diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 05afe086e2e5..6928e9ae7d32 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -453,10 +453,13 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - - name: Run misc eval tasks in parallel + - name: Ensure flake outputs on all systems still evaluate + run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1' + + - name: Query nixpkgs with aliases enabled to check for basic syntax errors run: | - # Ensure flake outputs on all systems still evaluate - nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1' & - # Query nixpkgs with aliases enabled to check for basic syntax errors - nix-env -I ./nixpkgs/untrusted -f ./nixpkgs/untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null & - wait + time nix-env -I ./nixpkgs/untrusted -f ./nixpkgs/untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null + + - name: Ensure NixOS modules meta is valid + run: | + time nix-instantiate -I ./nixpkgs/untrusted --strict --eval --json ./nixpkgs/untrusted/nixos --arg configuration '{}' --attr config.meta --option restrict-eval true --option allow-import-from-derivation false diff --git a/ci/OWNERS b/ci/OWNERS index 35f6c7cd84a2..fa76f045c29b 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -36,7 +36,7 @@ /maintainers/computed-team-list.nix @infinisil ## Standard environment–related libraries /lib/customisation.nix @alyssais @NixOS/stdenv -/lib/derivations.nix @alyssais @NixOS/stdenv +/lib/derivations.nix @NixOS/stdenv /lib/fetchers.nix @alyssais @NixOS/stdenv /lib/meta.nix @alyssais @NixOS/stdenv /lib/source-types.nix @alyssais @NixOS/stdenv diff --git a/ci/github-script/reviews.js b/ci/github-script/reviews.js index 0dacaa814e62..7041fdae1f10 100644 --- a/ci/github-script/reviews.js +++ b/ci/github-script/reviews.js @@ -66,7 +66,13 @@ async function dismissReviews({ github, context, core, dry, reviewKey }) { changesRequestedReviews.every( (review) => commentResolvedRegex.test(review.body) || - (reviewKey && reviewKeyRegex.test(review.body)), + (reviewKey && reviewKeyRegex.test(review.body)) || + // If we are called by check-commits and the review body is clearly + // from `commits.js`, then we can safely dismiss the review. + // This helps with pre-existing reviews (before the comments were added). + (reviewKey && + reviewKey === 'check-commits' && + review.body.includes('PR / Check / cherry-pick')), ) ) { reviewsToDismiss = changesRequestedReviews diff --git a/flake.nix b/flake.nix index 1bac7569d3ea..beced0fef048 100644 --- a/flake.nix +++ b/flake.nix @@ -116,6 +116,10 @@ && !self.legacyPackages.${system}.stdenv.targetPlatform.isPower64 # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')" && system != "armv6l-linux" + # Exclude armv7l-linux because "cannot bootstrap GHC on this platform ('armv7l-linux' with libc 'defaultLibc')" + && system != "armv7l-linux" + # Exclude powerpc64le-linux because "cannot bootstrap GHC on this platform ('powerpc64le-linux' with libc 'defaultLibc')" + && system != "powerpc64le-linux" # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')" && system != "riscv64-linux" ) @@ -165,6 +169,10 @@ ( # Exclude armv6l-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" system != "armv6l-linux" + # Exclude armv7l-linux because "cannot bootstrap GHC on this platform ('armv7l-linux' with libc 'defaultLibc')" + && system != "armv7l-linux" + # Exclude powerpc64le-linux because "cannot bootstrap GHC on this platform ('powerpc64le-linux' with libc 'defaultLibc')" + && system != "powerpc64le-linux" # Exclude riscv64-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" && system != "riscv64-linux" # Exclude x86_64-freebsd because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" @@ -182,6 +190,10 @@ system: _: # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')" system != "armv6l-linux" + # Exclude armv7l-linux because "cannot bootstrap GHC on this platform ('armv7l-linux' with libc 'defaultLibc')" + && system != "armv7l-linux" + # Exclude powerpc64le-linux because "cannot bootstrap GHC on this platform ('powerpc64le-linux' with libc 'defaultLibc')" + && system != "powerpc64le-linux" # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')" && system != "riscv64-linux" # Exclude x86_64-freebsd because "Package ‘go-1.22.12-freebsd-amd64-bootstrap’ in /nix/store/0yw40qnrar3lvc5hax5n49abl57apjbn-source/pkgs/development/compilers/go/binary.nix:50 is not available on the requested hostPlatform" diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 19faf1fdd9d8..752bb5a64c63 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12053,6 +12053,13 @@ githubId = 1198065; name = "Jeffrey David Johnson"; }; + jefferyoo = { + email = "oojefferywm@proton.me"; + github = "jefferyoo"; + githubId = 237098253; + name = "Jeffery Oo"; + keys = [ { fingerprint = "7129 408E 3D97 47EB FCE1 A6D5 1999 2BEC E706 CC59"; } ]; + }; jefflabonte = { email = "jean-francois.labonte@brightonlabs.ai"; github = "JeffLabonte"; @@ -14207,6 +14214,12 @@ githubId = 160317; name = "Kristoffer Søholm"; }; + krit = { + email = "dasskrit@gmail.com"; + github = "kritdass"; + githubId = 68750861; + name = "Krit Dass"; + }; kritnich = { email = "kritnich@kritni.ch"; github = "Kritnich"; @@ -15729,7 +15742,7 @@ github = "M0streng0"; githubId = 85799811; }; - m0ustache3 = { + M0ustach3 = { name = "M0ustach3"; github = "M0ustach3"; githubId = 37956764; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 4e107833f6f9..dcb05e349197 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -20,6 +20,9 @@ let rhs = optCall rhs_ { inherit lib pkgs; }; in lib.recursiveUpdate lhs rhs + // lib.optionalAttrs (lhs ? allowUnfreePackages) { + allowUnfreePackages = lhs.allowUnfreePackages ++ (lib.attrByPath [ "allowUnfreePackages" ] [ ] rhs); + } // lib.optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: diff --git a/nixos/modules/misc/nixpkgs/test-nixpkgs-config-allow-unfree.nix b/nixos/modules/misc/nixpkgs/test-nixpkgs-config-allow-unfree.nix new file mode 100644 index 000000000000..201a43314fbf --- /dev/null +++ b/nixos/modules/misc/nixpkgs/test-nixpkgs-config-allow-unfree.nix @@ -0,0 +1,124 @@ +# Test for allowUnfreePackages merging across multiple modules +# Run with: nix-build -A nixosTests.nixpkgs-config-allow-unfree --show-trace + +{ + evalMinimalConfig, + lib, +}: +let + eval = + modules: + evalMinimalConfig { + imports = [ + ../nixpkgs.nix + ] + ++ modules; + }; + + getConfig = evalResult: evalResult.config.nixpkgs.config; + + sortList = list: builtins.sort builtins.lessThan list; + + assertEquals = + expected: actual: + let + prettyExpected = lib.generators.toPretty { } expected; + prettyActual = lib.generators.toPretty { } actual; + in + lib.assertMsg (expected == actual) "Expected ${prettyExpected} but got ${prettyActual}"; + + assertUnfreePackages = + listOfModules: expectedPackages: + let + config = getConfig (eval listOfModules); + actualAllowedUnfreePackages = sortList config.allowUnfreePackages; + in + assertEquals expectedPackages actualAllowedUnfreePackages; +in +lib.recurseIntoAttrs { + + singleModuleTest = + assertUnfreePackages + [ + { + nixpkgs.config.allowUnfreePackages = [ + "package1" + "package2" + ]; + } + ] + [ + "package1" + "package2" + ]; + + multipleModulesMerging = + assertUnfreePackages + [ + { + _file = "module1.nix"; + nixpkgs.config.allowUnfreePackages = [ + "package1" + "package2" + ]; + } + { + _file = "module2.nix"; + nixpkgs.config.allowUnfreePackages = [ + "package3" + "package4" + ]; + } + { + _file = "module3.nix"; + nixpkgs.config.allowUnfreePackages = [ "package5" ]; + } + ] + [ + "package1" + "package2" + "package3" + "package4" + "package5" + ]; + + overlappingPackagesMerging = + assertUnfreePackages + [ + { + _file = "moduleA.nix"; + nixpkgs.config.allowUnfreePackages = [ + "shared-package" + "unique-a" + ]; + } + { + _file = "moduleB.nix"; + nixpkgs.config.allowUnfreePackages = [ + "shared-package" + "unique-b" + ]; + } + ] + [ + "shared-package" + "shared-package" + "unique-a" + "unique-b" + ]; + + emptyListMerging = + assertUnfreePackages + [ + { + _file = "empty.nix"; + nixpkgs.config.allowUnfreePackages = [ ]; + } + { + _file = "non-empty.nix"; + nixpkgs.config.allowUnfreePackages = [ "some-package" ]; + } + ] + [ "some-package" ]; + +} diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix index a719631312be..f1597189fa38 100644 --- a/nixos/modules/programs/dsearch.nix +++ b/nixos/modules/programs/dsearch.nix @@ -49,5 +49,5 @@ in systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ]; }; - meta.maintainers = lib.teams.danklinux.maintainers; + meta.maintainers = lib.teams.danklinux.members; } diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix index 233590bcf3ec..53f84c1a41b1 100644 --- a/nixos/modules/programs/wayland/dms-shell.nix +++ b/nixos/modules/programs/wayland/dms-shell.nix @@ -226,5 +226,5 @@ in hardware.graphics.enable = lib.mkDefault true; }; - meta.maintainers = lib.teams.danklinux.maintainers; + meta.maintainers = lib.teams.danklinux.members; } diff --git a/nixos/modules/security/run0.nix b/nixos/modules/security/run0.nix index 430c03706063..22296a76c95e 100644 --- a/nixos/modules/security/run0.nix +++ b/nixos/modules/security/run0.nix @@ -8,7 +8,7 @@ let cfg = config.security.run0; - sudoAlias = pkgs.writeScriptBin "sudo" '' + sudoAlias = pkgs.writeShellScriptBin "sudo" '' if [[ "$1" == -* ]]; then echo "This script is a sudo-alias to systemd's run0 and does not support any sudo parameters." exit 1 diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix index 246a02ea414f..94b79bd19a5f 100644 --- a/nixos/modules/services/display-managers/dms-greeter.nix +++ b/nixos/modules/services/display-managers/dms-greeter.nix @@ -294,5 +294,5 @@ in services.libinput.enable = mkDefault true; }; - meta.maintainers = lib.teams.danklinux.maintainers; + meta.maintainers = lib.teams.danklinux.members; } diff --git a/nixos/modules/services/misc/memos.nix b/nixos/modules/services/misc/memos.nix index 5847e90c9c06..5e74931c579f 100644 --- a/nixos/modules/services/misc/memos.nix +++ b/nixos/modules/services/misc/memos.nix @@ -195,5 +195,5 @@ in }; }; - meta.maintainers = [ lib.maintainers.m0ustach3 ]; + meta.maintainers = [ lib.maintainers.M0ustach3 ]; } diff --git a/nixos/modules/services/security/crowdsec.nix b/nixos/modules/services/security/crowdsec.nix index 003ed7595fb8..7d89659f5dd1 100644 --- a/nixos/modules/services/security/crowdsec.nix +++ b/nixos/modules/services/security/crowdsec.nix @@ -983,7 +983,7 @@ in meta = { maintainers = with lib.maintainers; [ - m0ustach3 + M0ustach3 tornax jk ]; diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix index 6634e4894546..7d3f06db9854 100644 --- a/nixos/modules/services/web-apps/wakapi.nix +++ b/nixos/modules/services/web-apps/wakapi.nix @@ -18,11 +18,34 @@ let types mkIf optional - mkMerge singleton + mkRemovedOptionModule ; in { + imports = [ + (mkRemovedOptionModule [ + "services" + "wakapi" + "passwordSalt" + ] "Use services.wakapi.environmentFiles instead.") + (mkRemovedOptionModule [ + "services" + "wakapi" + "passwordSaltFile" + ] "Use services.wakapi.environmentFiles instead.") + (mkRemovedOptionModule [ + "services" + "wakapi" + "smtpPassword" + ] "Use services.wakapi.environmentFiles instead.") + (mkRemovedOptionModule [ + "services" + "wakapi" + "smtpPasswordFile" + ] "Use services.wakapi.environmentFiles instead.") + ]; + options.services.wakapi = { enable = mkEnableOption "Wakapi"; package = mkPackageOption pkgs "wakapi" { }; @@ -45,33 +68,11 @@ in ''; }; - passwordSalt = mkOption { - type = types.nullOr types.str; - default = null; + environmentFiles = mkOption { + type = types.listOf types.path; + default = [ ]; description = '' - The password salt to use for Wakapi. - ''; - }; - passwordSaltFile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - The path to a file containing the password salt to use for Wakapi. - ''; - }; - - smtpPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The password used for the smtp mailed to used by Wakapi. - ''; - }; - smtpPasswordFile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - The path to a file containing the password for the smtp mailer used by Wakapi. + Use this to set `WAKAPI_PASSWORD_SALT` and `WAKAPI_MAIL_SMTP_PASS`. ''; }; @@ -148,14 +149,7 @@ in ''; serviceConfig = { - Environment = mkMerge [ - (mkIf (cfg.passwordSalt != null) "WAKAPI_PASSWORD_SALT=${cfg.passwordSalt}") - (mkIf (cfg.smtpPassword != null) "WAKAPI_MAIL_SMTP_PASS=${cfg.smtpPassword}") - ]; - - EnvironmentFile = - (lib.optional (cfg.passwordSaltFile != null) cfg.passwordSaltFile) - ++ (lib.optional (cfg.smtpPasswordFile != null) cfg.smtpPasswordFile); + EnvironmentFile = cfg.environmentFiles; User = config.users.users.wakapi.name; Group = config.users.users.wakapi.group; @@ -196,18 +190,6 @@ in }; assertions = [ - { - assertion = cfg.passwordSalt != null || cfg.passwordSaltFile != null; - message = "Either `services.wakapi.passwordSalt` or `services.wakapi.passwordSaltFile` must be set."; - } - { - assertion = !(cfg.passwordSalt != null && cfg.passwordSaltFile != null); - message = "Both `services.wakapi.passwordSalt` and `services.wakapi.passwordSaltFile` should not be set at the same time."; - } - { - assertion = !(cfg.smtpPassword != null && cfg.smtpPasswordFile != null); - message = "Both `services.wakapi.smtpPassword` and `services.wakapi.smtpPasswordFile` should not be set at the same time."; - } { assertion = cfg.database.createLocally -> cfg.settings.db.dialect != null; message = "`services.wakapi.database.createLocally` is true, but a database dialect is not set!"; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index bd095ce0b408..cb9f5509c102 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -30,7 +30,7 @@ let xf86-video-intel xf86-video-mga xf86-video-neomagic - xf86_video_nested + xf86-video-nested xf86-video-nouveau xf86-video-nv xf86-video-omap diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index da285ba3e7d0..41b2128e2bb4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -249,6 +249,7 @@ in atd = runTest ./atd.nix; atop = import ./atop.nix { inherit pkgs runTest; }; atticd = runTest ./atticd.nix; + attr = pkgs.callPackage ./attr.nix { }; atuin = runTest ./atuin.nix; audiobookshelf = runTest ./audiobookshelf.nix; audit = runTest ./audit.nix; @@ -1115,6 +1116,13 @@ in imports = [ ./nixos-rebuild-target-host.nix ]; }; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; + nixpkgs-config-allow-unfree = + pkgs.callPackage ../modules/misc/nixpkgs/test-nixpkgs-config-allow-unfree.nix + { inherit evalMinimalConfig; }; + nixpkgs-config-allow-unfree-packages-and-predicate = + pkgs.callPackage ../../pkgs/stdenv/generic/check-meta-test.nix + { }; + nixseparatedebuginfod = runTest ./nixseparatedebuginfod.nix; nixseparatedebuginfod2 = runTest ./nixseparatedebuginfod2.nix; node-red = runTest ./node-red.nix; nohang = runTest ./nohang.nix; @@ -1247,6 +1255,10 @@ in inherit runTest; php = pkgs.php84; }; + php85 = import ./php/default.nix { + inherit runTest; + php = pkgs.php85; + }; phylactery = runTest ./web-apps/phylactery.nix; pict-rs = runTest ./pict-rs.nix; pihole-ftl = import ./pihole-ftl { inherit runTest; }; diff --git a/nixos/tests/attr.nix b/nixos/tests/attr.nix new file mode 100644 index 000000000000..782f7031038e --- /dev/null +++ b/nixos/tests/attr.nix @@ -0,0 +1,28 @@ +# The reason this lives in nixos/tests is because `attr` is a bootstrap package, +# and it's very non-trivial to use `vmTools` in its passthru. +# +# The reason we need vmTools in the first place is because we don't allow +# extended attributes in the sandbox. +{ + lib, + vmTools, + attr, + perl, +}: +vmTools.runInLinuxVM ( + attr.overrideAttrs (oa: { + nativeCheckInputs = [ perl ]; + preCheck = "patchShebangs test"; + + # FIXME(balsoft): half of the test suite is skipped because the hacky test + # harness doesn't know that we're root even though we are (it's looking for + # /etc/group, which we don't have). Probably best to submit a fix upstream + # rather than patch it ourselves. + doCheck = true; + memSize = 4096; + + meta = oa.meta // { + maintainers = oa.meta.maintainers or [ ] ++ [ lib.maintainers.balsoft ]; + }; + }) +) diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index 6cb86d1ff8fc..acb531780f76 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -40,8 +40,15 @@ let nodes.server = { ... }: { - system.activationScripts = { - keyPlacement.text = '' + systemd.services.create-keys = { + wantedBy = [ "postgresql.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = '' mkdir -p '${serverKeyPath}' cp '${serverKey}' '${serverKeyPath}/server.key' chown postgres:postgres '${serverKeyPath}/server.key' @@ -85,8 +92,15 @@ let nodes.client = { ... }: { - system.activationScripts = { - keyPlacement.text = '' + systemd.services.create-keys = { + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = '' mkdir -p '${clientKeyPath}' cp '${clientKey}' '${clientKeyPath}/client.key' chown root:root '${clientKeyPath}/client.key' diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 49feef8bd9e6..5374661cb4cf 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1171,38 +1171,64 @@ let exporterTest = '' wait_for_unit("prometheus-node-cert-exporter.service") wait_for_open_port(9141) + succeed("test -f /run/certs/node-cert.cert") wait_until_succeeds( "curl -sSf http://localhost:9141/metrics | grep 'ssl_certificate_expiry_seconds{.\\+path=\"/run/certs/node-cert\\.cert\".\\+}'" ) ''; - metricProvider = { - system.activationScripts.cert.text = '' - mkdir -p /run/certs - cd /run/certs + metricProvider = + { config, ... }: + { + systemd.services.prometheus-node-cert-exporter = { + serviceConfig.ExecStartPre = + let + createDir = pkgs.writeShellApplication { + name = "create-dir"; + text = + let + inherit (config.services.prometheus.exporters.node-cert) user; + in + '' + mkdir -p /run/certs + chown ${user}:${user} /run/certs + chmod ug+rwx /run/certs + ''; + }; + createCerts = pkgs.writeShellApplication { + name = "create-certs"; + text = '' + cd /run/certs - cat >ca.template <ca.template <> "$out" - ''; + buildPhase = + attrs.buildPhase or '' + { echo "------------------------------------------------------------"; + echo " WARNING: the existence of this path is not guaranteed."; + echo " It is an internal implementation detail for pkgs.mkShell."; + echo "------------------------------------------------------------"; + echo; + # Record all build inputs as runtime dependencies + export; + } >> "$out" + ''; - preferLocalBuild = true; - } - // rest -) + preferLocalBuild = attrs.preferLocalBuild or true; + }; +} diff --git a/pkgs/by-name/ab/abseil-cpp/package.nix b/pkgs/by-name/ab/abseil-cpp/package.nix index 5419ae381c67..8e26cb30a690 100644 --- a/pkgs/by-name/ab/abseil-cpp/package.nix +++ b/pkgs/by-name/ab/abseil-cpp/package.nix @@ -1,50 +1,8 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - gtest, - static ? stdenv.hostPlatform.isStatic, - cxxStandard ? null, -}: +# Some packages, such as or-tools, strictly require a specific LTS +# branch of abseil-cpp, and will be broken by arbitrary upgrades. See +# also https://abseil.io/about/compatibility, which confirms “Each LTS +# release should be considered to be a new major version of the +# library.” Therefore, we keep packages `abseil-cpp_YYYYMM` for each +# required LTS branch, leaving `abseil-cpp` as an alias. -stdenv.mkDerivation (finalAttrs: { - pname = "abseil-cpp"; - version = "20250814.1"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - tag = finalAttrs.version; - hash = "sha256-SCQDORhmJmTb0CYm15zjEa7dkwc+lpW2s1d4DsMRovI="; - }; - - outputs = [ - "out" - "dev" - ]; - - cmakeFlags = [ - (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true) - (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true) - (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) - ] - ++ lib.optionals (cxxStandard != null) [ - (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard) - ]; - - strictDeps = true; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gtest ]; - - meta = { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.GaetanLepage ]; - }; -}) +{ abseil-cpp_202508 }: abseil-cpp_202508 diff --git a/pkgs/by-name/ab/abseil-cpp_202508/package.nix b/pkgs/by-name/ab/abseil-cpp_202508/package.nix new file mode 100644 index 000000000000..5419ae381c67 --- /dev/null +++ b/pkgs/by-name/ab/abseil-cpp_202508/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gtest, + static ? stdenv.hostPlatform.isStatic, + cxxStandard ? null, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "abseil-cpp"; + version = "20250814.1"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + tag = finalAttrs.version; + hash = "sha256-SCQDORhmJmTb0CYm15zjEa7dkwc+lpW2s1d4DsMRovI="; + }; + + outputs = [ + "out" + "dev" + ]; + + cmakeFlags = [ + (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true) + (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) + ] + ++ lib.optionals (cxxStandard != null) [ + (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard) + ]; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ gtest ]; + + meta = { + description = "Open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.GaetanLepage ]; + }; +}) diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 5571e8051691..2f6110a33b19 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -39,6 +39,10 @@ useBundledLuaJIT ? false, }: +let + luajit' = luajit.override { enable52Compat = true; }; +in + stdenv.mkDerivation (finalAttrs: { pname = "aegisub"; version = "3.4.2"; @@ -82,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals portaudioSupport [ portaudio ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals spellcheckSupport [ hunspell ] - ++ lib.optionals (!useBundledLuaJIT) [ luajit ]; + ++ lib.optionals (!useBundledLuaJIT) [ luajit' ]; mesonFlags = [ (lib.mesonEnable "alsa" alsaSupport) diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix index 8ac438c7ce04..45ec0b597869 100644 --- a/pkgs/by-name/ar/ariang/package.nix +++ b/pkgs/by-name/ar/ariang/package.nix @@ -6,21 +6,20 @@ imagemagick, xdg-utils, makeDesktopItem, - nix-update-script, }: buildNpmPackage rec { pname = "ariang"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "mayswind"; repo = "AriaNg"; tag = version; - hash = "sha256-InS+kw/bF1ygiFoWgpXg//XE5xgQifIr79C6Qoa84Fo="; + hash = "sha256-u4MnjGMvnnb9EGHwK2QYpW7cuX1e1+6z2/1X1baR8iA="; }; - npmDepsHash = "sha256-ch/+i0jNO47Zyet7/MTaIpibbaPJi9Sq97jTp8iq6dA="; + npmDepsHash = "sha256-kxoSEdM8H7M9s6U2dtCdfuvqVROEk35jAkO7MgyVVRg="; makeCacheWritable = true; @@ -65,8 +64,6 @@ buildNpmPackage rec { }) ]; - passthru.updateScript = nix-update-script { }; - meta = { description = "Modern web frontend making aria2 easier to use"; homepage = "http://ariang.mayswind.net/"; diff --git a/pkgs/by-name/at/atlauncher/deps.json b/pkgs/by-name/at/atlauncher/deps.json index f63cf02eb6b1..09db83395587 100644 --- a/pkgs/by-name/at/atlauncher/deps.json +++ b/pkgs/by-name/at/atlauncher/deps.json @@ -3,8 +3,8 @@ "!version": 1, "https://jitpack.io/com": { "github/ATLauncher/gradle-macappbundle#build/d22f8cdb94": { - "jar": "sha256-rBqYi12MUWdwuNbFSlYO0tREzcDpfXI3VRPVV/DRZ+c=", - "module": "sha256-JlSHpEtQuOO3/qIdidXBZ21IjieA7PE2b0ui7aimdxc=", + "jar": "sha256-jH3SXauqKfj/wonbe/jaMPsISthckyuc1ygUSdbsQpE=", + "module": "sha256-tZYrHWLuYmqeMw919dnXnIWR+ocLAmH/ZW0dgRAtnt8=", "pom": "sha256-ySbX7ZLlXt7l+JcGEqV/peu6T+h7oJp6s/d95XQdIVo=" }, "github/ATLauncher/gradle-macappbundle#edu.sc.seis.macAppBundle.gradle.plugin/d22f8cdb94": { @@ -27,40 +27,31 @@ "jar": "sha256-5ZE5ZDU4P3vhzmlAOVxAZynMBrkJfxPsTKVH+b/MxRE=", "pom": "sha256-AdGzI8W4ciDR49kasH/2Bh0XVpY8Ve/MFj+LI3pJHR4=" }, - "github/Vatuu#discord-rpc/1.6.2": { - "jar": "sha256-nTR5RBRKtdd34W1ui+EI3gxb9fbIz08uBOXS3Wn7tU4=", - "pom": "sha256-TWqqjVQWL2EeeD9I7+HngsFOv5WuZifEfKc9s1PVVdo=" - }, "gitlab/doomsdayrs#rxswing/a5749ad421": { "jar": "sha256-XZIGfC5TCNjiXwHdEdpxBSGWJu8aHt5RLkHYJey0nbc=", "module": "sha256-TAPDjgy5Byv7Vh43y9xE1VmAcq62/FGCh6NX+8Ir7lk=", "pom": "sha256-7Grt6dk72Csvb8zMKtflZte6wdf4SjDUynirA/OF1fM=" } }, - "https://libraries.minecraft.net": { - "com/mojang#authlib/1.5.21": { - "jar": "sha256-znqchuvr8wuJkpAm9KCjxYzg9NR5N9bcCGrk/Qx3VEo=", - "pom": "sha256-1ZKDxzA7QuQWUY2PXCZYlSlcEWkP2NNgefGgTGpWsXw=" - } - }, "https://plugins.gradle.org/m2": { - "com/adarshr#gradle-test-logger-plugin/3.2.0": { - "jar": "sha256-LW0Bksjs90nVxLHkUz/P2WXrsuteW9G+6qpLEJYdldg=", - "pom": "sha256-bQ61NlUv5CUhW5L7YX/UP3RSCt05QDQUE3oVEkBPEFA=" + "com/adarshr#gradle-test-logger-plugin/4.0.0": { + "jar": "sha256-5nhoOjPSvINWcb3U5YcQAErR2TFqqfmlTP4iQZpPbvk=", + "module": "sha256-jERLLH/UQgDNSrMYJyJwHCCXWkOyPH6e35sCJgSavcI=", + "pom": "sha256-ienBpTqmJS2mx9fZscN/t/j8qQuysaNq+Ti8cNni3GE=" }, - "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/3.2.0": { - "pom": "sha256-ql6amsMp1l5VI+RgyVfUmalqo/FUJzQoxENCxB57BBk=" + "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/4.0.0": { + "pom": "sha256-sobTcqzS2uG4vHsg/ouoT49kiXMdiBpB83NqYCCFotc=" }, "com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { "pom": "sha256-+Ww0HGI0gfly9FQurzIE3rd3NerlFYjOQrY0LUzfmcE=" }, - "com/github/ben-manes#gradle-versions-plugin/0.47.0": { - "jar": "sha256-H3CAteTQM5/dUJhSa+YDtPCVFaR/EirBUVCZzRWNg88=", - "module": "sha256-VYVMhFmwZESD+Gh53gvsIcwx9GsgfNizpF5TdKxngl4=", - "pom": "sha256-lO3mIRlM2G49tapNmGwedJroqjkSrN9xP5pTyKh9E5Q=" + "com/github/ben-manes#gradle-versions-plugin/0.52.0": { + "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=", + "module": "sha256-r6cL5O0h646QJ2hPFfpeKXXz0uRtIpN76jmhDkj3nd0=", + "pom": "sha256-WESi8/+pqARY0m7ex3EjeuYxXN3yBp1Qp+hUFj5A8Q0=" }, - "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.47.0": { - "pom": "sha256-+Mn7dWyfcAjGRFsFTbe7g9aJAp09tHjdYZqa7cwnCgw=" + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.52.0": { + "pom": "sha256-sLbWCz+UCuWgFAfwNJ6d86Ayph+FXkoXt9vakSprU3Y=" }, "com/github/johnrengelman#shadow/8.1.1": { "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", @@ -70,20 +61,27 @@ "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" }, - "de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { - "pom": "sha256-6wbtSRqHmov6z2CGiCpS/hh9J17a+DUN0eoMmMQS6Jw=" + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "de/undercouch/download#de.undercouch.download.gradle.plugin/5.6.0": { + "pom": "sha256-BlPzNGaIqBMNjjYy3kQHyDC1Iaoa7euqsYRUICAN/7E=" }, "edu/sc/seis#macAppBundle/2.3.0": { "jar": "sha256-RaQcBHwRecgPk0+WBIlWK8yD9CjWMcLUC2qzf93XlEQ=", "pom": "sha256-Bz+N8ig5R6YJRDDWt0iJ8xSjOW+6zOTAfqlTI+uecbY=" }, - "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.3": { - "pom": "sha256-Os140q2vOhpbu95A1j3H9vFCTge+OmzytMhvP5E2RKU=" + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.6": { + "pom": "sha256-YqT2dSGQuevzCGngkuQVTkGixc2WBIrpigGRbyaERlo=" }, - "edu/sc/seis/launch4j#launch4j/3.0.3": { - "jar": "sha256-nKdCRA20uwEgYWQXxHE500jaDntn3KVB+wKfR3Yjdjo=", - "module": "sha256-Cjj1r5mHEEhY1lPn0qwfv7kdHDfqDqU7qTf3lC1E4vs=", - "pom": "sha256-hXI2OQ+LV4qlENBxsf2+k8/UKKcbyie2JDliKah7PGQ=" + "edu/sc/seis/launch4j#launch4j/3.0.6": { + "jar": "sha256-ao8ADG/aLrF0BrUW7AvijNrJAMu6AzGeV708Lxsa+gI=", + "module": "sha256-Cjjh2qt5oytWeQ20WAiBSMl74CF2Ti0tziWbmof+wEg=", + "pom": "sha256-MhJ0+5apc3nprkdy0A7DMlBOPS/dQxlLUpQBlSzxcZY=" }, "edu/sc/seis/macAppBundle#edu.sc.seis.macAppBundle.gradle.plugin/2.3.0": { "pom": "sha256-aIm5UVUoqdAZ6vQ1FQTUkj0fIZz34HuRZKnYERmdBsw=" @@ -92,8 +90,24 @@ "jar": "sha256-w2sPCJOeiD8o0b9WgNvxxNYCSiIuN5dXiaJTcC05JmI=", "pom": "sha256-BPOApmghda+dW1ux+P7ULbtdoscHNpd0D/RfJn5MDtw=" }, + "net/ltgt/errorprone#net.ltgt.errorprone.gradle.plugin/4.1.0": { + "pom": "sha256-9k+NhpPxdWzFehY++k0phEu659VITFlgqahZCBU0nXM=" + }, + "net/ltgt/gradle#gradle-errorprone-plugin/4.1.0": { + "jar": "sha256-8eqwNcmW4gsIG/PBi9DjKLtVPUZeS+I1TQr03eBwRl0=", + "module": "sha256-iXVjhlYvotGW4elyfrG4+Qe/qynMfHNm1R4U3+Deblg=", + "pom": "sha256-6xrdVO4j+7Dgwnz5DZNQnM8rZOPnjHsfNhJP6emkHA4=" + }, "org/cadixdev/licenser#org.cadixdev.licenser.gradle.plugin/0.6.1": { "pom": "sha256-R5s2fGaOTTg5LrH+WVD4tOq6CFe0hym9oxIiIhX74MM=" + }, + "org/gradle/toolchains#foojay-resolver/0.9.0": { + "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=", + "module": "sha256-huXl1QMWJYbAlW/QKippt22nwHIPSuAj82bRkaqXtLg=", + "pom": "sha256-wdtMSmUHZ5Y7dl/Q3d7P4eqLjp9kQo+H3iB/V48DeOc=" + }, + "org/gradle/toolchains/foojay-resolver#org.gradle.toolchains.foojay-resolver.gradle.plugin/0.9.0": { + "pom": "sha256-2u7Fg/EsK0N8NVdSGCYQEZfZC5Ljtk5EYQs/Idi7Cl8=" } }, "https://repo.maven.apache.org/maven2": { @@ -171,15 +185,24 @@ "com/fasterxml#oss-parent/49": { "pom": "sha256-bfHMCoZSQhAIiUNBLJcbQqumidGwaNuf05Htmhk4cjU=" }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, "com/fasterxml/jackson#jackson-base/2.14.1": { "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24=" }, "com/fasterxml/jackson#jackson-bom/2.14.1": { "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, "com/fasterxml/jackson#jackson-parent/2.14": { "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, "com/fasterxml/jackson/core#jackson-annotations/2.14.1": { "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=", "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=", @@ -215,19 +238,20 @@ "jar": "sha256-u0s3BtLxXF5eYCPu0lG87hOPoVK+NUdJ9W/sAccmhnk=", "pom": "sha256-5TZK+P0X73rgJVElx+Qy1w0YW/Uy6cLzOSWZSeendSQ=" }, - "com/formdev#flatlaf-extras/3.1.1": { - "jar": "sha256-3l09TZ+oX+pOPEOv1+iCfr5cAF8+H/rVTT4/QJofZtM=", - "module": "sha256-5N/Q1zK+EUS7BJWdNkSwvvzvLAa6MNQj5Cp34hcLmMQ=", - "pom": "sha256-jFE9cIGiz2SOOUG/LTDo/NJ4y7I3FZqbWn2fCNaeXBo=" + "com/formdev#flatlaf-extras/3.5.4": { + "jar": "sha256-FnQYAYzBLtUGQpiSIcAcesrQGZu9l7P1RROK7373zSA=", + "module": "sha256-/orksa/AWKbwmRsYhGJ8+AQKy0I4DzKmBGKPJ8MJFCc=", + "pom": "sha256-tGm2lKtx+D5qhro4/Vc2jUrQ/jf2CBp6qDrwDkcTyrY=" }, - "com/formdev#flatlaf/3.1.1": { - "jar": "sha256-Jk75UoYnUQyiDzxoDE46wBKbysI1uNTZ8BQmHzzW1W8=", - "module": "sha256-pyoFwWAhh9DRfKh+1W9IjgzCtVpPiK0LAfgejZlnX4I=", - "pom": "sha256-X6tw379yYFHCJtgn2zQfND00aPKlm3Qw1hQKSJMsi+8=" + "com/formdev#flatlaf/3.5.4": { + "jar": "sha256-PDS2rrLxcKlUxDWGR+tDtotEeiw1H/MRBy9xV6XU4v4=", + "module": "sha256-Rjx10DAKwDblv9OLBqPx8Ua/17YdoyYael79bebtqdU=", + "pom": "sha256-ymv/5ynY3zr6lZQM0Wz/dL4eiHIHGP5hCsD+Jv4XsWA=" }, - "com/formdev#svgSalamander/1.1.3": { - "jar": "sha256-y7Z73jhascHpgy9UkSmCxp/GDIHCRINdB/Q8pORhDrA=", - "pom": "sha256-Cz+GlIGr8x9f9fQ4apYLTeYY4AQgLPHXsowlRf9Qoy8=" + "com/github/ben-manes/caffeine#caffeine/3.0.5": { + "jar": "sha256-iptU01BqO5LuRrIXvO55GWshym1S3ClnxoaiBfsvnBU=", + "module": "sha256-MNqUAgRzgsSZ0djzcgH8Ead8mTTSxYa8WkKvrEr6wrI=", + "pom": "sha256-vM/bJH7Xa1K7sUMMIoLEO61BjtPGl7TiqVrQmbvyXPg=" }, "com/github/cliftonlabs#json-simple/3.0.2": { "jar": "sha256-/aZamtDhrAyImHEG6Jqk2LKiSV5+BCNx76g4E/ZbcpU=", @@ -307,56 +331,145 @@ "jar": "sha256-OfNnW5EObpuTgl+ChL7J9K0wRM0gpvfI/54vhpXr8h4=", "pom": "sha256-6oYs472WzLjKNrjp57rvLaP7v73CVrrqqMioc5EQdOc=" }, - "com/github/oshi#oshi-core/6.4.4": { - "jar": "sha256-Qj70zXIge3OpGXvVw1FMOzNqcG5E8t+9Hp2hT3UTXc4=", - "pom": "sha256-LQP0hyNVDZCjSpqrK8EAY2jRaaxvpQnLAbHbKbueOFo=" + "com/github/kevinstern#software-and-algorithms/1.0": { + "jar": "sha256-YauCQ5zvNzQ7FPUxVMRhYZN1NzpWuTOOiVcJ+1Tghkw=", + "pom": "sha256-7ZcfAJNU5owJQUyWT74aLIXCyLvUYBIrdJenuMXU84g=" }, - "com/github/oshi#oshi-parent/6.4.4": { - "pom": "sha256-jNu7z13zPmIDXCUQWKKb7LK6e9R+LjqsDtyKrvfl+dA=" + "com/github/oshi#oshi-core/6.6.6": { + "jar": "sha256-lO0ISEjF4IajhryBE/s6Iow2yxQWpD2VbZ8rtVxx3ks=", + "pom": "sha256-uzele4iPzqgegnDVbR7V9un2YOcLVjlGwAkAwR3cwag=" + }, + "com/github/oshi#oshi-parent/6.6.6": { + "pom": "sha256-GWQ00yyqRedrrppZG5iUDwprgtmQVaGYqygMTVPTqHs=" }, "com/github/stephenc/jcip#jcip-annotations/1.0-1": { "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" }, - "com/google/code/findbugs#jsr305/2.0.1": { - "pom": "sha256-AsEsPCrhLdR1IZ/2kcgqTZ6iH0S8WUoYEpW/bUPc+7A=" + "com/github/weisj#jsvg/1.4.0": { + "jar": "sha256-Lx6hn7lhHMovfQaGqbAxPLDfjNy6Bz31dLXNGmyKhqI=", + "pom": "sha256-GMmalZVvTdu7NNN5YLI7va+bbWNDWQgPVCCU7JQISPM=" + }, + "com/google/auto#auto-common/1.2.2": { + "jar": "sha256-9Qsc6KQfrTGoqBnAUvj/o2LqCj2+nvj3x9yaNtRzilk=", + "pom": "sha256-A6mS+6T8+7z3ekYJgRgWMARuW64JZzpIGTxuD3YSceo=" + }, + "com/google/auto/service#auto-service-aggregator/1.0.1": { + "pom": "sha256-BIFGDbWZAzYrJvq9O9zV7CAHUPk5G7tlAv48fcLfPkw=" + }, + "com/google/auto/service#auto-service-annotations/1.0.1": { + "jar": "sha256-x77FS3tViLWWfocDQQkcVpEYHZVM8gOfG/Cm7rg3Rzs=", + "pom": "sha256-6bvxs9ZsoYAEpqB6INv6EMos6DZzSPdB3i/o/vzmjMI=" + }, + "com/google/auto/value#auto-value-annotations/1.9": { + "jar": "sha256-+lRp9MRO5Zii2PAzqwqdy8ZJigxeDJmN+gwq31E1gEQ=", + "pom": "sha256-kiCj2r51x5M08GGw5A34M0SGZrrCiouCO8Ho/VL4yYo=" + }, + "com/google/auto/value#auto-value-parent/1.9": { + "pom": "sha256-Lj2d/2OWAcq4gdfhcIBry9jgMffr/yWcu0W+V7TL14c=" }, "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/code/gson#gson-parent/2.10.1": { - "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" }, - "com/google/code/gson#gson/2.10.1": { - "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", - "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" }, - "com/google/errorprone#error_prone_annotations/2.18.0": { - "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", - "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + "com/google/errorprone#error_prone_annotation/2.36.0": { + "jar": "sha256-NwKIfOD6TQtM18VUUTiRmxAQAqiDvoYfLG8wylViY18=", + "pom": "sha256-B3hR7c2V1T9CYuqcuBsJLMSSHjbuGrrTsWRYSBAEBz4=" }, - "com/google/errorprone#error_prone_parent/2.18.0": { - "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + "com/google/errorprone#error_prone_annotations/2.27.0": { + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_annotations/2.36.0": { + "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", + "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" + }, + "com/google/errorprone#error_prone_check_api/2.36.0": { + "jar": "sha256-gNw5RECu1GhUEgukK+CrUFuUDZ8yt3uqj8V5Bjb4+PY=", + "pom": "sha256-LFua/IAMRjkPkQRCa2F0BvTdWXBxFTalRN45n7cZOtw=" + }, + "com/google/errorprone#error_prone_core/2.36.0": { + "jar": "sha256-jMG4xcpKtIToKKKnY6C9jnpDop/U8CM+3RW8TP0Hrjk=", + "pom": "sha256-6DiEq0b79gm2t258jf5stt4zZ2HYOmKKY1GJ1NLfGUo=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, + "com/google/errorprone#error_prone_parent/2.36.0": { + "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" + }, + "com/google/errorprone#error_prone_type_annotations/2.36.0": { + "jar": "sha256-3BVof0r+u3PtJjdx7UKxXNnPT5ruFfnJl6/C6OAJCH0=", + "pom": "sha256-2GJ347oLmmDpE3QaFFCJChkOwSXyZlqDlS4lyAHDubg=" + }, + "com/google/errorprone#javac/9+181-r4173-1": { + "jar": "sha256-HY00eg4VefP8hqwE0ZdOSJr8ZjV/AAmsmASnrDCRLtY=", + "pom": "sha256-FWnAgfqDWKBhZDcvn1Qbig6l7Alkkx9fdOrTb/UrQBU=" + }, + "com/google/googlejavaformat#google-java-format-parent/1.19.1": { + "pom": "sha256-r/ZaCUb8eGA7yBYgHRfTaezweeQI6z1YRwIV8grm/20=" + }, + "com/google/googlejavaformat#google-java-format/1.19.1": { + "jar": "sha256-/xWrrFKfbsuXh4qiricaTTsV9SbB+CN1fdh4HAsRxzs=", + "pom": "sha256-/FrF614foDnAmUcU8u8mzWbwvJad/L0qsR8n0KaCrJM=" }, "com/google/guava#failureaccess/1.0.1": { "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, "com/google/guava#guava-parent/26.0-android": { "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" }, "com/google/guava#guava-parent/32.1.1-jre": { "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0=" }, + "com/google/guava#guava-parent/32.1.3-jre": { + "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs=" + }, + "com/google/guava#guava-parent/33.4.0-jre": { + "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" + }, "com/google/guava#guava/32.1.1-jre": { - "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=", "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=", "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs=" }, - "com/google/j2objc#j2objc-annotations/2.8": { - "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", - "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=", + "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=", + "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM=" + }, + "com/google/guava#guava/33.4.0-jre": { + "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", + "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", + "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/google/protobuf#protobuf-bom/3.25.5": { + "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM=" + }, + "com/google/protobuf#protobuf-java/3.25.5": { + "jar": "sha256-hUAkf62eBrrvqPtF6zE4AtAZ9IXxQwDg+da1Vu2I51M=", + "pom": "sha256-51IDIVeno5vpvjeGaEB1RSpGzVhrKGWr0z5wdWikyK8=" + }, + "com/google/protobuf#protobuf-parent/3.25.5": { + "pom": "sha256-ZMwOOtboX1rsj53Pk0HRN56VJTZP9T4j4W2NWCRnPvc=" }, "com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": { "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY=" @@ -407,28 +520,28 @@ "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" }, - "com/squareup/okhttp3#okhttp-tls/4.11.0": { - "jar": "sha256-SuTHCSwBeBhSRQabkSdGX9V8dkSF81ev7USlxIoFNf0=", - "module": "sha256-2m5O5qfdybnUZusr5ScBAmsXms2wClyso08uXTdeSMI=", - "pom": "sha256-0SYiMcXxtb/bVe/7+SXas1/dWlNFEvhsSd3HIGY/IEg=" + "com/squareup/okhttp3#okhttp-tls/4.12.0": { + "jar": "sha256-lpiWzKApwrtDbL333DJd4PJ+ViniRvOSDJtsL2vmOvQ=", + "module": "sha256-GyzXCWlAe/Smhb5rMji68a4jA85sNN6Y3h+Y6h4ZPZE=", + "pom": "sha256-3dpg5I+mqWf7nTaW1eh+GA8+M2ZlQR7zceH9ZITBY2Q=" }, - "com/squareup/okhttp3#okhttp/4.11.0": { - "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", - "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", - "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" }, - "com/squareup/okio#okio-jvm/3.2.0": { - "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", - "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", - "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" }, "com/squareup/okio#okio-multiplatform/2.9.0": { "module": "sha256-JA9DK32vz1cfuOx8s48eiQiPFsjN92gq9Wt3I5FKw2A=", "pom": "sha256-NywwDgfKvA3u89B/QoPQfESwoS89XoV9WYT5UYCPdsY=" }, - "com/squareup/okio#okio/3.2.0": { - "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", - "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, "com/sun/activation#all/2.0.1": { "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw=" @@ -512,13 +625,9 @@ "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" }, - "commons-codec#commons-codec/1.15": { - "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", - "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" - }, - "commons-codec#commons-codec/1.9": { - "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", - "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" + "commons-codec#commons-codec/1.17.1": { + "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, "commons-collections#commons-collections/3.2.2": { "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", @@ -528,21 +637,21 @@ "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" }, - "commons-io#commons-io/2.4": { - "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", - "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + "commons-io#commons-io/2.16.1": { + "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", + "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" }, "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" }, - "de/undercouch#gradle-download-task/5.4.0": { - "jar": "sha256-JsVNuzwLnvITSpqanOcC6qyjbsFUnB3NJVv5SiRqjlQ=", - "module": "sha256-ttq8wyBMhKj4+Eh00qFkQ6thI2PP5SfBAngVuxJ7+sE=", - "pom": "sha256-jlGpL1k66bZZxEYWIcTymIP4l+EC1SIWZFmBsbQJiYU=" + "de/undercouch#gradle-download-task/5.6.0": { + "jar": "sha256-zkN6arnKcZzIVrVbp0kuQsTODumC5tIvtDLNVYh2gb4=", + "module": "sha256-P+YJN66Dzs2qpOD2EykVaQKD7d+IQ54m8efjgEV4NSI=", + "pom": "sha256-RqMBkMaLY9AegKQEQJfCULu8MgmkXw3FpNDioe1bgKc=" }, - "de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { - "pom": "sha256-4NrTSpBgtpqatLk0VkOHq5IW2hwphf4BVrQNgfTYMAE=" + "de/undercouch/download#de.undercouch.download.gradle.plugin/5.6.0": { + "pom": "sha256-V4ZJ2QNOktiHKG+bKWblNyG2bHFOUyWPzDOH61m2uEs=" }, "io/fabric8#kubernetes-client-bom/5.12.2": { "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" @@ -551,6 +660,17 @@ "jar": "sha256-8LBLXXexjtow8h+NHDXNbiuMsv8PmsRuc71yekdW39E=", "pom": "sha256-Irh7X4jt0O1kE2d4w9XluyqenqONrkg8+pOoAn3Qgd0=" }, + "io/github/eisop#dataflow-errorprone/3.41.0-eisop1": { + "jar": "sha256-EENPuk5T9V+px2kEzeQUuRiTJUjJ38Ti1jSsBf96fRA=", + "pom": "sha256-I/HN+kYTwAzG6lyfU2DhRxtEn4JjPxPPX/bNs0+jHr0=" + }, + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" + }, + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" + }, "io/github/x-stream#mxparser/1.2.2": { "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" @@ -646,14 +766,15 @@ "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=", "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw=" }, - "io/reactivex/rxjava3#rxjava/3.1.6": { - "jar": "sha256-NGgr0+xvBDxd77WJotGBE7o+LSNy3UAXRPjkgVwdtjg=", - "module": "sha256-xLSmhqW/xXqx3ud42SR1l8LtzDU3d2nbtMWuPQV000Q=", - "pom": "sha256-sfaISn2fJzghY7nkaKlfKNtls7j2tIhVieZ6C7zjw1E=" + "io/reactivex/rxjava3#rxjava/3.1.10": { + "jar": "sha256-6fJW+egFVy3V/UWxQNs2DX3ERNDDgwSbLT1+vwXYSqs=", + "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=", + "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60=" }, - "io/sentry#sentry/6.25.0": { - "jar": "sha256-QkQ2zF0SuRoCxvrazTDaf74NPcfoprvSygQEWMLw68w=", - "pom": "sha256-xMKzUiPvr/ZFvCRUcAqtmn+WcZjYDr3hLzDsbB0uq60=" + "io/sentry#sentry/8.0.0": { + "jar": "sha256-wbTvTG/Rh6YOU3i730p3cSwB5gZRqy6vDpMnceuHbNs=", + "module": "sha256-WTzZcOifJuOIeLXS6FE+Jqg0nSk+ZtxIxrus4DWlzj0=", + "pom": "sha256-O98OPIjMIuHGcA/BqblypLx0i/6JcfYR+EUxo9KEqXE=" }, "io/swagger#swagger-annotations/1.6.9": { "jar": "sha256-fvhZdOXYL8q9DavSxFXNgDeLNtd03gF86shCo6T6ZPg=", @@ -722,9 +843,15 @@ "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, "jakarta/platform#jakartaee-api-parent/9.0.0": { "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, "jakarta/validation#jakarta.validation-api/2.0.2": { "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=", "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI=" @@ -743,15 +870,20 @@ "jar": "sha256-V+N5atV1NkAIj1+dPFPBg/LCULfa2QUp6j4ZpVFaoSI=", "pom": "sha256-a9atlG7ZyKRKJrYKX8zM/M9fyMy/v/SQS1kXs8aUACs=" }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, "javax/servlet#javax.servlet-api/4.0.1": { "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=", "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E=" }, - "joda-time#joda-time/2.12.5": { - "jar": "sha256-EGKEEey0DEY0GWxUTzRoGr3u+CbzdwljV0M9H5oTW8Y=", - "pom": "sha256-QHV6ykQ5qWmPR1jyBsPFNxO1nNxVAd6W0WGKhPb/bH4=" + "joda-time#joda-time/2.13.0": { + "jar": "sha256-qbRQ2W2QYW+f5WV6KThbTQB3+Z+LyAhB+T4lRaPNYj4=", + "pom": "sha256-z3axJyUkKrwNv2c0z4nMKddt3Itnaklq1/xA0cUVUkM=" }, "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" }, "junit#junit/4.13.2": { @@ -769,12 +901,12 @@ "jar": "sha256-AwcEE55G8yw40nBg7e6eBnawoP/4qL5TRhUVFUuop74=", "pom": "sha256-Q1+4Zkqpt+EgyN1scH1Or6ZC+iYt/21eP3HcJcaeies=" }, - "net/freeutils#jlhttp/2.6": { - "jar": "sha256-HMFbUBezgFWM4q0uCvwrqW3iYXK6rXjCpwulXFRoV4A=", - "pom": "sha256-BaYFDFndeVRC+3zdZFjXUrJg6FOWbYovsNXiCXEo6Ug=" + "net/freeutils#jlhttp/3.2": { + "jar": "sha256-DvP0yOw9g9+E58KFQ55bqPz+rVSBrYVP8Zb6wOAA8n4=", + "pom": "sha256-8PYS4/ydGcpAKb/bAXPit5M3H/Ozv+//DOKmRv4mSSc=" }, - "net/freeutils#parent/1.3": { - "pom": "sha256-xouwWtmH1kcR6aU+/0ODO87EiMepPuRyfTOJEpsBc2Q=" + "net/freeutils#parent/2.0": { + "pom": "sha256-FE51G8n9qiJDf6r5MuCkxSvJ6Odw/KlhD/V6ZaGVJqs=" }, "net/iharder#base64/2.3.9": { "jar": "sha256-8aDjWe7imlk5w15f3txXTdfoygZbBW/BSysp4+081U0=", @@ -786,13 +918,13 @@ "net/java#jvnet-parent/3": { "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" }, - "net/java/dev/jna#jna-platform/5.13.0": { - "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", - "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + "net/java/dev/jna#jna-platform/5.16.0": { + "jar": "sha256-5aeVI5ZFCXV1VXgrtgKD5JAmEQE/EH5GANyTKY9z84I=", + "pom": "sha256-R3eT3wLGgn3+Ab2wjwBqVXdeb6BS3ErN7aNMmTYopJY=" }, - "net/java/dev/jna#jna/5.13.0": { - "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", - "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + "net/java/dev/jna#jna/5.16.0": { + "jar": "sha256-P1IzWJp5nrZtwpaa+jQz+1aFnT14fFi5vH3Z6G8KJQw=", + "pom": "sha256-9h/SxEqlg/Kiy8X8Z7DxmpIDyofV8OGNPVAwy+OQgIM=" }, "net/javacrumbs/json-unit#json-unit-core/2.36.0": { "jar": "sha256-a1j8/G2tlI6YMwzlmDUrOjnEndyPbZ9aCYPpL8h1hwU=", @@ -840,8 +972,14 @@ "org/apache#apache/27": { "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" }, - "org/apache#apache/29": { - "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, "org/apache#apache/9": { "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" @@ -857,27 +995,21 @@ "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" }, - "org/apache/commons#commons-compress/1.23.0": { - "jar": "sha256-wmfxcWDp72YrTXi38p3KfIKxXFz/LLaphl70qz3Vt4c=", - "pom": "sha256-WdwSFAa6notbUSvO9FcTUf7R+QK5Oc9SfYk7f3KUVMk=" + "org/apache/commons#commons-compress/1.27.1": { + "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=", + "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw=" }, "org/apache/commons#commons-digester3/3.2": { "jar": "sha256-HBUOPS30tCN7R+KP6iB5+w2jJFeNXMpqX+0uN6Ygguw=", "pom": "sha256-W7ihmK21l8MCBLTxwzb9s9KBZTZAPprTNJqyAAMuVEU=" }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + "org/apache/commons#commons-lang3/3.16.0": { + "jar": "sha256-CHCd101gK3Bc5AF9JlRCEAVqS6WD1bIMCTc0Bv56APg=", + "pom": "sha256-4oA4OVbC5ywd6zowezt18F7kNkm31D8CFfe2x7Fe6iw=" }, "org/apache/commons#commons-parent/22": { "pom": "sha256-+4xeVeMKet20/yEIWKDo0klO1nV7vhkBLamdUVhsPLs=" }, - "org/apache/commons#commons-parent/25": { - "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" - }, - "org/apache/commons#commons-parent/32": { - "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" - }, "org/apache/commons#commons-parent/34": { "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" }, @@ -893,13 +1025,23 @@ "org/apache/commons#commons-parent/54": { "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" }, - "org/apache/commons#commons-parent/56": { - "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apache/commons#commons-parent/72": { + "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" }, "org/apache/commons#commons-text/1.10.0": { "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, "org/apache/httpcomponents#httpclient/4.5.13": { "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" @@ -917,6 +1059,9 @@ "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=", "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc=" }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, "org/apache/logging#logging-parent/7": { "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" }, @@ -924,16 +1069,30 @@ "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" }, + "org/apache/logging/log4j#log4j-api/2.24.3": { + "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=", + "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk=" + }, "org/apache/logging/log4j#log4j-bom/2.20.0": { "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, "org/apache/logging/log4j#log4j-core/2.20.0": { "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" }, + "org/apache/logging/log4j#log4j-core/2.24.3": { + "jar": "sha256-frQIRZauJb08YWmOSOjQq2WpJgdYiE7Vy7nG5VxEpWo=", + "pom": "sha256-v9XAxKrGECQsy2H/ABCK1zeA2iCi9ym+Bjg2qXZXf1c=" + }, "org/apache/logging/log4j#log4j/2.20.0": { "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" }, + "org/apache/logging/log4j#log4j/2.24.3": { + "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" + }, "org/apache/velocity#velocity-engine-core/2.3": { "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM=" @@ -993,10 +1152,19 @@ "jar": "sha256-RTd/22VgqXHupyX1B9kf1rj70Hl9Yb/Ibyy2U8WBhqQ=", "pom": "sha256-VwEEzKwN+inkb7ZAL35qchcCwlXe9DvjAcassYwl520=" }, - "org/checkerframework#checker-qual/3.33.0": { - "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", - "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", - "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + "org/checkerframework#checker-qual/3.19.0": { + "module": "sha256-U+GJnd48UTyh79N2q/+sDmkH6OhKvV+WYkJjTJXk0Vc=", + "pom": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E=" + }, + "org/checkerframework#checker-qual/3.37.0": { + "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=", + "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", + "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" + }, + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" }, "org/codehaus/groovy#groovy-bom/3.0.14": { "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" @@ -1077,46 +1245,79 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.8.20": { - "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", - "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" + "org/jetbrains/kotlin#kotlin-bom/2.0.21": { + "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { - "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=", - "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg=" + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { - "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=", - "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { - "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=", - "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { - "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { - "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=", - "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { + "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", + "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.5.31": { + "pom": "sha256-RREKqwB0eSuBWAewKy2vGNKzfodHrAaSqteg0C2ok98=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { - "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { - "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=", - "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { + "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", + "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" }, "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { - "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=", "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" + }, "org/junit#junit-bom/5.10.2": { "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, "org/junit#junit-bom/5.5.2": { "pom": "sha256-WklWKkcEVB5p1O4xbNfq9xHN23ytXQ+Ia/ih/pjWqcU=" }, @@ -1124,10 +1325,6 @@ "module": "sha256-f0j4L1XvwfDMWVg8LUdKNBDiQXndLR0iFkUVzOM9dkM=", "pom": "sha256-6K1gGzGBsjeHoY5x0mrIaknFbcX4VgZ2S8PFG15F/hM=" }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" - }, "org/junit#junit-bom/5.7.2": { "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" @@ -1140,30 +1337,30 @@ "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" }, - "org/junit/jupiter#junit-jupiter-api/5.10.2": { - "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", - "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", - "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + "org/junit/jupiter#junit-jupiter-api/5.11.4": { + "jar": "sha256-q4PvnlGsRZfVnSa0tYgSEpVQ4vV5pATIr30J9c5bQpM=", + "module": "sha256-puov77OqWGj9engK4doRYudt2jdgtIAVwqQZ0jcv88s=", + "pom": "sha256-US0j/znHZmWho2RVJiMLz4ib1JiEME9/6+BHsBjuszk=" }, - "org/junit/jupiter#junit-jupiter-engine/5.10.2": { - "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", - "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", - "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + "org/junit/jupiter#junit-jupiter-engine/5.11.4": { + "jar": "sha256-zfisWfP613TKc4rQOJCVDuuRgz7w6JCHUxd+3SbxWBw=", + "module": "sha256-25EWOorwBaMnmFZd1nU3clGJWQ3qttoDsx292kVoahg=", + "pom": "sha256-sKMjsNA0REQdE9RjC0DbXvhBYNLC9YXU1kbcOIL5kgc=" }, - "org/junit/platform#junit-platform-commons/1.10.2": { - "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", - "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", - "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + "org/junit/platform#junit-platform-commons/1.11.4": { + "jar": "sha256-nt2Wmw0GcMVBBbyRrnm9HG9QPhIRX6uoIHO4TIa7wzQ=", + "module": "sha256-C54mJcj0aLPNQTLMCoBfif5B+FLRrf/3Xz6xRlyhy2s=", + "pom": "sha256-zRLSt8JC8WVUjtnJQGFg3O22CAkltHz3MeD9rl+0vOI=" }, - "org/junit/platform#junit-platform-engine/1.10.2": { - "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", - "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", - "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + "org/junit/platform#junit-platform-engine/1.11.4": { + "jar": "sha256-sd2Zj2T5rK3BWWbZzT0IB0ZiZ3s+OQ8KOPy/C7THIzA=", + "module": "sha256-v2zh+1lR3Gx942re72rq9474LWODHFzOvOOI2p/F/iU=", + "pom": "sha256-lDRxV5mEIS++adA+3sfC/0+6sYiL4LgMJl6nCGn9ir0=" }, - "org/junit/vintage#junit-vintage-engine/5.10.2": { - "jar": "sha256-8fjR0zVyx1DL6bxquBAZryjo3lVdWMQtHQtySLMxV2k=", - "module": "sha256-kMb9QnMc0QoP6c6qolXz/B9IPnFO6b2DtPk8lsgfWVY=", - "pom": "sha256-kw2chGQmBTZYP28ozjHkZL6JJIWu/tWnYIqzZqUYEK4=" + "org/junit/vintage#junit-vintage-engine/5.11.4": { + "jar": "sha256-GSOf9svvS0PlHtVVH68fLxCDSUWWzh3SwydeaYzLwCM=", + "module": "sha256-GgtPk/Nz+mGLq7Fyf3OBnkB7r+deuzL0vhrn7T+xKEk=", + "pom": "sha256-aKMj5gP+G0MtSKiWxX4GBw7GXseYXV973NgHaAY0fEg=" }, "org/mock-server#mockserver-client-java/5.15.0": { "jar": "sha256-LMqrNKNYdlkALhh/PISJAtd8g55OrmxZRp4YUUnvGyY=", @@ -1180,6 +1377,9 @@ "org/mock-server#mockserver/5.15.0": { "pom": "sha256-tlNuOpSx7xwjGfX1Zwc1JL1YtvIh4vK1rLh57Bu5DJA=" }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, "org/mockito#mockito-core/4.11.0": { "jar": "sha256-S5CWkMqyiMdh65TAvw6BRJbPOSHYr/rITNh3dFMDUeU=", "pom": "sha256-K8LjyMizE/2sIx8jgiIlsHgx3ImdBnBy9J1fiuN+c5o=" @@ -1250,6 +1450,11 @@ "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=", "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E=" }, + "org/pcollections#pcollections/4.0.1": { + "jar": "sha256-H4J2bXwyIZMIVAM76/9Qc+pGtD8nMmB0u+FdFIwYv7M=", + "module": "sha256-nr2nwMnbETTTQd/3yK0LxZUyhvvwuZiuyil6HuboCfA=", + "pom": "sha256-+j8pi1AlO5bpz7BvARw7zHj9m0DY3NJZCbygRUlzjHE=" + }, "org/reactivestreams#reactive-streams/1.0.4": { "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" @@ -1257,15 +1462,18 @@ "org/slf4j#slf4j-api/1.6.6": { "pom": "sha256-cxmZMiteIokinNntRiTJQexXG3xh0qJ9alB+9zuXyho=" }, - "org/slf4j#slf4j-api/2.0.7": { - "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", - "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" }, "org/slf4j#slf4j-parent/1.6.6": { "pom": "sha256-QrjCR2CP2OENW2Zs98gKW1nSseEoRQ97bZ0sIM+2sxs=" }, - "org/slf4j#slf4j-parent/2.0.7": { - "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" }, "org/sonatype/oss#oss-parent/5": { "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" @@ -1283,9 +1491,13 @@ "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" }, - "org/tukaani#xz/1.9": { - "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", - "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/tukaani#xz/1.10": { + "jar": "sha256-lcY8GlWyLdZFOJCkGcwaZA95C799iugtseMK7++wiIg=", + "pom": "sha256-72CLg8O7bI4+azvqo4hCuhWWO0ZJXkr5GwdGyLdQ87k=" }, "org/vafer#jdependency/2.8.0": { "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", @@ -1306,9 +1518,9 @@ "jar": "sha256-Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=", "pom": "sha256-6n1I/UUyGmAz2XzSiBhtSOXpLMDHBm5ziNfEzrSvWVc=" }, - "org/zeroturnaround#zt-zip/1.15": { - "jar": "sha256-egIaxh7b4ktfzIM5aWf3BxIE51cLktf0s/mH6Wylu5M=", - "pom": "sha256-ll/F/uIc+Ys81paoijiZqsjRiBsZlfZp+Jmvdtu2C2E=" + "org/zeroturnaround#zt-zip/1.17": { + "jar": "sha256-/sfjPEvqbOQqQn4/vyGjqtM4eCid/QaoSSgs4z5/jeM=", + "pom": "sha256-j8J+s+sJ6kktOw769o6EiI2PWMDdBalCgJEO9CD4cp4=" }, "xmlpull#xmlpull/1.1.3.1": { "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 9938e461bc58..769adc484c43 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -1,6 +1,7 @@ { fetchFromGitHub, gradle_8, + jdk17_headless, jre, lib, makeWrapper, @@ -26,20 +27,15 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.38.2"; + version = "3.4.40.2"; src = fetchFromGitHub { owner = "ATLauncher"; repo = "ATLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-x8ch8BdUckweuwEvsOxYG2M5UmbW4fRjF/jJ6feIjIA="; + hash = "sha256-sV6eWIgx/0e+uUCbbRwAPPqNcFWUQWyuHnzrwcYJkqA="; }; - postPatch = '' - # exclude UI tests - sed -i "/test {/a\ exclude '**/BasicLauncherUiTest.class'" build.gradle - ''; - nativeBuildInputs = [ gradle makeWrapper @@ -55,6 +51,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { gradleBuildTask = "shadowJar"; gradleFlags = [ + "-Dorg.gradle.java.home=${jdk17_headless.home}" "--exclude-task" "createExe" ]; diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch deleted file mode 100644 index f2f9259ebc00..000000000000 --- a/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/apps/desktop/desktop_native/napi/index.js b/apps/desktop/desktop_native/napi/index.js -index acfd0df..31a0c6a 100644 ---- a/apps/desktop/desktop_native/napi/index.js -+++ b/apps/desktop/desktop_native/napi/index.js -@@ -17,6 +17,7 @@ function loadFirstAvailable(localFiles, nodeModule) { - require(nodeModule); - } - -+/* - switch (platform) { - case "android": - switch (arch) { -@@ -121,6 +122,8 @@ switch (platform) { - default: - throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`); - } -+*/ -+nativeBinding = require('./desktop_napi.node') - - if (!nativeBinding) { - if (loadError) { -diff --git a/apps/desktop/desktop_native/napi/package.json b/apps/desktop/desktop_native/napi/package.json -index d557ccf..2e47c79 100644 ---- a/apps/desktop/desktop_native/napi/package.json -+++ b/apps/desktop/desktop_native/napi/package.json -@@ -3,7 +3,7 @@ - "version": "0.1.0", - "description": "", - "scripts": { -- "build": "napi build --platform --js false", -+ "build": "napi build --js false", - "test": "cargo test" - }, - "author": "", -diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json -index 2922035..6497a38 100644 ---- a/apps/desktop/electron-builder.json -+++ b/apps/desktop/electron-builder.json -@@ -18,7 +18,7 @@ - "**/*", - "!**/node_modules/@bitwarden/desktop-napi/**/*", - "**/node_modules/@bitwarden/desktop-napi/index.js", -- "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node" -+ "**/node_modules/@bitwarden/desktop-napi/desktop_napi.node" - ], - "electronVersion": "34.0.0", - "generateUpdatesFilesForAllChannels": true, -@@ -68,7 +68,6 @@ - "CFBundleDevelopmentRegion": "en" - }, - "provisioningProfile": "bitwarden_desktop_developer_id.provisionprofile", -- "singleArchFiles": "node_modules/@bitwarden/desktop-napi/desktop_napi.darwin-*.node", - "extraFiles": [ - { - "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}", diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index b6c4f148fcf8..026db2c1c5a9 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -5,14 +5,13 @@ copyDesktopItems, dart-sass, darwin, - electron_37, + electron_39, fetchFromGitHub, gnome-keyring, jq, llvmPackages_18, makeDesktopItem, makeWrapper, - napi-rs-cli, nix-update-script, nodejs_22, pkg-config, @@ -25,7 +24,7 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_37; + electron = electron_39; # argon2 npm dependency is using `std::basic_string`, which is no longer allowed in LLVM 19 buildNpmPackage' = buildNpmPackage.override { @@ -34,13 +33,13 @@ let in buildNpmPackage' rec { pname = "bitwarden-desktop"; - version = "2025.12.0"; + version = "2025.12.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-i+hLslZ2i94r04vaOzx9e55AR8aXa9sSK8el+Dcp05A="; + hash = "sha256-yER9LDFwTQkOdjB84UhEiWUDE+5Qa2vlRzq1/Qc/soY="; }; patches = [ @@ -53,8 +52,6 @@ buildNpmPackage' rec { ./set-desktop-proxy-path.patch # on linux: don't flip fuses, don't create wrapper script, on darwin: don't try copying safari extensions, don't try re-signing app ./skip-afterpack-and-aftersign.patch - # since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node - ./dont-use-platform-triple.patch ]; postPatch = '' @@ -87,7 +84,7 @@ buildNpmPackage' rec { "--ignore-scripts" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-OT9Ll+F4e/yOJVpay/zwfEHcBqRvSFOM2mtlrJ8E6fs="; + npmDepsHash = "sha256-hczwOG30ad5oaTU7APPrW+a7LmjPch+P4dZSb7B+2eU="; cargoDeps = rustPlatform.fetchCargoVendor { inherit @@ -97,7 +94,7 @@ buildNpmPackage' rec { cargoRoot patches ; - hash = "sha256-rA9zY9TAF6DnsTT3MzU18VeQDm6m25gjZ0rcmnbZb8E="; + hash = "sha256-NaomkYqkRW5ir6DI5t0JqoewN8QZtSibGKW93MwsqPQ="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -111,7 +108,6 @@ buildNpmPackage' rec { dart-sass jq makeWrapper - napi-rs-cli pkg-config rustc rustPlatform.cargoCheckHook @@ -134,6 +130,9 @@ buildNpmPackage' rec { # force our dart-sass executable echo "export const compilerCommand = ['dart-sass'];" > node_modules/sass-embedded/dist/lib/src/compiler-path.js + # needed so that the napi executable actually is usable + patchShebangs apps/desktop/node_modules + pushd apps/desktop/desktop_native/napi npm run build popd diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index 85e799bb6d0a..811748e10e8f 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.20.0"; + version = "5.20.1"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; tag = finalAttrs.version; - hash = "sha256-qxITJjO6Rf9cx4XWRguOlohud8gnMSQDb/qgwv3wA+8="; + hash = "sha256-eQgjEFYEuJXLNB+qeWLeN3ZRmq1lR5qpcFcPgHn8Az8="; }; patches = [ ]; diff --git a/pkgs/by-name/bs/bsh/package.nix b/pkgs/by-name/bs/bsh/package.nix index c235d9323340..37b75963ea4f 100644 --- a/pkgs/by-name/bs/bsh/package.nix +++ b/pkgs/by-name/bs/bsh/package.nix @@ -3,7 +3,7 @@ fetchurl (finalAttrs: { name = "${finalAttrs.pname}-${finalAttrs.version}.jar"; pname = "bsh"; - version = "2.0b5"; - url = "http://www.beanshell.org/bsh-${finalAttrs.version}.jar"; - hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw="; + version = "2.1.1"; + url = "https://github.com/beanshell/beanshell/releases/download/${finalAttrs.version}/bsh-${finalAttrs.version}.jar"; + hash = "sha256-cRksu+Seeiac/LoF3Fy5WcM7myba/NYmbKMoi0YfhqM="; }) diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix index ca5ec3f8a4c4..f75fbd39f49c 100644 --- a/pkgs/by-name/ca/cameradar/package.nix +++ b/pkgs/by-name/ca/cameradar/package.nix @@ -6,18 +6,18 @@ pkg-config, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "cameradar"; - version = "5.0.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "Ullaakut"; repo = "cameradar"; - tag = "v${version}"; - hash = "sha256-nfqgBUgcLjPLdn8hs1q0FLDBHbloeMKETDrv3a5SZq0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cWxclfu0ywmqKnBxsaWWz2sMFExC5Dcrf+rceAhIW2U="; }; - vendorHash = "sha256-AIi57DWMvAKl0PhuwHO/0cHoDKk5e0bJsqHYBka4NiU="; + vendorHash = "sha256-A8SJRky4dQHJoYpOaUBae89kHXwbdA+gnF/p7oRxcYo="; nativeBuildInputs = [ pkg-config ]; @@ -28,8 +28,8 @@ buildGoModule rec { meta = { description = "RTSP stream access tool"; homepage = "https://github.com/Ullaakut/cameradar"; - changelog = "https://github.com/Ullaakut/cameradar/releases/tag/${src.tag}"; + changelog = "https://github.com/Ullaakut/cameradar/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index 6fbcd284d5fb..adb07a71445a 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -13,19 +13,26 @@ cargo-geiger, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-geiger"; version = "0.13.0"; src = fetchFromGitHub { owner = "geiger-rs"; repo = "cargo-geiger"; - tag = "cargo-geiger-${version}"; + tag = "cargo-geiger-${finalAttrs.version}"; hash = "sha256-dZ71WbTKsR6g5UhWuJNfNAAqNNxbTgwL5fsgkm50BaM="; }; cargoHash = "sha256-GgCmUNOwvyTB82Y/ddgJIAb1SpO4mRPjECqCagJ8GmE="; + postPatch = '' + # https://github.com/geiger-rs/cargo-geiger/pull/562 + # Fix unused import warning which is treated as an error + substituteInPlace cargo-geiger/tests/integration_tests.rs \ + --replace-fail "use std::env;" "" + ''; + buildInputs = [ openssl ] @@ -76,7 +83,7 @@ rustPlatform.buildRustPackage rec { code is appropriate. ''; homepage = "https://github.com/geiger-rs/cargo-geiger"; - changelog = "https://github.com/geiger-rs/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md"; + changelog = "https://github.com/geiger-rs/cargo-geiger/blob/cargo-geiger-${finalAttrs.version}/CHANGELOG.md"; mainProgram = "cargo-geiger"; license = with lib.licenses; [ asl20 # or @@ -89,4 +96,4 @@ rustPlatform.buildRustPackage rec { matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock index db75a59c33ba..17ee521dab6d 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock +++ b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock @@ -1,12 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -25,15 +25,15 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "bitflags" -version = "2.9.4" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bstr" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "regex-automata", @@ -42,15 +42,15 @@ dependencies = [ [[package]] name = "camino" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" [[package]] name = "cargo-config2" -version = "0.1.38" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf2da6c8158a7ad35217e3187ac07db64d19719a934ffaf9b7591cda1f31964" +checksum = "3795d3a48839a46854805f56c8fe9c558f10804bcf57df53925ca843d87c788f" dependencies = [ "serde", "serde_derive", @@ -60,7 +60,7 @@ dependencies = [ [[package]] name = "cargo-llvm-cov" -version = "0.6.20" +version = "0.8.1" dependencies = [ "anyhow", "camino", @@ -88,15 +88,15 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "duct" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7478638a31d1f1f3d6c9f5e57c76b906a04ac4879d6fd0fb6245bc88f73fd0b" +checksum = "7e66e9c0c03d094e1a0ba1be130b849034aa80c3a2ab8ee94316bc809f3fa684" dependencies = [ "libc", "os_pipe", @@ -122,21 +122,20 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "filetime" -version = "0.2.26" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" +checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" dependencies = [ "cfg-if", "libc", "libredox", - "windows-sys 0.60.2", ] [[package]] name = "fs-err" -version = "3.1.3" +version = "3.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad492b2cf1d89d568a43508ab24f98501fe03f2f31c01e1d0fe7366a71745d2" +checksum = "baf68cef89750956493a66a10f512b9e58d9db21f2a573c079c0bdf1207a54a7" dependencies = [ "autocfg", ] @@ -149,9 +148,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[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 = "lcov2cobertura" @@ -173,15 +172,15 @@ checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7" [[package]] name = "libc" -version = "0.2.176" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ "bitflags", "libc", @@ -217,30 +216,30 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "opener" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9024962ab91e00c89d2a14352a8d0fc1a64346bf96f1839b45c09149564e47" +checksum = "a2fa337e0cf13357c13ef1dc108df1333eb192f75fc170bea03fcf1fd404c2ee" dependencies = [ "bstr", "normpath", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "os_pipe" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224" +checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] @@ -256,27 +255,27 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.41" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.5.18" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.11.3" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -286,9 +285,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -297,21 +296,21 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "rustc-demangle" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" +checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ "bitflags", "errno", @@ -328,15 +327,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ruzstd" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c" - -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01" [[package]] name = "same-file" @@ -378,22 +371,22 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] name = "serde_spanned" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", ] @@ -422,9 +415,9 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] name = "syn" -version = "2.0.106" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -444,9 +437,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.23.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ "fastrand", "once_cell", @@ -473,9 +466,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.7" +version = "0.9.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0" +checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" dependencies = [ "serde_core", "serde_spanned", @@ -486,27 +479,27 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.2" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] [[package]] name = "toml_parser" -version = "1.0.3" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] [[package]] name = "unicode-ident" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "walkdir" @@ -533,22 +526,13 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -560,22 +544,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - [[package]] name = "windows-targets" version = "0.53.5" @@ -583,106 +551,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - [[package]] name = "windows_aarch64_gnullvm" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - [[package]] name = "windows_aarch64_msvc" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - [[package]] name = "windows_i686_gnu" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - [[package]] name = "windows_i686_gnullvm" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - [[package]] name = "windows_i686_msvc" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - [[package]] name = "windows_x86_64_gnu" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - [[package]] name = "windows_x86_64_gnullvm" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - [[package]] name = "windows_x86_64_msvc" version = "0.53.1" @@ -691,9 +611,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" [[package]] name = "xattr" @@ -704,3 +624,9 @@ dependencies = [ "libc", "rustix", ] + +[[package]] +name = "zmij" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index bed69775d64d..023164ff40d9 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -25,7 +25,7 @@ let pname = "cargo-llvm-cov"; - version = "0.6.20"; + version = "0.8.1"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit owner; repo = "cargo-llvm-cov"; rev = "v${version}"; - sha256 = "sha256-LAiN9Opc0XQVepQ9IhK9JFWGoeRR3U6V680jgGiaDGo="; + sha256 = "sha256-w7UHfb5g8g9AYGbxoUpmiBsFEnSuc/RBEAZAYwoFjRg="; }; # Upstream doesn't include the lockfile so we need to add it back diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index fb2572b1f4fd..52762e875309 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-GQV8Sy7BCkPGYusojZGQtaazTXONdJIZ4B4toO1Lj/w="; + hash = "sha256-WsB+vAWcenZ5px5YdI7JqDXCoOTsk42T0EyqYQMLttQ="; }; - cargoHash = "sha256-fVr5W5xpucqUyKpDcubAh6GkB0roJ548EHgaIzqVJl0="; + cargoHash = "sha256-nbbIj0x5tVavzLR9Z0v+lFQEFrQvyNdAQVtmDGtoMYY="; meta = { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix index c0ba93a21e62..0b6588804313 100644 --- a/pkgs/by-name/ca/cargo-zigbuild/package.nix +++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-zigbuild"; - version = "0.21.1"; + version = "0.21.4"; src = fetchFromGitHub { owner = "messense"; repo = "cargo-zigbuild"; tag = "v${finalAttrs.version}"; - hash = "sha256-1SzwJlYLuOuu1cZgPMjVF0ibgXI7Mcnmj/aaqi83U9s="; + hash = "sha256-ayg5sj0Exjk986syGNyrmc+WWCCpnxUNBB2YMQ+AVwI="; }; - cargoHash = "sha256-6HOls1aoAWDqE6+YyXyIldkck2AXqpIfZKfyhmAtZ4M="; + cargoHash = "sha256-DjvLuOotTL1V+BjtIzZjDuUOvdIcDaufyuCQDKmzpeM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/cg/cgal/package.nix b/pkgs/by-name/cg/cgal/package.nix index f25ddd927790..9c7be9d86df0 100644 --- a/pkgs/by-name/cg/cgal/package.nix +++ b/pkgs/by-name/cg/cgal/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cgal"; - version = "6.1"; + version = "6.1.1"; src = fetchurl { url = "https://github.com/CGAL/cgal/releases/download/v${finalAttrs.version}/CGAL-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-YY2oqLP1vka08KR6Hvs8nmwD1qqw9VMdVtNV0ycB158="; + sha256 = "sha256-UlBpNfcOJH7Sd348ZfIOhveSCMKi0OGArnR12vEclu8="; }; patches = [ ./cgal_path.patch ]; diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 1165899352d9..5feee2664fa6 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -37,14 +37,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.497"; + version = "3.2.499"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-aovAkxEqNYkYczbUvf/Ei2FJVSstk8XdHWnzAq2ydUw="; + hash = "sha256-1jb+ot8m7MS+BvXL7QakBHoViEmk+eORVmlmBJDfAtM="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ch/cheesecutter/1001-cheesecutter-Pin-C-standard-to-C99.patch b/pkgs/by-name/ch/cheesecutter/1001-cheesecutter-Pin-C-standard-to-C99.patch new file mode 100644 index 000000000000..3a7575c7219e --- /dev/null +++ b/pkgs/by-name/ch/cheesecutter/1001-cheesecutter-Pin-C-standard-to-C99.patch @@ -0,0 +1,58 @@ +From 91e2418c37fce511eeaa1d1bb34a0d7a25668d40 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Tue, 20 Jan 2026 15:29:03 +0100 +Subject: [PATCH] Makefile.{dmd,ldc}: Pin C standard to C99 + +Code is definitely not C23-compatible, and I imagine C99 is *prolly* what this was initially targeting. +--- + Makefile.dmd | 4 ++-- + Makefile.ldc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.dmd b/Makefile.dmd +index 24a1d06..7c1b7c2 100644 +--- a/Makefile.dmd ++++ b/Makefile.dmd +@@ -3,7 +3,7 @@ COMFLAGS= + DLINK=$(COMFLAGS) + VERSION=$(shell cat Version) + DFLAGS=$(COMFLAGS) -I./src -J./src/c64 -J./src/font -O +-CFLAGS=$(COMFLAGS) -O1 ++CFLAGS=$(COMFLAGS) -O1 -std=c99 + CXXFLAGS=-I./src -O3 + COMPILE.d = $(DC) $(DFLAGS) -c -of$@ + OUTPUT_OPTION= +@@ -21,7 +21,7 @@ $(TARGET): $(C64OBJS) $(OBJS) $(CXX_OBJS) + $(CXX) $(CXXFLAGS) -c $< -o $@ + + .c.o : $(C_SRCS) +- $(CC) -c $< -o $@ ++ $(CC) $(CFLAGS) -c $< -o $@ + + ct: $(C64OBJS) $(CTOBJS) + +diff --git a/Makefile.ldc b/Makefile.ldc +index b89077a..a6c4714 100644 +--- a/Makefile.ldc ++++ b/Makefile.ldc +@@ -6,7 +6,7 @@ LIBS=-L-ldl -L-lstdc++ + COMFLAGS=-O2 + VERSION=$(shell cat Version) + DFLAGS=$(COMFLAGS) -I./src -J./src/c64 -J./src/font +-CFLAGS=$(COMFLAGS) ++CFLAGS=$(COMFLAGS) -std=c99 + CXXFLAGS=$(COMFLAGS) -I./src + COMPILE.d = $(DC) $(DFLAGS) -c + DC=ldc2 +@@ -28,7 +28,7 @@ ccutter:$(C64OBJS) $(OBJS) $(CXX_OBJS) + $(CXX) $(CXXFLAGS) -c $< -o $@ + + .c.o : $(C_SRCS) +- $(CC) -c $< -o $@ ++ $(CC) $(CFLAGS) -c $< -o $@ + + ct: $(C64OBJS) $(CTOBJS) + +-- +2.51.2 + diff --git a/pkgs/by-name/ch/cheesecutter/package.nix b/pkgs/by-name/ch/cheesecutter/package.nix index 42531867b15c..88b64568da1d 100644 --- a/pkgs/by-name/ch/cheesecutter/package.nix +++ b/pkgs/by-name/ch/cheesecutter/package.nix @@ -9,31 +9,44 @@ }: stdenv.mkDerivation { pname = "cheesecutter"; - version = "unstable-2021-02-27"; + version = "2.9-beta-3-unstable-2021-02-27"; src = fetchFromGitHub { owner = "theyamo"; repo = "CheeseCutter"; rev = "84450d3614b8fb2cabda87033baab7bedd5a5c98"; - sha256 = "sha256:0q4a791nayya6n01l0f4kk497rdq6kiq0n72fqdpwqy138pfwydn"; + hash = "sha256-tnnuLhrBY34bduJYgOM0uOWTyJzEARqANcp7ZUM6imA="; }; patches = [ + # https://github.com/theyamo/CheeseCutter/pull/60 + ./1001-cheesecutter-Pin-C-standard-to-C99.patch + ./0001-Drop-baked-in-build-date-for-r13y.patch ] - ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ./0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch + ]; + + strictDeps = true; nativeBuildInputs = [ acme ldc ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) patchelf; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + patchelf + ]; buildInputs = [ SDL ]; + enableParallelBuilding = true; + makefile = "Makefile.ldc"; installPhase = '' + runHook preInstall + for exe in {ccutter,ct2util}; do install -D $exe $out/bin/$exe done @@ -45,6 +58,8 @@ stdenv.mkDerivation { for res in $(ls icons | sed -e 's/cc//g' -e 's/.png//g'); do install -Dm444 icons/cc$res.png $out/share/icons/hicolor/''${res}x''${res}/apps/cheesecutter.png done + + runHook postInstall ''; postFixup = @@ -71,5 +86,6 @@ stdenv.mkDerivation { "x86_64-darwin" ]; maintainers = with lib.maintainers; [ OPNA2608 ]; + mainProgram = "ccutter"; }; } diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 1fb597f4d9a0..cefe99e1097f 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.160.0"; + version = "0.161.5"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-odD2ap2Z+Wsrz3XIDJrGyxbsrMvZBp3kQJ64LhIpc74="; + hash = "sha256-9mv6bGJDEv4ji4N7YFJYVjvYfRnqR9gsMP/JJ0NhobI="; }; - vendorHash = "sha256-zW0xX4E2Wr/liL2RMGiU1wpwFbeiuex1owWisysHJsc="; + vendorHash = "sha256-X7nziUeOJTMUhEQuF48ghVTuffOmsRtQrE3H4sqrObw="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json new file mode 100644 index 000000000000..ce6494a756e8 --- /dev/null +++ b/pkgs/by-name/cl/claude-code-bin/manifest.json @@ -0,0 +1,34 @@ +{ + "version": "2.1.20", + "buildDate": "2026-01-27T00:41:34Z", + "platforms": { + "darwin-arm64": { + "checksum": "c5703596ed854ae8e5775cf38de5d71d8a56ecfe3f36904812870e9e34178c8c", + "size": 181661168 + }, + "darwin-x64": { + "checksum": "0d38292770c88bd9b13b0684afb0d2dc0028a1437d0c09be3449d2b3d369b045", + "size": 187958208 + }, + "linux-arm64": { + "checksum": "eb8801c7a4a8501b21c235f36674f17328e65e796cf8a6196b3bf9a23ae16f99", + "size": 216047898 + }, + "linux-x64": { + "checksum": "f9d3698f5378a486db2d4eea5c80f95c2ceb410fbcea9ffc5703b5aac9574fcc", + "size": 223852550 + }, + "linux-arm64-musl": { + "checksum": "2a7d24d2b85068c5aca6c014dd5f3f94bd8d55803a06f0d39eea776ab3282d76", + "size": 211311930 + }, + "linux-x64-musl": { + "checksum": "0b392cc1c268f0e48ceedee384535451013f69887a61e23f989e3b743373796a", + "size": 216541126 + }, + "win32-x64": { + "checksum": "12e88d78570b6e979f5cf290652dc45ca8b9327f43bb27e275f87146190bef05", + "size": 233703072 + } + } +} diff --git a/pkgs/by-name/cl/claude-code-bin/package.nix b/pkgs/by-name/cl/claude-code-bin/package.nix new file mode 100644 index 000000000000..d8635c169508 --- /dev/null +++ b/pkgs/by-name/cl/claude-code-bin/package.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenvNoCC, + fetchurl, + installShellFiles, + makeBinaryWrapper, + autoPatchelfHook, + procps, + ripgrep, + bubblewrap, + socat, + versionCheckHook, + writableTmpDirAsHomeHook, +}: +let + stdenv = stdenvNoCC; + baseUrl = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases"; + manifest = lib.importJSON ./manifest.json; + platformKey = "${stdenv.hostPlatform.node.platform}-${stdenv.hostPlatform.node.arch}"; + platformManifestEntry = manifest.platforms.${platformKey}; +in +stdenv.mkDerivation (finalAttrs: { + pname = "claude-code-bin"; + inherit (manifest) version; + + src = fetchurl { + url = "${baseUrl}/${finalAttrs.version}/${platformKey}/claude"; + sha256 = platformManifestEntry.checksum; + }; + + dontUnpack = true; + dontBuild = true; + __noChroot = stdenv.hostPlatform.isDarwin; + # otherwise the bun runtime is executed instead of the binary + dontStrip = true; + + nativeBuildInputs = [ + installShellFiles + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isElf [ autoPatchelfHook ]; + + strictDeps = true; + + installPhase = '' + runHook preInstall + + installBin $src + + wrapProgram $out/bin/claude \ + --set DISABLE_AUTOUPDATER 1 \ + --set USE_BUILTIN_RIPGREP 0 \ + --prefix PATH : ${ + lib.makeBinPath ( + [ + # claude-code uses [node-tree-kill](https://github.com/pkrumins/node-tree-kill) which requires procps's pgrep(darwin) or ps(linux) + procps + # https://code.claude.com/docs/en/troubleshooting#search-and-discovery-issues + ripgrep + ] + # the following packages are required for the sandbox to work (Linux only) + ++ lib.optionals stdenv.hostPlatform.isLinux [ + bubblewrap + socat + ] + ) + } + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster"; + homepage = "https://github.com/anthropics/claude-code"; + downloadPage = "https://claude.com/product/claude-code"; + changelog = "https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "aarch64-linux" + "x86_64-linux" + ]; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + mirkolenz + ]; + mainProgram = "claude"; + }; +}) diff --git a/pkgs/by-name/cl/claude-code-bin/update.sh b/pkgs/by-name/cl/claude-code-bin/update.sh new file mode 100755 index 000000000000..e60893c580f1 --- /dev/null +++ b/pkgs/by-name/cl/claude-code-bin/update.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix +#!nix shell --ignore-environment .#cacert .#curl .#bash --command bash + +set -euo pipefail + +BASE_URL="https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases" + +VERSION=$(curl -fsSL "$BASE_URL/latest") + +curl -fsSL "$BASE_URL/$VERSION/manifest.json" --output pkgs/by-name/cl/claude-code-bin/manifest.json diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index adb3cafb5d2a..c827c4f5e386 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.1.19", + "version": "2.1.20", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.1.19", + "version": "2.1.20", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 1b8c63bcab41..d5bf48971472 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -1,6 +1,6 @@ # NOTE: Use the following command to update the package # ```sh -# nix-shell maintainers/scripts/update.nix --argstr commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])' +# nix-shell maintainers/scripts/update.nix --argstr commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["claude-code-bin"] ["vscode-extensions" "anthropic" "claude-code"]])' # ``` { lib, @@ -15,19 +15,23 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.1.19"; + version = "2.1.20"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-K2fJf1eRAyqmtAvKBzpAtMohQ4B1icwC9yf5zEf52C8="; + hash = "sha256-V2BIqUUJnQpjIsCAAk932L8wp5T74s22q3KgFoxfdDg="; }; - npmDepsHash = "sha256-C8HVKSz1ZQmYNMoLUKk2XUpf5y+Np4nTacCGMVEqO8c="; + npmDepsHash = "sha256-X8j7httM9qMpAPR11oDAWwDpkxZ2bc20y6ruMoStMsQ="; strictDeps = true; postPatch = '' cp ${./package-lock.json} package-lock.json + + # https://github.com/anthropics/claude-code/issues/15195 + substituteInPlace cli.js \ + --replace-fail '#!/bin/sh' '#!/usr/bin/env sh' ''; dontNpmBuild = true; @@ -40,7 +44,7 @@ buildNpmPackage (finalAttrs: { postInstall = '' wrapProgram $out/bin/claude \ --set DISABLE_AUTOUPDATER 1 \ - --set DISABLE_INSTALLATION_CHECKS 1 + --set DISABLE_INSTALLATION_CHECKS 1 \ --unset DEV \ --prefix PATH : ${ lib.makeBinPath ( diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 8250f96302a2..3c54b900168e 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "0.9.22"; + version = "0.9.23"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-bkispptxOoCKon0ZjW+U5M+kjpPDWErr3TpZKPtQxNY="; - aarch64-linux = "sha256-9yRd3982L8fRowpb+Id63CUywe1l5s8/07WmlAGt0Ig="; - x86_64-darwin = "sha256-athL8VXhj/g0FwSV2gt7DdAnrKvQ3hIp3fwxTs3Ucw0="; - aarch64-darwin = "sha256-xcW56Y4WoT86vyA+XG4vZ0HDYGIdMmQ9PYz4b7X7Q/c="; + x86_64-linux = "sha256-QDNfSA9DErES1QrreQyFZpgEv0tgaMao1vsle/jHYbc="; + aarch64-linux = "sha256-3dvzFJsoKhEgmSEqTw7aK466zexUQeTDkE0XqYVYDoY="; + x86_64-darwin = "sha256-N8alWOiEUVGZY3gkTEM8eQ41U+j+leKfUdv26YqBHao="; + aarch64-darwin = "sha256-OgpmcYrIjYdE37X3KC2iCrGKUTrLCRViVsDYsVFYsXU="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 1ee5799587d4..89836ea18f2f 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cnquery"; - version = "12.19.0"; + version = "12.19.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-lFnXkBPokDO/eduWhg/lSqqjRhC8/5tGqkS/RZHhZnU="; + hash = "sha256-9POb9iQrLSLl8pwLg+y1SzjlxYvcGuIJx5o+djsOxIc="; }; subPackages = [ "apps/cnquery" ]; diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index 21d98dcdb240..80b65f53f789 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "cog"; - version = "0.0.46"; + version = "0.0.47"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${version}"; - hash = "sha256-sxZdldloFSWSRfilTuqrpMTJ3LvSLHyt5ifyZyG1Pbk="; + hash = "sha256-gbM/PknM8ZC4BJx2OymLSuQO+DndB3f1Wx0zvep9tn0="; }; - vendorHash = "sha256-GeJPE0UrXWYAG7G6azMYqMdq8b3dDFmJOfEY1JilzcI="; + vendorHash = "sha256-Uf6XwwhWl6dzJJFeDgIoQU0zZ2QFjzEWwv+q9YazTxs="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index e00b7af881a5..e8d12ec77c6e 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.27.3"; + version = "1.27.4"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-uIj74Su2ICB5v/khMgCJXps+HQUT67U6kI06QzNs+nc="; + hash = "sha256-G1WFU7A0ibGsAZfpmIRQN4GR5LBKliMDDLnNnYqo4d8="; }; - vendorHash = "sha256-adrXNMdR20K+DLexLebvjgcQFV9XLqYdHZW5hg/Zk8w="; + vendorHash = "sha256-sjdUjnBMzEfGCVOwuL9Zw/5Lup3yUf5LoBajLOCNteA="; buildInputs = [ systemdLibs ]; diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index ec270b04428b..ce87ec77391a 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -53,7 +53,7 @@ libtiff, libwebp, libxml2, - lua, + lua5_4, util-linux, openexr, openjpeg, @@ -78,7 +78,9 @@ versionCheckHook, gitUpdater, }: - +let + pugixml-shared = pugixml.override { shared = true; }; +in stdenv.mkDerivation rec { version = "5.4.0"; pname = "darktable"; @@ -138,13 +140,13 @@ stdenv.mkDerivation rec { libtiff libwebp libxml2 - lua + lua5_4 openexr openjpeg osm-gps-map pcre2 portmidi - pugixml + pugixml-shared sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index f0dd5f01897f..5820b4ccbdd1 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "dep-scan"; - version = "6.0.0"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; tag = "v${version}"; - hash = "sha256-velhNPw/sfiq+8ZP5jkRU0tAwowcVO/BkSn7KocqLQI="; + hash = "sha256-Drp9DIu4ORNDMqYnCU7CJYpD65RW0da1g4bUIXlPfBA="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/di/dialog/package.nix b/pkgs/by-name/di/dialog/package.nix index 04c7f1936a41..c7568e76d06d 100644 --- a/pkgs/by-name/di/dialog/package.nix +++ b/pkgs/by-name/di/dialog/package.nix @@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicodeSupport; stdenv.mkDerivation (finalAttrs: { pname = "dialog"; - version = "1.3-20231002"; + version = "1.3-20260107"; src = fetchurl { url = "https://invisible-island.net/archives/dialog/dialog-${finalAttrs.version}.tgz"; - hash = "sha256-MVZAqwcZIl1cvKsTBYXAXweR/PBzBypf6UeZaaorgzs="; + hash = "sha256-eLPdGNleUPC+j5ucHnz/4oyb8c3yDVs+8XJ5xNo1xbU="; }; nativeBuildInputs = lib.optionals withLibrary [ diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index 4e6c1d5ac365..8bb791570628 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' wrapProgram $out/bin/dx \ - --prefix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_108 ]} + --suffix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_108 ]} ''; meta = { diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 43fefc03b2a6..8e76815b5976 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -7,17 +7,18 @@ nix, nixos-install, coreutils, + xcp, testers, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "disko"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE="; + hash = "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; @@ -26,17 +27,25 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/bin $out/share/disko cp -r install-cli.nix cli.nix default.nix disk-deactivate lib $out/share/disko - for i in disko disko-install; do + scripts=(disko) + ${lib.optionalString (!stdenvNoCC.isDarwin) '' + scripts+=(disko-install) + ''} + + for i in "''${scripts[@]}"; do sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" chmod 755 "$out/bin/$i" wrapProgram "$out/bin/$i" \ --set DISKO_VERSION "${finalAttrs.version}" \ --prefix PATH : ${ - lib.makeBinPath [ - nix - coreutils - nixos-install - ] + lib.makeBinPath ( + [ + nix + coreutils + xcp + ] + ++ lib.optional (!stdenvNoCC.isDarwin) nixos-install + ) } done runHook postInstall @@ -45,7 +54,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { installCheckPhase = '' runHook preInstallCheck $out/bin/disko --help - $out/bin/disko-install --help + ${lib.optionalString (!stdenvNoCC.isDarwin) '' + $out/bin/disko-install --help + ''} runHook postInstallCheck ''; @@ -60,7 +71,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { mic92 lassulus iFreilicht + Enzime ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index cc636e8c2d0b..d40d83badb2d 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dnscontrol"; - version = "4.31.1"; + version = "4.32.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; tag = "v${finalAttrs.version}"; - hash = "sha256-c0jQF6XGg0jTMqBbTwRA/ZfD/qocCHILoSujeqJ+lp4="; + hash = "sha256-eltk1+h2RN1+rNTX8ZbP9WNBE5MK18JGeY26lsVHeAY="; }; - vendorHash = "sha256-GMzLaV3LQNa4K111P6DLG28KAAgj9AHyPua4XSih14k="; + vendorHash = "sha256-vpomJTbgQnPDESRjpdvWvKwJduCrB4crabF3UdkxDTk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dr/drone-runner-docker/package.nix b/pkgs/by-name/dr/drone-runner-docker/package.nix index 4536607a2f88..f88d2839d7a3 100644 --- a/pkgs/by-name/dr/drone-runner-docker/package.nix +++ b/pkgs/by-name/dr/drone-runner-docker/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "drone-runner-docker"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "drone-runners"; repo = "drone-runner-docker"; tag = "v${version}"; - sha256 = "sha256-xJbmxoyL4Sb6YkkwgysGte44ZBKYHjc5QdYa+b62C/M="; + sha256 = "sha256-17i74U6PfOhvxdTeNrH0tQY/T46PMhRM/ggvE5BB0gY="; }; - vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; + vendorHash = "sha256-7iU7IE3lo8A3TO6LXF5D+/VEOTbfTJzWBFO0dycOSLs="; meta = { maintainers = [ ]; diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix index 57bdf5a9679a..36e7b26ad9bd 100644 --- a/pkgs/by-name/ej/ejsonkms/package.nix +++ b/pkgs/by-name/ej/ejsonkms/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "ejsonkms"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "envato"; repo = "ejsonkms"; rev = "v${version}"; - hash = "sha256-BLOlDvheCwlxYaONGh/foqvWs33ZqGA3n7SkM5LfJKY="; + hash = "sha256-AvOHsmcubKZH9uMwE/iwlC4ORAc9ie0H3Nyq2n+CDCs="; }; vendorHash = "sha256-6C/hZwqB6yqFjfDe+KQAY+ja41v/FVaEmPEUXb0FZTA="; diff --git a/pkgs/by-name/eq/equibop/node-modules.nix b/pkgs/by-name/eq/equibop/node-modules.nix index 1f804de9617a..b8e9d3fb67a0 100644 --- a/pkgs/by-name/eq/equibop/node-modules.nix +++ b/pkgs/by-name/eq/equibop/node-modules.nix @@ -48,7 +48,13 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - outputHash = "sha256-YqUAP11oSxfKifa8QL4VXGCWV5xGG2+vk60f4NdIXIA="; + outputHash = + { + x86_64-linux = "sha256-YqUAP11oSxfKifa8QL4VXGCWV5xGG2+vk60f4NdIXIA="; + aarch64-linux = "sha256-q7adhMY95g5BCcoiCVIwCpnqJAidE4a2cxGOjuE2YDk="; + } + .${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); outputHashAlgo = "sha256"; outputHashMode = "recursive"; } diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index 836ee11bda73..b416735d340e 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -180,6 +180,14 @@ python3Packages.buildPythonApplication (finalAttrs: { # system_profiler is not available in the sandbox "test_tb_parsing" + + # Flaky in the sandbox (even when __darwinAllowLocalNetworking is enabled) + # RuntimeError - Attempted to create a NULL object. + "test_sleep_on_multiple_items" + + # Flaky in the sandbox (even when __darwinAllowLocalNetworking is enabled) + # AssertionError: Expected 2 results, got 0. Errors: {0: "[ring] Couldn't bind socket (error: 1)"} + "test_composed_call_works" ]; disabledTestPaths = [ diff --git a/pkgs/by-name/fa/fakeroot/package.nix b/pkgs/by-name/fa/fakeroot/package.nix index ae9883af71f1..3b42386c05d0 100644 --- a/pkgs/by-name/fa/fakeroot/package.nix +++ b/pkgs/by-name/fa/fakeroot/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.37.1.2"; + version = "1.37.2"; pname = "fakeroot"; src = fetchFromGitLab { @@ -22,30 +22,12 @@ stdenv.mkDerivation (finalAttrs: { repo = "fakeroot"; rev = "upstream/${finalAttrs.version}"; domain = "salsa.debian.org"; - hash = "sha256-2ihdvYRnv2wpZrEikP4hCdshY8Eqarqnw3s9HPb+xKU="; + hash = "sha256-TU/9oltd+2wYums8EEDUhaIVzwPeQvW13laCrJqb5A4="; }; - patches = - lib.optionals stdenv.hostPlatform.isLinux [ - ./einval.patch - - # patches needed for musl libc, borrowed from alpine packaging. - # it is applied regardless of the environment to prevent patchrot - (fetchpatch { - name = "fakeroot-no64.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158"; - sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY="; - }) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # patch needed to fix execution on macos - # TODO: remove when the next release comes out: https://salsa.debian.org/clint/fakeroot/-/merge_requests/34 - (fetchpatch { - name = "fakeroot-fix-macos.patch"; - url = "https://salsa.debian.org/clint/fakeroot/-/merge_requests/34.diff"; - hash = "sha256-D5f1bXUaN2YMD/NTx/WIrqDBx/qNHpfLRcPhbdHYLl8="; - }) - ]; + patches = lib.optionals stdenv.hostPlatform.isLinux [ + ./einval.patch + ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix index 056e31e61b81..51db946d878d 100644 --- a/pkgs/by-name/fa/fastcdr/package.nix +++ b/pkgs/by-name/fa/fastcdr/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-KXQRQieyDPuSmLltf7iOVO4QdsHgaek+x1vneZyEg0E="; + hash = "sha256-gWENB3zqnFll047Jv+GL4k497wrzNaIaVTbXY7feRNQ="; }; patches = [ diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 028dee55152b..f920110891d1 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "8.17.115"; + version = "8.19.39"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-i16jMTbthl+XvL/I6tOqBKBdKyb6wOLYIQeWveR4Oyg="; + hash = "sha256-Po2UKrum4/OIDpnr4jtsm9RODC4ekjE3kzciKtV7Y8k="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fo/fortune/package.nix b/pkgs/by-name/fo/fortune/package.nix index faf4fb964527..b98527cc59bc 100644 --- a/pkgs/by-name/fo/fortune/package.nix +++ b/pkgs/by-name/fo/fortune/package.nix @@ -7,24 +7,31 @@ perl, rinutils, fortune, + libxslt, + docbook-xsl-nons, withOffensive ? false, }: stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.24.0"; + version = "3.26.0"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-${version}/fortune-mod-${version}.tar.xz"; - sha256 = "sha256-Hzh4dyVOleq2H5NyV7QmCfKbmU7wVxUxZVu/w6KsdKw="; + sha256 = "sha256-rE0UhsrJuZkEkQcTa5QQb+mKSurADsY1sUTEN2S//kw="; }; nativeBuildInputs = [ cmake - perl + (perl.withPackages (p: [ + p.PathTiny + p.AppXMLDocBookBuilder + ])) rinutils + libxslt + docbook-xsl-nons ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ # "strfile" must be in PATH for cross-compiling builds. diff --git a/pkgs/by-name/fr/freelens-bin/darwin.nix b/pkgs/by-name/fr/freelens-bin/darwin.nix index 4d1b95906af5..546eeecf1639 100644 --- a/pkgs/by-name/fr/freelens-bin/darwin.nix +++ b/pkgs/by-name/fr/freelens-bin/darwin.nix @@ -3,6 +3,7 @@ pname, version, src, + passthru, meta, undmg, }: @@ -12,6 +13,7 @@ stdenvNoCC.mkDerivation { pname version src + passthru meta ; @@ -23,7 +25,7 @@ stdenvNoCC.mkDerivation { runHook preInstall mkdir -p "$out/Applications" - cp -R "Lens.app" "$out/Applications/Lens.app" + cp -R "Freelens.app" "$out/Applications/Freelens.app" runHook postInstall ''; diff --git a/pkgs/by-name/fr/freelens-bin/linux.nix b/pkgs/by-name/fr/freelens-bin/linux.nix index bb3731be8fb3..758134cbef62 100644 --- a/pkgs/by-name/fr/freelens-bin/linux.nix +++ b/pkgs/by-name/fr/freelens-bin/linux.nix @@ -2,6 +2,7 @@ pname, version, src, + passthru, meta, appimageTools, makeWrapper, @@ -15,6 +16,7 @@ appimageTools.wrapType2 { pname version src + passthru meta ; diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix index 56f6e955226c..b81d7a082d89 100644 --- a/pkgs/by-name/fr/freelens-bin/package.nix +++ b/pkgs/by-name/fr/freelens-bin/package.nix @@ -6,29 +6,33 @@ appimageTools, makeWrapper, undmg, + writeShellScript, + nix-update, + jq, + common-updater-scripts, }: let pname = "freelens-bin"; - version = "1.7.0"; + version = "1.8.0"; sources = { x86_64-linux = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-amd64.AppImage"; - hash = "sha256-VeWTfJf66Cq4ZyR/mO0kzm8wD+Auo1MZvXPYC1Bbf7U="; + hash = "sha256-sgbsGUp/TKQZhPZgMpbIJy7n+BW0UGkp55jFHLO5T8s="; }; aarch64-linux = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage"; - hash = "sha256-KzX9GEaAVRWUYjaj31PVc4OQvFScXsZqZMR+baPADZA="; + hash = "sha256-8yAL+JxxjZ3XZOy+HCH5HfkZYr+84OoekTVcH3s6AsU="; }; x86_64-darwin = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg"; - hash = "sha256-qtfOf14gmH4HAA/UZ86QR1sA75lzXVaoWNb0N+mJWPw="; + hash = "sha256-1htSmQ+p7LMziwroG4aVY7HV1ZoLZ1YBDw2EHI4bh+k="; }; aarch64-darwin = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg"; - hash = "sha256-U6Oj+ip/srVzfyE04rJSZgaAtIt7y0X8nLgHeIvB/So="; + hash = "sha256-JFhzIhqdvcY3ssbKBoKyEcnX65C9OyVfTnGuuZJDAuw="; }; }; @@ -36,6 +40,24 @@ let inherit (sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) url hash; }; + passthru = { + updateScript = writeShellScript "update-freelens-bin" '' + ${lib.getExe nix-update} freelens-bin --override-filename pkgs/by-name/fr/freelens-bin/package.nix + latestVersion=$(nix eval --log-format raw --raw --file default.nix freelens-bin.version) + if [[ "$latestVersion" == "$UPDATE_NIX_OLD_VERSION" ]]; then + exit 0 + fi + systems=$(nix eval --json -f . freelens-bin.meta.platforms | ${lib.getExe jq} --raw-output '.[]') + for system in $systems; do + hash=$(nix store prefetch-file --json $(nix eval --raw -f . freelens-bin.src.url --system "$system") | ${lib.getExe jq} --raw-output .hash) + ${lib.getExe' common-updater-scripts "update-source-version"} freelens-bin $latestVersion $hash --system=$system --ignore-same-version --ignore-same-hash + done + ''; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit src; + }; + meta = { description = "Free IDE for Kubernetes"; longDescription = '' @@ -57,6 +79,7 @@ if stdenv.hostPlatform.isDarwin then pname version src + passthru meta undmg ; @@ -67,6 +90,7 @@ else pname version src + passthru meta appimageTools makeWrapper diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index 641a86727d6f..7edfe42ae493 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.1.88"; + version = "0.1.90"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-aGGLqtvJ/kaGZtbpzLUQ40wPMp+g8+WCxXk9t+fQR7M="; + hash = "sha256-ZJ6T1LUeuuaGu4l5mVUNcmtId3qleP5PE4lY+fGGnaE="; }; - cargoHash = "sha256-67XM9j3dZ+4TKVYsM4mTuKHZcxc4EcvlHjxSNRIz9y0="; + cargoHash = "sha256-tHuesoVUZ5OC9R662T4q0W8deXM/Gzvl0WEpHIltBOM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 419783472703..d8736f85d38f 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -179,11 +179,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "144.0.7559.96"; + version = "144.0.7559.109"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-tPM+bbT3AreOPZdeHfO2ktBXvFGicH1+oz/a2R+MbEE="; + hash = "sha256-O3fFCcSghHor8UaqvUCn/GDqKD+8SCrXT6FEnWh9QUc="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -336,6 +336,7 @@ let homepage = "https://www.google.com/chrome/browser/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ + iedame mdaniels5757 ]; platforms = lib.platforms.darwin ++ [ "x86_64-linux" ]; diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix index c31700e6e8a2..f49c4439ddfd 100644 --- a/pkgs/by-name/gt/gtest/package.nix +++ b/pkgs/by-name/gt/gtest/package.nix @@ -4,6 +4,9 @@ fetchFromGitHub, cmake, ninja, + withAbseil ? false, + abseil-cpp, + re2, # Enable C++17 support # https://github.com/google/googletest/issues/3081 # Projects that require a higher standard can override this package. @@ -47,6 +50,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja + ] + ++ lib.optionals withAbseil [ + abseil-cpp + re2 ]; cmakeFlags = [ @@ -54,7 +61,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (cxx_standard != null) [ "-DCMAKE_CXX_STANDARD=${cxx_standard}" - ]; + ] + ++ lib.optional withAbseil "-DGTEST_HAS_ABSL=ON"; meta = { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index e67ea3f24b74..bea3735b4142 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "harper"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${finalAttrs.version}"; - hash = "sha256-dJd/+9cFT7SVxTg3igJSC3lbOZcVIwjgGtiB+zPVUFU="; + hash = "sha256-Gi9MCwc10aVEjPNNw4nIRwGcQo0uE0Hyd3+RrOaCH4c="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-cc8TR+AJbnmzIBNykw1gh6nkuPZWZ7GsGdq06THlh1s="; + cargoHash = "sha256-a3W2y9VVp6uHknsCwVkNRekQsxgq/IzcZQ+3m2Q3Rhk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/haruna/package.nix b/pkgs/by-name/ha/haruna/package.nix index ade3a41473a5..917e5b56af0d 100644 --- a/pkgs/by-name/ha/haruna/package.nix +++ b/pkgs/by-name/ha/haruna/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "haruna"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${finalAttrs.finalPackage.version}"; - hash = "sha256-FRYsUsZBLXhFCZslQtaD10fd3SqbJ+4TKKShIpuUkQk="; + hash = "sha256-yoYF9R4Z8W7Alw3EL3sfJYndjxCZxTu6fQrCXQzypx8="; domain = "invent.kde.org"; }; diff --git a/pkgs/by-name/hy/hyprshutdown/package.nix b/pkgs/by-name/hy/hyprshutdown/package.nix new file mode 100644 index 000000000000..8f3bb9df54ea --- /dev/null +++ b/pkgs/by-name/hy/hyprshutdown/package.nix @@ -0,0 +1,71 @@ +{ + lib, + gcc15Stdenv, + fetchFromGitHub, + cmake, + pkg-config, + hyprtoolkit, + hyprutils, + pixman, + libdrm, + glaze, + aquamarine, + hyprgraphics, + cairo, + nix-update-script, + testers, +}: + +gcc15Stdenv.mkDerivation (finalAttrs: { + pname = "hyprshutdown"; + version = "0-unstable-2026-01-11"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprshutdown"; + rev = "0c9cec7809a715c5c9a99a585db0b596bfb96a59"; + hash = "sha256-JMpLic41Jw6kDXXMtj6tEYUMu3QQ0Sg/M8EBxmAwapU="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + hyprtoolkit + hyprutils + pixman + libdrm + aquamarine + hyprgraphics + cairo + (glaze.override { enableSSL = false; }) + ]; + + passthru = { + updateScript = nix-update-script { + # TODO: remove when stable release available + extraArgs = [ "--version=branch" ]; + }; + tests = { + help = testers.runCommand { + name = "${finalAttrs.pname}-help-test"; + nativeBuildInputs = [ finalAttrs.finalPackage ]; + script = '' + '${finalAttrs.meta.mainProgram}' --help && touch "$out" + ''; + }; + }; + }; + + meta = { + description = "A graceful shutdown utility for Hyprland"; + homepage = "https://github.com/hyprwm/hyprshutdown"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mithicspirit ]; + teams = [ lib.teams.hyprland ]; + mainProgram = "hyprshutdown"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index 143e1207806a..8dd2a04d0d9f 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "infrastructure-agent"; - version = "1.71.4"; + version = "1.72.0"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = version; - hash = "sha256-GF2Nlmvf4zCnDKuqqv7b4J+YNMtfdh0Zs7RI8JImiKw="; + hash = "sha256-4CKDmdey4a6sSYzz0d2nX72BDFODzyD5PWRfNHGLPuU="; }; vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o="; diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index b76f86ddcbd9..321ba140a1d3 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.70.2"; + version = "0.72.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-D79muCj4L4bhnDwTDkD5Ovr8AWpdcAGznBtvtFX/ktA="; + hash = "sha256-bzIrP6bUxEEgQ+lCKV3jpdyBNMAanCYXiMCr8ypUkUY="; }; - cargoHash = "sha256-1ej1CNvlB6WtRB5BYaaSMSHWKJ3anvJVpJqEL2feQuA="; + cargoHash = "sha256-DP4Qe9bzDkuE36RldYPYNeGrQWVqBewU5GUt8zw3GAA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index a5eb941f4e09..825bfa5f78c3 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -2,21 +2,26 @@ lib, fetchCrate, rustPlatform, + cacert, versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "jsonschema-cli"; - version = "0.38.1"; + version = "0.40.0"; src = fetchCrate { pname = "jsonschema-cli"; inherit (finalAttrs) version; - hash = "sha256-W3pyT5DK8ADkWi7znuTDTq1hjRTOwhg9rSmuGZTX8r0="; + hash = "sha256-giHE1iawz3iahO98C5Wq6QboLX2nTzeK/xhASzzDmAY="; }; - cargoHash = "sha256-C8A+cyNix0Q9OACyyPM3A74jZKNBCGz/622YsZqtY2E="; + cargoHash = "sha256-PhWT0ewOQ1ZUQ8xyCeDTNs96XjFGmk+uzvDSWANDCjo="; + + preCheck = '' + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + ''; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ke/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix index f000a43a06e7..99f123433053 100644 --- a/pkgs/by-name/ke/keycloak/all-plugins.nix +++ b/pkgs/by-name/ke/keycloak/all-plugins.nix @@ -4,15 +4,19 @@ junixsocket-common, junixsocket-native-common, }: - { - scim-for-keycloak = callPackage ./scim-for-keycloak { }; - scim-keycloak-user-storage-spi = callPackage ./scim-keycloak-user-storage-spi { }; + keycloak-2fa-sms-authenticator = callPackage ./keycloak-2fa-sms-authenticator { }; + keycloak-config-cli = callPackage ./keycloak-config-cli { }; keycloak-discord = callPackage ./keycloak-discord { }; + keycloak-enforce-mfa-authenticator = callPackage ./keycloak-enforce-mfa-authenticator { }; keycloak-magic-link = callPackage ./keycloak-magic-link { }; keycloak-metrics-spi = callPackage ./keycloak-metrics-spi { }; - keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth { }; + keycloak-orgs = callPackage ./keycloak-orgs { }; keycloak-remember-me-authenticator = callPackage ./keycloak-remember-me-authenticator { }; + keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth { }; + keycloak-secrets-vault-provider = callPackage ./keycloak-secrets-vault-provider { }; + scim-for-keycloak = callPackage ./scim-for-keycloak { }; + scim-keycloak-user-storage-spi = callPackage ./scim-keycloak-user-storage-spi { }; # junixsocket provides Unix domain socket support for JDBC connections, # which is required for connecting to PostgreSQL via Unix socket. diff --git a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix new file mode 100644 index 000000000000..e456b5f6a83a --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix @@ -0,0 +1,43 @@ +{ + stdenv, + maven, + lib, + fetchFromGitHub, +}: +maven.buildMavenPackage rec { + pname = "keycloak-2fa-sms-authenticator"; + version = "26.4.10"; + + src = fetchFromGitHub { + owner = "netzbegruenung"; + repo = "keycloak-mfa-plugins"; + tag = "v${version}"; + hash = "sha256-J7t/SRfK/LTcW7Y+D6bkHcXK+lKqUYLEqSpNWJUC3kQ="; + }; + + mvnHash = + let + mvnHashes = { + "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI="; + "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro="; + "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs="; + "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A="; + }; + in + mvnHashes.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + installPhase = '' + runHook preInstall + install -Dm644 sms-authenticator/target/netzbegruenung.sms-authenticator-v${version}.jar \ + $out/keycloak-2fa-sms-authenticator.jar + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/netzbegruenung/keycloak-mfa-plugins"; + description = "Keycloak authentication provider for 2FA via SMS"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anish ]; + }; +} diff --git a/pkgs/by-name/ke/keycloak/keycloak-config-cli/default.nix b/pkgs/by-name/ke/keycloak/keycloak-config-cli/default.nix new file mode 100644 index 000000000000..2f9d8e722cba --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-config-cli/default.nix @@ -0,0 +1,37 @@ +{ + maven, + lib, + fetchFromGitHub, +}: +maven.buildMavenPackage rec { + pname = "keycloak-config-cli"; + version = "6.4.0"; + + src = fetchFromGitHub { + owner = "adorsys"; + repo = "keycloak-config-cli"; + tag = "v${version}"; + hash = "sha256-Vg56Dz9U0eAJw+7u90MSZWmMIZttWYGXAwsXZsEfTj8="; + }; + + mvnHash = "sha256-tdh8hRqGXI3zuwy55dC3La9dm2naqeCEZT4qcw37iDI="; + + # Tests use MockServer which needs to bind to a local port + __darwinAllowLocalNetworking = true; + + installPhase = '' + runHook preInstall + install -Dm444 -t "$out" target/keycloak-config-cli.jar + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/adorsys/keycloak-config-cli/"; + description = "Import YAML/JSON-formatted configuration files into Keycloak"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + jefferyoo + anish + ]; + }; +} diff --git a/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix b/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix index 0e85c71c99a7..ec9958e45260 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix @@ -29,7 +29,7 @@ maven.buildMavenPackage rec { installPhase = '' runHook preInstall - install -Dm444 target/keycloak-discord-${version}.jar "$out/keycloak-discord-${version}.jar" + install -Dm444 -t "$out" target/keycloak-discord-${version}.jar runHook postInstall ''; diff --git a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix new file mode 100644 index 000000000000..5a2f0bb9afa7 --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix @@ -0,0 +1,43 @@ +{ + stdenv, + maven, + lib, + fetchFromGitHub, +}: +maven.buildMavenPackage rec { + pname = "keycloak-enforce-mfa-authenticator"; + version = "26.4.10"; + + src = fetchFromGitHub { + owner = "netzbegruenung"; + repo = "keycloak-mfa-plugins"; + tag = "v${version}"; + hash = "sha256-J7t/SRfK/LTcW7Y+D6bkHcXK+lKqUYLEqSpNWJUC3kQ="; + }; + + mvnHash = + let + mvnHashes = { + "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI="; + "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro="; + "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs="; + "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A="; + }; + in + mvnHashes.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + installPhase = '' + runHook preInstall + install -Dm644 enforce-mfa/target/netzbegruenung.enforce-mfa-v${version}.jar \ + $out/keycloak-enforce-mfa-authenticator.jar + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/netzbegruenung/keycloak-mfa-plugins"; + description = "Keycloak authenticator that enforces MFA"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anish ]; + }; +} diff --git a/pkgs/by-name/ke/keycloak/keycloak-orgs/default.nix b/pkgs/by-name/ke/keycloak/keycloak-orgs/default.nix new file mode 100644 index 000000000000..ec8c0962bc64 --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-orgs/default.nix @@ -0,0 +1,34 @@ +{ + maven, + lib, + fetchFromGitHub, +}: +maven.buildMavenPackage rec { + pname = "keycloak-orgs"; + version = "0.126"; + + src = fetchFromGitHub { + owner = "p2-inc"; + repo = "keycloak-orgs"; + tag = "v${version}"; + hash = "sha256-AQvIkmm8YJoNMcN+85OEbBud7YDLAlk5NfC05js1k2Y="; + }; + + mvnHash = "sha256-lq3N0XBRyR9I6U0gvjsjJ9r6fZINSsTWAMvdDEIsT0g="; + + # Tell buildnumber-maven-plugin to use a fallback value because git/.git aren't present + mvnParameters = "-Dmaven.buildNumber.revisionOnScmFailure=v${version} -DskipTests"; + + installPhase = '' + runHook preInstall + install -Dm644 -t "$out" target/keycloak-orgs-${version}.jar + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/p2-inc/keycloak-orgs"; + description = "Multi-tenancy on a single Keycloak realm via first-class organization objects"; + license = lib.licenses.elastic20; + maintainers = with lib.maintainers; [ anish ]; + }; +} diff --git a/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix index 2e02a2c1b1e9..433929ed3801 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix @@ -11,7 +11,7 @@ maven.buildMavenPackage rec { src = fetchFromGitHub { owner = "sventorben"; repo = "keycloak-restrict-client-auth"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-nQ2AwXhSUu5RY/BbxXE2OXgEb7Zf6FfrGP5tfbgAXk8="; }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-secrets-vault-provider/default.nix b/pkgs/by-name/ke/keycloak/keycloak-secrets-vault-provider/default.nix new file mode 100644 index 000000000000..fa1c0f7cbee5 --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-secrets-vault-provider/default.nix @@ -0,0 +1,34 @@ +{ + maven, + lib, + fetchFromGitHub, +}: +maven.buildMavenPackage rec { + pname = "keycloak-secrets-vault-provider"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Nordix"; + repo = "keycloak-secrets-vault-provider"; + tag = "v${version}"; + hash = "sha256-7ttjTm3D+dDiw+00pK4yvDFNCuXFmapPKnOY7vfa2Ac="; + }; + + mvnHash = "sha256-AJwt6JnNAffXzazWI2fIUMp5j/Fm5LRhO31bOUOl7g0="; + + installPhase = '' + runHook preInstall + install -Dm644 -t "$out/keycloak-secrets-vault-provider.jar" target/secrets-provider-${version}.jar + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/Nordix/keycloak-secrets-vault-provider"; + description = "Keycloak Vault SPI provider for OpenBao and HashiCorp Vault"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + krit + anish + ]; + }; +} diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index d435dcd1596c..b830d8b81a18 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -102,6 +102,8 @@ stdenv.mkDerivation (finalAttrs: { nickcao leona anish + krit + jefferyoo ]; }; }) diff --git a/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix b/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix index 2d873fa51f41..0e383a47f89f 100644 --- a/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix +++ b/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix @@ -11,7 +11,7 @@ maven.buildMavenPackage rec { src = fetchFromGitHub { owner = "Captain-P-Goldfish"; repo = "scim-for-keycloak"; - rev = version; + tag = version; hash = "sha256-kHjCVkcD8C0tIaMExDlyQmcWMhypisR1nyG93laB8WU="; }; diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index fbe573bbb8e5..8b238db72df8 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "kitex"; - version = "0.15.4"; + version = "0.16.0"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; tag = "v${finalAttrs.version}"; - hash = "sha256-JZsRT752RV3GGl6us4z0bC58kbkaZIkZHAgZL7gFnIY="; + hash = "sha256-jNrFW7VsKzoKDk0ylF/YU2n3UbpfyVuhYV8dhmEmAA0="; }; - vendorHash = "sha256-pMPt1NC3dAI7EvEOPoGXf/Gex1Vuso5y8jxQh2nBVOI="; + vendorHash = "sha256-xsyfOuovG7LHcRMrtkT02DOp/L96M309QMiPLE24y9k="; subPackages = [ "tool/cmd/kitex" ]; diff --git a/pkgs/by-name/kr/kryoptic/cargo-lock.patch b/pkgs/by-name/kr/kryoptic/0001-Add-Cargo.lock.patch similarity index 82% rename from pkgs/by-name/kr/kryoptic/cargo-lock.patch rename to pkgs/by-name/kr/kryoptic/0001-Add-Cargo.lock.patch index 54265aa2955d..4cfd9a099ca2 100644 --- a/pkgs/by-name/kr/kryoptic/cargo-lock.patch +++ b/pkgs/by-name/kr/kryoptic/0001-Add-Cargo.lock.patch @@ -1,19 +1,19 @@ -From 5386104b9b4bffa044587a9ab573c8ed24a0bab2 Mon Sep 17 00:00:00 2001 +From 9c18bc06ee221eaf53d6cf9ffc58a8dacb001e47 Mon Sep 17 00:00:00 2001 From: Morgan Jones -Date: Mon, 10 Nov 2025 23:25:00 -0800 +Date: Sun, 25 Jan 2026 16:48:38 -0800 Subject: [PATCH] Add Cargo.lock --- - Cargo.lock | 1089 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 1089 insertions(+) + Cargo.lock | 1049 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 1049 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..a4a3c6e +index 0000000..d137ab5 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1089 @@ +@@ -0,0 +1,1049 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 @@ -112,15 +112,15 @@ index 0000000..a4a3c6e + +[[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 = "cc" -+version = "1.2.45" ++version = "1.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" ++checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583" +dependencies = [ + "find-msvc-tools", + "shlex", @@ -154,9 +154,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "clap" -+version = "4.5.51" ++version = "4.5.54" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" ++checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" +dependencies = [ + "clap_builder", + "clap_derive", @@ -164,9 +164,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "clap_builder" -+version = "4.5.51" ++version = "4.5.54" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" ++checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" +dependencies = [ + "anstyle", + "clap_lex", @@ -186,9 +186,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "clap_lex" -+version = "0.7.6" ++version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" ++checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" + +[[package]] +name = "constant_time_eq" @@ -221,9 +221,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "data-encoding" -+version = "2.9.0" ++version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" ++checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" + +[[package]] +name = "deranged" @@ -254,34 +254,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "find-msvc-tools" -+version = "0.1.4" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" -+ -+[[package]] -+name = "futures" -+version = "0.3.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-io", -+ "futures-sink", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-channel" -+version = "0.3.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -+dependencies = [ -+ "futures-core", -+ "futures-sink", -+] ++checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" + +[[package]] +name = "futures-core" @@ -301,18 +276,6 @@ index 0000000..a4a3c6e +] + +[[package]] -+name = "futures-io" -+version = "0.3.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -+ -+[[package]] -+name = "futures-sink" -+version = "0.3.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" -+ -+[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -324,12 +287,8 @@ index 0000000..a4a3c6e +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ -+ "futures-channel", + "futures-core", -+ "futures-io", -+ "futures-sink", + "futures-task", -+ "memchr", + "pin-project-lite", + "pin-utils", + "slab", @@ -403,15 +362,15 @@ index 0000000..a4a3c6e + +[[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.85" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" ++checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" +dependencies = [ + "once_cell", + "wasm-bindgen", @@ -419,7 +378,7 @@ index 0000000..a4a3c6e + +[[package]] +name = "kryoptic" -+version = "1.3.1" ++version = "1.4.0" +dependencies = [ + "kryoptic-lib", + "ossl", @@ -427,7 +386,7 @@ index 0000000..a4a3c6e + +[[package]] +name = "kryoptic-lib" -+version = "1.3.1" ++version = "1.4.0" +dependencies = [ + "asn1", + "bimap", @@ -454,7 +413,7 @@ index 0000000..a4a3c6e + +[[package]] +name = "kryoptic-tools" -+version = "1.3.1" ++version = "1.4.0" +dependencies = [ + "clap", + "cryptoki", @@ -468,9 +427,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "libc" -+version = "0.2.177" ++version = "0.2.180" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" ++checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" + +[[package]] +name = "libloading" @@ -504,9 +463,9 @@ index 0000000..a4a3c6e + +[[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 = "memchr" @@ -542,9 +501,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "num-conv" -+version = "0.1.0" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" + +[[package]] +name = "num-integer" @@ -572,7 +531,7 @@ index 0000000..a4a3c6e + +[[package]] +name = "ossl" -+version = "1.3.1" ++version = "1.4.0" +dependencies = [ + "bindgen", + "cfg-if", @@ -650,18 +609,18 @@ index 0000000..a4a3c6e + +[[package]] +name = "proc-macro2" -+version = "1.0.103" ++version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" ++checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" -+version = "0.38.3" ++version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89" ++checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" +dependencies = [ + "memchr", + "serde", @@ -669,9 +628,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "quote" -+version = "1.0.42" ++version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" ++checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +dependencies = [ + "proc-macro2", +] @@ -747,12 +706,6 @@ index 0000000..a4a3c6e +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] -+name = "ryu" -+version = "1.0.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" -+ -+[[package]] +name = "scc" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -814,33 +767,34 @@ index 0000000..a4a3c6e + +[[package]] +name = "serde_json" -+version = "1.0.145" ++version = "1.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" ++checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +dependencies = [ + "itoa", + "memchr", -+ "ryu", + "serde", + "serde_core", ++ "zmij", +] + +[[package]] +name = "serde_spanned" -+version = "1.0.3" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" ++checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serial_test" -+version = "3.2.0" ++version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" ++checksum = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555" +dependencies = [ -+ "futures", ++ "futures-executor", ++ "futures-util", + "log", + "once_cell", + "parking_lot", @@ -850,9 +804,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "serial_test_derive" -+version = "3.2.0" ++version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" ++checksum = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83" +dependencies = [ + "proc-macro2", + "quote", @@ -889,9 +843,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "syn" -+version = "2.0.110" ++version = "2.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" ++checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +dependencies = [ + "proc-macro2", + "quote", @@ -900,30 +854,30 @@ index 0000000..a4a3c6e + +[[package]] +name = "time" -+version = "0.3.44" ++version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" ++checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", -+ "serde", ++ "serde_core", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" -+version = "0.1.6" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" ++checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" + +[[package]] +name = "time-macros" -+version = "0.2.24" ++version = "0.2.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" ++checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4" +dependencies = [ + "num-conv", + "time-core", @@ -931,9 +885,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "toml" -+version = "0.9.8" ++version = "0.9.11+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" ++checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" +dependencies = [ + "serde_core", + "serde_spanned", @@ -945,27 +899,27 @@ index 0000000..a4a3c6e + +[[package]] +name = "toml_datetime" -+version = "0.7.3" ++version = "0.7.5+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" ++checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_parser" -+version = "1.0.4" ++version = "1.0.6+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" ++checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +dependencies = [ + "winnow", +] + +[[package]] +name = "toml_writer" -+version = "1.0.4" ++version = "1.0.6+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" ++checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" + +[[package]] +name = "unicode-ident" @@ -975,9 +929,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "uuid" -+version = "1.18.1" ++version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" ++checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" +dependencies = [ + "getrandom", + "js-sys", @@ -1008,18 +962,18 @@ index 0000000..a4a3c6e + +[[package]] +name = "wasip2" -+version = "1.0.1+wasi-0.2.4" ++version = "1.0.2+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" ++checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" -+version = "0.2.105" ++version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" ++checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" +dependencies = [ + "cfg-if", + "once_cell", @@ -1030,9 +984,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.105" ++version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" ++checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", @@ -1040,9 +994,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.105" ++version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" ++checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" +dependencies = [ + "bumpalo", + "proc-macro2", @@ -1053,9 +1007,9 @@ index 0000000..a4a3c6e + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.105" ++version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" ++checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" +dependencies = [ + "unicode-ident", +] @@ -1068,30 +1022,30 @@ index 0000000..a4a3c6e + +[[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" + +[[package]] +name = "wit-bindgen" -+version = "0.46.0" ++version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" ++checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" + +[[package]] +name = "zerocopy" -+version = "0.8.27" ++version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" ++checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" -+version = "0.8.27" ++version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" ++checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" +dependencies = [ + "proc-macro2", + "quote", @@ -1103,6 +1057,12 @@ index 0000000..a4a3c6e +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" ++ ++[[package]] ++name = "zmij" ++version = "1.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" -- 2.50.1 diff --git a/pkgs/by-name/kr/kryoptic/package.nix b/pkgs/by-name/kr/kryoptic/package.nix index b18fc723e570..c3d23ad99f7e 100644 --- a/pkgs/by-name/kr/kryoptic/package.nix +++ b/pkgs/by-name/kr/kryoptic/package.nix @@ -1,5 +1,7 @@ { lib, + stdenv, + fetchpatch, rustPlatform, fetchFromGitHub, nix-update-script, @@ -8,35 +10,32 @@ openssl, pkg-config, sqlite, - fips ? false, + withPostQuantum ? true, }: rustPlatform.buildRustPackage (finalPackage: { pname = "kryoptic"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "latchset"; repo = "kryoptic"; tag = "v${finalPackage.version}"; - hash = "sha256-EzWZQLAtO7ZR28aOSfwXQOyHbL8Ss75dCxVnPkJIEbw="; + hash = "sha256-tP2BZkGCZqfLNLZ/mYAVkICWKTM1EbL7lbw+Mnx4VTk="; }; - postPatch = - let - # Creates an -I command line for overriding an include. - inc = name: ''format!("-I{}", env!("${name}_INCLUDE")).as_str()''; - fipsArgs = lib.optionalString fips ''"-D_KRYOPTIC_FIPS"''; - in - '' - substituteInPlace ossl/build.rs \ - --replace-fail 'ossl_bindings(&["-std=c90"], out_file)' 'ossl_bindings(&["-std=c90", ${inc "OPENSSL"}, ${inc "LIBC"}, ${fipsArgs}], out_file)' - ''; + patches = [ + # Support additional arguments for bindgen so it can find our glibc. + # https://github.com/latchset/kryoptic/pull/386 + (fetchpatch { + url = "https://github.com/latchset/kryoptic/commit/54b3deeb4eb84ebd7c5b52ccb9401e319fb00294.patch"; + hash = "sha256-QChVS/MnsGp6To4OWYA8Se6kgRCGABchLLnSHfrEj1E="; + }) + ]; env = { # Pass these include paths for bindgen in via the environment. - OPENSSL_INCLUDE = "${lib.getInclude openssl}/include"; - LIBC_INCLUDE = "${lib.getInclude glibc}/include"; + OSSL_BINDGEN_CLANG_ARGS = "-I${lib.getInclude glibc}/include"; LIBCLANG_PATH = "${lib.getLib clang.cc}/lib"; }; @@ -47,24 +46,28 @@ rustPlatform.buildRustPackage (finalPackage: { sqlite ]; - cargoPatches = [ ./cargo-lock.patch ]; + cargoPatches = [ + ./0001-Add-Cargo.lock.patch + ]; - cargoHash = "sha256-NWtL1ZzxGqTn8SS4XitOYJvGRYA/j52f14oul4ZPoyw="; + cargoHash = "sha256-eekiW9HCKwx7/y2WSqQH6adgAeAnQojM3QcNTc3kx2I="; cargoBuildFlags = [ "--no-default-features" "--features=${ lib.concatStringsSep "," ( [ - (if fips then "fips" else "standard") - "dynamic" # dynamic linking + "standard" "sqlitedb" "nssdb" "log" ] - ++ lib.optionals (!fips) [ + ++ lib.optionals withPostQuantum [ "pqc" # post-quantum ] + ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ + "dynamic" + ] ) }" ]; diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index b176c8e7cd50..3522f8176624 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -31,17 +31,18 @@ libtommath, sdl3, icu78, + simdjson, }: stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2026-01-11"; + version = "0-unstable-2026-01-27"; src = fetchFromGitHub { owner = "LadybirdBrowser"; repo = "ladybird"; - rev = "7814b497850ce131dfbfff8bd48836c121c2b237"; - hash = "sha256-MMIk1FF9GB4pPNDdeSAGMjqqbVybn67EVtzcEOVbRIg="; + rev = "6b9797f480509b29afae4a88bc5931221ac7e7fe"; + hash = "sha256-wqY7bG2Y5QNAeOMccvKbf8QFU7u6iRs2bGcDDe5K8cQ="; }; postPatch = '' @@ -113,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: { })) woff2 icu78 + simdjson ] ++ lib.optional stdenv.hostPlatform.isLinux [ libpulseaudio.dev diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index ba0f5327c33a..37e5dc59cae3 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -8,7 +8,7 @@ let pname = "lefthook"; - version = "2.0.15"; + version = "2.0.16"; in buildGoModule { inherit pname version; @@ -17,10 +17,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-HBVBH3F6EGLaB2FRgkhdwR9+E9PlthxEs/kckUZJosA="; + hash = "sha256-i2mbX7Zx0L+F1vTxGSgXY528eXoJVXkifKlZfxBRDXU="; }; - vendorHash = "sha256-fIPvoR/uRI3q/yOl1qS2pE4JdCPc4RC4DEy8LT7Xrs0="; + vendorHash = "sha256-azhyyp9vsO6DrYVHRC/NKLMoE2AIXV+su1Vh8/xHtrY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/liboprf/package.nix b/pkgs/by-name/li/liboprf/package.nix index 30e0c77c65c6..77a71b083359 100644 --- a/pkgs/by-name/li/liboprf/package.nix +++ b/pkgs/by-name/li/liboprf/package.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized"; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/li/libresplit/package.nix b/pkgs/by-name/li/libresplit/package.nix index bdf1979ea092..04d760855786 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-2026-01-09"; + version = "0-unstable-2026-01-22"; src = fetchFromGitHub { owner = "LibreSplit"; repo = "LibreSplit"; - rev = "5cce8434645c249b2a8bfc4bcf10ce8766df9fe6"; - hash = "sha256-nn6EmsG0RqpljylX4lAXDJC1JTWzzMDVCT+ObhVl5E4="; + rev = "be1ae0ea476846bb7e296613f471ba8803b1d7ff"; + hash = "sha256-9BzzpKun8c9TFzwHHbGxFK6ThfVHRMUUqjwRiS+Lfks="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libxvmc/package.nix b/pkgs/by-name/li/libxvmc/package.nix index 59ab561a47df..7ce4d196f44b 100644 --- a/pkgs/by-name/li/libxvmc/package.nix +++ b/pkgs/by-name/li/libxvmc/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxvmc"; - version = "1.0.14"; + version = "1.0.15"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXvMC-${finalAttrs.version}.tar.xz"; - hash = "sha256-5L6etra6/bv4H0f3FjBHIVN25F4tx4bQ6mGByTByXtk="; + hash = "sha256-T1GK/ePX/UNTRq97No0vc1F/PV+CZHyWLK8/e7j/cHg="; }; strictDeps = true; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index cd6816ddcf9b..059b3da0ec0b 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -27,6 +27,10 @@ ], blas, + fetchNpmDeps, + nodejs, + npmHooks, + pkg-config, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport, vulkanSupport ? false, @@ -88,10 +92,18 @@ effectiveStdenv.mkDerivation (finalAttrs: { ''; }; + patches = [ ]; + + postPatch = '' + rm tools/server/public/index.html.gz + ''; + nativeBuildInputs = [ cmake installShellFiles ninja + nodejs + npmHooks.npmConfigHook pkg-config ] ++ optionals cudaSupport [ @@ -107,8 +119,22 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ optionals vulkanSupport vulkanBuildInputs ++ [ openssl ]; + npmRoot = "tools/server/webui"; + npmDepsHash = "sha256-m1boNqwMELdpHbV/jYK3hpf2vP1S/KSAf32wVKQGyFo="; + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src patches; + preBuild = '' + pushd ${finalAttrs.npmRoot} + ''; + hash = finalAttrs.npmDepsHash; + }; + preConfigure = '' prependToVar cmakeFlags "-DLLAMA_BUILD_COMMIT:STRING=$(cat COMMIT)" + pushd ${finalAttrs.npmRoot} + npm run build + popd ''; cmakeFlags = [ diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index c2a80b042118..fb20f684f368 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "26.1.13"; + version = "26.1.27"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-1+56xdfrRpjhb536vC8kwZ+fyGpQ38wPH7clkApIOUs="; + hash = "sha256-Y6l0BX/pW+YWxzW75C0ssBW6rieQx2G1FiYQ868ZnQs="; }; - cargoHash = "sha256-JCWBG8jt8IxMaUfZaC+YnDfYSmpH/Jm1sqvEcHI8aA0="; + cargoHash = "sha256-ebq/OOO8ItHx7ayWaeZoqjE1qquVFxuNiL6lMMKy5iI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index a67682ed5f74..8f6067cf516f 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "26.1.13"; + version = "26.1.27"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-1+56xdfrRpjhb536vC8kwZ+fyGpQ38wPH7clkApIOUs="; + hash = "sha256-Y6l0BX/pW+YWxzW75C0ssBW6rieQx2G1FiYQ868ZnQs="; }; - cargoHash = "sha256-JCWBG8jt8IxMaUfZaC+YnDfYSmpH/Jm1sqvEcHI8aA0="; + cargoHash = "sha256-ebq/OOO8ItHx7ayWaeZoqjE1qquVFxuNiL6lMMKy5iI="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index be37edf31f4b..854f3a25b184 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -9,11 +9,11 @@ }: let pname = "LycheeSlicer"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-coPzvcF+kQVkETiKc3AY9tuPvh4vm45LSXi5UCbL9GI="; + hash = "sha256-jxZ7jtIkf3olC6nZYW6X2v88qSSUT4v4kCWfuekbeMI="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix index 65b9292569c0..d41778ef3915 100644 --- a/pkgs/by-name/ma/makemkv/package.nix +++ b/pkgs/by-name/ma/makemkv/package.nix @@ -26,19 +26,19 @@ stdenv.mkDerivation ( "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - hash = "sha256-v8THzrwPAEl2cf/Vbmo08HcKnmr37/LwEn76FD8oY24="; + hash = "sha256-we5yCukbJ2p8ib6GEUbFuTRjGDHo1sj0U0BkNXJOkr0="; }; srcs.oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - hash = "sha256-uUl/VVXCV/XTx/GLarA8dM/z6kQ36ANJ1hjRFb9fpEU="; + hash = "sha256-vIuwhK46q81QPVu5PvwnPgRuT9RmPTmpg2zgwEf+6CM="; }; in { pname = "makemkv"; - version = "1.18.2"; + version = "1.18.3"; srcs = lib.attrValues finalAttrs.passthru.srcs; sourceRoot = "makemkv-oss-${version}"; diff --git a/pkgs/by-name/ma/managarr/package.nix b/pkgs/by-name/ma/managarr/package.nix index c4159101561b..72126aa74180 100644 --- a/pkgs/by-name/ma/managarr/package.nix +++ b/pkgs/by-name/ma/managarr/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "managarr"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Dark-Alex-17"; repo = "managarr"; tag = "v${version}"; - hash = "sha256-RBJ4Z5WTArQ/fG3Bv6wHAPJzRJNrIGTNphPYjV8Ocqc="; + hash = "sha256-6aqJxnhc1eXqJIuX07aKSEooNeVwnq8ic7yZnJaokR8="; }; - cargoHash = "sha256-om4zGqh4bEgQZ+G2/MVGi9SCbopLdZ2K8hjIPIefiSQ="; + cargoHash = "sha256-BdgJVByyJ7Nq8gjPXxSaeQQYVQRM/leTd9AxWd7IpDw="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index 864f7c317fda..6f0216eae4f8 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -14,13 +14,13 @@ let pname = "mangayomi"; - version = "0.6.85"; + version = "0.7.0"; src = fetchFromGitHub { owner = "kodjodevf"; repo = "mangayomi"; tag = "v${version}"; - hash = "sha256-Zy4B0nl9R/LmXj/DUI4v98GbSUu8YWGOO0GCXpRHtBA="; + hash = "sha256-NcM0saSuNlxw16+MIT5o/DLRhV5+PbNBb2HnbRpYl/o="; }; metaCommon = { diff --git a/pkgs/by-name/ma/mangayomi/pubspec.lock.json b/pkgs/by-name/ma/mangayomi/pubspec.lock.json index 352b598c7306..7e5f5149d1aa 100644 --- a/pkgs/by-name/ma/mangayomi/pubspec.lock.json +++ b/pkgs/by-name/ma/mangayomi/pubspec.lock.json @@ -30,16 +30,6 @@ "source": "hosted", "version": "0.1.10" }, - "analyzer_plugin": { - "dependency": "transitive", - "description": { - "name": "analyzer_plugin", - "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.4" - }, "antlr4": { "dependency": "transitive", "description": { @@ -390,35 +380,15 @@ "source": "hosted", "version": "1.0.8" }, - "custom_lint_core": { - "dependency": "transitive", - "description": { - "name": "custom_lint_core", - "sha256": "cc4684d22ca05bf0a4a51127e19a8aea576b42079ed2bc9e956f11aaebe35dd1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.0" - }, - "custom_lint_visitor": { - "dependency": "transitive", - "description": { - "name": "custom_lint_visitor", - "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0+7.7.0" - }, "d4rt": { "dependency": "direct main", "description": { "name": "d4rt", - "sha256": "03d99e97cc893e312d568c657e9fe1034a0941f14043388a578e28500d1a31fb", + "sha256": "eff6a10f31e9e5b60b99146a33204c5f2d74e20ac3eeb14132d8a8ed0921c6e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.8" + "version": "0.1.9" }, "dart_style": { "dependency": "transitive", @@ -576,11 +546,11 @@ "dependency": "direct main", "description": { "name": "ffigen", - "sha256": "2bd9a420ca42cb5ce8cff5d80f88547b547a042ae26807704b1698714e4464a2", + "sha256": "b7803707faeec4ce3c1b0c2274906504b796e3b70ad573577e72333bd1c9b3ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "19.1.0" + "version": "20.1.1" }, "file": { "dependency": "transitive", @@ -596,11 +566,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200", + "sha256": "d974b6ba2606371ac71dd94254beefb6fa81185bde0b59bdc1df09885da85fde", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.3.7" + "version": "10.3.8" }, "fixnum": { "dependency": "transitive", @@ -790,11 +760,11 @@ "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "9e2d6907f12cc7d23a846847615941bddee8709bf2bfd274acdf5e80bcf22fde", + "sha256": "38ec6c303e2c83ee84512f5fc2a82ae311531021938e63d7137eccc107bf3c02", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.1.0" }, "flutter_rust_bridge": { "dependency": "direct main", @@ -893,21 +863,21 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "c92d18e1fe994cb06d48aa786c46b142a5633067e8297cff6b5a3ac742620104", + "sha256": "eff94d2a6fc79fa8b811dde79c7549808c2346037ee107a1121b4a644c745f2a", "url": "https://pub.dev" }, "source": "hosted", - "version": "17.0.0" + "version": "17.0.1" }, "google_fonts": { "dependency": "direct main", "description": { "name": "google_fonts", - "sha256": "517b20870220c48752eafa0ba1a797a092fb22df0d89535fd9991e86ee2cdd9c", + "sha256": "eefe5ee217f331627d8bbcf01f91b21c730bf66e225d6dc8a148370b0819168d", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "7.0.0" }, "graphs": { "dependency": "transitive", @@ -1722,41 +1692,41 @@ "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "c406de02bff19d920b832bddfb8283548bfa05ce41c59afba57ce643e116aa59", + "sha256": "16ff608d21e8ea64364f2b7c049c94a02ab81668f78845862b6e88b71dd4935a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.1.0" }, "riverpod_analyzer_utils": { "dependency": "transitive", "description": { "name": "riverpod_analyzer_utils", - "sha256": "a0f68adb078b790faa3c655110a017f9a7b7b079a57bbd40f540e80dce5fcd29", + "sha256": "947b05d04c52a546a2ac6b19ef2a54b08520ff6bdf9f23d67957a4c8df1c3bc0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0-dev.7" + "version": "1.0.0-dev.8" }, "riverpod_annotation": { "dependency": "direct main", "description": { "name": "riverpod_annotation", - "sha256": "7230014155777fc31ba3351bc2cb5a3b5717b11bfafe52b1553cb47d385f8897", + "sha256": "cc1474bc2df55ec3c1da1989d139dcef22cd5e2bd78da382e867a69a8eca2e46", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "4.0.0" }, "riverpod_generator": { "dependency": "direct dev", "description": { "name": "riverpod_generator", - "sha256": "49894543a42cf7a9954fc4e7366b6d3cb2e6ec0fa07775f660afcdd92d097702", + "sha256": "e43b1537229cc8f487f09b0c20d15dba840acbadcf5fc6dad7ad5e8ab75950dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "4.0.0+1" }, "rust_lib_mangayomi": { "dependency": "direct main", @@ -2505,7 +2475,7 @@ } }, "sdks": { - "dart": ">=3.10.1 <4.0.0", + "dart": ">=3.10.4 <4.0.0", "flutter": ">=3.38.1" } } diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 2fa622434d97..cbfa8c5fd298 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "5.4.7"; + version = "5.4.8"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-Rbzuji46o6n8gaGqj8TDzLEBU9Eq754rnzkRxF6iir4="; + hash = "sha256-LMgFCoMxLR9Diz0Fqke6J4aQy7cuEN1e7Umpo0/H0Bo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix index 41e801aaa920..f3ace7125452 100644 --- a/pkgs/by-name/me/mediainfo/package.nix +++ b/pkgs/by-name/me/mediainfo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "25.09"; + version = "25.10"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-jUug2L19QJf9CjiNQTHeQMNaxdvlKkdgt52PHSnvLmM="; + hash = "sha256-NmsyUQGrGppO55+9uOPdnni8wKIcD5sZZjE6rtPTNQI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index b3e8cfc880d0..22abda087c41 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.34.0"; + version = "1.34.1"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-+YN00NdihRpv3XklZJArkQnK91fOCci+fqHCiW4qVj4="; + hash = "sha256-1wNaf36z4CIyhyhNOLZbKSSSIRjhTRB84hdkgtHU7rA="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-/3uIT8V9FRYqeJeW4UvWbakoG7fdkGk/RN4TUQKzoqo="; + cargoHash = "sha256-8o4q2K93geIs3Ru7yUFShqCqELchVb0N2p4qEle6wss="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/me/meshtasticd/package.nix b/pkgs/by-name/me/meshtasticd/package.nix index 0c72b014b9d0..7a9ec6d4a12a 100644 --- a/pkgs/by-name/me/meshtasticd/package.nix +++ b/pkgs/by-name/me/meshtasticd/package.nix @@ -36,11 +36,11 @@ assert builtins.isBool enableDefaultConfig; let - version = "2.7.16.a597230"; + version = "2.7.18.fb3bf78"; platformio-deps-native = fetchzip { url = "https://github.com/meshtastic/firmware/releases/download/v${version}/platformio-deps-native-tft-${version}.zip"; - hash = "sha256-Jo7e6zsCaiJs6NyIRmD6BWJFwbs0xVlUih206ePUpwk="; + hash = "sha256-rud8F+aYVljNw2rpApIkjuN8ob/ZxvcXNJ+oAVSeMpE="; }; in stdenv.mkDerivation (finalAttrs: { @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "meshtastic"; repo = "firmware"; - hash = "sha256-oU3Z8qjBNeNGPGT74VStAPHgsGqsQJKngHJR6m2CBa0="; + hash = "sha256-RI1U0xZDy22C+YO5gKbxo5YWDzVeRWJ8u6tTyDdwqGU="; tag = "v${finalAttrs.version}"; fetchSubmodules = true; }; @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 bin/org.meshtastic.meshtasticd.svg -t $out/share/icons/hicolor/scalable/apps/ install -Dm644 bin/org.meshtastic.meshtasticd.desktop -t $out/share/applications/ - install -Dm755 .pio/build/native-tft/program $out/bin/meshtasticd + install -Dm755 .pio/build/native-tft/meshtasticd -t $out/bin install -Dm644 bin/99-meshtasticd-udev.rules -t $out/etc/udev/rules.d '' diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 46998dea7046..5a598c6cec74 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.14.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-WPjhDj9Qlu38gWIX9ExwfL+OLoW8+RJZwKo1gfvUKn8="; + hash = "sha256-b9Qmst+TXGGTx1k/TnDs4m1nL8aTgNYRCreNLXHCd3I="; }; - cargoHash = "sha256-Wvlw0djiQTT/JTWdnNivbpvFVOelWdCSHT3fxy2cdwE="; + cargoHash = "sha256-Mpu4Cg3CPvTLAHUnv5pfV77c0aGPyfAeFuhM4iu6Em0="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 2d61fb07669d..1256a9cad649 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2026.1.5"; + version = "2026.1.8"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-rOeTm4Qc8+cqce5jx4LciVMiQ7Jvu4883t0KdqgeTy4="; + hash = "sha256-D2WTKMjxUCunp5GDA0TG1P9lilLoytk1KWJiI+ht3XM="; }; - cargoHash = "sha256-/QcnUD8/WsZnbQY+Ecc33KT4tOj0Ua+BOBFybBK/O4Y="; + cargoHash = "sha256-2Fv+kRWtDAgAvqehgdqWfznKY4UhUdEj2NRN9MD2vy4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index c2d04fa988f3..8bd7b1a49181 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "1.3.5"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-R+sh8xQpLDIKqQwE1JjguP4NwE2Jz7tuXNK1+EsHnrA="; + hash = "sha256-2waDKL1TWVw2BXl0oqV9+kH86w7dWpz1j61VQSxJW5Q="; }; build-system = with python3Packages; [ @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; dependencies = with python3Packages; [ agent-client-protocol - aiofiles + anyio httpx mcp mistralai @@ -70,20 +70,15 @@ python3Packages.buildPythonApplication (finalAttrs: { writableTmpDirAsHomeHook ]; versionCheckKeepEnvironment = [ "HOME" ]; - pytestFlags = [ "tests/cli/test_clipboard.py" ]; - disabledTests = [ - # AssertionError: assert '/nix/store/00000000000000000000000000000000-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" + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError + "test_rebuilds_index_when_mass_change_threshold_is_exceeded" + "test_updates_index_incrementally_by_default" + "test_updates_index_on_file_creation" + "test_updates_index_on_file_deletion" + "test_updates_index_on_file_rename" + "test_updates_index_on_folder_rename" ]; disabledTestPaths = [ diff --git a/pkgs/by-name/mo/mo/package.nix b/pkgs/by-name/mo/mo/package.nix index cd8d1c003d2a..e303dd2bc1ec 100644 --- a/pkgs/by-name/mo/mo/package.nix +++ b/pkgs/by-name/mo/mo/package.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tests-always-included/mo"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sheepforce ]; + mainProgram = "mo"; }; } diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 54fa8f47821a..a0ccf8aff638 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -31,13 +31,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.10.26"; + version = "0.10.27"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-1C0BCbDJ6/nYzWEL5UA9GQW4vSo4ZfP6BuA3i4JoiuY="; + hash = "sha256-5KHxoOozqZMvq91oKZ18Hmt0W8r9Va0AJr0hWMmBCfs="; }; patches = [ @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-pZwWqWkcq142iIO0Ier9NH56P1EWXAoRiqDCNyElXCA="; + cargoHash = "sha256-OQVHG0iUyYcpc63N4Y3i8oWohDO4JBUIk3LEAf6ifL0="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-m5/7fD4OBJcY7stZhwDLw4asmXqUThUjTaRb3oVul78="; + hash = "sha256-N57RSuVRX33AhQBjHbxR0g9q62rYVqAlYJ1dhuUu0xw="; }; nativeBuildInputs = [ @@ -163,6 +163,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ getchoo hythera + encode42 ]; mainProgram = "ModrinthApp"; platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/by-name/mp/mpd/package.nix b/pkgs/by-name/mp/mpd/package.nix index 53fc3f5583aa..850a8880a5d9 100644 --- a/pkgs/by-name/mp/mpd/package.nix +++ b/pkgs/by-name/mp/mpd/package.nix @@ -197,13 +197,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mpd"; - version = "0.24.7"; + version = "0.24.8"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-2sOlyeEpg48J1GZu25Umz/Wl2i7EqL8R9HslDidX3NM="; + sha256 = "sha256-nVa4cNXr1lTcHQYoz1TVqgu/Ly6O3CL+2iHm92KOX3g="; }; buildInputs = [ diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix index e3c252848759..8f5aca898c61 100644 --- a/pkgs/by-name/mu/multipath-tools/package.nix +++ b/pkgs/by-name/mu/multipath-tools/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "multipath-tools"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; tag = finalAttrs.version; - hash = "sha256-FlmcZNi19ajAVTwHSNgS5jEsHUk8vHyzuFfxgN+WSxQ="; + hash = "sha256-fkpBvadQAR+oiFeyar7flwL8N69RoWhwOaiYSwYCbXs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index fffba61effcb..bd874c58f6e6 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.4.7"; + version = "8.4.8"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-wL8zqUzbkI8UmuoHl6/7GxOSYszw4Ll4ehckYgdULmk="; + hash = "sha256-vp2Wzfh/J2lSos3ZYPEGuWCohg5GwRXtOcG18uA4eiA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/na/nautilus-open-any-terminal/package.nix b/pkgs/by-name/na/nautilus-open-any-terminal/package.nix index e092b6a134c4..8b6e981c65bd 100644 --- a/pkgs/by-name/na/nautilus-open-any-terminal/package.nix +++ b/pkgs/by-name/na/nautilus-open-any-terminal/package.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = "nautilus-open-any-terminal"; tag = version; - hash = "sha256-D67mp+ha1xdRxkWeNxyKW3ZIyD40LoqBrNjoBqw+9rE="; + hash = "sha256-SqkvQZZXSFC5WRjOn/6uPx+bDWFCz1g6OtCatUM9+0U="; }; patches = [ ./hardcode-gsettings.patch ]; diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 5f64508fae60..85c231626b10 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.11.5"; + version = "0.11.6"; __structuredAttrs = true; @@ -103,7 +103,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-OsvLB9kynCbQ8PDQ2VQ+L56iy7pZ0ZP69J2cEG8Ad8A="; + hash = "sha256-GdfCaKNe/qPaUV2NJPXY+ATnQNWnyFTFnkOYDyLhTNg="; }; strictDeps = true; diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 0f7a97f99074..8e6430bfa6cd 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nuclei-templates"; - version = "10.3.7"; + version = "10.3.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${finalAttrs.version}"; - hash = "sha256-kiafZbt19UInpSGq9I3QkXM3ZA4Hzp2OEW9morLm/yQ="; + hash = "sha256-LLJrG2bmb1eDDvcLBK35GSn6EvDJslXeu/R57wKjzX8="; }; installPhase = '' diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index b955732b809e..7c6e36c6866c 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -5,16 +5,16 @@ versionCheckHook, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "nvitop"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "XuehaiPan"; repo = "nvitop"; - tag = "v${version}"; - hash = "sha256-CPx69Gp0n715q7ZoL0s19+IUdS1+vjw+49es2vzEFWg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CaQO20PF/fVGybyrt2OGASYsKAJsmJkOGis1ff/OOIs="; }; build-system = with python3Packages; [ setuptools ]; @@ -26,7 +26,6 @@ python3Packages.buildPythonApplication rec { nvidia-ml-py ]; - doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -36,9 +35,9 @@ python3Packages.buildPythonApplication rec { meta = { description = "Interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management"; homepage = "https://github.com/XuehaiPan/nvitop"; - changelog = "https://github.com/XuehaiPan/nvitop/releases/tag/v${version}"; + changelog = "https://github.com/XuehaiPan/nvitop/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index 92885da46bb2..062bf82a0b5c 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -1,6 +1,6 @@ { lib, - llvmPackages, + llvmPackages_18, fetchFromGitHub, makeBinaryWrapper, which, @@ -8,6 +8,7 @@ }: let + llvmPackages = llvmPackages_18; inherit (llvmPackages) stdenv; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 27410ec85644..9e43272ea303 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -138,13 +138,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-uuv0UMw/8eUcDlyglMxqFWbUlS2OzLEMBNhsbFx8qmg="; + hash = "sha256-hfEuVWMmayAO26EV6fu7lRWEL3Es9wyN9sMdm5I+NJE="; }; vendorHash = "sha256-WdHAjCD20eLj0d9v1K6VYP8vJ+IZ8BEZ3CciYLLMtxc="; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index cf24dc98c613..75b0f26c0230 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,12 +14,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.1.30"; + version = "1.1.36"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-RTj64yrVLTFNpVc8MvPAJISOlBo/j2MnuL5jo4VtKWM="; + hash = "sha256-ovFGFI2dSZLKSeuanRZg9cNvMCxYnS3UbtaCKls5BYQ="; }; node_modules = stdenvNoCC.mkDerivation { @@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-37pmIiJzPEWeA7+5u5lz39vlFPI+N13Qw9weHrAaGW4="; + outputHash = "sha256-MPzEzyx+Av0sa6EU3ewjUSwAOyA+GJGfvEoROYqZjkM="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix index 50731694d28a..4741ac51f266 100644 --- a/pkgs/by-name/ot/otree/package.nix +++ b/pkgs/by-name/ot/otree/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "otree"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "fioncat"; repo = "otree"; tag = "v${version}"; - hash = "sha256-l2hU1a2yfXo8u8wjSmvzL+nzniMQFKvdBhQ0eqqG3tg="; + hash = "sha256-7Yv8krhtA+YAbJmF/bxgWb6NZBzg/fubxkzDEeOw4xU="; }; - cargoHash = "sha256-UyomqesHDaGDEBHVcQMwUI7kH8akOOuyXOL/r4gfiAo="; + cargoHash = "sha256-Op0IIH1whnBWP5Z5LLygdiWpysC/JZJEKX6OLHQAsWo="; meta = { description = "Command line tool to view objects (JSON/YAML/TOML/XML) in TUI tree widget"; diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index b8a682040b5f..81f4a09c0ddb 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -5,7 +5,7 @@ }: rustPlatform.buildRustPackage rec { - version = "10.0.0"; + version = "10.1.0"; pname = "oxipng"; # do not use fetchCrate (only repository includes tests) @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { owner = "shssoichiro"; repo = "oxipng"; tag = "v${version}"; - hash = "sha256-c8NNTO+6GuFb5BBPpdyDSHbtmojq+9ceOic54Zq3nwE="; + hash = "sha256-fPzdko8qcg9zcr79SrEakLqTFj9hDCakl6hTVpW9al8="; }; - cargoHash = "sha256-YStZ2j2gjC5uVUnHaQIk6xtSbnPm0IoNONRr/nFOOUg="; + cargoHash = "sha256-P8PT75TwdYeS9xJ7EEdIhlgHfd0VlIPUaLkM0SfRPq0="; # don't require qemu for aarch64-linux tests # error: linker `aarch64-linux-gnu-gcc` not found diff --git a/pkgs/by-name/pa/pass-git-helper/package.nix b/pkgs/by-name/pa/pass-git-helper/package.nix index 2bb5a120249a..6b892d5a9668 100644 --- a/pkgs/by-name/pa/pass-git-helper/package.nix +++ b/pkgs/by-name/pa/pass-git-helper/package.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/languitar/pass-git-helper"; description = "Git credential helper interfacing with pass, the standard unix password manager"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ hmenke ]; diff --git a/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix b/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix index c7dd724920dd..8998073a27c3 100644 --- a/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix +++ b/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix @@ -12,11 +12,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasticscm-client-core-unwrapped"; - version = "11.0.16.9872"; + version = "11.0.16.9890"; src = fetchurl { url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-core_${finalAttrs.version}_amd64.deb"; - hash = "sha256-5V1x21+Dal6JDI8KBEFr9PXH1k12LutVWbaMOuDL954="; + hash = "sha256-J87bDtuAN+5sRLecdCXmaUlICTnCp25XMMIS+IQM/jQ="; nativeBuildInputs = [ dpkg ]; downloadToTemp = true; recursiveHash = true; diff --git a/pkgs/by-name/pl/plfit/package.nix b/pkgs/by-name/pl/plfit/package.nix index 90f103aea0e3..c0fd37234e2d 100644 --- a/pkgs/by-name/pl/plfit/package.nix +++ b/pkgs/by-name/pl/plfit/package.nix @@ -3,11 +3,14 @@ fetchFromGitHub, lib, llvmPackages, + withPython ? false, python ? null, stdenv, swig, }: +assert withPython -> python != null; + stdenv.mkDerivation (finalAttrs: { pname = "plfit"; version = "1.0.1"; @@ -19,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-0JrPAq/4yzr7XbxvcnFj8CKmMyZT05PkSdGprNdAsJA="; }; - postPatch = lib.optionalString (python != null) '' + postPatch = lib.optionalString withPython '' substituteInPlace src/CMakeLists.txt \ --replace-fail ' ''${Python3_SITEARCH}' ' ${placeholder "out"}/${python.sitePackages}' \ --replace-fail ' ''${Python3_SITELIB}' ' ${placeholder "out"}/${python.sitePackages}' @@ -28,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ] - ++ lib.optionals (python != null) [ + ++ lib.optionals withPython [ python swig ]; @@ -36,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DPLFIT_USE_OPENMP=ON" ] - ++ lib.optionals (python != null) [ + ++ lib.optionals withPython [ "-DPLFIT_COMPILE_PYTHON_MODULE=ON" ]; diff --git a/pkgs/by-name/po/powersupply/package.nix b/pkgs/by-name/po/powersupply/package.nix index c908ae909e43..88fc8d9c17d4 100644 --- a/pkgs/by-name/po/powersupply/package.nix +++ b/pkgs/by-name/po/powersupply/package.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "powersupply"; - version = "0.10.1"; + version = "0.10.2"; pyproject = false; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "postmarketOS"; repo = "powersupply"; rev = version; - hash = "sha256-sPdtrm2WQYjPu+1bb0ltBiqS9t8FFvbgRdGe1PEthy0="; + hash = "sha256-i0AZfxYWj8ct2jiXl2GnCGMU3xBSRRny4H0G/5Qs14Y="; }; postPatch = '' diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 7c81b57c8346..38c172057e2a 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -3,6 +3,7 @@ buildNpmPackage, fetchFromGitHub, fetchPypi, + libredirect, nodejs, python312, gettext, @@ -42,13 +43,13 @@ let }; pname = "pretix"; - version = "2025.10.1"; + version = "2026.1.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; tag = "v${version}"; - hash = "sha256-O9HAslZ8xbmLgJi3y91M6mc1oIvJZ8nRJyFRuNorRHs="; + hash = "sha256-XS4Kqgvg3Bu5S3gFJ4fvvezCtQEA26jUa+8pSx2saNw="; }; npmDeps = buildNpmPackage { @@ -247,6 +248,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ + libredirect.hook pytestCheckHook pytest-xdist pytest-mock @@ -271,6 +273,13 @@ python.pkgs.buildPythonApplication rec { preCheck = '' export PYTHONPATH=$(pwd)/src:$PYTHONPATH export DJANGO_SETTINGS_MODULE=tests.settings + + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/resolv.conf=$(realpath resolv.conf) + ''; + + postCheck = '' + unset NIX_REDIRECTS ''; passthru = { diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix index 037a94a8fde5..8e19abf81e22 100644 --- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pretix-mollie"; - version = "2.5.0"; + version = "2.5.1"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-mollie"; tag = "v${version}"; - hash = "sha256-lQ1y6w7zP0sy67jf5+K6584DP10LAZqo1hLsHF3H2UA="; + hash = "sha256-SpSXHPPxwI36iz5b8naD60vTomc52U84LjeeV8OnJXo="; }; build-system = [ diff --git a/pkgs/by-name/pr/pretix/plugins/payone/package.nix b/pkgs/by-name/pr/pretix/plugins/payone/package.nix new file mode 100644 index 000000000000..02f4c23a4fd6 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/payone/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pretix-plugin-build, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pretix-payone"; + version = "1.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "pretix-payone"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8DXORej+OJ65l/KGcanavHU4rabK9qTSnRPbdCidkgQ="; + }; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pretix_payone" + ]; + + meta = { + description = "Pretix payment plugin for PAYONE"; + homepage = "https://github.com/pretix/pretix-payone"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix b/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix new file mode 100644 index 000000000000..d2de73989ff0 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pretix-plugin-build, + setuptools, + onlinepayments-sdk-python3, +}: + +buildPythonPackage rec { + pname = "pretix-worldlinedirect"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "pretix-worldlinedirect"; + rev = "v${version}"; + hash = "sha256-ofDGbRYTA2GTnVexn0dE6Iftq6+MkigOXWVR4kPUJzY="; + }; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + dependencies = [ + onlinepayments-sdk-python3 + ]; + + pythonImportsCheck = [ + "pretix_payonegopay" + "pretix_worldlinedirect" + ]; + + meta = { + description = "A pretix plugin to accept payments through Worldline Direct"; + homepage = "https://github.com/pretix/pretix-worldlinedirect"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix index 1ac076d03b3a..3380a91b0690 100644 --- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pretix-zugferd"; - version = "2.6.1"; + version = "2.6.2"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-zugferd"; rev = "v${version}"; - hash = "sha256-nLpzNx/k1pJsYgMBhMkEOKfHmB46/AOzxB59cYkrGUU="; + hash = "sha256-C2Z/S3lEKmdi6fch/erjPc9evnKc69tBRTInXRgi24E="; }; postPatch = '' diff --git a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix index be208bacb07d..4dd8c42d22b6 100644 --- a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix +++ b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "projectm-sdl-cpp"; - version = "0-unstable-2025-12-27"; + version = "0-unstable-2026-01-20"; src = fetchFromGitHub { owner = "projectM-visualizer"; repo = "frontend-sdl-cpp"; - rev = "0231108c9574c7ba04490fe0036b314f7f37ca6e"; - hash = "sha256-NSwy0pJeJpqRxQI451J2kdevNt5EWUF4REhsmF0HS3w="; + rev = "7a07229428c51378f43843cf160bcddc21ef70ff"; + hash = "sha256-hz1Au5Gn10Yi5f7d7UiQOHTCU00Ze5UoQ40jirg54Pc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 5f4a86ebebf4..0d8756e802de 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2025-12-23"; - rev = "f0341d7b566080979b11661dc61a98f64db0d028"; + version = "0-unstable-2026-01-26"; + rev = "a0e74f2f7661a5ce8ecae738314ec0b4d4a182b0"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-V0tdABcZ/ob3duUkKbdcLn4AyOA8um7WkcohoH5J/pQ="; + hash = "sha256-EKWd0G6ONOWNYZCyp4UlY4lalfhB27sV5HwkKmyRscs="; }; - vendorHash = "sha256-/ZAnYxUHHq+tqk0hcJrt6ZrpDDRqyLITWGL/hgW4A6A="; + vendorHash = "sha256-Pv9LznRh7Nzm74gMKT2Q/VLIMIIc93en0qX6YA6TwK4="; # doCheck = false; diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 4c01157127b3..0e3e7149afe9 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -44,14 +44,14 @@ let pname = "pulsar"; - version = "1.129.0"; + version = "1.130.1"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-Iq+mYI8vldBroU/1ztVhWfbDUh9GiFjrSIzW0Qtgnvc="; + x86_64-linux.hash = "sha256-/s2sjGGDVOJ8cpIlgku+vt7DQI58IvM7jzMo61Vnq+E="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-hQBMxonnUSEoa0ATISuCoWh0scv/GPf6Tq55l+I1/n0="; + aarch64-linux.hash = "sha256-Psvx3oefvUtV5+gIt7xpB+k63c0073WejCFwVacV2+E="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 9b034b8bb296..3009169bc6d6 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "railway"; - version = "4.25.3"; + version = "4.27.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-dml5lyZoA4f9W9MdiSRj2P9+mXs9s87w8cS2J0RvC2k="; + hash = "sha256-9w0AFXf7BxXxw/JZui9rl+5FgHmqEaTlvbcRk8QwLEU="; }; - cargoHash = "sha256-9zk+SHwZL80fB/HuQbfpYvOTKx3UCNLvvlbnDAB/VYM="; + cargoHash = "sha256-WNL/Xmcoh3oTn7C/cK2CD3L085FbbxbdoasI+K5UucM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index 7408bbcce385..2c8199247888 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -56,13 +56,10 @@ python3Packages.buildPythonApplication rec { llama-cpp-vulkan podman ] - ++ ( - with python3Packages; - [ - huggingface-hub - ] - ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform mlx-lm) mlx-lm - ) + ++ (with python3Packages; [ + huggingface-hub + mlx-lm + ]) ) } ''; diff --git a/pkgs/by-name/ra/rauthy/package.nix b/pkgs/by-name/ra/rauthy/package.nix index 7e29ddf106df..b71b7e440dee 100644 --- a/pkgs/by-name/ra/rauthy/package.nix +++ b/pkgs/by-name/ra/rauthy/package.nix @@ -13,19 +13,19 @@ lld, }: let - version = "0.34.1"; + version = "0.34.2"; pname = "rauthy"; src = fetchFromGitHub { owner = "sebadob"; repo = "rauthy"; tag = "v${version}"; - hash = "sha256-6Ddf8ukwEecxBp9hMbWS4odxrRGB/uIXWdTbIU3MAUM="; + hash = "sha256-h7Nd17l/BR7p+b+9AqX8IYf0mfcc9QI9LQnR2cBc2s4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-fXe4bQRLscUk7fdAQGwzwBVJIRs8+puWfTeAjby1MmE="; + hash = "sha256-jhli1axBU/UV6k5apxbE7g9+F6dsHzY30/QKSgJ22Ws="; }; # Wasm modules are needed to build the frontend and are part of the main Rust repo. @@ -77,7 +77,7 @@ let "-p2" ]; - npmDepsHash = "sha256-F8/zbqI7Nmm8GLtkL25QDX222yzhlg7NA32tpBa8b5o="; + npmDepsHash = "sha256-pfrT2cXZWOetoquaMMNslo8nTy9DBornLCp48pGHRIM="; preBuild = '' mkdir -p ./src/wasm/ diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 227d8dc57305..fca7d602a190 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "reindeer"; homepage = "https://github.com/facebookincubator/reindeer"; license = with lib.licenses; [ mit ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ amaanq ]; }; } diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index fa6cdaece5d1..9407f5967143 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.151"; + version = "0.3.153"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-yH+ggH5bJNvdD+iv3gk6PZ/EXHoQhdl7ur9Sj6/GE/Q="; + hash = "sha256-/1Fuu1v8kNu0BUFNqhzy7Nexob29NDo/vEOWfQSPF88="; }; - cargoHash = "sha256-hi0TghUBEXBMSXq+gjxeGZWzpqzQTBg8WGOdkzP1Q70="; + cargoHash = "sha256-cosUcBEb/hRcQ0s/1f30917gDQzGmRKmPNJ4/ASAl+4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 84bbf1aab535..853e0869c624 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2026-01-12"; + version = "0-unstable-2026-01-23"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "b47b972dff8a835be2999cab8cd167d8778ce53a"; - hash = "sha256-34BEX7WaFZJVNeXxfPr6V6MGiqrIJ/Wdal8iwQkr4tQ="; + rev = "778be81b48eeeeb7991a49a816b350e4a88e0be1"; + hash = "sha256-Bmfty8W02RVTFU5yhIhkcDmO2yE8ECV87kbAsNNRGcY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 5975d14d314f..aa6d3cdbc192 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, makeWrapper, - nodejs, + nodejs_22, pnpm_10, fetchPnpmDeps, pnpmConfigHook, @@ -14,6 +14,9 @@ nix-update-script, yq-go, }: +let + nodejs = nodejs_22; +in stdenv.mkDerivation (finalAttrs: { pname = "renovate"; version = "42.83.1"; diff --git a/pkgs/by-name/ri/rinf_cli/package.nix b/pkgs/by-name/ri/rinf_cli/package.nix index a0058fec3b51..6c0f887dac0f 100644 --- a/pkgs/by-name/ri/rinf_cli/package.nix +++ b/pkgs/by-name/ri/rinf_cli/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rinf_cli"; - version = "8.8.1"; + version = "8.9.0"; src = fetchFromGitHub { owner = "cunarist"; repo = "rinf"; tag = "v${finalAttrs.version}"; - hash = "sha256-Nqzc3GXOXl+0zBOUQN58ib9HvVRMKymHckw9KGoKKyU="; + hash = "sha256-UHYYpNlhXRYysQlo3EWDUe4Fwp7PMifrQuZcMAGJp6Q="; }; sourceRoot = "${finalAttrs.src.name}/rust_crate_cli"; - cargoHash = "sha256-R55WVlVR5gjg4U4Icp379dXUp9tJAR0eTZy6glzA7nk="; + cargoHash = "sha256-T1reyeoaGBb+Wyn8WX/u7Kf9B01GwWUcYntb7PlIfCk="; meta = { description = "Framework for creating cross-platform Rust apps leveraging Flutter"; diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix index afc1a1a1a6d3..43208ea79eb2 100644 --- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix +++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "roave-backward-compatibility-check"; - version = "8.15.0"; + version = "8.17.0"; src = fetchFromGitHub { owner = "Roave"; repo = "BackwardCompatibilityCheck"; tag = finalAttrs.version; - hash = "sha256-vhoV8AkkcL1pDmHkpPYs5lD6TUcvMC6BXkQF1T2esIE="; + hash = "sha256-+LoAR7pViUnzIICRUUWa7Z5DvSBXo+lr4bjFrTSwq0g="; }; - vendorHash = "sha256-LBvqnBcSpjffS3cjgVgql8eNmaP45uNx9BKr72Mr+ZY="; + vendorHash = "sha256-q3n3VIxGlIz+xI5h/JNq40CvXFbShXeVoQ5VoIjk21I="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index ec287005022d..58abb555c215 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - stdenvNoCC, gitMinimal, versionCheckHook, nix-update-script, @@ -10,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.0.221"; + version = "0.1.1"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-r9aVSllmz7fXlePRC/vS6vxmi7zhUyVPEEo6dEkokKg="; + hash = "sha256-cJRJVo/YoSst5NJXAZPJFhXFM6Fmqy/UfuOK2OGLi2o="; }; - cargoHash = "sha256-LedT/ZwDz9FBsHZdObPZc2CoBNR8gNYF/4kvefgmNq8="; + cargoHash = "sha256-Y1KqqDGEjp2+0BwdAgooBjPOQtGbNDwwuXFH97XvXb4="; cargoBuildFlags = [ "--bin=rumdl" @@ -27,7 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # Non-specific tests often fail on Darwin (especially aarch64-darwin), # on both Hydra and GitHub-hosted runners, even with __darwinAllowLocalNetworking enabled. - doCheck = !stdenvNoCC.hostPlatform.isDarwin; + # proptest fails frequently + doCheck = false; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/by-name/sa/saber/git-hashes.json b/pkgs/by-name/sa/saber/git-hashes.json index 3ee14f88f491..0bdf9b600a25 100644 --- a/pkgs/by-name/sa/saber/git-hashes.json +++ b/pkgs/by-name/sa/saber/git-hashes.json @@ -1,4 +1,4 @@ { - "flutter_secure_storage_linux": "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=", - "receive_sharing_intent": "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY=" + "receive_sharing_intent": "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY=", + "slang": "sha256-AU8pA7DN3PuNPBtbLX/LQChoXraTQfkNc7dGEAsYkGU=" } diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index 523f863c1d3d..6d4f8e3fd8ac 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -24,13 +24,13 @@ let ln -s ${zlib}/lib $out/lib ''; - version = "1.29.1"; + version = "1.29.5"; src = fetchFromGitHub { owner = "saber-notes"; repo = "saber"; tag = "v${version}"; - hash = "sha256-+hqZQQtuNsyAIUKb0fydSnRTqc8EGVxWRtGubccsK2w="; + hash = "sha256-IHsVeOEgVV6GlqiH9RextBKLfIZ/jQ8+OWTcjAGNu5c="; }; in flutter338.buildFlutterApplication { @@ -54,8 +54,9 @@ flutter338.buildFlutterApplication { ]; postPatch = '' - patchShebangs patches/remove_proprietary_dependencies.sh - patches/remove_proprietary_dependencies.sh + patchShebangs patches/pre/remove_proprietary_dependencies.sh patches/pre/remove_dev_dependencies.sh + patches/pre/remove_proprietary_dependencies.sh + patches/pre/remove_dev_dependencies.sh ''; flutterBuildFlags = [ "--dart-define=DIRTY=false" ]; diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json index 4589956cb45c..2cde3d323676 100644 --- a/pkgs/by-name/sa/saber/pubspec.lock.json +++ b/pkgs/by-name/sa/saber/pubspec.lock.json @@ -1,15 +1,5 @@ { "packages": { - "_fe_analyzer_shared": { - "dependency": "transitive", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "91.0.0" - }, "abstract_sync": { "dependency": "direct main", "description": { @@ -20,16 +10,6 @@ "source": "hosted", "version": "1.3.1" }, - "analyzer": { - "dependency": "transitive", - "description": { - "name": "analyzer", - "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.4.1" - }, "animated_vector": { "dependency": "transitive", "description": { @@ -124,11 +104,11 @@ "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "a3b340e42bc45598918944e378dc6a05877e587fcd0e1b8d2ea26339de87bdf9", + "sha256": "e800c946df0bb6c73849716c25f54b7a0c94e8dccd02504cbd860a1742f970ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.0" + "version": "9.4.4" }, "barcode": { "dependency": "transitive", @@ -220,36 +200,6 @@ "source": "hosted", "version": "1.4.0" }, - "checked_yaml": { - "dependency": "transitive", - "description": { - "name": "checked_yaml", - "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.4" - }, - "cli_config": { - "dependency": "transitive", - "description": { - "name": "cli_config", - "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "cli_util": { - "dependency": "transitive", - "description": { - "name": "cli_util", - "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.2" - }, "clock": { "dependency": "transitive", "description": { @@ -290,16 +240,6 @@ "source": "hosted", "version": "3.1.2" }, - "coverage": { - "dependency": "transitive", - "description": { - "name": "coverage", - "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.15.0" - }, "cross_file": { "dependency": "transitive", "description": { @@ -360,16 +300,6 @@ "source": "hosted", "version": "1.0.8" }, - "dart_pubspec_licenses": { - "dependency": "transitive", - "description": { - "name": "dart_pubspec_licenses", - "sha256": "c3dd75f25ef705d4e8ab09f07afc7a83a80f5635eea11ea2d7b2b4600588b302", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.14" - }, "dart_quill_delta": { "dependency": "transitive", "description": { @@ -534,11 +464,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200", + "sha256": "d974b6ba2606371ac71dd94254beefb6fa81185bde0b59bdc1df09885da85fde", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.3.7" + "version": "10.3.8" }, "file_selector_linux": { "dependency": "transitive", @@ -722,32 +652,31 @@ "dependency": "direct main", "description": { "name": "flutter_secure_storage", - "sha256": "79d53f3393ac2b73bcba45317b6c1a29002f89c680225cdea0bd6770a1682ce0", + "sha256": "da922f2aab2d733db7e011a6bcc4a825b844892d4edd6df83ff156b09a9b2e40", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.0-beta.5" + "version": "10.0.0" }, "flutter_secure_storage_darwin": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_darwin", - "sha256": "81ef5abfb9cbeb78110d8043ba29f0b36cd7ffa989baa1b2d9482542b2200051", + "sha256": "8878c25136a79def1668c75985e8e193d9d7d095453ec28730da0315dc69aee3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.1" + "version": "0.2.0" }, "flutter_secure_storage_linux": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { - "path": "flutter_secure_storage_linux", - "ref": "patch-2", - "resolved-ref": "f076cbb65b075afd6e3b648122987a67306dc298", - "url": "https://github.com/m-berto/flutter_secure_storage.git" + "name": "flutter_secure_storage_linux", + "sha256": "2b5c76dce569ab752d55a1cee6a2242bcc11fdba927078fb88c503f150767cda", + "url": "https://pub.dev" }, - "source": "git", - "version": "2.0.1" + "source": "hosted", + "version": "3.0.0" }, "flutter_secure_storage_platform_interface": { "dependency": "transitive", @@ -763,21 +692,21 @@ "dependency": "transitive", "description": { "name": "flutter_secure_storage_web", - "sha256": "4c3f233e739545c6cb09286eeec1cc4744138372b985113acc904f7263bef517", + "sha256": "6a1137df62b84b54261dca582c1c09ea72f4f9a4b2fcee21b025964132d5d0c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "flutter_secure_storage_windows": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_windows", - "sha256": "ff32af20f70a8d0e59b2938fc92de35b54a74671041c814275afd80e27df9f21", + "sha256": "3b7c8e068875dfd46719ff57c90d8c459c87f2302ed6b00ff006b3c9fcad1613", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.1.0" }, "flutter_speed_dial": { "dependency": "direct main", @@ -851,16 +780,6 @@ "source": "hosted", "version": "10.12.0" }, - "frontend_server_client": { - "dependency": "transitive", - "description": { - "name": "frontend_server_client", - "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, "fuchsia_remote_debug_protocol": { "dependency": "transitive", "description": "flutter", @@ -891,21 +810,21 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "c92d18e1fe994cb06d48aa786c46b142a5633067e8297cff6b5a3ac742620104", + "sha256": "eff94d2a6fc79fa8b811dde79c7549808c2346037ee107a1121b4a644c745f2a", "url": "https://pub.dev" }, "source": "hosted", - "version": "17.0.0" + "version": "17.0.1" }, "golden_screenshot": { "dependency": "direct dev", "description": { "name": "golden_screenshot", - "sha256": "2bf16846c42e75a9eaed2aaf0ec0b53f3ba76332ebb3396fdfe085302f68854b", + "sha256": "2f7807322939ea921c593376c3d5f7c7b4b72e6c7bd8df927caff2b0d5f1d19a", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.1" + "version": "9.1.2" }, "gsettings": { "dependency": "transitive", @@ -947,16 +866,6 @@ "source": "hosted", "version": "1.6.0" }, - "http_multi_server": { - "dependency": "transitive", - "description": { - "name": "http_multi_server", - "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" - }, "http_parser": { "dependency": "transitive", "description": { @@ -1013,16 +922,6 @@ "source": "hosted", "version": "0.20.2" }, - "io": { - "dependency": "transitive", - "description": { - "name": "io", - "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, "irondash_engine_context": { "dependency": "transitive", "description": { @@ -1243,26 +1142,6 @@ "source": "hosted", "version": "8.1.0" }, - "node_preamble": { - "dependency": "transitive", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "objective_c": { - "dependency": "transitive", - "description": { - "name": "objective_c", - "sha256": "64e35e1e2e79da4e83f2ace3bf4e5437cef523f46c7db2eba9a1419c49573790", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.0.0" - }, "one_dollar_unistroke_recognizer": { "dependency": "direct main", "description": { @@ -1402,16 +1281,6 @@ "source": "hosted", "version": "0.1.1" }, - "pana": { - "dependency": "transitive", - "description": { - "name": "pana", - "sha256": "bbad5a3e085fcc2475f08fe1240041e25d74482da80d9af00bc17cce99989e29", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.22.24" - }, "path": { "dependency": "direct main", "description": { @@ -1556,21 +1425,21 @@ "dependency": "direct main", "description": { "name": "pdfrx", - "sha256": "40ab38d80af88ab58e9bab63a706a69f18f516fd0f1433f71833af236b159f42", + "sha256": "8028b5a3d33ff189dbb968fafcce1a924b3397c923819f974f6bde483f0cf808", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.16" + "version": "2.2.18" }, "pdfrx_engine": { "dependency": "transitive", "description": { "name": "pdfrx_engine", - "sha256": "6b7810d0fdd467760bf8e0afafb67140971bf297c9f9b12add5b2033bb55064f", + "sha256": "e4e942bda9f3876d34729fab8e0c5185b9384614929d82bd6efa8ef2a31b0be3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5" + "version": "0.3.6" }, "perfect_freehand": { "dependency": "direct main", @@ -1702,16 +1571,6 @@ "source": "hosted", "version": "3.9.1" }, - "pool": { - "dependency": "transitive", - "description": { - "name": "pool", - "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.2" - }, "posix": { "dependency": "transitive", "description": { @@ -1772,26 +1631,6 @@ "source": "hosted", "version": "6.1.5+1" }, - "pub_semver": { - "dependency": "transitive", - "description": { - "name": "pub_semver", - "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "pubspec_parse": { - "dependency": "transitive", - "description": { - "name": "pubspec_parse", - "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.0" - }, "qr": { "dependency": "transitive", "description": { @@ -1923,16 +1762,6 @@ "source": "hosted", "version": "2.0.0+1" }, - "retry": { - "dependency": "transitive", - "description": { - "name": "retry", - "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, "rxdart": { "dependency": "transitive", "description": { @@ -1943,16 +1772,6 @@ "source": "hosted", "version": "0.28.0" }, - "safe_url_check": { - "dependency": "transitive", - "description": { - "name": "safe_url_check", - "sha256": "49a3e060a7869cbafc8f4845ca1ecbbaaa53179980a32f4fdfeab1607e90f41d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, "saver_gallery": { "dependency": "direct main", "description": { @@ -2027,11 +1846,11 @@ "dependency": "transitive", "description": { "name": "sentry", - "sha256": "10a0bc25f5f21468e3beeae44e561825aaa02cdc6829438e73b9b64658ff88d9", + "sha256": "9b2fe138df1a104f6e41d8ebf2b1e4fe39d4370d2200eb4eea29913d38b8b33b", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.8.0" + "version": "9.9.1" }, "sentry_dart_plugin": { "dependency": "direct dev", @@ -2047,21 +1866,21 @@ "dependency": "direct main", "description": { "name": "sentry_flutter", - "sha256": "aafbf41c63c98a30b17bdbf3313424d5102db62b08735c44bff810f277e786a5", + "sha256": "698e0d47c0cf7362ad3b8034f6af5e9f3b2175d7a0cf58f78a967c29b43072b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.8.0" + "version": "9.9.1" }, "sentry_logging": { "dependency": "direct main", "description": { "name": "sentry_logging", - "sha256": "1ff2f99a9e8289c06e40ec35e63370b8eece091e956529315e221c5867593d99", + "sha256": "9cd3ee1f7a10d49cee179ed18ce8acd9e859cff4d118d9ba21b0df494ea8e7c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.8.0" + "version": "9.9.1" }, "share_plus": { "dependency": "direct main", @@ -2087,11 +1906,11 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.5.4" }, "shared_preferences_android": { "dependency": "transitive", @@ -2153,46 +1972,6 @@ "source": "hosted", "version": "2.4.1" }, - "shelf": { - "dependency": "transitive", - "description": { - "name": "shelf", - "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.2" - }, - "shelf_packages_handler": { - "dependency": "transitive", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_static": { - "dependency": "transitive", - "description": { - "name": "shelf_static", - "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, - "shelf_web_socket": { - "dependency": "transitive", - "description": { - "name": "shelf_web_socket", - "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, "simplytranslate": { "dependency": "direct dev", "description": { @@ -2212,42 +1991,23 @@ "slang": { "dependency": "direct main", "description": { - "name": "slang", - "sha256": "263159a93864a13a0f2486326e200cb38214a8e82a3c83a48c20ac24a8eed329", - "url": "https://pub.dev" + "path": "slang", + "ref": "949a16664259005d7ac8df853ea5a6ef3b0e4380", + "resolved-ref": "949a16664259005d7ac8df853ea5a6ef3b0e4380", + "url": "https://github.com/adil192/slang" }, - "source": "hosted", - "version": "4.11.1" + "source": "git", + "version": "4.12.0" }, "slang_flutter": { "dependency": "direct main", "description": { "name": "slang_flutter", - "sha256": "a6ebc0a855faa62053f44d333ae3b3cde24945357e88506d1d3e7fb0d3fc0c70", + "sha256": "0a4545cca5404d6b7487cf61cf1fe56c52daeb08de56a7574ee8381fbad035a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.11.0" - }, - "source_map_stack_trace": { - "dependency": "transitive", - "description": { - "name": "source_map_stack_trace", - "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "source_maps": { - "dependency": "transitive", - "description": { - "name": "source_maps", - "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.13" + "version": "4.12.0" }, "source_span": { "dependency": "transitive", @@ -2379,16 +2139,6 @@ "source": "hosted", "version": "4.1.0" }, - "tar": { - "dependency": "transitive", - "description": { - "name": "tar", - "sha256": "b338bacfd24dae6cf527acb4242003a71fc88ce183a9002376fabbc4ebda30c9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, "term_glyph": { "dependency": "transitive", "description": { @@ -2399,16 +2149,6 @@ "source": "hosted", "version": "1.2.2" }, - "test": { - "dependency": "transitive", - "description": { - "name": "test", - "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.26.3" - }, "test_api": { "dependency": "transitive", "description": { @@ -2419,16 +2159,6 @@ "source": "hosted", "version": "0.7.7" }, - "test_core": { - "dependency": "transitive", - "description": { - "name": "test_core", - "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.12" - }, "timezone": { "dependency": "transitive", "description": { @@ -2623,11 +2353,11 @@ "dependency": "transitive", "description": { "name": "watcher", - "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", + "sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.2.0" }, "web": { "dependency": "transitive", @@ -2639,26 +2369,6 @@ "source": "hosted", "version": "1.1.1" }, - "web_socket": { - "dependency": "transitive", - "description": { - "name": "web_socket", - "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "web_socket_channel": { - "dependency": "transitive", - "description": { - "name": "web_socket_channel", - "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, "webdriver": { "dependency": "transitive", "description": { @@ -2669,16 +2379,6 @@ "source": "hosted", "version": "3.1.0" }, - "webkit_inspection_protocol": { - "dependency": "transitive", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, "win32": { "dependency": "transitive", "description": { diff --git a/pkgs/by-name/sd/sdrpp/0001-Allow-management-of-resources-and-modules-paths.patch b/pkgs/by-name/sd/sdrpp/0001-Allow-management-of-resources-and-modules-paths.patch index 43a6b45442b8..d7b70b37e29e 100644 --- a/pkgs/by-name/sd/sdrpp/0001-Allow-management-of-resources-and-modules-paths.patch +++ b/pkgs/by-name/sd/sdrpp/0001-Allow-management-of-resources-and-modules-paths.patch @@ -1,4 +1,4 @@ -From 89189428a6857bc5607d8e28b9090c0d8bd0f8e3 Mon Sep 17 00:00:00 2001 +From 746644667cff9490d0f9a5f4ab70c76137dc80a2 Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Mon, 6 Oct 2025 16:19:55 +0200 Subject: [PATCH] Allow management of resources and modules paths @@ -13,17 +13,20 @@ This commit adds some functionality to the config manager to replace The prefix path used is either the installation directory, or the content of the `SDRPP_PREFIX` environment variable, if present. + +NOTE: Paths are transformed using a *temporary copy* of the config. This fixes +the issue described here https://github.com/NixOS/nixpkgs/issues/467610. --- - core/src/config.cpp | 31 ++++++++++++++++++++++++++++++- + core/src/config.cpp | 34 ++++++++++++++++++++++++++++++++-- core/src/config.h | 4 +++- core/src/core.cpp | 15 ++------------- - 3 files changed, 35 insertions(+), 15 deletions(-) + 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/core/src/config.cpp b/core/src/config.cpp -index 6de1888fd803d4bbe04c7a4ed2187103dd8a5081..4cab471b24b985ca717afae4322618759ffd47b4 100644 +index 6de1888f..dfde5628 100644 --- a/core/src/config.cpp +++ b/core/src/config.cpp -@@ -41,12 +41,16 @@ void ConfigManager::load(json def, bool lock) { +@@ -41,13 +41,18 @@ void ConfigManager::load(json def, bool lock) { conf = def; save(false); } @@ -36,11 +39,14 @@ index 6de1888fd803d4bbe04c7a4ed2187103dd8a5081..4cab471b24b985ca717afae432261875 void ConfigManager::save(bool lock) { if (lock) { mtx.lock(); } std::ofstream file(path.c_str()); -+ transformPaths(conf, false); - file << conf.dump(4); +- file << conf.dump(4); ++ auto tmp_conf = conf; ++ transformPaths(tmp_conf, false); ++ file << tmp_conf.dump(4); file.close(); if (lock) { mtx.unlock(); } -@@ -98,4 +102,29 @@ void ConfigManager::autoSaveWorker() { + } +@@ -98,4 +103,29 @@ void ConfigManager::autoSaveWorker() { termCond.wait_for(lock, std::chrono::milliseconds(1000), [this]() { return termFlag; }); } } @@ -73,10 +79,10 @@ index 6de1888fd803d4bbe04c7a4ed2187103dd8a5081..4cab471b24b985ca717afae432261875 + } +} diff --git a/core/src/config.h b/core/src/config.h -index fbbdeb4a54e06524a399e35afe8e187732bf851e..f9deef01e8d0850ab65a68ac33c9ed124486a1d5 100644 +index fbbdeb4a..f9deef01 100644 --- a/core/src/config.h +++ b/core/src/config.h -@@ -33,4 +33,6 @@ class ConfigManager { +@@ -33,4 +33,6 @@ private: std::mutex termMtx; std::condition_variable termCond; volatile bool termFlag = false; @@ -86,7 +92,7 @@ index fbbdeb4a54e06524a399e35afe8e187732bf851e..f9deef01e8d0850ab65a68ac33c9ed12 + static void transformPaths(json& conf, bool expand); +}; diff --git a/core/src/core.cpp b/core/src/core.cpp -index 37358062ed957e562bf971fa121d885073f2827c..f1b5396cad3154546bb3a2322403b7f3618ad253 100644 +index 37358062..f1b5396c 100644 --- a/core/src/core.cpp +++ b/core/src/core.cpp @@ -267,19 +267,8 @@ int sdrpp_main(int argc, char* argv[]) { @@ -111,3 +117,6 @@ index 37358062ed957e562bf971fa121d885073f2827c..f1b5396cad3154546bb3a2322403b7f3 // Load config flog::info("Loading config"); +-- +2.52.0 + diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index c2ee2e8cb11c..8807bc61a85b 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "sirikali"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "sirikali"; rev = version; - hash = "sha256-vrhHpQzTwiU0NGcXRBt9mtr5qbwL3LEtZYoYc+IkJHw="; + hash = "sha256-OaZrgX6zxp1ZP72xiBl0+h0nAQb1Z1eiqaSYdtxsDzQ="; }; buildInputs = [ diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix index ee7cf904e451..91b04f672fe8 100644 --- a/pkgs/by-name/sn/snakefmt/package.nix +++ b/pkgs/by-name/sn/snakefmt/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakefmt"; - version = "0.11.2"; + version = "0.11.3"; pyproject = true; disabled = python3.pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-6a03WEAeApH3pFNgB1xXODhrWKGxYNOIJ7QGMNn3NeE="; + hash = "sha256-PvuC9mwFl3EhJq1UDsFc7iTXl+RDiU/YbM9qqQdQbsA="; }; build-system = with python3.pkgs; [ hatchling ]; diff --git a/pkgs/by-name/sn/snell/package.nix b/pkgs/by-name/sn/snell/package.nix index c55ab58baa1e..d4a331bb0937 100644 --- a/pkgs/by-name/sn/snell/package.nix +++ b/pkgs/by-name/sn/snell/package.nix @@ -2,50 +2,68 @@ lib, stdenv, fetchzip, - autoPatchelfHook, upx, + autoPatchelfHook, + versionCheckHook, + writeShellScript, + nix-update, }: -let - platformMap = { - "x86_64-linux" = "linux-amd64"; - "aarch64-linux" = "linux-aarch64"; - }; - system = stdenv.hostPlatform.system; - platform = platformMap.${system} or (throw "Unsupported platform: ${system}"); - hashs = { - "x86_64-linux" = "sha256-J2kRVJRC0GhxLMarg7Ucdk8uvzTsKbFHePEflPjwsHU="; - "aarch64-linux" = "sha256-UT+Rd6TEMYL/+xfqGxGN/tiSBvN8ntDrkCBj4PuMRwg="; - }; -in + stdenv.mkDerivation (finalAttrs: { pname = "snell-server"; version = "5.0.1"; - src = fetchzip { - url = "https://dl.nssurge.com/snell/snell-server-v${finalAttrs.version}-${platform}.zip"; - hash = hashs.${system}; - }; + src = + let + selectSystem = attrs: attrs.${stdenv.hostPlatform.system}; + arch = selectSystem { + x86_64-linux = "amd64"; + aarch64-linux = "aarch64"; + }; + in + fetchzip { + url = "https://dl.nssurge.com/snell/snell-server-v${finalAttrs.version}-linux-${arch}.zip"; + hash = selectSystem { + x86_64-linux = "sha256-J2kRVJRC0GhxLMarg7Ucdk8uvzTsKbFHePEflPjwsHU="; + aarch64-linux = "sha256-UT+Rd6TEMYL/+xfqGxGN/tiSBvN8ntDrkCBj4PuMRwg="; + }; + }; nativeBuildInputs = [ upx autoPatchelfHook + versionCheckHook ]; - buildInputs = [ - (lib.getLib stdenv.cc.cc) - ]; + + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; + installPhase = '' runHook preInstall + upx -d snell-server install -Dm755 snell-server $out/bin/snell-server + runHook postInstall ''; + doInstallCheck = true; + + passthru.updateScript = writeShellScript "update-snell-server" '' + latestVersion=$(curl --fail --silent https://kb.nssurge.com/surge-knowledge-base/release-notes/snell | grep -oE 'snell-server-v[0-9]+\.[0-9]+\.[0-9]+' | sed 's/snell-server-v//' | sort -V | tail -n1) + if [[ "$latestVersion" == "$UPDATE_NIX_OLD_VERSION" ]]; then exit 0; fi + ${lib.getExe nix-update} pkgsCross.gnu64.snell --version "$latestVersion" + ${lib.getExe nix-update} pkgsCross.aarch64-multiplatform.snell --version skip + ''; + meta = { description = "Lean encrypted proxy protocol"; homepage = "https://kb.nssurge.com/surge-knowledge-base/release-notes/snell"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = lib.attrNames platformMap; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; maintainers = with lib.maintainers; [ mlyxshi ]; diff --git a/pkgs/by-name/sq/sqlcipher/package.nix b/pkgs/by-name/sq/sqlcipher/package.nix index 732ffb6ff6e1..aa7141f7e5dc 100644 --- a/pkgs/by-name/sq/sqlcipher/package.nix +++ b/pkgs/by-name/sq/sqlcipher/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcipher"; - version = "4.12.0"; + version = "4.13.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; tag = "v${finalAttrs.version}"; - hash = "sha256-dJBZw8SzcNS0GGt9el4tiR7gc2DOajuUVfDukwrVPeQ="; + hash = "sha256-3Qt7nOB0iMyNXfENC3gv3F6sENU7OUTZ3n2mo0M2CSA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ss/sshfs-fuse/common.nix b/pkgs/by-name/ss/sshfs-fuse/common.nix index 404d9c5e3768..6c07df8fe07f 100644 --- a/pkgs/by-name/ss/sshfs-fuse/common.nix +++ b/pkgs/by-name/ss/sshfs-fuse/common.nix @@ -66,6 +66,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin" ''; + outputs = [ + "out" + "man" + ]; + # doCheck = true; checkPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The tests need fusermount: diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 603db600ccd9..d165241db53f 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "syft"; - version = "1.40.1"; + version = "1.41.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-zvLUvBaGI6HXzpsPJSZaF4ni6tbEdZizY7KNSpzYXUo="; + hash = "sha256-ytABOKqW1wUl715JW9QD3twwXLq77x0PlIlFwQbfjjc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-xIy3cVGx8wJektv7b+3YtR2jIBDF920762y7Gsc22nI="; + vendorHash = "sha256-fofpT8OidlOUR8Q/xlE1axxCKl+FiRe0huTYhS2IPmQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index 43e6eaa62bf2..39b2b53ab03c 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -23,13 +23,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.21.1"; + version = "0.21.1-unstable-2026-01-26"; src = fetchFromGitHub { owner = "mozilla-services"; repo = "syncstorage-rs"; - tag = version; - hash = "sha256-WkUU6013sdLMh3hq9CE/D5+ftpdisihVD6W+FvjwbP4="; + rev = "11659d98f9c69948a0aab353437ce2036c388711"; + hash = "sha256-G37QvxTNh/C3gmKG0UYHI6QBr0F+KLGRNI/Sx33uOsc="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoHash = "sha256-V6shIxNpw+WHqypNgE02Sr7DO8l3H9tb72a1u2UHDfo="; + cargoHash = "sha256-9Dcf5mDyK/XjsKTlCPXTHoBkIq+FFPDg1zfK24Y9nHQ="; # almost all tests need a DB to test against doCheck = false; diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 9ac585130f2f..36b6e393f081 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.94.0"; + version = "1.94.1"; outputs = [ "out" @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-kwIWUKKXBz0rmiicLEaR4d3T94aA4VqiVrFFV9vk7g0="; + hash = "sha256-jk4C2xw6vKIjo5F+FHRNTgNGZ7Zl+Hgpl84xeptCs1g="; }; vendorHash = "sha256-WeMTOkERj4hvdg4yPaZ1gRgKnhRIBXX55kUVbX/k/xM="; diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index e1de49bc5b8f..7d30160aac5d 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -28,11 +28,11 @@ in stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.14"; + version = "1.4.15"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-FE9AfULteg7BRwpA7xetQRM/6RC86GXdn+CE1JyQdSY="; + hash = "sha256-+6CdjfHxuQcq6ujniyvUPFr+8gsvbe76YzqhSjd6jdI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/terraria-server/package.nix b/pkgs/by-name/te/terraria-server/package.nix index 5129241700cd..a19b3c102f92 100644 --- a/pkgs/by-name/te/terraria-server/package.nix +++ b/pkgs/by-name/te/terraria-server/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.4.4.9"; + version = "1.4.5.0"; urlVersion = lib.replaceStrings [ "." ] [ "" ] version; src = fetchurl { url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; - sha256 = "sha256-Mk+5s9OlkyTLXZYVT0+8Qcjy2Sb5uy2hcC8CML0biNY="; + hash = "sha256-PRA7cCFL2WJlT5Bat24PSgs9rhLu4C2mu5zWbut3kdQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/th/theharvester/package.nix b/pkgs/by-name/th/theharvester/package.nix index 2e1a5ae71fb5..a82aab714acf 100644 --- a/pkgs/by-name/th/theharvester/package.nix +++ b/pkgs/by-name/th/theharvester/package.nix @@ -4,16 +4,16 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "theharvester"; - version = "4.9.2"; + version = "4.10.0"; pyproject = true; src = fetchFromGitHub { owner = "laramies"; repo = "theharvester"; - tag = version; - hash = "sha256-ZD5nFjhunD6miBBgCp7r82l/zIbLjHSj1jghXGav8hI="; + tag = finalAttrs.version; + hash = "sha256-PDFKDm1amqmdYo/avxudWZ9Xhp16Cw4ejmUAQ+BlvC0="; }; pythonRelaxDeps = true; @@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec { aiodns aiofiles aiohttp + aiohttp-socks aiomultiprocess aiosqlite beautifulsoup4 @@ -71,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { gathers emails, names, subdomains, IPs, and URLs using multiple public data sources. ''; homepage = "https://github.com/laramies/theHarvester"; - changelog = "https://github.com/laramies/theHarvester/releases/tag/${src.tag}"; + changelog = "https://github.com/laramies/theHarvester/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ c0bw3b @@ -80,4 +81,4 @@ python3.pkgs.buildPythonApplication rec { ]; mainProgram = "theHarvester"; }; -} +}) diff --git a/pkgs/by-name/th/threema-desktop/package.nix b/pkgs/by-name/th/threema-desktop/package.nix index 6b6420e5b44b..b8862855da58 100644 --- a/pkgs/by-name/th/threema-desktop/package.nix +++ b/pkgs/by-name/th/threema-desktop/package.nix @@ -10,12 +10,12 @@ }: let - version = "1.2.48"; + version = "1.2.49"; electronSrc = fetchFromGitHub { owner = "threema-ch"; repo = "threema-web-electron"; tag = version; - hash = "sha256-u1rzKFDrLxU/o7Oc2o/WBwbAncNWKJ9GAUBaNDPViZI="; + hash = "sha256-8Zy+LMxszqCT17FFz8sEMAtBSTXhU/F2Nz9MfEA82xw="; }; threema-web = buildNpmPackage rec { @@ -54,7 +54,7 @@ let inherit version; src = electronSrc; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-mafB7lC1YpIZ71R6IT3TnSzFDieK4AsAzIqpWcy9480="; + npmDepsHash = "sha256-Nn1WIyGRAG009GlJIedl0QUeKLalY+H3Mj8w4J1GE6I="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; dontNpmBuild = true; prePatch = '' @@ -73,7 +73,7 @@ buildNpmPackage rec { inherit version; src = electronSrc; - npmDepsHash = "sha256-A7XvzURCCM0+ISlSLpnreFIxKku4FnVdWLsF2WxQfBY="; + npmDepsHash = "sha256-i37rIAIhoIU9tnioyhPFR1GWBfygMREZ0HCYE7ujXuE="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/ts/tsgolint/package.nix b/pkgs/by-name/ts/tsgolint/package.nix index 3a28d20f94e0..d7ad26cc72d3 100644 --- a/pkgs/by-name/ts/tsgolint/package.nix +++ b/pkgs/by-name/ts/tsgolint/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "tsgolint"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "oxc-project"; repo = "tsgolint"; tag = "v${finalAttrs.version}"; - hash = "sha256-s+rXbUrP/mJiqUruFUlzz8gxG4LDfvFRLKmlUIOcFho="; + hash = "sha256-Gby8JW3bwVOIuNgLCIIt0y3egdljrR5cgbqAGqqqzpI="; fetchSubmodules = true; }; @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { ''; proxyVendor = true; - vendorHash = "sha256-CGgLQKNGMKqIjfBnR7Uv6TwOfukfLX3hpLmSNHAZRv8="; + vendorHash = "sha256-pCmPL0OVwclCV5riL8wozCiQA2zRDafBKTxdkt/q3ns="; subPackages = [ "cmd/tsgolint" ]; diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index f710d42d58e8..b8d38fd14f4d 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "turbo-unwrapped"; - version = "2.7.3"; + version = "2.7.6"; src = fetchFromGitHub { owner = "vercel"; repo = "turborepo"; tag = "v${finalAttrs.version}"; - hash = "sha256-DLe3gCMSSB8464DAKnzDk6iJVVL2yL02+1sUOGbdGxI="; + hash = "sha256-skpTDC27F2S+rKB+24+I1OxgDX6AmdI9QwnUAr0Ps4o="; }; - cargoHash = "sha256-1M0EGZIiYkQcEByKZFRVEfWDp9Yb/kHr/VijRFNronk="; + cargoHash = "sha256-47ATXzlArTT+QsQvCQ7AfnFOXxTbPfXqmMS3zIimkEc="; nativeBuildInputs = [ capnproto @@ -82,6 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo + hythera ]; mainProgram = "turbo"; }; diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 250c486dc1af..512c3b258d13 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-2KPnFNutndxE5ap0E9BCL5w6vpnfow8GIY4/N9dgYy8="; + hash = "sha256-8mpTz0X7rV+lNX/qyWywomkBVY0Gq9UrKF8pv5dNlcI="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-E/kR6AxzpIqKMM80+ute5Z6LUL5f39RYfj7BnGOg6V4="; + cargoHash = "sha256-8W37Ul7hx99rSbzGsVKp5burq0D55I+dezidYfJ60a8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ua/uavs3d/package.nix b/pkgs/by-name/ua/uavs3d/package.nix index 47898d8d5ce4..39a0d4c7d612 100644 --- a/pkgs/by-name/ua/uavs3d/package.nix +++ b/pkgs/by-name/ua/uavs3d/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uavs3d"; - version = "1.1-unstable-2023-02-23"; + version = "1.1-unstable-2025-12-13"; src = fetchFromGitHub { owner = "uavs3"; repo = "uavs3d"; - rev = "1fd04917cff50fac72ae23e45f82ca6fd9130bd8"; - hash = "sha256-ZSuFgTngOd4NbZnOnw4XVocv4nAR9HPkb6rP2SASLrM="; + rev = "0e20d2c291853f196c68922a264bcd8471d75b68"; + hash = "sha256-SlCGLglBsU3ua406Bnf89c4X80F5B93piF2sAXqtRus="; }; cmakeFlags = [ diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix index b036b9b6de29..ccdd41171b97 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -13,12 +13,12 @@ let pname = "uhk-agent"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-QMs4xCXOuxDNlWcprUsb/+RvTcW83nkUcoH9/Oi0OYY="; + sha256 = "sha256-/DgXushqByEbvbQhmzwXIdmaKWEJL40X6HpV6SUKieY="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix index 64fed0f6eed2..f471f10b6a27 100644 --- a/pkgs/by-name/up/uptime-kuma/package.nix +++ b/pkgs/by-name/up/uptime-kuma/package.nix @@ -47,7 +47,10 @@ buildNpmPackage (finalAttrs: { homepage = "https://github.com/louislam/uptime-kuma"; changelog = "https://github.com/louislam/uptime-kuma/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ julienmalka ]; + maintainers = with lib.maintainers; [ + julienmalka + felixsinger + ]; # FileNotFoundError: [Errno 2] No such file or directory: 'xcrun' broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix index 58e18a152554..facfd2dff1c1 100644 --- a/pkgs/by-name/v2/v2raya/package.nix +++ b/pkgs/by-name/v2/v2raya/package.nix @@ -18,13 +18,13 @@ }: let pname = "v2raya"; - version = "2.2.7.4"; + version = "2.2.7.5"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; tag = "v${version}"; - hash = "sha256-Dr9RKVGt5zjUOVwUAXe2m8F29Z64BhyrmuLYGwZMd0A="; + hash = "sha256-aa/Eb+fZQ1hwm6H7wb7mr0b4tCu12Mhy14OXNjZUJ0Y="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix index d8b154652483..adf88f4a2027 100644 --- a/pkgs/by-name/vi/viceroy/package.nix +++ b/pkgs/by-name/vi/viceroy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "fastly"; repo = "viceroy"; rev = "v${version}"; - hash = "sha256-LVzpf5JDhL0zzKp+/loj3Et5R7fZh4h28eEO51VtKqc="; + hash = "sha256-KeFKh8ZAUJXBUo0MRw/jU0HnBrehX0YkvbvMUX8ovcA="; }; - cargoHash = "sha256-gXwpdWE7Te0ngGUu6meaIpY6lUX1yh8pu5G9KVSNNME="; + cargoHash = "sha256-PoexldRTp2cPu7iF7te//kO4Ph1P6A/jNZdMkYKERqM="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/by-name/vi/viennarna/package.nix b/pkgs/by-name/vi/viennarna/package.nix index 61cf15ea0db0..3231c61f2b2a 100644 --- a/pkgs/by-name/vi/viennarna/package.nix +++ b/pkgs/by-name/vi/viennarna/package.nix @@ -2,20 +2,20 @@ lib, stdenv, fetchurl, + pkg-config, dlib, gsl, mpfr, perl, python3, }: - stdenv.mkDerivation rec { pname = "viennarna"; - version = "2.7.0"; + version = "2.7.2"; src = fetchurl { url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_7_x/ViennaRNA-${version}.tar.gz"; - hash = "sha256-mpn9aO04CJTe+01eaooocWKScAKM338W8KBdpujHFHM="; + hash = "sha256-GrX0pPdvyFoiQ1RgiORfXYXy16VsxlbpabAFzOm/q18="; }; # use nixpkgs dlib sources instead of bundled ones @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { find ./src/dlib-19.24 -type d -exec chmod +w {} \; ''; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ gsl mpfr diff --git a/pkgs/by-name/vi/vikunja-desktop/package.nix b/pkgs/by-name/vi/vikunja-desktop/package.nix new file mode 100644 index 000000000000..0e478625d529 --- /dev/null +++ b/pkgs/by-name/vi/vikunja-desktop/package.nix @@ -0,0 +1,123 @@ +{ + lib, + stdenv, + makeWrapper, + makeDesktopItem, + pnpm, + pnpmConfigHook, + nodejs, + electron, + unstableGitUpdater, + fetchFromGitHub, + fetchPnpmDeps, + vikunja, +}: + +let + executableName = "vikunja-desktop"; + version = "0.24.6"; + src = fetchFromGitHub { + owner = "go-vikunja"; + repo = "vikunja"; + rev = "v${version}"; + hash = "sha256-yUUZ6gPI2Bte36HzfUE6z8B/I1NlwWDSJA2pwkuzd34="; + }; +in +stdenv.mkDerivation (finalAttrs: { + name = "vikunja-desktop-${version}"; + pname = finalAttrs.name; + inherit version src; + + sourceRoot = "${finalAttrs.src.name}/desktop"; + pnpmInstallFlags = [ "--shamefully-hoist" ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + sourceRoot + pnpmInstallFlags + ; + fetcherVersion = 1; + hash = "sha256-orFwjmS1KF82JiQa+BE92YOtKsnYiKVzLXrpjtbe1z8="; + }; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + pnpm + pnpmConfigHook + vikunja.passthru.frontend + ]; + + buildPhase = '' + runHook preBuild + + sed -i "s/\$${version}/${version}/g" package.json + sed -i "s/\"version\": \".*\"/\"version\": \"${version}\"/" package.json + ln -s '${vikunja.passthru.frontend}' frontend + pnpm run pack -c.electronDist="${electron.dist}" -c.electronVersion="${electron.version}" + + runHook postBuild + ''; + + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/lib/vikunja-desktop" + cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/vikunja-desktop" + cp -r ./node_modules "$out/share/lib/vikunja-desktop/resources" + + install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/vikunja-desktop.png" + + # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion + # see https://github.com/NixOS/nixpkgs/issues/172583 + makeShellWrapper "${lib.getExe electron}" "$out/bin/vikunja-desktop" \ + --add-flags "$out/share/lib/vikunja-desktop/resources/app.asar" \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + runHook postInstall + ''; + + # Do not attempt generating a tarball for vikunja-frontend again. + distPhase = '' + true + ''; + + passthru.updateScript = unstableGitUpdater { + url = "${src.meta.homepage}.git"; + }; + + # The desktop item properties should be kept in sync with data from upstream: + desktopItem = makeDesktopItem { + name = "vikunja-desktop"; + exec = executableName; + icon = "vikunja"; + desktopName = "Vikunja Desktop"; + genericName = "To-Do list app"; + comment = finalAttrs.meta.description; + categories = [ + "ProjectManagement" + "Office" + ]; + }; + + meta = with lib; { + description = "Desktop App of the Vikunja to-do list app"; + homepage = "https://vikunja.io/"; + license = licenses.gpl3Plus; + maintainers = with lib.maintainers; [ kolaente ]; + mainProgram = "vikunja-desktop"; + inherit (electron.meta) platforms; + }; +}) diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index cde985c5b1fb..b3f2b75a538e 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -131,7 +131,10 @@ buildGoModule { runHook postInstall ''; - passthru.tests.vikunja = nixosTests.vikunja; + passthru = { + tests.vikunja = nixosTests.vikunja; + frontend = frontend; + }; meta = { changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; diff --git a/pkgs/by-name/vj/vja/package.nix b/pkgs/by-name/vj/vja/package.nix new file mode 100644 index 000000000000..65c683a25c8f --- /dev/null +++ b/pkgs/by-name/vj/vja/package.nix @@ -0,0 +1,44 @@ +{ + lib, + python3, + fetchFromGitLab, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "vja"; + version = "4.10.1"; + pyproject = true; + + src = fetchFromGitLab { + owner = "ce72"; + repo = "vja"; + tag = version; + hash = "sha256-J2GX0t7hPLqqI2n8H0kDboGfpRff3+lHM3026fTX5rs="; + }; + + build-system = [ + python3.pkgs.setuptools + python3.pkgs.wheel + ]; + + dependencies = with python3.pkgs; [ + click + click-aliases + parsedatetime + python-dateutil + requests + ]; + + pythonImportsCheck = [ + "vja" + ]; + + meta = { + description = "Command line interface for Vikunja"; + homepage = "https://gitlab.com/ce72/vja"; + changelog = "https://gitlab.com/ce72/vja/-/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + mainProgram = "vja"; + maintainers = with lib.maintainers; [ iv-nn ]; + }; +} diff --git a/pkgs/by-name/vv/vvenc/package.nix b/pkgs/by-name/vv/vvenc/package.nix index f28ab0e0d436..25d08a97f4f2 100644 --- a/pkgs/by-name/vv/vvenc/package.nix +++ b/pkgs/by-name/vv/vvenc/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vvenc"; - version = "1.13.1"; + version = "1.14.0"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fraunhoferhhi"; repo = "vvenc"; tag = "v${finalAttrs.version}"; - hash = "sha256-DPR1HmUYTjhKI+gTHERtxqThZ5oKKMoqYsfE709IrhA="; + hash = "sha256-MZVXxUXpcZ16de3CZDscLOlnqjHkGZ98muhYCDCcgvs="; }; patches = [ ./unset-darwin-cmake-flags.patch ]; diff --git a/pkgs/by-name/wa/wafw00f/package.nix b/pkgs/by-name/wa/wafw00f/package.nix index eff94bfd933b..eb3103bb7068 100644 --- a/pkgs/by-name/wa/wafw00f/package.nix +++ b/pkgs/by-name/wa/wafw00f/package.nix @@ -4,16 +4,16 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "wafw00f"; - version = "2.3.2"; + version = "2.4.2"; pyproject = true; src = fetchFromGitHub { owner = "EnableSecurity"; repo = "wafw00f"; - tag = "v${version}"; - hash = "sha256-nJNJAmSjEYKgqVYcNDIL8O6AQzK6DrIN8P4U0s/PWQM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vGTqgvAVO6fbgRN5V5HhlKFrI9Z2XZaAjI1L19RIi9U="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -31,9 +31,9 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool to identify and fingerprint Web Application Firewalls (WAF)"; homepage = "https://github.com/EnableSecurity/wafw00f"; - changelog = "https://github.com/EnableSecurity/wafw00f/releases/tag/v${version}"; + changelog = "https://github.com/EnableSecurity/wafw00f/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; mainProgram = "wafw00f"; }; -} +}) diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index a75340dbdfc4..1117f7331857 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "wakatime-cli"; - version = "1.137.0"; + version = "1.139.1"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; tag = "v${version}"; - hash = "sha256-k749C9TLmNv5jDuAQcMzxb2FksEuZbZcr8R6y0u96nc="; + hash = "sha256-yqEoFXVP64WcGCCAtMd1bYStCnsd9T8chQWgjaVkwkk="; }; - vendorHash = "sha256-oCSIXon2/G42wXfaQqr3z0IiiNt7fkYui5X2MxhJagg="; + vendorHash = "sha256-1BtTtR8wPVzzOEGv3te3hOeKakZX7cS+HYvoCLnuZ/c="; ldflags = [ "-s" diff --git a/pkgs/by-name/wa/wallust/package.nix b/pkgs/by-name/wa/wallust/package.nix index 5653df37b2e9..33d95f29d367 100644 --- a/pkgs/by-name/wa/wallust/package.nix +++ b/pkgs/by-name/wa/wallust/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wallust"; - version = "3.4.0"; + version = "3.5.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "explosion-mental"; repo = "wallust"; rev = finalAttrs.version; - hash = "sha256-tNlSRdldzAXpM3x4XGVZeidwhplYu7xR7h7qPELaasE="; + hash = "sha256-ZgkeM9gMw9TB5NR+xyxBepKHO16bLVVFJN4IY39gllg="; }; - cargoHash = "sha256-7x217i1htwHoIc+uvYNwpefIRnPRV7RI0f4c4R2k8tU="; + cargoHash = "sha256-XrIi+8p2OZ7O6MTgqKbgN/9gLUbvB7uN9Yr2X1BYHIU="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix index 03c634a84b7a..9b1dd141fd73 100644 --- a/pkgs/by-name/xe/xen/package.nix +++ b/pkgs/by-name/xe/xen/package.nix @@ -186,6 +186,18 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./0002-scripts-external-executable-calls.patch scriptDeps) + # XSA #477 + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa477.patch"; + hash = "sha256-c9i61GvHPiLwMGvd+5IKgUwyu/NPub+mtnxUPHW/HhI="; + }) + + # XSA #479 + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa479.patch"; + hash = "sha256-2o6RYyT4Nrg1le6BUOQ3AwedorCvxvKao2uMYWrUV1Y="; + }) + # patch `libxl` to search for `qemu-system-i386` properly. (Before 4.21) (fetchpatch { url = "https://github.com/xen-project/xen/commit/f6281291704aa356489f4bd927cc7348a920bd01.diff?full_index=1"; diff --git a/pkgs/by-name/xf/xf86-video-ast/package.nix b/pkgs/by-name/xf/xf86-video-ast/package.nix index c8283bafd934..541cc6da00bd 100644 --- a/pkgs/by-name/xf/xf86-video-ast/package.nix +++ b/pkgs/by-name/xf/xf86-video-ast/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-ast"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "driver"; repo = "xf86-video-ast"; tag = "xf86-video-ast-${finalAttrs.version}"; - hash = "sha256-5fZ0+6Jf/QBuR9l2lOsh4RQEGKrR9XttEvwOVO8w3t4="; + hash = "sha256-Xz9ZvngAsEb/9+YOGOkJQIbFzofKw+2V6sST8Ry2tvo="; }; strictDeps = true; diff --git a/pkgs/by-name/xf/xf86-video-geode/package.nix b/pkgs/by-name/xf/xf86-video-geode/package.nix index dba6eaf99ee3..12e7a188392b 100644 --- a/pkgs/by-name/xf/xf86-video-geode/package.nix +++ b/pkgs/by-name/xf/xf86-video-geode/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-geode"; - version = "2.18.1"; + version = "2.18.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "driver"; repo = "xf86-video-geode"; tag = "xf86-video-geode-${finalAttrs.version}"; - hash = "sha256-y9fQpMg6qKjaQvDfqYbWscFomtzmHQ1cvzMaa4anhOE="; + hash = "sha256-G0w6Ft172ar5dwR3NAu+8vuvJqWKaknmpbdThpPR+kY="; }; strictDeps = true; diff --git a/pkgs/by-name/xf/xf86-video-nested/package.nix b/pkgs/by-name/xf/xf86-video-nested/package.nix new file mode 100644 index 000000000000..59e712a32050 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-nested/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorgproto, + libx11, + libxext, + xorg-server, +}: + +stdenv.mkDerivation { + pname = "xf86-video-nested"; + version = "0-unstable-2024-10-26"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-nested"; + rev = "03dab66493622835a29b873cd63df489f1a96ed9"; + hash = "sha256-EPQOcE23m6RSG05txjBjREBz9JlwZrmK4Rn6Fg2IyT4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ]; + + buildInputs = [ + xorg-server + xorgproto + libx11 + libxext + ]; + + meta = { + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested"; + description = "Video ddriver to run Xorg on top of another X server"; + maintainers = [ ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/by-name/xf/xf86_video_nested/package.nix b/pkgs/by-name/xf/xf86_video_nested/package.nix deleted file mode 100644 index 99c486d13c15..000000000000 --- a/pkgs/by-name/xf/xf86_video_nested/package.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoreconfHook, - xorgproto, - libX11, - libXext, - pixman, - pkg-config, - utilmacros, - xorgserver, -}: - -stdenv.mkDerivation { - pname = "xf86-video-nested"; - version = "unstable-2017-06-12"; - - src = fetchgit { - url = "git://anongit.freedesktop.org/xorg/driver/xf86-video-nested"; - rev = "6a48b385c41ea89354d0b2ee7f4649a1d1d9ec70"; - sha256 = "133rd2kvr2q2wmwpx82bb93qbi8wm8qp1vlmbhgc7aslz0j4cqqv"; - }; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - - buildInputs = [ - xorgproto - libX11 - libXext - pixman - utilmacros - xorgserver - ]; - - hardeningDisable = [ "fortify" ]; - - CFLAGS = "-I${pixman}/include/pixman-1"; - - meta = { - homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; - description = "Driver to run Xorg on top of Xorg or something else"; - maintainers = [ ]; - platforms = lib.platforms.linux; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix index 5215bb23ba86..d05b83e9280c 100644 --- a/pkgs/by-name/xf/xfsprogs/package.nix +++ b/pkgs/by-name/xf/xfsprogs/package.nix @@ -106,8 +106,5 @@ stdenv.mkDerivation rec { dezgeg ajs124 ]; - # error: ‘struct statx’ has no member named ‘stx_atomic_write_unit_min’ ‘stx_atomic_write_unit_max’ ‘stx_atomic_write_segments_max’ - # remove if https://www.openwall.com/lists/musl/2024/10/23/6 gets merged - broken = stdenv.hostPlatform.isMusl; }; } diff --git a/pkgs/by-name/xk/xkill/package.nix b/pkgs/by-name/xk/xkill/package.nix index 9577eb13c53b..ed7cca269274 100644 --- a/pkgs/by-name/xk/xkill/package.nix +++ b/pkgs/by-name/xk/xkill/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xkill"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "mirror://xorg/individual/app/xkill-${finalAttrs.version}.tar.xz"; - hash = "sha256-5aiqeMR1Z3sRUEZG2o2T2swwdEJYB2ospBiiRDiuuQc="; + hash = "sha256-X/JkvE7rwEWSVakgNtyNyEttSMrvhQn4ing76q3qdQs="; }; strictDeps = true; diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix index 75f23f102616..0bfdb8d85901 100644 --- a/pkgs/by-name/xr/xrgears/package.nix +++ b/pkgs/by-name/xr/xrgears/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { pname = "xrgears"; - version = "1.0.1-unstable-2025-03-03"; + version = "1.0.1-unstable-2026-01-20"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "demos/xrgears"; - rev = "caa21e13c2de83d33fb617c8f9b70a0d77c82453"; - sha256 = "sha256-VAcH+3yokDnUbFYldQOrkUi+WgcTnk6gBeKScyAyv6c="; + rev = "034d3dbb17beb4e393f1524a8508fb353bafebea"; + sha256 = "sha256-nbAwR4bFBSv2tYJgX3uH318uyRGfz9Qxsj+bAxagqIg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index fe69c9dcdc5e..8d7057b212e2 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "yara-x"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; tag = "v${finalAttrs.version}"; - hash = "sha256-UE5x9w9I4l9OqRVv6klveEvIap+El6vea6OsnnOJHus="; + hash = "sha256-od7RWHhyFQ7l3HZaqpOkUVtiWKDQj/tUsd5lGi6m34I="; }; - cargoHash = "sha256-rQ8uBgsJ86K0Qc3uTiFDPmcRU+dF5gu0b5pzMcGAAVU="; + cargoHash = "sha256-YW4Yi1gvMjTNAgsAlyX1KMlyQPHCXh/jAoO/Nkrn2Sc="; CARGO_PROFILE_RELEASE_LTO = "fat"; CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; diff --git a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix index 381954efcaab..c89fd10e2518 100644 --- a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "yatline.yazi"; - version = "25.5.31-unstable-2026-01-21"; + version = "25.12.29-unstable-2026-01-27"; src = fetchFromGitHub { owner = "imsi32"; repo = "yatline.yazi"; - rev = "3227a30b21f69b68df513754b5a00d6e75cece57"; - hash = "sha256-yhptHABQ0alVab2i367D5grJyG7SrfHH8H4JuGeYFyk="; + rev = "c5d4b487d6277dd68ea9d3c6537641bf4ae9cf8e"; + hash = "sha256-HjTRAfUHs6vlEWKruQWeA2wT/Mcd+WEHM90egFTYcWQ="; }; meta = { diff --git a/pkgs/by-name/ze/zenmonitor/package.nix b/pkgs/by-name/ze/zenmonitor/package.nix index 1fa30ef1c5f7..1dea44a53e2e 100644 --- a/pkgs/by-name/ze/zenmonitor/package.nix +++ b/pkgs/by-name/ze/zenmonitor/package.nix @@ -1,21 +1,21 @@ { lib, stdenv, - fetchFromGitLab, + fetchFromGitHub, pkg-config, gtk3, wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zenmonitor"; - version = "unstable-2024-12-19"; + version = "unstable-2025-06-12"; - src = fetchFromGitLab { - owner = "shdwchn10"; + src = fetchFromGitHub { + owner = "detiam"; repo = "zenmonitor3"; - rev = "a09f0b25d33967fd32f3831304be049b008cdabf"; - sha256 = "sha256-5N1Hhv2s0cv4Rujw4wFGHyIy7NyKAFThVvAo+xXqSyk="; + rev = "1e1ceec7353dc418578fe8ae56536bfee6adeca3"; + sha256 = "sha256-q5BeLu0A2XJkJL8ptN4hj/iLhQmpb16QEhOuIhNzVaI="; }; buildInputs = [ gtk3 ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { - inherit (src.meta) homepage; description = "Monitoring software for AMD Zen-based CPUs"; + homepage = "https://github.com/detiam/zenmonitor3"; mainProgram = "zenmonitor"; license = lib.licenses.mit; platforms = [ diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 881a374ff21a..aa5c08282527 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -161,6 +161,9 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; + # Fix build with gcc15 (-std=gnu23) + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu17"; + mesonFlags = [ "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 41cf9a49fb72..7d79b09e8662 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -194,6 +194,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 libepoxy + ] + ++ lib.optionals (lib.versionAtLeast flutterVersion "3.41") [ + at-spi2-atk + glib ]; dontPatch = true; @@ -270,6 +274,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/flutter/third_party/dart/runtime/bin/process_linux.cc \ --replace-fail "(unsigned int first, unsigned int last, int flags)" "(unsigned int first, unsigned int last, int flags) noexcept(true)" '' + # src/flutter/third_party/libcxx/include/__type_traits/is_referenceable.h:33:1: error: templates must have C++ linkage + + lib.optionalString (lib.versionAtLeast flutterVersion "3.41") '' + substituteInPlace src/flutter/shell/platform/linux/fl_view_accessible.cc \ + --replace-fail "// Workaround missing C code compatibility in ATK header." "#include " + '' + '' popd ''; diff --git a/pkgs/development/compilers/flutter/versions/3_41/data.json b/pkgs/development/compilers/flutter/versions/3_41/data.json new file mode 100644 index 000000000000..7ae21147540c --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_41/data.json @@ -0,0 +1,1090 @@ +{ + "version": "3.41.0-0.1.pre", + "engineVersion": "d8756bc5ef1a76d727745d21fd1cf195340c1020", + "engineSwiftShaderHash": "sha256-qbtCl2nTpmtp9dnaoXc7rF3RqLnAZEmzw1BzPoCRWrc=", + "engineSwiftShaderRev": "794b0cfce1d828d187637e6d932bae484fbe0976", + "channel": "beta", + "engineHashes": { + "aarch64-linux": { + "aarch64-linux": "sha256-yYYGQB2KKjbZxeAiq22sNUcendh3MKy6fGWU9BGyQ+U=", + "x86_64-linux": "sha256-yYYGQB2KKjbZxeAiq22sNUcendh3MKy6fGWU9BGyQ+U=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-q/KfydE5uUMXAu2tF2xTrkBlTnbnrNN6XZbd0ExOdtk=", + "x86_64-linux": "sha256-q/KfydE5uUMXAu2tF2xTrkBlTnbnrNN6XZbd0ExOdtk=" + } + }, + "dartVersion": "3.11.0-296.4.beta", + "dartHash": { + "x86_64-linux": "sha256-7K4IreZXaF9l8XL544miwKs5GjhxWQE51otR6cD0Qkk=", + "aarch64-linux": "sha256-5aQGrc1GD8hfut0qnGH+u4TcrHzCm0fM9rvu0dFGSQk=", + "x86_64-darwin": "sha256-/hifcVYo3B18i/77KCtYfHb1kj4ZdcIIaKBpo04BW/Q=", + "aarch64-darwin": "sha256-HRucig/9pSM9Z2EbRRjyL3/3BNz+63J76dMwBnjVuPY=" + }, + "flutterHash": "sha256-7y48/WTa3updXsMCXUUuEwucLPYD8SErAyr0CAvrNKU=", + "artifactHashes": { + "android": { + "aarch64-darwin": "sha256-CjNjxLgC89UkhAAkMtId5aMt41KxORT/IIn3U3NUF3g=", + "aarch64-linux": "sha256-KyDzSlQoZvnJA5UHstizry6nt7fr9xvEuHHnLlYO47I=", + "x86_64-darwin": "sha256-CjNjxLgC89UkhAAkMtId5aMt41KxORT/IIn3U3NUF3g=", + "x86_64-linux": "sha256-KyDzSlQoZvnJA5UHstizry6nt7fr9xvEuHHnLlYO47I=" + }, + "fuchsia": { + "aarch64-darwin": "sha256-La0NcuyWFmm+9hbqSueEH64Y5eS8qQIOMPFm4Fhpabw=", + "aarch64-linux": "sha256-La0NcuyWFmm+9hbqSueEH64Y5eS8qQIOMPFm4Fhpabw=", + "x86_64-darwin": "sha256-La0NcuyWFmm+9hbqSueEH64Y5eS8qQIOMPFm4Fhpabw=", + "x86_64-linux": "sha256-La0NcuyWFmm+9hbqSueEH64Y5eS8qQIOMPFm4Fhpabw=" + }, + "ios": { + "aarch64-darwin": "sha256-e1ZS2zS++jsYC9KgPSvLO4flwc60PGAPA7Kn1fFnSa8=", + "aarch64-linux": "sha256-e1ZS2zS++jsYC9KgPSvLO4flwc60PGAPA7Kn1fFnSa8=", + "x86_64-darwin": "sha256-e1ZS2zS++jsYC9KgPSvLO4flwc60PGAPA7Kn1fFnSa8=", + "x86_64-linux": "sha256-e1ZS2zS++jsYC9KgPSvLO4flwc60PGAPA7Kn1fFnSa8=" + }, + "linux": { + "aarch64-darwin": "sha256-LSkd7OoN0znxoqklUFAkP2U9N10CPs+0YOcCS/WgUPs=", + "aarch64-linux": "sha256-LSkd7OoN0znxoqklUFAkP2U9N10CPs+0YOcCS/WgUPs=", + "x86_64-darwin": "sha256-5Zy1Oksof7z00f1j2IMiQFIqrvAMx/L7pFbUb7vh3AE=", + "x86_64-linux": "sha256-5Zy1Oksof7z00f1j2IMiQFIqrvAMx/L7pFbUb7vh3AE=" + }, + "macos": { + "aarch64-darwin": "sha256-7ZvSoZX/I4DarIHMIJMcWZFvvj499iPu6nIL7iqQq60=", + "aarch64-linux": "sha256-7ZvSoZX/I4DarIHMIJMcWZFvvj499iPu6nIL7iqQq60=", + "x86_64-darwin": "sha256-7ZvSoZX/I4DarIHMIJMcWZFvvj499iPu6nIL7iqQq60=", + "x86_64-linux": "sha256-7ZvSoZX/I4DarIHMIJMcWZFvvj499iPu6nIL7iqQq60=" + }, + "universal": { + "aarch64-darwin": "sha256-0konzDQ0QMyBuycsY5hvynWaPpZymHcPxamRGS67fDc=", + "aarch64-linux": "sha256-kbEu2lIoxKNv5l1HSdCyUOc/azqFrRrAIVdeJ8PImJY=", + "x86_64-darwin": "sha256-A21agBBzBU08eQcR2yHGxN7rKlbh8uxXZDPHTLwK1CE=", + "x86_64-linux": "sha256-2gXvsNQFsTUbGVhqm6ngBa+dCv+ZN42zCHpIoheBFLg=" + }, + "web": { + "aarch64-darwin": "sha256-kRfdhiSstiC6IFgYIhOCz5SgJdqcx9mPcq0AFqNUr1A=", + "aarch64-linux": "sha256-kRfdhiSstiC6IFgYIhOCz5SgJdqcx9mPcq0AFqNUr1A=", + "x86_64-darwin": "sha256-kRfdhiSstiC6IFgYIhOCz5SgJdqcx9mPcq0AFqNUr1A=", + "x86_64-linux": "sha256-kRfdhiSstiC6IFgYIhOCz5SgJdqcx9mPcq0AFqNUr1A=" + }, + "windows": { + "x86_64-darwin": "sha256-tGpjWn6XrOQkGDKn0eu39gBQREaYsiK3ygE/SAF0Jag=", + "x86_64-linux": "sha256-tGpjWn6XrOQkGDKn0eu39gBQREaYsiK3ygE/SAF0Jag=" + } + }, + "pubspecLock": { + "packages": { + "_fe_analyzer_shared": { + "dependency": "direct main", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "92.0.0" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "boolean_selector": { + "dependency": "direct main", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "ca2557663d3033845f2ef2b60f94fc249528324fd1affddccb7c63ac0ccd6c67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "built_collection": { + "dependency": "direct main", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "direct main", + "description": { + "name": "built_value", + "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.1" + }, + "checked_yaml": { + "dependency": "direct dev", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "cli_config": { + "dependency": "direct main", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "clock": { + "dependency": "direct main", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "code_assets": { + "dependency": "direct main", + "description": { + "name": "code_assets", + "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "code_builder": { + "dependency": "direct main", + "description": { + "name": "code_builder", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.1" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "completion": { + "dependency": "direct main", + "description": { + "name": "completion", + "sha256": "82fa09800c0b71a2e8396bf3ca6b36b43cd35fe7ba2aeab53b6349ac671d0f5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "direct main", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "csslib": { + "dependency": "direct main", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "dap": { + "dependency": "direct main", + "description": { + "name": "dap", + "sha256": "42b0b083a09c59a118741769e218fc3738980ab591114f09d1026241d2b9c290", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "dart_service_protocol_shared": { + "dependency": "transitive", + "description": { + "name": "dart_service_protocol_shared", + "sha256": "1737875c176d7e3d87bb3a359182828b542fe20a0b34198b8d31a81af5c7a76d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "dart_style": { + "dependency": "direct main", + "description": { + "name": "dart_style", + "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "data_assets": { + "dependency": "direct main", + "description": { + "name": "data_assets", + "sha256": "d8b93648a338f471e576e0ba05f6b5d63a4e0fa447ca839a500267421d9245ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.6" + }, + "dds": { + "dependency": "direct main", + "description": { + "name": "dds", + "sha256": "06d09ee8b4a0b58e721fd3780aa53a80eeec0e14479899b74be39e4bd522c5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.0" + }, + "dds_service_extensions": { + "dependency": "direct main", + "description": { + "name": "dds_service_extensions", + "sha256": "afe0fce921953ac0c5bb276bccd7e36fa5035d7769567d122523fdd09beb4d03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "devtools_shared": { + "dependency": "direct main", + "description": { + "name": "devtools_shared", + "sha256": "275e48a8a145fa09c7ae433a96fd433c01cc079d39b40acf5ba883236ae2c887", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.0" + }, + "dtd": { + "dependency": "direct main", + "description": { + "name": "dtd", + "sha256": "09ddb228b3d1478a093556357692a4c203ff4f9d5f8cda05dfdca0ff3fb7c5d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "982c5727eeb966dbc6099087b6622be3633fef9616ead8d78d3da737d363a077", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "26.2.3" + }, + "extension_discovery": { + "dependency": "direct main", + "description": { + "name": "extension_discovery", + "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "fake_async": { + "dependency": "direct main", + "description": { + "name": "fake_async", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.3" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_testing": { + "dependency": "direct dev", + "description": { + "name": "file_testing", + "sha256": "eb0c85fd118ddc0d41c295c09f64e0924c256b071087cdc9828d5372c80d554d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter_template_images": { + "dependency": "direct main", + "description": { + "name": "flutter_template_images", + "sha256": "0120589a786dbae4e86af1f61748baccd8530abd56a60e7a13479647a75222fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "frontend_server_client": { + "dependency": "direct main", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "hooks": { + "dependency": "direct main", + "description": { + "name": "hooks", + "sha256": "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "hooks_runner": { + "dependency": "direct main", + "description": { + "name": "hooks_runner", + "sha256": "87832cd552d8ddc6014c240ee724f37bc9ea5141aa74a21658b73d22358f43fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.6" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_multi_server": { + "dependency": "direct main", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "direct main", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "js": { + "dependency": "direct dev", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "direct dev", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_rpc_2": { + "dependency": "direct main", + "description": { + "name": "json_rpc_2", + "sha256": "3c46c2633aec07810c3d6a2eb08d575b5b4072980db08f1344e66aeb53d6e4a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "direct main", + "description": { + "name": "matcher", + "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.18" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.17.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "multicast_dns": { + "dependency": "direct main", + "description": { + "name": "multicast_dns", + "sha256": "de72ada5c3db6fdd6ad4ae99452fe05fb403c4bb37c67ceb255ddd37d2b5b1eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3" + }, + "mustache_template": { + "dependency": "direct main", + "description": { + "name": "mustache_template", + "sha256": "daa42be75f2ccfb287c24a75e7ac594f2ea0b32bf9ebe7c15154aa45b2dfb2de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "native_stack_traces": { + "dependency": "direct main", + "description": { + "name": "native_stack_traces", + "sha256": "d34cf916db87b14d39465b3e3b4b4a8ee1f304bde6ed7605571e34802e3d6a11", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.1" + }, + "node_preamble": { + "dependency": "direct dev", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "petitparser": { + "dependency": "direct main", + "description": { + "name": "petitparser", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "platform": { + "dependency": "direct main", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "process": { + "dependency": "direct main", + "description": { + "name": "process", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.5" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "direct main", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "direct main", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "direct main", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "source_map_stack_trace": { + "dependency": "direct main", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "direct main", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "direct main", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "sprintf": { + "dependency": "direct main", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sse": { + "dependency": "direct main", + "description": { + "name": "sse", + "sha256": "fcc97470240bb37377f298e2bd816f09fd7216c07928641c0560719f50603643", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.8" + }, + "stack_trace": { + "dependency": "direct main", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "standard_message_codec": { + "dependency": "direct main", + "description": { + "name": "standard_message_codec", + "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1+4" + }, + "stream_channel": { + "dependency": "direct main", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "string_scanner": { + "dependency": "direct main", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "sync_http": { + "dependency": "direct main", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "term_glyph": { + "dependency": "direct main", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "77cc98ea27006c84e71a7356cf3daf9ddbde2d91d84f77dbfe64cf0e4d9611ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.28.0" + }, + "test_api": { + "dependency": "direct main", + "description": { + "name": "test_api", + "sha256": "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.8" + }, + "test_core": { + "dependency": "direct main", + "description": { + "name": "test_core", + "sha256": "f1072617a6657e5fc09662e721307f7fb009b4ed89b19f47175d11d5254a62d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.14" + }, + "typed_data": { + "dependency": "direct main", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "unified_analytics": { + "dependency": "direct main", + "description": { + "name": "unified_analytics", + "sha256": "ce091b2bec81f26a7d4cf83212380ac314bfa4f6061f8c2168274ba5fd828a23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.10" + }, + "usage": { + "dependency": "direct main", + "description": { + "name": "usage", + "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.2" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "vm_service_interface": { + "dependency": "direct main", + "description": { + "name": "vm_service_interface", + "sha256": "503c92c26cf9f77d688bf8fca27fa9ec40450adbf02ec1ec5f12828ded508ac0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "vm_snapshot_analysis": { + "dependency": "direct main", + "description": { + "name": "vm_snapshot_analysis", + "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "web": { + "dependency": "direct main", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "direct main", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "direct main", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webdriver": { + "dependency": "direct main", + "description": { + "name": "webdriver", + "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "webkit_inspection_protocol": { + "dependency": "direct main", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.6.1" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "ec709065bb2c911b336853b67f3732dd13e0336bd065cc2f1061d7610ddf45e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + } + }, + "sdks": { + "dart": ">=3.10.0-0.0.dev <4.0.0" + } + } +} diff --git a/pkgs/development/compilers/flutter/versions/3_41/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_41/patches/deregister-pub-dependencies-artifact.patch new file mode 100644 index 000000000000..c99d771299fe --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_41/patches/deregister-pub-dependencies-artifact.patch @@ -0,0 +1,21 @@ +diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart +index df67547..eacc7c4 100644 +--- a/packages/flutter_tools/lib/src/flutter_cache.dart ++++ b/packages/flutter_tools/lib/src/flutter_cache.dart +@@ -51,16 +51,6 @@ class FlutterCache extends Cache { + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); + } + registerArtifact(FontSubsetArtifacts(this, platform: platform)); +- registerArtifact( +- PubDependencies( +- logger: logger, +- // flutter root and pub must be lazily initialized to avoid accessing +- // before the version is determined. +- flutterRoot: () => Cache.flutterRoot!, +- pub: () => pub, +- projectFactory: projectFactory, +- ), +- ); + } + } + diff --git a/pkgs/development/compilers/flutter/versions/3_41/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_41/patches/disable-auto-update.patch new file mode 100644 index 000000000000..58be974b10db --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_41/patches/disable-auto-update.patch @@ -0,0 +1,29 @@ +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart +index e4e474ab6e..5548599802 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart +@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter -h') for available flutter commands and + + // Populate the cache. We call this before pub get below so that the + // sky_engine package is available in the flutter cache for pub to find. +- if (shouldUpdateCache) { ++ if (false) { + // First always update universal artifacts, as some of these (e.g. + // ios-deploy on macOS) are required to determine `requiredArtifacts`. + final bool offline; +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +index a1104da..1749d65 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -437,11 +437,6 @@ + // Required to support `flutter --version` before artifacts are cached. + await globals.cache.updateAll({DevelopmentArtifact.informative}); + +- globals.flutterVersion.ensureVersionFile(); +- if (await _shouldCheckForUpdates(topLevelResults)) { +- await globals.flutterVersion.checkFlutterVersionFreshness(); +- } +- + // See if the user specified a specific device. + final specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; + if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/versions/3_41/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_41/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 000000000000..9e43b62cbb4d --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_41/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,68 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "//XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -13,24 +13,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" "ios" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" "ios" +-- +2.46.0 diff --git a/pkgs/development/compilers/flutter/versions/3_41/patches/fix-macos-build-macos-assemble-sh.patch b/pkgs/development/compilers/flutter/versions/3_41/patches/fix-macos-build-macos-assemble-sh.patch new file mode 100644 index 000000000000..312ec3a5c1ba --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_41/patches/fix-macos-build-macos-assemble-sh.patch @@ -0,0 +1,59 @@ +Fix for macOS build issue in Flutter >= 3.35 + +Since version 3.35, the behavior of macos_assemble.sh and xcode_backend.sh +is almost identical. This caused the same error for macOS that previously +occurred for iOS. + +Derived from the iOS patch: ./fix-ios-build-xcode-backend-sh.patch + +Example error: +``` +$ flutter run -d macos +Launching lib/main.dart on macOS in debug mode... +Target debug_unpack_macos failed: Error: Flutter failed to create a directory at "//XXXX-flutter-3.35.1-unwrapped/bin/cache/artifacts". +Please ensure that the SDK and/or project is installed in a location that has read/write permissions for the current user. +Failed to copy Flutter framework. +** BUILD FAILED ** +``` + +--- + +diff --git a/packages/flutter_tools/bin/macos_assemble.sh b/packages/flutter_tools/bin/macos_assemble.sh +index 28acf8842..d0f2923df 100644 +--- a/packages/flutter_tools/bin/macos_assemble.sh ++++ b/packages/flutter_tools/bin/macos_assemble.sh +@@ -13,29 +13,13 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="$(dirname "${BASH_SOURCE[0]}")/xcode_backend.dart" + + # Main entry point. + if [[ $# == 0 ]]; then +- "$DART" "$BIN_DIR/xcode_backend.dart" "build" "macos" ++ exec "${dart}" "${xcode_backend_dart}" "build" "macos" + else +- "$DART" "$BIN_DIR/xcode_backend.dart" "$@" "macos" ++ exec "${dart}" "${xcode_backend_dart}" "$@" "macos" + fi diff --git a/pkgs/development/compilers/flutter/versions/3_41/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_41/patches/gradle-flutter-tools-wrapper.patch new file mode 100644 index 000000000000..4c5b258be373 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_41/patches/gradle-flutter-tools-wrapper.patch @@ -0,0 +1,220 @@ +This patch introduces an intermediate Gradle build step to alter the behavior +of flutter_tools' Gradle project, specifically moving the creation of `build` +and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`. + +Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle` +directories within the Nix Store. Resulting in read-only errors when trying to build a +Flutter Android app at runtime. + +This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project +when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")` + +`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory. + +The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle//` and `includeBuild`s it. +This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting +`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`. + +To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle//`, we need to set `buildDirectory`. +To move `.gradle` as well, the `--project-cache-dir` argument must be passed to the Gradle wrapper. +Changing the `GradleUtils.getExecutable` function signature is a delibarate choice, to ensure that no new unpatched usages slip in. +--- /dev/null ++++ b/packages/flutter_tools/gradle/settings.gradle +@@ -0,0 +1,19 @@ ++rootProject.buildFileName = "/dev/null" ++ ++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10) ++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev") ++dir.mkdirs() ++def file = new File(dir, "settings.gradle") ++ ++file.text = """ ++rootProject.projectDir = new File("$settingsDir") ++apply from: new File("$settingsDir/settings.gradle.kts") ++ ++gradle.allprojects { project -> ++ project.beforeEvaluate { ++ project.layout.buildDirectory = new File("$dir/build") ++ } ++} ++""" ++ ++includeBuild(dir) +--- a/packages/flutter_tools/gradle/build.gradle.kts ++++ b/packages/flutter_tools/gradle/build.gradle.kts +@@ -4,6 +4,11 @@ + + import org.jetbrains.kotlin.gradle.dsl.JvmTarget + ++// While flutter_tools runs Gradle with a --project-cache-dir, this startParameter ++// is not passed correctly to the Kotlin Gradle plugin for some reason, and so ++// must be set here as well. ++gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile ++ + plugins { + `java-gradle-plugin` + groovy +--- a/packages/flutter_tools/lib/src/android/gradle.dart ++++ b/packages/flutter_tools/lib/src/android/gradle.dart +@@ -474,9 +474,9 @@ class AndroidGradleBuilder implements AndroidBuilder { + // from the local.properties file. + updateLocalProperties(project: project, buildInfo: androidBuildInfo.buildInfo); + +- final options = []; +- +- final String gradleExecutablePath = _gradleUtils.getExecutable(project); ++ final [String gradleExecutablePath, ...List options] = _gradleUtils.getExecutable( ++ project, ++ ); + + // All automatically created files should exist. + if (configOnly) { +@@ -797,7 +797,7 @@ class AndroidGradleBuilder implements AndroidBuilder { + 'aar_init_script.gradle', + ); + final command = [ +- _gradleUtils.getExecutable(project), ++ ..._gradleUtils.getExecutable(project), + '-I=$initScript', + '-Pflutter-root=$flutterRoot', + '-Poutput-dir=${outputDirectory.path}', +@@ -912,6 +912,10 @@ class AndroidGradleBuilder implements AndroidBuilder { + final results = []; + + try { ++ final [String gradleExecutablePath, ...List options] = _gradleUtils.getExecutable( ++ project, ++ ); ++ + exitCode = await _runGradleTask( + _kBuildVariantTaskName, + preRunTask: () { +@@ -927,10 +931,10 @@ class AndroidGradleBuilder implements AndroidBuilder { + ), + ); + }, +- options: const ['-q'], ++ options: [...options, '-q'], + project: project, + localGradleErrors: gradleErrors, +- gradleExecutablePath: _gradleUtils.getExecutable(project), ++ gradleExecutablePath: gradleExecutablePath, + outputParser: (String line) { + if (_kBuildVariantRegex.firstMatch(line) case final RegExpMatch match) { + results.add(match.namedGroup(_kBuildVariantRegexGroupName)!); +@@ -964,6 +968,10 @@ class AndroidGradleBuilder implements AndroidBuilder { + late Stopwatch sw; + var exitCode = 1; + try { ++ final [String gradleExecutablePath, ...List options] = _gradleUtils.getExecutable( ++ project, ++ ); ++ + exitCode = await _runGradleTask( + taskName, + preRunTask: () { +@@ -979,10 +987,10 @@ class AndroidGradleBuilder implements AndroidBuilder { + ), + ); + }, +- options: ['-q', '-PoutputPath=$outputPath'], ++ options: [...options, '-q', '-PoutputPath=$outputPath'], + project: project, + localGradleErrors: gradleErrors, +- gradleExecutablePath: _gradleUtils.getExecutable(project), ++ gradleExecutablePath: gradleExecutablePath, + ); + } on Error catch (error) { + _logger.printError(error.toString()); +--- a/packages/flutter_tools/lib/src/android/gradle_errors.dart ++++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart +@@ -228,7 +228,12 @@ final flavorUndefinedHandler = GradleHandledError( + }, + handler: ({required String line, required FlutterProject project, required bool usesAndroidX}) async { + final RunResult tasksRunResult = await globals.processUtils.run( +- [globals.gradleUtils!.getExecutable(project), 'app:tasks', '--all', '--console=auto'], ++ [ ++ ...globals.gradleUtils!.getExecutable(project), ++ 'app:tasks', ++ '--all', ++ '--console=auto', ++ ], + throwOnError: true, + workingDirectory: project.android.hostAppGradleRoot.path, + environment: globals.java?.environment, +--- a/packages/flutter_tools/lib/src/android/gradle_utils.dart ++++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart +@@ -3,6 +3,7 @@ + // found in the LICENSE file. + + import 'package:meta/meta.dart'; ++import 'package:path/path.dart'; + import 'package:process/process.dart'; + import 'package:unified_analytics/unified_analytics.dart'; + +@@ -197,9 +198,29 @@ class GradleUtils { + final Logger _logger; + final OperatingSystemUtils _operatingSystemUtils; + ++ List get _requiredArguments { ++ final String cacheDir = join( ++ switch (globals.platform.environment['XDG_CACHE_HOME']) { ++ final String cacheHome => cacheHome, ++ _ => join( ++ globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'), ++ '.cache', ++ ), ++ }, ++ 'flutter', ++ 'nix-flutter-tools-gradle', ++ globals.flutterVersion.engineRevision.substring(0, 10), ++ ); ++ ++ return [ ++ '--project-cache-dir=${join(cacheDir, 'cache')}', ++ '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}', ++ ]; ++ } ++ + /// Gets the Gradle executable path and prepares the Gradle project. + /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory. +- String getExecutable(FlutterProject project) { ++ List getExecutable(FlutterProject project) { + final Directory androidDir = project.android.hostAppGradleRoot; + injectGradleWrapperIfNeeded(androidDir); + +@@ -210,7 +231,7 @@ class GradleUtils { + // If the Gradle executable doesn't have execute permission, + // then attempt to set it. + _operatingSystemUtils.makeExecutable(gradle); +- return gradle.absolute.path; ++ return [gradle.absolute.path, ..._requiredArguments]; + } + throwToolExit( + 'Unable to locate gradlew script. Please check that ${gradle.path} ' +--- a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart ++++ b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart +@@ -2606,8 +2606,8 @@ Gradle Crashed + + class FakeGradleUtils extends Fake implements GradleUtils { + @override +- String getExecutable(FlutterProject project) { +- return 'gradlew'; ++ List getExecutable(FlutterProject project) { ++ return const ['gradlew']; + } + } + +--- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart ++++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart +@@ -1633,8 +1633,8 @@ Platform fakePlatform(String name) { + + class FakeGradleUtils extends Fake implements GradleUtils { + @override +- String getExecutable(FlutterProject project) { +- return 'gradlew'; ++ List getExecutable(FlutterProject project) { ++ return const ['gradlew']; + } + } + diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 947649f56685..f090ca7414d9 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -26,7 +26,7 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; - "22.1.0-rc1".officialRelease.sha256 = "sha256-uyLW+z4rp4iL25eNfGF7BbvE91smx+XqFDH+GEnvd7c="; + "22.1.0-rc2".officialRelease.sha256 = "sha256-j0KSuTANrwLh/siEcztSqCYQQDYHmdBCgVCsPsDCQ+I="; "23.0.0-git".gitRelease = { rev = "eae75353f70b01363bab9383da6b4dd4324d13a3"; rev-version = "23.0.0-unstable-2026-01-25"; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 58f36ab4a180..f5466bf43c59 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -58,8 +58,12 @@ stdenv.mkDerivation rec { ) ''; + env = { + NIX_CFLAGS_COMPILE = "-std=gnu17"; + }; + postInstall = '' - wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" + wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" --set-default LANG "C.UTF-8" ''; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 3956c4506780..20b884d3f455 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -18,8 +18,8 @@ let param = if lib.versionAtLeast ppxlib.version "0.36" then { - version = "3.17.2"; - hash = "sha256-f0CHAW6MOToT1Xt3N2d7wdvxaXj9Q8GTVNTXmnlMjEc="; + version = "3.17.3"; + hash = "sha256-AcRZG4ITrYxxtunx0YDqvSANRBk27if+n5lka3X5hlw="; } else { diff --git a/pkgs/development/interpreters/php/8.5.nix b/pkgs/development/interpreters/php/8.5.nix new file mode 100644 index 000000000000..bf44a1aad7b7 --- /dev/null +++ b/pkgs/development/interpreters/php/8.5.nix @@ -0,0 +1,57 @@ +{ callPackage, ... }@_args: + +let + base = callPackage ./generic.nix ( + _args + // { + version = "8.5.2"; + hash = "sha256-9+/ezMOoELGJIGkjBlNrmaO6hmENvQeVopbPd9P7OgY="; + } + ); +in +base.withExtensions ( + { all, ... }: + with all; + [ + bcmath + calendar + curl + ctype + dom + exif + fileinfo + filter + ftp + gd + gettext + gmp + iconv + intl + ldap + mbstring + mysqli + mysqlnd + openssl + pcntl + pdo + pdo_mysql + pdo_odbc + pdo_pgsql + pdo_sqlite + pgsql + posix + readline + session + simplexml + sockets + soap + sodium + sysvsem + sqlite3 + tokenizer + xmlreader + xmlwriter + zip + zlib + ] +) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix new file mode 100644 index 000000000000..ba59bef5f802 --- /dev/null +++ b/pkgs/development/interpreters/php/default.nix @@ -0,0 +1,21 @@ +{ + callPackage, + stdenv, + llvmPackages, + pcre2, +}: + +let + commonArgs = { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 + }; + }; +in +{ + php82 = callPackage ./8.2.nix commonArgs; + php83 = callPackage ./8.3.nix commonArgs; + php84 = callPackage ./8.4.nix commonArgs; + php85 = callPackage ./8.5.nix commonArgs; +} diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 6eb8ec596680..08cfabb16f12 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -346,6 +346,10 @@ let substituteInPlace $dev/bin/phpize \ --replace-fail "$out/lib" "$dev/lib" + '' + + lib.optionalString (lib.versionAtLeast version "8.5") '' + # PHP 8.5+ has lexbor built into core; dom needs its headers. + cp -r ext/lexbor/lexbor $dev/include/php/ext/lexbor/ ''; src = if phpSrc == null then defaultPhpSrc else phpSrc; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 046d19925b44..cc34c00e92a7 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; + # tools/attr.c: Add missing libgen.h include for basename(3) + # Fixes compilation issue with musl and modern C99 compilers. + # See: https://bugs.gentoo.org/926294 patches = [ ./musl.patch ]; postPatch = '' @@ -37,6 +40,9 @@ stdenv.mkDerivation rec { done ''; + # See nixos/tests/attr.nix + doCheck = false; + meta = { homepage = "https://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix deleted file mode 100644 index 73e6fa003090..000000000000 --- a/pkgs/development/libraries/dotnetfx35/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv }: - -let - windir = "/cygdrive/c/WINDOWS"; -in -{ - pkg = stdenv.mkDerivation rec { - pname = "dotnetfx"; - version = "3.5"; - src = "${windir}/Microsoft.NET/Framework/v${version}"; - buildCommand = '' - mkdir -p $out/bin - ln -s $src/MSBuild.exe $out/bin - ''; - }; - - assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727"; - - wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1"; - - referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0"; - - referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5"; -} diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix deleted file mode 100644 index 7ca67f186ac8..000000000000 --- a/pkgs/development/libraries/dotnetfx40/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv }: - -let - windir = "/cygdrive/c/WINDOWS"; -in -{ - pkg = stdenv.mkDerivation rec { - pname = "dotnetfx"; - version = "4.0.30319"; - src = "${windir}/Microsoft.NET/Framework/v${version}"; - buildCommand = '' - mkdir -p $out/bin - ln -s $src/MSBuild.exe $out/bin - ''; - }; - - assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727"; - - wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1"; - - referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0"; - - referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5"; -} diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 85504e97f58f..cd54c29f00b9 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -19,7 +19,7 @@ buildDunePackage (finalAttrs: { pname = "cohttp"; - version = if lib.versionAtLeast ocaml.version "4.13" then "6.2.0" else "5.3.1"; + version = if lib.versionAtLeast ocaml.version "4.13" then "6.2.1" else "5.3.1"; minimalOCamlVersion = "4.08"; @@ -27,7 +27,7 @@ buildDunePackage (finalAttrs: { url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${finalAttrs.version}/cohttp-${finalAttrs.version}.tbz"; hash = { - "6.2.0" = "sha256-bwV1TK8z1rdeii4aISDKe1Ag4TiLwgJIRC0TOZNt3zs="; + "6.2.1" = "sha256-ZQgCR3Y0QtHcPNkGeLgjO3mHcvA2rIHNHqreH11mpl8="; "5.3.1" = "sha256-9eJz08Lyn/R71+Ftsj4fPWzQGkC+ACCJhbxDTIjUV2s="; } ."${finalAttrs.version}"; diff --git a/pkgs/development/ocaml-modules/gendarme/default.nix b/pkgs/development/ocaml-modules/gendarme/default.nix index ae5345407847..4237823a2797 100644 --- a/pkgs/development/ocaml-modules/gendarme/default.nix +++ b/pkgs/development/ocaml-modules/gendarme/default.nix @@ -4,24 +4,25 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gendarme"; - version = "0.3"; + version = "0.4"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; src = fetchFromGitHub { owner = "bensmrs"; repo = "gendarme"; - tag = version; - hash = "sha256-GWWAbYevd74YYRpyUjEI4rtzuXGZPp4Wa4uUqD6D7l8="; + tag = finalAttrs.version; + hash = "sha256-yiHBAhnWYntv+5fKG7Sa1RqsnvWIsW0YDqp+uAzpg/s="; }; meta = { description = "Marshalling library for OCaml"; homepage = "https://github.com/bensmrs/gendarme"; - changelog = "https://github.com/bensmrs/gendarme/releases/tag/${version}"; + changelog = "https://github.com/bensmrs/gendarme/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.ethancedwards8 ]; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + teams = with lib.teams; [ ngi ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/multicore-magic/default.nix b/pkgs/development/ocaml-modules/multicore-magic/default.nix index 358e3aed57ea..c8bd30b95544 100644 --- a/pkgs/development/ocaml-modules/multicore-magic/default.nix +++ b/pkgs/development/ocaml-modules/multicore-magic/default.nix @@ -10,11 +10,11 @@ buildDunePackage rec { pname = "multicore-magic"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/ocaml-multicore/multicore-magic/releases/download/${version}/multicore-magic-${version}.tbz"; - hash = "sha256-Adcgi9yfEhhygbBK04H6N9ozg3O6JJWrXrD1MxUcGV8="; + hash = "sha256-jY1wqCOq4c4EMDgIQqqIHErIONJFyvJ+0P8ld1CHF18="; }; doCheck = true; diff --git a/pkgs/development/php-packages/grpc/default.nix b/pkgs/development/php-packages/grpc/default.nix index 5a5d261633fb..c96c6090a097 100644 --- a/pkgs/development/php-packages/grpc/default.nix +++ b/pkgs/development/php-packages/grpc/default.nix @@ -3,6 +3,7 @@ pkg-config, lib, grpc, + php, }: buildPecl { @@ -26,5 +27,6 @@ buildPecl { homepage = "https://github.com/grpc/grpc/tree/master/src/php/ext/grpc"; license = lib.licenses.asl20; teams = [ lib.teams.php ]; + broken = lib.versionAtLeast php.version "8.5"; }; } diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index a4be541075bc..f93f16a06e03 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -1,5 +1,8 @@ -{ buildPecl, lib }: - +{ + buildPecl, + lib, + php, +}: buildPecl { pname = "igbinary"; version = "3.2.14"; @@ -17,5 +20,6 @@ buildPecl { homepage = "https://github.com/igbinary/igbinary/"; license = lib.licenses.bsd3; teams = [ lib.teams.php ]; + broken = lib.versionAtLeast php.version "8.5"; }; } diff --git a/pkgs/development/php-packages/ioncube-loader/default.nix b/pkgs/development/php-packages/ioncube-loader/default.nix index 07c941094c6e..b2cd73a9ed38 100644 --- a/pkgs/development/php-packages/ioncube-loader/default.nix +++ b/pkgs/development/php-packages/ioncube-loader/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ neverbehave ]; + broken = lib.versionAtLeast php.version "8.5"; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/development/php-packages/memcache/default.nix b/pkgs/development/php-packages/memcache/default.nix index 9cd31b635ee5..e3ff44172ef7 100644 --- a/pkgs/development/php-packages/memcache/default.nix +++ b/pkgs/development/php-packages/memcache/default.nix @@ -31,5 +31,6 @@ buildPecl rec { homepage = "https://github.com/websupport-sk/pecl-memcache"; maintainers = [ lib.maintainers.krzaczek ]; teams = [ lib.teams.php ]; + broken = lib.versionAtLeast php.version "8.5"; }; } diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index f46c8b6a8f9f..2dec6017a672 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -35,6 +35,6 @@ buildPecl { You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process. ''; teams = [ lib.teams.php ]; - broken = lib.versionOlder php.version "8.2"; + broken = lib.versionOlder php.version "8.2" || lib.versionAtLeast php.version "8.5"; }; } diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index b691d99487cb..451942fe5604 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -22,5 +22,6 @@ buildPecl { license = lib.licenses.mit; homepage = "https://github.com/Microsoft/msphpsql"; teams = [ lib.teams.php ]; + broken = lib.versionAtLeast php.version "8.5"; }; } diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index 41fe9ff8755c..eec3382df576 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -38,5 +38,6 @@ buildPecl rec { homepage = "https://phalcon.io"; maintainers = [ lib.maintainers.krzaczek ]; teams = [ lib.teams.php ]; + broken = lib.versionAtLeast php.version "8.5"; }; } diff --git a/pkgs/development/php-packages/rrd/default.nix b/pkgs/development/php-packages/rrd/default.nix index 6dcb6359e7bf..9c37fa225543 100644 --- a/pkgs/development/php-packages/rrd/default.nix +++ b/pkgs/development/php-packages/rrd/default.nix @@ -3,6 +3,7 @@ lib, pkg-config, rrdtool, + fetchpatch, }: buildPecl { @@ -19,6 +20,14 @@ buildPecl { pkg-config ]; + patches = [ + # PHP 8.5 compatibility patch + (fetchpatch { + url = "https://github.com/php/pecl-processing-rrd/pull/4/commits/dd4856dc89499a0141b1710e791f0e1096c7b244.patch"; + hash = "sha256-ES+cMhMBUubFB5TpTZzzKKfEK2cY737z7zCuNy4XF8Y="; + }) + ]; + # Fix GCC 14 build. # from incompatible pointer type [-Wincompatible-pointer-types env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index 933817c70b8c..76e0345f2041 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -33,5 +33,6 @@ buildPecl { homepage = "https://www.swoole.com"; license = lib.licenses.asl20; teams = [ lib.teams.php ]; + broken = lib.versionAtLeast php.version "8.5"; }; } diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 34659ff19f3e..2f21eb0610a3 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -18,16 +18,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "agate"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; src = fetchFromGitHub { owner = "wireservice"; repo = "agate"; - tag = version; - hash = "sha256-Pp5pUOycDGzymIvwWoDAaOomTsxAfDNdSGwOG5a25Hc="; + tag = finalAttrs.version; + hash = "sha256-REo26vSWFzWsvJzmqlc5A5xEYA2TebQFW6jFRIbH53I="; }; build-system = [ setuptools ]; @@ -59,8 +59,8 @@ buildPythonPackage rec { meta = { description = "Python data analysis library that is optimized for humans instead of machines"; homepage = "https://github.com/wireservice/agate"; - changelog = "https://github.com/wireservice/agate/blob/${version}/CHANGELOG.rst"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/wireservice/agate/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; + license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index 1d804579bae1..5de8b2940662 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -8,23 +8,22 @@ fetchFromGitHub, orjson, poetry-core, + pycryptodome, pytest-cov-stub, pytestCheckHook, - pythonOlder, + segno, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiovodafone"; - version = "3.0.0"; + version = "3.1.1"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "chemelli74"; repo = "aiovodafone"; - tag = "v${version}"; - hash = "sha256-JeMB7K2NURvMPgCZRNAFt9ThIu4LDq3WlmAXsgm1CKs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-NhtclSuwiEuGAA/zhKEL/5S/WTFTjo87BTQPuSVX0sE="; }; build-system = [ poetry-core ]; @@ -32,9 +31,11 @@ buildPythonPackage rec { dependencies = [ aiohttp beautifulsoup4 - cryptography colorlog + cryptography orjson + pycryptodome + segno ]; nativeCheckInputs = [ @@ -47,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Library to control Vodafon Station"; homepage = "https://github.com/chemelli74/aiovodafone"; - changelog = "https://github.com/chemelli74/aiovodafone/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/chemelli74/aiovodafone/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/alibabacloud-credentials/default.nix b/pkgs/development/python-modules/alibabacloud-credentials/default.nix index c4ae9ef1490f..b02b012391f8 100644 --- a/pkgs/development/python-modules/alibabacloud-credentials/default.nix +++ b/pkgs/development/python-modules/alibabacloud-credentials/default.nix @@ -9,15 +9,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alibabacloud-credentials"; - version = "1.0.4"; + version = "1.0.7"; pyproject = true; src = fetchPypi { pname = "alibabacloud_credentials"; - inherit version; - hash = "sha256-K3GrMHRSZ6vVJNZPvgY/fgJknaKrbarx7sBXM7f5yPE="; + inherit (finalAttrs) version; + hash = "sha256-gEKCgLS8+VRh1B0UkKIjYLi2fRgpvx6zj3T6vMaT8bM="; }; build-system = [ setuptools ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/appium-python-client/default.nix b/pkgs/development/python-modules/appium-python-client/default.nix index 4d59e67e0fb5..3ffb1aab7663 100644 --- a/pkgs/development/python-modules/appium-python-client/default.nix +++ b/pkgs/development/python-modules/appium-python-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "appium-python-client"; - version = "5.2.4"; + version = "5.2.5"; pyproject = true; src = fetchFromGitHub { owner = "appium"; repo = "python-client"; tag = "v${version}"; - sha256 = "sha256-oZquEwA1iNIVftt9XBdDfCoI3DLh7eM5/ATcrjJL+jA="; + sha256 = "sha256-BrKIZR8n5ZiOfGAxgCtt5FwPbbOtlPfMqW91HKjP5ro="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 04ed03667916..d2b16878798a 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -7,11 +7,13 @@ fetchFromGitHub, httpx, msgpack, + oras, orjson, packageurl-python, pydantic, - pytestCheckHook, pytest-cov-stub, + pytestCheckHook, + pyyaml, rich, semver, setuptools, @@ -19,16 +21,16 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "appthreat-vulnerability-db"; - version = "6.5.1"; + version = "6.6.0"; pyproject = true; src = fetchFromGitHub { owner = "AppThreat"; repo = "vulnerability-db"; - tag = "v${version}"; - hash = "sha256-SyUTDWi9t37Gw8qn7vCpW+l5jBAXFH5b/VACrFhgsRU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/tcfHEvTdk0B/vfcqqkTn9kGT3QIPLWW4l01fjnrhqE="; }; pythonRelaxDeps = [ @@ -51,13 +53,24 @@ buildPythonPackage rec { semver tabulate ] - ++ httpx.optional-dependencies.http2; + ++ httpx.optional-dependencies.http2 + ++ pydantic.optional-dependencies.email; + + optional-dependencies = { + all = [ + oras + pyyaml + ]; + custom = [ pyyaml ]; + oras = [ oras ]; + }; nativeCheckInputs = [ pytest-cov-stub pytestCheckHook writableTmpDirAsHomeHook - ]; + ] + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); disabledTests = [ # Tests require network access @@ -71,9 +84,9 @@ buildPythonPackage rec { meta = { description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; homepage = "https://github.com/appthreat/vulnerability-db"; - changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/${src.tag}"; + changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "vdb"; }; -} +}) diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index 09b68c112f6d..2f4d7e2facf7 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bidsschematools"; - version = "1.1.5"; + version = "1.1.6"; pyproject = true; src = fetchFromGitHub { owner = "bids-standard"; repo = "bids-specification"; tag = "schema-${version}"; - hash = "sha256-LAcrmnfksisLQb1JE82p/tm5HhHAfezCApz8CeUciZQ="; + hash = "sha256-HMGhEEnmr0BwkcRcysmu9SgTME4BhrwcAAnRt4qF7eI="; }; sourceRoot = "${src.name}/tools/schemacode"; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 1ebea8fa33c9..3201bf0ab679 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.34"; + version = "1.42.35"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-+vzDcTwzG6wRv1X+kT5aOgGCDwzeZAz8RpTfWpSqlVc="; + hash = "sha256-IKq13uWdTQqVFSvXvlhPqvufa88Ub//zzWBV9x0AbWo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 1408b6d412e5..686d13255e45 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "botocore-stubs"; - version = "1.42.34"; + version = "1.42.35"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit (finalAttrs) version; - hash = "sha256-89HFtFwsvhb2Nxmr5jmyOh7rP+ycPqCnJohYW0YujOM="; + hash = "sha256-N1z5U09vKjW9LJ5wduiPtJ+31YnFqsEp22qf/BNWHK0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 4b2823e950ec..a4ab5b29051e 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "cli-helpers"; - version = "2.7.0"; + version = "2.9.0"; format = "setuptools"; src = fetchPypi { pname = "cli_helpers"; inherit version; - hash = "sha256-YtEXENvrwvxGAAPeEhVogyXYY2hZBW1oizhBm9QEi8A="; + hash = "sha256-qYh0XsQx3a5wf3ON0NE4kLdKAKKqBCjqzX/B4Dsgahc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 36d367e81759..b29febab24a9 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.13.1"; + version = "7.13.2"; pyproject = true; src = fetchFromGitHub { owner = "coveragepy"; repo = "coveragepy"; tag = version; - hash = "sha256-xdbgHUE+vbSiqLRDhd5G5u90VU5+TxLehAuwdhdGzBQ="; + hash = "sha256-dYgZLAiuPwYs4NomT+c2KS9VXXYEMW8oyHk2y4TCwe0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cpe-search/default.nix b/pkgs/development/python-modules/cpe-search/default.nix index d514f42e084c..030cd7613c0d 100644 --- a/pkgs/development/python-modules/cpe-search/default.nix +++ b/pkgs/development/python-modules/cpe-search/default.nix @@ -7,19 +7,20 @@ hatchling, mariadb, requests, + tqdm, ujson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cpe-search"; - version = "0.1.7"; + version = "0.2.4"; pyproject = true; src = fetchFromGitHub { owner = "ra1nb0rn"; repo = "cpe_search"; - tag = "v${version}"; - hash = "sha256-gCWKVSVDJNspRwDzHi7+vUETGErWYs3jlpsqkOqSY4I="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wnUKLJUUj3idQLv3FSpcUZksa0FvwMxKDId6/hjpEZw="; }; build-system = [ hatchling ]; @@ -28,6 +29,7 @@ buildPythonPackage rec { aiohttp aiolimiter requests + tqdm ujson ]; @@ -37,6 +39,7 @@ buildPythonPackage rec { aiolimiter mariadb requests + tqdm ujson ]; mariadb = [ @@ -52,8 +55,8 @@ buildPythonPackage rec { meta = { description = "Search for Common Platform Enumeration (CPE) strings using software names and titles"; homepage = "https://github.com/ra1nb0rn/cpe_search"; - changelog = "https://github.com/ra1nb0rn/cpe_search/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/ra1nb0rn/cpe_search/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 2fd8298b5a9e..1e1d0ee67d18 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.37.2-unstable-2026-01-20"; + version = "1.37.2-unstable-2026-01-22"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-common"; - rev = "84492782606974ecb52eecfcae0aa706cde8e270"; # They don't tag releases - hash = "sha256-QOWztrXeRJqGccsabzse5FWxwlxSdsgEjZ2W40mwAqE="; + rev = "5b331b9c50ca5fee959a9e4fa9ecca964549930c"; # They don't tag releases + hash = "sha256-OF4zKmKVHa9SdiQ1WRLvNoqQd3FWCUr5hK9ZYls9EsY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 1e6a92692117..101649f5c17e 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2025.12.0"; + version = "2026.1.1"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; tag = version; - hash = "sha256-srFYbAdlnxpxhSVFqd1geOBoD7bbpLNSlAUWNtefokM="; + hash = "sha256-xriIsrdFNSHAO9SmdowXK9uPW06ziz9uGie3PkYncqo="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index d7a8a6ae35c1..ac796630d53c 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "65.13.1"; + version = "65.14.0"; pyproject = true; src = fetchFromGitea { @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "allauth"; repo = "django-allauth"; tag = version; - hash = "sha256-tmCOJ15l8UnvFZFCiqH2ACBeIEDqYKNwf9gkCUHTKPE="; + hash = "sha256-hoPNSMzn/bX98Qe+7guaLK8UhA5FfHpUCjzN6hCXVgs="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/development/python-modules/django-countries/default.nix b/pkgs/development/python-modules/django-countries/default.nix index 3d83eaf4dfe4..e79d314f2545 100644 --- a/pkgs/development/python-modules/django-countries/default.nix +++ b/pkgs/development/python-modules/django-countries/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - setuptools, + uv-build, # dependencies asgiref, @@ -20,17 +20,17 @@ buildPythonPackage rec { pname = "django-countries"; - version = "7.6.1"; + version = "8.2.0"; pyproject = true; src = fetchFromGitHub { owner = "SmileyChris"; repo = "django-countries"; tag = "v${version}"; - hash = "sha256-IR9cJbDVkZrcF3Ti70mV8VeXINQDK8OpwUTWVjD4Zn0="; + hash = "sha256-MtRlZFrTlY7t0n08X0aYN5HRGZUGLHkcU1gaZCtj07Q="; }; - build-system = [ setuptools ]; + build-system = [ uv-build ]; dependencies = [ asgiref @@ -52,7 +52,7 @@ buildPythonPackage rec { forms, flag icons static files, and a country field for models. ''; homepage = "https://github.com/SmileyChris/django-countries"; - changelog = "https://github.com/SmileyChris/django-countries/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/SmileyChris/django-countries/blob/v${version}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/helium/default.nix b/pkgs/development/python-modules/helium/default.nix new file mode 100644 index 000000000000..2c73e9c642e3 --- /dev/null +++ b/pkgs/development/python-modules/helium/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + selenium, + firefox, + geckodriver, + psutil, + pytestCheckHook, + which, + writableTmpDirAsHomeHook, + stdenv, +}: + +buildPythonPackage rec { + pname = "helium"; + version = "5.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mherrmann"; + repo = "helium"; + tag = "v${version}"; + hash = "sha256-0XpXG4G9iANHZ5YPhHFtgQmCnug6PlmAdErCYgBLOgs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + selenium + ]; + + nativeCheckInputs = [ + firefox + geckodriver + psutil + pytestCheckHook + which + writableTmpDirAsHomeHook + ]; + + # helium doesn't support testing on all platforms + doCheck = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64); + + # Selenium setup + preCheck = '' + export TEST_BROWSER=firefox + export SE_OFFLINE=true + ''; + + disabledTestPaths = [ + # All of the tests here fail, maybe because we force a driver to be found via envvars? + "tests/api/test_no_driver.py" + + # New tests, not sure why they fail. Maybe due to forced firefox? + "tests/api/test_write.py" + ]; + + pythonImportsCheck = [ + "helium" + ]; + + meta = { + description = "Lighter web automation with Python"; + homepage = "https://github.com/mherrmann/helium"; + changelog = "https://github.com/mherrmann/helium/releases/tag/v${version}"; + license = lib.licenses.mit; + teams = with lib.teams; [ ngi ]; + }; +} diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index da49be1fef1d..8eef3ec95d97 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202601261"; + version = "0.1.202601271"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-vjCyMNTaXALc5wecg6YO3kg5fdYfZ8tAWa0LrmoiOTE="; + hash = "sha256-bOnbWxSV3Aoukh403YS61SCkIsjp20cVpSOXcsQQj6U="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 2a77286bd94d..0ea95ed65750 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + fetchpatch, inkscape, poetry-core, cssselect, @@ -25,6 +26,17 @@ buildPythonPackage { inherit (inkscape) src; + patches = [ + # Fix tests with newer libxml2 + # https://gitlab.com/inkscape/extensions/-/merge_requests/712 + (fetchpatch { + url = "https://gitlab.com/inkscape/extensions/-/commit/b04ab718b400778a264f2085bbc779faebc08368.patch"; + hash = "sha256-BXRcfoeX7X8+x6CuKKBhrnzUHIwgnPay22Z8+rPZS54="; + stripLen = 1; + extraPrefix = "share/extensions/"; + }) + ]; + build-system = [ poetry-core ]; pythonRelaxDeps = [ @@ -72,9 +84,6 @@ buildPythonPackage { "tests/test_inkex_gui_window.py" # Failed to find pixmap 'image-missing' in /build/source/tests/data/ "tests/test_inkex_gui_pixmaps.py" - # Fails with libxml2 >= 2.15 with "lxml.etree was compiled without Schematron support" - "inkex/tester/test_inx_file.py" - "tests/test_inkex_inx.py" ]; postPatch = '' diff --git a/pkgs/development/python-modules/iterfzf/default.nix b/pkgs/development/python-modules/iterfzf/default.nix index a4a491024339..f29ad6291e50 100644 --- a/pkgs/development/python-modules/iterfzf/default.nix +++ b/pkgs/development/python-modules/iterfzf/default.nix @@ -9,21 +9,21 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iterfzf"; - version = "1.8.0.62.0"; + version = "1.9.0.67.0"; pyproject = true; src = fetchFromGitHub { owner = "dahlia"; repo = "iterfzf"; - tag = version; - hash = "sha256-eLgF+9p+sqxWR1VkSoeL0NPDMamzUYbql4gMeG8fyNY="; + tag = finalAttrs.version; + hash = "sha256-Giw5d0X8/1PXK1j428LJjg+Gqadm93C51mLfrYc5J94="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' \ + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' \ --replace-fail 'backend-path = ["."]' '# backend-path = ["."]' \ --replace-fail 'build-backend = "build_dist"' '# build-backend = "build_dist"' @@ -53,9 +53,9 @@ buildPythonPackage rec { meta = { description = "Pythonic interface to fzf, a CLI fuzzy finder"; homepage = "https://github.com/dahlia/iterfzf"; - changelog = "https://github.com/dahlia/iterfzf/releases/tag/${version}"; - license = lib.licenses.gpl3Only; + changelog = "https://github.com/dahlia/iterfzf/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index 999ba40b5222..fbfe5a9a0f2c 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpointsqlite==${version}"; - hash = "sha256-IE9Y+kFkDN49SuwvTNwa2kK+Hig18sJPZmZCqHUP3DM="; + hash = "sha256-th9LJxaq2Xj6QwPXGL204QTDsnFNBuyjQpLilhcCKUY="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix index 25809fb16869..e9f388fb1b77 100644 --- a/pkgs/development/python-modules/mlx-lm/default.nix +++ b/pkgs/development/python-modules/mlx-lm/default.nix @@ -84,9 +84,5 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/ml-explore/mlx-lm"; changelog = "https://github.com/ml-explore/mlx-lm/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - badPlatforms = [ - # Building for x86_64 on macOS is not supported by mlx (dependency) - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index f146911a9974..13be20543689 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -15,7 +15,6 @@ apple-sdk, fmt, nlohmann_json, - pybind11, # linux-only openblas, @@ -52,8 +51,9 @@ buildPythonPackage (finalAttrs: { }; patches = [ - # Use system nanobind instead of fetching its sources + # Use nix packages instead of fetching their sources ./dont-fetch-nanobind.patch + ./dont-fetch-json.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (replaceVars ./darwin-build-fixes.patch { @@ -80,19 +80,24 @@ buildPythonPackage (finalAttrs: { env = { PYPI_RELEASE = 1; - CMAKE_ARGS = toString [ - # NOTE The `metal` command-line utility used to build the Metal kernels is not open-source. - # To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape - # hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper` - # or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016). - (lib.cmakeBool "MLX_BUILD_METAL" false) - (lib.cmakeBool "USE_SYSTEM_FMT" true) - (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}") - (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json.src}") + CMAKE_ARGS = toString ( + [ + # NOTE The `metal` command-line utility used to build the Metal kernels is not open-source. + # To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape + # hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper` + # or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016). + (lib.cmakeBool "MLX_BUILD_METAL" false) + (lib.cmakeBool "USE_SYSTEM_FMT" true) + (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}") + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev nlohmann_json}/include/nlohmann") - # Cmake cannot find nanobind-config.cmake by itself - (lib.cmakeFeature "nanobind_DIR" "${nanobind}/${python.sitePackages}/nanobind/cmake") - ]; + # Cmake cannot find nanobind-config.cmake by itself + (lib.cmakeFeature "nanobind_DIR" "${nanobind}/${python.sitePackages}/nanobind/cmake") + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + (lib.cmakeBool "MLX_ENABLE_X64_MAC" true) + ] + ); }; build-system = [ @@ -103,9 +108,7 @@ buildPythonPackage (finalAttrs: { buildInputs = [ fmt - gguf-tools nlohmann_json - pybind11 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openblas @@ -180,9 +183,5 @@ buildPythonPackage (finalAttrs: { cameronyule viraptor ]; - badPlatforms = [ - # Building for x86_64 on macOS is not supported - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/development/python-modules/mlx/dont-fetch-json.patch b/pkgs/development/python-modules/mlx/dont-fetch-json.patch new file mode 100644 index 000000000000..e134d25d2cd3 --- /dev/null +++ b/pkgs/development/python-modules/mlx/dont-fetch-json.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2451aa65..f88d4889 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -241,14 +241,6 @@ else() + set(MLX_BUILD_ACCELERATE OFF) + endif() + +-message(STATUS "Downloading json") +-FetchContent_Declare( +- json +- URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz) +-FetchContent_MakeAvailable(json) +-target_include_directories( +- mlx PRIVATE $) +- + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mlx) + + target_include_directories( + diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index f0a231d9bb41..254d91613461 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "model-bakery"; - version = "1.23.0"; + version = "1.23.2"; pyproject = true; src = fetchFromGitHub { owner = "model-bakers"; repo = "model_bakery"; tag = finalAttrs.version; - hash = "sha256-AwdHsysCaxSS6+dH1gO7dyV2Q4PIA84Mc810KNrqP/g="; + hash = "sha256-7RMFbUFYUJI8gI5GVQ6kivjb6oeHGKzYbyTukMjK+8Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 3be034c68ec9..5d53d8d63497 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -347,8 +347,8 @@ in "sha256-omWYUcr7Aj6r1F1kKAmM32fn9577UeUgqesnIiBIpPQ="; mypy-boto3-connectcases = - buildMypyBoto3Package "connectcases" "1.42.3" - "sha256-OpFwfLIgldcA31CkZfgcD8H9vOPNVNSxmr0J3taPKV8="; + buildMypyBoto3Package "connectcases" "1.42.35" + "sha256-y/EYsonfz1GwySCHmcVK5i3gVGarbM3bLvDIj/nFh9o="; mypy-boto3-connectparticipant = buildMypyBoto3Package "connectparticipant" "1.42.3" @@ -443,8 +443,8 @@ in "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.42.33" - "sha256-6FgPHidDOccO4DvmCnE+1tDvZU+V/2I1aJ563D8/rDs="; + buildMypyBoto3Package "ec2" "1.42.35" + "sha256-uiUIfubdYTR0JL4fLLArnL9fHMc35JtpBwud2pW3HEw="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.42.3" @@ -519,8 +519,8 @@ in "sha256-zoJFU3RC1bgWvK/rTsAKRoWDbl1+VehjlGM9s18h7Fg="; mypy-boto3-evidently = - buildMypyBoto3Package "evidently" "1.42.3" - "sha256-t+mFGfaY21XDIDWgKthnXeg+couyjop0grL6QjHpi9g="; + buildMypyBoto3Package "evidently" "1.42.35" + "sha256-kdSGsikyLazIdSKidTt6bk5i+syJgx/GE0y+KRpC1rw="; mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.42.3" @@ -586,8 +586,8 @@ in "sha256-w3vOm8K/2rToF1CFWtAobCzswkv2d/gm1bzy6XiOFVA="; mypy-boto3-groundstation = - buildMypyBoto3Package "groundstation" "1.42.3" - "sha256-BrtHCaCwsfpaB5GA9kEhCFapQceZsjpyv3HVgpXUOFA="; + buildMypyBoto3Package "groundstation" "1.42.35" + "sha256-UIxD9R+oQjVmR90OfD8Dp7GW3E73zny6LFTkxrSdmNU="; mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.42.33" diff --git a/pkgs/development/python-modules/onlinepayments-sdk-python3/default.nix b/pkgs/development/python-modules/onlinepayments-sdk-python3/default.nix new file mode 100644 index 000000000000..b49d51be5f1d --- /dev/null +++ b/pkgs/development/python-modules/onlinepayments-sdk-python3/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, + requests-toolbelt, + mockito, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "onlinepayments-sdk-python3"; + version = "4.23.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wl-online-payments-direct"; + repo = "sdk-python3"; + rev = finalAttrs.version; + hash = "sha256-IX9kiM5ZtX4uzW+D+Bbt8535CqMtdTtv0mpDo5Swstg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + requests + requests-toolbelt + ]; + + nativeCheckInputs = [ + mockito + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires api key + "tests/integration" + ]; + + disabledTests = [ + # missing fixtures + "testConnection_request" + "testConnection_response" + ]; + + pythonImportsCheck = [ + "onlinepayments" + ]; + + meta = { + description = "SDK to communicate with the Online Payments platform using the Online Payments Server API"; + homepage = "https://github.com/wl-online-payments-direct/sdk-python3"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 393da071a313..59cfb56cf196 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -47,16 +47,16 @@ let }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "osqp"; - version = "1.0.5"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "osqp"; repo = "osqp-python"; - tag = "v${version}"; - hash = "sha256-i05e0GUQm9DbmF4SDZntKIssrYxC755qG3rRZjYEsiw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-xdxQaL794rHQmdC0cua1C/IT1qQSzzhTEf7dLrjOV9o="; }; patches = [ @@ -107,7 +107,8 @@ buildPythonPackage rec { ''; homepage = "https://osqp.org/"; downloadPage = "https://github.com/oxfordcontrol/osqp-python/releases"; + changelog = "https://github.com/osqp/osqp-python/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index da88fad14d0e..b1ecf3b6282f 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -7,16 +7,16 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydexcom"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "gagebenne"; repo = "pydexcom"; - tag = version; - hash = "sha256-IqSZZHe5epcgO2uoIsGkNaac3+UplHzqEcFWTzwAqPg="; + tag = finalAttrs.version; + hash = "sha256-u94OI45PmofPLpuJUpjbvGLla+mJEHy1t6/4fiI6+zc="; }; build-system = [ @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Python API to interact with Dexcom Share service"; homepage = "https://github.com/gagebenne/pydexcom"; - changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${src.tag}"; + changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index e640a29a0713..0a883e2cf968 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "pyexploitdb"; - version = "0.3.10"; + version = "0.3.11"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-EZX2eCNc46UuqbBEypjp6NcHOAI6C7SiFu+AZPXcSg8="; + hash = "sha256-SKIGVjgNhM22Ia/ZxZD5uwFiE4XcYmnKMvNG/KGltYw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 7cde9005c746..400c7c5e7f89 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pygls"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "openlawlibrary"; repo = "pygls"; tag = "v${version}"; - hash = "sha256-dQLK18EACiN+DpWp81Vgaan0mwtifhrmH4xwkqttKvg="; + hash = "sha256-RznpnGBOZZeNP1pqL9jSNd0W2sJmW0CAo8DKP6t9APw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index 80d6c0069c76..bfb63d93e269 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -7,28 +7,26 @@ prompt-toolkit, pycryptodome, pydantic, - setuptools, + hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pykoplenti"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "stegm"; repo = "pykoplenti"; - tag = "v${version}"; - hash = "sha256-vsqbjNj5x7X0VGbTq+CdZ9rPXVDypBkgaCI6MImloLo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Mwh6QOdsvf32U09ebleEKL7vt3xz8tjiftVVxKL/lO4="; }; pythonRelaxDeps = [ "pydantic" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pycryptodome pydantic @@ -48,10 +46,10 @@ buildPythonPackage rec { meta = { description = "Python REST client API for Kostal Plenticore Inverters"; - mainProgram = "pykoplenti"; homepage = "https://github.com/stegm/pykoplenti/"; - changelog = "https://github.com/stegm/pykoplenti/releases/tag/v${version}"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/stegm/pykoplenti/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "pykoplenti"; }; -} +}) diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index a084c467818e..18740fd5cb22 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "pylance"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${finalAttrs.version}"; - hash = "sha256-k6dwZAKhziTDoOGsIj1tasF2QUn4EG1+ogeirCt3Kwc="; + hash = "sha256-SAV4mowG8wcK22ZXJUT9UffKz8lcICipSDC5FR0Z2lY="; }; sourceRoot = "${finalAttrs.src.name}/python"; @@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: { src sourceRoot ; - hash = "sha256-8Ja6GrqZqq/zJCh/QiUrHaukHFMvGEcXKZmo1gZjGq8="; + hash = "sha256-qDfN4iH/FSqklUC58O4ot7SxBRSKWebYkh1X1T5JXUs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix index de3b9e8ceda2..dbffbaaeb278 100644 --- a/pkgs/development/python-modules/pymssql/default.nix +++ b/pkgs/development/python-modules/pymssql/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, freetds, krb5-c, openssl, @@ -13,20 +13,21 @@ sqlalchemy, tomli, }: - buildPythonPackage rec { pname = "pymssql"; - version = "2.3.7"; + version = "2.3.11"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-Xm15x7HOxArr7EsJnG5EXMqsJFGeXnZ7SaTm9IwIflA="; + src = fetchFromGitHub { + owner = "pymssql"; + repo = "pymssql"; + tag = "v${version}"; + hash = "sha256-Ybfg3V4qRqfA5basRAdL027aImt5i2SdfoC+Tfy/qBI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=54.0,<70.3" "setuptools>=54.0" + --replace-fail '"standard-distutils ; python_version>='"'"'3.12'"'"'"' "" ''; build-system = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 574634b810b3..5c96b8d2324a 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "pyoverkiz"; - version = "1.19.4"; + version = "1.20.0"; pyproject = true; src = fetchFromGitHub { owner = "iMicknl"; repo = "python-overkiz-api"; tag = "v${finalAttrs.version}"; - hash = "sha256-8MU+FH6fpQREpJ0x4OXh4BIlBtWEW+fL+oQCipTk4zg="; + hash = "sha256-H1G85vleaV+ZWbjH3tozI6fvWPKxwrIVRIXiFwsUWOA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 3a2e44cd937a..decc01817c88 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "Roche"; repo = "pyreadstat"; tag = "v${version}"; - hash = "sha256-JDs5SxiqSZHVOJTPezq5oIT+Xgp6tz2BytoQ6jb/ZwU="; + hash = "sha256-CXZ9edMmup4+/2lImt6Zy19RIqGig1sUIK35snvIFEk="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 1dcc98be36bc..5ab2052c9b97 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -9,16 +9,16 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyvlx"; - version = "0.2.27"; + version = "0.2.28"; pyproject = true; src = fetchFromGitHub { owner = "Julius2342"; repo = "pyvlx"; - tag = version; - hash = "sha256-FOchtl3HDByHIBRh0MXYnQYh6opzkcHOOYaINmMPu7w="; + tag = finalAttrs.version; + hash = "sha256-l+Yfp8s6x+l/1ssL0wgyzd8QbA4ikr+ZUVMdTEaIjYE="; }; build-system = [ setuptools ]; @@ -40,8 +40,8 @@ buildPythonPackage rec { devices, e.g. Velux Windows. ''; homepage = "https://github.com/Julius2342/pyvlx"; - changelog = "https://github.com/Julius2342/pyvlx/releases/tag/${src.tag}"; + changelog = "https://github.com/Julius2342/pyvlx/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 40782b57d4a3..6cf36fd5e46f 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -17,7 +17,7 @@ let in buildPythonPackage rec { pname = "reportlab"; - version = "4.4.7"; + version = "4.4.9"; pyproject = true; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Qegoevll5ZlnZJM/PnXn82PDtvJSuhcvlCnoFljXsXA="; + hash = "sha256-fPSHdkKU7nkaR4H1oVe+vOJipmauS7uHeGdgqWdsk3g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rocksdict/default.nix b/pkgs/development/python-modules/rocksdict/default.nix index 01152c1c85ec..e235785e3b85 100644 --- a/pkgs/development/python-modules/rocksdict/default.nix +++ b/pkgs/development/python-modules/rocksdict/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, @@ -57,6 +58,9 @@ buildPythonPackage (finalAttrs: { "test" ]; + # Trace/BPT Trap 5 calling `pytest` on darwin. + doCheck = !stdenv.hostPlatform.isDarwin; + meta = { description = "Python fast on-disk dictionary / RocksDB & SpeeDB Python binding"; homepage = "https://github.com/rocksdict/RocksDict"; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index aa0747843f40..3fb9e90e1617 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "sentence-transformers"; - version = "5.2.1"; + version = "5.2.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "sentence-transformers"; tag = "v${finalAttrs.version}"; - hash = "sha256-MMiZBnFwfgLxmiyIQoEA9Kw+J24uUeypbAcenvR7rjw="; + hash = "sha256-+ZJb56yo58nJtQz6LIyqsQA4yAFuDGeRRlkj0+iwUJ4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index a59295d5d6fb..8cbf74a71d87 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -27,12 +27,12 @@ buildPythonPackage (finalAttrs: { pname = "streamlit"; - version = "1.53.0"; + version = "1.53.1"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-ARQRbTRYny5lK/Ssc1o6ymmAfmWfkvmcmOe2INAAg48="; + hash = "sha256-rmVq87aLS7LWafqXdgYJbyAhvLqhSkVKKQ+OCje6snc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 3fae6f8903a9..a83ed24524df 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.37"; + version = "3.1.38"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-gtvmqQzKXwChwTyh0iOnZwVArNOHUuzAlT6hKRPfckU="; + hash = "sha256-YwCouaDX41sKJ45O5a1gGuXBKdEpZ+UVOVn1F2VtKd8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/translation-finder/default.nix b/pkgs/development/python-modules/translation-finder/default.nix index ef5218a8351e..6246e13fd442 100644 --- a/pkgs/development/python-modules/translation-finder/default.nix +++ b/pkgs/development/python-modules/translation-finder/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "translation-finder"; - version = "2.23"; + version = "2.24"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "WeblateOrg"; repo = "translation-finder"; tag = version; - hash = "sha256-SmCADimYcSsD3iUt/QqF2SwJPzbFLw5v7SWVSeOyelQ="; + hash = "sha256-OVAsw+snISVyz3ZvcfqCpv0BRfTNzYSpI+YLafW5OQg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/typed-argparse/default.nix b/pkgs/development/python-modules/typed-argparse/default.nix new file mode 100644 index 000000000000..4b15c9318a77 --- /dev/null +++ b/pkgs/development/python-modules/typed-argparse/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + typing-extensions, + pytestCheckHook, + pytest-cov-stub, +}: +buildPythonPackage { + pname = "typed-argparse"; + version = "0.3.1-unstable-2025-05-09"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "typed-argparse"; + repo = "typed-argparse"; + rev = "989887701c5b4e8c835fac60d6124a9efa557e6f"; + hash = "sha256-RgOHIjODBacZdUMCrazZxhQerHtZrNO0BBXPkWPN47o="; + }; + + build-system = [ setuptools ]; + + dependencies = [ typing-extensions ]; + + pythonImportsCheck = [ "typed_argparse" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + meta = { + description = "Type-safe Python argument parsing"; + homepage = "https://typed-argparse.github.io/typed-argparse/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.me-and ]; + }; +} diff --git a/pkgs/development/python-modules/types-openpyxl/default.nix b/pkgs/development/python-modules/types-openpyxl/default.nix new file mode 100644 index 000000000000..a9f852dc39a8 --- /dev/null +++ b/pkgs/development/python-modules/types-openpyxl/default.nix @@ -0,0 +1,29 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: +buildPythonPackage (finalAttrs: { + pname = "types-openpyxl"; + version = "3.1.5.20250809"; + + pyproject = true; + + src = fetchPypi { + pname = "types_openpyxl"; + inherit (finalAttrs) version; + hash = "sha256-SVNvoYo6i1Z7bSZx0zAdjCQOwvG895UQ9LrZ+skjLL0="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "openpyxl-stubs" ]; + + meta = { + description = "Typing stubs for openpyxl"; + homepage = "https://github.com/python/typeshed"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.me-and ]; + }; +}) diff --git a/pkgs/development/python-modules/ukkonen/default.nix b/pkgs/development/python-modules/ukkonen/default.nix index 4de244797b59..e3364ea5752d 100644 --- a/pkgs/development/python-modules/ukkonen/default.nix +++ b/pkgs/development/python-modules/ukkonen/default.nix @@ -4,21 +4,27 @@ fetchFromGitHub, cffi, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ukkonen"; - version = "1.0.1"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "asottile"; repo = "ukkonen"; - rev = "v${version}"; - sha256 = "jG6VP/P5sadrdrmneH36/ExSld9blyMAAG963QS9+p0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vXyOLAiY92Df7g57quiSnOz8yhaIsm8MTB6Fbiv6axQ="; }; - nativeBuildInputs = [ cffi ]; + build-system = [ + cffi + setuptools + ]; + + dependencies = [ cffi ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -30,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index bb7c96f9df39..6e1277a8f2ec 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -61,7 +61,7 @@ rec { godotPackages_4_4 = mkGodotPackages "4.4"; godotPackages_4_5 = mkGodotPackages "4.5"; godotPackages_4_6 = mkGodotPackages "4.6"; - godotPackages_4 = godotPackages_4_5; + godotPackages_4 = godotPackages_4_6; godotPackages = godotPackages_4; godot_4_3 = godotPackages_4_3.godot; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 67bc521cdc9f..9fbedf1c7b9f 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -19,8 +19,8 @@ { "4.12.0" = "4.7-412"; "4.12.1" = "4.7-412"; - "4.13.0" = "4.7-413"; - "4.13.1" = "4.7-413"; + "4.13.0" = "4.7.1-413"; + "4.13.1" = "4.7.1-413"; "4.14.0" = "4.19-414"; "4.14.1" = "4.19-414"; "4.14.2" = "4.19-414"; @@ -39,7 +39,7 @@ let hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; - "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; + "4.7.1-413" = "sha256-owR9ooUoOrKLOpZbKYDm8Q2ZfDn6C8GJwUF/4HQVRcI="; "4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4="; "4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0="; # Used by ocaml-lsp "4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY="; # Used by ocaml-lsp diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index 66b929b8df57..3bfa8858b03d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -308,9 +308,9 @@ }; glimmer = { - version = "1.4.0"; - url = "github:ember-tooling/tree-sitter-glimmer?ref=v1.4.0-tree-sitter-glimmer"; - hash = "sha256-4kEOvObNnZtt2aaf0Df+R/Wvyk/JlFnsvbasDIJxt4w="; + version = "1.6.0"; + url = "github:ember-tooling/tree-sitter-glimmer?ref=v1.6.0-tree-sitter-glimmer"; + hash = "sha256-AW+jd1Kl3krTgnPc8NoXfSM91fOan/wIB/mo/feWj74="; meta = { license = lib.licenses.mit; }; @@ -598,9 +598,9 @@ }; markdown = { - version = "0.3.2"; + version = "0.5.2"; url = "github:tree-sitter-grammars/tree-sitter-markdown"; - hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8="; + hash = "sha256-JJCFksPDwaiOmU+nZ3PHeLHlPKWTZBTnqcD/tQorWdU="; location = "tree-sitter-markdown"; meta = { license = lib.licenses.mit; @@ -609,9 +609,9 @@ markdown-inline = { language = "markdown_inline"; - version = "0.3.2"; + version = "0.5.2"; url = "github:tree-sitter-grammars/tree-sitter-markdown"; - hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8="; + hash = "sha256-JJCFksPDwaiOmU+nZ3PHeLHlPKWTZBTnqcD/tQorWdU="; location = "tree-sitter-markdown-inline"; meta = { license = lib.licenses.mit; diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 9b2d7f98cf68..34e10fe37192 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,14 +1,14 @@ { - version = "2025.4"; + version = "2025.5"; # To get these, run: # # ``` - # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.4/$tool-2025.4.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done + # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.5/$tool-2025.5.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done # ``` sha256 = { - alfred = "sha256-g3VHVHjtHNQTnJAAF1p9FAfujdkZoLfJ2/fRUJWIBIU="; - batctl = "sha256-Vmqk/XQ1Xo1d0r0hwl6YzAaOd/0I4Z+AuOK17d58jmU="; - batman-adv = "sha256-YkkKj4tYwC6Bkhbz6WMkmYRkXT5GAVagQ7c/xT4k+G0="; + alfred = "sha256-dcEsHDw5zbIkb2H8pdTZ9h4kD+KCcSn6t6A97vhV/+g="; + batctl = "sha256-HgvNSfku7aDXa8aDVirfNmAk4u5MGZ+kAgNva5PLsUc="; + batman-adv = "sha256-GtvoI5kelxjjB/N2bqlkBf4fKEwZvLmMZi16H6oyTDU="; }; } diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index 31081446ef2d..04eb7ab6e2db 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zenpower"; - version = "unstable-2025-06-17"; + version = "unstable-2025-12-20"; src = fetchFromGitHub { owner = "AliEmreSenel"; repo = "zenpower3"; - rev = "41e042935ee9840c0b9dd55d61b6ddd58bc4fde6"; - hash = "sha256-0U/JmEd6OJJeUm1ZLFYxpKH15n7+QTWYOgtKIFAuf/4="; + rev = "dc4f1e2d2f5e26ad5b314497485419cb240e7134"; + hash = "sha256-NvCBog1rAAjbhT9dMOjsmio6lVZ9h36XvOiE7znJdTo="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index de22d3c86057..5be97d77376e 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.9.5"; + version = "4.9.7"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-0odR9ZCXS8vovQTX81U2PL1i45ftijJ/WRWk00DBWXc="; + hash = "sha256-vEQtpoafjMCkpeOnfPa1u5pDo34LapLkRFUoblZ5ntg="; }; - npmDepsHash = "sha256-Z9u7fNd9XB41HiD0MuMy9xjq3mROSYp1sTRyJ0Rf9xw="; + npmDepsHash = "sha256-iTyiPtzKld8Lx1k2GtZ4rwPl79OgHf4bMbAkAeD/8uY="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix index 1f55aa5921a4..ba47f229d5a1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "vacuum-card"; - version = "2.11.6"; + version = "2.11.7"; src = fetchFromGitHub { owner = "denysdovhan"; repo = "vacuum-card"; rev = "v${version}"; - hash = "sha256-RBKg92QpfPcrvP1TDOPM8PfjS3NyHwl4By36o4B8yUE="; + hash = "sha256-qlAgkEMEwTq9vc6DoOwf5AhdlS2ezyXxjZQEhkhdrBs="; }; - npmDepsHash = "sha256-/M9TRM/wYN0jHigCoE9UVFspxGh5bpCrZvzo42DXgLo="; + npmDepsHash = "sha256-+vNnManvjv8suqgbsj/XnoDLLGyUGjBLsUUDrDKPXqY="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 502dff10a6f9..1dbfd1528467 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -35,6 +35,7 @@ rpcsvc-proto, bash, python3Packages, + pkgsHostTarget, nixosTests, libiconv, testers, @@ -76,6 +77,7 @@ let } .${stdenv.hostPlatform.system} or (throw "Need pre-generated answers file to compile for ${stdenv.hostPlatform.system}"); + isCross = !lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform; in stdenv.mkDerivation (finalAttrs: { pname = "samba"; @@ -112,7 +114,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ python3Packages.python - python3Packages.wrapPython + # Not `python3Packages.wrapPython` to workaround + # `python3Packages.wrapPython.__spliced.buildHost` having the wrong + # `pythonHost`. See https://github.com/NixOS/nixpkgs/issues/434307 + pkgsHostTarget.python3Packages.wrapPython wafHook pkg-config bison @@ -121,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { perl.pkgs.ParseYapp perl.pkgs.JSON libxslt + libtasn1 # Needed also natively for `asn1Parser` program docbook_xsl docbook_xml_dtd_45 cmocka @@ -129,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals stdenv.hostPlatform.isLinux [ buildPackages.stdenv.cc ] - ++ optional (stdenv.buildPlatform != stdenv.hostPlatform) samba # asn1_compile/compile_et + ++ optional isCross samba # asn1_compile/compile_et ++ optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -193,7 +199,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs ./buildtools/bin '' - + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + + lib.optionalString isCross '' substituteInPlace wscript source3/wscript nsswitch/wscript_build lib/replace/wscript source4/ntvfs/sysdep/wscript_configure --replace-fail 'sys.platform' '"${stdenv.hostPlatform.parsed.kernel.name}"' ''; @@ -266,6 +272,8 @@ stdenv.mkDerivation (finalAttrs: { tdb ]; + strictDeps = true; + preBuild = '' export MAKEFLAGS="-j $NIX_BUILD_CORES" ''; @@ -306,17 +314,12 @@ stdenv.mkDerivation (finalAttrs: { # Fix PYTHONPATH for some tools wrapPythonPrograms - - # Samba does its own shebang patching, but uses build Python - find $out/bin -type f -executable | while read file; do - isScript "$file" || continue - sed -i 's^${lib.getBin buildPackages.python3Packages.python}^${lib.getBin python3Packages.python}^' "$file" - done ''; - disallowedReferences = lib.optionals ( - buildPackages.python3Packages.python != python3Packages.python - ) [ buildPackages.python3Packages.python ]; + disallowedReferences = lib.optionals isCross [ + buildPackages.python3Packages.python + buildPackages.runtimeShellPackage + ]; passthru.tests = { samba = nixosTests.samba; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 3119c7b68ec5..868d9b2b9ca3 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.44"; + version = "8.0.45"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-YJUi7R/vzlqziN7CXg0bzhMjgtom4rd7aPB0HApkE1Y="; + hash = "sha256-tDXyLmWMj8k7gWmPo0uaVjJaMEs/Pf+H8n+2dMkKu8s="; }; nativeBuildInputs = [ diff --git a/pkgs/shells/fish/plugins/async-prompt.nix b/pkgs/shells/fish/plugins/async-prompt.nix index a548550ee6d0..c8fab1f1c931 100644 --- a/pkgs/shells/fish/plugins/async-prompt.nix +++ b/pkgs/shells/fish/plugins/async-prompt.nix @@ -6,13 +6,13 @@ buildFishPlugin rec { pname = "async-prompt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "acomagu"; repo = "fish-async-prompt"; rev = "v${version}"; - hash = "sha256-B7Ze0a5Zp+5JVsQUOv97mKHh5wiv3ejsDhJMrK7YOx4="; + hash = "sha256-HWW9191RP//48HkAHOZ7kAAAPSBKZ+BW2FfCZB36Y+g="; }; meta = { diff --git a/pkgs/stdenv/generic/check-meta-test.nix b/pkgs/stdenv/generic/check-meta-test.nix new file mode 100644 index 000000000000..0dedb25afbd2 --- /dev/null +++ b/pkgs/stdenv/generic/check-meta-test.nix @@ -0,0 +1,128 @@ +# Execute with +# nix-build -A nixosTests.nixpkgs-config-allow-unfree-packages-and-predicate --show-trace +# +# This test exercises the interaction between: +# +# - nixos/modules/misc/nixpkgs.nix (config merging, esp. allowUnfreePackages) +# - pkgs/stdenv/generic/check-meta.nix (allowUnfreePredicate logic) +# +# It checks how: +# +# * config.allowUnfreePackages +# * config.allowUnfreePredicate +# +# interact to determine whether unfree packages are allowed. +{ + lib, + pkgs, +}: + +let + inherit (lib) + assertMsg + generators + licenses + recurseIntoAttrs + ; + + mkUnfreePkg = name: { + pname = name; + version = "1.0"; + meta.license = licenses.unfree; + }; + assertValidity = + { + nixpkgsConfig, + pkg, + expected ? true, + }: + let + testPkgs = import ../../.. { + system = pkgs.stdenv.hostPlatform.system; + config = nixpkgsConfig; + }; + checkMeta = testPkgs.callPackage ./check-meta.nix { }; + tryEval = expression: builtins.tryEval (builtins.deepSeq expression expression); + actual = tryEval ( + checkMeta.assertValidity { + meta = pkg.meta; + attrs = pkg; + } + ); + toPretty = generators.toPretty { }; + in + assertMsg (actual.success == expected) '' + Expected validity of package ${lib.getName pkg} to be ${toPretty expected}, + but got ${toPretty actual} with config: + ${toPretty nixpkgsConfig} + ''; + + runAssertions = assertions: lib.deepSeq assertions ""; + +in +recurseIntoAttrs { + + allowOnlyFreePackagesByDefault = assertValidity { + nixpkgsConfig = { }; + pkg = mkUnfreePkg "forbidden"; + expected = false; + }; + + allowAllUnfreePackages = assertValidity { + nixpkgsConfig = { + allowUnfree = true; + }; + pkg = mkUnfreePkg "allowed"; + }; + + allowUnfreePackagesWithPredicate = + let + nixpkgsConfig = { + allowUnfreePredicate = pkg: lib.getName pkg == "allowed-by-predicate"; + }; + in + [ + (assertValidity { + inherit nixpkgsConfig; + pkg = mkUnfreePkg "allowed-by-predicate"; + }) + (assertValidity { + inherit nixpkgsConfig; + pkg = mkUnfreePkg "allowed-by-nothing"; + expected = false; + }) + ]; + + allowUnfreeWithPackages = runAssertions [ + (assertValidity { + nixpkgsConfig = { + allowUnfreePackages = [ "unfree" ]; + }; + pkg = mkUnfreePkg "unfree"; + expected = true; + }) + ]; + + allowUnfreePackagesOrPredicate = + let + nixpkgsConfig = { + allowUnfreePackages = [ "allowed-by-packages" ]; + allowUnfreePredicate = pkg: lib.getName pkg == "allowed-by-predicate"; + }; + in + runAssertions [ + (assertValidity { + inherit nixpkgsConfig; + pkg = mkUnfreePkg "allowed-by-packages"; + }) + (assertValidity { + inherit nixpkgsConfig; + pkg = mkUnfreePkg "allowed-by-predicate"; + }) + (assertValidity { + inherit nixpkgsConfig; + pkg = mkUnfreePkg "forbidden"; + expected = false; + }) + ]; +} diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 28de9c68110e..ae868ab14ac1 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -158,7 +158,19 @@ let # allowUnfree = false; # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "vscode" x.name); # } - allowUnfreePredicate = config.allowUnfreePredicate or (x: false); + # Defaults to allow all names defined in config.allowUnfreePackages + allowUnfreePredicate = + let + listPredicate = pkg: builtins.elem (lib.getName pkg) (config.allowUnfreePackages or [ ]); + + # Be robust against misconfigured allowUnfreePredicate values such as null + explicitPredicate = + let + raw = config.allowUnfreePredicate or null; + in + if builtins.isFunction raw then raw else (_: false); + in + pkg: (listPredicate pkg) || (explicitPredicate pkg); # Check whether unfree packages are allowed and if not, whether the # package has an unfree license and is not explicitly allowed by the diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d2686039707a..d394294c8125 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -567,6 +567,8 @@ mapAliases { dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27 dontRecurseIntoAttrs = warnAlias "dontRecurseIntoAttrs has been removed from pkgs, use `lib.dontRecurseIntoAttrs` instead" lib.dontRecurseIntoAttrs; # Added 2025-10-30 dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11 + dotnetfx35 = throw "'dotnetfx35' has been removed because it was unmaintained in Nixpkgs"; # Added 2026-01-27 + dotnetfx40 = throw "'dotnetfx40' has been removed because it was unmaintained in Nixpkgs"; # Added 2026-01-27 dotty = throw "'dotty' has been renamed to/replaced by 'scala_3'"; # Converted to throw 2025-10-27 dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16 dsd = throw "dsd has been removed, as it was broken and lack of upstream maintenance"; # Added 2025-08-25 @@ -1873,6 +1875,7 @@ mapAliases { xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27 xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12 xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12 + xf86_video_nested = xf86-video-nested; # added 2026-01-13 xf86inputjoystick = xf86-input-joystick; # Added 2026-01-19 xf86inputkeyboard = xf86-input-keyboard; # Added 2026-01-19 xf86inputmouse = xf86-input-mouse; # Added 2026-01-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b30704786714..5ab11ab15070 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -956,13 +956,6 @@ with pkgs; opnplug = adlplug.override { type = "OPN"; }; - aegisub = callPackage ../by-name/ae/aegisub/package.nix ( - { - luajit = luajit.override { enable52Compat = true; }; - } - // (config.aegisub or { }) - ); - acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; @@ -1763,15 +1756,7 @@ with pkgs; asciidoc = asciidoc-full; }; - dino = callPackage ../applications/networking/instant-messengers/dino { - inherit (gst_all_1) - gstreamer - gst-plugins-base - gst-plugins-bad - gst-vaapi - ; - gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; - }; + dino = callPackage ../applications/networking/instant-messengers/dino { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -2351,10 +2336,6 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; - dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; - - dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - drone = callPackage ../development/tools/continuous-integration/drone { }; drone-oss = callPackage ../development/tools/continuous-integration/drone { enableUnfree = false; @@ -3457,10 +3438,6 @@ with pkgs; tautulli = python3Packages.callPackage ../servers/tautulli { }; - plfit = callPackage ../by-name/pl/plfit/package.nix { - python = null; - }; - inherit (callPackage ../development/tools/pnpm { }) pnpm_8 pnpm_9 @@ -4094,6 +4071,7 @@ with pkgs; ); flutterPackages = flutterPackages-bin; flutter = flutterPackages.stable; + flutter341 = flutterPackages.v3_41; flutter338 = flutterPackages.v3_38; flutter335 = flutterPackages.v3_35; flutter332 = flutterPackages.v3_32; @@ -5391,35 +5369,26 @@ with pkgs; phpExtensions = recurseIntoAttrs php.extensions; phpPackages = recurseIntoAttrs php.packages; - # Import PHP84 interpreter, extensions and packages - php84 = callPackage ../development/interpreters/php/8.4.nix { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - pcre2 = pcre2.override { - withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 - }; - }; - php84Extensions = recurseIntoAttrs php84.extensions; - php84Packages = recurseIntoAttrs php84.packages; + # Import PHP interpreters + inherit (callPackage ./../development/interpreters/php { }) + php82 + php83 + php84 + php85 + ; + + # PHP Extensions and Packages + php82Extensions = recurseIntoAttrs php82.extensions; + php82Packages = recurseIntoAttrs php82.packages; - # Import PHP83 interpreter, extensions and packages - php83 = callPackage ../development/interpreters/php/8.3.nix { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - pcre2 = pcre2.override { - withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 - }; - }; php83Extensions = recurseIntoAttrs php83.extensions; php83Packages = recurseIntoAttrs php83.packages; - # Import PHP82 interpreter, extensions and packages - php82 = callPackage ../development/interpreters/php/8.2.nix { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - pcre2 = pcre2.override { - withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 - }; - }; - php82Extensions = recurseIntoAttrs php82.extensions; - php82Packages = recurseIntoAttrs php82.packages; + php84Extensions = recurseIntoAttrs php84.extensions; + php84Packages = recurseIntoAttrs php84.packages; + + php85Extensions = recurseIntoAttrs php85.extensions; + php85Packages = recurseIntoAttrs php85.packages; polyml = callPackage ../development/compilers/polyml { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; @@ -7783,10 +7752,6 @@ with pkgs; librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; redland = librdf_redland; # added 2018-04-25 - renovate = callPackage ../by-name/re/renovate/package.nix { - nodejs = nodejs_22; - }; - qadwaitadecorations-qt6 = callPackage ../by-name/qa/qadwaitadecorations/package.nix { useQt6 = true; }; @@ -9452,10 +9417,6 @@ with pkgs; open-vm-tools-headless = open-vm-tools.override { withX = false; }; - odin = callPackage ../by-name/od/odin/package.nix { - llvmPackages = llvmPackages_18; - }; - pam = if stdenv.hostPlatform.isLinux then linux-pam @@ -10054,11 +10015,6 @@ with pkgs; haskell.lib.compose.justStaticExecutables haskellPackages.darcs ); - darktable = callPackage ../by-name/da/darktable/package.nix { - lua = lua5_4; - pugixml = pugixml.override { shared = true; }; - }; - datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix { pythonPackages = datadog-integrations-core { }; }; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 757274fd1dc7..e58ef07ca41f 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -226,6 +226,23 @@ let ''; }; + allowUnfreePackages = mkOption { + type = with lib.types; listOf str; + default = [ ]; + example = [ "ut1999" ]; + description = '' + Allows specific unfree packages to be used. + + This option composes with `nixpkgs.config.allowUnfreePredicate` by also allowing the listed package names. + + Unlike `nixpkgs.config.allowUnfreePredicate`, this option merges additively, similar to `environment.systemPackages`. + This enables defining allowed unfree packages in multiple modules, close to where they are used. + + This avoids the need to centralize all unfree package declarations or globally enable unfree packages via + `nixpkgs.config.allowUnfree = true`. + ''; + }; + allowBroken = mkOption { type = types.bool; default = false; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 29e619bb19de..4886e9aa6060 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1393,6 +1393,28 @@ with self; }; }; + AppXMLDocBookBuilder = buildPerlPackage { + pname = "docmake"; + version = "0.1101"; + + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/App-XML-DocBook-Builder-0.1101.tar.gz"; + hash = "sha256-oa8C24OsbeaNdLIssSz/KH3MNFr0WuQJ67govyhxmqQ="; + }; + + buildInputs = [ + ClassXSAccessor + TestTrap + FileShouldUpdate + ]; + + meta = { + description = "automated builder from DocBook/XML to its output formats (e.g XHTML5 or PDF)"; + homepage = "https://github.com/shlomif/docmake"; + license = lib.licenses.mit; + }; + }; + ArchiveAnyLite = buildPerlPackage { pname = "Archive-Any-Lite"; version = "0.11"; @@ -13918,6 +13940,26 @@ with self; }; }; + FileShouldUpdate = buildPerlModule { + pname = "File-ShouldUpdate"; + version = "0.2.1"; + + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-ShouldUpdate-0.2.1.tar.gz"; + hash = "sha256-r1k1mNBvHCG63TrnQb8LRQbOJl7ImVDGCj8+cQbes+I="; + }; + + buildInputs = [ + PathTiny + ]; + + meta = { + description = "an be used to determine if files should be updated based on the mtime timestamps of their dependencies"; + homepage = "https://github.com/shlomif/perl-File-ShouldUpdate"; + license = lib.licenses.mit; + }; + }; + FilesysDf = buildPerlPackage { pname = "Filesys-Df"; version = "0.92"; @@ -35269,6 +35311,23 @@ with self; }; }; + TestStrict = buildPerlPackage { + pname = "Test-Strict"; + version = "0.54"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MANWAR/Test-Strict-0.54.tar.gz"; + hash = "sha256-9oB1F4I6kKlrQN7q7ZqggAgt7UtQpRIE9b4efOd0yFw="; + }; + buildInputs = [ IOStringy ]; + meta = { + description = "Check syntax, presence of use strict; and test coverage"; + license = with lib.licenses; [ + artistic1 + gpl1Plus + ]; + }; + }; + TestSubCalls = buildPerlPackage { pname = "Test-SubCalls"; version = "1.10"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index bcbccf76333f..9f6229359de5 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -446,6 +446,10 @@ lib.makeScope pkgs.newScope ( configureFlags = [ "--enable-dom" ]; + # PHP 8.5+ has lexbor built into core; dom needs its headers. + env = lib.optionalAttrs (lib.versionAtLeast php.version "8.5") { + NIX_CFLAGS_COMPILE = "-I${php.unwrapped.dev}/include/php/ext/lexbor"; + }; } { name = "enchant"; @@ -572,28 +576,6 @@ lib.makeScope pkgs.newScope ( '') ]; } - { - name = "opcache"; - buildInputs = [ - pcre2 - ] - ++ lib.optional ( - !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind - ) valgrind.dev; - configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit"; - zendExtension = true; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - # Tests are flaky on darwin - rm ext/opcache/tests/blacklist.phpt - rm ext/opcache/tests/bug66338.phpt - rm ext/opcache/tests/bug78106.phpt - rm ext/opcache/tests/issue0115.phpt - rm ext/opcache/tests/issue0149.phpt - rm ext/opcache/tests/revalidate_path_01.phpt - ''; - # Tests launch the builtin webserver. - __darwinAllowLocalNetworking = true; - } { name = "openssl"; buildInputs = [ openssl ]; @@ -828,6 +810,30 @@ lib.makeScope pkgs.newScope ( "--with-kerberos" ]; } + ] + ++ lib.optionals (lib.versionOlder php.version "8.5") [ + { + name = "opcache"; + buildInputs = [ + pcre2 + ] + ++ lib.optional ( + !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind + ) valgrind.dev; + configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit"; + zendExtension = true; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Tests are flaky on darwin + rm ext/opcache/tests/blacklist.phpt + rm ext/opcache/tests/bug66338.phpt + rm ext/opcache/tests/bug78106.phpt + rm ext/opcache/tests/issue0115.phpt + rm ext/opcache/tests/issue0149.phpt + rm ext/opcache/tests/revalidate_path_01.phpt + ''; + # Tests launch the builtin webserver. + __darwinAllowLocalNetworking = true; + } ]; # Convert the list of attrs: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17d60b664927..a00111cb5d7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6859,6 +6859,8 @@ self: super: with self; { helion = callPackage ../development/python-modules/helion { }; + helium = callPackage ../development/python-modules/helium { }; + help2man = callPackage ../development/python-modules/help2man { }; helpdev = callPackage ../development/python-modules/helpdev { }; @@ -11249,6 +11251,10 @@ self: super: with self; { callPackage ../development/python-modules/online-judge-verify-helper { }; + onlinepayments-sdk-python3 = + callPackage ../development/python-modules/onlinepayments-sdk-python3 + { }; + onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx { @@ -12354,7 +12360,12 @@ self: super: with self; { plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; - plfit = toPythonModule (pkgs.plfit.override { inherit (self) python; }); + plfit = toPythonModule ( + pkgs.plfit.override { + withPython = true; + inherit (self) python; + } + ); plink = callPackage ../development/python-modules/plink { }; @@ -19500,6 +19511,8 @@ self: super: with self; { inherit (pkgs) file zlib; }; + typed-argparse = callPackage ../development/python-modules/typed-argparse { }; + typed-settings = callPackage ../development/python-modules/typed-settings { }; typedmonarchmoney = callPackage ../development/python-modules/typedmonarchmoney { }; @@ -19929,6 +19942,8 @@ self: super: with self; { types-mysqlclient = callPackage ../development/python-modules/types-mysqlclient { }; + types-openpyxl = callPackage ../development/python-modules/types-openpyxl { }; + types-pillow = callPackage ../development/python-modules/types-pillow { }; types-protobuf = callPackage ../development/python-modules/types-protobuf { };