diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index b516dcea1a87..3f735f4cbd12 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -27,7 +27,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0 + - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index e8fe7c3717dc..377e9dc2bb75 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -109,7 +109,7 @@ jobs: - name: Build codeowners validator run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator - - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0 + - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID id: app-token with: diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml index b1b5b6dfc077..8a38f0eefeff 100644 --- a/.github/workflows/edited.yml +++ b/.github/workflows/edited.yml @@ -36,7 +36,7 @@ jobs: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs # We only need Pull Requests: write here, but the app is also used for backports. - - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0 + - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 6a2b11c621a1..4dfbe74f02b8 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -49,7 +49,7 @@ jobs: run: npm install @actions/artifact bottleneck # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour. - - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0 + - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index 4e22a2bcbbd9..3846d04159fc 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -23,7 +23,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0 + - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml index 9b3de2338553..c27bb0e97090 100644 --- a/.github/workflows/reviewers.yml +++ b/.github/workflows/reviewers.yml @@ -48,7 +48,7 @@ jobs: # - OWNER_APP_PRIVATE_KEY (secret) # # Can't use the token received from permissions above, because it can't get enough permissions. - - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0 + - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID id: app-token with: diff --git a/ci/OWNERS b/ci/OWNERS index cb3b2869a9f1..856ca93675ca 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -19,7 +19,6 @@ /.github/workflows @NixOS/nixpkgs-ci /ci @NixOS/nixpkgs-ci /ci/OWNERS @infinisil @philiptaron -/maintainers @philiptaron # Development support /.editorconfig @Mic92 @zowoq diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 9cebd8818d03..f36f3a306adc 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -166,7 +166,7 @@ The following is a non-exhaustive list of such differences: - Other environment variables may be inconsistent with a `nix-build` either due to `nix-shell`'s initialization script or due to the use of `nix-shell` without the `--pure` option. If the build fails differently inside the shell than in the sandbox, consider using [`breakpointHook`](#breakpointhook) and invoking `nix-build` instead. -The [`--keep-failed`](https://nixos.org/manual/nix/unstable/command-ref/conf-file#opt--keep-failed) option for `nix-build` may also be useful to examine the build directory of a failed build. +The [`--keep-failed`](https://nixos.org/manual/nix/unstable/command-ref/conf-file#conf-keep-failed) option for `nix-build` may also be useful to examine the build directory of a failed build. ::: ## Tools provided by `stdenv` {#sec-tools-of-stdenv} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 388a3a8a1332..23bb14820650 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7759,6 +7759,13 @@ github = "ErinvanderVeen"; githubId = 10973664; }; + eripa = { + name = "Eric Ripa"; + email = "eric@ripa.io"; + keys = [ { fingerprint = "L2IODNAzlzi0tkpCy4LHixqMUhkEas9D3+mo4a+PQZg"; } ]; + github = "eripa"; + githubId = 1429673; + }; ern775 = { email = "eren.demir2479090@gmail.com"; github = "ern775"; @@ -9368,6 +9375,12 @@ githubId = 471835; name = "Giorgio Gallo"; }; + gipphe = { + email = "gipphe@gmail.com"; + github = "Gipphe"; + githubId = 2266817; + name = "Victor Nascimento Bakke"; + }; GirardR1006 = { email = "julien.girard2@cea.fr"; github = "GirardR1006"; @@ -14125,6 +14138,11 @@ githubId = 61395246; name = "Lampros Pitsillos"; }; + langsjo = { + name = "langsjo"; + github = "langsjo"; + githubId = 104687438; + }; larsr = { email = "Lars.Rasmusson@gmail.com"; github = "larsr"; @@ -18030,6 +18048,12 @@ githubId = 42888162; keys = [ { fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; } ]; }; + neurofibromin = { + name = "Neurofibromin"; + github = "Neurofibromin"; + githubId = 125222560; + keys = [ { fingerprint = "9F9B FE94 618A D266 67BD 2821 4F67 1AFA D8D4 428B"; } ]; + }; neverbehave = { email = "i@never.pet"; github = "NeverBehave"; @@ -20815,11 +20839,10 @@ githubId = 7279609; }; pyrotelekinetic = { - name = "Clover"; - email = "carter@isons.org"; + name = "Clover Ison"; + email = "clover@isons.org"; github = "pyrotelekinetic"; githubId = 29682759; - keys = [ { fingerprint = "5963 78DB 25AA 608D 2743 D466 5D6A D9AE 71B3 F983"; } ]; }; pyrox0 = { name = "Pyrox"; @@ -21168,6 +21191,12 @@ githubId = 5653911; name = "Rampoina"; }; + randomdude = { + name = "Random Dude"; + email = "randomdude16671@proton.me"; + github = "randomdude16671"; + githubId = 210965013; + }; rane = { name = "Rane"; email = "rane+git@junkyard.systems"; @@ -23954,6 +23983,12 @@ githubId = 55726; name = "Stanislav Ochotnický"; }; + sodagunz = { + name = "sodagunz"; + github = "sodagunz"; + githubId = 19618127; + email = "sodagunz+nixpkgs@proton.me"; + }; sodiboo = { name = "sodiboo"; github = "sodiboo"; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 63ff7916ab10..85bb1cd0bf41 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -20,7 +20,8 @@ in { options = { passwordFile = lib.mkOption { - type = lib.types.str; + type = with lib.types; nullOr str; + default = null; description = '' Read the repository password from a file. ''; @@ -366,8 +367,10 @@ in assertions = lib.flatten ( lib.mapAttrsToList (name: backup: [ { - assertion = (backup.repository == null) != (backup.repositoryFile == null); - message = "services.restic.backups.${name}: exactly one of repository or repositoryFile should be set"; + assertion = + ((backup.repository == null) != (backup.repositoryFile == null)) + || (backup.environmentFile != null); + message = "services.restic.backups.${name}: exactly one of repository, repositoryFile or environmentFile should be set"; } { assertion = @@ -378,6 +381,10 @@ in !(fileBackup && commandBackup); message = "services.restic.backups.${name}: cannot do both a command backup and a file backup at the same time."; } + { + assertion = (backup.passwordFile != null) || (backup.environmentFile != null); + message = "services.restic.backups.${name}: passwordFile or environmentFile must be set"; + } ]) config.services.restic.backups ); systemd.services = lib.mapAttrs' ( diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix index e20e8c5931fb..b5c8d5d291d5 100644 --- a/nixos/modules/services/continuous-integration/github-runner/options.nix +++ b/nixos/modules/services/continuous-integration/github-runner/options.nix @@ -256,8 +256,16 @@ }; nodeRuntimes = lib.mkOption { - type = with lib.types; nonEmptyListOf (enum [ "node20" ]); - default = [ "node20" ]; + type = + with lib.types; + nonEmptyListOf (enum [ + "node20" + "node24" + ]); + default = [ + "node20" + "node24" + ]; description = '' List of Node.js runtimes the runner should support. ''; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b3d2fbaee8ed..3c6f89dcb2ae 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1345,6 +1345,7 @@ in simple = runTest ./simple.nix; sing-box = runTest ./sing-box.nix; slimserver = runTest ./slimserver.nix; + slipshow = runTest ./slipshow.nix; slurm = runTest ./slurm.nix; snmpd = runTest ./snmpd.nix; smokeping = runTest ./smokeping.nix; diff --git a/nixos/tests/slipshow.nix b/nixos/tests/slipshow.nix new file mode 100644 index 000000000000..40e0f0be620e --- /dev/null +++ b/nixos/tests/slipshow.nix @@ -0,0 +1,35 @@ +{ + lib, + pkgs, + ... +}: +{ + name = "slipshow presentation test"; + + meta.maintainers = with lib.maintainers; [ ethancedwards8 ]; + + nodes.machine = { + environment.systemPackages = with pkgs; [ slipshow ]; + + environment.etc."slipshow".source = pkgs.fetchFromGitHub { + owner = "meithecatte"; + repo = "bbslides"; + rev = "ce1c08cafa71ae36dda8cc581956548b8386ae16"; + hash = "sha256-sOydmvtDeMhNejDkwlsXdrbwtqN6lcNnzTnGzBVRFxA="; + }; + }; + + testScript = + { nodes, ... }: + '' + start_all() + + # it may take around a minute to compile the file and serve it + machine.succeed("slipshow serve /etc/slipshow/bbslides.md &>/dev/null &") + + # slipshow serves defaultly on :8080 and unfortunately cannot + # be changed currently + machine.wait_for_open_port(8080) + machine.succeed("curl -i 0.0.0.0:8080") + ''; +} diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index cc604b222f32..e36142b300dd 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -13,7 +13,7 @@ lib.makeScope pkgs.newScope ( inherit lib; inherit (pkgs) fetchFromBitbucket - fetchFromSavannah + fetchurl ; }; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index e088d9610b70..be728c1a3a1a 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -69,7 +69,6 @@ # Boolean flags withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, noGui ? false, - srcRepo ? true, withAcl ? false, withAlsaLib ? false, withAthena ? false, @@ -200,9 +199,11 @@ mkDerivation (finalAttrs: { ]; postPatch = lib.concatStringsSep "\n" [ - (lib.optionalString srcRepo '' - rm -fr .git - '') + + # See: https://github.com/NixOS/nixpkgs/issues/170426 + '' + find . -type f \( -name "*.elc" -o -name "*loaddefs.el" \) -exec rm {} \; + '' # Add the name of the wrapped gvfsd # This used to be carried as a patch but it often got out of sync with @@ -247,11 +248,6 @@ mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper pkg-config - ] - ++ lib.optionals (variant == "macport") [ - texinfo - ] - ++ lib.optionals srcRepo [ autoreconfHook texinfo ] diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index c706d8ecc276..38864a90e221 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -1,7 +1,7 @@ { lib, fetchFromBitbucket, - fetchFromSavannah, + fetchurl, }: let @@ -26,9 +26,9 @@ let src = { "mainline" = ( - fetchFromSavannah { - repo = "emacs"; - inherit rev hash; + fetchurl { + url = "mirror://gnu/emacs/emacs-${rev}.tar.xz"; + inherit hash; } ); "macport" = ( @@ -108,7 +108,7 @@ in version = "30.2"; variant = "mainline"; rev = "30.2"; - hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA="; + hash = "sha256-s/NvGKbdJxVxM3AWYlfeL64B+dOM/oeM7Zsebe1b79k="; patches = fetchpatch: [ (builtins.path { name = "inhibit-lexical-cookie-warning-67916.patch"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6e155a6b10b7..205276584175 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -493,8 +493,8 @@ let mktplcRef = { publisher = "banacorn"; name = "agda-mode"; - version = "0.6.4"; - hash = "sha256-KBOVVVDw+72QSYv4jynqeVBdIfYz+T5hD2//royVJpw="; + version = "0.6.5"; + hash = "sha256-fq3JiqdtYN9kAWDvu8X+2mlU5kj2RwUTPA4QF43vShQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; @@ -920,8 +920,8 @@ let mktplcRef = { name = "crabviz"; publisher = "chanhx"; - version = "0.4.0"; - hash = "sha256-SOsoSQLDNRqby91Ire4euSz6udRZI6G/RVloVjIvhUM="; + version = "0.5.0"; + hash = "sha256-YLNx/9jmHc0HDm/yHquOlMDPmAbpIdd6UZn0JZQVJko="; }; meta = { description = "VSCode extension for generating call graphs based on LSP"; @@ -1614,8 +1614,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.29.2"; - hash = "sha256-+MkKUhyma/mc5MZa0+RFty5i7rox0EARPTm/uggQj6M="; + version = "0.29.3"; + hash = "sha256-cghDjgv3FWsNpnH6Pa9iPuiPOlLI/iucGH+fzF35ERk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix index 0ea38a2711d4..420a7bc2c1d4 100644 --- a/pkgs/applications/emulators/libretro/cores/citra.nix +++ b/pkgs/applications/emulators/libretro/cores/citra.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "citra"; - version = "0-unstable-2025-06-22"; + version = "0-unstable-2025-08-17"; src = fetchFromGitHub { owner = "libretro"; repo = "citra"; - rev = "176214934cd46d6e072adcbda5f676bc4ca3162e"; - hash = "sha256-cdBR64OBOGMy0ROR89mbKXC0xk+QkBHUKEkIn2czGiQ="; + rev = "5263fae3344e5e9af43036e0e38bec2d10fb2407"; + hash = "sha256-66kbE1taODjxXDhO3uV5R212nikyXfHwCHC/zamZuL0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index a598216c9fff..fcf77335fd20 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -110,7 +110,20 @@ rec { }; # Eventually, switch to an updateScript without versionPrefix hardcoded... - thunderbird-esr = thunderbird-128; + thunderbird-esr = thunderbird-140; + + thunderbird-140 = common { + applicationName = "Thunderbird ESR"; + + version = "140.2.0esr"; + sha512 = "6a10f95b805f00a0820c822ae07bc52ac39d0a55f084c319d27f01710d8a1d809b7b224da966632ae0a22658bf14e76c8fd7cec022718316c306c43809a4997d"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-140"; + versionPrefix = "140"; + versionSuffix = "esr"; + }; + }; thunderbird-128 = common { applicationName = "Thunderbird ESR"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix index 8a6e77b51f87..411fb9b04d84 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-text-pthread"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-text-pthread"; rev = version; - sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o="; + sha256 = "sha256-lDGji2ZdK5XoBKLRdgYCIDPndVkhIZltc94wWFRTLCA="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/build-mozilla-mach/136-no-buildconfig.patch b/pkgs/build-support/build-mozilla-mach/136-no-buildconfig.patch new file mode 100644 index 000000000000..69972b5518bb --- /dev/null +++ b/pkgs/build-support/build-mozilla-mach/136-no-buildconfig.patch @@ -0,0 +1,26 @@ +diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp +index 16888323d7..b96450a247 100644 +--- a/docshell/base/nsAboutRedirector.cpp ++++ b/docshell/base/nsAboutRedirector.cpp +@@ -90,9 +90,6 @@ static const RedirEntry kRedirMap[] = { + {"addons", "chrome://mozapps/content/extensions/aboutaddons.html", + nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, + #endif +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | +- nsIAboutModule::IS_SECURE_CHROME_UI}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn +index eb6c179b60..57568668b1 100644 +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -40,7 +40,6 @@ toolkit.jar: + content/global/aboutUrlClassifier.js + content/global/aboutUrlClassifier.xhtml + content/global/aboutUrlClassifier.css +-* content/global/buildconfig.html + content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 8afe2e434322..043fc8ec537d 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -305,7 +305,8 @@ buildStdenv.mkDerivation { ]; patches = - lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [ + lib.optionals (lib.versionAtLeast version "136") [ ./136-no-buildconfig.patch ] + ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1955112 # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9 ./139-wayland-drag-animation.patch diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh index 50754a7b56d4..56f20a4f63a3 100644 --- a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh +++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh @@ -9,6 +9,7 @@ dartConfigHook() { echo "Installing dependencies" mkdir -p .dart_tool cp "$packageConfig" .dart_tool/package_config.json + @python3@ @packageGraphScript@ > .dart_tool/package_graph.json packagePath() { jq --raw-output --arg name "$1" '.packages.[] | select(.name == $name) .rootUri | sub("file://"; "")' .dart_tool/package_config.json diff --git a/pkgs/build-support/dart/build-dart-application/hooks/default.nix b/pkgs/build-support/dart/build-dart-application/hooks/default.nix index bf4b88da5d2e..64f1019f882f 100644 --- a/pkgs/build-support/dart/build-dart-application/hooks/default.nix +++ b/pkgs/build-support/dart/build-dart-application/hooks/default.nix @@ -4,6 +4,7 @@ dart, yq, jq, + python3, }: { @@ -11,6 +12,8 @@ name = "dart-config-hook"; substitutions.yq = "${yq}/bin/yq"; substitutions.jq = "${jq}/bin/jq"; + substitutions.python3 = lib.getExe (python3.withPackages (ps: with ps; [ pyyaml ])); + substitutions.packageGraphScript = ../../pub2nix/package-graph.py; } ./dart-config-hook.sh; dartBuildHook = makeSetupHook { name = "dart-build-hook"; diff --git a/pkgs/build-support/dart/pub2nix/package-graph.py b/pkgs/build-support/dart/pub2nix/package-graph.py new file mode 100644 index 000000000000..a63b5b042045 --- /dev/null +++ b/pkgs/build-support/dart/pub2nix/package-graph.py @@ -0,0 +1,54 @@ +""" +https://github.com/dart-lang/pub/issues/4522 +This script generates a package_graph.json file. +""" + +import json +import os +from pathlib import Path +from urllib.parse import unquote, urlparse + +import yaml + + +def get_package(pubspec_path: Path, dev_dependencies: bool = False): + with pubspec_path.open("r", encoding="utf-8") as f: + pubspec = yaml.load(f, Loader=yaml.CSafeLoader) + package = { + "name": pubspec["name"], + "version": pubspec.get("version") or "0.0.0", + "dependencies": list(pubspec.get("dependencies") or {}), + } + if dev_dependencies: + package["devDependencies"] = list(pubspec.get("dev_dependencies") or {}) + return package + + +def main() -> None: + package_config_file_path = Path(os.environ["packageConfig"]) # noqa: SIM112 + with package_config_file_path.open("r", encoding="utf-8") as f: + package_config = json.load(f) + package_graph = [] + root_package = get_package(Path("pubspec.yaml"), dev_dependencies=True) + for data in package_config.get("packages", []): + if data["name"] == root_package["name"] or data["rootUri"] == "flutter_gen": + continue + package_graph.append( + get_package(Path(unquote(urlparse(data["rootUri"]).path)) / "pubspec.yaml") + ) + package_graph.append(root_package) + print( + json.dumps( + { + "roots": [root_package["name"]], + "packages": package_graph, + "configVersion": 1, + }, + indent=2, + ensure_ascii=False, + ) + ) + + +if __name__ == "__main__": + main() diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index 90884d9a5256..82dcdeaf535d 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -11,6 +11,8 @@ xz, version, pharHash, + installShellFiles, + stdenv, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -24,7 +26,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontUnpack = true; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + installShellFiles + ]; installPhase = '' runHook preInstall @@ -46,13 +51,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd composer \ + --bash <($out/bin/composer completion bash) + ''; + meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; description = "Dependency Manager for PHP, shipped from the PHAR file"; homepage = "https://getcomposer.org/"; license = lib.licenses.mit; mainProgram = "composer"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ lib.maintainers.patka ]; + teams = [ lib.teams.php ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ak/akkoma-fe/package.nix b/pkgs/by-name/ak/akkoma-fe/package.nix index 88096a68f044..ce282974eac4 100644 --- a/pkgs/by-name/ak/akkoma-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-fe/package.nix @@ -9,7 +9,7 @@ nodejs, jpegoptim, oxipng, - nodePackages, + svgo, nix-update-script, }: @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs jpegoptim oxipng - nodePackages.svgo + svgo ]; postPatch = '' @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { # (Losslessly) optimise compression of image artifacts find dist -type f -name '*.jpg' -execdir ${jpegoptim}/bin/jpegoptim -w$NIX_BUILD_CORES {} \; find dist -type f -name '*.png' -execdir ${oxipng}/bin/oxipng -o max -t $NIX_BUILD_CORES {} \; - find dist -type f -name '*.svg' -execdir ${nodePackages.svgo}/bin/svgo {} \; + find dist -type f -name '*.svg' -execdir ${svgo}/bin/svgo {} \; cp -R -v dist $out diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index 97a68660a69b..40865fc86aff 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.9.1"; + version = "4.8.9.2"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-docQqOVzmgqWPhKzOmKeXhssjyhtfYy1fNn0ZGXjsZ0="; + hash = "sha256-UavKtAwnEa+Ym1a7XzC3JPDLovqggjsav4q2MiYUxbI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index b6ec6f336c7e..597778941003 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -5,29 +5,55 @@ installShellFiles, nix-update-script, stdenv, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, }: buildGoModule rec { pname = "argocd"; - version = "2.14.11"; + version = "3.1.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-KCU/WMytx4kOzlkZDwLfRRfutBtdk6UVBNdXOWC5kWc="; + hash = "sha256-zg6zd10hpGUOukrwMK0qJXBL8nVgPSZJ6+jh+/mbOL0="; + }; + + ui = stdenv.mkDerivation { + pname = "${pname}-ui"; + inherit version; + src = src + "/ui"; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/ui/yarn.lock"; + hash = "sha256-ekhSPWzIgFhwSw0bIlBqu8LTYk3vuJ9VM8eHc3mnHGM="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; + + postInstall = '' + mkdir -p $out + cp -r dist $out/dist + ''; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-Xm9J08pxzm3fPQjMA6NDu+DPJGsvtUvj+n/qrOZ9BE4="; + vendorHash = "sha256-tYHA1WlziKWOvv3uF3tTSrvqDoHBVRhUnKZXOxT1rMk="; # Set target as ./cmd per cli-local - # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 + # https://github.com/argoproj/argo-cd/blob/master/Makefile subPackages = [ "cmd" ]; ldflags = let - packageUrl = "github.com/argoproj/argo-cd/v2/common"; + packageUrl = "github.com/argoproj/argo-cd/v3/common"; in [ "-s" @@ -41,12 +67,17 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + preBuild = '' + cp -r ${ui}/dist ./ui + stat ./ui/dist/app/index.html # Sanity check + ''; + # set ldflag for kubectlVersion since it is needed for argo # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code prePatch = '' export KUBECTL_VERSION=$(grep 'k8s.io/kubectl v' go.mod | cut -f 2 -d " " | cut -f 1 -d "=" ) echo using $KUBECTL_VERSION - ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v2/common.kubectlVersion=''${KUBECTL_VERSION}" + ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v3/common.kubectlVersion=''${KUBECTL_VERSION}" ''; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/as/asciiquarium-transparent/package.nix b/pkgs/by-name/as/asciiquarium-transparent/package.nix index e82c054b017a..85ee2cb78c7c 100644 --- a/pkgs/by-name/as/asciiquarium-transparent/package.nix +++ b/pkgs/by-name/as/asciiquarium-transparent/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "asciiquarium-transparent"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "nothub"; repo = "asciiquarium"; - rev = "${finalAttrs.version}"; - hash = "sha256-zQyVIfwmhF3WsCeIZLwjDufvKzAfjLxaK2s7WTedqCg="; + rev = "v${finalAttrs.version}"; + hash = "sha256-lUNPg+/R/UwnHxjVXROMjvQxBZuCPBrYWB546OHplJM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index cb6cd7a143f6..36d0be40a5dd 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.1.111"; + version = "4.1.135"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage"; - hash = "sha256-0cr6syveIHIIy8+FyE23U8iidMYJXkN8CqhhbH0oNt0="; + hash = "sha256-bp0RGU689A8kgphNgJJnlbQBh1fAubwWUvM9StzLwB4="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/bl/blowfish-tools/package.nix b/pkgs/by-name/bl/blowfish-tools/package.nix new file mode 100644 index 000000000000..d8ab233e56cb --- /dev/null +++ b/pkgs/by-name/bl/blowfish-tools/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + hugo, +}: + +buildNpmPackage (finalAttrs: { + pname = "blowfish-tools"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "nunocoracao"; + repo = "blowfish-tools"; + tag = "v${finalAttrs.version}"; + hash = "sha256-90EKsRKOO2Hb64Wy3TlwzlPU2K8AAlSxc17ek5ZLoG0="; + }; + + dontNpmBuild = true; + + npmDepsHash = "sha256-P6XHXR4QcVCRz5ju36OzCTNxXtW9RYxkfhbp7kJVfoY="; + + postFixup = '' + wrapProgram $out/bin/blowfish-tools \ + --prefix PATH : ${lib.makeBinPath [ hugo ]} + ''; + + meta = { + description = "CLI to initialize and configure a Blowfish project"; + homepage = "https://blowfish.page"; + changelog = "https://github.com/nunocoracao/blowfish-tools/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eripa ]; + mainProgram = "blowfish-tools"; + }; +}) diff --git a/pkgs/by-name/ch/choose/package.nix b/pkgs/by-name/ch/choose/package.nix index 3043e782099d..3e6597d8722f 100644 --- a/pkgs/by-name/ch/choose/package.nix +++ b/pkgs/by-name/ch/choose/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "choose"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "theryangeary"; repo = "choose"; rev = "v${version}"; - sha256 = "sha256-ojmib9yri/Yj1VSwwssbXv+ThnZjUXLTmOpfPGdGFaU="; + sha256 = "sha256-nqL8CAnpqOaecC6vHlCtVXFRO0OAGZAn12TdOM5iUFA="; }; - cargoHash = "sha256-SecWDujJu68K1LMQJQ55LeW51Ag/aCt1YKcdWeRp22c="; + cargoHash = "sha256-NVpkCs1QY2e+WiI9nk1uz/j3pOtsJpMwgAMspB6Bs1E="; meta = with lib; { description = "Human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 282079be6889..be310ab7754b 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.125.0"; + version = "1.128.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-bpQvBUSYpmv6bmgXSCz9pfGgFxlGVFFDfaSkvk7481E="; + hash = "sha256-pIuBIl1iZRuqjy7CPfsTnR82Fq7iH22TtpbSk4oBshQ="; fetchSubmodules = true; }; @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { "CIRCT :: circt-as-dis/.*\\.mlir" "CIRCT :: circt-reduce/.*\\.mlir" "CIRCT :: circt-test/basic.mlir" + "CIRCT :: firld/.*\\.mlir" ] ++ [ # Temporarily disable for bump: https://github.com/llvm/circt/issues/8000 diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index 3a6c759ad1ad..feb8e901b883 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -20,6 +20,7 @@ jq, ripgrep, common-updater-scripts, + headless ? false, }: let @@ -38,7 +39,7 @@ in stdenv.mkDerivation rec { inherit version; - pname = "cloudflare-warp"; + pname = "cloudflare-warp" + lib.optionalString headless "-headless"; src = sources.${stdenv.hostPlatform.system} @@ -49,20 +50,24 @@ stdenv.mkDerivation rec { autoPatchelfHook versionCheckHook makeWrapper + ] + ++ lib.optionals (!headless) [ copyDesktopItems desktop-file-utils ]; buildInputs = [ dbus - gtk3 libpcap openssl nss (lib.getLib stdenv.cc.cc) + ] + ++ lib.optionals (!headless) [ + gtk3 ]; - desktopItems = [ + desktopItems = lib.optionals (!headless) [ (makeDesktopItem { name = "com.cloudflare.WarpCli"; desktopName = "Cloudflare Zero Trust Team Enrollment"; @@ -93,22 +98,35 @@ stdenv.mkDerivation rec { mv lib/systemd/system $out/lib/systemd/ substituteInPlace $out/lib/systemd/system/warp-svc.service \ --replace-fail "ExecStart=" "ExecStart=$out" - substituteInPlace $out/lib/systemd/user/warp-taskbar.service \ - --replace-fail "ExecStart=" "ExecStart=$out" \ - --replace-fail "BindsTo=" "PartOf=" + ${lib.optionalString (!headless) '' + substituteInPlace $out/lib/systemd/user/warp-taskbar.service \ + --replace-fail "ExecStart=" "ExecStart=$out" \ + --replace-fail "BindsTo=" "PartOf=" - cat >>$out/lib/systemd/user/warp-taskbar.service <>$out/lib/systemd/user/warp-taskbar.service < (!enableWlrSupport); stdenv.mkDerivation (finalAttrs: { pname = "flameshot"; - version = "13.0.1"; + version = "13.1.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; tag = "v${finalAttrs.version}"; - hash = "sha256-Zo+rhvpwhcYqgn8PZ0b48sCb/YWqGSormFnY6pbY8Qc="; + hash = "sha256-Wg0jc1AqgetaESmTyhzAHx3zal/5DMDum7fzhClqeck="; }; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-I${kdsingleapplication}/include/kdsingleapplication-qt6" + (lib.cmakeBool "USE_BUNDLED_KDSINGLEAPPLICATION" false) (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true) (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon) ] diff --git a/pkgs/by-name/fl/fluent-icon-theme/package.nix b/pkgs/by-name/fl/fluent-icon-theme/package.nix index 0e1b0ee2e368..355ce29e499a 100644 --- a/pkgs/by-name/fl/fluent-icon-theme/package.nix +++ b/pkgs/by-name/fl/fluent-icon-theme/package.nix @@ -30,13 +30,13 @@ lib.checkListOfEnum "${pname}: available color variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2025-02-26"; + version = "2025-08-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "Fluent-icon-theme"; tag = version; - hash = "sha256-nL9hk+H2ees2grBvVULvJs54FlFTXrA7o1STbDDJGhQ="; + hash = "sha256-qAKNAbmSfVuzUGDJGVU0QF3LMc5tRzAy+l0ZwEXaJ28="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch index 7e9d9f4790a0..02731aa16fdb 100644 --- a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch +++ b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch @@ -1,396 +1,85 @@ -diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml -index b35356ea76..b7ab1c775b 100644 ---- a/forge-adventure/pom.xml -+++ b/forge-adventure/pom.xml -@@ -47,131 +47,6 @@ - - - -- -- com.akathist.maven.plugins.launch4j -- launch4j-maven-plugin -- 1.7.25 -- -- -- l4j-adv -- package -- -- launch4j -- -- -- gui -- ${project.build.directory}/forge-adventure-editor-java8.exe -- ${project.build.finalName}-jar-with-dependencies.jar -- true -- forge -- src/main/config/forge-adventure-editor.ico -- -- forge.adventure.Main -- false -- anything -- -- -- 1.8.0 -- 4096 -- -- -Dfile.encoding=UTF-8 -- -- -- -- -- 1.0.0.0 -- -- -- 1.0.0.0 -- -- Forge -- Forge -- -- 1.0.0.0 -- -- -- 1.0.0.0 -- -- forge-adventure-editor -- forge-adventure-editor -- forge-adventure-editor-java8.exe -- -- -- -- -- -- l4j-adv2 -- package -- -- launch4j -- -- -- gui -- ${project.build.directory}/forge-adventure-editor.exe -- ${project.build.finalName}-jar-with-dependencies.jar -- true -- forge -- https://www.oracle.com/java/technologies/downloads/ -- src/main/config/forge-adventure-editor.ico -- -- forge.adventure.Main -- false -- anything -- -- -- 11.0.1 -- jdkOnly -- 4096 -- -- -Dfile.encoding=UTF-8 -- --add-opens java.base/java.lang=ALL-UNNAMED -- --add-opens java.base/java.math=ALL-UNNAMED -- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -- --add-opens java.base/java.nio=ALL-UNNAMED -- --add-opens=java.base/sun.nio.ch=ALL-UNNAMED -- --add-opens java.base/java.util=ALL-UNNAMED -- --add-opens java.base/java.lang.reflect=ALL-UNNAMED -- --add-opens java.base/java.text=ALL-UNNAMED -- --add-opens java.desktop/java.awt=ALL-UNNAMED -- --add-opens java.desktop/java.awt.font=ALL-UNNAMED -- --add-opens java.desktop/java.awt.image=ALL-UNNAMED -- --add-opens java.desktop/java.awt.color=ALL-UNNAMED -- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED -- --add-opens java.desktop/javax.swing=ALL-UNNAMED -- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED -- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED -- --add-opens java.desktop/sun.swing=ALL-UNNAMED -- --add-opens java.desktop/java.beans=ALL-UNNAMED -- --add-opens java.base/java.util.concurrent=ALL-UNNAMED -- --add-opens java.base/java.net=ALL-UNNAMED -- -Dio.netty.tryReflectionSetAccessible=true -- -- -- -- -- 1.0.0.0 -- -- -- 1.0.0.0 -- -- Forge -- Forge -- -- 1.0.0.0 -- -- -- 1.0.0.0 -- -- forge-adventure-editor -- forge-adventure-editor -- forge-adventure-editor.exe -- -- -- -- -- -- -- - - com.google.code.maven-replacer-plugin - replacer diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml -index 3b74663b04..f0e324b69c 100644 +index dfe902e6b9..6fe3382f27 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml -@@ -282,59 +282,6 @@ - windows-linux-release - - -- -- com.akathist.maven.plugins.launch4j -- launch4j-maven-plugin -- 2.1.2 -- -- -- l4j-gui -- package -- -- launch4j -- -- -- gui -- ${project.build.directory}/forge-java8.exe -- ${project.build.finalName}-jar-with-dependencies.jar -- true -- forge -- src/main/config/forge.ico -- -- forge.view.Main -- false -- anything -- -- -- 1.8.0 -- 4096 -- -- -Dfile.encoding=UTF-8 -- -- -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- Forge -- Forge -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- Forge -- forge -- forge-java8.exe -- -- -- -- -- - - - org.apache.maven.plugins -@@ -447,130 +394,6 @@ - windows-linux - - -- -- com.akathist.maven.plugins.launch4j -- launch4j-maven-plugin -- 2.1.2 -- -- -- l4j-gui -- package -- -- launch4j -- -- -- gui -- ${project.build.directory}/forge-java8.exe -- ${project.build.finalName}-jar-with-dependencies.jar -- true -- forge -- src/main/config/forge.ico -- -- forge.view.Main -- false -- anything -- -- -- 1.8.0 -- 4096 -- -- -Dfile.encoding=UTF-8 -- -- -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- Forge -- Forge -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- Forge -- forge -- forge-java8.exe -- -- -- -- -- -- l4j-gui2 -- package -- -- launch4j -- -- -- gui -- ${project.build.directory}/forge.exe -- ${project.build.finalName}-jar-with-dependencies.jar -- true -- forge -- https://www.oracle.com/java/technologies/downloads/ -- src/main/config/forge.ico -- -- forge.view.Main -- false -- anything -- -- -- 11.0.1 -- jdkOnly -- 4096 -- -- -Dfile.encoding=UTF-8 -- --add-opens java.base/java.lang=ALL-UNNAMED -- --add-opens java.base/java.math=ALL-UNNAMED -- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -- --add-opens java.base/java.nio=ALL-UNNAMED -- --add-opens=java.base/sun.nio.ch=ALL-UNNAMED -- --add-opens java.base/java.util=ALL-UNNAMED -- --add-opens java.base/java.lang.reflect=ALL-UNNAMED -- --add-opens java.base/java.text=ALL-UNNAMED -- --add-opens java.desktop/java.awt=ALL-UNNAMED -- --add-opens java.desktop/java.awt.font=ALL-UNNAMED -- --add-opens java.desktop/java.awt.image=ALL-UNNAMED -- --add-opens java.desktop/java.awt.color=ALL-UNNAMED -- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED -- --add-opens java.desktop/javax.swing=ALL-UNNAMED -- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED -- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED -- --add-opens java.desktop/sun.swing=ALL-UNNAMED -- --add-opens java.desktop/java.beans=ALL-UNNAMED -- --add-opens java.base/java.util.concurrent=ALL-UNNAMED -- --add-opens java.base/java.net=ALL-UNNAMED -- -Dio.netty.tryReflectionSetAccessible=true -- -- -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- Forge -- Forge -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- -- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 -- -- Forge -- forge -- forge.exe -- -- -- -- -- -- - - - org.apache.maven.plugins -diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml -index e7439c1e3a..de0cbc16a1 100644 ---- a/forge-gui-mobile-dev/pom.xml -+++ b/forge-gui-mobile-dev/pom.xml -@@ -64,130 +64,6 @@ - - +@@ -70,62 +70,6 @@ + + - - com.akathist.maven.plugins.launch4j - launch4j-maven-plugin -- 1.7.25 +- 2.5.1 - - -- l4j-adv +- l4j-gui - package - - launch4j - - - gui -- ${project.build.directory}/forge-adventure-java8.exe +- ${project.build.directory}/forge.exe - ${project.build.finalName}-jar-with-dependencies.jar - true - forge -- src/main/config/forge-adventure.ico +- https://bell-sw.com/pages/downloads/#jdk-17-lts +- src/main/config/forge.ico - -- forge.app.Main +- forge.view.Main - false - anything - - -- 1.8.0 +- 17 +- true - 4096 - -- -Dfile.encoding=UTF-8 +- ${mandatory.java.args} +- ${addopen.java.args} - - - - -- 1.0.0.0 +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - -- 1.0.0.0 +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - Forge - Forge - -- 1.0.0.0 +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - -- 1.0.0.0 +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - -- forge-adventure -- forge-adventure -- forge-adventure-java8.exe +- Forge +- forge +- forge.exe - - - -- +- +- + + com.google.code.maven-replacer-plugin + replacer +diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml +index 168ecba1dc..748dbf47b7 100644 +--- a/forge-gui-mobile-dev/pom.xml ++++ b/forge-gui-mobile-dev/pom.xml +@@ -60,57 +60,6 @@ + 17 + + +- +- com.akathist.maven.plugins.launch4j +- launch4j-maven-plugin +- 2.5.1 +- - -- l4j-adv2 +- l4j-adv - package - - launch4j @@ -401,40 +90,14 @@ index e7439c1e3a..de0cbc16a1 100644 - ${project.build.finalName}-jar-with-dependencies.jar - true - forge -- https://www.oracle.com/java/technologies/downloads/ +- https://bell-sw.com/pages/downloads/#jdk-17-lts - src/main/config/forge-adventure.ico -- -- forge.app.Main -- false -- anything -- - -- 11.0.1 -- jdkOnly +- 17 +- true - 4096 - -- -Dfile.encoding=UTF-8 -- --add-opens java.base/java.lang=ALL-UNNAMED -- --add-opens java.base/java.math=ALL-UNNAMED -- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -- --add-opens java.base/java.nio=ALL-UNNAMED -- --add-opens=java.base/sun.nio.ch=ALL-UNNAMED -- --add-opens java.base/java.util=ALL-UNNAMED -- --add-opens java.base/java.lang.reflect=ALL-UNNAMED -- --add-opens java.base/java.text=ALL-UNNAMED -- --add-opens java.desktop/java.awt=ALL-UNNAMED -- --add-opens java.desktop/java.awt.font=ALL-UNNAMED -- --add-opens java.desktop/java.awt.image=ALL-UNNAMED -- --add-opens java.desktop/java.awt.color=ALL-UNNAMED -- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED -- --add-opens java.desktop/javax.swing=ALL-UNNAMED -- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED -- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED -- --add-opens java.desktop/sun.swing=ALL-UNNAMED -- --add-opens java.desktop/java.beans=ALL-UNNAMED -- --add-opens java.base/java.util.concurrent=ALL-UNNAMED -- --add-opens java.base/java.net=ALL-UNNAMED -- -Dio.netty.tryReflectionSetAccessible=true +- ${mandatory.java.args} - - - @@ -462,5 +125,5 @@ index e7439c1e3a..de0cbc16a1 100644 - - - maven-assembly-plugin - + com.google.code.maven-replacer-plugin + replacer diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix index dedce0dd3cd3..ef078bbe0298 100644 --- a/pkgs/by-name/fo/forge-mtg/package.nix +++ b/pkgs/by-name/fo/forge-mtg/package.nix @@ -6,16 +6,21 @@ maven, makeWrapper, openjdk, + libGL, + makeDesktopItem, + copyDesktopItems, + imagemagick, + nix-update-script, }: let - version = "1.6.65"; + version = "2.0.05"; src = fetchFromGitHub { owner = "Card-Forge"; repo = "forge"; rev = "forge-${version}"; - hash = "sha256-MCJl3nBHbX/O24bzD4aQ12eMWxYY2qJC5vomvtsIBek="; + hash = "sha256-71CZBI4FvN5X7peDjhv+0cdTYv8hWwzM8ePdvQSb6QI="; }; # launch4j downloads and runs a native binary during the package phase. @@ -26,11 +31,56 @@ maven.buildMavenPackage { pname = "forge-mtg"; inherit version src patches; - mvnHash = "sha256-ouF0Ja3oGrlUCcT0PzI5i9FQ+oLdEhE/LvhJ0QGErvI="; + mvnHash = "sha256-krPOUaJTo5i3imkDvEkBJH3W01y1KypdvitqmZ5JMMA="; doCheck = false; # Needs a running Xorg - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + imagemagick + ]; + desktopItems = [ + (makeDesktopItem { + name = "forge"; + exec = "forge"; + actions = { + forge-adventure = { + exec = "forge-adventure"; + name = "Play Adventure"; + }; + forge-adventure-editor = { + exec = "forge-adventure-editor"; + name = "Adventure Editor"; + }; + forge-classic = { + exec = "forge"; + name = "Play Classic"; + }; + }; + icon = "forge-mtg"; + comment = "Magic: the Gathering card game with rules enforcement"; + desktopName = "Forge MTG"; + genericName = "Card Game"; + categories = [ + "Game" + "BoardGame" + ]; + keywords = [ + "Magic" + "MTG" + "Card Game" + "Trading Card Game" + "TCG" + ]; + }) + ]; + + mvnParameters = lib.escapeShellArgs [ + "-pl" + ":adventure-editor,:forge-gui-desktop,:forge-gui-mobile-dev" # forge-gui-mobile-dev is required for forge-adventure + "--also-make" + ]; installPhase = '' runHook preInstall @@ -40,16 +90,25 @@ maven.buildMavenPackage { forge-gui-desktop/target/forge-gui-desktop-${version}-jar-with-dependencies.jar \ forge-gui-mobile-dev/target/forge-adventure.sh \ forge-gui-mobile-dev/target/forge-gui-mobile-dev-${version}-jar-with-dependencies.jar \ - forge-adventure/target/forge-adventure-editor.sh \ - forge-adventure/target/forge-adventure-${version}-jar-with-dependencies.jar \ + adventure-editor/target/adventure-editor-jar-with-dependencies.jar \ forge-gui/res \ $out/share/forge + cp adventure-editor/target/adventure-editor.sh $out/share/forge/forge-adventure-editor.sh + + mkdir -p $out/share/icons/hicolor/128x128/apps + magick AppIcon.png -resize 128x128 $out/share/icons/hicolor/128x128/apps/forge-mtg.png + runHook postInstall ''; preFixup = '' for commandToInstall in forge forge-adventure forge-adventure-editor; do chmod 555 $out/share/forge/$commandToInstall.sh + PREFIX_CMD="" + if [ "$commandToInstall" = "forge-adventure" ]; then + PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}" + fi + makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \ --prefix PATH : ${ lib.makeBinPath [ @@ -59,13 +118,18 @@ maven.buildMavenPackage { ] } \ --set JAVA_HOME ${openjdk}/lib/openjdk \ - --set SENTRY_DSN "" + --set SENTRY_DSN "" \ + $PREFIX_CMD done ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=forge-(.*)" ]; + }; + meta = with lib; { description = "Magic: the Gathering card game with rules enforcement"; - homepage = "https://www.slightlymagic.net/forum/viewforum.php?f=26"; + homepage = "https://card-forge.github.io/forge"; license = licenses.gpl3Plus; maintainers = with maintainers; [ eigengrau ]; }; diff --git a/pkgs/by-name/fr/fromager/package.nix b/pkgs/by-name/fr/fromager/package.nix index 53fdc785c02b..f9edb2825bd1 100644 --- a/pkgs/by-name/fr/fromager/package.nix +++ b/pkgs/by-name/fr/fromager/package.nix @@ -6,19 +6,19 @@ python3.pkgs.buildPythonApplication rec { pname = "fromager"; - version = "0.47.0"; + version = "0.59.0"; pyproject = true; src = fetchFromGitHub { owner = "python-wheel-build"; repo = "fromager"; tag = version; - hash = "sha256-Jw5fOhY4WOwYG5QPCcsT6+BicGtqz9UrHcpPsPQlOWc="; + hash = "sha256-aKoZKpzgJ3e5JRYSSeLmLlji1Fj8omxvwGZfNXDOhLs="; }; build-system = with python3.pkgs; [ - setuptools - setuptools-scm + hatchling + hatch-vcs ]; dependencies = with python3.pkgs; [ @@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { pyproject-hooks pyyaml requests + requests-mock resolvelib rich setuptools diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index 94f75a7d304d..b0e2d3910e5a 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.30.4"; + version = "1.30.5"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-fDLtB3l682+APcOkvQCPAfxCqWhjEi2E7sEU617fzyg="; + hash = "sha256-RsYg3DSiB6DWVlwAJT7iN7rNxUJqT5EAIGNEuMuIm8Y="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 776c86e6a945..5e331b17c88b 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -16,12 +16,22 @@ buildPackages, runtimeShell, # List of Node.js runtimes the package should support - nodeRuntimes ? [ "node20" ], + nodeRuntimes ? [ + "node20" + "node24" + ], nodejs_20, + nodejs_24, }: # Node.js runtimes supported by upstream -assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; +assert builtins.all ( + x: + builtins.elem x [ + "node20" + "node24" + ] +) nodeRuntimes; buildDotnetModule (finalAttrs: { pname = "github-runner"; @@ -226,6 +236,9 @@ buildDotnetModule (finalAttrs: { '' + lib.optionalString (lib.elem "node20" nodeRuntimes) '' ln -s ${nodejs_20} _layout/externals/node20 + '' + + lib.optionalString (lib.elem "node24" nodeRuntimes) '' + ln -s ${nodejs_24} _layout/externals/node24 ''; postInstall = '' @@ -268,6 +281,9 @@ buildDotnetModule (finalAttrs: { + lib.optionalString (lib.elem "node20" nodeRuntimes) '' ln -s ${nodejs_20} $out/lib/externals/node20 '' + + lib.optionalString (lib.elem "node24" nodeRuntimes) '' + ln -s ${nodejs_24} $out/lib/externals/node24 + '' + '' # Install Nodejs scripts called from workflows install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index 7d3f484d678e..9233d83bfab1 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -60,9 +60,6 @@ let orjson psycopg pydantic - # undocumented on django-allauth side - # https://codeberg.org/allauth/django-allauth/issues/4493 - pyyaml sentry-sdk symbolic user-agents @@ -71,6 +68,7 @@ let whitenoise ] ++ celery.optional-dependencies.redis + ++ django-allauth.optional-dependencies.headless-spec ++ django-allauth.optional-dependencies.mfa ++ django-allauth.optional-dependencies.socialaccount ++ django-redis.optional-dependencies.hiredis diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix index b0c45b04b531..a17ddc3d9aad 100644 --- a/pkgs/by-name/ha/hacompanion/package.nix +++ b/pkgs/by-name/ha/hacompanion/package.nix @@ -27,5 +27,6 @@ buildGoModule rec { license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ramblurr ]; + mainProgram = "hacompanion"; }; } diff --git a/pkgs/by-name/jd/jdenticon-cli/package.nix b/pkgs/by-name/jd/jdenticon-cli/package.nix new file mode 100644 index 000000000000..bc91523e6f6d --- /dev/null +++ b/pkgs/by-name/jd/jdenticon-cli/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs, + makeWrapper, + versionCheckHook, + nix-update-script, +}: +buildNpmPackage (finalAttrs: { + pname = "jdenticon-cli"; + version = "3.3.0"; + src = fetchFromGitHub { + owner = "dmester"; + repo = "jdenticon"; + tag = finalAttrs.version; + hash = "sha256-uOPNsfEreC7F+Y0WWmudZSPnGxqarna0JPOwQyK6LiQ="; + }; + npmDepsHash = "sha256-LXwvb088oHmA57EryfYtKi0L/9sB+yyUr/K/qGA1W9k="; + + nativeBuildInputs = [ + makeWrapper + nodejs + ]; + + installPhase = '' + runHook preInstall + + install -D bin/jdenticon.js "$out/lib/jdenticon/bin/jdenticon.js" + install -D dist/jdenticon-node.js "$out/lib/jdenticon/dist/jdenticon-node.js" + install -d "$out/lib/jdenticon/node_modules" + cp -r node_modules/canvas-renderer "$out/lib/jdenticon/node_modules" + makeWrapper "${lib.getExe nodejs}" "$out/bin/jdenticon" \ + --add-flags "$out/lib/jdenticon/bin/jdenticon.js" + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/dmester/jdenticon/releases/tag/${finalAttrs.version}"; + description = "JavaScript library for generating highly recognizable identicons using HTML5 canvas or SVG."; + homepage = "https://jdenticon.com/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.gipphe ]; + mainProgram = "jdenticon"; + }; +}) diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json index 748c3518da51..329257377897 100644 --- a/pkgs/by-name/jo/joplin-desktop/release-data.json +++ b/pkgs/by-name/jo/joplin-desktop/release-data.json @@ -1,15 +1,15 @@ { - "version": "3.3.13", + "version": "3.4.6", "x86_64-linux": { - "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13.AppImage", - "sha256": "1gd5qlkjwrx8kxx5d97r58v5wxw4zbzjblr24ydjqbbfhjrr1zr2" + "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6.AppImage", + "sha256": "0xf5lmjv49rq5bnczpydflzzhha8rzcn3iy7zpi5wqzmzsp0jg2p" }, "x86_64-darwin": { - "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13.dmg", - "sha256": "05v5idqnajlya83ax252xs6d1nc0p6679aihij35b885nqiql6f5" + "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6.dmg", + "sha256": "1yahng1rciyrviykksqhk2wfkmrff77frsb7fkaxbhll1p8p74hm" }, "aarch64-darwin": { - "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13-arm64.dmg", - "sha256": "1bafq33n0qdw4hxbq3mp2499zpzz0kc4gqh9cdp650994kmq8207" + "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6-arm64.dmg", + "sha256": "1k5ipsbss3qkyi5b3bw9agk4jmbsakvskrff71v8hg5wk6vi3m7c" } } diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index b196b0bc550a..bbdadfaf7234 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -41,13 +41,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.97.4"; + version = "1.98"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-z9F3q+1iq6HQV37yRjBOlJRChhnQ/cPP5sAZl5rFDUs="; + hash = "sha256-5VP7NfHc00TdTqr5wel1vrtOnJWDGZT44tKDEm/f2iw="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 72ae4fab3fdb..8bc733f32051 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -21,14 +21,14 @@ rustPlatform.buildRustPackage rec { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.76.1"; + version = "0.78.2"; src = fetchFromGitHub { fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; tag = "v${version}"; - hash = "sha256-411+ANwyqqUX11rxCzFvPhjMWviJ0CcQlkAiqNWs32w="; + hash = "sha256-4buK92sJZj5yEwFyi55WonF+1LZ5PERZ9wJZdlFjPcg="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { env.BORING_BSSL_PATH = "${boringssl-wrapper}"; env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; - cargoHash = "sha256-9W7u0fZgU0J03hT6D4BJPpIKn3dwf9yckJiwwNkyqUA="; + cargoHash = "sha256-eDerNFw8jtM7qIVh3Y837Iu11yeEpAcxgFVqZJTylEc="; cargoBuildFlags = [ "-p" @@ -51,6 +51,9 @@ rustPlatform.buildRustPackage rec { description = "C ABI library which exposes Signal protocol logic"; homepage = "https://github.com/signalapp/libsignal"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ pentane ]; + maintainers = with maintainers; [ + pentane + SchweGELBin + ]; }; } diff --git a/pkgs/by-name/lm/lmath/package.nix b/pkgs/by-name/lm/lmath/package.nix new file mode 100644 index 000000000000..9b29d50f552d --- /dev/null +++ b/pkgs/by-name/lm/lmath/package.nix @@ -0,0 +1,54 @@ +{ + lib, + nix-update-script, + fetchurl, + appimageTools, + makeBinaryWrapper, +}: +let + pname = "lmath"; + version = "1.10.15"; + src = fetchurl { + url = "https://github.com/lehtoroni/lmath-issues/releases/download/v${version}/LMath_Linux_r${version}-release.AppImage"; + hash = "sha256-JOV+g7izjctCkHl5q/9T2PSUZzPzVPisHppbPofVYy0="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + # '--skip-updated-bundle-check' stops automatic updates from breaking the package + extraInstallCommands = '' + install -Dm 444 ${appimageContents}/lmath.desktop $out/share/applications/lmath.desktop + install -Dm 444 ${appimageContents}/lmath.png $out/share/icons/hicolor/512x512/apps/lmath.png + + wrapProgram $out/bin/lmath \ + --add-flags "--no-update-check" + + substituteInPlace $out/share/applications/lmath.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=lmath' + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^r([0-9\.]*)" + ]; + }; + + meta = { + description = "Simple notebook app with LaTeX capabilities"; + homepage = "https://lehtodigital.fi/lmath/"; + mainProgram = "lmath"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ langsjo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index 4f887f68316a..cf5a039ba465 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PKkyZDd4FLWGZ/kDKWkaSV8p8NDniSQGcR9Htce6uCg="; }; + postPatch = '' + substituteInPlace src/meson.build --replace-fail \ + "'src' / rust_target / meson.project_name()," \ + "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()," \ + ''; + nativeBuildInputs = [ cargo desktop-file-utils @@ -73,6 +79,9 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + # For https://gitlab.gnome.org/GNOME/loupe/-/blob/0e6ddb0227ac4f1c55907f8b43eaef4bb1d3ce70/src/meson.build#L34-35 + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + passthru = { updateScript = let diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index a85cd20a2364..f9a10e41c272 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "mautrix-signal"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; tag = "v${version}"; - hash = "sha256-koO1eeMZ8wmty6z2zyJlA7zoM6gYmFlxdF8GB2hOxb8="; + hash = "sha256-62Z7Lasx0bzCAWLvHN7uCUqkMk6W80PR24mwfJU/n3Q="; }; buildInputs = @@ -41,7 +41,7 @@ buildGoModule rec { CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ]; - vendorHash = "sha256-NmIWxc+6Leaqm1W+g2XdbMv4iU7Z7k8/g88U0iw/+98="; + vendorHash = "sha256-srvqflqleK2KIgesEZPNhSQh/IFmyTElJ7iUjBEmNq0="; doCheck = true; preCheck = '' @@ -68,6 +68,7 @@ buildGoModule rec { maintainers = with maintainers; [ pentane ma27 + SchweGELBin ]; mainProgram = "mautrix-signal"; }; diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix index 1e98a9564da7..f2c1a8ce8a57 100644 --- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix +++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix @@ -14,19 +14,19 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-gbKphWFBT5+7kIptIS/GquFBPVaZzJolbEkZ6bj3Fiw="; + hash = "sha256-FduZKeWApGR/SmjiZsVDC0KJZq8XRtfCFQUZhxlVswM="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-LGHW1n36fdDtIPNENA2qqLcho+7FVna/zUPEYcxd9LQ="; + vendorHash = "sha256-Ujk/bJWo4tU7wQxyF7VP1JLqNh+VuNy5n31x9AWyEZA="; doCheck = false; diff --git a/pkgs/by-name/mf/mfaomp/package.nix b/pkgs/by-name/mf/mfaomp/package.nix new file mode 100644 index 000000000000..967c771c20f9 --- /dev/null +++ b/pkgs/by-name/mf/mfaomp/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + qt6, + libvlc, + libvlcpp, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mfaomp"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "Neurofibromin"; + repo = "mfaomp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-b8eIG5UC1i4yfHSStNwhgIttTS+g511RmFJ5OYxeYvM="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtmultimedia + qt6.qtwebengine + qt6.qtsvg + libvlc + libvlcpp + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_PROVIDED_LIBVLCPP" true) + (lib.cmakeBool "USE_FETCHED_LIBVLCPP" false) + ]; + + meta = { + description = "Multiple Files At Once Media Player"; + homepage = "https://github.com/Neurofibromin/mfaomp"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ neurofibromin ]; + platforms = lib.platforms.linux; + mainProgram = "mfaomp"; + }; +}) diff --git a/pkgs/by-name/mi/minefair/package.nix b/pkgs/by-name/mi/minefair/package.nix new file mode 100644 index 000000000000..2fc84795abb9 --- /dev/null +++ b/pkgs/by-name/mi/minefair/package.nix @@ -0,0 +1,25 @@ +{ + fetchFromGitHub, + rustPlatform, + lib, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "minefair"; + version = "1.5.0"; + src = fetchFromGitHub { + owner = "LyricLy"; + repo = "minefair"; + tag = finalAttrs.version; + hash = "sha256-gABgSjS+ZhzmWJsCbbWMFstFAoTJ+Yc159CCo5nhYBc="; + }; + cargoHash = "sha256-s4Wlp3IUPDuArf9N+9qWZH7JjQeczYi1phpUs7SNUd4="; + + meta = { + description = "Fair and infinite implementation of Minesweeper"; + homepage = "https://github.com/LyricLy/minefair"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pyrotelekinetic ]; + mainProgram = "minefair"; + }; +}) diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 1f30a2a9be02..e64aa1d7241c 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -30,19 +30,18 @@ withShareSelection ? false, withTermion ? false, }: - rustPlatform.buildRustPackage (finalAttrs: { pname = "ncspot"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; tag = "v${finalAttrs.version}"; - hash = "sha256-FSMQv2443oPQjMSv68ppfI2ZTUG79b+GcXmHNAmjPZk="; + hash = "sha256-bKwpvkaYIFK4USxAfx/Vudu7KlT3WP5rKQ1f5lQFbtc="; }; - cargoHash = "sha256-Qjsn3U9KZr5qZliJ/vbudfkH1uOng1N5c8dAyH+Y5vQ="; + cargoHash = "sha256-FepaUgwOaQKW+0ugGDbqFmZmVPL7wqVaYyLk5UjND2o="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; @@ -95,6 +94,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ liff getchoo + sodagunz ]; mainProgram = "ncspot"; }; diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index 4361cf140bca..2a07c05b2c39 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2025-07-28"; + version = "0-unstable-2025-08-21"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Nightfox-GTK-Theme"; - rev = "ea0172aa853e8f6c2b00568c4cd6dcbea7991b7c"; - hash = "sha256-9+RBAG/JKGXjW6zRut8eXM4EYkbNRZ+yw5tLDrSMBXg="; + rev = "4d73329de5ac65dc3e957e1635d471c7d3122a6b"; + hash = "sha256-QTsouPINcn8coLk5z2EFMG1egP97rFVPgiYqGhwu62c="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/np/npingler/package.nix b/pkgs/by-name/np/npingler/package.nix index 6223a0eaac79..443cf4f50b7c 100644 --- a/pkgs/by-name/np/npingler/package.nix +++ b/pkgs/by-name/np/npingler/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage { pname = "npingler"; - version = "unstable-2025-08-21"; + version = "unstable-2025-08-24"; src = fetchFromGitHub { owner = "9999years"; repo = "npingler"; - rev = "de47bb5c5c188ba3b36958c2284dbc6d24f2687f"; - hash = "sha256-4Q8oG2iem9dgsTTEFfhyw2rPAxtXdGx+Uhb/9uAdUy4="; + rev = "b897098be1df890b669dc734edcb10bf8fc798cb"; + hash = "sha256-mMwfonIP8fnJDNdl9ANhLmYlM8tPLtBCWNIPSRBT/D4="; }; - cargoHash = "sha256-wTW0cwi6C2WRlH2ifPMTdLAEZg4VbE5Jr5Mh+e+SjaM="; + cargoHash = "sha256-VhMpgrNy0NauwBSCR+5vjod9H216HPC+rdQUIFVjnRg="; meta = { description = "Nix profile manager for use with npins"; diff --git a/pkgs/by-name/pr/prowlarr/deps.json b/pkgs/by-name/pr/prowlarr/deps.json index 53ed46c74faf..c8ca52167952 100644 --- a/pkgs/by-name/pr/prowlarr/deps.json +++ b/pkgs/by-name/pr/prowlarr/deps.json @@ -609,8 +609,8 @@ }, { "pname": "Polly", - "version": "8.5.2", - "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA=" + "version": "8.6.0", + "hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk=" }, { "pname": "Polly.Contrib.WaitAndRetry", @@ -619,8 +619,8 @@ }, { "pname": "Polly.Core", - "version": "8.5.2", - "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk=" + "version": "8.6.0", + "hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8=" }, { "pname": "RestSharp", diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix index 5afe8e16fbfe..69d6877a43e1 100644 --- a/pkgs/by-name/pr/prowlarr/package.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -19,7 +19,7 @@ applyPatches, }: let - version = "1.37.0.5076"; + version = "2.0.5.5160"; # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass # the already patched lockfile to `fetchYarnDeps`. src = applyPatches { @@ -27,32 +27,11 @@ let owner = "Prowlarr"; repo = "Prowlarr"; tag = "v${version}"; - hash = "sha256-uSdZaPq/aXehmRKMobwYNs5iYGPv5R76Ix9lCEVdLzM="; + hash = "sha256-xSAEDcBaItA+retaSKtEI6wlwj5Knfi4RwUN6GGYms0="; }; postPatch = '' mv src/NuGet.config NuGet.Config ''; - patches = lib.optionals (lib.versionOlder version "2.0") [ - # See https://github.com/Prowlarr/Prowlarr/pull/2399 - # Unfortunately, the .NET 8 upgrade will be merged into the v2 branch, - # and it may take some time for that to become stable. - # However, the patches cleanly apply to v1 as well. - (fetchpatch { - name = "dotnet8-compatibility"; - url = "https://github.com/Prowlarr/Prowlarr/commit/21c408a7dac8abaac91c05958f18a556220b2304.patch"; - hash = "sha256-Es7JEXycOJPMXN+Kgv4wRnJA+l6zltUdP2i/wVodTBs="; - }) - (fetchpatch { - name = "dotnet8-darwin-compatibility"; - url = "https://github.com/Prowlarr/Prowlarr/commit/7a1fca5e23a3e75a9a2b2e1073a33eaa2ce865fe.patch"; - hash = "sha256-bReCHXC3RHgm1MYmE2kGqStt4fuBHowcupLIXT3fEes="; - }) - (fetchpatch { - name = "bump-swashbuckle-version"; - url = "https://github.com/Prowlarr/Prowlarr/commit/8eec321a0eaa396e2f964576e5883890c719b202.patch"; - hash = "sha256-SOdzGvq8FFYa451zTOw8yD1CDvM++AiFYFHhFW5Soco="; - }) - ]; }; rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system; in diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix index 47fcecde48b7..35dab5a2f0e9 100644 --- a/pkgs/by-name/pw/pwvucontrol/package.nix +++ b/pkgs/by-name/pw/pwvucontrol/package.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk="; }; + postPatch = '' + substituteInPlace src/meson.build --replace-fail \ + "'src' / rust_target / meson.project_name()," \ + "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()," + ''; + nativeBuildInputs = [ cargo desktop-file-utils @@ -80,6 +86,9 @@ stdenv.mkDerivation (finalAttrs: { wireplumber_0_4 ]; + # For https://github.com/saivert/pwvucontrol/blob/7bf43c746cd49fffbfb244ac4474742c6b3737a9/src/meson.build#L45-L46 + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + meta = { description = "Pipewire Volume Control"; homepage = "https://github.com/saivert/pwvucontrol"; diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index f5be849fd298..df9e47810a15 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -48,16 +48,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rio"; - version = "0.2.28"; + version = "0.2.29"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; tag = "v${finalAttrs.version}"; - hash = "sha256-bQ6Kj8kKDdcvRX5084KRjsuctp22Zi7375GWjOBznhw="; + hash = "sha256-hM5WFZMZRq5iA/kGpbOncmHTyG//xt/B+Jmi7Y/gGwk="; }; - cargoHash = "sha256-LJLexxczsqtIZuLil7sB3aAt1S2RBOmuvOQTBeuSUP4"; + cargoHash = "sha256-pD3s446lrXtJp67fZfjbm7Eej0FyLYf9op8AF/GkeJ8="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ro/roomarranger/package.nix b/pkgs/by-name/ro/roomarranger/package.nix index 4b0e2630dadd..c5343115baf4 100644 --- a/pkgs/by-name/ro/roomarranger/package.nix +++ b/pkgs/by-name/ro/roomarranger/package.nix @@ -15,7 +15,7 @@ let exec = "roomarranger"; name = "roomarranger"; desktopName = "Room Arranger"; - genericName = "Design your room, office, apartment, house."; + genericName = "Design your room, office, apartment or house, plan gardens and more..."; icon = "roomarranger-icon"; terminal = false; categories = [ "Graphics" ]; @@ -28,11 +28,11 @@ in stdenv.mkDerivation { pname = "roomarranger"; - version = "10.0.1"; + version = "10.2"; src = fetchurl { - url = "https://f000.backblazeb2.com/file/rooarr/rooarr1001-linux64.tar.gz"; - hash = "sha256-OwJSOfyTQinVKzrJftpFa5NN1kGweBezedpL2aE4LbE="; + url = "https://f000.backblazeb2.com/file/rooarr/rooarr1020-linux64.tar.gz"; + hash = "sha256-24AGP2le5HfcVMlqDjiMRcRWKU/zjACV7KzJlVWMpkw="; }; nativeBuildInputs = [ @@ -53,9 +53,6 @@ stdenv.mkDerivation { mkdir -p $out/lib $out/bin cp -r rooarr-bin/* $out/lib/ - # Delete bundled dynamic libraries that reference major Qt version 6 - rm -f $out/lib/*.6 - ln -s $out/lib/RoomArranger $out/bin/roomarranger # Install application icons @@ -80,6 +77,7 @@ stdenv.mkDerivation { Free for 30 days. Updates are free. ''; homepage = "https://www.roomarranger.com/"; + changelog = "https://www.roomarranger.com/whatsnew.txt"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ bellackn ]; diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 3819a06875b4..a82823c65d7e 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "seagoat"; - version = "1.0.20"; + version = "1.0.25"; pyproject = true; src = fetchFromGitHub { owner = "kantord"; repo = "SeaGOAT"; tag = "v${version}"; - hash = "sha256-UbvWvPEd4SRVZpnANJD3V/oZAQrqOeEjWwr5TyOZjNI="; + hash = "sha256-Qg4sYp2glD7TI6MjqTGFFDlwpLdy7apckTUT29NSK6k="; }; build-system = [ python3Packages.poetry-core ]; diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index eda3938abb6a..663827bb5d1c 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -2,20 +2,27 @@ lib, fetchFromGitHub, buildGoModule, + go-mockery, versionCheckHook, }: buildGoModule rec { pname = "sesh"; - version = "2.16.0"; + version = "2.17.1"; + nativeBuildInputs = [ + go-mockery + ]; src = fetchFromGitHub { owner = "joshmedeski"; repo = "sesh"; rev = "v${version}"; - hash = "sha256-3kD7t3lgkxrK53cL+5i9DB5w1hIYA4J/MiauLZ1Z7KQ="; + hash = "sha256-olt61AR/Tq8lLh65V0/+GDrWjCi9hrkNbHR9LOX7kY0="; }; - vendorHash = "sha256-r6n0xZbOvqDU63d3WrXenvV4x81iRgpOS2h73xSlVBI="; + preBuild = '' + mockery + ''; + vendorHash = "sha256-TLl8HZnsVvtx6jqusTETP0l3zTmzYmuV4NJIM958VcQ="; ldflags = [ "-s" @@ -34,6 +41,7 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ gwg313 + randomdude t-monaghan ]; mainProgram = "sesh"; diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 19dce23a62f1..6e0e5d807517 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250818-1"; + version = "20250824"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = version; - hash = "sha256-qVKtFgSnxXZEwmzVen62BLnLsklyoFdYCX1bVp8TNMI="; + hash = "sha256-V2q3eA/Bqa98RdF2/Quta2qA7MmL1xiPNXsRehee9zU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slipshow/package.nix b/pkgs/by-name/sl/slipshow/package.nix index 1dafb04b9b84..15b1f52bd8aa 100644 --- a/pkgs/by-name/sl/slipshow/package.nix +++ b/pkgs/by-name/sl/slipshow/package.nix @@ -3,6 +3,7 @@ ocamlPackages, fetchFromGitHub, versionCheckHook, + nixosTests, nix-update-script, }: @@ -49,7 +50,10 @@ ocamlPackages.buildDunePackage rec { versionCheckProgramArg = "--version"; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru = { + tests = { inherit (nixosTests) slipshow; }; + updateScript = nix-update-script { }; + }; meta = { description = "Engine for displaying slips, the next-gen version of slides"; diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix index 669991608b1a..81479f9fb6d2 100644 --- a/pkgs/by-name/sp/spirit/package.nix +++ b/pkgs/by-name/sp/spirit/package.nix @@ -2,20 +2,21 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "spirit"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "block"; repo = "spirit"; tag = "v${finalAttrs.version}"; - hash = "sha256-bGKqiCd9dggppORouoWlAoAaYdx4vAivsP22KWm1fxU="; + hash = "sha256-B9yrPHHIjtfjY1+auC/8h95ejs2f6HD5TCIrt+8dH2k="; }; - vendorHash = "sha256-87WUqUjyfprpY63kEKCAx/AU6TN73W7oMdOaKfl8xt4="; + vendorHash = "sha256-pMvZxGNnLLAiyWtRRRHJcF28wEQkHgUI3nJCKTlMJhY="; subPackages = [ "cmd/spirit" ]; @@ -24,6 +25,10 @@ buildGoModule (finalAttrs: { "-w" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { homepage = "https://github.com/block/spirit"; description = "Online schema change tool for MySQL"; diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix index d2c24ad6ec5a..cb9ddae6591e 100644 --- a/pkgs/by-name/sp/spotify/darwin.nix +++ b/pkgs/by-name/sp/spotify/darwin.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation { inherit pname; - version = "1.2.69.449"; + version = "1.2.70.409"; src = if stdenv.hostPlatform.isAarch64 then (fetchurl { - url = "https://web.archive.org/web/20250811170447/https://download.scdn.co/SpotifyARM64.dmg"; - hash = "sha256-x9lpcQI1kZc4OIvQBhKXmI7t/2DIDbzufZhpNCKTxPA="; + url = "https://web.archive.org/web/20250826093914/https://download.scdn.co/SpotifyARM64.dmg"; + hash = "sha256-bs+rSMfIFG0FyHGDUtuk6tSbd5l6r6qUNH20hQQjZC0="; }) else (fetchurl { - url = "https://web.archive.org/web/20250811170211/https://download.scdn.co/Spotify.dmg"; - hash = "sha256-z6pmQ3Wmwnd3YQNf1WPdPNCRxHX1PjqAEt50trGe0Bk="; + url = "https://web.archive.org/web/20250826093142/https://download.scdn.co/Spotify.dmg"; + hash = "sha256-i1mHX7zo/07sHrGm8c6SQdFekRuJXOmqCcOk2IYPeLI="; }); nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 4b4cd3bf46cf..93eb4afb8fe4 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -14,13 +14,13 @@ buildNpmPackage rec { pname = "super-productivity"; - version = "14.1.0"; + version = "14.3.3"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-wZQhSQBJPyJPAMZU927Xq9bOxAohSaEg+ylk7DoTJJE="; + hash = "sha256-gJ6hG5nAzT708GFMjArN/F1Mz/K4gg1R0QeHmM6jc0c="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -63,7 +63,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-SmA2qTi7tXxUcAlFOI61AW8pimB7YEYe749h5hjtLN8="; + hash = "sha256-+e53npbip3BGdw4S6mpkxc9g6AVc+QbJxfPYK6IglSA="; } ); @@ -85,6 +85,14 @@ buildNpmPackage rec { buildPhase = '' runHook preBuild + # Npm hooks do not install packages for the plugins. The build + # script does install the packages, but it does not handle patching + # the shebangs. + find packages -name package-lock.json | while read -r p; do + npm --prefix "$(dirname $p)" ci --ignore-scripts + done + patchShebangs packages + # electronDist needs to be modifiable on Darwin cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist diff --git a/pkgs/by-name/sv/svgo/missing-hashes.json b/pkgs/by-name/sv/svgo/missing-hashes.json new file mode 100644 index 000000000000..964e11a01bf8 --- /dev/null +++ b/pkgs/by-name/sv/svgo/missing-hashes.json @@ -0,0 +1,22 @@ +{ + "@rollup/rollup-android-arm-eabi@npm:4.40.1": "bd6599045fbfa1bba4eb4fa6269bf11121ac377a5e9bc5f32265b66cc190d3bf0eece89a4b0503cf38c0f91fc3d64f5daeeccd55420cf522cde478c6c8dacf4c", + "@rollup/rollup-android-arm64@npm:4.40.1": "89932296d6f2dd08ce2d4ee91d5cc14b5305c13f5b7ddba30dad59b525682539191b7769e5b2baf849b664d664daf26b0f29fb2950c2456ff85c5bb11ca39bed", + "@rollup/rollup-darwin-arm64@npm:4.40.1": "0eae1bc7d76ad339ccbfb1571fae06d9c3ad60cf95a513c42f14fb7cbc74697d35ce5f81f5b9a619cb7ff17ae8d78d9f39e78ab9ed2d94bf3755fd4c4b593929", + "@rollup/rollup-darwin-x64@npm:4.40.1": "524543130b510ef8f9775d55ddc6dd3735a1cbd82ffb95b74d677c9cc179848027cffdc6b7318976fa516497c73bc3039da8bbdfabd268156ca0ca1cc41428a8", + "@rollup/rollup-freebsd-arm64@npm:4.40.1": "1e43d5075bdcf1480a04dd7121036fdb1d6432848359cf6d9669d324d4556a2e354a758e276d7a6c2761b9fbefdab1307c58d459968ea847db7be20fe51b1c22", + "@rollup/rollup-freebsd-x64@npm:4.40.1": "f1c1921630d49602836ae77b7c1f0790e71b1317cb68733a21ce9ed6529c222265ae93e4c33eba590695015b3f43c0c54cd0aaa138531ffe3051880673ac2f5d", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.1": "bea6ef52650bd0c795429d635a2c8429eecbe5f8365e927cdbca02c1d07d1e28af760669e2d4b7c5ae5ff575c803fae6c370d74b342ea5d4625276dd4651accc", + "@rollup/rollup-linux-arm-musleabihf@npm:4.40.1": "cf41bd211e700928864808382c183e3f41fbc6f4804a9be0292b738f31b8b48ec9721e8717703960875aa0dc15075d7a191e6feb9b6af444ee4c0acd482da50f", + "@rollup/rollup-linux-arm64-gnu@npm:4.40.1": "992f2dbd1f01bfe12c6ff72c5aebc2f7624bae973f8f992aa33422e12b516a718c18076202bfd4dc678ffa82f7ef9e3583582aacca9f4f7fde3e7164e76420ce", + "@rollup/rollup-linux-arm64-musl@npm:4.40.1": "96a17721328bf35fbedecb2a94a881e407179b364921178d1c64a481831ff9ca5b260f627056461c7854946e9c2c854aef537e25ecbce3f1b70b810371f45267", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.1": "e313a016a50431cdd0fc2f3855cd345a921304793ab205ff3860523dcd009edd6efd7afc6197220faa5a4e0b638fd29f732f79c91759a392d221d708eceb3af6", + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.1": "ebc53027c9f6b9b3c36a008fa73958b21f52ece080cda6d2329f6412f255f73ccfed52083b9efff14950511a2a6a2dcb4351347db19f19920f33bbb6d1446be8", + "@rollup/rollup-linux-riscv64-gnu@npm:4.40.1": "9d4e28526eedbf681bc1897da4e61b08657b9a396841e057995c7a54999aeb21548308e30430bfd9c3b9da09deeac7800b1da88bfbebea3c1f2442424107f13c", + "@rollup/rollup-linux-riscv64-musl@npm:4.40.1": "c5f4b1d84f9a468bca4582192da1c8a0242bbb1b96965b3becb96a8a0a19d6522f741e52d591bbf3d9aba6c16a247fef02ed7a4a37a11bbd035f50a5bfd3c5af", + "@rollup/rollup-linux-s390x-gnu@npm:4.40.1": "15ddb6faa9d49a12f87f97a21e16c171b49167b1dfe86d3a81a059e38901fc8edc9d49a68fc88e809699bd77b9eb72edde8bbb49bfb58a40438aa9dd4ceba1ea", + "@rollup/rollup-linux-x64-gnu@npm:4.40.1": "3c240b9aafb8c5360656326cd112568f3003082450dc48fc1eb4a01da460930abbf6235a85cee153f182eeeadcb28ab65116b93e2725e8d935ae60bf098024e2", + "@rollup/rollup-linux-x64-musl@npm:4.40.1": "27ec9c576a7f111333dc764c1ce48c0718e9617467e86fff431fa01c904b890f606f238a73fcfbc5928c78e1e7855947be78e16e49bf6044cfc0abdeffb6da9e", + "@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "c4a4f46690669b6d2eea20440edc46deb103cdf7f41debcfda1c0f68c41bea66526eb6f8befdc0da6192ae762c740e82f76e30164f1bbb4c36faba6c457fb905", + "@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "976361a3888decf0bc81521d83010e58213c264967ce23e023990ef2110a9189785fbb72c3752466179feb069f457d7242adbcb9813c9ce8f7b6363fb3ea6063", + "@rollup/rollup-win32-x64-msvc@npm:4.40.1": "70f30abca4447f1a9c163f07482b0f62029d545f94abe686cf40c6cb1039bd13ee00471927a4cb595c94929b97a8b189c86d7fc9872858d48b1711096ee6d45a" +} diff --git a/pkgs/by-name/sv/svgo/package.nix b/pkgs/by-name/sv/svgo/package.nix new file mode 100644 index 000000000000..2cd74ca00403 --- /dev/null +++ b/pkgs/by-name/sv/svgo/package.nix @@ -0,0 +1,56 @@ +{ + fetchFromGitHub, + lib, + makeWrapper, + nodejs, + stdenv, + yarn-berry_3, +}: + +let + yarn-berry = yarn-berry_3; +in +stdenv.mkDerivation (finalAttrs: { + pname = "svgo"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "svg"; + repo = "svgo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eSttRNHxcZquIxrTogk+7YS7rhp083qnOwJI71cmO20="; + }; + + missingHashes = ./missing-hashes.json; + + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "sha256-DrIbnm0TWviCfylCI/12XYsx7YOIk7JFVV18Q4dImwU="; + }; + + nativeBuildInputs = [ + makeWrapper + yarn-berry.yarnBerryConfigHook + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" "$out/lib/svgo" + cp -r bin lib node_modules package.json plugins "$out/lib/svgo" + makeWrapper '${lib.getExe nodejs}' "$out/bin/svgo" \ + --add-flags "$out/lib/svgo/bin/svgo.js" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/svg/svgo/releases/tag/${finalAttrs.src.tag}"; + description = "Node.js tool for optimizing SVG files"; + homepage = "https://github.com/svg/svgo"; + license = lib.licenses.mit; + mainProgram = "svgo"; + maintainers = [ ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index a50c69b2234f..5ba29eeccb4a 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -7,6 +7,7 @@ symfony-cli, nssTools, makeBinaryWrapper, + installShellFiles, }: buildGoModule (finalAttrs: { @@ -39,15 +40,22 @@ buildGoModule (finalAttrs: { buildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' mkdir $out/libexec mv $out/bin/symfony-cli $out/libexec/symfony makeBinaryWrapper $out/libexec/symfony $out/bin/symfony \ --prefix PATH : ${lib.makeBinPath [ nssTools ]} + + installShellCompletion --cmd symfony \ + --bash <($out/bin/symfony completion bash) \ + --fish <($out/bin/symfony completion fish) \ + --zsh <($out/bin/symfony completion zsh) ''; - # Tests requires network access + # Tests require network access doCheck = false; passthru = { @@ -65,6 +73,6 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/symfony-cli/symfony-cli"; license = lib.licenses.agpl3Plus; mainProgram = "symfony"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ patka ]; }; }) diff --git a/pkgs/by-name/ta/taskchampion-sync-server/package.nix b/pkgs/by-name/ta/taskchampion-sync-server/package.nix index fbe747b5f35d..76b32312b44d 100644 --- a/pkgs/by-name/ta/taskchampion-sync-server/package.nix +++ b/pkgs/by-name/ta/taskchampion-sync-server/package.nix @@ -1,19 +1,32 @@ { - lib, - rustPlatform, fetchFromGitHub, + lib, + openssl, + rustPlatform, + stdenv, }: rustPlatform.buildRustPackage rec { pname = "taskchampion-sync-server"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskchampion-sync-server"; tag = "v${version}"; - hash = "sha256-spuTCRsF1uHTTWfOjkMRokZnBhqP53CPAi3WMJB3yq4="; + hash = "sha256-DNGugytc4dMjj8je4BpEjNjdrnTBnWc1MNeMqcdTr4s="; }; - cargoHash = "sha256-bsB/dPqPmzviHsGA8gtSew2PQdySNzifZ6dhu7XQ8IU="; + cargoHash = "sha256-A0alSDqsqlAL0XW0rJ35rYcoyx2ndX/Xft9Qff/rr9I="; + + env = { + # Use system openssl. + OPENSSL_DIR = lib.getDev openssl; + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_NO_VENDOR = 1; + }; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; meta = { description = "Sync server for Taskwarrior 3"; diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index d3d33ccab881..9dd433b1024d 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -1,20 +1,19 @@ { lib, - buildGoModule, + buildGo125Module, fetchFromGitHub, versionCheckHook, mockgen, }: - -buildGoModule (finalAttrs: { +buildGo125Module (finalAttrs: { pname = "terragrunt"; - version = "0.85.0"; + version = "0.86.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-ey3Qbwg036OzWYfw/0lso3CentUXGF0/NB/w3ss3Dp0="; + hash = "sha256-Xmka1391wEGufEEavQNoB5YuzR7npe6ky8MzKJnGQt8="; }; nativeBuildInputs = [ @@ -26,7 +25,7 @@ buildGoModule (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-n0fPaeigwXvd0S5KvMG+ZerDqdaapUGK6mhY7WmEkIE="; + vendorHash = "sha256-aQzt7yeNoL1OF+mO6y2axeiuJbfuMBzoEAm0+Y9+Xr8="; doCheck = false; diff --git a/pkgs/by-name/ti/timoni/package.nix b/pkgs/by-name/ti/timoni/package.nix index 98bdda4b15c2..5d56c991b8c7 100644 --- a/pkgs/by-name/ti/timoni/package.nix +++ b/pkgs/by-name/ti/timoni/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "timoni"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; tag = "v${finalAttrs.version}"; - hash = "sha256-iTVTlxMCLHTXQj3I+nDHhE5w4fDaaM7p52wuvZY2uy4="; + hash = "sha256-u59+FGBURP3p1zosZU+6IfCZMHl4plrf/8/FUUgj/qw="; }; - vendorHash = "sha256-JFJZguXpPrLbIC5lzvcOMDv5n2K7OoNXKJvWWcNOzKc="; + vendorHash = "sha256-bWhXhZJHdiWY/Yz0l2VAPKJrMVb9XbvVEGPNZIQtvFQ="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ur/urserver/package.nix b/pkgs/by-name/ur/urserver/package.nix index dc80ea77942d..98f1ca2e2cf7 100644 --- a/pkgs/by-name/ur/urserver/package.nix +++ b/pkgs/by-name/ur/urserver/package.nix @@ -7,15 +7,16 @@ libX11, libXtst, makeWrapper, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "urserver"; - version = "3.13.0.2505"; + version = "3.14.0.2574"; src = fetchurl { url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz"; - hash = "sha256-rklv6Ppha1HhEPunbL8ELYdQ9Z1FN4FrVsNwny3/gA4="; + hash = "sha256-4wA2VPb5QN30TWa72pUVTYfvsxlGTO8Vngh7wDHXhDE="; }; nativeBuildInputs = [ @@ -23,26 +24,31 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; - buildInputs = [ - (lib.getLib stdenv.cc.cc) - bluez - libX11 - libXtst - ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' install -m755 -D urserver $out/bin/urserver - wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" + wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + libX11 + libXtst + bluez + ] + }" cp -r remotes $out/bin/remotes cp -r manager $out/bin/manager ''; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + meta = { homepage = "https://www.unifiedremote.com/"; description = "One-and-only remote for your computer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ sfrijters ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ sfrijters ]; platforms = [ "x86_64-linux" ]; + mainProgram = "urserver"; }; }) diff --git a/pkgs/by-name/uv/uv-sort/package.nix b/pkgs/by-name/uv/uv-sort/package.nix index ed3e901a7efc..2e6cd323b6a5 100644 --- a/pkgs/by-name/uv/uv-sort/package.nix +++ b/pkgs/by-name/uv/uv-sort/package.nix @@ -17,6 +17,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-umKMcQcQST0bBGf7ZXxNcWq/5/ht3jp+3JVjowBdeO0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"packaging~=24.1"' '"packaging"' + ''; + build-system = with python3Packages; [ hatchling uv-dynamic-versioning diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix index 01bf2d38bb07..be1442314a8c 100644 --- a/pkgs/by-name/ve/vector/package.nix +++ b/pkgs/by-name/ve/vector/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, rustPlatform, pkg-config, openssl, @@ -63,6 +64,14 @@ rustPlatform.buildRustPackage { zlib ]; + patches = [ + (fetchpatch { + name = "1.89-mismatched-lifetime-syntaxes.patch"; + url = "https://patch-diff.githubusercontent.com/raw/vectordotdev/vector/pull/23645.patch"; + hash = "sha256-2ADlF4/Z1uR3LR6608lA4tseh+MnHb097PACD/Nq6/0="; + }) + ]; + # Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect. # Upstream is working on fixing this in https://github.com/vectordotdev/vector/pull/20949, but silencing the lint lets us build again until then. # TODO remove when upgrading Vector diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index 65f560443603..1743f4554197 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.26.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaLogs"; tag = "v${finalAttrs.version}"; - hash = "sha256-PnXpu2Dna5grozKOGRHi/Gic7djszYh7wJ96EiEYP8U="; + hash = "sha256-IKKVCVsHFijSnLawy9oq1qCji2O4+QkSWUvQ4S6tAN8="; }; vendorHash = null; @@ -32,6 +32,15 @@ buildGoModule (finalAttrs: { ] ++ lib.optionals withVlAgent [ "app/vlagent" ]; + postPatch = '' + # Allow older go versions + substituteInPlace go.mod \ + --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" + + substituteInPlace vendor/modules.txt \ + --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" + ''; + ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix index 525630a6153c..cc0f8120a0d0 100644 --- a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix +++ b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix @@ -10,13 +10,13 @@ libglvnd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xp-pen-g430-driver"; version = "1.2.13.1"; src = fetchzip { url = "https://archive.org/download/linux-pentablet-v-1.2.13.1.tar.gz-20200428/Linux_Pentablet_V1.2.13.1.tar.gz%2820200428%29.zip/Linux_Pentablet_V1.2.13.1.tar.gz"; - name = "xp-pen-g430-driver-${version}.tar.gz"; + name = "xp-pen-g430-driver-${finalAttrs.version}.tar.gz"; hash = "sha256-Wavf4EAzR/NX3GOfdAEdFX08gkD03FVvAkIl37Zmipc="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ ]; }; -} +}) diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 9f44fc65c395..9908898a71ef 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -8,15 +8,12 @@ zlib, libnetfilter_queue, libnfnetlink, - - iptables, - nftables, - gawk, + libmnl, }: stdenv.mkDerivation (finalAttrs: { pname = "zapret"; - version = "71"; + version = "71.4"; src = fetchFromGitHub { owner = "bol-van"; @@ -30,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; tag = "v${finalAttrs.version}"; - hash = "sha256-cwwj0xGEiR3sg2WheurtQo6Hy5JAARcZJNHEHMfAoOE="; + hash = "sha256-n7UasKtoQ4zfy2ho2vOREb0RPrDnhjYYbXcXTjelDvg="; }; buildInputs = [ @@ -38,12 +35,7 @@ stdenv.mkDerivation (finalAttrs: { zlib libnetfilter_queue libnfnetlink - ]; - - nativeBuildInputs = [ - iptables - nftables - gawk + libmnl ]; preBuild = '' diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index 98b6c88c860d..721d73c96d1f 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -17,7 +17,7 @@ let }: stdenv.mkDerivation rec { inherit pname; - version = "7.4"; + version = "7.6"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; inherit hash; diff --git a/pkgs/data/fonts/maple-font/hashes.json b/pkgs/data/fonts/maple-font/hashes.json index 111fed91e04a..1025910086a8 100644 --- a/pkgs/data/fonts/maple-font/hashes.json +++ b/pkgs/data/fonts/maple-font/hashes.json @@ -1,47 +1,46 @@ { - "MapleMono-CN-unhinted": "sha256-pYhWiOB9RGof+3Uy5KlVgGtHRtoPjkKHW/aulEftrN8=", - "MapleMono-CN": "sha256-uDhFvaS8Cz0Gh4uPdHxGHB+ibnmjPgo3brw1Reyubjo=", - "MapleMono-NF-CN-unhinted": "sha256-m0OenEinfqOzFPd9J+9hvmlWZyo9gN48KsvtnSJZbQw=", - "MapleMono-NF-CN": "sha256-1H1AkMaE+yG2Wlp4NxvKu9z/VEnSyGLVVHX7YK9YlKg=", - "MapleMono-NF-unhinted": "sha256-1D7oAcurpS3PCQRky+Spb2l0z2j+ZxMqzQqLdCXAppA=", - "MapleMono-NF": "sha256-qPAKfND9r5YomfKQyS6lO7BQwwo4F+KqQdX7Jr9EM9Y=", - "MapleMono-OTF": "sha256-6Zl9snDOsgvoswTIa8dqRx+pYAy9N5yQ4J62qvsdlKs=", - "MapleMono-TTF-AutoHint": "sha256-ddzGDLCD73+qpdmgY+g2zbk0dNdsLF1dA9yuw3xzTS0=", - "MapleMono-TTF": "sha256-ggAJq9Sg8i1lXpE6adNqhVXJH5A1N7derskN/ZTn+KE=", - "MapleMono-Variable": "sha256-YKWtUvz3aGrEjihEzcjq6gKG0xFpRKqiSW6cGfhvsy8=", - "MapleMono-Woff2": "sha256-NPniX47eSSt6pp7qiqhhq6EpacBDKxlWsiwRToyT2E0=", - "MapleMonoNL-CN-unhinted": "sha256-KqFyvmKeDizD1LlaR+L3kiIeXSe+7VoaMJGV1/NMz/8=", - "MapleMonoNL-CN": "sha256-HJAWQ/Dw3Mpfjcc756aquUPsRLgKv7tN/w8jDZh4xZ4=", - "MapleMonoNL-NF-CN-unhinted": "sha256-hgjKmKScjn3erpKgBetzf7iiJa5WYdC4JzTZQkGbqNg=", - "MapleMonoNL-NF-CN": "sha256-qIBhdbJSw9w9k8Vh/goG2F46Yvhn1apeqlSbkD2yn1Q=", - "MapleMonoNL-NF-unhinted": "sha256-UI8OAt0PuRXYek4gtg00zZaYKiNiZWx5c79izq/eAbY=", - "MapleMonoNL-NF": "sha256-8UlJu96gL1XhZFs1llmAaisH+KsIYsXA9DIqB2EMfjo=", - "MapleMonoNL-OTF": "sha256-OOa/etMQQvmrrqC4ZZu4QwLHnsUtypKb00vGlp8Y2j4=", - "MapleMonoNL-TTF-AutoHint": "sha256-eQyk1LR+dff3UxfT/I0RCgU0spm1LWRoZtQ0m0JUGRE=", - "MapleMonoNL-TTF": "sha256-aRhtKSbzUs179usRUhOpsFMyrM4dqh7xt5mY0POskR4=", - "MapleMonoNL-Variable": "sha256-1ueWNUfeavEnHxH4g5Qhci/+LxobRwZq4pTsj4v1os4=", - "MapleMonoNL-Woff2": "sha256-5ZRCll9rq79oAnr9WgWxgNFtcdL8ljY72wDZnsox5bI=", - "MapleMonoNormal-CN-unhinted": "sha256-hNJfhsaxRnzv/3Y8Gzaf5ym9XxDEyVOrLR3E9FpFl8s=", - "MapleMonoNormal-CN": "sha256-SoS52L09o2qZlyKFuRBO5F4PKXBFAFxI6xpc4Ef1XHc=", - "MapleMonoNormal-NF-CN-unhinted": "sha256-vbWIGQl5g/OKFF0UK3m2RUZ30bu3H/btzXe0MbJk5IA=", - "MapleMonoNormal-NF-CN": "sha256-bcH9LMLMaKJ5A+9994yvbMoUNgz43vQUDTs200YeHn4=", - "MapleMonoNormal-NF-unhinted": "sha256-yW15Rf7GE8Qy5Ye9QGBMLma+Kx2Kj+3l/SAAzpBLg8k=", - "MapleMonoNormal-NF": "sha256-Eg3hKcHkslsvGzkJDrhkyN0IAYrjHJ+erzFAVAu/K0g=", - "MapleMonoNormal-OTF": "sha256-PVsYL/MdD7aX3P5kYafa/xwR84B2uG5TzMfi7i1ROWM=", - "MapleMonoNormal-TTF-AutoHint": "sha256-vtEHKBv0gjI6IuzXBmZcUVJS6fPNH/HJqohVZBwXN0U=", - "MapleMonoNormal-TTF": "sha256-YkUNl59nllTQca1Duj9phu20rLMiTSmcCXc0RluKln4=", - "MapleMonoNormal-Variable": "sha256-i0slIrBUwAXZj6VVUBUsEyN+mySgIBJcA5LL7iBamBA=", - "MapleMonoNormal-Woff2": "sha256-U4w4PqR8YC0HotDs/rHuUSf28WBnKNnVHe8FtO8MCHA=", - "MapleMonoNormalNL-CN-unhinted": "sha256-dJ2Si+l+NQAC+arOxOhvBFyy5uvWWRKh3RD62fSIl8Q=", - "MapleMonoNormalNL-CN": "sha256-/c5jU7O6M+hnRYZuFDVxg/PA+wk75HdllNX5IIarw2k=", - "MapleMonoNormalNL-NF-CN-unhinted": "sha256-At6I9eSGrF+9aWF5L2f4b2a3PWq4er7YMnYZJg4xwC8=", - "MapleMonoNormalNL-NF-CN": "sha256-EVHoFU4PQkbHknlfEfafYzDKwPwfQsAd+1oZaT8heao=", - "MapleMonoNormalNL-NF-unhinted": "sha256-5acGvUcFPQMdSh9CK7MWS/NNo52eiDpUiBRiVH3rsz4=", - "MapleMonoNormalNL-NF": "sha256-Y2XSNB9xCOGx9y1fnEHGztK7c9BjAdYj4PH2+Ft9cQ8=", - "MapleMonoNormalNL-OTF": "sha256-Sp81tk2teKk9fg7p0LJ0CLXmoh65ZcFNi/BOVzemGqQ=", - "MapleMonoNormalNL-TTF-AutoHint": "sha256-JKPgSZOaxqTSlsqEqbfo6ra27LqCxzFRpe78aUWunBw=", - "MapleMonoNormalNL-TTF": "sha256-KZBB4fyQmTUVwXsRC8yqiZtG9ED3isj64/tE8sDgSS4=", - "MapleMonoNormalNL-Variable": "sha256-95OvqOs9qo/38UPnGWGCF5SGxrRWnEE6OWT8M0J6XY0=", - "MapleMonoNormalNL-Woff2": "sha256-BwRa9BpkAe8Tw4mn16+g41Z3giIVoxJTGdC2Vk30lgg=" + "MapleMono-CN-unhinted": "sha256-QnjRoW04WvGtgoKVm46U0Z0wImp2YVBdB/8LD37mfWk=", + "MapleMono-CN": "sha256-BF8VP6uZHgyuy/X0iie43jdJ6zyJUCXHlzHt6fOPEEQ=", + "MapleMono-NF-CN-unhinted": "sha256-8PSw/qGYXjpaazyY99bOQFbM+QOkJfizrmll8DTGwq8=", + "MapleMono-NF-CN": "sha256-q3wIvSszhOLyZkqvgvipQ2eEvG9K3Sf2o5hrpHS2vD8=", + "MapleMono-NF-unhinted": "sha256-7KEs6EtgfdO2DZIFGlHAWdIzKqKDaq7aRTG08HEYihw=", + "MapleMono-NF": "sha256-If/kKAFiyOs5NnxXeDOGsLSZRsCdhDmgOtP0SuN96pg=", + "MapleMono-OTF": "sha256-5XsHz8QsruS4oNfwazEfAWXSPr+mX+a5ayUPe5DF/nc=", + "MapleMono-TTF-AutoHint": "sha256-gmBHcBQk8GuWhdVF+TCB23Bh0raB5HVSwHNacVOScWM=", + "MapleMono-TTF": "sha256-n4kivPRcI80jEj7dRX3/SKyWHiBiiXXoY4jEV7eCSSI=", + "MapleMono-Variable": "sha256-8US2XL/RTIeWHatHeLv7/yWib5Vv7rdOyNC5qosRXw0=", + "MapleMono-Woff2": "sha256-f6khGfztBDMX8q7o9VlvLA2YikPoNDqxCf0KVxAR498=", + "MapleMonoNL-CN-unhinted": "sha256-qmtqUCoaWpqGIfIGOBlUU2WIm6vUOUP3S/SyUCCQSSE=", + "MapleMonoNL-CN": "sha256-rs5WcOBR9SYVsCFog6CY04RstSfZmbwo4HuwpeGw/V8=", + "MapleMonoNL-NF-CN-unhinted": "sha256-p8J1tiBXxus2xTvV884QjT8N19vV/uIlz/bCIIGCUp0=", + "MapleMonoNL-NF-CN": "sha256-aDutuElaeOrcKBjNxi096SEylvsSHVe5Fmcj3yoT19M=", + "MapleMonoNL-NF-unhinted": "sha256-fcAQa79JDpxB6A4bAGpY5K9RZhVTmoVnyHx72pRtHxE=", + "MapleMonoNL-NF": "sha256-HZByDLhGkJPDV7t0LXsINLDMYKso19bJD72MiWU/8N4=", + "MapleMonoNL-OTF": "sha256-4zjWL0g7BubP8lVswUe4nPuLHV0rBsAHD/TwmROVXdI=", + "MapleMonoNL-TTF-AutoHint": "sha256-9Q4MdpzfiTZB9QFbH3K2O66hkEQmJdgjPRA1iGG51yc=", + "MapleMonoNL-TTF": "sha256-PM5Dy1lU5MX5nilxHA34x5jBNYp4m8BknJ/aHrprxpY=", + "MapleMonoNL-Variable": "sha256-jvUfLi+DLTCHkdNuKMgcVp49MMeRiVVjwdIVXNKOaYc=", + "MapleMonoNL-Woff2": "sha256-SOCpyCMfXS9atPD2g58dTK67M61rJkoYOIolveCjVYY=", + "MapleMonoNormal-CN-unhinted": "sha256-X6cnYCp2V7pNLxeYE7BmxQncOfes6Vl4TTpONb10xrI=", + "MapleMonoNormal-CN": "sha256-FmZt06ZgRWTRemGMzxkQjU9B26FSQsAFXLc8b/Hv1Ko=", + "MapleMonoNormal-NF-CN-unhinted": "sha256-uRJEJVkcoAyK85V788UU29R9lH9Vuw9RbsrrSEOzdMU=", + "MapleMonoNormal-NF-CN": "sha256-nXENizBJawD/UgrYUNP9mU8m2mt9KH2Sy6vQeXFOmNI=", + "MapleMonoNormal-NF-unhinted": "sha256-qIDYALvHBz8g3V4/jaVAEz5ZIgfNSkLqrVv/AT6pRPM=", + "MapleMonoNormal-NF": "sha256-xWAhVQl9xsKXTJWNCfPBUV6gdHhmf9WUUrAYk2erTM0=", + "MapleMonoNormal-OTF": "sha256-EU4/dvUR68LaM/je41IyXTQyDxroJUTQ6GvkcaTHsSw=", + "MapleMonoNormal-TTF-AutoHint": "sha256-N7DM6nzYRi2zGXMlvc9FmwcWMLvC1bq1AULzsZu0c9E=", + "MapleMonoNormal-TTF": "sha256-HRy0W3srGzO54/VxFk+7q6m0iXFHcii47+Tcxz2RkzI=", + "MapleMonoNormal-Variable": "sha256-CE1XGv0AlbXRW9uRzXKN4pcQHqK4gtoOQyYLM3S4QZo=", + "MapleMonoNormal-Woff2": "sha256-tUvhscxn9r8P8DSJPMRmmUhIB7Owv5fI3fYCYP3CWtg=", + "MapleMonoNormalNL-CN-unhinted": "sha256-XT7cnDJsjNm8OFPqnBWMargcaWo9nl77K+4+DHuYZ4w=", + "MapleMonoNormalNL-CN": "sha256-6okDLMwtXgIiHfSapwKPk7ZKSSxGTBHFzg5STmgTO9Q=", + "MapleMonoNormalNL-NF-CN-unhinted": "sha256-6xQPEAlMjEFb0BaTSqC/4QfCcZYD8uUYMDOgGVFqdrs=", + "MapleMonoNormalNL-NF-CN": "sha256-z1xQa89ex5M4fOnl30Ay0O+eVpuP5644OpRVwE4s8qo=", + "MapleMonoNormalNL-NF-unhinted": "sha256-7BBO3nUUxFf/Nd1CWBukNjGIhc5MmvB8R7B5V0nTJ6I=", + "MapleMonoNormalNL-NF": "sha256-yd8HUSmsTq2RdTNaK0gkh8WpPfuf93vMUD9SZOU415s=", + "MapleMonoNormalNL-OTF": "sha256-nNbOJeqWG55IXWmShMMb2YTrjQe5Yz5A0y2zwwV9irI=", + "MapleMonoNormalNL-TTF-AutoHint": "sha256-/Dpk7Hb7h/VCU5dHR8AyVrrJTGNHHB6OMY85eJNhMhU=", + "MapleMonoNormalNL-TTF": "sha256-ydFuYEgK8o57s67lK1ZAxwTBpuM7fHFGZamQh7YmZcI=", + "MapleMonoNormalNL-Variable": "sha256-KcWDxyp2/kdehiL3/eE1I33so+pR7iFl4zSsKSygsWE=", + "MapleMonoNormalNL-Woff2": "sha256-f5MaDdfaBgxeR0rGlBr6LrCqyPalZjc2ffUVarD24aw=" } - diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch deleted file mode 100644 index 3e266db224f3..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch +++ /dev/null @@ -1,38 +0,0 @@ -This patch introducing error handling in the invocation of packagesWithNativeAssets within flutter_tools. - ---- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart -+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart -@@ -357,7 +357,15 @@ - } - - Future _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async { -- final List packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets(); -+ late final List packagesWithNativeAssets; -+ try { -+ packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets(); -+ } catch (error, stackTrace) { -+ globals.logger.printTrace( -+ 'Error while checking for native assets packages: $error\n$stackTrace' -+ ); -+ packagesWithNativeAssets = []; -+ } - if (packagesWithNativeAssets.isEmpty) { - globals.logger.printTrace( - 'No packages with native assets. Skipping native assets compilation.', -@@ -385,7 +393,15 @@ - FileSystem fileSystem, - FlutterNativeAssetsBuildRunner buildRunner, - ) async { -- final List packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets(); -+ late final List packagesWithNativeAssets; -+ try { -+ packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets(); -+ } catch (error, stackTrace) { -+ globals.logger.printTrace( -+ 'Error while checking for native assets packages: $error\n$stackTrace' -+ ); -+ packagesWithNativeAssets = []; -+ } - if (packagesWithNativeAssets.isEmpty) { - globals.logger.printTrace( - 'No packages with native assets. Skipping native assets compilation.', diff --git a/pkgs/development/compilers/flutter/versions/3_35/patches/avoid-crash-on-missing-package-graph-json.patch b/pkgs/development/compilers/flutter/versions/3_35/patches/avoid-crash-on-missing-package-graph-json.patch deleted file mode 100644 index a81ea1996e0e..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_35/patches/avoid-crash-on-missing-package-graph-json.patch +++ /dev/null @@ -1,95 +0,0 @@ -Prevent crashes due to missing or incomplete package_graph.json - -Modify package graph parsing to safely handle missing package_graph.json file -and missing dependencies or devDependencies entries by using empty defaults -instead of throwing errors. - ---- a/packages/flutter_tools/lib/src/package_graph.dart -+++ b/packages/flutter_tools/lib/src/package_graph.dart -@@ -36,18 +36,9 @@ - isExclusiveDevDependency: true, - ); - -- final List? dependencies = packageGraph.dependencies[project.manifest.appName]; -- if (dependencies == null) { -- throwToolExit(''' --Failed to parse ${packageGraph.file.path}: dependencies for `${project.manifest.appName}` missing. --Try running `flutter pub get`'''); -- } -- final List? devDependencies = packageGraph.devDependencies[project.manifest.appName]; -- if (devDependencies == null) { -- throwToolExit(''' --Failed to parse ${packageGraph.file.path}: devDependencies for `${project.manifest.appName}` missing. --Try running `flutter pub get`'''); -- } -+ final List dependencies = packageGraph.dependencies[project.manifest.appName] ?? []; -+ final List devDependencies = packageGraph.devDependencies[project.manifest.appName] ?? []; -+ - final packageNamesToVisit = [...dependencies, ...devDependencies]; - while (packageNamesToVisit.isNotEmpty) { - final String current = packageNamesToVisit.removeLast(); -@@ -55,13 +46,7 @@ - continue; - } - -- final List? dependencies = packageGraph.dependencies[current]; -- -- if (dependencies == null) { -- throwToolExit(''' --Failed to parse ${packageGraph.file.path}: dependencies for `$current` missing. --Try running `flutter pub get`'''); -- } -+ final List dependencies = packageGraph.dependencies[current] ?? []; - packageNamesToVisit.addAll(dependencies); - - result[current] = Dependency( -@@ -89,7 +74,7 @@ - currentDependency.rootUri, - isExclusiveDevDependency: false, - ); -- packageNamesToVisit.addAll(packageGraph.dependencies[current]!); -+ packageNamesToVisit.addAll(packageGraph.dependencies[current] ?? []); - } - return result.values.toList(); - } -@@ -147,6 +132,9 @@ - final File file = project.packageConfig.fileSystem.file( - project.packageConfig.uri.resolve('package_graph.json'), - ); -+ if (!file.existsSync()) { -+ return PackageGraph(file, [], >{}, >{}); -+ } - try { - return PackageGraph.fromJson(file, jsonDecode(file.readAsStringSync())); - } on IOException catch (e) { - ---- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart -+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart -@@ -384,7 +384,12 @@ - } - - Future _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async { -- final List packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets(); -+ late final List packagesWithNativeAssets; -+ try { -+ packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets(); -+ } catch (error) { -+ packagesWithNativeAssets = []; -+ } - if (packagesWithNativeAssets.isEmpty) { - globals.logger.printTrace( - 'No packages with native assets. Skipping native assets compilation.', -@@ -412,7 +417,12 @@ - FileSystem fileSystem, - FlutterNativeAssetsBuildRunner buildRunner, - ) async { -- final List packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets(); -+ late final List packagesWithNativeAssets; -+ try { -+ packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets(); -+ } catch (error) { -+ packagesWithNativeAssets = []; -+ } - if (packagesWithNativeAssets.isEmpty) { - globals.logger.printTrace( - 'No packages with native assets. Skipping native assets compilation.', diff --git a/pkgs/development/libraries/nss/3_114.nix b/pkgs/development/libraries/nss/3_114.nix index 3d17c3de971c..af578ffeb2e4 100644 --- a/pkgs/development/libraries/nss/3_114.nix +++ b/pkgs/development/libraries/nss/3_114.nix @@ -1,4 +1,6 @@ import ./generic.nix { - version = "3.114"; - hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8="; + version = "3.114.1"; + hash = "sha256-xs7G5MHOd6mPVpBfDd2fFG2qw+5KypBTPqErbl0zfrk="; + filename = "3_114.nix"; + versionRegex = "NSS_(3)_(114)(?:_(\\d+))?_RTM"; } diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index f1b8c6df4acf..63b10c220152 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,6 @@ import ./generic.nix { version = "3.101.2"; hash = "sha256-i5K47pzQYOiD4vFHBN6VeqXEdPBOM7U1oSK0qSi2M2Y="; + filename = "esr.nix"; + versionRegex = "NSS_(3)_(101)(?:_(\\d+))?_RTM"; } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 77d838a25ab0..6c274607e03c 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -1,4 +1,9 @@ -{ version, hash }: +{ + version, + hash, + filename, + versionRegex, +}: { lib, stdenv, @@ -19,6 +24,7 @@ enableFIPS ? false, nixosTests, nss_latest, + nix-update-script, }: let @@ -229,7 +235,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--override-filename" + "pkgs/development/libraries/nss/${filename}" + "--version-regex" + versionRegex + ]; + }; passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) { diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 45cd7960539f..85caeb11d41c 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,8 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.115"; - hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA="; + version = "3.115.1"; + hash = "sha256-SuXNqRW0lBPioYxmoGa3ZbfxC7ud6TW3xVpakVwtm14="; + filename = "latest.nix"; + versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM"; } diff --git a/pkgs/development/libraries/nss/update.sh b/pkgs/development/libraries/nss/update.sh deleted file mode 100755 index 600dbdff004c..000000000000 --- a/pkgs/development/libraries/nss/update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused coreutils common-updater-scripts - -set -x - -base_url="https://ftp.mozilla.org/pub/security/nss/releases/" - -version="$(curl -sSL ${base_url} | grep 'RTM' | grep -v WITH_CKBI | sed 's|.*>\(NSS_[0-9]*_[0-9]*_*[0-9]*_*[0-9]*_RTM\)/.*|\1|g' | sed 's|NSS_||g' | sed 's|_RTM||g' | sed 's|_|.|g' | sort -V | tail -1)" -hash="$(nix-hash --type sha256 --base32 ${base_url}/NSS_${version/\./_}_RTM/src/nss-${version}.tar.gz)" -update-source-version nss "${version}" "${hash}" diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 80024647fc3f..c8e24794e2c1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -203,6 +203,7 @@ mapAliases { inherit (pkgs) stylelint; # added 2023-09-13 surge = pkgs.surge-cli; # Added 2023-09-08 inherit (pkgs) svelte-language-server; # Added 2024-05-12 + inherit (pkgs) svgo; # added 2025-08-24 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 inherit (pkgs) tailwindcss; # added 2024-12-04 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a2ad4054fe62..9167fa3d6624 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -144,7 +144,6 @@ , "smartdc" , "speed-test" , "svelte-check" -, "svgo" , "tern" , "tiddlywiki" , "tsun" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6e7242c1f9c0..8e8fa9375329 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -62664,56 +62664,6 @@ in bypassCache = true; reconstructLock = true; }; - svgo = nodeEnv.buildNodePackage { - name = "svgo"; - packageName = "svgo"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz"; - sha512 = "OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw=="; - }; - dependencies = [ - sources."@trysound/sax-0.2.0" - sources."boolbase-1.0.0" - sources."commander-7.2.0" - sources."css-select-5.1.0" - ( - sources."css-tree-2.3.1" - // { - dependencies = [ - sources."mdn-data-2.0.30" - ]; - } - ) - sources."css-what-6.1.0" - ( - sources."csso-5.0.5" - // { - dependencies = [ - sources."css-tree-2.2.1" - ]; - } - ) - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.2.2" - sources."entities-4.5.0" - sources."mdn-data-2.0.28" - sources."nth-check-2.1.1" - sources."picocolors-1.1.1" - sources."source-map-js-1.2.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = "https://svgo.dev"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; diff --git a/pkgs/development/ocaml-modules/systemd/default.nix b/pkgs/development/ocaml-modules/systemd/default.nix index f729601d3a74..ce6410a282bd 100644 --- a/pkgs/development/ocaml-modules/systemd/default.nix +++ b/pkgs/development/ocaml-modules/systemd/default.nix @@ -16,7 +16,7 @@ buildDunePackage { minimalOCamlVersion = "4.06"; propagatedBuildInputs = [ systemdLibs ]; meta = { - platform = lib.platforms.linux; + platforms = lib.platforms.linux; description = "OCaml module for native access to the systemd facilities"; license = lib.licenses.lgpl3Only; maintainers = [ lib.maintainers.atagen ]; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 6dd3d98830db..986347de7f4c 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer"; - version = "2.8.5"; + version = "2.8.11"; # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-nO8YIS4iI1GutHa4HeeypTg/d1M2R0Rnv1x8z+hKsMw="; + passthru.pharHash = "sha256-JXqWnpqdJ+DkXP6VSDXBenYDO6hKOI4PRy24Pt7WWos="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "composer"; repo = "composer"; tag = finalAttrs.version; - hash = "sha256-/E/fXh+jefPwzsADpmGyrJ+xqW5CSPNok0DVLD1KZDY="; + hash = "sha256-ufkrrCnIwJHtAsjKdaFzlJkCH0i7Tm17+eIqgSqDwlE="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-UcMB0leKqD8cXeExXpjDgPvF8pfhGXnCR0EN4FVWouw="; + outputHash = "sha256-elh3zgN4DJK0lY6TDRGWfBjmnWZzy7s1sMWe34RsLEE="; }; installPhase = '' diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index d14f1a653754..1f29b5102146 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "citeproc-py"; - version = "0.8.2"; + version = "0.9.0"; pyproject = true; src = fetchPypi { pname = "citeproc_py"; inherit version; - hash = "sha256-swsQocrDW4IaQEQiOdGEdL34rns+NrjufmsujuQt0ZI="; + hash = "sha256-WHgdilY+h8p8zrQ9CL6soQ3N+fPPd93zsXiUBx7cJ8g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix index f0d8d55b6c94..77d51cdeeb98 100644 --- a/pkgs/development/python-modules/cynthion/default.nix +++ b/pkgs/development/python-modules/cynthion/default.nix @@ -23,6 +23,7 @@ # tests pytestCheckHook, + udevCheckHook, }: buildPythonPackage rec { pname = "cynthion"; @@ -44,6 +45,8 @@ buildPythonPackage rec { --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; + nativeBuildInputs = [ udevCheckHook ]; + build-system = [ setuptools ]; @@ -72,6 +75,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "cynthion" ]; + # Make udev rules available for NixOS option services.udev.packages + postInstall = '' + install -Dm444 \ + -t $out/lib/udev/rules.d \ + build/lib/cynthion/assets/54-cynthion.rules + ''; + meta = { description = "Python package and utilities for the Great Scott Gadgets Cynthion USB Test Instrument"; homepage = "https://github.com/greatscottgadgets/cynthion"; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index e710032e9006..6250bb4808e8 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -81,6 +81,7 @@ buildPythonPackage rec { ''; optional-dependencies = { + headless-spec = [ pyyaml ]; idp-oidc = [ oauthlib pyjwt diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 5a16cd6e023f..2a464b1565b3 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -4,14 +4,17 @@ edlib, cython, python, + setuptools, }: buildPythonPackage { - inherit (edlib) pname src meta; - version = "1.3.9"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + inherit (edlib) + pname + src + version + meta + ; + pyproject = true; sourceRoot = "${edlib.src.name}/bindings/python"; @@ -19,10 +22,14 @@ buildPythonPackage { ln -s ${edlib.src}/edlib . ''; - EDLIB_OMIT_README_RST = 1; - EDLIB_USE_CYTHON = 1; + env.EDLIB_OMIT_README_RST = 1; + env.EDLIB_USE_CYTHON = 1; + + build-system = [ + setuptools + cython + ]; - nativeBuildInputs = [ cython ]; buildInputs = [ edlib ]; checkPhase = '' diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index abfb7f2badd5..d2ac5b94ecda 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -14,14 +14,6 @@ typing-extensions, }: -let - test_data = fetchFromGitHub { - owner = "pydicom"; - repo = "pydicom-data"; - rev = "cbb9b2148bccf0f550e3758c07aca3d0e328e768"; - hash = "sha256-nF/j7pfcEpWHjjsqqTtIkW8hCEbuQ3J4IxpRk0qc1CQ="; - }; -in buildPythonPackage rec { pname = "highdicom"; version = "0.26.1"; @@ -63,7 +55,7 @@ buildPythonPackage rec { preCheck = '' export HOME=$TMP/test-home mkdir -p $HOME/.pydicom/ - ln -s ${test_data}/data_store/data $HOME/.pydicom/data + ln -s ${pydicom.passthru.pydicom-data}/data_store/data $HOME/.pydicom/data ''; disabledTests = [ @@ -94,9 +86,6 @@ buildPythonPackage rec { "highdicom.sc" ]; - # updates the wrong fetcher - passthru.skipBulkUpdate = true; - meta = { description = "High-level DICOM abstractions for Python"; homepage = "https://highdicom.readthedocs.io"; diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index e3174f10b0ad..1e0726ccfe0e 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -1,10 +1,11 @@ { - lib, beautifulsoup4, buildPythonPackage, fetchFromGitHub, + hatchling, + lib, mkdocs, - pathspec, + playwright, pytestCheckHook, pythonOlder, }: @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; version = "0.7.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,12 +25,13 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - mkdocs beautifulsoup4 + hatchling + mkdocs ]; nativeCheckInputs = [ - pathspec + playwright pytestCheckHook ]; @@ -40,6 +42,8 @@ buildPythonPackage rec { "test_material" "test_material_dark_scheme_name" "test_template" + "test_mkdocs_screenshot" + "test_no_console_errors" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 47a4aac4eb26..9da2e71d149e 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -37,13 +37,13 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "9.0.0"; + version = "9.1.0"; pyproject = true; src = fetchPypi { pname = "oslo_utils"; inherit version; - hash = "sha256-1FobkOoUlliVYtOP6EP9p/okf5p+YXhIhZkdIPtmOkM="; + hash = "sha256-AcOHXnzKAFtZRlxCn0ZxE7X0sEIRy9U0yawvFSJ207M="; }; patches = [ diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index f357ec7d6732..7d5f146c57a0 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pkg-about"; - version = "1.3.7"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pkg_about"; inherit version; - hash = "sha256-xYGDHXLRWxqA7dxs4hhh+qsEcdNwSh1jvAhpyUdbJOg="; + hash = "sha256-D3lcyisijpDDQkYWR1OB5dUo2ErnRjmV/H9mCsDJuxM="; }; # tox is listed in build requirements but not actually used to build diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index bfab7cb2f30f..ea11dbcf3a97 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -58,6 +58,8 @@ buildPythonPackage rec { ] ++ optional-dependencies.pixeldata; + passthru.pydicom-data = test_data; + # Setting $HOME to prevent pytest to try to create a folder inside # /homeless-shelter which is read-only. # Linking pydicom-data dicom files to $HOME/.pydicom/data diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index 940dbfe3273d..a64ab34d2cd1 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -8,16 +8,25 @@ }: buildPythonPackage rec { pname = "python-sat"; - version = "0.1.8.dev17"; + version = "0.1.8.dev20"; format = "setuptools"; src = fetchFromGitHub { owner = "pysathq"; repo = "pysat"; - rev = "a04763de6dafb8d3a0d7f1b231fc0d30be1de4c0"; # upstream does not tag releases - hash = "sha256-FG6oAAI8XKXumj6Ys2QjjYcRp1TpwkUZzyfpkdq5V6E="; + rev = "d94f51e5eff2feef35abbc25480659eafa615cc0"; # upstream does not tag releases + hash = "sha256-fKZcdEVuqpv8jWnK8Cr1UJ7szJqXivK6x3YPYHH5ccI="; }; + # Build SAT solver backends in parallel and fix hard-coded g++ reference for + # darwin, where stdenv uses clang + postPatch = '' + substituteInPlace solvers/prepare.py \ + --replace-fail "&& make &&" "&& make -j$NIX_BUILD_CORES &&" + substituteInPlace solvers/patches/glucose421.patch \ + --replace-fail "+CXX := g++" "+CXX := c++" + ''; + propagatedBuildInputs = [ six pypblib @@ -37,6 +46,5 @@ buildPythonPackage rec { maintainers.chrjabs ]; platforms = lib.platforms.all; - badPlatforms = lib.platforms.darwin ++ [ "i686-linux" ]; }; } diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 679e5ab81777..b76320f33c17 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.46.1"; + version = "0.46.2"; pyproject = true; src = fetchFromGitHub { owner = "pyvista"; repo = "pyvista"; tag = "v${version}"; - hash = "sha256-o/g2cvSCLwKigHxMinS1WeVLj6Z6RGM3F/3kWURTJks="; + hash = "sha256-k5Sr41mmZJCEiIeEyyqulzYrI3cQYTWN5ooW41QUPuQ="; }; # remove this line once pyvista 0.46 is released diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix index 9aa21d479820..83f5d1c1f5d4 100644 --- a/pkgs/development/python-modules/reflex-chakra/default.nix +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, hatchling, - uv-dynamic-versioning, pythonOlder, reflex, pytestCheckHook, @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "reflex-chakra"; - version = "0.8.2post1"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,18 +19,11 @@ buildPythonPackage rec { owner = "reflex-dev"; repo = "reflex-chakra"; tag = "v${version}"; - hash = "sha256-DugZRZpGP90EFkBjpAS1XkjrNPG6WWwCQPUcEZJ0ff8="; + hash = "sha256-6KWIpTtr2tNBxXoj2hY0zuX0bpSUvsoA1Y7uwln3HDY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail ', "uv-dynamic-versioning"' "" \ - --replace-fail 'source = "uv-dynamic-versioning"' 'source = "env"${"\n"}variable = "version"' - ''; - build-system = [ hatchling - uv-dynamic-versioning ]; dependencies = [ reflex ]; diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index f42a8a2e4d79..732580294bf9 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.54"; + version = "0.1.55"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-agfG9nKCvKqWUOfXZ54S25jMYPSg9oVItcu0PTbIoB4="; + hash = "sha256-9dWwwmzv3HujNWlUt75r+o7FAmfBOiJH9s8YoUDpWRg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 70e5c6bc02a2..644f0c59bbcd 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.8.6"; + version = "0.8.7"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${version}"; - hash = "sha256-Tas67x9UEFSR7yyENvixzCWbbKgP+OBMw6prnxWgCQo="; + hash = "sha256-ieR+Wxj1bJp3dQpw6j2Wki1nm4MWtVZ+UOtDl+6ip7M="; }; # 'rich' is also somehow checked when building the wheel, diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index dc2a443f4a95..74b36df70095 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -2,7 +2,6 @@ lib, anyio, buildPythonPackage, - curio, fetchFromGitHub, httpx, hypothesis, @@ -42,7 +41,6 @@ buildPythonPackage rec { nativeCheckInputs = [ anyio - curio httpx hypothesis pytestCheckHook diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index 95b24b25e1cf..40cf5441255a 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sagemaker-core"; - version = "1.0.52"; + version = "1.0.55"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-core"; tag = "v${version}"; - hash = "sha256-f+Xy9/14cJhbjqrSqR+Bh98uNUCb0XlDdaTPkPAomlA="; + hash = "sha256-Qt7AgS9x9hgM6Qs5trfP6wEAKAuR6aOMz2VFtLdmXt8="; }; build-system = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index fa226744b5c0..c85014a814a8 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -13,6 +13,7 @@ docker, fastapi, google-pasta, + graphene, importlib-metadata, jsonschema, numpy, @@ -40,14 +41,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.249.0"; + version = "2.251.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; tag = "v${version}"; - hash = "sha256-CXEIRFr0rrdydPOKp4HxErUUew86toGAkKo8X5Bz2Bo="; + hash = "sha256-QGj4ZUAwr6SxUNWgs+1PNxg/4WYE1ynR1y4I11+kDmc="; }; build-system = [ @@ -72,6 +73,7 @@ buildPythonPackage rec { docker fastapi google-pasta + graphene importlib-metadata jsonschema numpy diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index ef8d8b23171f..513b03db10bc 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -21,18 +21,18 @@ }: buildPythonPackage rec { pname = "sourmash"; - version = "4.8.14"; + version = "4.9.4"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-no99VjO1KVE+/JUOJcl0xOz3yZtMr70A8vE1rQVjMH8="; + hash = "sha256-KIidEQQeOYgxh1x9F6Nn4+WTewldAGdS5Fx/IwL0Ym0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-DnJ0RFc03+rBg7yNdezgb/YuoQr3RKj+NeMyin/kSRk="; + hash = "sha256-/tVuR31T38/xx1+jglSGECAT1GmQEddQp9o6zAqlPyY="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index f7a769ed03f9..00065a42ac5f 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "8.4.5"; - mysqlServerVersion = "8.4.5"; + mysqlShellVersion = "8.4.6"; + mysqlServerVersion = "8.4.6"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-U2OVkqcgpxn9+t8skhuUfqyGwG4zMgLkdmeFKleBvRo="; + hash = "sha256-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-OLU27mLd46pC6mfvBTRmC0mJ8nlwQuHPNWPkTQw3t8w="; + hash = "sha256-IUmWUW5rZcRvmolE+LjMaGPFa5abv1osIhTzm9BKt/w="; }) ]; diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index f9305754f960..9dd624e54263 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "9.3.0"; - mysqlServerVersion = "9.3.0"; + mysqlShellVersion = "9.4.0"; + mysqlServerVersion = "9.4.0"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell-innovation"; @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-Gj7iNvHarF74l8YyXJsOCq5IY4m+G4AB3rP/d85oLWA="; + hash = "sha256-a7UJxU5YtUq776SeKW5yIPXnz+RGkUujYV9ZSWfPqSE="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-26bhtMNuaEnsW/TygbyhejlHbtSnh+EwrEdHaDqyv5s="; + hash = "sha256-BpiDGA3Lxf/MrKqtPSA+apFNZx9N805PYYVa+2vQxPE="; }) ]; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 306fc5d776a0..bb8a4cb3770e 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -35,7 +35,7 @@ rsync, icu, pnpm_9, - nodePackages, + svgo, nodejs, jq, moreutils, @@ -82,7 +82,7 @@ let libjpeg jpegoptim gifsicle - nodePackages.svgo + svgo jhead ]; diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/tools/package-management/elm-github-install/default.nix deleted file mode 100644 index d5b945fcb205..000000000000 --- a/pkgs/tools/package-management/elm-github-install/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - bundlerEnv, - ruby, - bundlerUpdateScript, -}: - -bundlerEnv rec { - pname = "elm_install"; - name = "elm-github-install-${version}"; - - version = (import ./gemset.nix).elm_install.version; - - inherit ruby; - gemdir = ./.; - - passthru.updateScript = bundlerUpdateScript "elm-github-install"; - - meta = with lib; { - description = "Install Elm packages from git repositories"; - homepage = "https://github.com/gdotdesign/elm-github-install"; - license = licenses.unfree; - maintainers = with maintainers; [ - roberth - nicknovitski - ]; - platforms = platforms.all; - mainProgram = "elm-install"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0361da9e34e9..e11cfafbb996 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -806,7 +806,7 @@ mapAliases { eintopf = lauti; # Project was renamed, added 2025-05-01 elasticsearch7Plugins = elasticsearchPlugins; electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17 - + elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25 element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17 elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b21d4402d3f..cfaba82c34ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -535,9 +535,10 @@ with pkgs; ({ mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix { antlr = antlr4_10; - icu = icu73; - protobuf = protobuf_25; - stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; + icu = icu77; + protobuf = protobuf_25.override { + abseil-cpp = abseil-cpp_202407; + }; }; }) mysql-shell_8 @@ -545,9 +546,10 @@ with pkgs; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { antlr = antlr4_10; - icu = icu73; - protobuf = protobuf_25; - stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; + icu = icu77; + protobuf = protobuf_25.override { + abseil-cpp = abseil-cpp_202407; + }; }; # this is used by most `fetch*` functions @@ -2039,8 +2041,6 @@ with pkgs; conf = config.element-web.conf or { }; }; - elm-github-install = callPackage ../tools/package-management/elm-github-install { }; - espanso-wayland = espanso.override { x11Support = false; waylandSupport = !stdenv.hostPlatform.isDarwin; @@ -10908,7 +10908,7 @@ with pkgs; v4l-utils = callPackage ../os-specific/linux/v4l-utils { }; - windows = callPackages ../os-specific/windows { }; + windows = recurseIntoAttrs (callPackages ../os-specific/windows { }); wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; @@ -10987,9 +10987,7 @@ with pkgs; moeli = eduli; - emojione = callPackage ../data/fonts/emojione { - inherit (nodePackages) svgo; - }; + emojione = callPackage ../data/fonts/emojione { }; flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; @@ -13233,6 +13231,9 @@ with pkgs; thunderbird-128-unwrapped = thunderbirdPackages.thunderbird-128; thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { }; + thunderbird-140-unwrapped = thunderbirdPackages.thunderbird-140; + thunderbird-140 = wrapThunderbird thunderbirdPackages.thunderbird-140 { }; + thunderbird-bin = thunderbird-latest-bin; thunderbird-latest-bin = wrapThunderbird thunderbird-latest-bin-unwrapped { pname = "thunderbird-bin"; @@ -15042,7 +15043,7 @@ with pkgs; hjson = with python3Packages; toPythonApplication hjson; - image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; + image_optim = callPackage ../applications/graphics/image_optim { }; libjack2 = jack2.override { prefix = "lib"; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5d74adccdaa9..37c4a51e1878 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -11,7 +11,9 @@ let mkOcamlPackages = ocaml: (lib.makeScope newScope ( - self: with self; { + self: + with self; + { inherit ocaml; ### A ### @@ -118,8 +120,6 @@ let binning = callPackage ../development/ocaml-modules/binning { }; - biocaml = throw "biocaml has been removed"; # 2025-06-04 - biotk = callPackage ../development/ocaml-modules/biotk { }; bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; @@ -659,7 +659,6 @@ let gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; - gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; gd = callPackage ../development/ocaml-modules/gd { inherit (pkgs) gd; }; gen = callPackage ../development/ocaml-modules/gen { }; @@ -871,7 +870,7 @@ let else null; - janeStreet = + janeStreet = lib.recurseIntoAttrs ( if lib.versionOlder "5.1" ocaml.version then import ../development/ocaml-modules/janestreet/0.17.nix { inherit self; @@ -928,7 +927,8 @@ let } else import ../development/ocaml-modules/janestreet { - }; + } + ); javalib = callPackage ../development/ocaml-modules/javalib { }; @@ -1426,8 +1426,6 @@ let ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { }; - ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; - ocamlbuild = if lib.versionOlder "4.03" ocaml.version then callPackage ../development/tools/ocaml/ocamlbuild { } @@ -2223,6 +2221,11 @@ let ### End ### } + // lib.optionalAttrs config.allowAliases { + biocaml = throw "biocaml has been removed"; # 2025-06-04 + gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; + ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; + } )).overrideScope liftJaneStreet; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index eb69a04b807b..f4598ee7c2b6 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -20,7 +20,6 @@ rPackages roundcubePlugins sourceHanPackages - windows ; # Make sure haskell.compiler is included, so alternative GHC versions show up,