diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml index 5b8d2f2d8c65..83995b1cb31c 100644 --- a/.github/actions/checkout/action.yml +++ b/.github/actions/checkout/action.yml @@ -19,6 +19,7 @@ runs: TARGET_SHA: ${{ inputs.target-as-trusted-at }} PIN_BUMP_SHA: ${{ inputs.untrusted-pin-bump }} with: + retries: 3 script: | const { rm, writeFile } = require('node:fs/promises') const { spawn } = require('node:child_process') diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 17ad49c55151..769336be3c98 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -91,7 +91,7 @@ jobs: GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }} run: gh api /rate_limit | jq - - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 + - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 name: Labels from touched files if: | github.event_name == 'pull_request_target' && @@ -101,7 +101,7 @@ jobs: configuration-path: .github/labeler.yml # default sync-labels: true - - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 + - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 name: Labels from touched files (no sync) if: | github.event_name == 'pull_request_target' && @@ -111,7 +111,7 @@ jobs: configuration-path: .github/labeler-no-sync.yml sync-labels: false - - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 + - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 name: Labels from touched files (development branches) # Development branches like staging-next, haskell-updates and python-updates get special labels. # This is to avoid the mass of labels there, which is mostly useless - and really annoying for diff --git a/doc/hooks/check-phase-thread-limit-hook.section.md b/doc/hooks/check-phase-thread-limit-hook.section.md new file mode 100644 index 000000000000..0adc0d309c47 --- /dev/null +++ b/doc/hooks/check-phase-thread-limit-hook.section.md @@ -0,0 +1,24 @@ +# checkPhaseThreadLimitHook {#setup-hook-check-phase-thread-limit} + +This hook defaults a variety of environment variables known +to control thread counts to 1. Many of these otherwise default +to `$(nproc)`, which causes massive overloads on build machines +if nix build jobs and build cores are already tuned to fully utilize +compute capacity of a builder without additional parallelism. + +Currently sets the following environment variables: +- [`OMP_NUM_THREADS`](https://www.openmp.org/spec-html/5.0/openmpse50.html) +- [`OPENBLAS_NUM_THREADS`](https://github.com/OpenMathLib/OpenBLAS/blob/e7b45174355edec1f04de1cabcf5ca6a98ea7fbc/USAGE.md#how-can-i-use-openblas-in-multi-threaded-applications) +- [`MKL_NUM_THREADS`](https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2023-0/mkl-domain-num-threads.html) +- [`BLIS_NUM_THREADS`](https://github.com/flame/blis/blob/b8b75b4e19459f5d618b57aa814ca38b1d82eb82/docs/Multithreading.md#specifying-multithreading) +- `VECLIB_MAXIMUM_THREADS`: Only affects darwin, see [`man 7 Accelerate`](https://manp.gs/mac/7/Accelerate) +- [`NUMBA_NUM_THREADS`](https://numba.readthedocs.io/en/stable/reference/envvars.html#threading-control) +- [`NUMEXPR_NUM_THREADS`](https://numexpr.readthedocs.io/en/latest/user_guide.html#threadpool-configuration) + +The `NIX_CHECK_PHASE_DEFAULT_NUM_THREADS` environment variable +can be used to override the default thread count limit. +`dontLimitCheckPhaseThreads = true;` can be used to disable +thread limiting on an individual package. + +This hook will not attempt to override already existing +definitions for thread count environment variables. diff --git a/doc/hooks/index.md b/doc/hooks/index.md index e6c3af542f07..d6a470f506e3 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -13,6 +13,7 @@ aws-c-common.section.md bmake.section.md breakpoint.section.md cernlib.section.md +check-phase-thread-limit-hook.section.md cmake.section.md desktop-file-utils.section.md gdk-pixbuf.section.md @@ -34,7 +35,6 @@ nodejs-install-manuals.section.md npm-build-hook.section.md npm-config-hook.section.md npm-install-hook.section.md -openmp-check-hook.section.md patch-rc-path-hooks.section.md perl.section.md pkg-config.section.md diff --git a/doc/hooks/openmp-check-hook.section.md b/doc/hooks/openmp-check-hook.section.md deleted file mode 100644 index 5a5842eb5e29..000000000000 --- a/doc/hooks/openmp-check-hook.section.md +++ /dev/null @@ -1,10 +0,0 @@ -# openmpCheckPhaseHook {#setup-hook-omp-check} - - -This hook can be used to setup a check phase that -requires running a OpenMP application. It mostly -serves to limit `OMP_NUM_THREADS` to avoid overloading -build machines. - -This hook will not attempt to override an already existing -definition of `OMP_NUM_THREADS` in the environment. diff --git a/doc/redirects.json b/doc/redirects.json index 8a822e998401..edc4696b1821 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -2809,7 +2809,8 @@ "setup-hook-mpi-check": [ "index.html#setup-hook-mpi-check" ], - "setup-hook-omp-check": [ + "setup-hook-check-phase-thread-limit": [ + "index.html#setup-hook-check-phase-thread-limit", "index.html#setup-hook-omp-check" ], "ninja": [ diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 6f2246688d21..b2ed8a86318b 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -4,7 +4,17 @@ -- Create the first release note entry in this section! +- The {file}`nixexprs.tar.xz` tarball will be discontinued together with Nixpkgs + 27.05 after 2027-12-31. Migrate to the {file}`nixexprs.tar.zst` tarball + instead. + + This affects for example users who pull Nixpkgs as a flake input from + https://channels.nixos.org: + + ```diff + -nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.xz"; + +nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst"; + ``` ## Backward Incompatibilities {#sec-nixpkgs-release-26.11-incompatibilities} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5fcc23f9fd45..53a26777a840 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8207,6 +8207,12 @@ githubId = 7820865; name = "Eric Dallo"; }; + erics118 = { + name = "Eric Shen"; + github = "erics118"; + githubId = 52634785; + email = "ericshen118@gmail.com"; + }; ericson2314 = { email = "John.Ericson@Obsidian.Systems"; matrix = "@Ericson2314:matrix.org"; @@ -29991,6 +29997,13 @@ github = "x807x"; githubId = 86676478; }; + xaltsc = { + email = "hey+dev@xaltsc.dev"; + matrix = "@xaltsc:matrix.org"; + name = "xaltsc"; + github = "xaltsc"; + githubId = 41400742; + }; xanderio = { name = "Alexander Sieg"; email = "alex@xanderio.de"; diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 4f3a9d0d9a80..1539b800fbcd 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -4,7 +4,17 @@ -- Create the first release note entry in this section! +- The {file}`nixexprs.tar.xz` tarball will be discontinued together with Nixpkgs + 27.05 after 2027-12-31. Migrate to the {file}`nixexprs.tar.zst` tarball + instead. + + This affects for example users who pull Nixpkgs as a flake input from + https://channels.nixos.org: + + ```diff + -nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.xz"; + +nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst"; + ``` ## New Modules {#sec-release-26.11-new-modules} diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index e366006e908c..098be3237dae 100644 --- a/nixos/lib/make-channel.nix +++ b/nixos/lib/make-channel.nix @@ -18,7 +18,10 @@ pkgs.releaseTools.makeSourceTarball { officialRelease = false; # FIXME: fix this in makeSourceTarball inherit version versionSuffix; - buildInputs = [ pkgs.nix ]; + buildInputs = with pkgs; [ + nix + zstd + ]; distPhase = '' rm -rf .git @@ -32,6 +35,35 @@ pkgs.releaseTools.makeSourceTarball { NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --show-trace --xml \* > /dev/null cd .. chmod -R u+w $releaseName - tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName + + # The compression tasks are shortlived; use all available CPUs (-T0) to + # prioritize fast channel advancement. + XZ_OPT="-T0" tar \ + --create \ + --file=$out/tarballs/$releaseName.tar.xz \ + --xz \ + --absolute-names \ + --owner=0 \ + --group=0 \ + --numeric-owner \ + --format=gnu \ + --sort=name \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + $releaseName + + tar \ + --create \ + --file="$out/tarballs/$releaseName.tar.zst" \ + --use-compress-program="zstd -19 -T0" \ + --absolute-names \ + --owner=0 \ + --group=0 \ + --numeric-owner \ + --format=gnu \ + --sort=name \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + $releaseName ''; } diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix index 0515d93d71cb..82f923f13b0f 100644 --- a/nixos/modules/services/video/wivrn.nix +++ b/nixos/modules/services/video/wivrn.nix @@ -24,6 +24,7 @@ let getExe types maintainers + makeBinPath ; cfg = config.services.wivrn; configFormat = pkgs.formats.json { }; @@ -63,13 +64,24 @@ let enabledConfig = optionalString cfg.config.enable "-f ${configFile}"; # Manage server executables and flags - serverExec = concatStringsSep " " ( + serverCmdline = concatStringsSep " " ( [ serverPackageExe enabledConfig ] ++ cfg.extraServerFlags ); + serverExec = + if cfg.steam.enable then + lib.getExe ( + pkgs.writeShellScriptBin "start-wivrn-server" '' + # The server needs Steam in PATH to open Steam games from the application launcher + export PATH="${makeBinPath [ cfg.steam.package ]}:$PATH" + exec -a wivrn-server ${serverCmdline} + '' + ) + else + serverCmdline; in { imports = [ @@ -184,6 +196,11 @@ in IPC_EXIT_ON_DISCONNECT = "off"; PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES = mkIf cfg.steam.importOXRRuntimes "1"; } cfg.monadoEnvironment; + # WiVRn scans for .desktop files in $XDG_DATA_DIRS for the application launcher, + # which will execute the command in Exec when selected in the headset. If the + # Exec path isn't absolute, it will be resolved relative to $PATH, so we must + # not override the value of $PATH. + enableDefaultPath = false; serviceConfig = ( if cfg.highPriority then { @@ -211,8 +228,6 @@ in RestrictSUIDSGID = true; } ); - # Needs Steam in the PATH to allow launching games from the headset - path = mkIf cfg.steam.enable [ cfg.steam.package ]; wantedBy = mkIf cfg.autoStart [ "default.target" ]; restartTriggers = [ cfg.package diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix index 1e656fc5fcf2..795f4c11c74f 100644 --- a/nixos/tests/unbound.nix +++ b/nixos/tests/unbound.nix @@ -7,6 +7,7 @@ * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via TCP/853 (DoT) * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/53 & UDP/53 * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/853 (DoT) + * running a recursive DNS resolver on a machine in the network awaiting input from clients over UDP/853 (DoQ) In the below test setup we are trying to implement all of those use cases. @@ -100,7 +101,7 @@ in }; # The resolver that knows that forwards (only) to the authoritative server - # and listens on UDP/53, TCP/53 & TCP/853. + # and listens on UDP/53, TCP/53, TCP/853 & UDP/853. resolver = { lib, nodes, ... }: { @@ -122,7 +123,10 @@ in 853 # DNS over TLS 443 # DNS over HTTPS ]; - networking.firewall.allowedUDPPorts = [ 53 ]; + networking.firewall.allowedUDPPorts = [ + 53 # regular DNS + 853 # DNS over QUIC + ]; services.unbound = { enable = true; @@ -150,6 +154,8 @@ in ]; tls-service-pem = "${cert}/cert.pem"; tls-service-key = "${cert}/key.pem"; + quic-port = 853; + quic-size = "8m"; }; forward-zone = [ { @@ -306,7 +312,7 @@ in assert expected == out, f"Expected `{expected}` but got `{out}`" - def test(machine, remotes, /, doh=False, zone=zone, records=records, args=[]): + def test(machine, remotes, /, doh=False, doq=False, zone=zone, records=records, args=[]): """ Run queries for the given remotes on the given machine. """ @@ -331,6 +337,15 @@ in expected, ["+https"] + args, ) + if doq: + query( + machine, + remote, + query_type, + zone, + expected, + ["+quic"] + args, + ) client.start() @@ -348,12 +363,12 @@ in # verify that the resolver is able to resolve on all the local protocols with subtest("test that the resolver resolves on all protocols and transports"): - test(resolver, ["::1", "127.0.0.1"], doh=True) + test(resolver, ["::1", "127.0.0.1"], doh=True, doq=True) resolver.wait_for_unit("multi-user.target") with subtest("client should be able to query the resolver"): - test(client, ["${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True) + test(client, ["${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True, doq=True) # discard the client we do not need anymore client.shutdown() diff --git a/nixos/tests/web-apps/dashy.nix b/nixos/tests/web-apps/dashy.nix index 39454b5b8d8a..d83c14d3294f 100644 --- a/nixos/tests/web-apps/dashy.nix +++ b/nixos/tests/web-apps/dashy.nix @@ -1,6 +1,5 @@ { pkgs, lib, ... }: let - customSettings = { pageInfo = { title = "My Custom Dashy Title"; @@ -45,29 +44,29 @@ in } ]; }; - nodes = { - machine = { }; + containers = { + container = { }; - machine-custom = { + custom = { services.dashy.settings = customSettings; }; }; testScript = '' start_all() - machine.wait_for_unit("nginx.service") - machine.wait_for_open_port(80) + container.wait_for_unit("nginx.service") + container.wait_for_open_port(80) - actual = machine.succeed("curl -v --stderr - http://dashy.local/", timeout=10) + actual = container.succeed("curl -v --stderr - http://dashy.local/", timeout=10) expected = "Dashy" assert expected in actual, \ f"unexpected reply from Dashy, expected: '{expected}' got: '{actual}'" - machine_custom.wait_for_unit("nginx.service") - machine_custom.wait_for_open_port(80) + custom.wait_for_unit("nginx.service") + custom.wait_for_open_port(80) - actual_custom = machine_custom.succeed("curl -s --stderr - http://dashy.local/conf.yml", timeout=10).strip() - expected_custom = machine_custom.succeed("cat ${customSettingsYaml}").strip() + actual_custom = custom.succeed("curl -s --stderr - http://dashy.local/conf.yml", timeout=10).strip() + expected_custom = custom.succeed("cat ${customSettingsYaml}").strip() assert expected_custom == actual_custom, \ f"unexpected reply from Dashy, expected: '{expected_custom}' got: '{actual_custom}'" diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 608038c434bf..a3bc7a312ec7 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "150.0.7871.100", + "version": "150.0.7871.114", "chromedriver": { - "version": "150.0.7871.101", - "hash_darwin": "sha256-LJPfzeJjVcEHenRNqKNOGcEZLL/rHRH55yBefLFTlEs=", - "hash_darwin_aarch64": "sha256-+WZw22dgaDsDMOQUJTjTuCGyUZT1t1RBjutyqmumX/A=" + "version": "150.0.7871.115", + "hash_darwin": "sha256-3QytnwfqPqpYL2TMTMykvT+yAfZqWiRHMbMEK+whe0Q=", + "hash_darwin_aarch64": "sha256-jJ1URVS4led/1rTODm3t8wewJ8oIOzKIrq1utn5JJ3s=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "b5a9b587b83512ef1fab99cb7510c58a06d22089", - "hash": "sha256-bylGmZC9NhUjcU6amK3mwuZ1it7uTm2hsC60DaKINr4=", + "rev": "f405107495a07cb1bfcf687d4af8d91117098db6", + "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=", "recompress": true }, "src/third_party/clang-format/script": { @@ -92,8 +92,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "bbf3d8a4755268f016087be2f56099fa5a5f3f6e", - "hash": "sha256-8iuHtNgHumlMXeXj2k0ZPcvnTeJ00di298+789OjScs=" + "rev": "8d3c5a8caebd836b99fa32062951a401910eba33", + "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -262,8 +262,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "1d67dc0dafa344bbd6ca75c124e2d6d9d53074d8", - "hash": "sha256-VBXch2YwnKm+lMcZ5L0SlW+vAYeaSwgZvcOhg1TE5/A=" + "rev": "ec97cf3bbeea2cb623fbf97c4e3f22f5acb4d568", + "hash": "sha256-kbGcNwpdmqFTIAe/OU3Y1C13ZEHz5OP+QDAExg6tw2g=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -827,8 +827,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "968f19a8970f8d91702d86f0ec1522f3909781b7", - "hash": "sha256-x3rCWvC3hEjyJq6PNThhZEp4oRF9Y1JJEPnZTqVNVrY=" + "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16", + "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g=" }, "src/agents/shared": { "url": "https://chromium.googlesource.com/chromium/agents.git", @@ -838,7 +838,7 @@ } }, "ungoogled-chromium": { - "version": "150.0.7871.100", + "version": "150.0.7871.114", "deps": { "depot_tools": { "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", @@ -850,16 +850,16 @@ "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=" }, "ungoogled-patches": { - "rev": "150.0.7871.100-1", - "hash": "sha256-a+bGt3sROlE9edUBN2/VGn/grN6BqxWX/bsUlAVoAxY=" + "rev": "150.0.7871.114-1", + "hash": "sha256-qvAtrj013U44vU+U3JLuItAPbgtHwm9Kq7hU2NLYDaE=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "b5a9b587b83512ef1fab99cb7510c58a06d22089", - "hash": "sha256-bylGmZC9NhUjcU6amK3mwuZ1it7uTm2hsC60DaKINr4=", + "rev": "f405107495a07cb1bfcf687d4af8d91117098db6", + "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=", "recompress": true }, "src/third_party/clang-format/script": { @@ -929,8 +929,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "bbf3d8a4755268f016087be2f56099fa5a5f3f6e", - "hash": "sha256-8iuHtNgHumlMXeXj2k0ZPcvnTeJ00di298+789OjScs=" + "rev": "8d3c5a8caebd836b99fa32062951a401910eba33", + "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -1099,8 +1099,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "1d67dc0dafa344bbd6ca75c124e2d6d9d53074d8", - "hash": "sha256-VBXch2YwnKm+lMcZ5L0SlW+vAYeaSwgZvcOhg1TE5/A=" + "rev": "ec97cf3bbeea2cb623fbf97c4e3f22f5acb4d568", + "hash": "sha256-kbGcNwpdmqFTIAe/OU3Y1C13ZEHz5OP+QDAExg6tw2g=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1664,8 +1664,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "968f19a8970f8d91702d86f0ec1522f3909781b7", - "hash": "sha256-x3rCWvC3hEjyJq6PNThhZEp4oRF9Y1JJEPnZTqVNVrY=" + "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16", + "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g=" }, "src/agents/shared": { "url": "https://chromium.googlesource.com/chromium/agents.git", diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 474693ba713b..44a39a193ea8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "152.0"; + version = "152.0.1"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/af/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/af/thunderbird-152.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "5b90f77b5c8cac190807b4666ebd8eb4d8cce8d5e85bd100fe6361ea211b8164"; + sha256 = "4d81a3dac8e71d11950fc908d025afc54d6c96a8464ff30728b70e3359cc27d3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ar/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ar/thunderbird-152.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "30669ea06f84ac8d5aa33345e9248dd7073409c2040666b56054ee238cd1207a"; + sha256 = "30e4b843aecc0e29e5f0e21c786746230b2a0a8fbec302f3c931c9d1256c40f1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ast/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ast/thunderbird-152.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4a1d6fd1f0c4e09de5bd7635152038116cfb9b2b40022a15c2b6a37d3974a660"; + sha256 = "f27e475de0c8fd493812762d738955c2d829ffa55152cb8818e3d1a838b76654"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/be/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/be/thunderbird-152.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0e18707b7db4830d59a287d924fc1d9c31b764dea0647c184aabc32c895b8b55"; + sha256 = "695938a400f10cb01318b33351299b01d46d749c091b473b3617802443ef206a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/bg/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/bg/thunderbird-152.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e5e35bd25986fab8990be705502691407d532127160f1fff68483c2276bc351a"; + sha256 = "dc02bb1a8dcb5914112ddee4f1d040032bc3d20f115764da0e9d04682f19575e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/br/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/br/thunderbird-152.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "82d38f27846dbfc18ac333546663cc698deb30d54040c07cc7f90b25d7b0a496"; + sha256 = "fbce72250ac139d59d6afe0b9ef4e0b30d0173b895a0a164233fb3fa8381828a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ca/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ca/thunderbird-152.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7e26f0a94f950575dd4ce24ac2973ab96e6162cfae687d515fb99170bbdfecf0"; + sha256 = "df734731d9e17d367e099cd2bed636a899e3f1dc1ecdcb3489e20c996adfa5b5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/cak/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/cak/thunderbird-152.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "34c483d5d2dbe2f69d17a89e250d9f95632e0e0ee224c6410e4d06d37681bc0e"; + sha256 = "a39a113102842c31f1e6fce77640e9882e74b10634d4e6e7619ab3ddae9ae1cd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/cs/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/cs/thunderbird-152.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "25604eb677d5b93e276b4df59464ff2a205eeea2adca73aef4c53a0629b34402"; + sha256 = "b02377f4575e0309d7f01165b3e8eba9af2794525d3541f2532b2bd8eb2141ea"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/cy/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/cy/thunderbird-152.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "6cc83e2a3e724c65d2396fbaeb7873f1599e0ea57a0c21c4a33eacc6f5224abf"; + sha256 = "c3c1c7cefccc0407b0af66a58d906db48c4ba7adb91379ff88096aa8fa23c99c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/da/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/da/thunderbird-152.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "4ffdeb0bdbc501c351f0aaecfacefe4403e793a8aa3880a1726dee2984ef389f"; + sha256 = "14584ef3996ec7c23c61da688dabd12dd1efdd8b31aeff55e28db0c64b49874d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/de/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/de/thunderbird-152.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "0d9584b6991fb72c4ea99ed230f677c1e1c55422a3914b21228199d63b855268"; + sha256 = "5dfddb6ea62d75292b9d119bb56529f719fe38a8a00f2db4377bb74ceaaf5832"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/dsb/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/dsb/thunderbird-152.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "fca307bd5ddbde1873277ffd50a19e4260c155294b67dc049e918d8b3a372c97"; + sha256 = "82aba1f083e356920afa71f0f64d71fd6d4dbe2bd456f9a25ece63c312a083b2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/el/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/el/thunderbird-152.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3e161d6bd4cf8191b43bfc45b4929c8b9de90321e88c119e71c09da6d91f4455"; + sha256 = "60126796e6519edd80da3cdd8a906b85027602f2b0ed7e0719a36fd478da7693"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/en-CA/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/en-CA/thunderbird-152.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "dfa130e9de55475ef8b2c997c28d1ce48721aff668b3e92d64ec5a2bef477acd"; + sha256 = "13f78d7e874c282ce1d2247ce34f6cef87bd0de0200f8b50ceff7ccbee883fdf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/en-GB/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/en-GB/thunderbird-152.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "88991414359f6892f0b0d8c2560d7de1fb60f47e07593a7ea5ea7291a349c159"; + sha256 = "26720c7ba7b48cd33343dc5f9256f8a642e0371b86cb728e83622a2a2404b69a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/en-US/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/en-US/thunderbird-152.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a803cb3794ed2fb2bf62bd22d59dac236f6063d59d58357ac03ab0337143a924"; + sha256 = "4c1c89352b5593d8a9fce73e10c446c9f95efad9160230082bed071b2af71f9b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/es-AR/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/es-AR/thunderbird-152.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "908c6d8918b8bdf0f1b1220b66616fac94cd57c59ce65e5ad3bdfad998bad95a"; + sha256 = "a531075526dec09870efcd102008f8a869658c44d59f675fb91ce1137a23d18e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/es-ES/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/es-ES/thunderbird-152.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "75c3088f2723545ceab4ad514ecaefb60dd274a4c3342579c5acb3e7c660769f"; + sha256 = "bc2a13c87c2740f2f6b560f8fedbee8b02b236a8b6c33639c4d8cc6bc7bfd594"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/es-MX/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/es-MX/thunderbird-152.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "54d703962626baf6d56795b6de11b9067a41369127932a2a84bf3c27f7908560"; + sha256 = "aa98d74303220b1f8f3da31a2a46073615a0335bf7e333447436e769e58adba3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/et/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/et/thunderbird-152.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e395eda21ca7c3b35cdba5e4b08b207b61bb5a41431ffec7afd67658b3a6586d"; + sha256 = "6dbebe03fc6b404407a1d0704dc8fe336c6b370bf0ffece70f5dc17676fac032"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/eu/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/eu/thunderbird-152.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "be834db03de723231200e4196eca482c49b91a9875f30fe2783c7dec7124ebd8"; + sha256 = "aca435a77ca215ce12fa0057c4dbf14e4aecd56615ca9965bce14a5d43159836"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/fi/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/fi/thunderbird-152.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2b4d9e045d040efc8d9b328df71393c62d77e937c075cdf0afbcc492f6631cc7"; + sha256 = "ed66ab39a832e16fc1a6eabda70b10ebfb377a4b3647d555736759458a0e5238"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/fr/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/fr/thunderbird-152.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "23007c1954f3efaba10fc6618eb7bc4588b4d736c4c3a0e13d7269ed419de667"; + sha256 = "64f997263e5a66e7fe888500595c8b333cf93e82873c091308862213c414ef52"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/fy-NL/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/fy-NL/thunderbird-152.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8a93eb5f2f2f326aced8899ae96079fc0d977f96b9b61b7ffcb114500ac4cc01"; + sha256 = "d2ed5698fda8515d3e0ad41a2d1cefac42ebd1b1d48f48dfef338509b4d652d8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ga-IE/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ga-IE/thunderbird-152.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b6c909482e3a8734beef9b2238c4a1d31817b013a96b59a88df4d6d855889ae9"; + sha256 = "c121fa734cbf24d157dfbe53f06d43a483dbaa3fb443ef4858dbd5ba0bb89c45"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/gd/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/gd/thunderbird-152.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2aee7f600b7bd91e984e0bfb688c2072ba1a935ac1e8a5e9e5ecdeda5945c619"; + sha256 = "118d82a56ca7b5cab8d4f58821958bd5048cea9d92a9866328c840b827114cf9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/gl/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/gl/thunderbird-152.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "13199eae8c51fbe0d929ff39aa8e79448faf47549acec40077f8a930b08b2abe"; + sha256 = "ce1e968514ed207ef3dec874c03fd6b38ea919ca323d6f864943c989866a1aa0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/he/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/he/thunderbird-152.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c33e79f90666dc22e5f62919da060714f85499a0dd10c4811e64d88650e6c37d"; + sha256 = "5fb9ad329da71e722d7c09104173e50198ff60e2d60b019ca545c61cc309e575"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/hr/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/hr/thunderbird-152.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9bf91331ed42b88ada2f177e4af32b0abe6c89ec9a62b070d6850501f207710f"; + sha256 = "fd054e8e357eb45ff0185782c39aea1ffe3fbf9d9c73e212c7a508f71ebb5363"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/hsb/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/hsb/thunderbird-152.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "923ceb79cf3395cce7a664b4235e3ca000e1740e1c94ec66525fa9c00ee2c34d"; + sha256 = "120e6cec01b5b384b9e1c8e1f68d607f922e197e0e80e935f1519c51e8d91b02"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/hu/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/hu/thunderbird-152.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "946a0e7f6becd28c1dfc43aeb1ccce86d6a1ad418ba4a04d06fb4397ea5562d0"; + sha256 = "f1e32edada9bf6649af6abdac582972dc51f342ed4698c7b5ec4055ea4166dab"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/hy-AM/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/hy-AM/thunderbird-152.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f6c3b7d01432742fddda7872d1855473706b18f247986424c5488f35748e9015"; + sha256 = "5cdc75efea4f9d5cb12217c83f5697542544b48d042625c83205187b181f1e91"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/id/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/id/thunderbird-152.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c284bcefce23ae770a1f5a918581b95cc5f2abb35c6494116e31d7438c09da62"; + sha256 = "5ab5a0c8df4f329cddc24fe5b3cd9f7c6d68fc1023e33bff4ea97aea276caeb6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/is/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/is/thunderbird-152.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "046fd8a1048ced5b1b4f23689ba3fead14ac2faab62963fa5415d23a7eef6396"; + sha256 = "99b443148993fbd16fa6de8703949fa8935a2a03a3d51e3381fbf3b355700f61"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/it/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/it/thunderbird-152.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a603bec1dc08a70cf0a70de49c7bbe49d8c841c5868c3440a16015495b452cde"; + sha256 = "db9c3bf364f972e93ac76218a8375ad28e3fca4c679c5cb4d2cd4eee5c50aae9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ja/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ja/thunderbird-152.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "60849cf286a01c5063452d8a5aa6cbb0e3f83d4e0c987f6c162dc6be4f0c8db3"; + sha256 = "3443752d5321e2d6362a839a052bac4704fafdab9050711c2b5f7f376f429db9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ka/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ka/thunderbird-152.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2eac8b7dcb651f5d742bd34cb6dd3d0664f4eee1ad507704dc9df67b186cf3eb"; + sha256 = "f4605a1f51a11e4967ae780885519dbcb3c5314e3f7fe052c8a3c59478acca51"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/kab/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/kab/thunderbird-152.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a2839077a93b606b0515096d19fde767a4c52058e4bff5b589b847d13b547eef"; + sha256 = "017592e09e8c3dbc99cebbb3f395e21d73e1193f294257cba8530df246bf0aa9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/kk/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/kk/thunderbird-152.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "2a5aa24a497829daffda08265f9e6d667fd0834211a9e1a78665b1bf15f4176b"; + sha256 = "b52f50007704f3d5d091ae772c8bb47a8b6be859767dd05e3dc3b6ab531d810d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ko/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ko/thunderbird-152.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e2c1f3d9a80c362b123a8559a45228dd9cdc58f5081e475990d6e3d7dcc1a02b"; + sha256 = "e7dea245659b76060d7b1a4d629aa7d54dbc51afc38e78c66e284c40e9d69d76"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/lt/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/lt/thunderbird-152.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "b3fae10389b5a935aace226414bd21349381d8036c1872d57bcf31422ed04f6d"; + sha256 = "ebc4e083a78d4997021556c3733f428f39563d160be5fed9e26c174032890c48"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/lv/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/lv/thunderbird-152.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "0445947e9a1096973d4df01182bdb0ed40cce14be0edeb9fb4eb3ca7ee90e8c6"; + sha256 = "9ea1e28299f96d04d4d7c79831c96b27d2ffaf5766825625ec15b32f4a0c3aa3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ms/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ms/thunderbird-152.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b8cbc2278a0063bfac3d5a77bcb8ebab3678b20ce0c14fa06420f3672c62e7d0"; + sha256 = "83907525cd325568caaa2e118d17aa2a7fa376597230b99e5c6501c662bbac67"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/nb-NO/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/nb-NO/thunderbird-152.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c934af099b0076f502dd6ba11f3790cca7c4bea2c8699beace26c7ef13d5b2e4"; + sha256 = "4e1914054f7360cffdf5ad8eb768acb7b1b6ad12fbebd42af2ebe25ca2c65aeb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/nl/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/nl/thunderbird-152.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "48b1328b247c993879a8855d71bdd6b8bc9e9665b1003b9396538b0260044a3a"; + sha256 = "03555fabad23a6feaef4c3bfc36dfe80a277f95a61d778948e65200dd6ca901a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/nn-NO/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/nn-NO/thunderbird-152.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "81fd62d2ff7899522332b0796ad5646ff61f3f679000942e814becffa58c3be8"; + sha256 = "348647bc24040a353824035a02fa937557cb06d4fd789ed5faa545db0c6a8d44"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/pa-IN/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/pa-IN/thunderbird-152.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "b6eab18d93aaf53357f416b24a65f9727760869ee7d7b07929dacbbf21f31962"; + sha256 = "68aff1456e36ef21ac64eba44f859ed0c5babfccba1afc4e91d4d3168f5b5ffb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/pl/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/pl/thunderbird-152.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "26322bb6fbdd56918097e71c2da8e24c33dd16b26777369561d48e408da4f557"; + sha256 = "61029cd0b65035f39cbd8fccea313d56a13a1ac3d6752a5a30820486724c5a39"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/pt-BR/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/pt-BR/thunderbird-152.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8c1ad9777a4ad4d132a4f2fc8bedae883a7280317cc9f6a94dfbfedd7dc4633d"; + sha256 = "2da35094aefb00d8c6cb5de741ee70b2f7f0b83972f1eed0bd63c9a2ace4d0c6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/pt-PT/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/pt-PT/thunderbird-152.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "831b666f6b4d71256a2c71fd61de235e28fee1278c3e545375b79138969cb0fd"; + sha256 = "50a2160a41264a44dc9daa22e0443c3c7d79b165f6612655d314dcb40651cd43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/rm/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/rm/thunderbird-152.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "2e1e2faa0f580d6c15d88444b10daef10357951a2ab75dcf4c2900d252130f57"; + sha256 = "ea61621141f6d3f957dcc52e4b8e63c5f0af2da9c71c11538cdc494c6fa9e713"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ro/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ro/thunderbird-152.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8b0e082d32615c9c2f0084c0e753c85e0e8eb19037ccbe16d2acc9a399b27666"; + sha256 = "f59aa1fe09405b50413eef49a0e9dec3d38cc853a6e3b0805556b9e6edfdc435"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/ru/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ru/thunderbird-152.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0829966c5d17ba0c86e814e7a4727656296990c96f4b8ad0e65a32a9c209583e"; + sha256 = "e56f0979e9e4fec993cdef77bebbfb3f70a94c28a7b041d5891c5f5108875b43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/sk/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sk/thunderbird-152.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6766b76807da210ff33b1150f34bdea1a275e0fb84d937787d786a78ee1e48bc"; + sha256 = "c80e1b7f55ff1b377ee5e31170e0eeab702e19c2cfcdd1d1d6bb0a28a292552b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/sl/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sl/thunderbird-152.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9ac7e68f9438168f4c6ca306bf1ca5cfabd80ee4ef4d1d6b8e9d66e60c459d85"; + sha256 = "d922a7ef6bc55a6499676498efd8d580c93f9d8c90f04493f62b0239386018a5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/sq/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sq/thunderbird-152.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "875d48e8d5e367e555416d625e747cb6158f583884efe17ef4d00d7fa2e50754"; + sha256 = "5040e32916ac1328b404327b07d00448b04c8f7c5340e43088253cf04242215f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/sr/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sr/thunderbird-152.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d1040033f0ea430716bbbf3ff4c73afeadfa8a6fff7f39f72b0f106aa113fda6"; + sha256 = "3fe1d75afc21fa130ab42595ae754b70ce70c9237654271d24b78e3ca2bc8e9d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/sv-SE/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sv-SE/thunderbird-152.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "8e1aa6a34d0a2ed30bb6bfb7af51854e13a15e3714ce07f02f5044d36180fd92"; + sha256 = "92bc1225f62f3cd9722e7698815ffcf4c7461ad85a33171b7ba7e845e43af5b0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/th/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/th/thunderbird-152.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6968bcae680af3944715343b3e0a079b260f94385d819945f9eb5af17f2b36ea"; + sha256 = "e42cb3ca1256dc8c8ecee3608c42aee52d6af242f9c1e84f70d6f89b09eacb10"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/tr/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/tr/thunderbird-152.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9cc3a26a7f0af6d37ef43cf6a0cd0e272384c517ab56c6a6d1becc656b232c46"; + sha256 = "412b576b11fc50523c2d60cf424a3345a7c60c687c3a9a19324654feb05d00e6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/uk/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/uk/thunderbird-152.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c885413a9fd9ad30ccaeb66f9a3622c753c57ba3165fc5ea09a63e4daa6810eb"; + sha256 = "b4f0134adf16d406cc385cff255ff89de3f30ecfb351d7e4cae69652feb53c85"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/uz/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/uz/thunderbird-152.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2966ef6ef827e8d1ade82dd0b89b08e40ef432ffd75d253cedd9e1668477acc3"; + sha256 = "9be0000d168ea4e7cefb8db26a2e6581d090f3d67d80e30281a6e9a3141e441e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/vi/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/vi/thunderbird-152.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a5c1d9266ef50eb0fb1b8abae0f2e9bd9270b730a5b26d01d2c026036b0a6697"; + sha256 = "2f002d79964af466b1c85dc6cb0ab9796bc63d526975c837448161852904e20a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/zh-CN/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/zh-CN/thunderbird-152.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2bad234d97bf03a4cf9da35826b05529b0fa94c9dc1b2d2492467c22c2aba0a7"; + sha256 = "96b250be51398b0a48cd1ed47a92fb17b326da5f3444d8f2b7623cf0caccc2f7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/linux-x86_64/zh-TW/thunderbird-152.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/zh-TW/thunderbird-152.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "30a99eb44a9d9a6d1c8e150b6d16f0690d966149f99f1f1f154ccd98c2526c6e"; + sha256 = "544cb2db7c03a21af83869d86154a105ef332f2658885fb0cdba0122b555d432"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/af/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/af/Thunderbird%20152.0.1.dmg"; locale = "af"; arch = "mac"; - sha256 = "e0c4b7eecf7d18de76b25bfca17c97dc1846f6b407297ef9575cca38a3c95200"; + sha256 = "4408ab7b882c87b49e336366d734d092d0179df4fdc42a02cfdb285564080dff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ar/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ar/Thunderbird%20152.0.1.dmg"; locale = "ar"; arch = "mac"; - sha256 = "1673c9fa879453d60a3c115c186cdb539e65c1cef88b8650bf8828fa1eaea934"; + sha256 = "89ec721e4ddfe899cbf091c8106daff50bf6d7f24c16c057d24d84d6d27804c0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ast/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ast/Thunderbird%20152.0.1.dmg"; locale = "ast"; arch = "mac"; - sha256 = "c39db7878d04ab87f84f0d5b2e7f27444d5c300203033bb4a8d02c06911b2e90"; + sha256 = "1d25f08eba3ce2309ad50301d63e075a5a2c432860415a497164780b14ed8503"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/be/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/be/Thunderbird%20152.0.1.dmg"; locale = "be"; arch = "mac"; - sha256 = "c298a7ee4330dacf117a7992a32344d64a1403306b245868566adba5c356b015"; + sha256 = "d8ea62ba64e8f11fbef7f5ce7498f9741dde044479a362f6fe74797a23118bfd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/bg/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/bg/Thunderbird%20152.0.1.dmg"; locale = "bg"; arch = "mac"; - sha256 = "318839c09548c03e16ebcf0804714c6432a24a9622fda80bc5da8245aaf88667"; + sha256 = "4da05c87c12bcae424e7aa2fb6f929e396f57c77c2b811cc30f57e4872702b20"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/br/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/br/Thunderbird%20152.0.1.dmg"; locale = "br"; arch = "mac"; - sha256 = "ef3c402920c15e448e2400c5d23e2e2132f73c7065c398990b2e07a4196c8bfa"; + sha256 = "78d270d1e5927e563ba21039b5e196adf69e7a0324c40fe11125fe20c635c451"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ca/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ca/Thunderbird%20152.0.1.dmg"; locale = "ca"; arch = "mac"; - sha256 = "3ec2c1af330beba1ec7de37ad420b88e57d7b5e3e7b94fd761abc2389c797143"; + sha256 = "032afb66a26ec0dc03b72b7ca80ee4a6900cdaeea2ee66056dd437e7e887312a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/cak/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/cak/Thunderbird%20152.0.1.dmg"; locale = "cak"; arch = "mac"; - sha256 = "85019a97ec2907f05731de186357266ba11c651fa5b5bfe687605f6f84aa6c73"; + sha256 = "41e5c9b3835e6d92739902d298cb317fe9d2db8ad72a53c3b9f78867d13669d9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/cs/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/cs/Thunderbird%20152.0.1.dmg"; locale = "cs"; arch = "mac"; - sha256 = "dd293ea9fcd764a43f32507478d3192f364a1fddaefe5ea0906407aa372f6066"; + sha256 = "f0bec80b949c9bca491565f0cccb24228834a7cc1d47abc54c8029b5584ac97b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/cy/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/cy/Thunderbird%20152.0.1.dmg"; locale = "cy"; arch = "mac"; - sha256 = "3d9cbbfd745bf0aeabd250fd158280dad11de30eebffa785e626a0b6228e3ad5"; + sha256 = "a6242b2b7dc0e8d34b3763a54c8b7e84cb6eaab116e6c8af8cd23de934445156"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/da/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/da/Thunderbird%20152.0.1.dmg"; locale = "da"; arch = "mac"; - sha256 = "39dd3394e42b4bdacb5bf1b3fe91917fc57f8484da30cdfe2e7572a0c934836f"; + sha256 = "54ca25e3c72f4c57b83fdb0d058e48fd144a71b754d930f28e14a7d80e7ece92"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/de/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/de/Thunderbird%20152.0.1.dmg"; locale = "de"; arch = "mac"; - sha256 = "3f97b6b1bd1cf63fff975ab267ebef493c0f08de4507487d466508f6d72465cd"; + sha256 = "9f3adbb7b8728d36462c884111b0933eea00761102417a96b6718973235e6d13"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/dsb/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/dsb/Thunderbird%20152.0.1.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "627a82fdcf2bc880c547058327717f2710a04d757b7ecadc775190c3b6b5c61f"; + sha256 = "57a36c2099e9932d9161a650e370b52bf5b399c53df45e93899a7bef38867bec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/el/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/el/Thunderbird%20152.0.1.dmg"; locale = "el"; arch = "mac"; - sha256 = "cbbacf7045af81250bb4c0dadb165059511ca6d041dfcafa7573bf02a2353734"; + sha256 = "98fb7469ad7747372d70fe526a6e319ed390f436f42d02af60fd14a6955efe5e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/en-CA/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/en-CA/Thunderbird%20152.0.1.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "0d471b18ffad7dff4d1a6bbf95211d64602217ff21a74eea180086503b4d258a"; + sha256 = "14d52981f5cfafbba62523cc8fac0a8804d92266e998b48a9a0d107c0bcd9c5e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/en-GB/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/en-GB/Thunderbird%20152.0.1.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "acf0aa056e87d3447485c31dd6415f5ad5af167575a7d1a7882b4b7e7964689c"; + sha256 = "e86244b4244b62c85b70fe7074ad8e7fb418dc4ade583af61c9601792bd1fbef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/en-US/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/en-US/Thunderbird%20152.0.1.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "42ac9a908831d8fb32c85dbd484a8d31106dd9fee950be5b43565dcf8303ea7f"; + sha256 = "2ddb04427a7153e2c25f2f118ba42d5904f73b8e8b7599a0761a30c774fc00c6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/es-AR/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/es-AR/Thunderbird%20152.0.1.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "4660c74e3a8883f44a9e7dfb7b6e982666743616b9e344b3f650537030cbcf74"; + sha256 = "b2474b995b3e15c30a91afc4746c1858da3eb17e1cf5f31156393a661581fb9e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/es-ES/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/es-ES/Thunderbird%20152.0.1.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "46c7931114d7f1186f6312dd8564a86bd9b449d07a9ea28503d46f0df73acddc"; + sha256 = "6fc00ab22c863261e28d7cee0d11d9fd7ec8fbc387a90477e2a87a17c9d24fa0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/es-MX/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/es-MX/Thunderbird%20152.0.1.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "1ba72397485674719573a8bf962d61c0edd4fd351070de8d53616bb26c348311"; + sha256 = "33cc5572a9b0c368df1bbf87218cdb693b2ef209491c865d674463f8262b3aa9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/et/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/et/Thunderbird%20152.0.1.dmg"; locale = "et"; arch = "mac"; - sha256 = "f82a43467dc06909ad61bb0e9e544644b8159ebfc6efe79d52eaf7eaa41e3270"; + sha256 = "16d369305e03b19a50ce4a31807d28f08c12ea15fcea77f6a8b43e581c9a0a14"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/eu/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/eu/Thunderbird%20152.0.1.dmg"; locale = "eu"; arch = "mac"; - sha256 = "d4c51cadf6f34d5871b92694090eb62e108331f9957dffb9068ca433f9706220"; + sha256 = "58f2e8080fc9d9d3a4ff8f6721d73e639932574fd82cc65b58012f1c7f336518"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/fi/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/fi/Thunderbird%20152.0.1.dmg"; locale = "fi"; arch = "mac"; - sha256 = "15f547697410920a2730c1db552fa629448529479957bc412db2b5a55af26aa9"; + sha256 = "516dc7c067e4eae883823378d8b78dbf6d74b6e6224e6c4b4e2d36750d53effc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/fr/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/fr/Thunderbird%20152.0.1.dmg"; locale = "fr"; arch = "mac"; - sha256 = "388c6a3a89a089130219f70b7694a7146b675aef99603b65d4d613cb47257406"; + sha256 = "c5f1da966b4dbdab893c85785ee1ab9439a31c33b8f3b9a2ca9ed04c32164ddf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/fy-NL/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/fy-NL/Thunderbird%20152.0.1.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "8910bb1babb540754a0063d489506920d50f3c0140ed99f150de14f901f48ffd"; + sha256 = "992036c121dc6f641f05a849f6638f337ebdb319b8a4c13f92ae56efc2462f7f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ga-IE/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ga-IE/Thunderbird%20152.0.1.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "27de5939d215d797c53933bc939e5cc1c98a0f9e873f10812188866f68d4d425"; + sha256 = "686e62df158651404ec2d17ed20913acf3ca2eaa23cf23f0d1dd4118f7a47358"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/gd/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/gd/Thunderbird%20152.0.1.dmg"; locale = "gd"; arch = "mac"; - sha256 = "9956a11d4e3829739899306bffb33420699f17009724e916005d5fa6a68866a4"; + sha256 = "bc4d5c71286f446362517234bc3b68c707d03848db5b4c631f8106c5a60578ef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/gl/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/gl/Thunderbird%20152.0.1.dmg"; locale = "gl"; arch = "mac"; - sha256 = "8bdd35f461c16cc7de405075d866a88726f3fc81f5da20335e1dd5303336dc2c"; + sha256 = "1a5e70641572149cdc602bcb734518e05d31052460870401d90e0ede5d779683"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/he/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/he/Thunderbird%20152.0.1.dmg"; locale = "he"; arch = "mac"; - sha256 = "6062a35a0cc4622b8089b659163e8684f0451c60df23004314c85702de58d59c"; + sha256 = "5bac4ed802ca670726f02a1227440633d6d7710e87c6d314283c1a5aab4230a4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/hr/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/hr/Thunderbird%20152.0.1.dmg"; locale = "hr"; arch = "mac"; - sha256 = "a0ad06209c8aeb25084c3c305fcb57ec46480bfc79245ecd9d564748eb5ba7e9"; + sha256 = "b1aa9eeaf1e44f63f6cb52fe9fdd7516b62fa08cb0e061b00d37b333d576c9f0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/hsb/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/hsb/Thunderbird%20152.0.1.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "b779bde5ae2a437926fc65d0986962cb09a7e1a601c2e57a8c45e37d9c356ea7"; + sha256 = "6971c8781561378794d9b97769baf5ed4351fb6e34f4446665bcdb1b16526783"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/hu/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/hu/Thunderbird%20152.0.1.dmg"; locale = "hu"; arch = "mac"; - sha256 = "7c2930f61c61764fc0c301835fa92d2c9cd1e54af8a4a302aa90ff54c60e972b"; + sha256 = "dcad9ed1f99cfe06f2b6af081c13383e68a2f9ea703e2632f5f7f08e1cd2b63d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/hy-AM/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/hy-AM/Thunderbird%20152.0.1.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "fd5d1f569f3e3f1ff7488914a4ec09fc2e8ff24c50877dde07affd5e157d5056"; + sha256 = "cfbc7a9989daa7c5690531280f86404571795c9a8de798c3cf468b569fb12f43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/id/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/id/Thunderbird%20152.0.1.dmg"; locale = "id"; arch = "mac"; - sha256 = "da07e98bcfc4d83ff84fd9f183274335277bce3a6c596c9daeab4ed0b49080bf"; + sha256 = "b5cab6d618e161ca3b56a869628aec16997c24961f149f4f1e8476fcf1ff73ab"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/is/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/is/Thunderbird%20152.0.1.dmg"; locale = "is"; arch = "mac"; - sha256 = "bbb5f0a9a048a52480d0adaf8b0f8f45e211ba75769105703e00480bc25a638a"; + sha256 = "c388e46c1127894a7811be9396b00b16d995e8ade53cf6ac09e0fdb1a041ee54"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/it/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/it/Thunderbird%20152.0.1.dmg"; locale = "it"; arch = "mac"; - sha256 = "4329b3581d9b864c8c816ad06fe638ef8b4fc45ce821bda4a7b43d64bdcb3df0"; + sha256 = "35eed5be6ea98a55b30a02c4ff197acf1e357e0aee73f99e30196c06d455c0f0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ja-JP-mac/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ja-JP-mac/Thunderbird%20152.0.1.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "f19e34c6039cc7f3a5253fcc0089f310c3c48a463f23a531b969f67714d83a4c"; + sha256 = "b8c5522eddf6c92f127b0b261922841b6298f8fa3a10daddb81928035da4b949"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ka/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ka/Thunderbird%20152.0.1.dmg"; locale = "ka"; arch = "mac"; - sha256 = "485cdf35f3bfe95e6b80baebdd2598ab63d9decc880f15501cb98f55b25c6c4d"; + sha256 = "d69fc15f1380a7d49019ede8cf63b81298c06505889cd2030b42c942b3e77b9a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/kab/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/kab/Thunderbird%20152.0.1.dmg"; locale = "kab"; arch = "mac"; - sha256 = "df95e4171763f4b890a7443f95aab083072efb49e52e3d051eb471e2e2207888"; + sha256 = "b3dad85c2214c6c994bf20e0a150a4ed59f5b2a64e80fa82e07d109dfc4a26e4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/kk/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/kk/Thunderbird%20152.0.1.dmg"; locale = "kk"; arch = "mac"; - sha256 = "7c3fc4d39684042df9d241f956805e34f186a181a32668d5efad92971afa05c7"; + sha256 = "0eb5767276165f67dad1d786ed794b21b45f82c9a7e7dd13efc53069191a7db5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ko/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ko/Thunderbird%20152.0.1.dmg"; locale = "ko"; arch = "mac"; - sha256 = "c5bca5895d640d25e73da62a7a468e02268b21857fa11ee2cd402d59415d3ebf"; + sha256 = "1d3d93ea1e5c07f94170f8a8661667f2e450b628e5d165d73c5e7b98f12ae3f9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/lt/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/lt/Thunderbird%20152.0.1.dmg"; locale = "lt"; arch = "mac"; - sha256 = "a25351002c66cb7142cbeae96c260f6d17a17688b96381cddbcda83dd06d6430"; + sha256 = "edeff3cc61e1060826333cd9f71ebe5b7ccd5943a88123b72071f2b05902eebd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/lv/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/lv/Thunderbird%20152.0.1.dmg"; locale = "lv"; arch = "mac"; - sha256 = "c8946461927698b201f1b6634449d605f9fc0a0c97ecd6f5d9755e851646588b"; + sha256 = "f4c6c62114b803cc1c50776a66e06ab4cc64158f2e397e5b693e9631c3e587b8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ms/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ms/Thunderbird%20152.0.1.dmg"; locale = "ms"; arch = "mac"; - sha256 = "08915120d6d8059902ce855a81e5451f711102cc661bc597b577671b4719f9a6"; + sha256 = "29a87af2113ac76c51f87eb982dc377295be836aaf944cb382cce5002882180a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/nb-NO/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/nb-NO/Thunderbird%20152.0.1.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "0b041ccb9abc711163afbcc91eb9141ca4e43c9cb06fa5fcf93999756225ce60"; + sha256 = "55523504611afba716e782aae7f1f2f9c57a296f082ea6f923aca5df6cde05bc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/nl/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/nl/Thunderbird%20152.0.1.dmg"; locale = "nl"; arch = "mac"; - sha256 = "d87d0f61369b2ea2446a3b69d5669aa08293af0c12ffc5590f09bf3355ab758c"; + sha256 = "ac8885100e33ba4dd53d3513338885e651d5399abcb1b88fe30cd6be284d4832"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/nn-NO/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/nn-NO/Thunderbird%20152.0.1.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "0940a74690d137f79d10ee453bbd7c9ad9256907973648716aeee8b8fe1c78f3"; + sha256 = "bba879fa2a64572e97ac2c890f2c57414653b105ef2a5ce14a588bdab17b0aba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/pa-IN/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/pa-IN/Thunderbird%20152.0.1.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "e1c039ddb1b3fe4900870e20ef2c4365baaed4e1b20cceaa4f25a797ae92baf5"; + sha256 = "2193c9f55b83a3bcd803a8e34654b19902065b78633e456eb639d9344d8c2ec1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/pl/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/pl/Thunderbird%20152.0.1.dmg"; locale = "pl"; arch = "mac"; - sha256 = "36852dc2d620540d01c1cf6c96fd66762ab91e870de177574198a91016d70f03"; + sha256 = "014d20781639014d304866c9772903dc4bb4c552d320a120c0b31143381499ee"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/pt-BR/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/pt-BR/Thunderbird%20152.0.1.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "3e98f199614ecfa5db34a73b7b260204d2993dd04766ba549f52cb57f0d9b60a"; + sha256 = "fd3400134bd5420db23cac7095d6855ce2a8ffed9f8d8ac00891cf708971551c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/pt-PT/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/pt-PT/Thunderbird%20152.0.1.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "03bfe51078e85ea7ddf8141ad440ac0607527e0c72dc5fb7b55cc3b38fc34845"; + sha256 = "ff56e84058d5d42a44e7f6a59571888b539aad30c79c0703915ea8b1130a05f5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/rm/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/rm/Thunderbird%20152.0.1.dmg"; locale = "rm"; arch = "mac"; - sha256 = "a8296f4d529c3a157b1d554947b10954b5cee8c4c8dc3d36204193b5006a7566"; + sha256 = "9b02c2033256331363af9ca3288d9ccc47cf98010e21d91766df1721f4ee088d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ro/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ro/Thunderbird%20152.0.1.dmg"; locale = "ro"; arch = "mac"; - sha256 = "e64d2a690faf363a5352c43b8915882f3a2849816bff974f6f6eecf718115e7b"; + sha256 = "477c5714f088703526f4f32388067e5c57dfac1d7425739b86b169d0a7d93234"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/ru/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ru/Thunderbird%20152.0.1.dmg"; locale = "ru"; arch = "mac"; - sha256 = "ca9322f34d787e16ac0034cb3605ac7171b83437ab6112afea81843dc1e214cb"; + sha256 = "cdeb26cc7d4370ecd93df3cf429f92468617ed1436dd8439c9c40b8446bad48a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/sk/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sk/Thunderbird%20152.0.1.dmg"; locale = "sk"; arch = "mac"; - sha256 = "03d1243d9174888e1d9f8b1fff3efc6b562deca46b6dd208ad9abe23c89ecc88"; + sha256 = "a79436bbe2e69c096800e84f20887fb44d08ae044f86a7e1c380a92ce3f34527"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/sl/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sl/Thunderbird%20152.0.1.dmg"; locale = "sl"; arch = "mac"; - sha256 = "fba4e523bdb7a26b69a9e7e4d44b19ae62dcdd152c39af4ba3f7eb0c20ef6e4a"; + sha256 = "4860141caee86a667319cae4a45f4d5a55c16ae74d930c654b0d40a95537914e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/sq/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sq/Thunderbird%20152.0.1.dmg"; locale = "sq"; arch = "mac"; - sha256 = "d047dbc42d59b591d43761dd4708d222ab07a435fae0f7815dd38ee1ffecf601"; + sha256 = "e6c2b2678c7c4a07c2bd3a84767d5c8e253a044fe23060ee7e36b035da39a777"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/sr/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sr/Thunderbird%20152.0.1.dmg"; locale = "sr"; arch = "mac"; - sha256 = "45706ded2bcc0b8d054005c5b43d6bf10aa19d18e2cb3c9bc50faf9c72980eab"; + sha256 = "237758f368539a799974b6fab81a1a221c77971ecd6d2fbff53d7905865468dc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/sv-SE/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sv-SE/Thunderbird%20152.0.1.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "e812b9810758f71fd900c94e60e8c7cc70ab5cd76dd85e94235cf3a4bb3ffdaa"; + sha256 = "f41bf3544886a60269598db51c775595472cd44b2a88d5592e87d84f8ccf71d9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/th/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/th/Thunderbird%20152.0.1.dmg"; locale = "th"; arch = "mac"; - sha256 = "e4183ae2afeacabdfac026fa7de2923c865e727f74050756180f477fcde5c731"; + sha256 = "bd61e2a35e48003ef1d95bfde78fabe274f49ab80ac200109b8f7acc48e9cf35"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/tr/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/tr/Thunderbird%20152.0.1.dmg"; locale = "tr"; arch = "mac"; - sha256 = "697cdaa32e7bb505697bdab764afbc3b49d0fe3de8872d187f11917f5e8c0b84"; + sha256 = "83803875437161d44ca569c1b29156452cf6a9afae0e962bfe13c9b9077a627b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/uk/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/uk/Thunderbird%20152.0.1.dmg"; locale = "uk"; arch = "mac"; - sha256 = "dc2a08b2689e268a75126ec6ab8929cfbf24803688d75288bbd6207120288004"; + sha256 = "2532b1b8fceeab71b57477a6f5e3c016f47d3eae73637b6cdb3fdb6dd589260f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/uz/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/uz/Thunderbird%20152.0.1.dmg"; locale = "uz"; arch = "mac"; - sha256 = "ebca03486a96dcacce7cb62f4da62059d07d2af6595781c07b3143ffeb024860"; + sha256 = "1e93deb4ebfb9a6c9df082765955bc02bafce5ad92376f9a7aecf5a2d8bcf84c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/vi/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/vi/Thunderbird%20152.0.1.dmg"; locale = "vi"; arch = "mac"; - sha256 = "7e7c21d5fbf5df383afe102f07734ebbf1a7438963dcb088b709d1ce5e36bb07"; + sha256 = "c9975acbdb805e2b992b98025724f07601d070848af6a019a9f1eeba00fbd479"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/zh-CN/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/zh-CN/Thunderbird%20152.0.1.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "1b7ecf996b6de037528644a2ba986742dbf5bb7288561be4819b74a41b24ada2"; + sha256 = "c9d95293b8d6d16d5175b9881a3e7423d8086eddd2f2feb47613c3cc14fae078"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0/mac/zh-TW/Thunderbird%20152.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/zh-TW/Thunderbird%20152.0.1.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "9ecc937cd9d179de3b45276f6a57bce9fcccf17c2aa45fb4db422c50fa3ccc59"; + sha256 = "44b69c1314cccfaad0031a85484daa9b1f53ac187c54fc3988d17affbeff0477"; } ]; } diff --git a/pkgs/applications/office/softmaker/softmaker-office-nx.nix b/pkgs/applications/office/softmaker/softmaker-office-nx.nix index e6e4e1c33937..2cf897f78b5c 100644 --- a/pkgs/applications/office/softmaker/softmaker-office-nx.nix +++ b/pkgs/applications/office/softmaker/softmaker-office-nx.nix @@ -6,9 +6,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. officeVersion ? { - version = "1230"; + version = "1234"; edition = ""; - hash = "sha256-/4qKFnLoou1ZuGkRt+2Yf/FPGOnYhx7fnE+8D3gutaY="; + hash = "sha256-00bscKt+4aE94x6wKGqXh6tE2GiDll6F4gWZZBEl2JE="; }, ... diff --git a/pkgs/applications/office/softmaker/softmaker-office.nix b/pkgs/applications/office/softmaker/softmaker-office.nix index e92103a3bd1a..db73e9d94c69 100644 --- a/pkgs/applications/office/softmaker/softmaker-office.nix +++ b/pkgs/applications/office/softmaker/softmaker-office.nix @@ -7,9 +7,9 @@ # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. officeVersion ? { - version = "1230"; + version = "1234"; edition = "2024"; - hash = "sha256-xaXS22feHbRVPWP43vGbfptoT2S6jLUrGVFQ3xY7SJY="; + hash = "sha256-oIO/p52ASIU0qjQqxp/l9GVrUK+LQNQxX1wKheKHT3w="; }, ... diff --git a/pkgs/by-name/ac/acli/sources.json b/pkgs/by-name/ac/acli/sources.json index bd8c679ff957..e35f6351094d 100644 --- a/pkgs/by-name/ac/acli/sources.json +++ b/pkgs/by-name/ac/acli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.3.21-stable", + "version": "1.3.22-stable", "sources": { "aarch64-darwin": { - "url": "https://acli.atlassian.com/darwin/1.3.21-stable/acli_1.3.21-stable_darwin_arm64.tar.gz", - "sha256": "39687d1c18054736f7264d76d33ceb89e8ebf480fbbba9541d9fefdda94ded66" + "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_arm64.tar.gz", + "sha256": "3a9a6ff1bb0bce5902780e26e748b18b9adb4489df67d88ea878f4b7673944ad" }, "aarch64-linux": { - "url": "https://acli.atlassian.com/linux/1.3.21-stable/acli_1.3.21-stable_linux_arm64.tar.gz", - "sha256": "b6104cd1737613fe4b24c20619965bb59b7b9bc09e39fb95f41a671b2b320ab8" + "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_arm64.tar.gz", + "sha256": "1a9e86d0b46a62a8f1992c1ef98b3af7e9a9ee3f76d0efa215fe1f2d1b2fd139" }, "x86_64-darwin": { - "url": "https://acli.atlassian.com/darwin/1.3.21-stable/acli_1.3.21-stable_darwin_amd64.tar.gz", - "sha256": "75f08d45886f770117405bb5b053bfa4c8e98045afe3dfa965905fabd8825f5c" + "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_amd64.tar.gz", + "sha256": "993fd692700d602fd1e3cff7f1d29f70e44a2ebb8056fbb93bdc8aed1e5cbbd4" }, "x86_64-linux": { - "url": "https://acli.atlassian.com/linux/1.3.21-stable/acli_1.3.21-stable_linux_amd64.tar.gz", - "sha256": "f158f6e8f6ae7e279d1ced8ce85a93647aa70c42c29f0d5ad303ebd3c727f956" + "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_amd64.tar.gz", + "sha256": "de9e0a60a556e4119428b9072f6ca787e75b9f9a538aa71ebcc8084deb8ca1a6" } } } diff --git a/pkgs/by-name/be/bencher-cli/package.nix b/pkgs/by-name/be/bencher-cli/package.nix new file mode 100644 index 000000000000..4145952c6736 --- /dev/null +++ b/pkgs/by-name/be/bencher-cli/package.nix @@ -0,0 +1,80 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + mold, + nix-update-script, + versionCheckHook, + rustc, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "bencher-cli"; + version = "0.6.8"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "bencherdev"; + repo = "bencher"; + rev = "v${finalAttrs.version}"; + hash = "sha256-MlRj56QXRrvfBxi6+B6vpEKlDWMFB+V1CzQYOiGFpHE="; + }; + + cargoHash = "sha256-biCHEePgVxrnGUj94bwWrp9GVhspiMjcMRdp3A7O2h0="; + + nativeBuildInputs = [ mold ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + cargoBuildFlags = [ "--package=bencher_cli" ]; + cargoTestFlags = [ "--package=bencher_cli" ]; + # Build the open-source version + buildNoDefaultFeatures = true; + checkNoDefaultFeatures = finalAttrs.buildNoDefaultFeatures; + + postPatch = lib.optionalString finalAttrs.buildNoDefaultFeatures '' + # Replaces the proprietary Rust files with empty files + # This is just a safeguard, the build shouldn't touch these files anyways + echo "find . -path '*/plus/*' -type f ! -name Cargo.toml -exec truncate -s 0 {} +" + find . -path '*/plus/*' -type f ! -name Cargo.toml -exec truncate -s 0 {} + + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command-Line interface for the Bencher continuous benchmarking platform"; + mainProgram = "bencher"; + longDescription = '' + Bencher is a suite of continuous benchmarking tools. + Bencher allows you to detect and prevent performance regressions + *before* they hit production. + + - Run: Run your benchmarks locally or in CI using your favorite + benchmarking tools. The bencher CLI simply wraps your existing + benchmark harness and stores its results. + - Track: Track the results of your benchmarks over time. Monitor, query, + and graph the results using the Bencher web console based on the source + branch, testbed, benchmark, and measure. + - Catch: Catch performance regressions in CI. Bencher uses state of the + art, customizable analytics to detect performance regressions before + they make it to production. + + Bencher's source repo includes non-free features, included in the build + as the Cargo feature "plus". + Files in the plus directories are proprietary, while the other files + are dual Apache-2.0/MIT licensed. + The Nix derivation does not compile the proprietary features. + ''; + homepage = "https://bencher.dev"; + license = + if finalAttrs.buildNoDefaultFeatures then + lib.licenses.OR [ + lib.licenses.asl20 + lib.licenses.mit + ] + else + lib.licenses.unfree; + platforms = rustc.meta.platforms; + maintainers = [ lib.maintainers.skyesoss ]; + }; +}) diff --git a/pkgs/by-name/bl/blas/package.nix b/pkgs/by-name/bl/blas/package.nix index 51deec6c5c64..c0023957bcea 100644 --- a/pkgs/by-name/bl/blas/package.nix +++ b/pkgs/by-name/bl/blas/package.nix @@ -3,7 +3,7 @@ stdenv, lapack-reference, openblas, - openmpCheckPhaseHook, + checkPhaseThreadLimitHook, isILP64 ? false, blasProvider ? openblas, }: @@ -188,7 +188,7 @@ stdenv.mkDerivation { ]; propagatedNativeBuildInputs = [ - openmpCheckPhaseHook + checkPhaseThreadLimitHook ]; meta = (blasProvider'.meta or { }) // { diff --git a/pkgs/by-name/bl/blink-qt/fix-none-account.patch b/pkgs/by-name/bl/blink-qt/fix-none-account.patch new file mode 100644 index 000000000000..d766d24ea265 --- /dev/null +++ b/pkgs/by-name/bl/blink-qt/fix-none-account.patch @@ -0,0 +1,25 @@ +From 6e438d1ab9f9da5e55b0cc96ea81fbac1f1a871b Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sun, 5 Jul 2026 19:40:36 +0530 +Subject: [PATCH] fix: handle None default_account on startup + +--- + blink/mainwindow.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blink/mainwindow.py b/blink/mainwindow.py +index d0baa21..77c67e8 100644 +--- a/blink/mainwindow.py ++++ b/blink/mainwindow.py +@@ -1109,7 +1109,7 @@ class MainWindow(base_class, ui_class): + + def _NH_SIPAccountManagerDidStart(self, notification): + account = notification.sender.default_account +- if account is not BonjourAccount() and account.sms.enable_pgp and account.sms.private_key is not None and os.path.exists(account.sms.private_key.normalized): ++ if account is not None and account is not BonjourAccount() and account.sms.enable_pgp and account.sms.private_key is not None and os.path.exists(account.sms.private_key.normalized): + self.export_pgp_key_action.setEnabled(True) + + def _NH_SIPAccountManagerDidRemoveAccount(self, notification): +-- +2.54.0 + diff --git a/pkgs/by-name/bl/blink-qt/package.nix b/pkgs/by-name/bl/blink-qt/package.nix index 45da889affe8..395bffbe4d39 100644 --- a/pkgs/by-name/bl/blink-qt/package.nix +++ b/pkgs/by-name/bl/blink-qt/package.nix @@ -5,26 +5,24 @@ python3Packages, qt6Packages, libvncserver, + stdenv, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "blink-qt"; - version = "6.0.4"; + version = "6.0.6"; pyproject = true; src = fetchFromGitHub { owner = "AGProjects"; repo = "blink-qt"; tag = finalAttrs.version; - hash = "sha256-QESg9yo5oddYqSKuFLSMI2Oju3FCq97+j0uJDK85Yy8="; + hash = "sha256-0hsuAYYp7KvfxErAcN4EX8G3goirGRmpijJfAMvbZJQ="; }; patches = [ - # Remove when version > 6.0.4 - (fetchpatch2 { - url = "https://github.com/AGProjects/blink-qt/commit/45343c90ae0680a3d03589fa8a12ac1eb85a6925.patch"; - hash = "sha256-XwV5L3r0IqWkhlaJypS2cHkDCcoumOgEEqDpdcaTviE="; - }) + # Remove once https://github.com/AGProjects/blink-qt/pull/7 is mereged and tagged + ./fix-none-account.patch ]; nativeBuildInputs = [ qt6Packages.wrapQtAppsHook ]; @@ -40,26 +38,31 @@ python3Packages.buildPythonApplication (finalAttrs: { qt6Packages.qtsvg ]; - dependencies = with python3Packages; [ - dateutils - dnspython - google-api-python-client - lxml - lxml-html-clean - msrplib - oauth2client - otr - pgpy - pyqt6 - pyqt6-webengine - python3-application - python3-eventlib - python3-gnutls - python3-sipsimple - sqlobject - standard-imghdr - xcaplib - ]; + dependencies = + with python3Packages; + [ + dateutils + dnspython + google-auth-oauthlib + google-api-python-client + lxml + lxml-html-clean + msrplib + otr + pgpy + pyqt6 + pyqt6-webengine + python3-application + python3-eventlib + python3-gnutls + python3-sipsimple + sqlobject + standard-imghdr + xcaplib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + numpy + ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/bl/blis/package.nix b/pkgs/by-name/bl/blis/package.nix index 0002f7c3c3ee..b8bb979f41c3 100644 --- a/pkgs/by-name/bl/blis/package.nix +++ b/pkgs/by-name/bl/blis/package.nix @@ -5,6 +5,12 @@ perl, python3, + # sets BLIS_NUM_THREADS and OMP_NUM_THREADS for packages + # invoking blis during checkPhase/installCheckPhase to + # avoid overloading builders with excessive parallelism + # See also: https://github.com/flame/blis/blob/b8b75b4e19459f5d618b57aa814ca38b1d82eb82/docs/Multithreading.md#specifying-multithreading + checkPhaseThreadLimitHook, + # Enable BLAS interface with 64-bit integer width. blas64 ? false, @@ -36,6 +42,10 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/ch/charm-freeze/package.nix b/pkgs/by-name/ch/charm-freeze/package.nix index 5ce7e0d1a319..e9ff10c34681 100644 --- a/pkgs/by-name/ch/charm-freeze/package.nix +++ b/pkgs/by-name/ch/charm-freeze/package.nix @@ -23,6 +23,8 @@ buildGoModule (finalAttrs: { "-X=main.Version=${finalAttrs.version}" ]; + excludedPackages = [ "test/input" ]; + meta = { description = "Tool to generate images of code and terminal output"; mainProgram = "freeze"; diff --git a/pkgs/by-name/ch/checkPhaseThreadLimitHook/hook.sh b/pkgs/by-name/ch/checkPhaseThreadLimitHook/hook.sh new file mode 100644 index 000000000000..1b610b631d84 --- /dev/null +++ b/pkgs/by-name/ch/checkPhaseThreadLimitHook/hook.sh @@ -0,0 +1,32 @@ +setupThreadLimit() { + # Limit number of threads used during checks. Default is "all cores". + # Using all cores causes high load on builders if checks are executed with NIX_BUILD_CORE parallelism. + # This gets even worse if multiple builds are scheduled on the same machine, potentially growing O(n^3) without explicit core limits. + + # global value to override all of these at once + NIX_CHECK_PHASE_DEFAULT_NUM_THREADS="${NIX_CHECK_PHASE_DEFAULT_NUM_THREADS:-1}" + + thread_vars=( + OMP_NUM_THREADS + OPENBLAS_NUM_THREADS + MKL_NUM_THREADS + BLIS_NUM_THREADS + VECLIB_MAXIMUM_THREADS + NUMBA_NUM_THREADS + NUMEXPR_NUM_THREADS + ) + + echo "setting known thread variables to default: $NIX_CHECK_PHASE_DEFAULT_NUM_THREADS" + for var in "${thread_vars[@]}"; do + export "$var=${!var:-$NIX_CHECK_PHASE_DEFAULT_NUM_THREADS}" + printf " %s=%s" "$var" "${!var}" + done + printf "\n" +} + + +if [[ -z "${dontLimitCheckPhaseThreads-}" ]]; then + echo "Using checkPhaseThreadLimitHook" + preCheckHooks+=('setupThreadLimit') + preInstallCheckHooks+=('setupThreadLimit') +fi diff --git a/pkgs/by-name/ch/checkPhaseThreadLimitHook/package.nix b/pkgs/by-name/ch/checkPhaseThreadLimitHook/package.nix new file mode 100644 index 000000000000..6bd9bda7135a --- /dev/null +++ b/pkgs/by-name/ch/checkPhaseThreadLimitHook/package.nix @@ -0,0 +1,15 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "check-phase-thread-limit-hook"; + + __structuredAttrs = true; + + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ grimmauld ]; + }; +} ./hook.sh diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 3bf2a2fbc3e2..097703ec410f 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-A8Qk9u3Q83Q4AjzTrdptfS9UNoyKq39YihC4d/dNBYc="; + hash = "sha256-tygAgaafoU0CnTzKPb00uVaYTieCJ4uNjux3AYyYtXQ="; }; cargoPatches = [ diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index 87e9e75cb8cb..e75829d8b511 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 6a27f2f4a9dc..3ed2a20f6e01 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-bg"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-bczUWa91l52P6Q46/lkX1j9eKasM154D82fBaLFHF1M="; + hash = "sha256-r/7eyaUwxXNbfzO+7TCa25JaOefGF/hY+PBHFJtpoiw="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg" ''; - cargoHash = "sha256-UDhXKg4lO6op/lfi3aZ4iclzUqcf5xQI85UWAHVTWig="; + cargoHash = "sha256-jU6KesqaHnfVZfCtDKrG/pVaJzh3Q5Q6UDMlOoFiLeY="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 69552fdea6ad..c88707d6fa92 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-fUuw7qwfojAmu/mkWMkWBhpcSgZNTIzdXmInjyKrZBI="; + hash = "sha256-yhgjdkAzUipGAo7Jv9hWlhOb/dLXn1/68yX+tRO6UV4="; }; - cargoHash = "sha256-ki+unf58rXBCpj5PCpBcg/6FWo16+MdPQWae+w1YkJ8="; + cargoHash = "sha256-Yi1nVvWmFzlXxHN01BeeGc9YRqrRoVXTqehisOrGWS0="; separateDebugInfo = true; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index c6148a0cf930..00bb463d9482 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-5DsnhaiJgmTakn+q9o2Q7IeuakAC/j0Ck3F3pfFx/EA="; + hash = "sha256-w6Os3R//40ED9q6wyiABmIgofdj+WaLZPD/4+1EF7aY="; }; - cargoHash = "sha256-2E+98uWtahyQufoZTzdUtkwbuISsUHwlqOmMSpyi1O8="; + cargoHash = "sha256-/OnmUO7WFXvZPq+0nPe2BKbYZRR0Ku+V8+qeLWnYHPQ="; separateDebugInfo = true; diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index cc0d584fd744..3c70453dd93a 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-cRwZrmm/zOIV6VCyz2dTH+qn8h6LOnaOiHU5nENTK6o="; + hash = "sha256-ZjV5HkVzDHH96OcaHSKKrTJdOSp3NqWHbLgtq/GOQ+M="; }; - cargoHash = "sha256-+21DCCTkNrbdxgxQi0YyuAxpl1IvwUz3ccUE+E0sZ4Y="; + cargoHash = "sha256-HWkuWaF2UP5brDW39nq1pn9Zp1XgEUToumuD4MmHhU8="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index c9f04a86339b..3c1d9e0a23a8 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -19,14 +19,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-oxXCAvBISkZu76VpvQ9AliFRJ8r5Ay7mjWf4sEwV0Xs="; + hash = "sha256-JaPF2kFXQLumPBn8JFBiaSJ/tP3QqK/hwhy5rZrLuY4="; }; cargoHash = "sha256-mfY2hsMxBooRjmTB2jgUIKyKHBpGfZ9Qslwv+2aEQyg="; diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 6e680b83e8fa..a74c3a0b2a4c 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,7 +9,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index 05c0e99f8ff1..c5e6d69ed44d 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index cf7d5a6b55f1..be74335fc68e 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -14,7 +14,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-initial-setup"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index 2f790b30098d..55866cd7ef5e 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-9U64nSeI47bkc8BQU9ilXBlHQRGS2zC/FcBKc7Z17RY="; + hash = "sha256-Dy1sOEe/Cb1wyXHETZ5wJt8IcJMGw19OeDGOhuv4kQg="; }; cargoHash = "sha256-WnZAPQR8hGGNC5S7hPmcGSMs9HrOw4/wqJR151eIgHY="; diff --git a/pkgs/by-name/co/cosmic-monitor/package.nix b/pkgs/by-name/co/cosmic-monitor/package.nix index 9b1bdd228583..f192a0a0264d 100644 --- a/pkgs/by-name/co/cosmic-monitor/package.nix +++ b/pkgs/by-name/co/cosmic-monitor/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-monitor"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-monitor"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-CiJ9LeNcdOyC8yn0c7hCz0QEecxYK95KGvs1SWr9360="; + hash = "sha256-6Iz2CMcw131GrgSsSk2FgnwAnges1yMeEwblrusCc24="; }; - cargoHash = "sha256-OMhLPQ3GkV/wdeb9F7lsKY1Uzzg8+UlhOeakGZo6mYk="; + cargoHash = "sha256-INILXUO4637bcq51OV+ENJG306kXOrKN8547/RRSG0k="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 401eb262ebe7..224f663015f6 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index c3bdf6376f10..e5de7a3ec2dc 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 08fbe6eaf82d..566ad2f386f0 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index b12ec673f447..ec98e81d1ec3 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-aHQbwpNr8tsfUR0Dm4WTzz6XNXjgdqZ9/2AQRPPbnog="; + hash = "sha256-4oIfTsEGMVmgS0VWLnQ1xAcPAzBeYaGT8xU3b/ObeO8="; }; - cargoHash = "sha256-KVaKTMrWijResBqzH62j/YqBR4TQ77x2sK/kN40UWjw="; + cargoHash = "sha256-aY5QYZ1OjiCHgfFysTTU6Wp/1IexAWjuZCkTFuFY1PI="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index f632be043c9b..84d0cf9deac1 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-randr"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index a335b3e56fed..d9d1e9486e6b 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index cf4406a3cb21..a0c7d87b9622 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-FphY53MaOUUR2oQfZak3HbT+kvysUnw2AIc4L9O+TcU="; + hash = "sha256-nKrdjvD1dcFvwhCiruM/bxrh8CYOWnoVgJj/2nkfEFg="; }; cargoHash = "sha256-5dLG40X+yxJo566guyHqOCLNp+uNSE+HONS8GIDm58A="; diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 84aaa17fdf48..a3bb39a29310 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -17,14 +17,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings-daemon"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-6MLZpGGvE1EnUlRv2T6+iXy8B0aqBTNNrqDtBbeABYs="; + hash = "sha256-cCxcIRrLvCxWDujXuREukkxZ0qPl3SH4n1VWAR1c/QY="; }; postPatch = '' diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 5320de71ee47..bfdc70e203c6 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,14 +27,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-LfhFza0G85+fIuACMdwV50Okh5/46z8tLoJ9IvLqTgw="; + hash = "sha256-zs8QJc8bLbLLj1lqLsxdgkVOLIHqk+fOEyNEEmViv0g="; }; cargoPatches = [ diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index d29231e0e70d..fb6d99cae1fa 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-pePtfOgeQtaD15dfWzrMQmXcINf/V5ovKWAG8kOPf+c="; + hash = "sha256-DqkYwbEph6GJM9Gok/XaiIFyWnv0+W+geviyzrXmQ8I="; }; - cargoHash = "sha256-jECZ/6hxaDfz2pOOqLkbq5HfF3YnCVK2geFAC+n286A="; + cargoHash = "sha256-IuMCYUZWtzvGyLMNb+Kwoj6M9fKaEYFMfcfYYVggVYw="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index b99fcc991196..2c8e7a00fecd 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-ocOPssCxm2p2HoAIHIAoAMh66cGcGXuGWDuAEtHFoPQ="; + hash = "sha256-0LGbe9oOwkNKU3XboEeZfi3isRbX95rIu+/VWWf6N68="; }; - cargoHash = "sha256-ezFCpU4ZNfANYRVTMrvPMC79j55XGUwYMMKeihekYds="; + cargoHash = "sha256-JJQ+CLSaqdqTWcbb/Oj6a1vjIHXIYQsmMn+PtmHt0Gc="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index a0ddd6e66db8..7f77639d26fc 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 92fa4090d020..7214a5b407f8 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index 206dc5016818..822539b23b6d 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -17,16 +17,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dashy-ui"; - version = "4.0.7"; + version = "4.4.2"; src = fetchFromGitHub { owner = "lissy93"; repo = "dashy"; tag = finalAttrs.version; - hash = "sha256-PWuynBFOp4A/0AC5Lc5zAkb5Y5DWJgdZHtDc/douYQc="; + hash = "sha256-4AJx/BoRVYA8dU6HrIvGYWflvppxNsi2PWSpnJLWR0w="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-jU/XnX6i6P1CWWWyUeVXt2q2PXMExDvmPTiLBOEuHcE="; + hash = "sha256-oxVxzdap3dWi1ORP+eviFabO+G8GcFd0ZM3/a20Qbog="; }; passthru = { diff --git a/pkgs/by-name/do/docker-sbx/package.nix b/pkgs/by-name/do/docker-sbx/package.nix new file mode 100644 index 000000000000..74cecebba681 --- /dev/null +++ b/pkgs/by-name/do/docker-sbx/package.nix @@ -0,0 +1,128 @@ +{ + lib, + fetchurl, + stdenvNoCC, + installShellFiles, + autoPatchelfHook, + makeWrapper, + gccForLibs, + e2fsprogs, + lz4, + xxhash, + zlib, + zstd, + versionCheckHook, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "docker-sbx"; + version = "0.34.0"; + src = + if stdenvNoCC.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-linux-amd64.tar.gz"; + hash = "sha256-5H9LOyKi0/SBVJ0ld6OkcP1h9r9eHrAb4fsVVVdMusg="; + } + else if stdenvNoCC.hostPlatform.system == "aarch64-linux" then + fetchurl { + url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-linux-arm64.tar.gz"; + hash = "sha256-dZ/ttnmaf62rA5Cs8YSmZGHVQoy9PQh3Ok/AnIjCqZ4="; + } + else if stdenvNoCC.hostPlatform.system == "aarch64-darwin" then + fetchurl { + url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-darwin.tar.gz"; + hash = "sha256-aBh6NbtQ5o2zxuR+d1U1gZpm2bch/J3Y8GZ73DeUBUk="; + } + else + throw "Unsupported host platform ${stdenvNoCC.hostPlatform.system}"; + + strictDeps = true; + __structuredAttrs = true; + + sourceRoot = if stdenvNoCC.hostPlatform.isDarwin then "." else null; + + nativeBuildInputs = [ + installShellFiles + versionCheckHook + ] + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ + autoPatchelfHook + makeWrapper + e2fsprogs + ]; + + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + lz4 + zlib + zstd + xxhash + gccForLibs + ]; + + dontBuild = true; + doInstallCheck = true; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ "HOME" ]; + preVersionCheck = '' + export HOME=$TMPDIR + ''; + + installPhase = + if stdenvNoCC.hostPlatform.isLinux then + '' + runHook preInstall + + PREFIX=$out bash ./install.sh + + wrapProgram $out/bin/sbx \ + --prefix PATH : ${lib.makeBinPath [ e2fsprogs ]} + + ${lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + export HOME=$TMPDIR + $out/bin/sbx completion bash > sbx.bash + $out/bin/sbx completion fish > sbx.fish + $out/bin/sbx completion zsh > sbx.zsh + installShellCompletion sbx.{bash,fish,zsh} + ''} + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir -pv $out + cp -rv bin libexec $out + + installShellCompletion \ + --bash --name sbx.bash completions/bash/sbx \ + --zsh --name _sbx completions/zsh/_sbx \ + --fish --name sbx.fish completions/fish/sbx.fish + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Safe environments for agents"; + longDescription = '' + Docker Sandboxes provides sandboxes with controlled access to your + filesystem, network, and tools. This means your agents can work + autonomously without putting your machine or data at risk. + ''; + homepage = "https://docs.docker.com/reference/cli/sbx/"; + changelog = "https://github.com/docker/sbx-releases/releases/tag/v${finalAttrs.version}"; + mainProgram = "sbx"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; + license = lib.licenses.unfree; + maintainers = [ + lib.maintainers.skyesoss + lib.maintainers.erics118 + ]; + }; +}) diff --git a/pkgs/by-name/ed/edhm-ui/package.nix b/pkgs/by-name/ed/edhm-ui/package.nix index b5bd92b4f4e3..c3e9f4aebc30 100644 --- a/pkgs/by-name/ed/edhm-ui/package.nix +++ b/pkgs/by-name/ed/edhm-ui/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "edhm-ui"; - version = "3.0.67"; + version = "3.0.69"; strictDeps = true; src = fetchzip { url = "https://github.com/BlueMystical/EDHM_UI/releases/download/v${finalAttrs.version}/edhm-ui-v3-linux-x64.zip"; - hash = "sha256-JhWHub1YmdSJXZcyOK97/5TnBsKVN0dg7nwqg0EP7H8="; + hash = "sha256-t/K8VohJjjP/VgreHZWYtlsMXp1gp9Gme/joHywfeH4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index f794cf8ffc35..ccd14b90f46f 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -55,14 +55,14 @@ let in buildGoModule (finalAttrs: { pname = "forgejo-runner"; - version = "12.12.0"; + version = "12.13.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${finalAttrs.version}"; - hash = "sha256-6czLxFgjcrBepoFN4iYDUt8uBkhfC8qx4yqmcfQ8FAg="; + hash = "sha256-wrHZ4vgWNw0tbcNpZesU5SoV2gqle1MJcPjj6lNMwOw="; }; vendorHash = "sha256-du7fXehcxZ70Lsr5VCkz646G0Us/XwM4Sl98HXimoao="; diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index ad10007e9e99..29c9b2a22a96 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "15.0.3"; - hash = "sha256-tGZ83TEG6iyZd5mfSuSvVkmUJINWLN661YpOk1+dgbM="; + version = "15.0.4"; + hash = "sha256-8AMq5CT4q7aaF5gj9d5+JINp5rrI5U98juI9BA0wVVo="; npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg="; - vendorHash = "sha256-z3YTjt+SM9yPCsJdfSQbTpy3vRiXaFV2QMz1y6J6k/Q="; + vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig="; lts = true; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index f3caad2e61d6..748f8544ca91 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -46,6 +46,7 @@ cumulusSupport ? false, irdpSupport ? true, mgmtdSupport ? true, + scriptingSupport ? true, # Experimental as of 10.1, reconsider if upstream changes defaults grpcSupport ? false, @@ -120,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: { python3 readline rtrlib - lua53Packages.lua sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -135,11 +135,17 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals grpcSupport [ grpc protobuf + ] + ++ lib.optionals scriptingSupport [ + lua53Packages.lua ]; # otherwise in cross-compilation: "configure: error: no working python version found" depsBuildBuild = [ buildPackages.python3 + ] + ++ lib.optionals scriptingSupport [ + buildPackages.lua53Packages.lua ]; # cross-compiling: clippy is compiled with the build host toolchain, split it out to ease @@ -157,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: { "--enable-logfile-mask=0640" "--enable-multipath=${toString numMultipath}" "--enable-config-rollbacks" - "--enable-scripting" "--enable-user=frr" "--enable-vty-group=frrvty" "--localstatedir=/var" @@ -171,6 +176,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.strings.enableFeature irdpSupport "irdp") (lib.strings.enableFeature mgmtdSupport "mgmtd") (lib.strings.enableFeature grpcSupport "grpc") + (lib.strings.enableFeature scriptingSupport "scripting") # routing protocols (lib.strings.enableFeature bgpdSupport "bgpd") diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index a9e195ff1848..36e78cd0f4c6 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -179,11 +179,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "150.0.7871.100"; + version = "150.0.7871.114"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-SbV/ACzm31CA1fglQtxc8RdBuTeal/HXXXtUFa0IYHk="; + hash = "sha256-DxnmjcpXSEljLiUinxWFPSvqwz+gZJj+7UPzRii8LVM="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -289,11 +289,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "150.0.7871.101"; + version = "150.0.7871.115"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/fwvlzsetnpzv5sb7rdxd5a6nke_150.0.7871.101/GoogleChrome-150.0.7871.101.dmg"; - hash = "sha256-cumG2dMFXZuYCWWdIn6iJT0Bd24hauVMfXZzbDFVvuU="; + url = "http://dl.google.com/release2/chrome/acd57hhfrcygivr2dnxpq2q56zka_150.0.7871.115/GoogleChrome-150.0.7871.115.dmg"; + hash = "sha256-AB16I7Tl/E4F4ydXHSLeyoKAWNwP7JSL0wLyrUvn3FE="; }; dontPatch = true; diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index f1f4fa6d7ed6..30119aa33239 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.161.1"; + version = "0.163.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-TmsXtsH3NgxrAvYzyMKGK+DZRAPjvo/Uy3zXw0lWss8="; + hash = "sha256-o8MoGrdOXBN/HkcuRsHyyyFLvPvNo3PI0oWBlO6Xfpw="; }; - vendorHash = "sha256-pgyJMdiifwqft29wG36TAYY1LlW4P21LIWKfepeDmYg="; + vendorHash = "sha256-Bn+RA+EHd3gAKL4N/ibydX7yWNKOSYnIl2pfecfOu1k="; checkFlags = let diff --git a/pkgs/by-name/kb/kbd-ergol/package.nix b/pkgs/by-name/kb/kbd-ergol/package.nix new file mode 100644 index 000000000000..7099e223b0bf --- /dev/null +++ b/pkgs/by-name/kb/kbd-ergol/package.nix @@ -0,0 +1,36 @@ +{ + stdenv, + fetchFromCodeberg, + lib, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "kbd-ergol"; + version = "0-unstable-2026-07-07"; + + src = fetchFromCodeberg { + owner = "Alerymin"; + repo = "kbd-ergol"; + rev = "0af6404625fe4da03bc27e1141dc255ac49fa94e"; + hash = "sha256-875ss78HdU03EgoSpQqLWG279Zg3tIoc6ZTP/hnedcg="; + }; + + strictDeps = true; + __structuredAttrs = true; + + # console.nix expects keymaps to be under /share/keymaps + postPatch = '' + substituteInPlace Makefile \ + --replace "/usr/share/kbd/" "$out/share/" + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Ergo-L layout in keymap format for linux console"; + homepage = "https://codeberg.org/Alerymin/kbd-ergol"; + maintainers = with lib.maintainers; [ xaltsc ]; + platforms = lib.platforms.linux; + license = lib.licenses.wtfpl; + }; +} diff --git a/pkgs/by-name/le/lektor/package.nix b/pkgs/by-name/le/lektor/package.nix index bf2d4b7c17ea..943e3cbc1bfc 100644 --- a/pkgs/by-name/le/lektor/package.nix +++ b/pkgs/by-name/le/lektor/package.nix @@ -13,14 +13,7 @@ let python = python3.override { self = python; packageOverrides = self: super: { - mistune = super.mistune.overridePythonAttrs (old: rec { - version = "2.0.5"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; - }; - }); + mistune = self.mistune_2; }; }; in diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index 202438779974..977b507059fa 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lockbook-desktop"; - version = "26.6.22"; + version = "26.7.4"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-OgNscshw445uf2PtiYVlyCfx/l2BNZyZK5QwQSunCQ0="; + hash = "sha256-gwpobBTugTTTtd/mWVoyiU0E/NjWCTfMnMF0reWLKrA="; }; - cargoHash = "sha256-USdDHcWexjAllH/kOZVc4XMehESoIozkvvOw47ZeBD8="; + cargoHash = "sha256-EH3uIjz2M+Ytkx/gD0gwslUrDVPvm5+hwOGoDtAdblg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch index 0b31bb032b51..d413cf2f7849 100644 --- a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch +++ b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch @@ -11,7 +11,7 @@ index 93cb8ab263..3d12cd5e54 100644 ); }; diff --git a/channels/src/components/header_footer_route/header.scss b/channels/src/components/header_footer_route/header.scss -index c2e6fbd187..828955cc79 100644 +index c2e6fbd187..bc1cedcff1 100644 --- a/channels/src/components/header_footer_route/header.scss +++ b/channels/src/components/header_footer_route/header.scss @@ -47,20 +47,7 @@ @@ -36,6 +36,19 @@ index c2e6fbd187..828955cc79 100644 } } } +@@ -83,12 +70,6 @@ + margin-top: 12px; + } + } +- +- &.has-free-banner.has-custom-site-name { +- .header-back-button { +- bottom: -20px; +- } +- } + } + + @media screen and (max-width: 699px) { diff --git a/channels/src/components/widgets/menu/menu_items/menu_item.scss b/channels/src/components/widgets/menu/menu_items/menu_item.scss index dee9b57f8c..8ef4aa073a 100644 --- a/channels/src/components/widgets/menu/menu_items/menu_item.scss @@ -57,7 +70,7 @@ index dee9b57f8c..8ef4aa073a 100644 button { padding: 3px 0; diff --git a/channels/webpack.config.js b/channels/webpack.config.js -index 852046de70..cf28fdcbd6 100644 +index 852046de70..a310da48f4 100644 --- a/channels/webpack.config.js +++ b/channels/webpack.config.js @@ -470,6 +470,9 @@ if (targetIsDevServer) { diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch index 574d7f012fbf..1ae8c819b72a 100644 --- a/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch +++ b/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch @@ -1,8 +1,19 @@ diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go -index 4c88c1f049..fb7d84ef05 100644 +index 45448e4b2b..6125c02baf 100644 --- a/server/channels/app/limits.go +++ b/server/channels/app/limits.go -@@ -18,23 +18,8 @@ func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) { +@@ -10,8 +10,8 @@ import ( + ) + + const ( +- maxUsersLimit = 200 +- maxUsersHardLimit = 250 ++ maxUsersLimit = 10000000 ++ maxUsersHardLimit = 10000000 + ) + + // GetServerLimits returns the server's seat/post-history limits. The license-derived +@@ -25,23 +25,8 @@ func (a *App) GetServerLimits(includeUserCounts bool) (*model.ServerLimits, *mod limits := &model.ServerLimits{} license := a.License() @@ -28,11 +39,11 @@ index 4c88c1f049..fb7d84ef05 100644 // Check if license has post history limits and get the calculated timestamp if license != nil && license.Limits != nil && license.Limits.PostHistory > 0 { -@@ -99,14 +84,5 @@ func (a *App) GetPostHistoryLimit() int64 { +@@ -112,14 +97,5 @@ func (a *App) GetPostHistoryLimit() int64 { } func (a *App) isAtUserLimit() (bool, *model.AppError) { -- userLimits, appErr := a.GetServerLimits() +- userLimits, appErr := a.GetServerLimits(true) - if appErr != nil { - return false, appErr - } diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 077e35239ed7..80bb78aae6aa 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -27,10 +27,10 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(11\\.7\\.[0-9]+)$"; - version = "11.7.4"; - srcHash = "sha256-kO4ntGffvMis7JFZLMpnPdjotPiZ/kJcxeKoMjXAZ3U="; + version = "11.7.6"; + srcHash = "sha256-oMjfSX45+sEQwNpNVDTOlCBUK7OSBCCKpaUMMrRzdQM="; vendorHash = "sha256-XaXqQN20c3DhW2/L0zhTA8dLeRp4MyBxUKpiMVwp/7s="; - npmDepsHash = "sha256-lqgYZAGCjChGwBKACKKiMRzI2WP0ByanMMIVxo/h8t8="; + npmDepsHash = "sha256-F7o+AVM1WiuHKDQaqHbxDjWT1vAiddh4/D8EktxncAs="; }, ... }: diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index e98f1f7032b5..81bb48d30b17 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -15,10 +15,10 @@ mattermost.override ( # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(11\\.[0-9]+\\.[0-9]+)$"; - version = "11.8.2"; - srcHash = "sha256-XZ4yr7nbGum6UQaBjze50L8Yc/MLjo4NQBh263CNRtI="; + version = "11.8.3"; + srcHash = "sha256-OWHW6UifUljL+yyWtc5XD/spbn7Yu1FqZ8gQAs073gY="; vendorHash = "sha256-F2QMrLbio7812ZTGQZZPTqHWtIXbwbDmjUhtvv0DJ9s="; - npmDepsHash = "sha256-WIPLpi6lQvq9wieqvOACiRh7v1znxzcf+jyKXSjWzNc="; + npmDepsHash = "sha256-C8L5g+HY5aArLJzPbw3fESvA+U4JK1OQFWA4wwaan1M="; autoUpdate = ./package.nix; }; } diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index ed313b3bc7ca..4f0dd9397d0d 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -10,7 +10,7 @@ pkg-config, python3, jonquil, - openmpCheckPhaseHook, + checkPhaseThreadLimitHook, }: assert ( @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { gfortran pkg-config python3 - openmpCheckPhaseHook + checkPhaseThreadLimitHook ] ++ lib.optionals (buildType == "meson") [ meson diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix index 34ab0e9b72ab..583cce0b15a5 100644 --- a/pkgs/by-name/md/mdns-scanner/package.nix +++ b/pkgs/by-name/md/mdns-scanner/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdns-scanner"; - version = "0.27.3"; + version = "0.27.4"; __structuredAttrs = true; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "CramBL"; repo = "mdns-scanner"; tag = "v${finalAttrs.version}"; - hash = "sha256-daJEiYOF1N2m4zVbsBuRl8KGrDs62GGDP9lCok9r/3w="; + hash = "sha256-oEXqaatURQxLnWY1086Gf6AJDpc6q+4Yreffsw2egEI="; }; - cargoHash = "sha256-eCB5nVEucMFX/wz9zrAKO9d3yI7BK/URpjlU39Y4g4I="; + cargoHash = "sha256-lRxGqNIctckQZioP2jjMEjSyLUlI0wN9nIv0ym3YCrI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mk/mkl/package.nix b/pkgs/by-name/mk/mkl/package.nix index f9e1dda4e7ab..31b724759e8a 100644 --- a/pkgs/by-name/mk/mkl/package.nix +++ b/pkgs/by-name/mk/mkl/package.nix @@ -8,6 +8,11 @@ _7zz, cctools, validatePkgConfig, + # sets MKL_NUM_THREADS for packages + # invoking mkl during checkPhase/installCheckPhase to + # avoid overloading builders with excessive parallelism + # See also: https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2023-0/mkl-domain-num-threads.html + checkPhaseThreadLimitHook, enableStatic ? stdenv.hostPlatform.isStatic, }: @@ -86,6 +91,10 @@ stdenvNoCC.mkDerivation ( [ rpmextract ] ); + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + buildPhase = if stdenvNoCC.hostPlatform.isDarwin then '' diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix index c380087e77bf..88a8bc90abd2 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix @@ -1,7 +1,7 @@ { makeSetupHook, stdenv, - openmpCheckPhaseHook, + checkPhaseThreadLimitHook, }: makeSetupHook { @@ -13,6 +13,6 @@ makeSetupHook { }; propagatedNativeBuildInputs = [ - openmpCheckPhaseHook + checkPhaseThreadLimitHook ]; } ./mpi-check-hook.sh diff --git a/pkgs/by-name/nv/nvibrant/hatch_build.patch b/pkgs/by-name/nv/nvibrant/hatch_build.patch new file mode 100644 index 000000000000..ccbc86f72e58 --- /dev/null +++ b/pkgs/by-name/nv/nvibrant/hatch_build.patch @@ -0,0 +1,84 @@ +diff --git a/hatch_build.py b/hatch_build.py +index da19ad8..f33e582 100644 +--- a/hatch_build.py ++++ b/hatch_build.py +@@ -1,7 +1,6 @@ + import hashlib + import os + import subprocess +-import sys + from pathlib import Path + from tempfile import TemporaryDirectory + +@@ -57,46 +56,33 @@ class BuildHook(BuildHookInterface): + + build_data["pure_python"] = False + +- # Ensure submodule on git main +- subprocess.check_call( +- ("git", "submodule", "update", "--init", "--remote"), +- cwd=Dirs.repository, +- ) +- + # Configure the project + subprocess.check_call(( +- sys.executable, "-m", "mesonbuild.mesonmain", +- "setup", Dirs.build, ++ "meson", "setup", Dirs.build, + "--buildtype", "release", + "--reconfigure", "--wipe", + ), cwd=Dirs.repository) + +- # Intended operation +- subprocess.check_call( +- ("git", "config", "advice.detachedHead", "false"), +- cwd=Dirs.opengpu, +- ) +- + # Keep track of breaking changes + hashes: dict[str, str] = dict() + + # Make binaries for all known driver version +- for driver in sorted(subprocess.check_output( +- args=("git", "tag"), ++ for driver in subprocess.check_output( ++ args=("cat", "./SOURCE_TAGS"), + cwd=Dirs.opengpu +- ).decode().strip().splitlines()): ++ ).decode().strip().splitlines(): + + # Checkout driver version +- subprocess.check_call( +- ("git", "checkout", "-f", driver), +- cwd=Dirs.opengpu, +- ) ++ if driver != os.environ["OLDEST_DRIVER_VERSION"]: ++ subprocess.check_call( ++ ("git", "apply", f"./PATCHES/{driver}.patch"), ++ cwd=Dirs.opengpu, ++ ) + + # Compile an executable +- subprocess.check_call(( +- sys.executable, "-m", "ninja", +- "-C", Dirs.build, +- )) ++ subprocess.check_call( ++ ("ninja", "-C", Dirs.build) ++ ) + + # Find and vendor the binary for this version + binary = Dirs.build.joinpath("nvibrant") +@@ -109,12 +95,6 @@ class BuildHook(BuildHookInterface): + build_data["force_include"][str(target)] = f"nvibrant/resources/{target.name}" + hashes.setdefault(hashlib.md5(target.read_bytes()).hexdigest(), driver) + +- # Revert back main branch +- subprocess.check_call( +- ("git", "checkout", "-f", "main"), +- cwd=Dirs.opengpu +- ) +- + print("\nBreaking changes across driver versions:") + + for hashsum, driver in hashes.items(): diff --git a/pkgs/by-name/nv/nvibrant/package.nix b/pkgs/by-name/nv/nvibrant/package.nix index afabbff94736..d2ebbb444698 100644 --- a/pkgs/by-name/nv/nvibrant/package.nix +++ b/pkgs/by-name/nv/nvibrant/package.nix @@ -1,38 +1,152 @@ { lib, - stdenv, fetchFromGitHub, - meson, - ninja, - pkg-config, + python3Packages, + writeShellScript, + common-updater-scripts, + coreutils, + gitMinimal, }: -stdenv.mkDerivation (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "nvibrant"; - version = "1.1.0"; + version = finalAttrs.passthru._version; + pyproject = true; - src = fetchFromGitHub { - owner = "Tremeschin"; - repo = "nvibrant"; - rev = "v${finalAttrs.version}"; - hash = "sha256-RZIi1V3hcwZdaI84Nd0YSQOjDng9/ZDg7aqfTL7GJIU="; - fetchSubmodules = true; + passthru = { + nvibrantVersion = "1.2.1"; + + oldestDriverVersion = "515.43.04"; + latestDriverVersion = "610.43.02"; + + _version = lib.concatStringsSep "-" [ + finalAttrs.passthru.nvibrantVersion + "unstable" + finalAttrs.passthru.latestDriverVersion + ]; + + srcAttrs = { + nvibrant = fetchFromGitHub { + owner = "tremeschin"; + repo = "nvibrant"; + name = "nvibrant"; + tag = "v${finalAttrs.passthru.nvibrantVersion}"; + hash = "sha256-M83WSQiJwzFZl8ECkZjKigvLTlMkzRa6o2hqPOt1378="; + }; + open-gpu = fetchFromGitHub { + owner = "nvidia"; + repo = "open-gpu-kernel-modules"; + name = "open-gpu"; + tag = finalAttrs.passthru.oldestDriverVersion; + hash = "sha256-MfLR5sYSjBrENWkCChcS9rk1zSlRFfTRpof/4lQ3qow="; + + # since .git isn't deterministic, we can't use it to checkout tags in + # the build phase, so instead we generate patches for each version + # upgrade before .git is removed and apply them incrementally + fetchTags = true; + postCheckout = '' + cd $out + + while IFS= read -r tag; do + echo "adding $tag" + echo "$tag" >> SOURCE_TAGS + + if [[ "$tag" == ${finalAttrs.passthru.latestDriverVersion} ]]; then + echo 'reached end of known tags' + break + fi + done < <(git tag --sort v:refname) + + mkdir PATCHES + + prev_tag=${finalAttrs.passthru.oldestDriverVersion} + while IFS= read -r tag; do + if [ "$prev_tag" == "$tag" ]; then continue; fi + + echo "generating patch: $prev_tag -> $tag" + git diff --minimal --binary "$prev_tag" "$tag" \ + > "PATCHES/$tag.patch" + + prev_tag=$tag + done < SOURCE_TAGS + unset prev_tag + + rm -rf .git + ''; + }; + }; + + updateScript = writeShellScript "update-nvibrant" '' + set -euo pipefail + + export PATH="${ + lib.makeBinPath [ + common-updater-scripts + coreutils + gitMinimal + ] + }:$PATH" + + list_tags() { + git ls-remote --tags --sort v:refname --refs "$1" | + cut --delimiter=/ --field=3- + } + + readarray -t nvibrant_tags < <(list_tags \ + 'https://github.com/tremeschin/nvibrant.git') + + readarray -t open_gpu_tags < <(list_tags \ + 'https://github.com/nvidia/open-gpu-kernel-modules.git') + + update-source-version nvibrant "''${nvibrant_tags[-1]:1}" \ + --version-key=nvibrantVersion --source-key=srcAttrs.nvibrant \ + --ignore-same-hash --ignore-same-version + + update-source-version nvibrant "''${open_gpu_tags[0]}" \ + --version-key=oldestDriverVersion --source-key=srcAttrs.open-gpu \ + --ignore-same-hash --ignore-same-version + + update-source-version nvibrant "''${open_gpu_tags[-1]}" \ + --version-key=latestDriverVersion --source-key=srcAttrs.open-gpu \ + --ignore-same-hash --ignore-same-version + ''; }; - nativeBuildInputs = [ + srcs = lib.attrValues finalAttrs.passthru.srcAttrs; + sourceRoot = "."; + + postUnpack = '' + mv open-gpu nvibrant/ + cd nvibrant + ''; + + # replaces code that depends on .git and uses of python -m {ninja,meson} + patches = [ ./hatch_build.patch ]; + + configurePhase = '' + export OLDEST_DRIVER_VERSION=${finalAttrs.passthru.oldestDriverVersion} + ''; + + nativeBuildInputs = [ gitMinimal ]; + + build-system = with python3Packages; [ + hatchling meson ninja - pkg-config ]; - mesonBuildType = "release"; + dependencies = with python3Packages; [ + packaging + ]; - meta = with lib; { + meta = { description = "Configure NVIDIA's Digital Vibrance on Wayland"; homepage = "https://github.com/Tremeschin/nvibrant"; - license = licenses.gpl3Only; - maintainers = [ maintainers.mikaeladev ]; - platforms = [ "x86_64-linux" ]; mainProgram = "nvibrant"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + mikaeladev + ]; }; }) diff --git a/pkgs/by-name/op/openmpCheckPhaseHook/omp-check-hook.sh b/pkgs/by-name/op/openmpCheckPhaseHook/omp-check-hook.sh deleted file mode 100644 index b3279b170360..000000000000 --- a/pkgs/by-name/op/openmpCheckPhaseHook/omp-check-hook.sh +++ /dev/null @@ -1,11 +0,0 @@ -preCheckHooks+=('setupOmpCheck') -preInstallCheckHooks+=('setupOmpCheck') - - -setupOmpCheck() { - # Limit number of OpenMP threads. Default is "all cores". - # Using all cores causes high load on builders if checks are executed with NIX_BUILD_CORE parallelism. - # This gets even worse if multiple builds are scheduled on the same machine, potentially growing O(n^3) without explicit core limits. - export OMP_NUM_THREADS="${OMP_NUM_THREADS:-1}" -} - diff --git a/pkgs/by-name/op/openmpCheckPhaseHook/package.nix b/pkgs/by-name/op/openmpCheckPhaseHook/package.nix deleted file mode 100644 index 9e30609e8de5..000000000000 --- a/pkgs/by-name/op/openmpCheckPhaseHook/package.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - lib, - makeSetupHook, -}: - -makeSetupHook { - name = "omp-checkPhase-hook"; - - __structuredAttrs = true; - - meta.license = lib.licenses.mit; -} ./omp-check-hook.sh diff --git a/pkgs/by-name/pi/pipeweaver/package.nix b/pkgs/by-name/pi/pipeweaver/package.nix new file mode 100644 index 000000000000..ac386a89f88c --- /dev/null +++ b/pkgs/by-name/pi/pipeweaver/package.nix @@ -0,0 +1,126 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + rustPlatform, + pkg-config, + pipewire, + nix-update-script, + stdenv, +}: + +rustPlatform.buildRustPackage ( + finalAttrs: + let + web = buildNpmPackage { + pname = "${finalAttrs.pname}-web"; + inherit (finalAttrs) version src; + + sourceRoot = "${finalAttrs.src.name}/web"; + + npmDepsHash = "sha256-ZX/3H/VdRdWC2j+mPA/0rZflDhslqTN1mqA9vvQRQG0="; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + }; + in + { + pname = "pipeweaver"; + version = "0.1.6"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "pipeweaver"; + repo = "pipeweaver"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wf3gxCLT5vOz+5+CpfmkX0stKoAOpQ6KIoW6xBNV1xk="; + }; + + cargoHash = "sha256-Jv0fF6keg2NcUnCJhCId7rwPVZK1/Q9+otQNjp54RCI="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + pipewire + ]; + + cargoBuildFlags = [ + "--workspace" + "--exclude" + "pipeweaver-app" + "--all-features" + ]; + + cargoTestFlags = [ + "--workspace" + "--exclude" + "pipeweaver-app" + "--all-features" + ]; + + postPatch = '' + # Prevent daemon/build.rs from running to prevent impure git and npm calls. + rm daemon/build.rs + substituteInPlace daemon/Cargo.toml --replace-fail 'build = "build.rs"' "" + + mkdir -p daemon/web-content + cp -r ${web}/* daemon/web-content/ + ''; + + # Provide GIT_HASH that build.rs would have set + env.GIT_HASH = finalAttrs.src.tag; + + installPhase = '' + runHook preInstall + + releaseDir=target/${stdenv.hostPlatform.rust.cargoShortTarget}/release + + install -Dm755 $releaseDir/pipeweaver-daemon -t $out/bin + install -Dm755 $releaseDir/pipeweaver-client -t $out/bin + + install -Dm644 daemon/resources/icons/pipeweaver.png \ + $out/share/icons/hicolor/48x48/apps/pipeweaver.png + install -Dm644 daemon/resources/icons/pipeweaver.svg \ + $out/share/icons/hicolor/scalable/apps/pipeweaver.svg + install -Dm644 daemon/resources/icons/pipeweaver-large.png \ + $out/share/pixmaps/pipeweaver.png + install -Dm644 daemon/resources/desktop/pipeweaver.desktop \ + $out/share/applications/pipeweaver.desktop + + substituteInPlace $out/share/applications/pipeweaver.desktop \ + --replace-fail "Path=/usr/bin" "Path=$out/bin" \ + --replace-fail "Exec=/usr/bin/pipeweaver-daemon" "Exec=$out/bin/pipeweaver-daemon" + + install -Dm644 README.md $out/share/doc/pipeweaver/README.md + install -Dm644 LICENSE $out/share/licenses/pipeweaver/LICENSE + + runHook postInstall + ''; + + passthru = { + inherit web; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "web" + ]; + }; + }; + + meta = { + description = "Manage streaming audio on Linux through PipeWire with virtual channels, mixing, and routing"; + homepage = "https://github.com/pipeweaver/pipeweaver"; + license = lib.licenses.mit; + mainProgram = "pipeweaver-daemon"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ saadndm ]; + }; + } +) diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix index 23755586fe6c..f9e469ede120 100644 --- a/pkgs/by-name/pi/pixman/package.nix +++ b/pkgs/by-name/pi/pixman/package.nix @@ -6,7 +6,7 @@ ninja, pkg-config, libpng, - openmpCheckPhaseHook, + checkPhaseThreadLimitHook, glib, # just passthru # for passthru.tests @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - openmpCheckPhaseHook + checkPhaseThreadLimitHook __flattenIncludeHackHook ]; diff --git a/pkgs/by-name/pr/present/package.nix b/pkgs/by-name/pr/present/package.nix index b5157e44827a..8033e9f35024 100644 --- a/pkgs/by-name/pr/present/package.nix +++ b/pkgs/by-name/pr/present/package.nix @@ -8,14 +8,7 @@ let # https://github.com/NixOS/nixpkgs/issues/348788 pythonPackages = python3Packages.overrideScope ( self: super: { - mistune = super.mistune.overridePythonAttrs (oldAttrs: rec { - version = "2.0.5"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; - }; - }); + mistune = self.mistune_2; } ); in diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix index ce8001b66b60..8bcd90b05e6e 100644 --- a/pkgs/by-name/rc/rclone/package.nix +++ b/pkgs/by-name/rc/rclone/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { pname = "rclone"; - version = "1.74.3"; + version = "1.74.4"; outputs = [ "out" @@ -28,10 +28,10 @@ buildGoModule (finalAttrs: { owner = "rclone"; repo = "rclone"; tag = "v${finalAttrs.version}"; - hash = "sha256-GLl8juSCVKEjsVZAzvvfKx1TxC/rcM7lMBek9BLosi0="; + hash = "sha256-n+s9OiSwjiFwR1/DEd81YZIAyaMWMj0g8ORf6grnE3M="; }; - vendorHash = "sha256-FuSqI5fCmt/fr4AwJhdFaolYugZDTYeOcity/VZzYZ0="; + vendorHash = "sha256-PVTcYFRr4Zb4VVsY6dkO+emZ48Nyr9aUBJbehFlDh9c="; subPackages = [ "." ]; diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index bb5fb0572db2..31e2be061ec6 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -1,19 +1,19 @@ { buildTeleport, buildGo125Module, - wasm-bindgen-cli_0_2_99, + wasm-bindgen-cli_0_2_122, withRdpClient ? true, extPatches ? [ ], }: buildTeleport { - version = "18.9.1"; - hash = "sha256-FIPExc8tMoPXfWc7pQjwQRkxmiQEOxdkYgWS0GejQuk="; - vendorHash = "sha256-BlQhypAoK85ID0pgmXbUboks88qjSg3p5E8qxyTIc9M="; - pnpmHash = "sha256-ZGbuBMPwC3u/2qDTVLH2InOGVc94Vq0i3AKHMsOwq3k="; - cargoHash = "sha256-KbmacTEOElmboHMK6YxWGC0brlDsX7kcvpaOOZmuops="; + version = "18.9.2"; + hash = "sha256-w6qCH57L2rwClbSpZeG01eekzj3JRNijwSdfl+wx8v8="; + vendorHash = "sha256-LJmpFHvFsBsneq1Cl3vvqxBGB94gSjaikNDZtQfwNjM="; + pnpmHash = "sha256-8tKVv5SPJlS89EsHhF8qpThkh4n47qRBbHDCgX17Cdg="; + cargoHash = "sha256-+B5fGIzCpiYmqVcM4iy+PTIdtvuvtufQiXMHNzHTDlQ="; - wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; + wasm-bindgen-cli = wasm-bindgen-cli_0_2_122; buildGoModule = buildGo125Module; inherit withRdpClient extPatches; } diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 935818521103..b2b52eadbb27 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -31,6 +31,8 @@ systemd ? null, # optionally support DNS-over-HTTPS as a server withDoH ? false, + # optionally support DNS-over-QUIC as a server + withDoQ ? false, withECS ? false, withDNSCrypt ? false, withDNSTAP ? false, @@ -38,7 +40,7 @@ withRedis ? false, # Avoid .lib depending on lib.getLib openssl # The build gets a little hacky, so in some cases we disable this approach. - withSlimLib ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP, + withSlimLib ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP && !withDoQ, # enable support for python plugins in unbound: note this is distinct from pyunbound # see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html withPythonModule ? false, @@ -47,6 +49,7 @@ withLto ? !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isMinGW, withMakeWrapper ? !stdenv.hostPlatform.isMinGW, libnghttp2, + ngtcp2, # for passthru.updateScript nix-update-script, @@ -55,6 +58,9 @@ versionCheckHook, }: +assert lib.assertMsg ( + !withDoQ || lib.versionAtLeast openssl.version "3.5.0" +) "unbound: withDoQ requires OpenSSL with QUIC support (OpenSSL >= 3.5)"; stdenv.mkDerivation (finalAttrs: { pname = "unbound"; version = "1.25.1"; @@ -90,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withDoH [ libnghttp2 ] + ++ lib.optionals withDoQ [ ngtcp2 ] ++ lib.optionals withPythonModule [ python ]; enableParallelBuilding = true; @@ -120,6 +127,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withDoH [ "--with-libnghttp2=${libnghttp2.dev}" ] + ++ lib.optionals withDoQ [ + "--with-libngtcp2=${ngtcp2.dev}" + ] ++ lib.optionals withECS [ "--enable-subnet" ] diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 5174bf62351b..fc7e472cfe99 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -5,7 +5,6 @@ avahi, bison, cairo, - curl, dbus, faad2, fetchFromGitLab, @@ -26,6 +25,7 @@ libxinerama, libxpm, libarchive, + libaacs, libass, libbluray-full, libcaca, @@ -82,10 +82,8 @@ wayland-protocols, wayland-scanner, wrapGAppsHook3, - writeShellScript, libxcb-keysyms, zlib, - chromecastSupport ? true, jackSupport ? false, onlyLibVLC ? false, @@ -152,6 +150,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libsm libarchive + libaacs libass libbluray-full libcaca @@ -246,7 +245,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' echo "$version" > src/revision.txt substituteInPlace modules/text_renderer/freetype/platform_fonts.h \ - --replace \ + --replace-fail \ /usr/share/fonts/truetype/freefont \ ${freefont_ttf}/share/fonts/truetype '' @@ -255,7 +254,7 @@ stdenv.mkDerivation (finalAttrs: { # https://www.lua.org/wshop13/Jericke.pdf#page=39 + lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) '' substituteInPlace share/Makefile.am \ - --replace $'.luac \\\n' $'.lua \\\n' + --replace-fail $'.luac \\\n' $'.lua \\\n' ''; enableParallelBuilding = true; @@ -299,6 +298,7 @@ stdenv.mkDerivation (finalAttrs: { # depends on a qt5.qttranslations that doesn't build, even though it # should be the same as pkgsBuildBuild.qt5.qttranslations. postFixup = '' + patchelf --add-rpath ${libaacs}/lib "$out/lib/vlc/plugins/access/liblibbluray_plugin.so" patchelf --add-rpath ${libv4l}/lib "$out/lib/vlc/plugins/access/libv4l2_plugin.so" find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' ${ diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_122/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_122/package.nix new file mode 100644 index 000000000000..8de107307715 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_122/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.122"; + hash = "sha256-vO4RSxi/sMWxmsEs3GuljdMfIRSu75A+Q+c5wgYToRU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-Inup6vvJSG5ghNyeDPyZbfZo4d0LsMG2OJfStoaeDBs="; + }; +} diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 711d80f4136d..4b8486e564af 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -4,6 +4,7 @@ rustPlatform, fetchFromGitHub, glib, + just, libcosmicAppHook, pkg-config, util-linux, @@ -17,14 +18,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.1.0"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-yN7dUhB8eMW/CK9HTeuK/CAYFjvWvCLApQ7mb71VLps="; + hash = "sha256-/2pn+snrXnPTPbcwg+pg/zcn9WxE3/3xXpNFlN/RITM="; }; cargoHash = "sha256-wSwXzaU872KqcRgAIKRuQFvG9f/q4z0OysysLyYMwdg="; @@ -34,6 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; nativeBuildInputs = [ + just libcosmicAppHook rustPlatform.bindgenHook pkg-config @@ -53,11 +55,16 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/share/backgrounds' '${cosmic-wallpapers}/share/backgrounds' ''; - dontCargoInstall = true; + dontUseJustBuild = true; + dontUseJustCheck = true; - makeFlags = [ - "prefix=${placeholder "out"}" - "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru = { diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 10f9ce154cb4..0b971ea1d0ef 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -19,7 +19,7 @@ ompdSupport ? true, ompdGdbSupport ? ompdSupport, getVersionFile, - openmpCheckPhaseHook, + checkPhaseThreadLimitHook, }: assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!"; @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedNativeBuildInputs = [ - openmpCheckPhaseHook + checkPhaseThreadLimitHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 7e34c047f1a5..79677623f776 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -4,6 +4,11 @@ fetchFromGitHub, fetchpatch, cmake, + # sets OPENBLAS_NUM_THREADS and OMP_NUM_THREADS for packages + # invoking openblas during checkPhase/installCheckPhase to + # avoid overloading builders with excessive parallelism + # See also: https://github.com/OpenMathLib/OpenBLAS/blob/e7b45174355edec1f04de1cabcf5ca6a98ea7fbc/USAGE.md#how-can-i-use-openblas-in-multi-threaded-applications + checkPhaseThreadLimitHook, # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -232,6 +237,10 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + buildInputs = lib.optional (stdenv.cc.isClang && config.USE_OPENMP) openmp; depsBuildBuild = [ diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 2fbcfdb340c6..96d30a5223c3 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -5,7 +5,7 @@ }: let - version = "3.5.1"; + version = "3.5.3"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-GOlWCKDLwptsHV9SvOOlR4uScvcw8V/DjwXIpfWjSkM="; + hash = "sha256-UrRQqnWEE0y8I4DTDWn21yGScG42+XaFFl6UjcJXbtM="; }; doCheck = true; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 2474439fc910..b4b9c7bf2217 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -5,6 +5,14 @@ pythonAtLeast, stdenv, + # sets various thread limit env vars for packages + # invoking joblib during checkPhase/installCheckPhase to + # avoid overloading builders with excessive parallelism + # See also: + # https://github.com/joblib/joblib/blob/b030e4e1ed6a227c0e587c31b266c03b3b692372/joblib/_parallel_backends.py#L59-L67 + # https://github.com/joblib/joblib/blob/b030e4e1ed6a227c0e587c31b266c03b3b692372/joblib/_parallel_backends.py#L221-L248 + checkPhaseThreadLimitHook, + # build-system setuptools, @@ -40,6 +48,14 @@ buildPythonPackage rec { threadpoolctl ]; + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + + # joblib expects to set thread limits itself while checking for propagation of thread limit environment variables. + # Setting these via checkPhaseThreadLimitHook on joblib itself causes tests to fail, but we do want the hook to propagate. + dontLimitCheckPhaseThreads = true; + enabledTestPaths = [ "joblib/test" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/mistune/2.nix b/pkgs/development/python-modules/mistune/2.nix new file mode 100644 index 000000000000..ebf6469392cb --- /dev/null +++ b/pkgs/development/python-modules/mistune/2.nix @@ -0,0 +1,62 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "mistune"; + version = "2.0.5"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mistune" ]; + + meta = { + changelog = "https://github.com/lepture/mistune/blob/v${finalAttrs.version}/docs/changes.rst"; + description = "Sane Markdown parser with useful plugins and renderers"; + homepage = "https://github.com/lepture/mistune"; + knownVulnerabilities = [ + "GHSA-h7ww-273w-6cm8" + "CVE-2026-44896" + "CVE-2026-59926" + "CVE-2026-33441" + "CVE-2026-59924" + "CVE-2026-33079" + "CVE-2026-59923" + "GHSA-jhcm-5rpf-j3wv" + "CVE-2026-44708" + "CVE-2026-44897" + "CVE-2026-44898" + "CVE-2026-44899" + "GHSA-9jjx-3hq3-hx4j" + "GHSA-xrpv-r66x-8p7j" + "CVE-2026-59929" + "GHSA-xmwc-wjpr-q378" + "CVE-2026-59922" + "CVE-2026-59925" + "CVE-2026-59928" + "GHSA-96vr-jm8v-g22j" + "CVE-2026-59930" + "CVE-2026-59927" + "GHSA-3q64-rw38-243v" + "CVE-2026-49851" + "GHSA-x2gr-6qf2-fc9x" + "GHSA-f32h-38gf-rg5r" + "GHSA-jxhr-4j38-fpxg" + "GHSA-8ppg-4vv7-9p53" + ]; + license = lib.licenses.bsd3; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 506f0e10dfd6..014c8da0f02c 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -9,6 +9,12 @@ # nativeBuildInputs setuptools, + # sets NUMBA_NUM_THREADS and OMP_NUM_THREADS for packages + # invoking numba during checkPhase/installCheckPhase to + # avoid overloading builders with excessive parallelism + # See also: https://numba.readthedocs.io/en/stable/reference/envvars.html#threading-control + checkPhaseThreadLimitHook, + # dependencies llvmlite, numpy, @@ -114,6 +120,10 @@ buildPythonPackage (finalAttrs: { writableTmpDirAsHomeHook ]; + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' cd $out diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index f4b552c108ec..426b53e7814d 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -5,6 +5,11 @@ numpy, pytestCheckHook, setuptools, + # sets NUMEXPR_NUM_THREADS and OMP_NUM_THREADS for packages + # invoking numexpr during checkPhase/installCheckPhase to + # avoid overloading builders with excessive parallelism + # See also: https://numexpr.readthedocs.io/en/latest/user_guide.html#threadpool-configuration + checkPhaseThreadLimitHook, }: buildPythonPackage rec { @@ -31,6 +36,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + preCheck = '' pushd $out ''; diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index 7167ff94637e..c1c9cb2bed6e 100644 --- a/pkgs/development/python-modules/numpy/1.nix +++ b/pkgs/development/python-modules/numpy/1.nix @@ -18,7 +18,7 @@ blas, lapack, - openmpCheckPhaseHook, + checkPhaseThreadLimitHook, # Reverse dependency sage, @@ -112,7 +112,7 @@ buildPythonPackage (finalAttrs: { ]; propagatedNativeBuildInputs = [ - openmpCheckPhaseHook + checkPhaseThreadLimitHook ]; preCheck = '' diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 0cef4e21ccc0..5e0c15993a56 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -19,7 +19,7 @@ coreutils, lapack, - openmpCheckPhaseHook, + checkPhaseThreadLimitHook, # Reverse dependency sage, @@ -112,7 +112,7 @@ buildPythonPackage (finalAttrs: { ]; propagatedNativeBuildInputs = [ - openmpCheckPhaseHook + checkPhaseThreadLimitHook ]; preCheck = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cabc64941662..9554fbc038a0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1147,8 +1147,8 @@ mapAliases { libpthreadstubs = libpthread-stubs; # Added 2025-02-04 libpulseaudio-vanilla = throw "'libpulseaudio-vanilla' has been renamed to/replaced by 'libpulseaudio'"; # Converted to throw 2025-10-27 libqt5pas = throw "'libqt5pas' has been renamed to/replaced by 'libsForQt5.libqtpas'"; # Converted to throw 2025-10-27 - libqtdbusmock = warnAlias "'libqtdbusmock' has been renamed to 'libsForQt5.libqtdbusmock'"; # Added 2026-03-10 - libqtdbustest = warnAlias "'libqtdbustest' has been renamed to 'libsForQt5.libqtdbustest'"; # Added 2026-03-10 + libqtdbusmock = warnAlias "'libqtdbusmock' has been renamed to 'libsForQt5.libqtdbusmock'" libsForQt5.libqtdbusmock; # Added 2026-03-10 + libqtdbustest = warnAlias "'libqtdbustest' has been renamed to 'libsForQt5.libqtdbustest'" libsForQt5.libqtdbustest; # Added 2026-03-10 libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04 LibreArp = throw "'LibreArp' has been renamed to/replaced by 'librearp'"; # Converted to throw 2025-10-27 LibreArp-lv2 = throw "'LibreArp-lv2' has been renamed to/replaced by 'librearp-lv2'"; # Converted to throw 2025-10-27 @@ -1629,6 +1629,7 @@ mapAliases { openjfx23 = throw "OpenJFX 23 was removed as it has reached its end of life"; # Added 2025-11-04 openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04 openmodelica = throw "'openmodelica' has been removed as it was unmaintained in nixpkgs and depends on insecure&unmtaintained qtwebkit"; # Added 2026-04-26 + openmpCheckPhaseHook = warnAlias "'openmpCheckPhaseHook' has been renamed to 'checkPhaseThreadLimitHook' to reflect its handling of all known thread-limiting mechanisms during check phase" checkPhaseThreadLimitHook; # Added 2026-07-09 openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30 openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27 opensycl = throw "'opensycl' has been renamed to/replaced by 'adaptivecpp'"; # Converted to throw 2025-10-27 @@ -1819,7 +1820,7 @@ mapAliases { qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27 qMasterPassword = warnAlias "'qMasterPassword' has been renamed to/replaced by 'qmasterpassword'" qmasterpassword; # Added 2026-02-01 qMasterPassword-wayland = warnAlias "'qMasterPassword-wayland' has been renamed to/replaced by 'qmasterpassword-wayland'" qmasterpassword-wayland; # Added 2026-02-01 - qmenumodel = warnAlias "'qmenumodel' has been renamed to 'libsForQt5.qmenumodel'"; # Added 2026-03-26 + qmenumodel = warnAlias "'qmenumodel' has been renamed to 'libsForQt5.qmenumodel'" libsForQt5.qmenumodel; # Added 2026-03-26 qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26 qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19 qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60339a8e8f9f..b70b8212d637 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3244,6 +3244,7 @@ with pkgs; withDynlibModule = true; withPythonModule = true; withDoH = true; + withDoQ = true; withECS = true; withDNSCrypt = true; withDNSTAP = true; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 3318b17ba926..eeaea8a32f36 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -24,6 +24,7 @@ pkgs.releaseTools.sourceTarball { jq lib-tests brotli + zstd ]; configurePhase = '' @@ -63,6 +64,9 @@ pkgs.releaseTools.sourceTarball { # Some context: https://github.com/NixOS/infra/issues/438 distPhase = '' mkdir -p $out/tarballs + + # The compression tasks are shortlived; use all available CPUs (-T0) to + # prioritize fast channel advancement. XZ_OPT="-T0" tar \ --create \ --xz \ @@ -79,5 +83,22 @@ pkgs.releaseTools.sourceTarball { --mode=ug+w \ --hard-dereference \ $src $(pwd)/{.version-suffix,.git-revision} + + tar \ + --create \ + --use-compress-program="zstd -19 -T0" \ + --file=$out/tarballs/$releaseName.tar.zst \ + --absolute-names \ + --transform="s|^$src|$releaseName|g" \ + --transform="s|^$(pwd)|$releaseName|g" \ + --owner=0 \ + --group=0 \ + --numeric-owner \ + --format=gnu \ + --sort=name \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --mode=ug+w \ + --hard-dereference \ + $src $(pwd)/{.version-suffix,.git-revision} ''; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d57386b35945..f6dd83fc139b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10058,6 +10058,8 @@ self: super: with self; { mistune = callPackage ../development/python-modules/mistune { }; + mistune_2 = callPackage ../development/python-modules/mistune/2.nix { }; + mitmproxy = callPackage ../development/python-modules/mitmproxy { }; mitmproxy-linux = callPackage ../development/python-modules/mitmproxy-linux { };