diff --git a/ci/github-script/prepare.ts b/ci/github-script/prepare.ts index be08c09ee525..3425744d4853 100644 --- a/ci/github-script/prepare.ts +++ b/ci/github-script/prepare.ts @@ -57,11 +57,10 @@ export default async ({ if (baseClassification.type.includes('channel')) { const { stable, version } = baseClassification - const correctBranch = stable ? `release-${version}` : 'master' const body = [ 'The `nixos-*` and `nixpkgs-*` branches are pushed to by the channel release script and should not be merged into directly.', '', - `Please target \`${correctBranch}\` instead.`, + `Make sure you know the [right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions), then target the correct branch (probably \`release-${stable ? version : '*'}\` or \`master\`) instead.`, ].join('\n') await postReview({ github, context, core, dry, body, reviewKey }) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index fb1f5612ad25..d0885bc9046c 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -79,7 +79,7 @@ let # If you prefer a stable release instead, you can change the word unstable to the latest number shown here: https://nixos.org/download # i.e. nixos-24.11 # Use `nix flake update` to update the flake to the latest revision of the chosen release channel. - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"; }; outputs = inputs\@{ self, nixpkgs, ... }: { # NOTE: '${options.networking.hostName.default}' is the default hostname diff --git a/nixos/tests/repath-studio.nix b/nixos/tests/repath-studio.nix index 030b597a5f2e..3501b9d31243 100644 --- a/nixos/tests/repath-studio.nix +++ b/nixos/tests/repath-studio.nix @@ -43,7 +43,9 @@ # ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.) interactive.sshBackdoor.enable = true; - testScript = /* python */ '' + testScript = /* py */ '' + from datetime import timedelta + start_all() machine.wait_for_x() @@ -53,6 +55,11 @@ machine.screenshot("Repath-Studio-GUI-Welcome") machine.send_key("kp_enter") # OK + # Wait for the home screen and create a new document + machine.sleep(duration=timedelta(seconds=2)) + machine.execute("su - alice -c \"DISPLAY=:0 xdotool key ctrl+n\"") + machine.sleep(duration=timedelta(seconds=2)) + # move the mouse to the "Save" icon on the toolbar machine.execute("su - alice -c \"DISPLAY=:0 xdotool mousemove --sync 95 65\"") @@ -62,13 +69,13 @@ if status == 0: break machine.execute("su - alice -c \"DISPLAY=:0 xdotool click 1\"") - machine.sleep(1) + machine.sleep(duration=timedelta(seconds=1)) # wait for the GTK dialog to focus the text input field - machine.sleep(3) + machine.sleep(duration=timedelta(seconds=3)) machine.send_chars("saved.rps") # avoid using absolute path here, doesn't work for some reason # wait for text to be typed - machine.sleep(2) + machine.sleep(duration=timedelta(seconds=2)) machine.execute("su - alice -c \"DISPLAY=:0 xdotool key alt+s\"") # save file machine.wait_until_succeeds("ls /home/alice/saved.rps") diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3e133acf2620..2d7f34043d67 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 = "157.0.1"; + version = "158.0.1"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/af/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/af/thunderbird-158.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "db20299c3034fa29d3b2ada0ab35a10b90dcc079f8bfb47c4c911eeb4f0aacaf"; + sha256 = "90a2b84579562992186488525ae19d640c47d69d095edfaad3f75f007dc262ba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ar/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ar/thunderbird-158.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "cb677f1b9f7f3c7c703b929713baa67e80f458ef7822bc108f24ea86f4457b03"; + sha256 = "720802d10ef4b8888ee1aa70d5dcae178be142d7efb78a4e83a1b64e93aadabf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ast/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ast/thunderbird-158.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e5936015ad59033d06c2c3651bb4d4ddb2ef9a3707f1e9d2861b61101a78a9f8"; + sha256 = "210fdbeb20123775579515d39698a0a1ece1260e15ae3492771583f5b2e30ee1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/be/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/be/thunderbird-158.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "100ffef0fd7a45a1a37d40040d77120a0d960d30460a7fd15cdd7bc094690224"; + sha256 = "44c9005cb92d56b73c99839dff0c7ed7fec2dcfb5c40afc264414eea7980e6a4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/bg/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/bg/thunderbird-158.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "59e9f09e3361cb7f6e5a03051443687f3a9257a85dd321209c3cde68240cce91"; + sha256 = "7271bdd9e3a68dab45d77216561ad3b8042a2f31dd03514db56efeee94046d3b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/br/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/br/thunderbird-158.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2eed639e55c75af7c7c4f6847f0114f39f27fd83408675fc5652d7af771b73e4"; + sha256 = "abb1bb5983f2f1a47d8c52e8bd66d9362f2d36d48a81b48efd4e627ddf6a0e4c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ca/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ca/thunderbird-158.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "63ee174513243e04c80d468aede0cc9482bcc046d246d7648944e7696b0b4ba0"; + sha256 = "c3780ccaa5300e969d7cd6191007889ee6303f84428114d75191702ccf593be0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/cak/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/cak/thunderbird-158.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "828f13c03ed04fc019f79f4cfecaa81af1bfb057de3f494abacd7e249d200ed8"; + sha256 = "a872b05e1f960fa06d1e2d2e3a6a07be32829cd7ba61360be504a73646572625"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/cs/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/cs/thunderbird-158.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "eb506333cead6142921702d948631620530da179036fc4cd5030c55374021d48"; + sha256 = "b9a14289deb86a82b2269bd3dd205ecedb5cc35c857e3e5d128d2b59f9f7db6c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/cy/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/cy/thunderbird-158.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "fd738ff8f0668e4157527636f3816f954e1c32d8b3e1d893ef22e13c2970841e"; + sha256 = "2d418f6470c696af78f4085c31cb193846d75b147f886bc985c6c50dcac9a81a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/da/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/da/thunderbird-158.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "38cd985f9c83f6e7860d1e1237d62eb408f0c2e816cae8901362da247c282533"; + sha256 = "a692627ff6aff7df1cf4eaaf940137bc3a5b1a9c5d3ca76c6c7e900b20e2c063"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/de/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/de/thunderbird-158.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a6078fd6a6d7c5ad32d82294bb7044ed87317c2d9cfe916593e40da96b8524f1"; + sha256 = "caed2119fab6fc28fd045b09032050b95a062a6ae080d2e3ff147b973a295c3e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/dsb/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/dsb/thunderbird-158.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9edce1683fbcbf3b01da57995aeb6e2ef709ab87fb9b5a51c78960146808ec42"; + sha256 = "9b62849cc0d42f3556f3afb048683632e5668c20b7dc94b6d1343ef4f861a862"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/el/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/el/thunderbird-158.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2e5c87809176aaf558d5c0234af9b28d8b8957c10997bfc5cd4ef0adbb8490cd"; + sha256 = "65c0b81dbfe3501efcbd9e996906a7f40740bcc95e44d8a87f834cf7159a405c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/en-CA/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/en-CA/thunderbird-158.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "fa9a127106c2bbfcbf459a0879e9beac7e5846603bacc9d313b86ebb4965009d"; + sha256 = "466bd37ff7b892db054feee596fbbea15c0ab29c7efcb62b369a133b693f68e9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/en-GB/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/en-GB/thunderbird-158.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "425aa703c4267d7f0313f171184a4f77348b030f168b7997b3f5fd10b098d449"; + sha256 = "07818e11ada0f7260cc6a64c17dd871d31504072c617a294668a69361ff84711"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/en-US/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/en-US/thunderbird-158.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9d6a12447fe8976adc4740bb9593973d3ad495cfff800dbd91fcb8e7a8f03ad6"; + sha256 = "1dc49731b31cc1d820b4dcec678ce2b01aa26c226f6e7cca4ba4807289763ce0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/es-AR/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/es-AR/thunderbird-158.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e98bdd06842f7030ed52064483f4e4a4b6d95abaefb4261bf9fd1507cf882921"; + sha256 = "84f0e4b3a9c01b44eab148923f2ed7a1ac0dff62ac4bd2253c713bb8ea652d84"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/es-ES/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/es-ES/thunderbird-158.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "5a29d79b9c8aeaebe731333e1c4650aa90b5ec8b43723f877b58807a858edd69"; + sha256 = "bb4615ee1f509b405f0079037f8943ccd50540338ba4998785cc7495f4fa3495"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/es-MX/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/es-MX/thunderbird-158.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "69132d917c41b537116cd339253647d052e4074cf0b60f614d020b4640c10bdd"; + sha256 = "a51bed40f7e154e3a1ac7c3129879678ea98df13ea52d7206dc7961269f52e25"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/et/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/et/thunderbird-158.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ecd81251415ac0a4c5387dd07b433c2b7827314347337fe67626ba46570197b9"; + sha256 = "eb68d6ee6eb7b75dc954c9c1bed267758fbb2708d781d6a6325b25d7bc9c6f3f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/eu/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/eu/thunderbird-158.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2d218cf5b731dff59aeb98b11afa5e01219b55ddc2b5ec9a6f7ece61ed8d6a96"; + sha256 = "2caa2ab05ac1603b6397105b3fa5574a78355f17ee28b0bc62f2819fcf6538ac"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/fi/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/fi/thunderbird-158.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "eb7343962483ea427742240dd2c7c32c12f5d6dffa93af0cdc08481038dfa8f9"; + sha256 = "137427908b5a6530cc1052bcdeb4fc1dfc74a10b49398baf23804dd6c4437ffd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/fr/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/fr/thunderbird-158.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a6c56973269fbe24d2e33022ec8a6b1891ece70379fc372a4777dd2479417cc7"; + sha256 = "aae248cc07f5c126930520c90f24adf6b8b254147f456ddc22558982d789b346"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/fy-NL/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/fy-NL/thunderbird-158.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "89e98ae6a063d1d521ffae3b9b4dbce47404a6be6af604ca2ccd8116cacaa63b"; + sha256 = "5e64930ebbf1265bc5d8aa1c26c70a315044a731ef5e6a67721861f0bef10ea4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ga-IE/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ga-IE/thunderbird-158.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "dca286768d4ab0afd2f7a26e957d4576a8dbab7a692f1d9ee3f91686ebcd50f1"; + sha256 = "0ca5147aa55af037f9e9ff6aa272ca75b3e3e71fce67982aec6bb8f876328e92"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/gd/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/gd/thunderbird-158.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c1886a0ab0dab61edcc2338edc4a8a46cff06c5a51c04e7a15d1fccb6d3e0c06"; + sha256 = "de615514b8174521c761eb0abfce4fee167df32b9cd47648466ba16196270b3c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/gl/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/gl/thunderbird-158.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "db6deefc6236a9a38703c3708dc1db2c4ec50b51b931ed95c9dbb7049cf19b80"; + sha256 = "3a748ae37e29ebdc570392779b883cc001e8c383160e97f671c3bdd12d727e96"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/he/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/he/thunderbird-158.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "a45c37254f76ffb57576e30d01a255428126e139219827bdf1309aa4a82693a8"; + sha256 = "70cb66d426d1dc7fcab94278e5eb6e5eb5e8604a052b7d856d6ea5e57198c26a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/hr/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/hr/thunderbird-158.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "f1dde2c1ceb10f01ca18cc107d4eb1249653720e04ce3e4b9e0c26d379ef88a8"; + sha256 = "d593c725658a26a0c8a2455cb1395688f209c7c355b9518e01aa2fb722743b07"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/hsb/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/hsb/thunderbird-158.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cc410c696a75cf82185f31e7d1498400d48702c4037bda3abe6b8c777a5c3750"; + sha256 = "453fb92a4343490205074966dc76c643e2fa3ad92c3c43aaa226f19c35288778"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/hu/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/hu/thunderbird-158.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "3fc0cbffb45fa389f599c21ceb4bb4c28974062ade1a31282b088467912e7121"; + sha256 = "82484d8ecd5f92422e47dc15a302661859dee80a02a5fd0bad18fa7d2ddbe107"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/hy-AM/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/hy-AM/thunderbird-158.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "92f85eedc45f82471ed57411aabfce8dcad8b632d869b9d82e35482e89a4d8b7"; + sha256 = "018c3e0bb3528076a3850a35a6ce6732ad5fc9f0837352062ed1b1b54650317a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/id/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/id/thunderbird-158.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c2e2d4f5572f4a0f621d1bc57ee9ab37babcf3f69440392c9a28e0b4692919f2"; + sha256 = "14e784e92336e1493253a12783ba0f5018636951969fe09aef33abc66245ee63"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/is/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/is/thunderbird-158.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "aaa8722230812966ac6f81ba1deb26dd8d5f564701eb01b84268c1b678c001a3"; + sha256 = "704dc2560cfc2e89ecb517c920eb095dcbee819cd9af5afc82b8e74252d53cf4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/it/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/it/thunderbird-158.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "172b67464bbfe908b2caa5db9a71cdf7b44d31f3c4acac0cd6a273e63c32c7d7"; + sha256 = "9795c9da82f3052741014afcc4ea1eeba4fdf30544bce451295bad14e4bf9ac2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ja/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ja/thunderbird-158.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8afe0a670c580dff7cf86f7b096a4a012c716210ecf97d95fdfb42191dc4d88f"; + sha256 = "63fb284340de8a0d7ef34d52e09a881c927623b9d5b8c47594660a124f472bef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ka/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ka/thunderbird-158.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3162ddf7db67d2f751472a20f700d5a6512704b3caab94a182eff675cbb6be70"; + sha256 = "b38cabd158103a80c897eb3068c77344a6b078ba21aef55c06e5aeff63db8994"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/kab/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/kab/thunderbird-158.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "7516f9242f3ad27e0d240d38dfb42bddd376bd0a21581ff57e5de1654675e883"; + sha256 = "c558de8ccdaf9cf2a9511aefdb19397e8b568d4ab680a4fe9c06596dcfd41dea"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/kk/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/kk/thunderbird-158.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "250f6d24e825b031fbb5b32c79ffee1659eee8c645611ce567d417ada66639e5"; + sha256 = "31a183d8b2ff5f1895aa5eee8b0a3a6e9f175af24e9927e7b69f0a5ba441ed97"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ko/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ko/thunderbird-158.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "67be3baca318e3a2a8a404b81cc9cee1fe9f406d7007effead686495bd7c57cc"; + sha256 = "87a564371d2763a640b6c20724d53677f445bd801a78731c5fe849bd74f1bc90"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/lt/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/lt/thunderbird-158.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "85415d6097b8c9aa924a7f7905698b3545249cdb386f47c5f9ea2bc8bc14c9e8"; + sha256 = "e4c022db16e1fe0802fc402e027b403c8bed361b4bbabc09e9c9226a576c36ea"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/lv/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/lv/thunderbird-158.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1a3d0b6442b402aaad5ecf243033d2788913a1ad4277ea5840e2fbb9e6b4142a"; + sha256 = "e06e981169fb5ded36e88f3bc4f54c84b11f518a3eaa1ba781f62d9d84350b8a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ms/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ms/thunderbird-158.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "93691b4ab69b2502c03d803100ee213bf628ff2b74d4d5c702108aab7cff8363"; + sha256 = "a340313f0e7c5f3739fe889a60c9cfa52ee2cffcf30f651867eef1f28f3d657d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/nb-NO/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/nb-NO/thunderbird-158.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "20a41098fc1884687641c501cb78592961aca83d6e6b4312e7b2d635e0f91c33"; + sha256 = "464e4b5d547e7d1e991ed2a166ec3b43789b918c42535a683ca824f568920a50"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/nl/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/nl/thunderbird-158.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4cc8fd6abb58822306019313510a02def1848fb800401e093ca945a1187ce20e"; + sha256 = "5905954ec8155b7363ed6fb424d5ddaf82fa3efd6b3967b8764a2d78f4b06495"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/nn-NO/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/nn-NO/thunderbird-158.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8275599c7fa21c08e8c741e846cdaabf4d34c24d6941b394f4998140d330ef31"; + sha256 = "ba96e9c462dafe58cea7b4859e50ee5dfdefe2b32ca9d7db66aa77852819404b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/pa-IN/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/pa-IN/thunderbird-158.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ab1bdad6aaf93374a9e1c5b7ff8ede5f7f53ce0b23eae9dc0b5c5a55c6290177"; + sha256 = "b29288bb943cbc8be21ee8df6f37a8389d75bdacd239b7fff647ac15ad0ac6af"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/pl/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/pl/thunderbird-158.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d6d5d391f477058236dd40668176a8b8e03b6bfb635f6ea58ee965038cc7a07d"; + sha256 = "14de4e2809563a209791d1a2ee6c246a12bc5adb0cf86689c7724cee6a71adef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/pt-BR/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/pt-BR/thunderbird-158.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "f05ec7f2dc5a0671359354c14d3f918c5bd03f4e8a82db64fb9db4ae76687bda"; + sha256 = "a17928c81f58f4c93b58df17a12a0daf20f688d7e6b0c22a47f8dccae1562e8c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/pt-PT/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/pt-PT/thunderbird-158.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "5e4478fc6437d3370396f8a9cbef6d66931ff3bb309779c372112a5436f4e2eb"; + sha256 = "6a3f91bd2a9aa7eba8d9cf5b2a45e1d9d61d6fa7860b8e3356677541d0d56462"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/rm/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/rm/thunderbird-158.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5ffadbdb8ae9f2eb39b69fd1bc5181fed8bcd8046b52382e0e72184d6a9742e8"; + sha256 = "cfeb58243d410202a5fb87889b6a90c88249a08095788b163495599d1c48a528"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ro/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ro/thunderbird-158.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "49d4c87d7136d6acbf6c5fc0a77157dadbdf57e8d45f374f65d5e7415de15eae"; + sha256 = "373a70ded6ffece33e4db181fb349df7b49c095c4f21549efe0e010fe6fd956a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/ru/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/ru/thunderbird-158.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8c96c1808a194ca92ed77568bbe61c03fdb530948eb1d6865dfe3e06a5188bf6"; + sha256 = "7d95d52d070b3aad96a1e2e16640778d9842cd8e3e48e2f40c0ab208e292a5fa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/sk/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/sk/thunderbird-158.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "9ca2cd979dad07a0d33a3200cb31c41c403f70df28e1e6ff842f8c4ceab9754f"; + sha256 = "4d12cb30dd2b909abff6c92d88ff7e18af20e80f1acf8fe001fffb458281c00b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/sl/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/sl/thunderbird-158.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c335078d62319ee660c7d5289e22f928836af7a869d9e69ffcd1d101904dd332"; + sha256 = "5762cc041848ce079fde218793e6c0a34170b5d329dc58939722ac527b42310e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/sq/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/sq/thunderbird-158.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9da1e5f6d73b4e81a69b6ea37ee9eacd265245c125856ca287b90a8544f18015"; + sha256 = "b1e6568200af26d7132197f315313516736823dea84b9996dea8c4e419825141"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/sr/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/sr/thunderbird-158.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "04edb379692a4581687f71b08e5713b96a95e23748945c010c2aa0c26be5c9a7"; + sha256 = "eb0c6514a85b196139c17c7d5f61d3cb562b0136ceb6b23de07b6b3c1b62c299"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/sv-SE/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/sv-SE/thunderbird-158.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "9024108e70ef9fba30b2a6ff9c988a167680f2b46837c489346a98061ada8a12"; + sha256 = "8cb7d906b0798316ea1615956287f3168cc86479734cd7cd4f65dbf85583d291"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/th/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/th/thunderbird-158.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "8703f069a5e44ab30a483989755b9905f9ec188dcb60ea78bb7e2ae1340f32c2"; + sha256 = "71a6fc8065175a47a79daa26142cb8b56e635516b4dd06e852ba40f594dbf24f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/tr/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/tr/thunderbird-158.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f1cec459d60fd880935493f8c43ee093b0780cf7803e14aa4d01e49cea19b6c3"; + sha256 = "30fd86c1557576825f0dafc88be99a8e57d72f285e857b7e7e4d0aa4921db908"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/uk/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/uk/thunderbird-158.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ec5500c834c52b81eedf253d1540827ce7956e2848914ce6cc588f729679f328"; + sha256 = "3fb8c4180e7db7216bfd3e9c9f74c7479fb023325fc395d3205b43b41e751c43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/uz/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/uz/thunderbird-158.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "42acdc089370a1b4d2fa3eb6c597f6eafe59ba12fba4eb0c488b986d16cc7084"; + sha256 = "772bd11019312de7c4dc89514fc79b65b39ac7e3aa6c94ce3ee6027a8bc0bf4e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/vi/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/vi/thunderbird-158.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "1d3543b08e3db3c6017cc51ec850f1aa965b71862ea9fe52760ccf2475721399"; + sha256 = "8b3617691e1478151f06accb5b6b12575fbe1435c314cd9de9d086263861f646"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/zh-CN/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/zh-CN/thunderbird-158.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "94ccfc5639c13035eabc5fa1b85766fa74afa321936266edec8efd913f5059da"; + sha256 = "03cac0ea1c2716f7fc7d63bf6f3a1eccf5bd6a259ba4ed8db0e9062e00fdd6ea"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/linux-x86_64/zh-TW/thunderbird-157.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/linux-x86_64/zh-TW/thunderbird-158.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8ee79ef6661b588fb9145f8fffc5189acdaae265a7ec32cac2caa2bb28cfafe2"; + sha256 = "a45573436bcb8418ad4551641d760dc9a7fb5cd378ef9f44238727ea839459d0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/af/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/af/Thunderbird%20158.0.1.dmg"; locale = "af"; arch = "mac"; - sha256 = "158e3df7a35b0445e142b1dcd478f4b5fd7870fbf42ed61b55c13df36ef41d09"; + sha256 = "fb970576ef8b19829fbf7699e0a48ef85ea893dbd5e8410fdd8ff5a6024cd87a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ar/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ar/Thunderbird%20158.0.1.dmg"; locale = "ar"; arch = "mac"; - sha256 = "02ffd4e9a821f174a1e9e50ccd379321aa63d01fcf532680c6e42a68d05696ab"; + sha256 = "cef19720a71e812e0973156e08a23e9da08c42760ca0e9637ae48982aed38302"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ast/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ast/Thunderbird%20158.0.1.dmg"; locale = "ast"; arch = "mac"; - sha256 = "43c6c88709fa0312b72d04d5e42d0a72db96edf8eeb14f849c5aca4d909f8c25"; + sha256 = "0a9b548b9829b35d6b970f177fecef68803930c60e721691236f1cbad6535d8a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/be/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/be/Thunderbird%20158.0.1.dmg"; locale = "be"; arch = "mac"; - sha256 = "decbbc30dd6811c9248f31dd103440a3ac1ade4666d5b24ccb84c9c53f078dda"; + sha256 = "8c167413f22c02896fe6cd7191f1aea73217895d1f5bc4984a6246b5551dc37c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/bg/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/bg/Thunderbird%20158.0.1.dmg"; locale = "bg"; arch = "mac"; - sha256 = "bbb660bbbc5a9e1398b9e3a0752bd64822a63f989f3ba597af11433d1f7121ce"; + sha256 = "75794bc37069cf0a0ea8c35b5ab57dd0d54069b9d33aeaf1dbf8a7a71dc78444"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/br/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/br/Thunderbird%20158.0.1.dmg"; locale = "br"; arch = "mac"; - sha256 = "e97847891b4e32d2552d619fb039bdab114027997c70ba031bfc31705c184253"; + sha256 = "a43b922faeee453ab3dba0daef46ff0dba8f480fdbde065728b26671996b5cd4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ca/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ca/Thunderbird%20158.0.1.dmg"; locale = "ca"; arch = "mac"; - sha256 = "5fc66f0821eb3d3bfcf005569b13a4fdd3bf900cc04d3bb93b57d5b7be9a1dba"; + sha256 = "db73c90e57b1e3458b62121c7c7a31cd25b99358155b1c3c9d699cc792b6c272"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/cak/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/cak/Thunderbird%20158.0.1.dmg"; locale = "cak"; arch = "mac"; - sha256 = "b57b7823200b42068a7dff816429054a985aa917aab0fa98e81c0b2fd064c957"; + sha256 = "1d83678c98eea1e50b2ef9e33efb7417d4fe99466eb4871173990482fa796304"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/cs/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/cs/Thunderbird%20158.0.1.dmg"; locale = "cs"; arch = "mac"; - sha256 = "c9ff5c8d816dc06263720af128275fd815058d6040e5cf85bc493c25e5f074e5"; + sha256 = "24aeeb7c266922d247a4927fbdbe4ff2a3399c5b89c6d981cb7f95b2bea233da"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/cy/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/cy/Thunderbird%20158.0.1.dmg"; locale = "cy"; arch = "mac"; - sha256 = "1c9414125233455e2536b3caa1210743583069635a71087e96a8675d612ad17d"; + sha256 = "538bb488a53e37683d130505771fe32fef8a8faf53e222b335492c0972031c4e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/da/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/da/Thunderbird%20158.0.1.dmg"; locale = "da"; arch = "mac"; - sha256 = "61b08fe44b7d0a6960160a3320c5dd27f83dd6b5f2e0f8486f34c4e75c09113f"; + sha256 = "5d1751dd7964c9e17f1a7ba4edd9f690c064c46b8514c5a2d604562689f58c60"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/de/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/de/Thunderbird%20158.0.1.dmg"; locale = "de"; arch = "mac"; - sha256 = "b5f763a2355644352fa41e6f14a75f66aa871c4f1d315d88fcc4174406916e5a"; + sha256 = "0aee28696d99c4266da8d9fb0b7842a834cd5fcb8f45b65ec797cfee35ea52da"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/dsb/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/dsb/Thunderbird%20158.0.1.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "673553d2095d2810d226c1b11e820149b5f3a103459db06fa55d5ca4ad2fdbd7"; + sha256 = "7453950abacbdb4bb1497aaf0925e6b6a5c46c13ae673df9776a69deb0fe94c1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/el/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/el/Thunderbird%20158.0.1.dmg"; locale = "el"; arch = "mac"; - sha256 = "648ab3ee9652832268c9e6c36d87d9003d139561b761cd39a3ce0f4b0a838087"; + sha256 = "dbe41fe0e072a939bdb84bac1c75fe6c28d1ad74f99295e389d1bb6011b7622d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/en-CA/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/en-CA/Thunderbird%20158.0.1.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "9542e3ae12cb21615821734e6185ea70ff92e0c059140bdcba37733bb9d699bf"; + sha256 = "8e6189dbe4c43dbd74c99ec718993e580d57be8df6ed7f5487071bdfd3f5dbc5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/en-GB/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/en-GB/Thunderbird%20158.0.1.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "832af971d8ebe756ec3c14a23251ce1944bd27dead3185dac5bf2c1335869321"; + sha256 = "91be1fcc6b19d66066fde6721c4c55fa302860b8129246424653f2e385417363"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/en-US/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/en-US/Thunderbird%20158.0.1.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "8397bd44504d1f23c6c480cc9e67136a8f5899aa72e66bf684a4e76a74f8705b"; + sha256 = "768073920b8f6bf3db610bb1f0ad5521c3f6735155993639d347192954cfe6b3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/es-AR/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/es-AR/Thunderbird%20158.0.1.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "ebd18f8f7673d77a1f4d49103a5e725a70c0419443dd1e7f4bdd35ec783a3d20"; + sha256 = "ae3e43fbc9f58122c7783158ab0058cb3935f58290145c91adf14b7c1bd6cd1d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/es-ES/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/es-ES/Thunderbird%20158.0.1.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "608659e838aedf1d634969d5cd1aef5c6a770df4631f1ec2699b5f23ef10ecbd"; + sha256 = "7f739a41a4ba89d54383d02a0af4570bccb6fca65cf79fd244f4bb64e29de275"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/es-MX/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/es-MX/Thunderbird%20158.0.1.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "6007a04863c62f5aa752df1a624af4482a31c55a4b37dfedab952355c19e8cf2"; + sha256 = "aa9d8d26b233610d89feb63cb10e7b2b60a595e62a5952cc83c59022a1c0d8a8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/et/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/et/Thunderbird%20158.0.1.dmg"; locale = "et"; arch = "mac"; - sha256 = "3fd876afac64a489773949f48966a890158be6d9107eb81487d7eaaa3e680a52"; + sha256 = "0a486b00f5d2fb36c5c0650437dc07c9d4b42596b341da1d2ca95cfef4f8bd01"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/eu/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/eu/Thunderbird%20158.0.1.dmg"; locale = "eu"; arch = "mac"; - sha256 = "6c97d2ba131d279778e0a6262ab90cbb4add25f4ccc6c0247f4c7eead3e2a6a1"; + sha256 = "ac2e31b454852ffa798313bcb7e27226cde8bb596f5d09e6e647da2d9fa43b36"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/fi/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/fi/Thunderbird%20158.0.1.dmg"; locale = "fi"; arch = "mac"; - sha256 = "73e3d2edb62d2c8803d5fcc97b998ddf74d671393834a78a0fc1f2351c0a712f"; + sha256 = "bd4a177b6b6284bf2f0d19fd120369d56fa44690c95dd8dae5c0fc929a6b2177"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/fr/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/fr/Thunderbird%20158.0.1.dmg"; locale = "fr"; arch = "mac"; - sha256 = "077fc06e5ad05b0689a113f9f0f55b3f256e93e80a85d900bba412703bce28ef"; + sha256 = "2fcab598d82442028ab1fd4ef1f957b3e449a10f9db640ec7e1daa0573a6bbbe"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/fy-NL/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/fy-NL/Thunderbird%20158.0.1.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "f78c76a7c48a354d1a6091f65b7bfe34d50d954c324e613ad323b305fd21a146"; + sha256 = "c6ce8f893b7daf08b2cd4f2b6e6fcc78e3d74a742c30e999d4ea0704fec21d9b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ga-IE/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ga-IE/Thunderbird%20158.0.1.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "86a700bf13c8dfc9ddb588c341e3339fbaf254a5c31cac329530d18b8693b7b8"; + sha256 = "9e8bb32795efd453262e195eae0214f4cd56c4bb74c5bfbd7188b8571f25f155"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/gd/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/gd/Thunderbird%20158.0.1.dmg"; locale = "gd"; arch = "mac"; - sha256 = "5196035e124d3f76386c5de11f3297395bd46026ad0f0cf8464e88a513a149ce"; + sha256 = "0c599c908c604ff532cc9ab616127ba5cac97f113bc85551f3032f9af2dc538c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/gl/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/gl/Thunderbird%20158.0.1.dmg"; locale = "gl"; arch = "mac"; - sha256 = "a0d879806a7d334c69fe295c153096f556debf0fce3b5afc89ed528d77a4b88c"; + sha256 = "83cc18d6fb6865cde4e695a042910ed71fb9be7b909714b0515588bb09378af6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/he/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/he/Thunderbird%20158.0.1.dmg"; locale = "he"; arch = "mac"; - sha256 = "c6a490fdf407d4ea07752e44249e6fa5ed73baf496d9baeab44b39a1a21dd8a8"; + sha256 = "bdaac15b5f22da3d8473b8d4b3e7635a5a4dac87ccf7b78c527db499d31adc40"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/hr/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/hr/Thunderbird%20158.0.1.dmg"; locale = "hr"; arch = "mac"; - sha256 = "94ef059e764b2e6e2db99d683ba3ed48c9614959f069c4e3da53a2e0aaf69bb2"; + sha256 = "0954bc9a77c876bfb4dd8c12bab975d66a789f77afc8736f967e840171354c96"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/hsb/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/hsb/Thunderbird%20158.0.1.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "b932a9142988676a020f03adfa94ab5c1be101fbdaf21ce706ba52ac6a3d491c"; + sha256 = "b7be230988f6d0117ee84ed03aba786585deb83ff5f98822a2fadd17f3b97cc4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/hu/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/hu/Thunderbird%20158.0.1.dmg"; locale = "hu"; arch = "mac"; - sha256 = "9d84066259ce4859f4eb87e4a25dadab394264e196a4bb6e90fa6fdab1e096e6"; + sha256 = "49896a63fa3d84020a3147f4ddc8a9a18c80abb564a84913fd90d943122fc5b1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/hy-AM/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/hy-AM/Thunderbird%20158.0.1.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "13d039526667322fb1b59481a8cbfa02eeed4c307cfc5dd7e5e26a2fe38d0bd5"; + sha256 = "f08c01488862876e76a4702a9e4b5b4c7933125d79bfc7a2329fa506a99a7f23"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/id/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/id/Thunderbird%20158.0.1.dmg"; locale = "id"; arch = "mac"; - sha256 = "9a562baac22110c728dc50e703743f62d40ea5676d82219f10e7ca15085af9e1"; + sha256 = "97ff16fbef8eb8d0765c730d8373a7a581dc89fbc3b94e23a473f31051b1fcf7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/is/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/is/Thunderbird%20158.0.1.dmg"; locale = "is"; arch = "mac"; - sha256 = "19c0bafd779bcb3529eb81d4aebb3198f3d555fe4db20dbcfd290cfc02b691c7"; + sha256 = "061425f9117abcbc73c4e3f238a3c1e9f5913bca19a0b22e4c8f0b9e7e4398ce"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/it/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/it/Thunderbird%20158.0.1.dmg"; locale = "it"; arch = "mac"; - sha256 = "7d00896b55537fac277df146783f274a51ea5609cb04f642919efcf35834c247"; + sha256 = "133c9d865fbf978201a8c2d660d61c09b766929328580119657eef132633269b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ja-JP-mac/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ja-JP-mac/Thunderbird%20158.0.1.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "659cd90b38ca5837dd212a61a3aa3ae31f99a4ed13f0d56b8df14f3fd6f3986c"; + sha256 = "bba8c1a59eb5522d600a98716efd5bd14c7b730a62cf9cf34794c9bfaa09f71c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ka/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ka/Thunderbird%20158.0.1.dmg"; locale = "ka"; arch = "mac"; - sha256 = "5f83a411510f1eb1b908d7d4b4e09830ef3b38042da7a14b708bf30d19fc0a21"; + sha256 = "2de93291914f87b0930a00eb8f92b855877b9913229656f3e5f1d83a38e1af4b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/kab/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/kab/Thunderbird%20158.0.1.dmg"; locale = "kab"; arch = "mac"; - sha256 = "ed72afdf6daa9d153e06308da35b304cfadffc7463ae4744c529ac27a8bbdd8c"; + sha256 = "880edaffabc3a042b45b7ae728c0dcca2d51d1056aff471ba8cc930fee742b03"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/kk/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/kk/Thunderbird%20158.0.1.dmg"; locale = "kk"; arch = "mac"; - sha256 = "ff6241291240e950cd30721b138cfe0fbd928bd8096c7dd3149e871f5e16c676"; + sha256 = "34ea08c42920db42655edfc30b2952639f3fdb1801c88ce4d7e38bf5be234794"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ko/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ko/Thunderbird%20158.0.1.dmg"; locale = "ko"; arch = "mac"; - sha256 = "4e1d2a265bfbc02c3cd8f1b2996034b5832f623cc4bbe1b22c42460cf824dcc9"; + sha256 = "7f926b2a97197abf18d747d8913ddf46f07affdc2bdd6e7bb6eea4337b51df27"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/lt/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/lt/Thunderbird%20158.0.1.dmg"; locale = "lt"; arch = "mac"; - sha256 = "039fd569f0006c0a5691bf001d7d71fcc268de8a6ec94672adf08a678f219e44"; + sha256 = "0a589b5a18acdc037fac31bf64fadcc0d6dc604c56e7d8eda40abbf16b73e558"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/lv/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/lv/Thunderbird%20158.0.1.dmg"; locale = "lv"; arch = "mac"; - sha256 = "46483808760117aa752c74946aa251bdebe2bb569f8d699531d442bf1cc5ef9a"; + sha256 = "842f35da36e76c91d332f3967ce64dc07e53cefeb1b6768c48f17b1dcf739220"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ms/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ms/Thunderbird%20158.0.1.dmg"; locale = "ms"; arch = "mac"; - sha256 = "d77abe2011a97176dc0f24e769c249c17beb8f532fb8370181c12fcf943f7e9b"; + sha256 = "4049a81f9148e57de11bd3d1944f0e55f4e12aedf9c856e4e0d78053c2051a11"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/nb-NO/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/nb-NO/Thunderbird%20158.0.1.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "193dc9999aac3d80ac2c740224b09f45ada9910f36aa7674f46efb834a981f8e"; + sha256 = "90266c671b525246fce0fd39a75d950f65df782ae26412c8ff1c1d6c6479ab47"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/nl/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/nl/Thunderbird%20158.0.1.dmg"; locale = "nl"; arch = "mac"; - sha256 = "efced9975673eb7750f999ee40ec7f9e44f387dad2dc1246d6aa7bb1be5f7c86"; + sha256 = "0294e8c1182ee4b156947ef1c818f0e997b9de4055c79973e84acf116174f0cc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/nn-NO/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/nn-NO/Thunderbird%20158.0.1.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "8b74a1a176d14983e4b9ae65f381919296b3051267cbaf8330c58ce2308c88ed"; + sha256 = "b8e17805984909700fe0dea733914ce511581dc55b9b6b7e17947bc8cf7ca079"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/pa-IN/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/pa-IN/Thunderbird%20158.0.1.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "b33ad40f27f0436313169c11b23950030d6fe5e42225ef517183f71bb1c1bf1a"; + sha256 = "d4a4a1dc162754bc9f1af7cedb2a87a412bf62f154891f36adf6cac03e6d8117"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/pl/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/pl/Thunderbird%20158.0.1.dmg"; locale = "pl"; arch = "mac"; - sha256 = "c0d6bf2582a2302ac171946ce33c4cb94acf4f9b4a65b1d50b3d85e8261b8327"; + sha256 = "6be00f54c5f16bf218e43f62ffbb6861eb99b62a768f159020bd3b35e7a6e6ae"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/pt-BR/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/pt-BR/Thunderbird%20158.0.1.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "a1f1b71086f413895c30357aa107233522274ece245f49502050c6184d6d2e57"; + sha256 = "037e8595cab1510ed87b0c94b967123da6f140b4fd4cfb7a9e2cd0212b56e880"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/pt-PT/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/pt-PT/Thunderbird%20158.0.1.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "a542ed449ae393ff9f56d45f31331636241d1f8e56091bf2fe8b16cf46a00eff"; + sha256 = "101cfa3da06e906a474a29ea20fe3f5210a36ebee089db95fe5776773c60a0e3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/rm/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/rm/Thunderbird%20158.0.1.dmg"; locale = "rm"; arch = "mac"; - sha256 = "878b596884e31ce195b981b71ef91ffbb532ac6aca9f2c50986759c1ff82b382"; + sha256 = "2cc755dfabeaacb92a1737f694f81704a15cb0afd529eb957676f4665203b70a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ro/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ro/Thunderbird%20158.0.1.dmg"; locale = "ro"; arch = "mac"; - sha256 = "dc09caea1326ebf18597d1b19dc678d197f558595c8e8fd50238e18631d7c91a"; + sha256 = "4c822c5f134ff0e04c1060d011fb8cb2afef59ea7f031ca964f6831c75278358"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/ru/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/ru/Thunderbird%20158.0.1.dmg"; locale = "ru"; arch = "mac"; - sha256 = "45f43c8d89ef19810fca5f8593620fa99cf9e4b103aaa95cd868dc0c7e90fdab"; + sha256 = "9336e0e31d96f8803aaf96969031e5def5413c4f0b18dd93c9b19089230ca102"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/sk/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/sk/Thunderbird%20158.0.1.dmg"; locale = "sk"; arch = "mac"; - sha256 = "95c273d90703e63976afea8805be3490ac0c28927fdebc2318d16f5117d7a9f4"; + sha256 = "7e375fdfef5f6df3a8021a3bbb39fe2a5fbb33183b15a19c990c331abdc265ae"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/sl/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/sl/Thunderbird%20158.0.1.dmg"; locale = "sl"; arch = "mac"; - sha256 = "bba44638bc132ad6bc6ad929d3524910562710e1da2ea18fe5f230f7b9e57fdd"; + sha256 = "5af13fb755ed21849dc5846a203df0a36868aa565e769c7e1d7864d86aed39d3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/sq/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/sq/Thunderbird%20158.0.1.dmg"; locale = "sq"; arch = "mac"; - sha256 = "5f93d27aa4e099b9892a16a968b4aebcf274bb0be5be9c17e61532d4b4b9f0ce"; + sha256 = "a5e0c9e20b005e87c14ad59a4c2b5cb5b7263d297e7cc9b2046a98b88ba40852"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/sr/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/sr/Thunderbird%20158.0.1.dmg"; locale = "sr"; arch = "mac"; - sha256 = "794c0b2ad1fdd58970b3cf6969f12ddcd985a00549a3c65dc68cfc2fcf64a47f"; + sha256 = "39d123e44f3dc3875050af3781e2eb9b9d41c09222f31afd90493017f3715f8e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/sv-SE/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/sv-SE/Thunderbird%20158.0.1.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "dade9eb50aff638ae33ff6fb437ea5d6b845bd1a5de4ec4d2c6cab1cda66f6fc"; + sha256 = "afecd4c3a34333e94e456014e4e86fe5938a51a48e933ecb0935ac9a66a88b95"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/th/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/th/Thunderbird%20158.0.1.dmg"; locale = "th"; arch = "mac"; - sha256 = "ceea69f6702c11f0cba454091b5bef1c5dacb7eef0244fce46866d4ba6be1396"; + sha256 = "c860910ad42afcdbcf6a5a883dff763a0a09e9de1eb57b88b46d6249a6b76d05"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/tr/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/tr/Thunderbird%20158.0.1.dmg"; locale = "tr"; arch = "mac"; - sha256 = "06deb6709be96b807258a58a88387ead5406f0c0d6292ae99a553dc1d3f60cfd"; + sha256 = "9c7c43905febd037f4034a2345cfa49299ff57ad63e9ec777a8aa4c685b1bcb3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/uk/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/uk/Thunderbird%20158.0.1.dmg"; locale = "uk"; arch = "mac"; - sha256 = "af78c9b175b1031ecb3f9cd76a9370393c9848594b250f35d71ffdd49b0b2c36"; + sha256 = "1709c0fbb74ed9d206ff3e40c051d203c93f92c2a92daf7ac000a78a2b622602"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/uz/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/uz/Thunderbird%20158.0.1.dmg"; locale = "uz"; arch = "mac"; - sha256 = "344473529d41ca0c6569d218bd7eeeb2348c1ab778580ee207d55fa445ec9d29"; + sha256 = "6eddb1ea27185158146e443eb7af346fa6123ec35d91cdb4193fb4bac93cb1a6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/vi/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/vi/Thunderbird%20158.0.1.dmg"; locale = "vi"; arch = "mac"; - sha256 = "039620ec52060c64fba437fcf0f524f7d96b65636477ad992dafefd49b6a2772"; + sha256 = "ef17a1acabe8efae9d50f03759d39739cd09d5f31c5541e47a3efb5ab7158e62"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/zh-CN/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/zh-CN/Thunderbird%20158.0.1.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "d7d80a0d922860d62674e2799de81d5e6c90ad1d5bad9b4867abb537e2096477"; + sha256 = "8cc7f1898cfd8a1063e010631743f22134135c0d09cfd19c991af9873993de0f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/157.0.1/mac/zh-TW/Thunderbird%20157.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/158.0.1/mac/zh-TW/Thunderbird%20158.0.1.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "3b8b89450be83a4a25eb98db002b082b5d15c1654eaf3c517dd4485eaf2ea55b"; + sha256 = "e4c46ffbf8587c929a31735e0ec652ac1aae75658fe2b472f60b4234af260031"; } ]; } diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 165482e3bf16..447e86780597 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -100,7 +100,12 @@ let (lib.escapeShellArg '' if ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" - if ! test -d "$dbus_tmp_dir" && test -d "/run"; then + # Sometimes /run exists but is not writeable, (like when running in + # a linux builder on darwin) giving + # `mkdir: cannot create directory '/run/user': Permission denied` + # instead of going to the next fallback. Ensure we test with `-w` + # and not `-d`. + if ! test -d "$dbus_tmp_dir" && test -w "/run"; then mkdir -p "$dbus_tmp_dir" fi if ! test -d "$dbus_tmp_dir"; then diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index a7775cc8be70..5a25586a29a4 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "buildbox"; - version = "1.4.27"; + version = "1.4.30"; src = fetchFromGitLab { owner = "BuildGrid"; repo = "buildbox/buildbox"; tag = finalAttrs.version; - hash = "sha256-RXCn6xJEWEK/4cPXobIh8Ll5m1nyY+zIVxIGQMOMhnU="; + hash = "sha256-pga8gzFNS3b9nYTqqLxiK7QBJbtwq5dufZTsP74NsNE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix index 3d9fb0e19e98..69a2b4e1837a 100644 --- a/pkgs/by-name/de/deploy-rs/package.nix +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -5,29 +5,30 @@ nix-update-script, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "deploy-rs"; - version = "0-unstable-2026-10-07"; + version = "1.0.0"; src = fetchFromGitHub { owner = "serokell"; repo = "deploy-rs"; - rev = "45ba3f8c5cb28396fff71671806e2550b464ac86"; - hash = "sha256-TQiEqCAQ4bWppfeRGX4O3lwopsgsd2OvcOHTEQRRwEQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-i5dTwfPglZYE1zpg2IvBq+n0wDxMdrLwgHuRxZmO6Tw="; }; - cargoHash = "sha256-ONGMdmkKGPJ+6KF2hkZQBefkug/C5ZEqPidKR6OkCbU="; + cargoHash = "sha256-bgx2aKAYtq/8A2fa8xlhSjh2Jd6Pas5rUF+IiYEoxXQ="; # Tests use the FSEvents API on macOS, which the darwin sandbox blocks by default sandboxProfile = '' (allow mach-lookup (global-name "com.apple.FSEvents")) ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + passthru.updateScript = nix-update-script { }; meta = { description = "Multi-profile Nix-flake deploy tool"; homepage = "https://github.com/serokell/deploy-rs"; + changelog = "https://github.com/serokell/deploy-rs/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ teutat3s @@ -35,4 +36,4 @@ rustPlatform.buildRustPackage { ]; mainProgram = "deploy"; }; -} +}) diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index e144e405b3a0..08122ce06631 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -43,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Disable-segfaulting-test-on-Darwin.patch; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] + ++ lib.optionals (enableGrpc && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ grpc ]; buildInputs = [ curl @@ -70,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "WITH_BENCHMARK" false) + (lib.cmakeBool "WITH_EXAMPLES" (!enableGrpc)) (lib.cmakeBool "WITH_OTLP_HTTP" enableHttp) (lib.cmakeBool "WITH_OTLP_GRPC" enableGrpc) (lib.cmakeBool "WITH_PROMETHEUS" enablePrometheus) @@ -111,6 +115,21 @@ stdenv.mkDerivation (finalAttrs: { enableElasticSearch = true; enableZipkin = true; }; + http = opentelemetry-cpp.override { + enableHttp = true; + }; + grpc = opentelemetry-cpp.override { + enableGrpc = true; + }; + prometheus = opentelemetry-cpp.override { + enablePrometheus = true; + }; + elasticSearch = opentelemetry-cpp.override { + enableElasticSearch = true; + }; + zipkin = opentelemetry-cpp.override { + enableZipkin = true; + }; }; meta = { @@ -122,7 +141,5 @@ stdenv.mkDerivation (finalAttrs: { panicgh ]; platforms = lib.platforms.all; - # https://github.com/protocolbuffers/protobuf/issues/14492 - broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; }) diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix index aa0c3cea19bb..6390fcb5e958 100644 --- a/pkgs/by-name/pe/peertube/package.nix +++ b/pkgs/by-name/pe/peertube/package.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "peertube"; - version = "8.3.1"; + version = "8.3.2"; __structuredAttrs = true; strictDeps = true; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Chocobozzz"; repo = "PeerTube"; tag = "v${finalAttrs.version}"; - hash = "sha256-9Arq6gvMZV+0WcHWGwFnMjtnZzW+hWPPsHkJDwMFZCM="; + hash = "sha256-x41ngH8fiuMm0xG/YP+qRQRWJ9bGd5vFae6aoK3j6qk="; }; outputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10_latest; fetcherVersion = 3; - hash = "sha256-HbscF8sjgFCICJnpWopW5VWcD67XdzKOONWn+RHZThI="; + hash = "sha256-nGmDbJ+2ChGccC5cGJuG/Cbc/QVqH0t0S9/M/hbGY8A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 0eb18959fbbd..47c2dec2b40e 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -42,13 +42,13 @@ }: buildGoModule (finalAttrs: { pname = "podman"; - version = "5.8.8"; + version = "5.8.9"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; tag = "v${finalAttrs.version}"; - hash = "sha256-fl2/HyUh2EBbSw6O50H04Bltu2ZNF1Fay9XNNzKVpSE="; + hash = "sha256-nIWwG5QyIent0vJtEm8zDQLbqfTZmD4oKMbf2N5r2wA="; }; patches = [ diff --git a/pkgs/by-name/re/repath-studio/0001-disable-auto-update-check.patch b/pkgs/by-name/re/repath-studio/0001-disable-auto-update-check.patch index d3bc410e9873..da68ae26f1e6 100644 --- a/pkgs/by-name/re/repath-studio/0001-disable-auto-update-check.patch +++ b/pkgs/by-name/re/repath-studio/0001-disable-auto-update-check.patch @@ -9,28 +9,28 @@ Signed-off-by: phanirithvij 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/electron/main.cljs b/src/electron/main.cljs -index cdc2a5a0..e86922d6 100644 +index 4075cbb..561239c 100644 --- a/src/electron/main.cljs +++ b/src/electron/main.cljs @@ -5,7 +5,6 @@ ["@sentry/electron/main" :as sentry-electron-main] - ["electron" :refer [app shell ipcMain BrowserWindow]] + ["electron" :refer [app shell ipcMain BrowserWindow Menu]] ["electron-log/main" :as log] - ["electron-updater" :refer [autoUpdater]] - ["electron-window-state" :as window-state-keeper] ["os" :as os] ["path" :as path] -@@ -148,9 +147,7 @@ - (register-web-contents-events) - (register-ipc-on-events) - (register-ipc-handle-events) -- (register-window-events) + ["url" :as url] +@@ -164,9 +163,7 @@ + (register-web-contents-events) + (register-ipc-on-events) + (register-ipc-handle-events) +- (register-window-events) - -- (.checkForUpdatesAndNotify autoUpdater))) -+ (register-window-events))) +- (.checkForUpdatesAndNotify autoUpdater)) ++ (register-window-events)) (defn init-loading-window! [] - (set! (.-allowRendererProcessReuse app) false) + (reset! loading-window -- 2.55.0 diff --git a/pkgs/by-name/re/repath-studio/fix-karma-sandbox.patch b/pkgs/by-name/re/repath-studio/fix-karma-sandbox.patch index 1c78fa1bc21c..45c3a8dfe8e2 100644 --- a/pkgs/by-name/re/repath-studio/fix-karma-sandbox.patch +++ b/pkgs/by-name/re/repath-studio/fix-karma-sandbox.patch @@ -1,22 +1,29 @@ --- a/karma.conf.js +++ b/karma.conf.js -@@ -7,7 +7,7 @@ +@@ -2,13 +2,14 @@ + var junitOutputDir = process.env.CIRCLE_TEST_REPORTS || "target/junit" + + config.set({ +- browserDisconnectTimeout: 10000, ++ browserDisconnectTimeout: 300000, customLaunchers: { ChromeHeadlessNoSandbox: { base: 'ChromeHeadless', -- flags: ['--no-sandbox'] -+ flags: ['--no-sandbox', '--disable-dev-shm-usage'] + flags: [ + '--disable-gpu', +- '--no-sandbox' ++ '--no-sandbox', ++ '--disable-dev-shm-usage' + ] }, CustomElectron: { - base: 'Electron', -@@ -42,6 +42,10 @@ +@@ -44,6 +45,9 @@ outputDir: junitOutputDir + '/karma', // results will be saved as outputDir/browserName.xml outputFile: undefined, // if included, results will be saved as outputDir/browserName/outputFile suite: '' // suite will become the package name attribute in xml testsuite element - } + }, + -+ browserDisconnectTimeout: 300000, + browserNoActivityTimeout: 300000, + pingTimeout: 300000 }) diff --git a/pkgs/by-name/re/repath-studio/package.nix b/pkgs/by-name/re/repath-studio/package.nix index 9a3c24292f79..e4254646102f 100644 --- a/pkgs/by-name/re/repath-studio/package.nix +++ b/pkgs/by-name/re/repath-studio/package.nix @@ -4,6 +4,7 @@ buildNpmPackage, fetchFromGitHub, + runCommand, pkg-config, electron, chromium, @@ -21,15 +22,49 @@ nixosTests, }: +let + jediSrc = fetchFromGitHub { + owner = "davidhalter"; + repo = "jedi"; + rev = "v0.19.2"; # updateScript + hash = "sha256-2nDQJS6LIaq91PG3Av85OMFfs1ZwId00K/kvog3PGXE="; + fetchSubmodules = true; + }; + + parsoSrc = fetchFromGitHub { + owner = "davidhalter"; + repo = "parso"; + rev = "v0.8.6"; # updateScript + hash = "sha256-SKXVU19zCYpPik8QF/r2J9V4+ygGiDPEc9Xv6qRb4dM="; + }; + + pyodideWheels = + runCommand "pyodide-wheels" + { + nativeBuildInputs = with python3.pkgs; [ + build + flit-core + setuptools + wheel + ]; + } + '' + mkdir -p $out + cp -r ${jediSrc} jedi && chmod -R u+w jedi + python -m build --wheel --no-isolation jedi --outdir $out + cp -r ${parsoSrc} parso && chmod -R u+w parso + python -m build --wheel --no-isolation parso --outdir $out + ''; +in buildNpmPackage (finalAttrs: { pname = "repath-studio"; - version = "0.4.18"; + version = "0.4.26"; src = fetchFromGitHub { owner = "repath-studio"; repo = "repath-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-uHGF/SEbKZF6Ax1yrXYoAjXH5k6PzKF4aB85TXGJvk4="; + hash = "sha256-aLHQhhIF/GQYVO5p0Wlr8VGt71NOohRnu78tJhGvyp8="; }; patches = [ @@ -39,11 +74,13 @@ buildNpmPackage (finalAttrs: { # checks have become flaky in nix build sandbox, increase timeout and disable dev/shm for chrome ./fix-karma-sandbox.patch ./0001-disable-auto-update-check.patch + # pyodide wheels are built locally from source + ./use-local-pyodide-wheels.patch ]; makeCacheWritable = true; - npmDepsHash = "sha256-LBzauu5lpyfwOpnncsjPP4NpnoKqqcvX+HbK0YWNerA="; + npmDepsHash = "sha256-8fZjwwZuuiXYTq9NUkvcVaj+mewGfK2vaiq6z7rHoTo="; nativeBuildInputs = [ finalAttrs.passthru.clojureWithHome @@ -71,9 +108,9 @@ buildNpmPackage (finalAttrs: { substituteInPlace shadow-cljs.edn \ --replace-fail ":shadow-git-inject/version" '"v${finalAttrs.version}"' - substituteInPlace src/renderer/shell/impl/python.cljs \ - --replace-fail '"/pyodide/pyodide.js"' '"pyodide/pyodide.js"' \ - --replace-fail '(js/loadPyodide)' '(js/loadPyodide #js {:indexURL "pyodide/"})' + mkdir -p resources/public/pyodide src/generated + cp ${pyodideWheels}/*.whl resources/public/pyodide/ + chmod -R u+w resources/public/pyodide ''; buildPhase = '' @@ -175,7 +212,8 @@ buildNpmPackage (finalAttrs: { # -P -> resolve all normal deps # -M:alias -> resolve extra-deps of the listed aliases - clojure -P -M:dev:cljs + clojure -P + clojure -M:dev runHook postBuild ''; @@ -213,7 +251,7 @@ buildNpmPackage (finalAttrs: { dontFixup = true; - outputHash = "sha256-0+7pPY/f7Cn+wgGZyM5gKS7g3dsL4j57oQE4GWdCpu0="; + outputHash = "sha256-7J1sK7fg/gBLln4KTt9q65Vt0FjCjR81vGRwhwSdw4o="; outputHashMode = "recursive"; outputHashAlgo = "sha256"; }; @@ -225,6 +263,7 @@ buildNpmPackage (finalAttrs: { ''; updateScript = ./update.sh; + inherit jediSrc parsoSrc; tests = { inherit (nixosTests) repath-studio; }; }; diff --git a/pkgs/by-name/re/repath-studio/pin-clojure.patch b/pkgs/by-name/re/repath-studio/pin-clojure.patch index a5a160ab472f..3f56896c5247 100644 --- a/pkgs/by-name/re/repath-studio/pin-clojure.patch +++ b/pkgs/by-name/re/repath-studio/pin-clojure.patch @@ -3,7 +3,7 @@ @@ -1,5 +1,6 @@ {:paths ["src"] - :deps {binaryage/devtools {:mvn/version "1.0.7"} -+ :deps {org.clojure/clojure {:mvn/version "1.12.5"} ++ :deps {org.clojure/clojure {:mvn/version "1.12.6"} + binaryage/devtools {:mvn/version "1.0.7"} camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"} clj-kdtree/clj-kdtree {:git/url "https://github.com/abscondment/clj-kdtree.git" diff --git a/pkgs/by-name/re/repath-studio/update.sh b/pkgs/by-name/re/repath-studio/update.sh index b339fd9a6f72..29d34c4d0a33 100755 --- a/pkgs/by-name/re/repath-studio/update.sh +++ b/pkgs/by-name/re/repath-studio/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix-update gitMinimal diffutils gnused +#!nix-shell -i bash -p curl jq nix-update gitMinimal diffutils gnused common-updater-scripts set -x set -eou pipefail @@ -61,6 +61,28 @@ diff -u --label=a/deps.edn --label=b/deps.edn a/deps.edn b/deps.edn >"$PATCH_CLJ rm -rf a b +# pyodide dependencies + +pyodide_version="$(jq -r '.devDependencies.pyodide // .dependencies.pyodide' "$src/package.json")" +pyodide_lock="$(curl -sL "https://registry.npmjs.org/pyodide/-/pyodide-${pyodide_version}.tgz" | tar -zxOf - package/pyodide-lock.json)" + +update_pyodide_dep() { + local repo="$1" + local src_attr="$2" + + local version + version="$(jq -r --arg r "$repo" '.packages[$r].version' <<<"$pyodide_lock")" + local current_rev + current_rev="$(nix-instantiate --eval -E "let pkgs = import $NIXPKGS_PATH {}; in pkgs.repath-studio.passthru.$src_attr.rev" | tr -d '"')" + + if [[ -n "$version" && "$version" != "null" && "$current_rev" != "v$version" ]]; then + (cd "$NIXPKGS_PATH" && update-source-version repath-studio --source-key="passthru.$src_attr" --rev="v$version" --ignore-same-version) + fi +} + +update_pyodide_dep jedi jediSrc +update_pyodide_dep parso parsoSrc + # clojure home dummy_hash="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" diff --git a/pkgs/by-name/re/repath-studio/use-local-pyodide-wheels.patch b/pkgs/by-name/re/repath-studio/use-local-pyodide-wheels.patch new file mode 100644 index 000000000000..de04ddff24d1 --- /dev/null +++ b/pkgs/by-name/re/repath-studio/use-local-pyodide-wheels.patch @@ -0,0 +1,34 @@ +--- a/src/build/fetch-pyodide-wheels.mjs ++++ b/src/build/fetch-pyodide-wheels.mjs +@@ -39,7 +39,8 @@ const wheelNames = new Set([...needed.values()].map((p) => p.file_name)); + await mkdir(pyodideDir, { recursive: true }); + for (const [name, pkg] of needed) { + const dest = path.join(pyodideDir, pkg.file_name); +- if (existsSync(dest) && sha256(await readFile(dest)) === pkg.sha256) { ++ if (existsSync(dest)) { ++ pkg.sha256 = sha256(await readFile(dest)); + console.log(`up to date: ${pkg.file_name}`); + continue; + } +@@ -57,6 +58,11 @@ for (const [name, pkg] of needed) { + console.log(`downloaded: ${pkg.file_name}`); + } + ++await writeFile( ++ path.join(pyodideDir, "pyodide-lock.json"), ++ JSON.stringify(lock, null, 2) ++); ++ + // Drop wheels left over from older pyodide versions. + for (const file of await readdir(pyodideDir)) { + if (file.endsWith(".whl") && !wheelNames.has(file)) { +--- a/src/renderer/shell/impl/python.cljs ++++ b/src/renderer/shell/impl/python.cljs +@@ -151,7 +151,7 @@ + + (defn load-pyodide + [{:keys [on-success on-error]}] +- (-> (js/loadPyodide) ++ (-> (js/loadPyodide #js {:indexURL "pyodide/"}) + (.then (fn [^js pyodide] + (aset js/window "pyodide" pyodide) diff --git a/pkgs/by-name/rs/rsyslog/package.nix b/pkgs/by-name/rs/rsyslog/package.nix index b827dc882941..6bdd6e604909 100644 --- a/pkgs/by-name/rs/rsyslog/package.nix +++ b/pkgs/by-name/rs/rsyslog/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, pkg-config, autoreconfHook, autoconf-archive, @@ -66,22 +65,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rsyslog"; - version = "8.2608.0"; + version = "8.2610.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/rsyslog-${finalAttrs.version}.tar.gz"; - hash = "sha256-49YMg0BSaMQi+V/ux0BFWhzEuRHQC9hCTV0ScrxQmxo="; + hash = "sha256-e9+V6B6mwO5dWGNC1X0qbjlbCJ+zxnMYoNxVWBbeQEs="; }; - patches = [ - # Remove with the first rsyslog release containing this fix. - (fetchpatch { - name = "CVE-2026-78002.patch"; - url = "https://github.com/rsyslog/rsyslog/commit/667e3f61aec5ee02c5c2ee6f0f8accf6fe4301a9.patch"; - hash = "sha256-QsxOJCvr6VBbLbXzednwgvCfisSvNm6zfxPaMFxXVT0="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook @@ -206,10 +196,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.rsyslog.com/"; description = "Enhanced syslog implementation"; - mainProgram = "rsyslogd"; changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = [ ]; + mainProgram = "rsyslogd"; }; }) diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 6867269bcc53..8e66b3cf48b9 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -15,18 +15,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "rustls-ffi"; - version = "0.15.6"; + version = "0.15.7"; src = fetchFromGitHub { owner = "rustls"; repo = "rustls-ffi"; tag = "v${finalAttrs.version}"; - hash = "sha256-qVsadtAxS+yTt9FZMszwxql0CBTuz9ofpTto1hw9Kzg="; + hash = "sha256-HwcK6av6LKZ34QK41izBXGrGS3p5E819yw4TUuqdHEo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-rALR92Ia+I2axVTMVjI9UyNiiS4e6QuN5QU9JfM0UY8="; + hash = "sha256-kzAvxC1YAlzXJD0ku99ASJ7wbBJ3dI/d8h7VIT+vBSo="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index 4ed9843fc890..a9b4a113c318 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "veracrypt"; - version = "1.26.29"; + version = "1.26.30"; src = fetchFromGitHub { owner = "veracrypt"; repo = "VeraCrypt"; tag = "VeraCrypt_${finalAttrs.version}"; - hash = "sha256-Q+WUz8F63cP9/KlZUn9xLu2V9wO4FeY7AtErE1T9Km4="; + hash = "sha256-sjccuVsHU9C76tgRRw8Ew8scaDOT900+/7SnpqRjPRQ="; }; patches = [ diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 04c1a234a6a4..087a0fd13e3c 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -15,13 +15,13 @@ buildGo127Module (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.154.0"; + version = "1.154.1"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-1c9hltpsAg7tHa+h0ROMql6Zc+Q2yTSULBtzf8RPlaE="; + hash = "sha256-PG0UTQtn1zgeoFoEG82lsrr/Bo4TRTX/UHLGrPV5tGY="; }; vendorHash = null; diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 1994f89f3ef1..ca27c194c3ab 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -8,6 +8,7 @@ mixCompileHook, mixAppConfigPatchHook, + cacert, lib, stdenv, writeText, @@ -86,5 +87,10 @@ lib.extendMkDerivation { passthru = (args.passthru or { }) // { inherit beamDeps; }; + } + // lib.optionalAttrs (args.name == "castore") { + postPatch = (args.postPatch or "") + '' + cp ${cacert}/etc/ssl/certs/ca-bundle.crt priv/cacerts.pem + ''; }; } diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 1145905996bc..106d71df03b9 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -6,6 +6,7 @@ rebar3WithPlugins, rebarDevendorPatchHook, + cacert, libyaml, openssl, @@ -82,5 +83,10 @@ lib.extendMkDerivation { passthru = { inherit beamDeps; }; + } + // lib.optionalAttrs (args.name == "certifi") { + postPatch = (args.postPatch or "") + '' + cp ${cacert}/etc/ssl/certs/ca-bundle.crt priv/cacerts.pem + ''; }; } diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index ba8a5016a51e..b34b350907ff 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + cacert, fetchFromGitHub, writeText, elixir, @@ -27,6 +28,10 @@ let sha256 = "sha256-lOoD6mzctGk9xHNJiribDMVWQ9xrr2N5eluJalirESk="; }; + postPatch = '' + cp ${cacert}/etc/ssl/certs/ca-bundle.crt lib/hex/http/ca-bundle.crt + ''; + setupHook = writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index bbbca0625b44..9a60c0858690 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -17,6 +17,7 @@ gnugrep, gawk, mixBuildDirHook, + cacert, }@inputs: { @@ -165,6 +166,13 @@ stdenv.mkDerivation ( # writable, thus a copy to the $TEMPDIR is inevitable here. export MIX_DEPS_PATH="$TEMPDIR/deps" cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH" + + local dep + for dep in castore certifi; do + if [ -f "$MIX_DEPS_PATH/$dep/priv/cacerts.pem" ]; then + cp "${cacert}/etc/ssl/certs/ca-bundle.crt" "$MIX_DEPS_PATH/$dep/priv/cacerts.pem" + fi + done ''} '' + (attrs.postUnpack or ""); diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d0282d58aaab..b09701b7aaae 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -565,4 +565,33 @@ in license = lib.licenses.asl20; }; }; + + openssl_4_1 = common { + version = "4.1.0"; + hash = "sha256-UMF7r1TLAI9s5C1Q3rSygFChqtcRY2yr1LJBx+kMwv0="; + + patches = [ + # Support for NIX_SSL_CERT_FILE, motivation: + # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + # Look up SSL certificates in /etc rather than the immutable installation directory + ( + if stdenv.hostPlatform.isDarwin then + ./3.5/use-etc-ssl-certs-darwin.patch + else + ./3.5/use-etc-ssl-certs.patch + ) + ]; + + withDocs = true; + + extraMeta = { + license = lib.licenses.asl20; + }; + }; } diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 8eb53f2d26a9..6e2a9b8935a3 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "1.4.0"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; tag = "v${version}"; - hash = "sha256-EaislmA4v2qKCDQ87I85Pn8IlS4VJWyNXkITipKSBC8="; + hash = "sha256-jDQDcKsHKCG3RJ1AlMx+XB0R1/MhT+avI7/aBo8+sFo="; }; postPatch = '' diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index eb0d4826bd60..33d993ee01ad 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -45,34 +45,34 @@ }, "42": { "hashes": { - "aarch64-darwin": "15856346793e4e7f3f2200a898473379b51eda1a7aea55c6b1a326d58750bad4", - "aarch64-linux": "94988ccf40f739495ceb010b73b69018aeac79ba24c14fd0cd40a5ba27ff8221", - "armv7l-linux": "c984aefaa4ca5b07051dd45321b03fa35b5ee530e5655143f00820894b323e10", + "aarch64-darwin": "07bb5205c7e6c94cc1b254e0f71b9f924add59307cfe20efd5dac8e50a1a360e", + "aarch64-linux": "7a2325a068b39271166bc93e21996047fd82e207e603ca37fe8350347851908e", + "armv7l-linux": "10c007a4da8e1d70127f739771caf7ffba92d87d15c7ee305d2f0870206de762", "headers": "01yk8qsddgpx89lggmsn0735kjkci4fqkfv300p39qm7pd4lwgs5", - "x86_64-darwin": "3c509d3c2f59cfe235b81e26c3a490cb5ed07c49b88af110a84cfed5663db629", - "x86_64-linux": "0c8d31b8c2f2d30ffbb78cd4837e145e158971285777d67588ee2c166ecd7ed1" + "x86_64-darwin": "bcbb66d317979d39399a380186d5cc3104609f85f7cbc6775358858cba46ea6a", + "x86_64-linux": "c703693e5df41a413dd0464888bbabc8537a7000fb6d6e4f027fea0e90481a96" }, - "version": "42.11.14" + "version": "42.11.18" }, "43": { "hashes": { - "aarch64-darwin": "e60ad7fb9c030ddfb5005a6bc54712bc78c2d3e760f7f010fa5b997e956aaefa", - "aarch64-linux": "79e05a363b236acc16d2fe304c0a21ea3ac48885d96b6bd572446820abe06a51", - "armv7l-linux": "6bd149bd01cd1b0274d16dd012b7e1c323d7108a1073c1ca12474b54bd1358c4", - "headers": "1dfdkm72jbxylql74i8z5lznw3zlhq2kc1qizlwvjhx16l9v46kk", - "x86_64-darwin": "96510a54405ca2747d93af2d472483fc93d8e7a5d147bde53b9b36a3794f86bc", - "x86_64-linux": "37342601dc246db0269487b786856044b2476e58cdd07d00a57ac155329c5130" + "aarch64-darwin": "08e693ae36cfd230105aabe70c626b1a243c13534a529c35a80c1b87cb8da7b4", + "aarch64-linux": "b814ab22abf0bce90fd2fffc1490efc94f388353bcdb2f744950744998fd97b1", + "armv7l-linux": "ce65b4ba52dabe1cf8e98933d057cb656b9b9c745ac0e1c859d331bc7a5da1ae", + "headers": "1k3idywwl7fxqjxx7i8r5la1h6v4fvmxs4lvfwipxx59vjnmncki", + "x86_64-darwin": "3e16ccaed7473a763e1a8cd16e8f17e796229d2a269b9c36bfbb6d93a6ba8443", + "x86_64-linux": "73d7d6fe120c998db75834c23c8ce7ce8390607c198b2e167a28acd7937bef22" }, - "version": "43.7.11" + "version": "43.8.3" }, "44": { "hashes": { - "aarch64-darwin": "07d73d3d6dd0b8679c2f1849e30df179ea50c1d6b17630fcc398ae05221f0bd2", - "aarch64-linux": "f8ecb0702b6a0b10274d2c3043dddaa22da77addcab98e7e0b1e0d4f6c2d93e9", - "headers": "1qjfzgx602dpidlw8bwasi83nhq95dbyh664l5xrzikhvibc9jxx", - "x86_64-darwin": "915cb638692e3595926fa64903ee0562c3c0c5a1febb84724175756ca2f0f3b7", - "x86_64-linux": "777b26a64aee3d185acb9f93c04782bb51eae7c2c61c793963ef24374e5a1539" + "aarch64-darwin": "4af51382278d00291dfcda265eddd9bab6e98cebb09f46aadc8438bf606de162", + "aarch64-linux": "8e70d53d920d84db869023280e5a1fbda82ecc58fea4443748e58309a3c80238", + "headers": "0q32b3nnz6m4a58fbgrqb5riqz9kg1d58hkhfhq5nfs2fs2y9x13", + "x86_64-darwin": "451363b59bb7d2c1c9e0c4baa99106004eaabe724aa21a0c6b4c87469293531a", + "x86_64-linux": "6e7fd2d450d442507b846ace4ae6e2bd17e1b1653e86a033b5231abfc23e6df4" }, - "version": "44.7.2" + "version": "44.9.3" } } diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index b5d62d5e40fe..f75756b1bb72 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -45,34 +45,34 @@ }, "42": { "hashes": { - "aarch64-darwin": "df600a318802e81d7072f83406d73f2962d16f1d9731f55f44c070c30c18cd18", - "aarch64-linux": "e4eb2787cc32649808173daa521bf4acc2ee3cf5d8fc55ad3f8c7f88833b0db3", - "armv7l-linux": "31ea3acd1c7074b208c624f3cf2dade480e371140747c595631216331306a046", + "aarch64-darwin": "9c928bc8ea6c7fcfc66bff2fd9ae5307c705717dd13ffaa76474de0ab6aee616", + "aarch64-linux": "8f17afed5c1b69a48e767d868e0282f5c57d0c3fcc946fd0d98a126b52b8fc5a", + "armv7l-linux": "b80329d73c5cc0d76c74d1cb94f0ecb15899e525432f77af4a02a4f2c771589f", "headers": "01yk8qsddgpx89lggmsn0735kjkci4fqkfv300p39qm7pd4lwgs5", - "x86_64-darwin": "74a2e383498dadfa8708bb2403485a950d2559f71dae5bd6c2e17a359c8e6a26", - "x86_64-linux": "7098681887e4641a8f04011a36c4d8e7e11792f42f3bc66979feb7e657c341e5" + "x86_64-darwin": "399835093ea23c3c67acd37ee63923148776aeb26d2e00861e6c8bbfb4fd779b", + "x86_64-linux": "37977f55379613baed1275d9be9bbd325686643450ace265ebd91a0dc20ea6f1" }, - "version": "42.11.14" + "version": "42.11.18" }, "43": { "hashes": { - "aarch64-darwin": "0f4e43230f281c9518938f884dca652dfcd850b5c0950faccba83df46ec5c7bf", - "aarch64-linux": "c69df6e8fbb8fd545d96a33d47aec4087c01b57553cf9b08f42deac2abbd12e6", - "armv7l-linux": "6f05b0693ba85ecd7910bbdc9e912dbdb6c4b4b060cf0ad0ecd8b7abd560f168", - "headers": "1dfdkm72jbxylql74i8z5lznw3zlhq2kc1qizlwvjhx16l9v46kk", - "x86_64-darwin": "b9f1023e45702e75681cdeff77af88f0c738ae8fe70bdeea2eecdb5a294ed091", - "x86_64-linux": "2155508082d3749e924d83b649f46630c26268da0a87ed24996728d63c6646f5" + "aarch64-darwin": "37e278ec348a0a97b45f36f9e4a43f6b1f57c6b70baa1e91ec895cac9e912547", + "aarch64-linux": "929cda53a3a544cb6a3b03e75e3d0ff9f44c077be89ce0a6c66287199cd51940", + "armv7l-linux": "4d35c68f3015b1b12c4cd58744df2e6ca66fd6ef901a76d66f3aaf88a1207d5e", + "headers": "1k3idywwl7fxqjxx7i8r5la1h6v4fvmxs4lvfwipxx59vjnmncki", + "x86_64-darwin": "e8a913dff24d2d3f3e5039fe74ef754ea642a3320282495ec8076e702612f69c", + "x86_64-linux": "110d5bf9d1e03841cdc29ae5bb6f997913b02f34de4caeedddf7e2c7b20ee396" }, - "version": "43.7.11" + "version": "43.8.3" }, "44": { "hashes": { - "aarch64-darwin": "0b72483b23183ac8dd9193125d06044e999f3923f8143ff7683323cea1997040", - "aarch64-linux": "62127c18c542649d9052ff3205968cb0621c2da253715138737edcfcbf5c31d9", - "headers": "1qjfzgx602dpidlw8bwasi83nhq95dbyh664l5xrzikhvibc9jxx", - "x86_64-darwin": "6d8f9bf77466f1394e83bcb884f607f4432d8eb78f42c4ba68901f001fdaad11", - "x86_64-linux": "92e9fa4f3baf56373a2e6406113f5b478cd4c384c2c6c38d62bd5cf39d4c7e17" + "aarch64-darwin": "8777821e0f4d7a39efabfaedd67a2ac6167e9127b5d63ae8b497795716e8891f", + "aarch64-linux": "46e021041db497176ab792e4d214c92637ee44086b76e6b453a04fff28feffd5", + "headers": "0q32b3nnz6m4a58fbgrqb5riqz9kg1d58hkhfhq5nfs2fs2y9x13", + "x86_64-darwin": "25360ce0400aacbc26a7535427c166aa88485c557e0758fab8bb8606a763aa10", + "x86_64-linux": "3bc92381261d31254d3921a15015bde389ce65c8a1c475d7f2dcad524e13e1b0" }, - "version": "44.7.2" + "version": "44.9.3" } } diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index b81bf1e36318..79669209f692 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -190,6 +190,12 @@ in cd third_party/node grep patch update_npm_deps | sh ) + + gnFlags+=' v8_version_hash_salt_files=["//electron/patches/v8/.patches"' + for patch in $(cat electron/patches/v8/.patches); do + gnFlags+=",\"//electron/patches/v8/$patch\"" + done + gnFlags+=']' '' + (base.preConfigure or ""); @@ -225,6 +231,8 @@ in enable_linux_installer = false; enable_pdf_save_to_drive = false; node_openssl_path = "//third_party/boringssl"; + node_v8_path = "//v8"; + node_use_v8_platform = false; } // lib.optionalAttrs (lib.versionOlder info.version "43") { enterprise_cloud_content_analysis = false; diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 7e9c808241e7..02fa80769a18 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -56,10 +56,10 @@ }, "src/electron": { "args": { - "hash": "sha256-P/zoInRtKQXlzPkyu+f4LW5rgIp/5VTY7yaQB5Jo8Ag=", + "hash": "sha256-5QBlmxMu7DKPYPQxADNtjnKTxVFdXKj940Adn/sG+V4=", "owner": "electron", "repo": "electron", - "tag": "v42.11.14" + "tag": "v42.11.18" }, "fetcher": "fetchFromGitHub" }, @@ -1367,7 +1367,7 @@ } }, "electron_yarn_data": { - "hash": "sha256-EIdGb0MAZeYelJujwLvjFIRjvuayq5qBu8eAfCQSG0Q=", + "hash": "sha256-i4bos0RAZ67kAnmqBahpZX9FmLADVnuz3p/+EFo2CVk=", "missing_hashes": { "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", @@ -1437,7 +1437,7 @@ }, "modules": "146", "node": "24.19.0", - "version": "42.11.14" + "version": "42.11.18" }, "43": { "chrome": "150.0.7871.250", @@ -1504,10 +1504,10 @@ }, "src/electron": { "args": { - "hash": "sha256-tB4xqttVDCRSxP1jnAXCWKWtVSrVXc+ml2FvzdJns0o=", + "hash": "sha256-adUyEUqbjAEfBYxBPaeRPDtoTkwuBGMHIR6YZJ5e6qE=", "owner": "electron", "repo": "electron", - "tag": "v43.7.11" + "tag": "v43.8.3" }, "fetcher": "fetchFromGitHub" }, @@ -1849,10 +1849,10 @@ }, "src/third_party/electron_node": { "args": { - "hash": "sha256-D0Emw+F+8fz41onhxfiCQuxEQx+4jjsT7Ym2mqrKkRI=", + "hash": "sha256-055FP6A2CjODxhrh2R4csRsiTNOIsxnuC9zWjTP9U34=", "owner": "nodejs", "repo": "node", - "tag": "v24.21.0" + "tag": "v24.22.0" }, "fetcher": "fetchFromGitHub" }, @@ -1864,15 +1864,6 @@ }, "fetcher": "fetchFromGitiles" }, - "src/third_party/engflow-reclient-configs": { - "args": { - "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", - "owner": "EngFlow", - "repo": "reclient-configs", - "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - }, - "fetcher": "fetchFromGitHub" - }, "src/third_party/expat/src": { "args": { "hash": "sha256-veGg5/QjtBSmxYa8IyHF0NxEdJzlcJSZfzw8ay3ASVU=", @@ -2823,7 +2814,7 @@ } }, "electron_yarn_data": { - "hash": "sha256-8r0r7WXrM4HlS2qKMHbyxS+4zet646JKjTEtSyCTqqs=", + "hash": "sha256-s6iBBgvQvvPN97/pSoHrZZcAyE4dWOmYtAT5Z5cQ9d8=", "missing_hashes": { "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", @@ -2892,11 +2883,11 @@ } }, "modules": "148", - "node": "24.21.0", - "version": "43.7.11" + "node": "24.22.0", + "version": "43.8.3" }, "44": { - "chrome": "152.0.7977.149", + "chrome": "152.0.7977.167", "chromium": { "deps": { "gn": { @@ -2905,15 +2896,15 @@ "version": "0-unstable-2026-07-23" } }, - "version": "152.0.7977.149" + "version": "152.0.7977.167" }, "chromium_npm_hash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=", "deps": { "src": { "args": { - "hash": "sha256-hGjd8i2ESBREWG5lekdtEK5CVFjxT3Po7NRG1PvD3xM=", + "hash": "sha256-DzIhUc7a9USmm8MCUgkDcLtb5GRs7eKzT4FlsZADmJU=", "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "152.0.7977.149", + "tag": "152.0.7977.167", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2960,10 +2951,10 @@ }, "src/electron": { "args": { - "hash": "sha256-HkV7zfjl6BbMVowgNBtHl8DZVVSgSMjQFOn37qPxA60=", + "hash": "sha256-9FaI//rjfeUeVlcqTITMiHb4Cuk7npzEggrhoJhYTrs=", "owner": "electron", "repo": "electron", - "tag": "v44.7.2" + "tag": "v44.9.3" }, "fetcher": "fetchFromGitHub" }, @@ -2993,8 +2984,8 @@ }, "src/third_party/angle": { "args": { - "hash": "sha256-YRPVefAR1xcqWJApIYb9ynGfwTtoRhhj6a6GpSIVykM=", - "rev": "6c47c4b6dae794245a23a16b3826efc09ebdefd0", + "hash": "sha256-RGAZFJh5IM1NYRqOPAvEX9MnA9lTTXS2ZEDPcvc7DNw=", + "rev": "4f2e7d39252ed0e8387ebee1b222d4715f2dea7d", "url": "https://chromium.googlesource.com/angle/angle.git" }, "fetcher": "fetchFromGitiles" @@ -3137,8 +3128,8 @@ }, "src/third_party/crabbyavif/src": { "args": { - "hash": "sha256-N9YwO68d3CXPje43fWs9CoO5Sc3wIULta7n8cp+2Efs=", - "rev": "61f5abadda7b179f90e557fed6ae7a3d78bd8231", + "hash": "sha256-D5cYECQYGfDn4ubl9yhpK3XGq1vjzOZI5tOV8s67SuQ=", + "rev": "05103ee49f6dc58dfbbaf24286dcedacffb26d6d", "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" }, "fetcher": "fetchFromGitiles" @@ -3313,10 +3304,10 @@ }, "src/third_party/electron_node": { "args": { - "hash": "sha256-D0Emw+F+8fz41onhxfiCQuxEQx+4jjsT7Ym2mqrKkRI=", + "hash": "sha256-055FP6A2CjODxhrh2R4csRsiTNOIsxnuC9zWjTP9U34=", "owner": "nodejs", "repo": "node", - "tag": "v24.21.0" + "tag": "v24.22.0" }, "fetcher": "fetchFromGitHub" }, @@ -3328,15 +3319,6 @@ }, "fetcher": "fetchFromGitiles" }, - "src/third_party/engflow-reclient-configs": { - "args": { - "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", - "owner": "EngFlow", - "repo": "reclient-configs", - "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - }, - "fetcher": "fetchFromGitHub" - }, "src/third_party/expat/src": { "args": { "hash": "sha256-WAxyD34gYgQzu+t4BFaG9cktulKFsM6V+XYi8x+h9ls=", @@ -3860,8 +3842,8 @@ }, "src/third_party/pdfium": { "args": { - "hash": "sha256-4OhJcWZJ3UC/Mf4DJNzLLYQtrw0y0suO/wy0d1GYP4w=", - "rev": "8f3e90282ef137adf7d380079c3178b24407104a", + "hash": "sha256-X30F4eqkkY5mttzA0yKwMX/rpbrFiZDc5iigg82PrTM=", + "rev": "23f70fdae651eff9740ef8c0eb31158029314f84", "url": "https://pdfium.googlesource.com/pdfium.git" }, "fetcher": "fetchFromGitiles" @@ -3972,8 +3954,8 @@ }, "src/third_party/skia": { "args": { - "hash": "sha256-eXQ9FXOKVzVpXjDUFdkO4e3YRcgSHDszbM2nsZDHTXw=", - "rev": "f593e0fb883333745ab2c8568c1449a60904b244", + "hash": "sha256-GH1yObHvyEH2rgVMRJKEG00NON1WLX8dW2w5TPf05M4=", + "rev": "747cf654ed6f864f4402e7d6eb54a6ede60141e5", "url": "https://skia.googlesource.com/skia.git" }, "fetcher": "fetchFromGitiles" @@ -4264,8 +4246,8 @@ }, "src/third_party/webrtc": { "args": { - "hash": "sha256-c0h6bD8zNZbacnOgRei+yVB+5+AvfglW+eQDNZU945M=", - "rev": "6f37672d358475cd17544121a12494da454d85fb", + "hash": "sha256-SNuTzeMeu5hF6SQWDI4Y9tgbDifiPpcAlmycLko3P00=", + "rev": "e1991d7f7bd00eaa701dcdd8d6786b746c623c30", "url": "https://webrtc.googlesource.com/src.git" }, "fetcher": "fetchFromGitiles" @@ -4304,15 +4286,15 @@ }, "src/v8": { "args": { - "hash": "sha256-Oohc8euPVyridd0SMjRd8vdsIJgrzfSYfN9LM/dtT3Y=", - "rev": "55f2189ccf587e664e289e900d8ed99dfff2acfa", + "hash": "sha256-cv8pAZxlSuLLCQEfVc7+/mkco8PZQqS/smSpa8VAsMo=", + "rev": "a11d960c1c22c067ff898ceb4a8e4e0687014d41", "url": "https://chromium.googlesource.com/v8/v8.git" }, "fetcher": "fetchFromGitiles" } }, "electron_yarn_data": { - "hash": "sha256-o40KUJ1YYQ9ImompIMsovGQT3kuXDKJyfZHW/k7+8mE=", + "hash": "sha256-uPMmYNUPFw7LC/MUr6duZYjVgcaJ2Q5DN6qO+iCqXao=", "missing_hashes": { "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", @@ -4381,7 +4363,7 @@ } }, "modules": "149", - "node": "24.21.0", - "version": "44.7.2" + "node": "24.22.0", + "version": "44.9.3" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a5a539bc453e..b4504bf5be10 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,13 +30,13 @@ "lts": true }, "6.18": { - "version": "6.18.58", - "hash": "sha256:04w0h6dwm9jvwlpdbxm9887wmssxqch6ajxf960sqk9c0gwik6q6", + "version": "6.18.59", + "hash": "sha256:0qrrw85mbg2dqjkjhm3x2b8hs962wka83qxqjbi4fm9shv4mm9ak", "lts": true }, "7.2": { - "version": "7.2.12", - "hash": "sha256:0krdl05l7y8nigrvgdjnxqzxmdppagklcr5a1jh8m5y8in54c65v", + "version": "7.2.13", + "hash": "sha256:0v7accir5bx5l7bsqmmcj29ri64sb1g4n9ysfbwp26fxyb2b1rq8", "lts": false }, "7.3": { diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a848c14ce1e9..0f78bf313696 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.18.58"; - hash = "sha256-qb/wngB9sURju6P+tq9/cyV3DpDDkRPSeBmFmTVUSJ4="; + version = "6.18.59"; + hash = "sha256-ptzICfzK/yCeCCBtsCSnE11VeuKFBYb/mGqqX9zvQgA="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "7.2.12"; - hash = "sha256-Z+JTKbWyaD8TOfzcAnmPLRI1hIGeK/QscmnCK2GFS8s="; + version = "7.2.13"; + hash = "sha256-QU+0ri/6caunv5OE9uVbIz/o03vkVT5Sp/0/jIakckw="; }; }; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index be57db588305..2fa21213e6b7 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -54,13 +54,13 @@ }: let - version = "2026.9.0"; + version = "2026.9.1"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; tag = "v${version}"; - hash = "sha256-xOZyoDA+/UPV/art5z8lNSM7RfNejeYcZAL+JzrPk7A="; + hash = "sha256-j3JjLYNcv3lluoCekyUUKMfkSX/ExeDsa8zrQ+pDrwg="; }; pnpm = pnpm_10_latest; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 5b93c678e59f..cb274b1951c0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "89bae0e929387ed5697fd3c5eedf9b3dbe85bead"; - sha256 = "sha256-ycDyYRi7uab4vxHY8K2kUytWBmTuFTFHYGD1AHpzC+0="; + rev = "5764be5b8ce440df9059f05cf6273c50f90f7905"; + sha256 = "sha256-BXeWJuokl9FnE1wtpJZ1e1AsU2MhO65I8vkRf1nF76I="; }; meta = { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 1f75f3cc44b9..cd411d75404c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -10,8 +10,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "8850b2ee1acb69266f8697c3741f34cca80cad61"; - sha256 = "sha256-7koWRb0ifMwHdtpjV6X4yTiKmK7zVCdIJlewkY5Vgzs="; + rev = "635f45bf06cc2fba9b5c3e1b0a06398bdd0ec718"; + sha256 = "sha256-tEfejuJ7cBVXfSiee1kE4EWqYqBWiLtQABE2PKCbZbM="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index e706d9ef881a..dc587600e407 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -1,6 +1,6 @@ # frozen_string_literal: true -ruby "~> 3.4" +ruby ">= 3.4", "< 4.1" source "https://rubygems.org" # if there is a super emergency and rubygems is playing up, try @@ -73,7 +73,6 @@ gem "unf", require: false gem "email_reply_trimmer" -gem "image_optim" gem "multi_json" gem "mustache" gem "liquid", "5.12.0" @@ -201,7 +200,7 @@ gem "pitchfork", require: false # Used by discourse-prometheus to collect socket queue stats. # Was previously a transitive dependency of the unicorn gem. -gem "raindrops", require: false, platform: :ruby +gem "raindrops", git: "https://github.com/discourse/raindrops", require: false, platform: :ruby gem "rbtrace", require: false, platform: :mri diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 173b0a828fff..47f79257ba8b 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: https://github.com/discourse/raindrops + revision: d2ef03efc23504db76a9fd92eb35f508ac4f7546 + specs: + raindrops (0.20.1) + PATH remote: migrations/converters specs: @@ -225,9 +231,8 @@ GEM email_reply_trimmer (0.4.0) erb (6.0.7) erubi (1.13.1) - excon (1.7.1) + excon (1.8.0) logger - exifr (1.5.1) extralite-bundle (3.0.1) fabrication (3.0.0) faker (3.5.3) @@ -255,7 +260,6 @@ GEM fiber-local (1.1.0) fiber-storage fiber-storage (1.0.1) - fspath (3.1.2) globalid (1.4.0) activesupport (>= 6.1) goldiloader (6.0.0) @@ -294,14 +298,6 @@ GEM http_accept_language (2.1.1) i18n (1.14.8) concurrent-ruby (~> 1.0) - image_optim (0.32.0) - exifr (~> 1.2, >= 1.2.2) - fspath (~> 3.0) - image_size (>= 1.5, < 4) - in_threads (~> 1.3) - progress (~> 3.0, >= 3.0.1) - image_size (3.6.0) - in_threads (1.6.0) inflection (1.0.0) io-console (0.9.2) irb (1.18.0) @@ -323,7 +319,7 @@ GEM simpleidn (~> 0.2) jwt (3.2.0) base64 - landlock (0.5.1) + landlock (0.6.0) language_server-protocol (3.17.0.6) libv8-node (24.12.0.1) libv8-node (24.12.0.1-aarch64-linux) @@ -511,7 +507,6 @@ GEM prettier_print (1.2.1) prettyprint (0.2.0) prism (1.9.0) - progress (3.6.0) propshaft (1.3.2) actionpack (>= 7.0.0) activesupport (>= 7.0.0) @@ -563,7 +558,6 @@ GEM tsort (>= 0.2) zeitwerk (~> 2.6) rainbow (3.1.1) - raindrops (0.20.1) rake (13.4.2) rake-compiler-dock (1.12.0) rb-fsevent (0.11.2) @@ -903,7 +897,6 @@ DEPENDENCIES highline htmlentities http_accept_language - image_optim inflection iso8601 json @@ -964,7 +957,7 @@ DEPENDENCIES rails_failover rails_multisite railties (~> 8.1.0) - raindrops + raindrops! rake rb-fsevent rbtrace @@ -1088,8 +1081,7 @@ CHECKSUMS email_reply_trimmer (0.4.0) sha256=cdb8e90649f0d3972c17392063af052e337d13902f5a33a04fac900d544f8f57 erb (6.0.7) sha256=c5ca6dc25b0ef974a44dc8f59fe847577122483b1968a38dec305c60bf91ee92 erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9 - excon (1.7.1) sha256=dd2d870eece1b5ce4e4f9efd938e67a69ccd8c003c3825b638b937e1082eaac2 - exifr (1.5.1) sha256=ad87a5dbc92946fbf1d8ccd178d557d95d9168e8b3c5c5f381ea2bffcc312521 + excon (1.8.0) sha256=56d414519bff28bf95dd800ad4690a2fc0b8a49caf00367b70ecdbac71f91c93 extralite-bundle (3.0.1) sha256=49b9b6d459b194b44519d80936d6a98a9e54522e34a8a725fd4e81fdb3944aac fabrication (3.0.0) sha256=a6a0bfad9071348ad3cb1701df788524b888c0cdd044b988893e7509f7463be3 faker (3.5.3) sha256=b961482dc0bb15ccb9a98ea7878b925669e9ae8f5e59b607da540b768137d765 @@ -1109,7 +1101,6 @@ CHECKSUMS fiber-annotation (0.2.0) sha256=7abfadf1d119f508867d4103bf231c0354d019cc39a5738945dec2edadaf6c03 fiber-local (1.1.0) sha256=c885f94f210fb9b05737de65d511136ea602e00c5105953748aa0f8793489f06 fiber-storage (1.0.1) sha256=f48e5b6d8b0be96dac486332b55cee82240057065dc761c1ea692b2e719240e1 - fspath (3.1.2) sha256=b5ac9bafb97e2c8f8f9e303cd98ebd484be76fe9aa588bc4d01c6d99e78c9d75 globalid (1.4.0) sha256=037f12fbf1d9d7a014d501c2d5c77356fd4ddd96d7a7991d6700bba96706f427 goldiloader (6.0.0) sha256=613db1b28e9964291255a67a521f04d481b6afd6b9ca56ea1a612fd86e9a89c7 google-protobuf (4.36.1) sha256=893ac9d66b36b6ea50da5418f856bc7c2d2072099a578aeefc2d7757dcab6a77 @@ -1128,9 +1119,6 @@ CHECKSUMS htmlentities (4.4.2) sha256=bbafbdf69f2eca9262be4efef7e43e6a1de54c95eb600f26984f71d2fe96c5c3 http_accept_language (2.1.1) sha256=0043f0d55a148cf45b604dbdd197cb36437133e990016c68c892d49dbea31634 i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5 - image_optim (0.32.0) sha256=457d5ea28ee93244c2aabc7134e06455587fb670f210e88e1be40aea882c2ba3 - image_size (3.6.0) sha256=1b9c4196cb658bf503a887920543a3991e927a4b767a5c770fb9665bce0dcb28 - in_threads (1.6.0) sha256=91a7e6138d279dc632f59b8a9a409e47148948e297c0f69c92f9a2479a182149 inflection (1.0.0) sha256=ceba9b26fc28b9af82e33e822d28f78a4312af75687efec81d5ef1062498d355 io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -1141,7 +1129,7 @@ CHECKSUMS json_completer (1.2.0) sha256=4665749172634eccb208c562eb59ea81dd7a612a1fa9a36df441ac473ff177b1 json_schemer (2.5.0) sha256=2f01fb4cce721a4e08dd068fc2030cffd0702a7f333f1ea2be6e8991f00ae396 jwt (3.2.0) sha256=5419b1fe37b1da0982bd07051f573a8b8789ab724c2aa7e785e4784a3ed217d7 - landlock (0.5.1) sha256=4c66c5ea238ce0fb4dbf0ea8697da3af01f396f86b34f1f5c323969bc524eba0 + landlock (0.6.0) sha256=fb8ae70640636a170770dcd28c77a5a0e29d4edce29f9f421b6d641f02f6f3b6 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 libv8-node (24.12.0.1) sha256=d93d23b861bfe5de3ba829e34a142402fb83b4c3592dd58d9ac4e027588d739a libv8-node (24.12.0.1-aarch64-linux) sha256=22bd0246cde85d70c88cf772727ac3677a20ac1d169105f82efe5f1f7c39f755 @@ -1235,7 +1223,6 @@ CHECKSUMS prettier_print (1.2.1) sha256=a72838b5f23facff21f90a5423cdcdda19e4271092b41f4ea7f50b83929e6ff9 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - progress (3.6.0) sha256=360ed306dfa43d6174e847d563c70736dca249e2333cfec4b0387306c86cd573 propshaft (1.3.2) sha256=1d56a3e56a92c21bfc29caf07406b5386b00d4c47ddf357cf989a5a234b1389e pry (0.16.0) sha256=d76c69065698ed1f85e717bd33d7942c38a50868f6b0673c636192b3d1b6054e pry-rails (0.3.11) sha256=a69e28e24a34d75d1f60bcf241192a54253f8f7ef8a62cba1e75750a9653593d @@ -1254,7 +1241,7 @@ CHECKSUMS rails_multisite (9.0.0) sha256=2bc88f0405cb88d1055712095a11c4eb8ce1d4a36599d1226c6779946be495e6 railties (8.1.3.1) sha256=2388a232579a00cefea4487de66c8553c3408c1300abdc6cf1799d86ffb04487 rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a - raindrops (0.20.1) sha256=aa0eb9ff6834f2d9e232ba688bd49cb30be893bc5a3452e74722c94c1fab4730 + raindrops (0.20.1) rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 61d4903a63a4..71ef7c66dfec 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -986,20 +986,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hma5q4f2dxr72v2af1w026cv756cy797zcy9x7cxdg1xh78fbfx"; + sha256 = "14qwz5qsrnzcf1xkc05gkjjbih1g19lx82l0vnavya7zkd8i9m2n"; type = "gem"; }; - version = "1.7.1"; - }; - exifr = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0895676gyazah7rwbidkx1l92pfrazapilfcv3qznii9r7dsb1xd"; - type = "gem"; - }; - version = "1.5.1"; + version = "1.8.0"; }; extralite-bundle = { groups = [ @@ -1180,16 +1170,6 @@ src: { }; version = "1.0.1"; }; - fspath = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xcxikkrjv8ws328nn5ax5pyfjs8pn7djg1hks7qyb3yp6prpb5m"; - type = "gem"; - }; - version = "3.1.2"; - }; globalid = { dependencies = [ "activesupport" ]; groups = [ "default" ]; @@ -1330,43 +1310,6 @@ src: { }; version = "1.14.8"; }; - image_optim = { - dependencies = [ - "exifr" - "fspath" - "image_size" - "in_threads" - "progress" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "18rb5j4fl2p43f7fh47jf2v7yn2mckh38wdwmb148cp9isi5wza5"; - type = "gem"; - }; - version = "0.32.0"; - }; - image_size = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0a6b1p75nrmr1xvmqykn9dx947lrld1hb4l7m01zb2v5rfb4370v"; - type = "gem"; - }; - version = "3.6.0"; - }; - in_threads = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0j9132d4g8prjafgdh4pw948j527kr09m2lvylrcd797il9yd9wi"; - type = "gem"; - }; - version = "1.6.0"; - }; inflection = { groups = [ "default" ]; platforms = [ ]; @@ -1506,10 +1449,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "187b4k2rp5i3qgsz2d3bz2bg60dgldynka0fpx6zpq4c4gmcarjc"; + sha256 = "1dpkyq11yr3d3d19z7z2vi79vqm0lmvqrlnwf03ifsk3803fg2pv"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.0"; }; language_server-protocol = { groups = [ @@ -2582,16 +2525,6 @@ src: { }; version = "1.9.0"; }; - progress = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wymdk40cwrqn32gwg1kw94s5p1n0z3n7ma7x1s62gd4vw3d63in"; - type = "gem"; - }; - version = "3.6.0"; - }; propshaft = { dependencies = [ "actionpack" @@ -2884,9 +2817,11 @@ src: { } ]; source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0c27mcglrj928zkm4d2spj9yh2xkkka8ns5s6bidkwild3zvj3ma"; - type = "gem"; + fetchSubmodules = false; + rev = "d2ef03efc23504db76a9fd92eb35f508ac4f7546"; + sha256 = "1i2dgxiqamkp18591pnp0xdf2ichyxax31jb11zcbvpi31wpzvf6"; + type = "git"; + url = "https://github.com/discourse/raindrops"; }; version = "0.20.1"; }; diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 83247dab10ca..de6f2bc51364 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -112,6 +112,7 @@ let knownVulnerabilities = (lib.optional eol "Garage version ${version} is EOL"); inherit broken; mainProgram = "garage"; + platforms = lib.platforms.linux; }; }; in @@ -123,9 +124,9 @@ rec { }; garage_2 = generic { - version = "2.4.1"; - hash = "sha256-+3w4R0IGxc7GCVW3t7Izt6Y5PVUjxHsdLrr74ckR9Mg="; - cargoHash = "sha256-G928EsavtEgxugLzpBGSbo2RMHLzu9PZf9r3GqU5J3E="; + version = "2.5.0"; + hash = "sha256-5jWgH+hi0Ouqszapw00KOBHFjxlV/y4T7IB22IRaEHE="; + cargoHash = "sha256-xk1lMNnGp4qWK7BvgdUKIvc+cR5HDw0GFfV6q64yMso="; }; garage = garage_1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f92c24bc156..6127f60482dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6828,6 +6828,7 @@ with pkgs; openssl_3_5 openssl_3_6 openssl_4_0 + openssl_4_1 ; # pcre32 seems unused