diff options
125 files changed, 1813 insertions, 1112 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 11295ab1cc50..a7f18929b11b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8623,6 +8623,13 @@ githubId = 52276064; name = "figboy9"; }; + figsoda = { + email = "figsoda@pm.me"; + matrix = "@figsoda:matrix.org"; + github = "figsoda"; + githubId = 40620903; + name = "figsoda"; + }; fionera = { email = "nix@fionera.de"; github = "fionera"; @@ -17325,6 +17332,12 @@ githubId = 20436235; name = "Billy Zaelani Malik"; }; + mio = { + name = "Mio"; + email = "mio@mio19.uk"; + github = "mio-19"; + githubId = 57285379; + }; mir06 = { email = "armin.leuprecht@uni-graz.at"; github = "mir06"; diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index d35b554cbff8..a7e2010fe10e 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -65,12 +65,17 @@ "module-services-keycloak-unix-socket": [ "index.html#module-services-keycloak-unix-socket" ], - "module-services-tandoor-recipes-migrating-media-option-1": [ + "module-services-tandoor-recipes-migrating-media-option-move": [ + "index.html#module-services-tandoor-recipes-migrating-media-option-move", "index.html#module-services-tandoor-recipes-migrating-media-option-1" ], - "module-services-tandoor-recipes-migrating-media-option-2": [ + "module-services-tandoor-recipes-migrating-media-option-postgresql": [ + "index.html#module-services-tandoor-recipes-migrating-media-option-postgresql", "index.html#module-services-tandoor-recipes-migrating-media-option-2" ], + "module-services-tandoor-recipes-migrating-media-option-disallow-access": [ + "index.html#module-services-tandoor-recipes-migrating-media-option-disallow-access" + ], "sec-override-nixos-test": [ "index.html#sec-override-nixos-test" ], diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index e9955859bffd..aa8f06d1c7f2 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -7,19 +7,22 @@ let sanitizeUTF8Capitalization = lang: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] lang); - aggregatedLocales = [ - "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}" - ] - ++ lib.pipe config.i18n.extraLocaleSettings [ - # See description of extraLocaleSettings for why is this ignored here. - (x: lib.removeAttrs x [ "LANGUAGE" ]) - (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v))) - (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8"))) - ] - ++ (map sanitizeUTF8Capitalization ( - lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales - )) - ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales); + aggregatedLocales = + lib.optionals (config.i18n.defaultLocale != "C") [ + "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}" + ] + ++ lib.pipe config.i18n.extraLocaleSettings [ + # See description of extraLocaleSettings for why is this ignored here. + (x: lib.removeAttrs x [ "LANGUAGE" ]) + (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v))) + # C locales are always installed + (lib.filterAttrs (n: v: v != "C")) + (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8"))) + ] + ++ (map sanitizeUTF8Capitalization ( + lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales + )) + ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales); in { ###### interface @@ -111,6 +114,9 @@ in description = '' Per each {option}`i18n.extraLocaleSettings`, choose the character set to use for it. Essentially defaults to UTF-8 for all of them. + + Note that for a locale category that uses the `C` locale, setting a + character set to it via this setting is ignored. ''; }; diff --git a/nixos/modules/services/misc/tandoor-recipes.md b/nixos/modules/services/misc/tandoor-recipes.md index 762ab56c5c6d..7888805eff70 100644 --- a/nixos/modules/services/misc/tandoor-recipes.md +++ b/nixos/modules/services/misc/tandoor-recipes.md @@ -1,19 +1,53 @@ # Tandoor Recipes {#module-services-tandoor-recipes} -## Dealing with `MEDIA_ROOT` for installations prior 26.05 {#module-services-tandoor-recipes-migrating-media} +## Remediating insecure `MEDIA_ROOT` for installations prior to 26.05 {#module-services-tandoor-recipes-migrating-media} -See https://github.com/NixOS/nixpkgs/issues/338339 for some background. +Tandoor Recipes installations initialized with `system.stateVersion < 26.05` +may suffer from a security vulnerability. To remediate this issue, apply one of +the recommendations below. -### Option 1: Migrate media to new `MEDIA_ROOT` {#module-services-tandoor-recipes-migrating-media-option-1} +See [NixOS/nixpkgs#338339](https://github.com/NixOS/nixpkgs/issues/338339) and +[GHSA-g8w3-p77x-mmxh](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-g8w3-p77x-mmxh) +for some background. + +### Recommended: Move `MEDIA_ROOT` into a subdirectory {#module-services-tandoor-recipes-migrating-media-option-move} + +The issue is only present when `MEDIA_ROOT` is the same as the data directory. Moving it into a subdirectory of `/var/lib/tandoor-recipes` remediates this and any similar issues in the future. 1. Stop the currently running service: `systemctl stop tandoor-recipes.service` 2. Create a media folder. NixOS `26.05` creates the media path at `/var/lib/tandoor-recipes/media` by default, but you may choose any other path as well. `mkdir -p /var/lib/tandoor-recipes/media` 3. Move existing media to the new path: `mv /var/lib/tandoor-recipes/{files,recipes} /var/lib/tandoor-recipes/media` 4. Set `services.tandoor-recipes.extraConfig.MEDIA_ROOT = "/var/lib/tandoor-recipes/media";` in your NixOS configuration (not needed if `system.stateVersion >= 26.05`). -5. Rebuild and switch! +5. If not using `GUNICORN_MEDIA`, update your reverse proxy / web server configuration accordingly. +6. Rebuild and switch! These changes can be reverted by moving the files back into the state directory. -### Option 2: Keep existing directory (may be insecure) {#module-services-tandoor-recipes-migrating-media-option-2} +### Not recommended: Switch to PostgreSQL {#module-services-tandoor-recipes-migrating-media-option-postgresql} + +When using an external database like PostgreSQL (the only other option available in Tandoor Recipes) this issue does not manifest. + +A simple PostgreSQL configuration can be enabled using the option +[`services.tandoor-recipes.database.createLocally`](https://search.nixos.org/options?channel=unstable&show=services.tandoor-recipes.database.createLocally). + +Note that this will require migrating the existing database to PostgreSQL. Refer to the [upstream documentation](https://docs.tandoor.dev/system/migration_sqlite-postgres/) for this procedure. It is important to delete or move the `db.sqlite3` file out of the media path, after this has been done. + +More information on configuring PostgreSQL can be found in the [upstream documentation](https://docs.tandoor.dev/system/configuration/#database). + +Set the following option to ignore the evaluation warnings once `db.sqlite3` has been deleted. + +```nix +{ + services.tandoor-recipes.extraConfig.MEDIA_ROOT = "/var/lib/tandoor-recipes"; +} +``` + +As future releases of Tandoor Recipes could add additional files to the data +directory, this is not a future-proof solution. + +### Not recommended: Disallow access to `db.sqlite3` {#module-services-tandoor-recipes-migrating-media-option-disallow-access} + +When using a web server like nginx, access to this file can be disabled. -To keep the existing directory, set `services.tandoor-recipes.extraConfig.MEDIA_ROOT = "/var/lib/tandoor-recipes";`. +As future releases of Tandoor Recipes could add additional files to the data +directory, this is not a future-proof solution. diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 3751fa5e57fd..1e21fe20d714 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -104,6 +104,8 @@ in config = mkIf cfg.enable (mkMerge [ { + system.switch.inhibitors.dbus-implementation = cfg.implementation; + environment.etc."dbus-1".source = configDir; environment.pathsToLink = [ diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix index 6f713d905141..b4b128dfa03d 100644 --- a/nixos/modules/services/web-apps/part-db.nix +++ b/nixos/modules/services/web-apps/part-db.nix @@ -153,6 +153,9 @@ in // cfg.poolConfig; }; + # Required for symphony + part-db.settings.APP_SHARE_DIR = "/var/lib/part-db/share"; + postgresql = mkIf cfg.enablePostgresql { enable = true; ensureUsers = [ @@ -173,7 +176,7 @@ in root = "${pkg}/public"; locations = { "/" = { - tryFiles = "$uri $uri/ /index.php"; + tryFiles = "$uri $uri/ /index.php?$query_string"; index = "index.php"; extraConfig = '' sendfile off; diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index 0b840c978fb8..f6aeb70d7aa4 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -32,12 +32,12 @@ }; inhibitors = lib.mkOption { - type = lib.types.listOf lib.types.pathInStore; - default = [ ]; + type = lib.types.attrsOf lib.types.str; + default = { }; description = '' - List of derivations that will prevent switching into a configuration when + Attribute set of strings that will prevent switching into a configuration when they change. - This can be manually overridden on the command line if required. + The switch can be manually forced on the command line if required. ''; }; }; @@ -67,80 +67,86 @@ ln -s ${config.system.build.inhibitSwitch} $out/switch-inhibitors ''; - build.inhibitSwitch = pkgs.writeTextFile { - name = "switch-inhibitors"; - text = lib.concatMapStringsSep "\n" (drv: drv.outPath) config.system.switch.inhibitors; - }; + build.inhibitSwitch = pkgs.writers.writeJSON "switch-inhibitors" config.system.switch.inhibitors; preSwitchChecks.switchInhibitors = let realpath = lib.getExe' pkgs.coreutils "realpath"; - sha256sum = lib.getExe' pkgs.coreutils "sha256sum"; - diff = lib.getExe' pkgs.diffutils "diff"; + mktemp = lib.getExe' pkgs.coreutils "mktemp"; + rm = lib.getExe' pkgs.coreutils "rm"; + jq = lib.getExe' pkgs.jq "jq"; in - lib.mkIf (lib.length config.system.switch.inhibitors > 0) - # bash - '' - incoming="''${1-}" - action="''${2-}" - - if [ "$action" == "boot" ]; then - echo "Not checking switch inhibitors (action = $action)" - exit - fi - - echo -n "Checking switch inhibitors..." - - booted_inhibitors="$(${realpath} /run/booted-system)/switch-inhibitors" - booted_inhibitors_sha="$( - if [ -f "$booted_inhibitors" ]; then - ${sha256sum} - < "$booted_inhibitors" - else - echo 'none' - fi - )" - - if [ "$booted_inhibitors_sha" == "none" ]; then - echo - echo "The previous configuration did not specify switch inhibitors, nothing to check." - exit - fi - - new_inhibitors="$(${realpath} "$incoming")/switch-inhibitors" - new_inhibitors_sha="$( - if [ -f "$new_inhibitors" ]; then - ${sha256sum} - < "$new_inhibitors" - else - echo 'none' - fi - )" - - if [ "$new_inhibitors_sha" == "none" ]; then - echo - echo "The new configuration does not specify switch inhibitors, nothing to check." - exit - fi - - if [ "$new_inhibitors_sha" != "$booted_inhibitors_sha" ]; then - echo - echo "Found diff in switch inhibitors:" - echo - ${diff} --color "$booted_inhibitors" "$new_inhibitors" - echo - echo "The new configuration contains changes to packages that were" - echo "listed as switch inhibitors." - echo "You probably want to run 'nixos-rebuild boot' and reboot your system." - echo - echo "If you really want to switch into this configuration directly, then" - echo "you can set NIXOS_NO_CHECK=1 to ignore pre-switch checks." - echo - echo "WARNING: doing so might cause the switch to fail or your system to become unstable." - echo - exit 1 - else - echo " done" - fi - ''; + # bash + '' + incoming="''${1-}" + action="''${2-}" + + if [ "$action" == "boot" ]; then + echo "Not checking switch inhibitors (action = $action)" + exit + fi + + echo -n "Checking switch inhibitors..." + + # Create a temporary file that we use in case a generation does not have + # the switch-inhibitors file. + empty="$(${mktemp} -t switch_inhibit.XXXX)" + # shellcheck disable=SC2329 + clean_up() { + ${rm} -f "$empty" + } + trap clean_up EXIT + echo "{}" > "$empty" + + current_inhibitors="$(${realpath} /run/current-system)/switch-inhibitors" + if [ ! -f "$current_inhibitors" ]; then + current_inhibitors="$empty" + fi + + new_inhibitors="$(${realpath} "$incoming")/switch-inhibitors" + if [ ! -f "$new_inhibitors" ]; then + new_inhibitors="$empty" + fi + + diff="$( + ${jq} \ + --raw-output \ + --null-input \ + --rawfile current "$current_inhibitors" \ + --rawfile newgen "$new_inhibitors" \ + ' + $current | try fromjson catch {} as $old | + $newgen | try fromjson catch {} as $new | + $old | + to_entries | + map( + select(.key | in ($new)) | + select(.value != $new.[.key]) | + [ .key, ":", .value, "->", $new.[.key] ] | join(" ") + ) | + join("\n") + ' \ + )" + + if [ -n "$diff" ]; then + echo + echo "There are changes to critical components of the system:" + echo + echo "$diff" + echo + echo "Switching into this system is not recommended." + echo "You probably want to run 'nixos-rebuild boot' and reboot your system instead." + echo + echo "If you really want to switch into this configuration directly, then" + echo "you can set NIXOS_NO_CHECK=1 to ignore pre-switch checks." + echo + echo "WARNING: doing so might cause the switch to fail or your system to become unstable." + echo + exit 1 + else + echo " done" + fi + ''; }; security = diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index bca27762a493..3da2a4c24dc4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1208,6 +1208,7 @@ in paperless = runTest ./paperless.nix; paretosecurity = runTest ./paretosecurity.nix; parsedmarc = handleTest ./parsedmarc { }; + part-db = runTest ./web-apps/part-db.nix; pass-secret-service = runTest ./pass-secret-service.nix; password-option-override-ordering = runTest ./password-option-override-ordering.nix; patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { }; diff --git a/nixos/tests/i18n.nix b/nixos/tests/i18n.nix index a0493b7c62f5..77f0cc579d5d 100644 --- a/nixos/tests/i18n.nix +++ b/nixos/tests/i18n.nix @@ -38,6 +38,32 @@ }; }; }; + Csimple = { + i18n = { + defaultLocale = "C"; + }; + }; + CnonDefault = { + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_COLLATE = "C"; + LC_MESSAGES = "C"; + LC_TIME = "C"; + }; + }; + }; }; - testScript = { nodes, ... }: ""; + testScript = + { nodes, ... }: + lib.pipe nodes [ + builtins.attrNames + (map (node: '' + ${node}.copy_from_vm( + ${node}.succeed("readlink -f /etc/locale.conf").strip(), + "${node}" + ) + '')) + (lib.concatStringsSep "\n") + ]; } diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 3ff6dcbc4e02..07e80cb86abd 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -646,6 +646,23 @@ in EOF ''; }; + + no_inhibitors.configuration.system.switch.inhibitors = lib.mkForce { }; + + inhibitors.configuration.system.switch.inhibitors = lib.mkForce { + foo = "bar"; + quz = "bor"; + }; + + inhibitors_changed.configuration.system.switch.inhibitors = lib.mkForce { + foo = "baz"; + quz = "boz"; + }; + + inhibitors_new.configuration.system.switch.inhibitors = lib.mkForce { + foo = "bar"; + qux = "baz"; + }; }; }; @@ -658,6 +675,7 @@ in echo "this should succeed (config: $config, action: $action)" [ "$action" == "check" ] || [ "$action" == "test" ] ''; + boot.loader.grub.enable = false; specialisation.failingCheck.configuration.system.preSwitchChecks.failEveryTime = '' echo this will fail false @@ -745,6 +763,24 @@ in out = switch_to_specialisation("${otherSystem}", "failingCheck", action="check", fail=True) assert_contains(out, "this will fail") + with subtest("switch inhibitors"): + # Start without any inhibitors + switch_to_specialisation("${machine}", "no_inhibitors", action="switch") + # Check that we can switch into a generation with inhibitors from one that doesn't have any + switch_to_specialisation("${machine}", "inhibitors", action="switch") + # Check that we cannot switch into a generation that has a different value for an existing inhibitor + out = switch_to_specialisation("${machine}", "inhibitors_changed", action="switch", fail=True) + assert_contains(out, "There are changes to critical components of the system") + assert_contains(out, "foo") + assert_contains(out, "bar") + assert_contains(out, "baz") + # Confirm that we can set that same generation as the new boot default + switch_to_specialisation("${machine}", "inhibitors_changed", action="boot") + # Check that we can switch into a new generation with new inhibitors, but same values for existing ones + switch_to_specialisation("${machine}", "inhibitors_new", action="switch") + # Check that we can switch back into a generation without inhibitors + switch_to_specialisation("${machine}", "no_inhibitors", action="switch") + with subtest("actions"): # boot action out = switch_to_specialisation("${machine}", "simpleService", action="boot") diff --git a/nixos/tests/tandoor-recipes-media.nix b/nixos/tests/tandoor-recipes-media.nix index 9384c9765efa..3465090b2357 100644 --- a/nixos/tests/tandoor-recipes-media.nix +++ b/nixos/tests/tandoor-recipes-media.nix @@ -66,7 +66,7 @@ machine.succeed(f"curl --head {db_path} | grep \"HTTP/1.1 404 Not Found\"") - # Switch to NixOS 24.11 to check if the setup still functions the same + # Switch to NixOS 25.11 to check if the setup still functions the same # as before. stop_and_rm() machine.succeed("${oldVersion}/bin/switch-to-configuration test") @@ -77,7 +77,7 @@ machine.succeed(f"curl --head {db_path} | grep \"HTTP/1.1 200 OK\"") - # Switch to NixOS 24.11 with the MEDIA_ROOT already set to + # Switch to NixOS 25.11 with the MEDIA_ROOT already set to # /var/lib/tandoor-recipes/media. stop_and_rm() machine.succeed("${oldVersionOverrideMedia}/bin/switch-to-configuration test") diff --git a/nixos/tests/web-apps/part-db.nix b/nixos/tests/web-apps/part-db.nix new file mode 100644 index 000000000000..66e43b09a50e --- /dev/null +++ b/nixos/tests/web-apps/part-db.nix @@ -0,0 +1,22 @@ +{ lib, ... }: +{ + name = "part-db"; + meta.maintainers = with lib.maintainers; [ oddlama ]; + + nodes = { + machine = { + services.part-db.enable = true; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("postgresql.service") + machine.wait_for_unit("part-db-migrate.service") + machine.wait_for_unit("phpfpm-part-db.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + + machine.succeed("curl -L --fail http://localhost | grep 'Part-DB'", timeout=10) + ''; +} diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 86decf313fdb..01e2eb329ffa 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -52,6 +52,9 @@ rev = "3bd2036e710f609ea08fcfca5a1eb1169ecc114f"; hash = "sha256-VdfPZ39AEjvl+9r/LZNRGNIQsiTB9S065AnUc4MeohU="; }; + passthru.requires = [ + "html" + ]; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; apex = buildGrammar { @@ -75,6 +78,9 @@ rev = "53eb391da4c6c5857f8defa2c583c46c2594f565"; hash = "sha256-qQVUWCOZ4y9FTsIf0FI3vmYBhLYz4hcqRTo+5C2MYvc="; }; + passthru.requires = [ + "cpp" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino"; }; asm = buildGrammar { @@ -97,6 +103,9 @@ rev = "213f6e6973d9b456c6e50e86f19f66877e7ef0ee"; hash = "sha256-TpXs3jbYn39EHxTdtSfR7wLA1L8v9uyK/ATPp5v4WqE="; }; + passthru.requires = [ + "html" + ]; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; authzed = buildGrammar { @@ -405,6 +414,9 @@ rev = "12bd6f7e96080d2e70ec51d4068f2f66120dde35"; hash = "sha256-vmXTv6Idf0Le5ZVa8Rc1DVefqzUxkGeLGsYcSDNBpQU="; }; + passthru.requires = [ + "c" + ]; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { @@ -428,6 +440,9 @@ hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o="; }; location = "csv"; + passthru.requires = [ + "tsv" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv"; }; cuda = buildGrammar { @@ -439,6 +454,9 @@ rev = "48b066f334f4cf2174e05a50218ce2ed98b6fd01"; hash = "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ="; }; + passthru.requires = [ + "cpp" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cuda"; }; cue = buildGrammar { @@ -882,6 +900,9 @@ rev = "69086d7627c03e1f4baf766bcef14c60d9e92331"; hash = "sha256-U0P9QoOZST1h6XI83CI0/6/CDTvqkv1Yiq62h6YdHpI="; }; + passthru.requires = [ + "gap" + ]; meta.homepage = "https://github.com/gap-system/tree-sitter-gaptst"; }; gdscript = buildGrammar { @@ -1003,6 +1024,9 @@ rev = "12d98944c1d5077b957cbdb90d663a7c4d50118c"; hash = "sha256-3cJI6vcbU62kUIhphprNeAl9RyY9TThrzVeArdLfxnI="; }; + passthru.requires = [ + "typescript" + ]; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript"; }; glsl = buildGrammar { @@ -1014,6 +1038,9 @@ rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"; hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk="; }; + passthru.requires = [ + "c" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-glsl"; }; gn = buildGrammar { @@ -1268,6 +1295,9 @@ rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"; hash = "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8="; }; + passthru.requires = [ + "json" + ]; meta.homepage = "https://github.com/winston0410/tree-sitter-hjson"; }; hlsl = buildGrammar { @@ -1279,6 +1309,9 @@ rev = "bab9111922d53d43668fabb61869bec51bbcb915"; hash = "sha256-BWjgXtMN6y/0ahD44Cm8a+MxxVMpCNhkf33V/vsCBTU="; }; + passthru.requires = [ + "cpp" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { @@ -1422,6 +1455,9 @@ rev = "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"; hash = "sha256-vxe+g7o0gXgB4GjhjkxqLqcLL2+8wqMB3tm1xQFSitI="; }; + passthru.requires = [ + "c" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ispc"; }; janet_simple = buildGrammar { @@ -1478,6 +1514,9 @@ hash = "sha256-a4/+tsouuYkkVEStpOEUiIos9H4Hw7NhJOFaasylWUk="; }; location = "tree-sitter-jinja"; + passthru.requires = [ + "jinja_inline" + ]; meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja"; }; jinja_inline = buildGrammar { @@ -1788,6 +1827,9 @@ rev = "a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f"; hash = "sha256-5qbZA2mxTvrsfUrpgD+4y3oeJsifA91c/hfcVwQBRgI="; }; + passthru.requires = [ + "lua" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luau"; }; m68k = buildGrammar { @@ -1822,6 +1864,9 @@ hash = "sha256-IYqh6JT74deu1UU4Nyls9Eg88BvQeYEta2UXZAbuZek="; }; location = "tree-sitter-markdown"; + passthru.requires = [ + "markdown_inline" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"; }; markdown_inline = buildGrammar { @@ -1945,6 +1990,9 @@ rev = "4ad352773688deb84a95eeaa9872acda5b466439"; hash = "sha256-dinMmbD36o1QkcLk2mgycgHZ9sW5Mg6lfnxssynaj58="; }; + passthru.requires = [ + "nim_format_string" + ]; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; nim_format_string = buildGrammar { @@ -2011,6 +2059,9 @@ rev = "181a81b8f23a2d593e7ab4259981f50122909fda"; hash = "sha256-7W8ozhQJL+f+tQYz61EZexk9NkMu1pCAP5IIy1m3qak="; }; + passthru.requires = [ + "c" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-objc"; }; objdump = buildGrammar { @@ -2046,6 +2097,9 @@ hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o="; }; location = "grammars/interface"; + passthru.requires = [ + "ocaml" + ]; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocamllex = buildGrammar { @@ -2125,6 +2179,9 @@ hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo="; }; location = "php"; + passthru.requires = [ + "php_only" + ]; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { @@ -2259,6 +2316,9 @@ hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18="; }; location = "grammars/problog"; + passthru.requires = [ + "prolog" + ]; meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; }; prolog = buildGrammar { @@ -2327,6 +2387,9 @@ hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o="; }; location = "psv"; + passthru.requires = [ + "tsv" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv"; }; pug = buildGrammar { @@ -2712,6 +2775,9 @@ rev = "c478c6868648eff49eb04a4df90d703dc45b312a"; hash = "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c="; }; + passthru.requires = [ + "css" + ]; meta.homepage = "https://github.com/serenadeai/tree-sitter-scss"; }; sflog = buildGrammar { @@ -3126,6 +3192,9 @@ hash = "sha256-Kq0KtkF6xtZcN2s8KzYGyguJH2iOTlA2WRytZ+KGTUE="; }; location = "dialects/terraform"; + passthru.requires = [ + "hcl" + ]; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; textproto = buildGrammar { @@ -3227,6 +3296,9 @@ hash = "sha256-A0M6IBoY87ekSV4DfGHDU5zzFWdLjGqSyVr6VENgA+s="; }; location = "tsx"; + passthru.requires = [ + "typescript" + ]; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; turtle = buildGrammar { @@ -3528,6 +3600,9 @@ hash = "sha256-0ztP30xWqVWy5upWPp0JwhpQphOJufzlcYn+KvLejVs="; }; location = "xml"; + passthru.requires = [ + "dtd" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; xresources = buildGrammar { @@ -3642,18 +3717,29 @@ }; angular = buildQueries { language = "angular"; + requires = [ + "html" + "html_tags" + ]; }; apex = buildQueries { language = "apex"; }; arduino = buildQueries { language = "arduino"; + requires = [ + "cpp" + ]; }; asm = buildQueries { language = "asm"; }; astro = buildQueries { language = "astro"; + requires = [ + "html" + "html_tags" + ]; }; authzed = buildQueries { language = "authzed"; @@ -3738,15 +3824,24 @@ }; cpp = buildQueries { language = "cpp"; + requires = [ + "c" + ]; }; css = buildQueries { language = "css"; }; csv = buildQueries { language = "csv"; + requires = [ + "tsv" + ]; }; cuda = buildQueries { language = "cuda"; + requires = [ + "cpp" + ]; }; cue = buildQueries { language = "cue"; @@ -3870,6 +3965,9 @@ }; gaptst = buildQueries { language = "gaptst"; + requires = [ + "gap" + ]; }; gdscript = buildQueries { language = "gdscript"; @@ -3900,12 +3998,21 @@ }; glimmer_javascript = buildQueries { language = "glimmer_javascript"; + requires = [ + "ecma" + ]; }; glimmer_typescript = buildQueries { language = "glimmer_typescript"; + requires = [ + "typescript" + ]; }; glsl = buildQueries { language = "glsl"; + requires = [ + "c" + ]; }; gn = buildQueries { language = "gn"; @@ -3975,9 +4082,15 @@ }; hjson = buildQueries { language = "hjson"; + requires = [ + "json" + ]; }; hlsl = buildQueries { language = "hlsl"; + requires = [ + "cpp" + ]; }; hlsplaylist = buildQueries { language = "hlsplaylist"; @@ -3990,6 +4103,9 @@ }; html = buildQueries { language = "html"; + requires = [ + "html_tags" + ]; }; html_tags = buildQueries { language = "html_tags"; @@ -4020,6 +4136,9 @@ }; ispc = buildQueries { language = "ispc"; + requires = [ + "c" + ]; }; janet_simple = buildQueries { language = "janet_simple"; @@ -4032,9 +4151,16 @@ }; javascript = buildQueries { language = "javascript"; + requires = [ + "ecma" + "jsx" + ]; }; jinja = buildQueries { language = "jinja"; + requires = [ + "jinja_inline" + ]; }; jinja_inline = buildQueries { language = "jinja_inline"; @@ -4122,6 +4248,9 @@ }; luau = buildQueries { language = "luau"; + requires = [ + "lua" + ]; }; m68k = buildQueries { language = "m68k"; @@ -4131,6 +4260,9 @@ }; markdown = buildQueries { language = "markdown"; + requires = [ + "markdown_inline" + ]; }; markdown_inline = buildQueries { language = "markdown_inline"; @@ -4164,6 +4296,9 @@ }; nim = buildQueries { language = "nim"; + requires = [ + "nim_format_string" + ]; }; nim_format_string = buildQueries { language = "nim_format_string"; @@ -4182,6 +4317,9 @@ }; objc = buildQueries { language = "objc"; + requires = [ + "c" + ]; }; objdump = buildQueries { language = "objdump"; @@ -4191,6 +4329,9 @@ }; ocaml_interface = buildQueries { language = "ocaml_interface"; + requires = [ + "ocaml" + ]; }; ocamllex = buildQueries { language = "ocamllex"; @@ -4212,6 +4353,9 @@ }; php = buildQueries { language = "php"; + requires = [ + "php_only" + ]; }; php_only = buildQueries { language = "php_only"; @@ -4248,6 +4392,9 @@ }; problog = buildQueries { language = "problog"; + requires = [ + "prolog" + ]; }; prolog = buildQueries { language = "prolog"; @@ -4266,6 +4413,9 @@ }; psv = buildQueries { language = "psv"; + requires = [ + "tsv" + ]; }; pug = buildQueries { language = "pug"; @@ -4290,6 +4440,9 @@ }; qmljs = buildQueries { language = "qmljs"; + requires = [ + "ecma" + ]; }; query = buildQueries { language = "query"; @@ -4371,6 +4524,9 @@ }; scss = buildQueries { language = "scss"; + requires = [ + "css" + ]; }; sflog = buildQueries { language = "sflog"; @@ -4443,6 +4599,9 @@ }; svelte = buildQueries { language = "svelte"; + requires = [ + "html_tags" + ]; }; sway = buildQueries { language = "sway"; @@ -4482,6 +4641,9 @@ }; terraform = buildQueries { language = "terraform"; + requires = [ + "hcl" + ]; }; textproto = buildQueries { language = "textproto"; @@ -4509,6 +4671,11 @@ }; tsx = buildQueries { language = "tsx"; + requires = [ + "ecma" + "jsx" + "typescript" + ]; }; turtle = buildQueries { language = "turtle"; @@ -4518,6 +4685,9 @@ }; typescript = buildQueries { language = "typescript"; + requires = [ + "ecma" + ]; }; typespec = buildQueries { language = "typespec"; @@ -4569,6 +4739,9 @@ }; vue = buildQueries { language = "vue"; + requires = [ + "html_tags" + ]; }; wgsl = buildQueries { language = "wgsl"; @@ -4590,6 +4763,9 @@ }; xml = buildQueries { language = "xml"; + requires = [ + "dtd" + ]; }; xresources = buildQueries { language = "xresources"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 9786265ec6de..3e6ed03ace08 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -17,12 +17,15 @@ let inherit (neovimUtils) grammarToPlugin; buildQueries = - { language }: + { + language, + requires ? [ ], + }: vimUtils.toVimPlugin ( runCommand "nvim-treesitter-queries-${language}" { passthru = { - inherit language; + inherit language requires; isTreesitterQuery = true; }; meta.description = "Queries for ${language} from nvim-treesitter"; @@ -45,18 +48,50 @@ let inherit (generated) parsers queries; - parsersWithMeta = lib.mapAttrs ( + queriesWithDeps = lib.mapAttrs ( + lang: query: + let + requires = query.requires or [ ]; + dependencies = map (req: queries.${req}) requires; + in + if dependencies != [ ] then + query.overrideAttrs (old: { + passthru = old.passthru or { } // { + inherit dependencies; + }; + }) + else + query + ) queries; + + parsersWithQueries = lib.mapAttrs ( lang: parser: - if lib.hasAttr lang queries then + if lib.hasAttr lang queriesWithDeps then parser.overrideAttrs (old: { - passthru = (old.passthru or { }) // { - associatedQuery = queries.${lang}; + passthru = old.passthru or { } // { + associatedQuery = queriesWithDeps.${lang}; }; }) else parser ) parsers; + parsersWithMeta = lib.mapAttrs ( + lang: parser: + let + requires = parser.requires or [ ]; + dependencies = map (req: grammarToPlugin parsersWithQueries.${req}) requires; + in + if dependencies != [ ] then + parser.overrideAttrs (old: { + passthru = old.passthru or { } // { + inherit dependencies; + }; + }) + else + parser + ) parsersWithQueries; + # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins` # for example, for ocaml_interface, the following aliases will be added # ocaml-interface @@ -92,7 +127,7 @@ let grammarPlugins = map grammarToPlugin selectedGrammars; queryPlugins = lib.pipe selectedGrammars [ - (map (g: g.passthru.associatedQuery or null)) + (map (g: g.associatedQuery or null)) (lib.filter (q: q != null)) ]; in @@ -115,9 +150,9 @@ in grammarToPlugin withPlugins withAllGrammars - queries ; + queries = queriesWithDeps; parsers = grammarPlugins; tests = { diff --git a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py index cc71c9495dc4..ce1ff9bdef87 100755 --- a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py @@ -15,12 +15,10 @@ log = logging.getLogger("vim-updater") NURR_JSON_URL = ( "https://raw.githubusercontent.com/lumen-oss/nurr/main/tree-sitter-parsers.json" ) -NVIM_TREESITTER_QUERIES_URL = ( - "https://api.github.com/repos/nvim-treesitter/nvim-treesitter/contents/runtime/queries" -) +NVIM_TREESITTER_QUERIES_URL = "https://api.github.com/repos/nvim-treesitter/nvim-treesitter/contents/runtime/queries" -def generate_grammar(lang, parser_info): +def generate_grammar(lang, parser_info, parsers_map): """Generate grammar for a language based on the parser info""" if "install_info" not in parser_info: log.warning(f"Parser {lang} does not have install_info, skipping") @@ -36,9 +34,7 @@ def generate_grammar(lang, parser_info): version = "0.0.0+rev={rev[:7]}"; src = """ - generated += subprocess.check_output( - ["nurl", url, rev, "--indent=6"], text=True - ) + generated += subprocess.check_output(["nurl", url, rev, "--indent=6"], text=True) generated += ";" location = install_info.get("location", "") @@ -50,6 +46,23 @@ def generate_grammar(lang, parser_info): generated += """ generate = true;""" + # Add requires field - only include parsers + requires = parser_info.get("requires", []) + if requires: + # Filter to only include parser dependencies (those with install_info) + parser_requires = [ + req + for req in requires + if req in parsers_map and "install_info" in parsers_map[req] + ] + if parser_requires: + generated += """ + passthru.requires = [ +""" + for req in parser_requires: + generated += f' "{req}"\n' + generated += " ];" + generated += f""" meta.homepage = "{url}"; }}; @@ -58,12 +71,28 @@ def generate_grammar(lang, parser_info): return generated -def generate_query(lang): +def generate_query(lang: str, parser_info: dict | None, queries_set: set[str]): """Generate query derivation for a language""" - return f""" {lang} = buildQueries {{ - language = "{lang}"; - }}; + generated = f""" {lang} = buildQueries {{ + language = "{lang}";""" + + # Add requires field for queries - include everything that has queries + if parser_info and "requires" in parser_info: + requires = parser_info["requires"] + # Filter to only include langs that have queries + query_requires = [req for req in requires if queries_set and req in queries_set] + if query_requires: + generated += """ + requires = [ """ + for req in query_requires: + generated += f' "{req}"\n' + generated += " ];" + + generated += """ + }; +""" + return generated def fetch_nurr_parsers(): @@ -111,9 +140,9 @@ def fetch_available_queries(): return languages -def process_parser_info(parser_info): +def process_parser_info(parser_info, parsers_map): """Process a single parser info entry and generate grammar for it""" - return generate_grammar(parser_info["lang"], parser_info) + return generate_grammar(parser_info["lang"], parser_info, parsers_map) def update_grammars(): @@ -121,6 +150,9 @@ def update_grammars(): parsers_info = fetch_nurr_parsers() queries_list = fetch_available_queries() + # Create a mapping of lang -> parser_info for quick lookup + parsers_map = {p["lang"]: p for p in parsers_info} + generated_file = """# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py # Using parser data from https://github.com/nvim-neorocks/nurr/blob/main/tree-sitter-parsers.json @@ -141,7 +173,9 @@ def update_grammars(): # Process parsers in parallel for better performance with ThreadPoolExecutor(max_workers=5) as executor: - for generated in executor.map(process_parser_info, parsers_info): + for generated in executor.map( + lambda p: process_parser_info(p, parsers_map), parsers_info + ): generated_file += generated generated_file += """ }; @@ -149,9 +183,13 @@ def update_grammars(): queries = { """ - # Process queries + # Convert queries list to a set for fast lookup + queries_set = set(queries_list) + + # Process queries - include parser info if available for requires field for lang in queries_list: - generated_file += generate_query(lang) + parser_info = parsers_map.get(lang) + generated_file += generate_query(lang, parser_info, queries_set) generated_file += " };\n}\n" return generated_file diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index 4e994394f762..8230f8c72f3a 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2025-11-14"; + version = "0-unstable-2026-01-16"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "7e9b257b8a591cb7e00f9e55371edba19db9799c"; - hash = "sha256-LBx4bSnE3XeQw/Bc5EID8U6Dxj7uc6JBrV8vSwO/jEM="; + rev = "6d182b22f6b9430c76ea71579ffb2eee0e2e9521"; + hash = "sha256-QHkG5CSZgaakblOgp5HxGvtWg8K4Nbag481nhG4UjoY="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index ba6f3c6c58c8..e3260d8b3d00 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2026-01-05"; + version = "0-unstable-2026-01-16"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "9e119625ae7aab771c6f12e6e5ffccfd24b3bd4d"; - hash = "sha256-Zso1EmJ+JH+eynV87tBUWGq9sPqhMwSHmc4gbF94btE="; + rev = "b9b7bfaa2d9e40ca5b94af1f6e9ec77332e4f6c3"; + hash = "sha256-92lHdfYlITWPO4uVzVf3l+rm3RPyUu7/dO6h9t/+A4Q="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 99d0f4bd1a68..2c88fd184cfa 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -62,19 +62,20 @@ mkChromiumDerivation (base: rec { $out/share/applications/chromium-browser.desktop substituteInPlace $out/share/applications/chromium-browser.desktop \ - --replace "@@MENUNAME@@" "Chromium" \ - --replace "@@PACKAGE@@" "chromium" \ - --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" - - # Append more mime types to the end - sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ - $out/share/applications/chromium-browser.desktop + --replace-fail "@@MENUNAME@@" "Chromium" \ + --replace-fail "@@PACKAGE@@" "chromium" \ + --replace-fail "/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "chromium" \ + --replace-fail "@@URI_SCHEME@@" "x-scheme-handler/chromium;" \ + --replace-fail "@@EXTRA_DESKTOP_ENTRIES@@" "" # See https://github.com/NixOS/nixpkgs/issues/12433 - sed -i \ - -e '/\[Desktop Entry\]/a\' \ - -e 'StartupWMClass=chromium-browser' \ - $out/share/applications/chromium-browser.desktop + substituteInPlace $out/share/applications/chromium-browser.desktop \ + --replace-fail "[Desktop Entry]" "[Desktop Entry]''\nStartupWMClass=chromium-browser" + + if grep -F '@@' $out/share/applications/chromium-browser.desktop ; then + echo "error: chromium-browser.desktop contains unsubstituted placeholders" >&2 + exit 1 + fi ''; passthru = { inherit sandboxExecutableName; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 54b60d6c40e2..58895241493e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -959,13 +959,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-P0lxCwEBhkShLE3xJX7V1wxI+xjpgjepuTWYiXbRYBE=", + "hash": "sha256-SfUTt9Ag6pBC9a8rJERBCbccKgJYdNiI1UXoptZoYdw=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.76.7", + "rev": "v3.78.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xTlalKIWvU2MDBvwNjl3cWFVH26EyDthwrnXVmbK+rc=" + "vendorHash": "sha256-RyGnUzRkIR0XoEPc/cc+40QACAJhvOMENzJc1T0Yz40=" }, "ns1-terraform_ns1": { "hash": "sha256-pKdybFzTuuD6D76Uhuz+fLN+EmpDxUwjIWXYK6DRKOY=", diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 0ecbd3d277fe..451162118522 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -14,7 +14,14 @@ wrapQtAppsHook, }: -python3Packages.buildPythonApplication rec { +let + pythonPackages = python3Packages.overrideScope ( + final: prev: { + pyqt5 = prev.pyqt5.override { withWebSockets = true; }; + } + ); +in +pythonPackages.buildPythonApplication rec { pname = "gns3-gui"; inherit version; format = "setuptools"; @@ -28,20 +35,20 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - build-system = with python3Packages; [ setuptools ]; + build-system = with pythonPackages; [ setuptools ]; propagatedBuildInputs = [ qt5.qtwayland ]; dependencies = - with python3Packages; + with pythonPackages; [ distro jsonschema psutil + pyqt5 sentry-sdk setuptools sip - (pyqt5.override { withWebSockets = true; }) truststore ] ++ lib.optionals (pythonOlder "3.9") [ @@ -56,7 +63,7 @@ python3Packages.buildPythonApplication rec { doCheck = true; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = with pythonPackages; [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index de04bfb202a0..088527fe930a 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 = "146.0.1"; + version = "147.0"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/af/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/af/thunderbird-147.0.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d981a255991badddf6267838c55682cb1591c74be50db34e9e0d56b2058dd4c6"; + sha256 = "c5e28d2c01738c629f1abad0069eddf168a15583131177b5c596a3212a043b85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ar/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ar/thunderbird-147.0.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "90837a1812d292d4262c98003829d3f3dbe5ffa56f3e337c055512ac8ec33f8d"; + sha256 = "f767b82448c053fba33cc2096eeb21cb8cddd63f3162fc1a5a67dbd956dc964a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ast/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ast/thunderbird-147.0.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b519195555b63aa6ddccbd63ae1128ff24972a757e41f4f249ba86048101aaf6"; + sha256 = "007e2607dc1646a5d93a19c7243d9c1f3f2b700469c044bca070e0eaeb078b6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/be/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/be/thunderbird-147.0.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "71a07d58c038f38bbba3a112bdc817b57a23480db9d4bbcae84cc4dc14ed4771"; + sha256 = "512593c97a6f0fe1a3f15bdf88736561f17f7723d4e5d30e14131ac6300ef0a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/bg/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/bg/thunderbird-147.0.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c998ab09d84d07127858cecf6c6fc7c33576311d5da08b4588258ab987df70f8"; + sha256 = "d014bfec61719c830dd7803a6c10b030fe29810c116b6182424fda092bef74af"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/br/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/br/thunderbird-147.0.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5a0ef28c481e58cd3eabfa76dc99096ba7a0fb9f78c3a46e99b8f83dde485350"; + sha256 = "3e8985ba97fa461f233dc42d4b14651e54766812cd493e46bc836c8c2cf46b6b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ca/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ca/thunderbird-147.0.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "3cc8bd57ee7b5d1868a792bf0a251343fdf023350a5733cb33230585f150cb51"; + sha256 = "c00626b73ce72d97f041b4c891e6dea93ed0a239535ab68846232ce9774f416f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cak/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/cak/thunderbird-147.0.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7acef4083bb55b48f7d8b4e1d8b15012f57d03ed932836e8d84fb890c95faf78"; + sha256 = "59de7b316917205570044f312427d763c4fd5c31cbbf65e640ae9775962ff489"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cs/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/cs/thunderbird-147.0.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e9f17a07dabc286859d2647e688b295678c867f558dce96fbb7582797b05d31c"; + sha256 = "059f76cfbbd7c181196544611acc94fc413ed3295d699f7f0092061cd5db05e0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cy/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/cy/thunderbird-147.0.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f8d2c3b43e1e5d4c3811886c644c38dd14cf9a12a4c2fc11634731b098c5fb07"; + sha256 = "8794fcce1ff291d0d77076bb8fcaca196b5cb1af57d6a41d09cda6c205da09af"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/da/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/da/thunderbird-147.0.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bb4af11735a021a8d643103d6ae467b9b97e08cd9ed5ee955db595c53b68aa7c"; + sha256 = "36c9522c106b9e2133adc3c44f1208e094a732d7c026976e14f0abd44cb696cb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/de/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/de/thunderbird-147.0.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "77e4b6254773701e84d72e6a3d551068838b020dbfbb094509ca0e8fa757ec5e"; + sha256 = "b2e28316fba510bebbfe2cd62838a631ae8faa79b79132bdb1e715e3dd3f5c22"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/dsb/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/dsb/thunderbird-147.0.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "27ac6a7d2979c90ed7c9136ed26a04c2e79f9dcdf6e10e526b0bd01e80654a68"; + sha256 = "38d3256d0fea27e5d0eacfa4bd9d1eeabc35f8ea4c6595907219259fa078a586"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/el/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/el/thunderbird-147.0.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "393b5336fbe551f562bf57f098dc366ef9c0681f295a22a525776a9f9f7f24f9"; + sha256 = "e5dc3e6ea1bcdaa1dde21894fa786f28f4785805b873dc6a08c7387df56c1ec7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-CA/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/en-CA/thunderbird-147.0.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "46aa073e1cafcd9cdec1d0ccba174e855d99e172f90e005b00bea6f6cd4023cc"; + sha256 = "2a092524ec4fc702bfe05323f5316fb3670a8df20db770f60bdf973300ba514b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-GB/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/en-GB/thunderbird-147.0.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "016f6d485ae7af4c2c408fdc347f2c90b07bb6e43f5d3f683b1ced5a45c9752a"; + sha256 = "0ba2f01e772759955b4e0768b060c49f9bf08076a3826d6030060b6e7051cae6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-US/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/en-US/thunderbird-147.0.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d2e49bba5f275e016c4ff775b7405165178e045ab30a721ae041882108a87e33"; + sha256 = "ce101064e7d9fcdd3c3e41cc212c00384fd714accf51adfb228aa2b24dd98bd7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-AR/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/es-AR/thunderbird-147.0.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "2dbb5884243e97a78debb25ec2bc7d4821b17d369c92458607a1939940670599"; + sha256 = "fb368f360e65b5b4085876bedbb285e97a2d588f960587e18c27d7d1e37bb90a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-ES/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/es-ES/thunderbird-147.0.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b0d5c2b5574a131bb2e7859204d4765202d82e0b46bffdedd803b6c1246e52b7"; + sha256 = "e695f9e66cbedb6d34bda83e42c62375d87e027cd54aec049ab42f615379717b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-MX/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/es-MX/thunderbird-147.0.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5ace903ffacfe0c99307a7257a84ce125a46ef2d59d51637a9f48ae966b006c7"; + sha256 = "79c76d110dd44a3643dddefe077d8c58b6a87809adacad3750bfbe7d84ae6e8b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/et/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/et/thunderbird-147.0.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "975432c045351d6946876cab0bef4ec97fe469b484f913ddc6c379d673436f1f"; + sha256 = "1497c1190df4344e3fc4ee48cf884196eedbba3f1de79cbb6878a1c838c93927"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/eu/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/eu/thunderbird-147.0.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e91c8c99a617df62e1d3f2fb0063375d28297be8884f4f783c939e55e22d7db3"; + sha256 = "7c5c734bd3d3f354141dd15a355d2083ee917539e9f838126a2fd12389019a91"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fi/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/fi/thunderbird-147.0.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "bc852f61463e4eea4bc8a85c53eb77b5f995bfa6c6f8008b7e68590742a9935c"; + sha256 = "e5bcb84aea395e6ecb32529aad2fefb2d7a7faaaecae2d8815b6ea734c0d47d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fr/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/fr/thunderbird-147.0.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "efa5c8415081538a0d1b5fdb703db855a5f0d498ac4d5dd016cfd4d17d66ffaf"; + sha256 = "1124070f96aa06e411ef0eb7ed1552bdd792f75265efe8360dada5170dd9b59f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fy-NL/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/fy-NL/thunderbird-147.0.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5f0ba65fe99db544dd61359e48843f6d1900ba891fbd1bab3d60060ff9164c3d"; + sha256 = "6308776f611afeb0de28ad6efdd7ae0880903f442795bbd4342aee60b80e9d2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ga-IE/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ga-IE/thunderbird-147.0.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6b8a39a6b5344ce667a06186280615ec93ad16675dd0cc93b073113b4508a274"; + sha256 = "971b4d23079d0e6cf7c03a79e09a5bd465c207e8e0975b55befe9deca1986a63"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/gd/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/gd/thunderbird-147.0.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3c337f9609041e97436fd9bb96eb9b0119ebd2c667745064f30a2db1c4bdcb8a"; + sha256 = "bb70aac1fad09c30f581be8ecef53667f292cdcb9d8898020eef8e6a6c348a18"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/gl/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/gl/thunderbird-147.0.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c0855f94bab373ba33d46546a8b15768b8f81c660bbb76a83416059795af02ff"; + sha256 = "1921d44187358810e76c19a146e6e568b34d6c4e328c3ee8eb6db0d08dd4ac9d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/he/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/he/thunderbird-147.0.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d5c458dfa6fd8ff986188a6fcd88c425c8a605b4876401148bc2fb1a461ca4a3"; + sha256 = "4e3fb7273a6cf8d3e36b1c483640c2ab7de5227f6ccf763338994da94fb5ecb5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hr/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/hr/thunderbird-147.0.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "092edaaff1fb539743ce5d17814f64fefb01f94398a47c1c0fa570a6affa707c"; + sha256 = "624549be1a5d6a8bebc2fd99ce4ce0d0ce24e324445373a108a47c3280eb7a35"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hsb/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/hsb/thunderbird-147.0.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "21638543d1da61e943d88de501c6553de596d7599a9212a4c8b10c446ec61443"; + sha256 = "12d542934568eb0c7d64acf5ae0eef5abc488742b169837bae3499a7b7930358"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hu/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/hu/thunderbird-147.0.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d4575a6b46fce80568bf53330f16b035f3f467eea976499f672777b791644af7"; + sha256 = "9529fbe37377a95ca6713ccd6601766a9a793f68b3acd802854f811a9a1965b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hy-AM/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/hy-AM/thunderbird-147.0.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6a8bf0444f480c708bc193394c51a90b91b3bea9e59abd0a7b15c44c82afb7fd"; + sha256 = "0835a6c07e8c2284f692a835f290c64185e2b8e6c232b4dccf690da509bc43a9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/id/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/id/thunderbird-147.0.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "49a9f95cd9f7a511ef65e1094e6893d16e1f35af98398357a0f8a56ec60cd538"; + sha256 = "e4bea4075153dc47d12b4313e166cc814d1af170b47a569bda323a1b94d0dc86"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/is/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/is/thunderbird-147.0.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6f83c77c77c1a140ada9e38b7f1e6db8e58f48d77a943b3590ac8aa95d1955aa"; + sha256 = "a48fe1303a6ac147889c3e2c8728e55a794f4ec6ee86a9a1f9e17299fabd3731"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/it/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/it/thunderbird-147.0.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f1fce770ce0dacfe003b2c812044b16cd0d819e1eeb5e18cf4346248af08afb5"; + sha256 = "1d25410525f2b884871db0d530639c9b355f00eec9526abbb5108834310b2420"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ja/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ja/thunderbird-147.0.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5909215ac5239cd223e4b032ae44e41da6d19c162f377bae9bcddf2489f5f742"; + sha256 = "50c1555c46c4c44599be7dd811ae391328df2a02150fb02a39c265c47784ed07"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ka/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ka/thunderbird-147.0.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "06b0e91bd58599081569927830c8d63ab74bd2545925111a47d47b4cd5987490"; + sha256 = "e7c4f9ea538476dc1d964e9e689a784b9c5484965ad8db2fabfdf0394d7ed7f2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/kab/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/kab/thunderbird-147.0.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3c784c1cd6755fdd232b6ae04f43668dd48aa7d7ea25deeb735f62520247306f"; + sha256 = "0261eb97ff4d5d6feda3c15ae0b5d191deb0966dd88be39552a791b54c1096a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/kk/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/kk/thunderbird-147.0.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "912eedc1f49264dfd7994984a50606b750c89c8056e2967790a4c66d45ce578c"; + sha256 = "79eaacbe2f1b885e1f5bd3eb513b2e379223ff5a3ca86fc2ea88f703c3285393"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ko/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ko/thunderbird-147.0.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c7242bccdf8cc25a137e7939c78cade8bfc9f6c2851860c34e2422d9eab4c321"; + sha256 = "b12e403aecc3ffb2867cf6d4a9ee1b94364721c75a7524ccf71aa6d7a40de424"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/lt/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/lt/thunderbird-147.0.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "781b88157bfc9faddcfdc4b25735acfee2660c2b666eb26d238e6cde778de9b1"; + sha256 = "d921112fcffebe0f6c4ed5ecdbf5fad2f2a1d1389f5a34153b1dc7c2a0494e71"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/lv/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/lv/thunderbird-147.0.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ce966bd83eb6849e74d2dd653a5980232cb7e704128da78f6a55ece2ccbb1b9d"; + sha256 = "cd3db4c0f7c0255bcdf26e253b9eddbb7f3a3704c55a2d3f5e6921832c75b8d3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ms/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ms/thunderbird-147.0.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "99f7d4b58d0d473c49ba3c387cd9b24b452688acf77386f49531eea51e131550"; + sha256 = "a2358e11e54328f140afa751e8760e312718634cb0c145369a1aa1d2506ffa2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nb-NO/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/nb-NO/thunderbird-147.0.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b8dd3b1cd37865d368a0cf26ae36855351b6bcd6f7f0d7461d66486a05601105"; + sha256 = "a9b66e68fa3fb648ca99c2a0a7e58b97749e7af56c463879ded73ac1f8a258d0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nl/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/nl/thunderbird-147.0.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "95e42e1e6931ce6fb3b4ffb09e3af2be57a2439408962bf59fc176a5aaa794f1"; + sha256 = "59d3fd1bc61a84b95c0a3ea8b169c32b87eb465ec698081eff4246b307717ac4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nn-NO/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/nn-NO/thunderbird-147.0.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b70f5a3a62f91c32e517b94f68473b41c3ddf1a7e981fef193b76654a17969b5"; + sha256 = "d97f96dddf2390513a2cdcace20af4e5ec63c8c6f963df15cf4c5de85061acd1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pa-IN/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/pa-IN/thunderbird-147.0.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "adda59ed9422f89e2a5fc4f086342ff298d3c4cf99b0cb7c8aa1d3b8a0b2ce4e"; + sha256 = "6c59d93a3ef44124e37688e2c6cb7497aa7f87cf5b15052ba3d28aa5927a520b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pl/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/pl/thunderbird-147.0.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9facc84ad65bee162be8342da0fba929071b2791c531b61562f86e2c65278a0a"; + sha256 = "4e4f51bc72af14578d6b4f25bd5d052fb7dd1015a5394067bbab16f777bac4e0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pt-BR/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/pt-BR/thunderbird-147.0.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2930e7484e905354e07365368fd6857b217a91207160ad266201c2f5616fc67a"; + sha256 = "c4d8078b60ea6e9623d3d7196213732f957acb8bc2fadf1355fa1be32d066057"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pt-PT/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/pt-PT/thunderbird-147.0.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9560275197fc4f65f576b73c3df213dfda369beb87031c1577a6f68d6ae5b649"; + sha256 = "33c64b4b3094e15de33a7a6452e04a44c04a5e18ecdfc6dcba5f766c12d296df"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/rm/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/rm/thunderbird-147.0.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ba4ce786cc17539e994428c40424e524633143f6f2dce340a733365b8a056bd4"; + sha256 = "09ea23f4310d2fc3a2daf9c1420c7250f47cd01418609562de2ef5ebf5bcb77d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ro/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ro/thunderbird-147.0.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "995cb37f220dc8c9a637e381c5a9f6e5e62d1f50bf257ed3210770b3502695b6"; + sha256 = "36b4073e1c1336f613d6293174003a03057bc5195c1125c95cb042bea1b095e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ru/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ru/thunderbird-147.0.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "226ed314e80e49e3081d956a953127d30701123e3c630a2b84944d394fe355da"; + sha256 = "f755ce54db6b7b3c92575670d12a7af3d885a51da8b455757efd9341f3f0da52"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sk/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sk/thunderbird-147.0.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "11951db352dce08007ef625c93bf4f4f51f79cfd28650884495b50b4ef48d399"; + sha256 = "e2326ed8a243ec894858980536e25ff39c399aed32e9998e400a9cc81ae1f24c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sl/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sl/thunderbird-147.0.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "b4ccccb91ff4929b69e6ed6479518f44fb2c8b346e989c96e29740584ddef3f0"; + sha256 = "8526086855d974c1775f353193900fcc86178acb5ab5fc8d1085cdc559edef89"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sq/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sq/thunderbird-147.0.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "38cefa80ed52e818b64dc9050bf007a4b1976aed7773a704563d8e1efc7726c2"; + sha256 = "d9f284f71dd7cad63fea09b6234e2002c65d0130350ab1452a3a282859b6822c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sr/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sr/thunderbird-147.0.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4c6c2638d6b81290ccd041df3fc442228eb13d9a9c03d6b3acc4c8afbd6d85a2"; + sha256 = "8ec3b1d7de26f60bdd5801faa26542e2b42467432d3180db5a0d85d415dc70fd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sv-SE/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sv-SE/thunderbird-147.0.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "41735d81059ead10a333ede3144127542d5c72f0b6b1f48a29ba7e846595cb67"; + sha256 = "c59ccab9f8ee78f417ceb8ab2fff985eb41dc45d923dab294c540f8f14425aec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/th/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/th/thunderbird-147.0.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "75511f9814d4b37fa8c832a95ea509b1fec0b1767119754db81acd53553b9207"; + sha256 = "0cd157dd80e062f2465143595fe4f4898d20c83b9033a6c287e34111055817f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/tr/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/tr/thunderbird-147.0.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "25a85741204a036692f409a3dca1a98dacf710af86c802d7345a653d35822760"; + sha256 = "395677017a8b043bb8d7291f4acc01736937da439566cd76ade19316ba107154"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/uk/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/uk/thunderbird-147.0.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8d06173389422e607338aa3a22815f2431e59f5e7cb77ca20af9d2d2348af41d"; + sha256 = "00f771462f62b48f2125b327b36d1a41939431c062ae79e6303d155232bac6c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/uz/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/uz/thunderbird-147.0.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "18c29c959a5c3a1cde540bde24235810367d9ac596085bd04cfdd101c39f9332"; + sha256 = "31f134e6553bc18596bffd6ce255f577e65bb5eedda0f078fde0633c2bdc85b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/vi/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/vi/thunderbird-147.0.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "155d9b185772b3d1d08be4d7c88aa03eb6ba1df625b00e16605269a8f4c68d75"; + sha256 = "4873941e95a75b48ed1ac7bbd98b527c49850c04d6553365df75dc366097c6f0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/zh-CN/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/zh-CN/thunderbird-147.0.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "98a2e8be7f9dc3ae8873b12b87374dcd033c3d498c78cb8d0668b4afc246fd72"; + sha256 = "1f90d4e44683117664355e72f4daa2d91b06ae5dfd8e1942bd5538730769d952"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/zh-TW/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/zh-TW/thunderbird-147.0.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b7806eafd1734260e233fb9dd1144a105739d746a0d998e7517adecf3fe7f373"; + sha256 = "99d130307577a236982a07082d909377ed1a2e54b9b0c9d85d6cc5842443d572"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/af/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/af/Thunderbird%20147.0.dmg"; locale = "af"; arch = "mac"; - sha256 = "15ff5f058d558e50a55022a59ff10b06587b09e98e951a4d574260f3ad95b72b"; + sha256 = "bd378636f4010ab2d5c3546da9b21dd4d193f514ac167d647153491e37a04027"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ar/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ar/Thunderbird%20147.0.dmg"; locale = "ar"; arch = "mac"; - sha256 = "a6b94457a01e227af02b57fc009e2d43145b4899f0d45cecda4927afd5bd9dab"; + sha256 = "39d65c43e394e3df8f91c766fb4b0fc752ee7f9a7e4762e0bf6dc38689bfbc85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ast/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ast/Thunderbird%20147.0.dmg"; locale = "ast"; arch = "mac"; - sha256 = "e37201f38f611b9662a29694a10d8f15e58cde752a19e766bd87dfda535f9df0"; + sha256 = "bbc7d5bbf0491c6e2519854577c3c6477c594a592ba740ce5f4d83521e451729"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/be/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/be/Thunderbird%20147.0.dmg"; locale = "be"; arch = "mac"; - sha256 = "a032af69c46654cfd22484a62f25e0ad089fa140b1002389ded4eb35efc93fb4"; + sha256 = "1b4f81b55eaebc2392f75c543787019855158a9173bc433fc0b90141bd3ed677"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/bg/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/bg/Thunderbird%20147.0.dmg"; locale = "bg"; arch = "mac"; - sha256 = "1a052dfb4e89787d8173a6f7dfa4154ea3bba962f03655bc534c8880ba97fd99"; + sha256 = "1cf0ccdd615f3aab381d8d0e6bf37ca04770e33121f3aedaeb84d9486043b1c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/br/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/br/Thunderbird%20147.0.dmg"; locale = "br"; arch = "mac"; - sha256 = "e1bc0aa08a50dd8c6c6c2ea1eebd228854bac1a39f5b67f4a1b97f45c2431348"; + sha256 = "b08df726cf401e61361b586fdd910714251f0415a270456369d979b0b5551388"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ca/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ca/Thunderbird%20147.0.dmg"; locale = "ca"; arch = "mac"; - sha256 = "018136e573c9bef83166794f590042d9fd3de2c6ade075e1671f432ba15ebd56"; + sha256 = "59fc5ef92c4767d4a67fe847b6e11e8dee7654a31fb47feb23e5018347e2dac8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cak/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/cak/Thunderbird%20147.0.dmg"; locale = "cak"; arch = "mac"; - sha256 = "30da57420e4ef8d32d351df490b324b5fd2c53139ae025713fe80ec89772ed84"; + sha256 = "f8651fb91909443daf8aafab04255453a6b0bc13f361345eb23d341242861fcb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cs/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/cs/Thunderbird%20147.0.dmg"; locale = "cs"; arch = "mac"; - sha256 = "38e776c6f0dda6d0e6955c2f9044d7b17141152568d1c08f5641bce015ad9425"; + sha256 = "a47e3c2c0a742018731ba20c358764fe9607bf2c514a5b7ba9ee2fee1c19cc34"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cy/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/cy/Thunderbird%20147.0.dmg"; locale = "cy"; arch = "mac"; - sha256 = "d11f1326db344c8f738c9c8e582276ad3a037adc97e1848876d6066096e9d939"; + sha256 = "844158eaf25963b1ec80b951d78865669c7748a24181932e6a85a8d800b23cdc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/da/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/da/Thunderbird%20147.0.dmg"; locale = "da"; arch = "mac"; - sha256 = "4a4c49fc3f494921878b0e7761a2f1918089978d535a86395a212a439e6a9567"; + sha256 = "2d36261c374e9083f35dc547c3c0150e32bf360b7465d7bc5d3b32a0e8723b70"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/de/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/de/Thunderbird%20147.0.dmg"; locale = "de"; arch = "mac"; - sha256 = "39e18093e3473a10564bd79bc3235808258dcdab16107942248b09ee20668342"; + sha256 = "9caf0b895e1952c041d1a19adb051d4e5794b137a5b641ae7c4b2662aef00040"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/dsb/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/dsb/Thunderbird%20147.0.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "632b8da6324713d7b2f90e3b562c6694da012e09681573adba2166601f0254fe"; + sha256 = "dbe872700d81195f4241bfda3d59f37639f212144d6e9464a96387f9ab14a5f6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/el/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/el/Thunderbird%20147.0.dmg"; locale = "el"; arch = "mac"; - sha256 = "65209e444344103e70f00bd8be9322fad56d59cca75d79eb41d49cd1a523fac0"; + sha256 = "1b3329a3ab07731203155a00a594c533c84be2b161d4c766d52c78f32a69b9c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-CA/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/en-CA/Thunderbird%20147.0.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "d579ba962027732a6f81475e01702a57796d20fa943f6f504e8c55afcde99dbc"; + sha256 = "de80ac7f670542e674bcd488726e0f613e80898dd94d3b742b6696506176a7a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-GB/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/en-GB/Thunderbird%20147.0.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "e5ee344258ef6d439fb4e7f0ebf205e35011455fc10c7838f0e7d27bee4ce49e"; + sha256 = "dc0b45304e5a29f39d1343e958dbc458563d9cf6da47aba040619b32ea84cb90"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-US/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/en-US/Thunderbird%20147.0.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "5b729073f032a77589b88f69a032066233a6e0f862b66005de81cee0f2adc601"; + sha256 = "75a5aef901fdfac2e078442f50e9eb31475c821823ae78659aa3f1013fbb4c51"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-AR/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/es-AR/Thunderbird%20147.0.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "fb905803e5f6ed0b6dfa0de701c35bebce1a9e2f8028fb13fcd5d23844a3286c"; + sha256 = "c0cb0574039dfaa299da2b1762f79dd39004b493f99f2baf473be3698ecb8890"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-ES/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/es-ES/Thunderbird%20147.0.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "5a492a1703348ab4d7bb7fcd41d4e2ec4f491c6cbc9d26c4d67036174b2aa239"; + sha256 = "86f2b87eaba9827c490b4d3f923a990f4a5616c23f7b140c6328a1d0d5affd2a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-MX/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/es-MX/Thunderbird%20147.0.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "82447f466a9e7c54ce4d6b4efcbed1b1a20f61f0000b97776bfca343dec7c516"; + sha256 = "bbc2d0a8ddff7d92b07006d006a7c69069ce9a65df12e2d5442c686b4118230c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/et/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/et/Thunderbird%20147.0.dmg"; locale = "et"; arch = "mac"; - sha256 = "33fd3e0f50c75c6444fdf5b2b4cd63b644646b3fd5f8c39c99b40db9c85e2695"; + sha256 = "c3bfb4bd7c71d28403ad521d7d1cecdd489a411241cb233d8e437a772c22a55e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/eu/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/eu/Thunderbird%20147.0.dmg"; locale = "eu"; arch = "mac"; - sha256 = "67708d850bcd4573dc45980ffe079e33aae02026b36bd9ce60e3cd94e83364cc"; + sha256 = "ddd8f87ee2a5369aa5b428ae2db559466c882b59d95513f6288f5fcb6a67d21d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fi/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/fi/Thunderbird%20147.0.dmg"; locale = "fi"; arch = "mac"; - sha256 = "f18913bd86180a97782614e6af7bd96a8debd25146feb2de321c797416b452c2"; + sha256 = "04c419c046d91782a1f5be537efd576be9cc6490bfb14cad13c6b4448cdc4471"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fr/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/fr/Thunderbird%20147.0.dmg"; locale = "fr"; arch = "mac"; - sha256 = "e99e5b9bf8ded3d36540b16a5b14d10c5e216388da7126454515c242e0ba66a6"; + sha256 = "dbf89c9b21fcc131bebff511dc5b6555f45f5ad1c6abb7ebc2db1533510549a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fy-NL/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/fy-NL/Thunderbird%20147.0.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "0ee6cfbf3668646d8247de610644b2a9f728f9a18cb916f16fb83c767c4e152c"; + sha256 = "0f4e9d4ba0ed985f714131302c28636e9190de43c11e1bef604886f8a2ca3b39"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ga-IE/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ga-IE/Thunderbird%20147.0.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "800c2d3c36289a5b8e05dda9414d7e852b429b9a04f5c75cb8278284beb6d353"; + sha256 = "8cd58b183a846cc3c18cf5ee05f583594ae1c18380c2493d9d436b6ce44f69d6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/gd/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/gd/Thunderbird%20147.0.dmg"; locale = "gd"; arch = "mac"; - sha256 = "ae0b8ec336917f1c90aeb910004079298f9c544c27c354abc8573f2224f39260"; + sha256 = "dd169e09a7528c4501c0bff9a367fe668a9667e116a7daf3bb05ac9b44e414e1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/gl/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/gl/Thunderbird%20147.0.dmg"; locale = "gl"; arch = "mac"; - sha256 = "41fdce45c6b91975d42cacd60a76b40d817a2e900428ef94a6160ae571300817"; + sha256 = "e9f18781c50a39027771cd4caa590337d199b489c1b2f52dd6802209df2b5c59"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/he/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/he/Thunderbird%20147.0.dmg"; locale = "he"; arch = "mac"; - sha256 = "77b284018f5410c89e995a0c0521e67ebe1d212229e1011eeb58e7d4e26a2177"; + sha256 = "0e4203b50ab8f3b3fcc3ec166b56c6bd792f43ffe530c9dd4d61f816aa66c1c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hr/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/hr/Thunderbird%20147.0.dmg"; locale = "hr"; arch = "mac"; - sha256 = "5cf82129d579badc50a69367c1c5087a97ae010076a3d9cd2ca8569236899252"; + sha256 = "db6ff7111358360765c5dab0b8e0a266547c865ab4060d00559b8c4832997e61"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hsb/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/hsb/Thunderbird%20147.0.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "24bb71861c845ae5c5b50d8120d0cb1e6a4b31ff680da12ff7d1248c6df9ec57"; + sha256 = "bb9c1c500146740476248fb718231bbd1e6d5e9d449760c93b62734052d501b2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hu/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/hu/Thunderbird%20147.0.dmg"; locale = "hu"; arch = "mac"; - sha256 = "5e74a2fb88cee5b4a85c65e9e2253a3ced22e282ec717981d927c929ea623c7d"; + sha256 = "0c60a8458d0ce13a66afb365ba698512389b2b8d73d1405b3166d39a29d10c9c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hy-AM/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/hy-AM/Thunderbird%20147.0.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "1fa695c7852c0d5ebd032e8525b78ecf4a6b3c607374b7db01adc523ead8c552"; + sha256 = "3cb3be913cf48707024bccb578f063e9875a4dfda5cc324bfc87fe0ec03e1e30"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/id/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/id/Thunderbird%20147.0.dmg"; locale = "id"; arch = "mac"; - sha256 = "1e2ab777080bb5c86ab40d6b615edad87837f7cf5abe9ca7e568e2497d07615a"; + sha256 = "d2e073a4e4ac0e205d11036483640c83a81200a9721c26349875fbdb31d77a00"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/is/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/is/Thunderbird%20147.0.dmg"; locale = "is"; arch = "mac"; - sha256 = "b16053dee6f778fafc16f77a1e754721b0ade6e457c3372c5d30ed2d2e983f65"; + sha256 = "dee951bdd684e1cb1c96baef26aab12dc30d6183e9a0bd56591c4052252783a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/it/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/it/Thunderbird%20147.0.dmg"; locale = "it"; arch = "mac"; - sha256 = "9f248ad96934cdb30c9910cff199d59b1947ccdb77352e9e955d7413dff3af89"; + sha256 = "ff7c81a32361a77eb3e566b48782f54a968d48e159ea3213620a6146d037d2ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ja-JP-mac/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ja-JP-mac/Thunderbird%20147.0.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "25ca0bc952a9c4bf88e67358d1e54ba33960376e65a2adbb0ac3b798e5e835b9"; + sha256 = "3ece823e89a424a9d5f3c5c1a10dbc3962f371f3c65236dfad641d61cabc2499"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ka/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ka/Thunderbird%20147.0.dmg"; locale = "ka"; arch = "mac"; - sha256 = "3c4d61128e3fd194a686db70e0a5ff18afdc5e0e46f35c1c48d948a049f09259"; + sha256 = "5b54f2f0cd08e2bac8615b398e820e6904bfc3f4649419965c3932fa04ea7389"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/kab/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/kab/Thunderbird%20147.0.dmg"; locale = "kab"; arch = "mac"; - sha256 = "8dc7ce6bfa706b6108d87859154b21ef93a8c22a4aa22930560b50259b29d6b7"; + sha256 = "047461cafc5987f93f3dec2d19199949c6aaec87f2007c8b53fbaa212fc429e9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/kk/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/kk/Thunderbird%20147.0.dmg"; locale = "kk"; arch = "mac"; - sha256 = "86178c30d913830680f7405a0fdcb77a6f98f67a857b6a78fa74331fb81e1deb"; + sha256 = "85ff7a9957fcdae87951c444ee7655b841f91db810874f23cae53a87b5eef894"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ko/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ko/Thunderbird%20147.0.dmg"; locale = "ko"; arch = "mac"; - sha256 = "ea97b2efcd71481be2bd4851952a18227cfa389fa1bfddb9231cdcdabd5cfb70"; + sha256 = "34866282a5d5561ccc567a462ac5969ab829d19dba0fb6315369f011d94740a2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/lt/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/lt/Thunderbird%20147.0.dmg"; locale = "lt"; arch = "mac"; - sha256 = "f5eebc6e2e9e281282519944144de083a05ea9a4c48c026a239578455875cfed"; + sha256 = "95c51d54e412eeda41fa740544bd131df7788639a961997b05b0a7ded3cc7838"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/lv/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/lv/Thunderbird%20147.0.dmg"; locale = "lv"; arch = "mac"; - sha256 = "a80176d6c847e5c3ef6758b62b7c75d3d221f7dead3715f629bdfc9f8193a26d"; + sha256 = "16532de67ca9d74ef268ebec1ffb59797a0c170abdf9e107420948dadeb512d8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ms/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ms/Thunderbird%20147.0.dmg"; locale = "ms"; arch = "mac"; - sha256 = "72b01a9a3120dcd44b88ac472a64f97e187a49dd7afb5f125f8582e47481a176"; + sha256 = "ba6979fdb50302c9ee41b57bbb324c465a4accd4cf20c97dec2c531c807f806c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nb-NO/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/nb-NO/Thunderbird%20147.0.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "f4bb767fcae023e475ef9c3335b494bfc6ac586d2773e586da941fc53d4890cb"; + sha256 = "81cffc99a6915b323151cf9fab92acc9ebb7f8787391f1db6ace731c2ca448ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nl/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/nl/Thunderbird%20147.0.dmg"; locale = "nl"; arch = "mac"; - sha256 = "3fffcf1624fd39242b2538c5a317cdbe164b863fd3814d25fc2983a8a106f0ef"; + sha256 = "61acd7eb3cb5f1e2fdaf90bae8b4e153a94737ccfa7b23daf098b45d55459e49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nn-NO/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/nn-NO/Thunderbird%20147.0.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "06c2e547367b08a80629d49ce7a9e7bef6d6121d90a0b03fc06960c90f1fb3d5"; + sha256 = "e933271484c6a3898abb4f019a70fb2c70ebcb3b9618c087920ceeb8d84cf2cd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pa-IN/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/pa-IN/Thunderbird%20147.0.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "de82f8e7303170951fef3fdcc807b80ba41b94b5026293147dac6a5a928b746d"; + sha256 = "f1a93e1ca89267214ea7679be16260237114afbf4849e43253791446a1e23fcb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pl/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/pl/Thunderbird%20147.0.dmg"; locale = "pl"; arch = "mac"; - sha256 = "03ec55112877dc9e34a79fa708a29a957e27b2a5d3e22e1a7f15701f8eacf5be"; + sha256 = "ed3817f815035fb9d0dd958d910687de29a29c229739c1454fe705370645aed5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pt-BR/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/pt-BR/Thunderbird%20147.0.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "64549f1a6f26ba880d52e5e540f0bded8cbae1b72cb6bd70709db695dc4f6484"; + sha256 = "4d2702599b9e4931310d625985fcc3c50b5511071c3eeb483e6898d21c65168b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pt-PT/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/pt-PT/Thunderbird%20147.0.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "5498cad57f286dfbaed62f3eb494c08763f9c97127283ee8e3a5a4e1517db38e"; + sha256 = "32ab431fa2ce9d372a3c7d50e6530c36368e270e72d4af0b69e84f4482400177"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/rm/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/rm/Thunderbird%20147.0.dmg"; locale = "rm"; arch = "mac"; - sha256 = "0f7a511c06d197d3699e4d23cc663150c1e117c22521a314f5f61c5907794a66"; + sha256 = "d958b82cb798b99a3c3bb51f4c8346326c27f4b7b3e8874d99cfdf8073da8aae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ro/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ro/Thunderbird%20147.0.dmg"; locale = "ro"; arch = "mac"; - sha256 = "7d9c8b56618afad54372e5d44a0df5e9a47a022c45d004cf34126c621bd85535"; + sha256 = "7f2c8aa5e42ebbaf87ee25e2740e62d0f459e3cc6965929d121f6d84cd352c09"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ru/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ru/Thunderbird%20147.0.dmg"; locale = "ru"; arch = "mac"; - sha256 = "a8b065cbcb95a693e939678aff081259d2a073c6fa1c5ff6fd42f3b1209f5bf2"; + sha256 = "10ea40caf6a17e1be9691d4bb0b8b87438d307077977587b3ed7e414849a39bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sk/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sk/Thunderbird%20147.0.dmg"; locale = "sk"; arch = "mac"; - sha256 = "2c7d31645950e128e8447bdb268df96f1c47092ee7dbab444381c46eb4bb4715"; + sha256 = "9e32c5bc58dae4f88155e310871a4c3355ea3e398d45d457cbdc37954eaba772"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sl/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sl/Thunderbird%20147.0.dmg"; locale = "sl"; arch = "mac"; - sha256 = "3cc4956ac2ce6448656cc0f3377486c0fbbcf20b7e3f39623875a7c7051b56f6"; + sha256 = "5b15b5490487d21941d7f245f2278ad6ad92b39e20bed63286a29ba82d10f9ed"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sq/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sq/Thunderbird%20147.0.dmg"; locale = "sq"; arch = "mac"; - sha256 = "8eca9081aafd084cf7b1923cf08062c043664d63edf6136d7274f42eb4a72dcb"; + sha256 = "69d20766ea74e8824586e67334b4ba30c30e12a551cc4f302a49caf24285341b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sr/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sr/Thunderbird%20147.0.dmg"; locale = "sr"; arch = "mac"; - sha256 = "75105432189c496ba5199ca55c98ad4f0a6deba73e356bc967d2c91a66d1d810"; + sha256 = "115b325c5e42edc6bb871e16dee6b84721b7f04f3909ac180852151039a27ebb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sv-SE/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sv-SE/Thunderbird%20147.0.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "914037bc2c5f19669f90641d2146cdff64f10c23d977295f5bfd48fb66b77192"; + sha256 = "465114b36ca6cc68d2277903703c2ba3a218b9fe4d3bfde425a79fd942edbd18"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/th/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/th/Thunderbird%20147.0.dmg"; locale = "th"; arch = "mac"; - sha256 = "e4690f6f55d56f0bffb471ff609574e6dfdcc9492f6dd79f2475d9e132f07102"; + sha256 = "5c3e3091c0e20c42c6c665aff8314d8a58be4efc1b2eb794c76a2803d3661a29"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/tr/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/tr/Thunderbird%20147.0.dmg"; locale = "tr"; arch = "mac"; - sha256 = "76f878fb5b1175a88a0c3148226c3f21065e3ec7b8fcd6d8614a3ccd0427212d"; + sha256 = "b26cde83b1c1022615ea80f1ef161a9548fb00ee48bf54b4fb97e475a533c055"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/uk/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/uk/Thunderbird%20147.0.dmg"; locale = "uk"; arch = "mac"; - sha256 = "1162a9d25cca14d7e198b4dc88d34934397378205511ddc761df9077f0c3946f"; + sha256 = "a649e588d15fd0a93c4aeadcfd252d09747d96a4f1882fb9568f4a941d85d7a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/uz/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/uz/Thunderbird%20147.0.dmg"; locale = "uz"; arch = "mac"; - sha256 = "a00e616bab7f670e58a402e113f949ddbe6de7c4a003b0f2b3dbf76e66e53b4b"; + sha256 = "38b50caaa35e7bcd28d2554e455dcedc5f22160167a143474f22c2784a5e67b4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/vi/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/vi/Thunderbird%20147.0.dmg"; locale = "vi"; arch = "mac"; - sha256 = "71b5df9e7cba580acb587db61a3f49a8c6d25c08a0567988e589ded079c3f44d"; + sha256 = "0073fe0cd504c3d8f92fba73bed048777284e87d6a419403aed1bac8023a2a5d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/zh-CN/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/zh-CN/Thunderbird%20147.0.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "19635085e3961a365d472d8c1cb82ea5c2cbe2c3df2ce135717951a79bf29836"; + sha256 = "bf57df284f8df5e042cb49ba616575227dc2c292f233e7981fc627f8d9be63a8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/zh-TW/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/zh-TW/Thunderbird%20147.0.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "e01eaa89e888af9d942504707551fe45c923d00f7be5fa8cbaf64f5bcb775581"; + sha256 = "a685df930a69b56d41fd04fa379e8a55e1d60d50482ab74aa40bbfa2afc5b7ca"; } ]; } diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix index 3bb18cd36d0e..235ea7a9ecbf 100644 --- a/pkgs/by-name/ar/argo-workflows/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "argoproj"; - repo = "argo"; + repo = "argo-workflows"; tag = "v${version}"; hash = "sha256-TM/eK8biMxKV4SFJ1Lys+NPPeaHVjbBo83k2RH1Xi40="; }; @@ -55,7 +55,7 @@ buildGoModule rec { meta = { description = "Container native workflow engine for Kubernetes"; mainProgram = "argo"; - homepage = "https://github.com/argoproj/argo"; + homepage = "https://github.com/argoproj/argo-workflows"; changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ groodt ]; diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index d88476a32a9a..adc0aa587bc7 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -206,7 +206,7 @@ let self = python; packageOverrides = final: prev: { # https://github.com/goauthentik/authentik/pull/16324 - django = final.django_5_2; + django = final.django_5; django-channels-postgres = final.buildPythonPackage { pname = "django-channels-postgres"; diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix index 1ce916a303b6..2754c888a9a9 100644 --- a/pkgs/by-name/ch/changedetection-io/package.nix +++ b/pkgs/by-name/ch/changedetection-io/package.nix @@ -91,7 +91,7 @@ python3.pkgs.buildPythonApplication rec { description = "Self-hosted free open source website change detection tracking, monitoring and notification service"; homepage = "https://github.com/dgtlmoon/changedetection.io"; changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${src.tag}"; - license = lib.licenses.asl20; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ mikaelfangel thanegill diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index 5e82a1161402..d2bbfcbea610 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.12.2.54-stable"; - rev = "e06d8a2be22920e4c146389bbde5358b78aa8ef6"; - hash = "sha256-F9v+qwjnqsp9At5h41gNWP8cD6C7nnI0AjuOU2mRfPs="; + version = "25.12.3.21-stable"; + rev = "7c3f65751609dab4f2f66de305cbc96dbeb1c4f2"; + hash = "sha256-1cPAEh8CuKGLcQhUSAMXE8sR3pStzVEtPpgUTj2z0cw="; lts = false; } diff --git a/pkgs/by-name/co/confy/package.nix b/pkgs/by-name/co/confy/package.nix index b144a1a366d0..0f2f448d8b69 100644 --- a/pkgs/by-name/co/confy/package.nix +++ b/pkgs/by-name/co/confy/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "confy"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromSourcehut { owner = "~fabrixxm"; repo = "confy"; rev = finalAttrs.version; - hash = "sha256-rkVem9bPjp68Pk8fVPMDZLFFQsqeeRsynWciCk6xWhU="; + hash = "sha256-dcQ0ynEqrrGjAqQoWXtLMpvBVzpilXGpGWVNaVHp3CY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 180a539a1a34..c9fdc2b3b86d 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${version}"; - hash = "sha256-qfsyEHQnOfJYqgZi5QxiGJX1pbXx7oR7qzBEwTYH7oY="; + hash = "sha256-kGjeyw3E6hYcEOcGugW+mgvXGJ38pFp+z9vAMJqPTVE="; }; - cargoHash = "sha256-xQTMxas5gO17DvNXvxdJ03Rhd4kaJPBf+GikbCE1fWI="; + cargoHash = "sha256-SUnpv53UQiawGNdQLJCjpxzmbMV8eZq2ycRMnWJxVLc="; # Build without the self-updating feature buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index afc56199ca7e..865b021bf54e 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -6,10 +6,12 @@ git, pkg-config, boost, - eigen_3_4_0, + eigen_5, glm, + gcc, libGL, libpng, + makeWrapper, openexr, onetbb, xorg, @@ -20,14 +22,14 @@ stdenv.mkDerivation { pname = "curv"; - version = "0.5-unstable-2025-01-20"; + version = "0.5-unstable-2026-01-17"; src = fetchFromGitea { domain = "codeberg.org"; owner = "doug-moen"; repo = "curv"; - rev = "ef082c6612407dd8abce06015f9a16b1ebf661b8"; - hash = "sha256-BGL07ZBA+ao3fg3qp56sVTe+3tM2SOp8TGu/jF7SVlM="; + rev = "1c2eb68e47e3c61a98e39cd3c50f90691c5a268d"; + hash = "sha256-PuRBnJswrg+PjtU6ize+PjoBpQSSEzO2CeCx9mQF+3w="; fetchSubmodules = true; }; @@ -36,11 +38,12 @@ stdenv.mkDerivation { cmake git pkg-config + makeWrapper ]; buildInputs = [ boost - eigen_3_4_0 + eigen_5 glm libGL libpng @@ -75,6 +78,18 @@ stdenv.mkDerivation { --replace-fail "cmake_minimum_required(VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)" ''; + ## support runtime compilation with -Ojit + fixupPhase = '' + wrapProgram $out/bin/curv \ + --set NIX_CFLAGS_COMPILE_${gcc.suffixSalt} "$NIX_CFLAGS_COMPILE" \ + --set NIX_LDFLAGS_${gcc.suffixSalt} "$NIX_LDFLAGS" \ + --prefix PATH : "${ + lib.makeBinPath [ + gcc + ] + }" + ''; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index f6872dd63f2b..391cbfea9f00 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -30,14 +30,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.26.3"; + version = "2.26.4"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-LJZ1pt36KccnA/fimZsOzEjXvqVE2eSww1Wkq5+siJk="; + hash = "sha256-QGveq9PZfy/m+ah4gBvZDMkVWS50oj1f4SJsKcCKGug="; }; patches = [ diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index d3be3f661a3d..4e6c1d5ac365 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -7,7 +7,7 @@ openssl, rustfmt, makeWrapper, - wasm-bindgen-cli_0_2_106, + wasm-bindgen-cli_0_2_108, testers, dioxus-cli, withTelemetry ? false, @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dioxus-cli"; - version = "0.7.2"; + version = "0.7.3"; src = fetchCrate { pname = "dioxus-cli"; version = finalAttrs.version; - hash = "sha256-VCoTxZKFYkGBCu1X/9US/OCFpp6zc5ojmXWJfzozCxc="; + hash = "sha256-6uG737MNk+wTKqNWgFEd8MsOOvllZLDnIrJPAn5Wjuw="; }; - cargoHash = "sha256-de8z68uXnrzyxTJY53saJ6hT7rvYbSdsSA/WWQa6nl4="; + cargoHash = "sha256-BdPsdWah/f2pveQViPikIV2riSwjSo+qGOFoP+hHaiM="; buildFeatures = [ "no-downloads" ] @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' wrapProgram $out/bin/dx \ - --prefix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_106 ]} + --prefix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_108 ]} ''; meta = { diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix index cdf162f1f23a..ee135f7ff9c1 100644 --- a/pkgs/by-name/eg/ego/package.nix +++ b/pkgs/by-name/eg/ego/package.nix @@ -37,7 +37,10 @@ rustPlatform.buildRustPackage rec { description = "Run Linux desktop applications under a different local user"; homepage = "https://github.com/intgr/ego"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dit7ya ]; + maintainers = with lib.maintainers; [ + dit7ya + mio + ]; mainProgram = "ego"; }; } diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index ec8b144b022b..60947666ec93 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { # the Equicord repository. Dates as tags (and automatic releases) were the compromise # we came to with upstream. Please do not change the version schema (e.g., to semver) # unless upstream changes the tag schema from dates. - version = "2025-12-25"; + version = "2026-01-19"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; tag = finalAttrs.version; - hash = "sha256-ce5n7E+eJLPnj/dUnaaDi4R8kKO4+iOcQgdtOin4NcM="; + hash = "sha256-pEFU1E+BqAAAz2ywPrS1MejhZ/g47iG/4BBey+2F7Hw="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/by-name/ex/exo/inject-dashboard-path.patch b/pkgs/by-name/ex/exo/inject-dashboard-path.patch new file mode 100644 index 000000000000..29f964446dbb --- /dev/null +++ b/pkgs/by-name/ex/exo/inject-dashboard-path.patch @@ -0,0 +1,17 @@ +diff --git a/src/exo/utils/dashboard_path.py b/src/exo/utils/dashboard_path.py +index b5ce9c04..ec60ef4a 100644 +--- a/src/exo/utils/dashboard_path.py ++++ b/src/exo/utils/dashboard_path.py +@@ -5,11 +5,7 @@ from typing import cast + + + def find_dashboard() -> Path: +- dashboard = ( +- _find_dashboard_in_env() +- or _find_dashboard_in_repo() +- or _find_dashboard_in_bundle() +- ) ++ dashboard = "@dashboard@" + if not dashboard: + raise FileNotFoundError( + "Unable to locate dashboard assets - make sure the dashboard has been built, or export DASHBOARD_DIR if you've built the dashboard elsewhere." diff --git a/pkgs/by-name/ex/exo/make-encoding-init-lazy.patch b/pkgs/by-name/ex/exo/make-encoding-init-lazy.patch new file mode 100644 index 000000000000..7a51317853ca --- /dev/null +++ b/pkgs/by-name/ex/exo/make-encoding-init-lazy.patch @@ -0,0 +1,29 @@ +diff --git a/src/exo/master/api.py b/src/exo/master/api.py +index 30f87e2a..4aac51fe 100644 +--- a/src/exo/master/api.py ++++ b/src/exo/master/api.py +@@ -67,7 +67,14 @@ from exo.utils.channels import Receiver, Sender, channel + from exo.utils.dashboard_path import find_dashboard + from exo.utils.event_buffer import OrderedBuffer + +-encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) ++_encoding: object = None ++ ++ ++def get_encoding(): ++ global _encoding ++ if _encoding is None: ++ _encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) ++ return _encoding + + + def chunk_to_response( +@@ -382,7 +389,7 @@ class API: + ) + + async def _process_gpt_oss(self, token_chunks: Receiver[TokenChunk]): +- stream = StreamableParser(encoding, role=Role.ASSISTANT) ++ stream = StreamableParser(_encoding, role=Role.ASSISTANT) + thinking = False + + async for chunk in token_chunks: diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index 919815c9ec61..fae8710e96ad 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -3,80 +3,201 @@ stdenv, fetchFromGitHub, python3Packages, - gitUpdater, -}: -python3Packages.buildPythonApplication rec { - pname = "exo"; - version = "0.0.14-alpha"; - pyproject = true; + replaceVars, + macmon, + + # pyo3-bindings + rustPlatform, + + # dashboard + buildNpmPackage, + fetchNpmDeps, + writableTmpDirAsHomeHook, + + nix-update-script, +}: +let + version = "1.0.63"; src = fetchFromGitHub { + name = "exo"; owner = "exo-explore"; repo = "exo"; tag = "v${version}"; - hash = "sha256-GoYfpr6oFpreWQtSomOwgfzSoBAbjqGZ1mcc0u9TBl4="; + hash = "sha256-aQ3rGLtT/zvIVdKQcwqODulzEHBKg7KMkBg3KJEscho="; }; - build-system = with python3Packages; [ setuptools ]; + pyo3-bindings = python3Packages.buildPythonPackage (finalAttrs: { + pname = "exo-pyo3-bindings"; + inherit version src; + pyproject = true; + + buildAndTestSubdir = "rust/exo_pyo3_bindings"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname src version; + hash = "sha256-N7B1WFqPdqeNPZe9hXGyX7F3EbB1spzeKc19BFDDwls="; + }; + + # Bypass rust nightly features not being available on rust stable + env.RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + nativeCheckInputs = with python3Packages; [ + pytest-asyncio + pytestCheckHook + ]; + + enabledTestPaths = [ + "rust/exo_pyo3_bindings/tests/" + ]; + }); + + dashboard = buildNpmPackage (finalAttrs: { + pname = "exo-dashboard"; + inherit src version; + + sourceRoot = "${finalAttrs.src.name}/dashboard"; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) + pname + version + src + sourceRoot + ; + fetcherVersion = 2; + hash = "sha256-w3FZL/yy8R+SWCQF7+v21sKyizvZMmipG6IfhJeSjyQ="; + }; + }); +in +python3Packages.buildPythonApplication (finalAttrs: { + pname = "exo"; + pyproject = true; + + inherit version src; + + patches = [ + (replaceVars ./inject-dashboard-path.patch { + dashboard = "${dashboard}/lib/node_modules/${dashboard.pname}/build"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.9,<0.9.0" "uv_build" + '' + # MemoryObjectStreamState was renamed in + # https://github.com/agronholm/anyio/pull/1009/changes/bdc945a826d0d5917aea3517ceb9fe335b468094 + + '' + substituteInPlace src/exo/utils/channels.py \ + --replace-fail \ + "MemoryObjectStreamState as AnyioState," \ + "_MemoryObjectStreamState as AnyioState," + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/exo/worker/utils/macmon.py \ + --replace-fail \ + 'path = shutil.which("macmon")' \ + 'path = "${lib.getExe macmon}"' + + substituteInPlace src/exo/worker/utils/tests/test_macmon.py \ + --replace-fail \ + 'cmd=["macmon"' \ + 'cmd=["${lib.getExe macmon}"' + ''; + + build-system = with python3Packages; [ + uv-build + ]; pythonRelaxDeps = true; - pythonRemoveDeps = [ "uuid" ]; - - dependencies = with python3Packages; [ - aiohttp - aiohttp-cors - aiofiles - grpcio - grpcio-tools - jinja2 - numpy - nuitka - nvidia-ml-py - opencv-python - pillow - prometheus-client - protobuf - psutil - pydantic - requests - rich - scapy - tqdm - transformers - tinygrad - uvloop + pythonRemoveDeps = [ + "types-aiofiles" + "uuid" ]; + dependencies = + with python3Packages; + [ + aiofiles + aiohttp + aiohttp-cors + anyio + fastapi + filelock + grpcio + grpcio-tools + httpx + huggingface-hub + hypercorn + jinja2 + loguru + mlx + mlx-lm + nvidia-ml-py + openai + openai-harmony + opencv-python + pillow + prometheus-client + psutil + pydantic + pyo3-bindings + rustworkx + scapy + tiktoken + tinygrad + transformers + uvloop + ] + ++ sqlalchemy.optional-dependencies.asyncio; pythonImportsCheck = [ "exo" - "exo.inference.tinygrad.models" + "exo.main" ]; - nativeCheckInputs = with python3Packages; [ - mlx - pytestCheckHook + nativeCheckInputs = [ + python3Packages.pytest-asyncio + python3Packages.pytestCheckHook + writableTmpDirAsHomeHook ]; - disabledTestPaths = [ - "test/test_tokenizers.py" + # Otherwise fails with 'import file mismatch' + preCheck = '' + rm src/exo/__init__.py + ''; + + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: assert "MacMon not found in PATH" in str(exc_info.value) + "test_macmon_not_found_raises_macmon_error" + + # ValueError: zip() argument 2 is longer than argument 1 + "test_events_processed_in_correct_order" ]; - # Tests require `mlx` which is not supported on linux. - doCheck = stdenv.hostPlatform.isDarwin; + disabledTestPaths = [ + # All tests hang indefinitely + "src/exo/worker/tests/unittests/test_mlx/test_tokenizers.py" + ]; passthru = { - updateScript = gitUpdater { - rev-prefix = "v-"; - }; + updateScript = nix-update-script { }; + exo-pyo3-bindings = pyo3-bindings; + exo-dashboard = dashboard; }; meta = { description = "Run your own AI cluster at home with everyday devices"; homepage = "https://github.com/exo-explore/exo"; - changelog = "https://github.com/exo-explore/exo/releases/tag/v${version}"; + changelog = "https://github.com/exo-explore/exo/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "exo"; }; -} +}) diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index f330a6f182dc..c1332555a5b1 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-edit"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "a-kenji"; repo = "flake-edit"; rev = "v${version}"; - hash = "sha256-cBW2UH25MRSqqQ1930xxIydg+sSf62NFvbjqfkK0vnI="; + hash = "sha256-Ptg/Wt8H6vOvk/V6juDmFd6Vzu/F3LzxDIGObuwySLA="; }; - cargoHash = "sha256-VhDN9Wq6O5lB78zEE/vjO7uzr5de0jKWfd2nRlyLtu8="; + cargoHash = "sha256-5i3wll3CdrRbwN8zsD4MQg62hvsMPESMW4YrtjPeySw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fu/fusesoc/package.nix b/pkgs/by-name/fu/fusesoc/package.nix index 364bb8de030e..ad40fb5665d4 100644 --- a/pkgs/by-name/fu/fusesoc/package.nix +++ b/pkgs/by-name/fu/fusesoc/package.nix @@ -5,30 +5,55 @@ iverilog, verilator, gnumake, + gitMinimal, + openssh, + writableTmpDirAsHomeHook, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "fusesoc"; - version = "2.2.1"; - format = "setuptools"; + version = "2.4.5"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-M36bXBgY8hR33AVDlHoH8PZJG2Bi0KOEI07IMns7R4w="; + hash = "sha256-VBjJ7wiEz441iVquLMGabtdYbK07+dtHY05x8QzdSL8="; }; - nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; dependencies = with python3Packages; [ edalize - fastjsonschema pyparsing pyyaml simplesat - ipyxact + fastjsonschema + argcomplete + ]; + + nativeCheckInputs = [ + gitMinimal + openssh + python3Packages.pytestCheckHook + writableTmpDirAsHomeHook ]; pythonImportsCheck = [ "fusesoc" ]; + disabledTestPaths = [ + # These tests require network access + "tests/test_coremanager.py::test_export" + "tests/test_libraries.py::test_library_add" + "tests/test_libraries.py::test_library_update_with_initialize" + "tests/test_provider.py::test_git_provider" + "tests/test_provider.py::test_github_provider" + "tests/test_provider.py::test_url_provider" + "tests/test_usecases.py::test_git_library_with_default_branch_is_added_and_updated" + "tests/test_usecases.py::test_update_git_library_with_fixed_version" + ]; + makeWrapperArgs = [ "--suffix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index 89aecb2f3bb8..5d3296e72f88 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -13,7 +13,7 @@ let python = python313.override { self = python; packageOverrides = final: prev: { - django = final.django_5_2; + django = final.django_5; django-csp = prev.django-csp.overridePythonAttrs rec { version = "4.0"; src = fetchPypi { diff --git a/pkgs/by-name/go/gokrazy/package.nix b/pkgs/by-name/go/gokrazy/package.nix index 6d5b45bebfcf..a64fb74fba6a 100644 --- a/pkgs/by-name/go/gokrazy/package.nix +++ b/pkgs/by-name/go/gokrazy/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, }: buildGoModule rec { @@ -25,6 +26,15 @@ buildGoModule rec { subPackages = [ "cmd/gok" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd gok \ + --bash <($out/bin/gok completion bash) \ + --fish <($out/bin/gok completion fish) \ + --zsh <($out/bin/gok completion zsh) + ''; + meta = { description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi Zero 2 W, or amd64 PCs"; homepage = "https://github.com/gokrazy/gokrazy"; diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index dddf243a7053..0e6ccfd3552f 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -19,13 +19,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2025-12-18"; + version = "0.1-unstable-2026-01-14"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690"; - hash = "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ="; + rev = "541628cebe42792ddf5063c4abd6402c2f1bd68f"; + hash = "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI="; }; strictDeps = true; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/by-name/ha/halide/package.nix index ccd585f1ce4e..adb1918eefc4 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/by-name/ha/halide/package.nix @@ -1,10 +1,9 @@ { + lib, stdenv, llvmPackages, - lib, fetchFromGitHub, cmake, - fetchpatch2, flatbuffers, libffi, libpng, @@ -29,29 +28,15 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "halide"; - version = "19.0.0"; + version = "21.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; tag = "v${finalAttrs.version}"; - hash = "sha256-0SFGX4G6UR8NS4UsdFOb99IBq2/hEkr/Cm2p6zkIh/8="; + hash = "sha256-A5EnZgXc9+L+bzWHftaL74nHmP8Jf0rnT5KJAAWvKis="; }; - patches = [ - # The following two patches fix cmake/HalidePackageConfigHelpers.cmake to - # support specifying an absolute library install path (which is what Nix - # does when "lib" is included as a separate output) - (fetchpatch2 { - url = "https://github.com/halide/Halide/commit/ac2cd23951aff9ac3b765e51938f1e576f1f0ee9.diff?full_index=1"; - hash = "sha256-JTktOTSyReDUEHTaPPMoi+/K/Gzg39i6MI97cO3654k="; - }) - (fetchpatch2 { - url = "https://github.com/halide/Halide/commit/59f4fff30f4ab628da9aa7e5f77a7f1bb218a779.diff?full_index=1"; - hash = "sha256-yOzE+1jai1w1GQisLYfu8F9pbTE/bYg0MTLq8rPXdGk="; - }) - ]; - postPatch = '' substituteInPlace src/runtime/CMakeLists.txt --replace-fail \ '-isystem "''${VulkanHeaders_INCLUDE_DIR}"' \ @@ -69,18 +54,18 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}" + (lib.cmakeBool "WITH_PYTHON_BINDINGS" pythonSupport) (lib.cmakeBool "WITH_TESTS" doCheck) (lib.cmakeBool "WITH_TUTORIALS" doCheck) # Disable performance tests since they may fail on busy machines - "-DWITH_TEST_PERFORMANCE=OFF" + (lib.cmakeBool "WITH_TEST_PERFORMANCE" false) # Disable fuzzing tests -- this has become the default upstream after the # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba) # These tests also fail to compile on Darwin because of some missing command line options... - "-DWITH_TEST_FUZZ=OFF" + (lib.cmakeBool "WITH_TEST_FUZZ" false) # Disable FetchContent and use versions from nixpkgs instead - "-DHalide_USE_FETCHCONTENT=OFF" - "-DHalide_WASM_BACKEND=${if wasmSupport then "wabt" else "OFF"}" + (lib.cmakeBool "Halide_USE_FETCHCONTENT" false) + (lib.cmakeFeature "Halide_WASM_BACKEND" (if wasmSupport then "wabt" else "OFF")) (lib.cmakeBool "Halide_LLVM_SHARED_LIBS" wasmSupport) ]; @@ -101,6 +86,10 @@ stdenv.mkDerivation (finalAttrs: { "anderson2021_test_apps_autoscheduler" "correctness_cross_compilation" "correctness_simd_op_check_hvx" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Failed Required regular expression not found + "mullapudi2016_histogram" ]; dontUseNinjaCheck = true; @@ -158,6 +147,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; + changelog = "https://github.com/halide/Halide/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ @@ -166,5 +156,10 @@ stdenv.mkDerivation (finalAttrs: { twesterhout ]; broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + badPlatforms = [ + # Build fails on darwin: + # FAILED: [code=133] test/autoschedulers/anderson2021/anderson2021_demo.h + lib.systems.inspect.patterns.isDarwin + ]; }; }) diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix index 684dc0994ee8..a6251f1f4fb0 100644 --- a/pkgs/by-name/ht/htgettoken/package.nix +++ b/pkgs/by-name/ht/htgettoken/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "htgettoken"; - version = "2.5"; + version = "2.6"; format = "setuptools"; src = fetchFromGitHub { owner = "fermitools"; repo = "htgettoken"; tag = "v${version}"; - hash = "sha256-CUzkivrkvMr8EE00tjHswyK5WidQjmki5nLYpeb8jjU="; + hash = "sha256-jHKKTnFZ+6LHaB61wi5+Ht6ZHrE4dDqADIMfGWI47oM="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/hu/hugin/package.nix b/pkgs/by-name/hu/hugin/package.nix index 1e9f0c735191..1303b917cac8 100644 --- a/pkgs/by-name/hu/hugin/package.nix +++ b/pkgs/by-name/hu/hugin/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2025.0.0"; + version = "2025.0.1"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - hash = "sha256-DeJ6XVQy421OXTisJde8r8e33VQqqwMWQKYe1mdnB2w"; + hash = "sha256-fPjrM6aohIzH+Bb69LyIOJIoiD1VExNtzLXLJDkSq3k="; }; buildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 3be6d11eec1d..7a5c134d6061 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -13,7 +13,7 @@ let python = python3.override { self = python3; packageOverrides = self: super: { - django = super.django_5_2; + django = super.django_5; }; }; diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 4498801eb593..674507684ea7 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -7,7 +7,7 @@ let python = python3.override { self = python3; - packageOverrides = (self: super: { django = super.django_5_2; }); + packageOverrides = (self: super: { django = super.django_5; }); }; in diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix index fe57e737db12..967fe27821db 100644 --- a/pkgs/by-name/la/lazydocker/package.nix +++ b/pkgs/by-name/la/lazydocker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.24.3"; + version = "0.24.4"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-JbiG3cy+nn9BWJxX43YW+FKmWvsJPtRZ9NdMHtulzcw="; + sha256 = "sha256-cW90/yblSLBkcR4ZdtcSI9MXFjOUxyEectjRn9vZwvg="; }; vendorHash = null; diff --git a/pkgs/by-name/li/libosmium/package.nix b/pkgs/by-name/li/libosmium/package.nix index dffca35acfcb..f1d66a8fb58e 100644 --- a/pkgs/by-name/li/libosmium/package.nix +++ b/pkgs/by-name/li/libosmium/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libosmium"; - version = "2.22.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; tag = "v${finalAttrs.version}"; - hash = "sha256-b4jdPh6lJ/ALPVblDt16Nabx9ZL8MW8/roI+NqTZshU="; + hash = "sha256-VYNNp7czQgIvPhYxXlPaY/qlVxoZZ6CiJXWrHW+zAD8="; }; nativeBuildInputs = [ cmake ]; @@ -34,8 +34,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - # Fix the build with CMake 4. - "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" (lib.cmakeBool "INSTALL_GDALCPP" true) ]; diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix index 06c74debd822..21df027a9076 100644 --- a/pkgs/by-name/li/listmonk/package.nix +++ b/pkgs/by-name/li/listmonk/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { owner = "knadh"; repo = "listmonk"; rev = "v${finalAttrs.version}"; - hash = "sha256-qfFspzAbb+wCv0rVasfgEVUgbFuFLR1ouT3LeWyKShQ="; + hash = "sha256-FUhmbp4P9zQFlSf3ss17zs4ZaPUi0CbVceq3ZJeIXBY="; }; vendorHash = "sha256-R4chuOzpy/aEB5i5owZV3M7ByqnrXzxLaCeUOcjzQKE="; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index f5da3865acb6..b9010902dd0a 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -9,16 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.0.0-beta.14"; + version = "1.0.3"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-UKoq4RkFcLS47DZHPY/MhrRuLQoWYLoOzO2BeeJZoQw="; + hash = "sha256-i8iC16TFT2zqgJeCcJICcbmPr2kAOTZHvZvAXtHwQQw="; + forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-/THZFU3lJbgJGA4lxWt6fyiHqIgQ539vj57iKoQfXZo="; + cargoHash = "sha256-EGtUvFZw16Rxj8gPQLBapJpKUgRjawZQmn1sRD5gU1E="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index bc00dad687e9..c0e3d35c4e49 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,18 +9,19 @@ buildGoModule rec { pname = "meowlnir"; - version = "0.7.0"; + version = "26.01"; + tag = "v0.2601.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; - tag = "v${version}"; - hash = "sha256-S0GrM8uKfWJh0/oAQp2f7P+yj99N0bovCNscM8b7tB8="; + inherit tag; + hash = "sha256-vrj19+YuhCFwluR+f73WPOJ4bMVxzoG3WjWrN3QuhZ0="; }; buildInputs = [ olm ]; - vendorHash = "sha256-gzigJ2gg9jaREbFdX+38sUV8I/gcB5x+lYaABnS2Mbk="; + vendorHash = "sha256-l6H6NqAq3C0OBYaea3ed6g/wHdNmo5tVkgizx+vU09E="; doCheck = true; doInstallCheck = true; diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix index af391fcfae2d..42d00115174e 100644 --- a/pkgs/by-name/mo/moon/package.nix +++ b/pkgs/by-name/mo/moon/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "moon"; - version = "1.41.5"; + version = "1.41.8"; src = fetchFromGitHub { owner = "moonrepo"; repo = "moon"; tag = "v${finalAttrs.version}"; - hash = "sha256-BcDKjw2k102TQmLeq6+59Z6b4IpnGDRbQ4/nAXXIPBo="; + hash = "sha256-KPK1XE18A8vh5FlGIPizxWmEVPkJHcy6fvtFsOQlhok="; }; - cargoHash = "sha256-mc3A573QaovLwhcZshe9Z60ebHmcCyW/izbxlb2FNpk="; + cargoHash = "sha256-U3Hq5zy1dvG/sJA08bBi2mwMbTP2E5LLIpx0rMq2U1A="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index 849d758898e6..83aa10953964 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.26.1"; + version = "2.27.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-8MC3sHKs7HmxzqFw7px+Q0zX9PzzZhb4I5gcJ/fQ4uc="; + hash = "sha256-XVB3zgdfgApqNwMdZMung4qLZOPfsaWdpqlFUz5z9ZU="; }; - npmDepsHash = "sha256-RIhVSRjqzFawXaRZHAUwGodnNerGz+I3GbPFsP5qESY="; + npmDepsHash = "sha256-e4Uxy1bwR3a+thIkaNWpAwDvIJyTbM5TwVy+YVD0CQQ="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/ne/netbox_4_3/package.nix b/pkgs/by-name/ne/netbox_4_3/package.nix index dc5807639598..3689a4177415 100644 --- a/pkgs/by-name/ne/netbox_4_3/package.nix +++ b/pkgs/by-name/ne/netbox_4_3/package.nix @@ -9,7 +9,7 @@ let py = python3.override { self = py; - packageOverrides = _final: prev: { django = prev.django_5_2; }; + packageOverrides = _final: prev: { django = prev.django_5; }; }; extraBuildInputs = plugins py.pkgs; diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix index 01ee99b882e6..1a6bea9d66bf 100644 --- a/pkgs/by-name/ne/netbox_4_4/package.nix +++ b/pkgs/by-name/ne/netbox_4_4/package.nix @@ -9,7 +9,7 @@ let py = python3.override { self = py; - packageOverrides = _final: prev: { django = prev.django_5_2; }; + packageOverrides = _final: prev: { django = prev.django_5; }; }; extraBuildInputs = plugins py.pkgs; diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index e6a84d96ea5e..fee8f60c7566 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -95,6 +95,9 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/nix-community/nix-init"; changelog = "https://github.com/nix-community/nix-init/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.eclairevoyant ]; + maintainers = with lib.maintainers; [ + eclairevoyant + figsoda + ]; }; }) diff --git a/pkgs/by-name/ni/nix-search-cli/package.nix b/pkgs/by-name/ni/nix-search-cli/package.nix index e5198fb28a7c..8a6ba783cb83 100644 --- a/pkgs/by-name/ni/nix-search-cli/package.nix +++ b/pkgs/by-name/ni/nix-search-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "nix-search-cli"; - version = "0.2-unstable-2024-09-24"; + version = "0.3-unstable-2025-12-03"; src = fetchFromGitHub { owner = "peterldowns"; repo = "nix-search-cli"; - rev = "7d6b4c501ee448dc2e5c123aa4c6d9db44a6dd12"; - hash = "sha256-0Zms/QVCUKxILLLJYsaodSW64DJrVr/yB13SnNL8+Wg="; + rev = "ab0d5156c1e3b383c250ff273639cd3dea6de2d9"; + hash = "sha256-NGL9jj4y16+d0Es7aK1oxqAimZn7sdJDAxVkcY3CTcg="; }; - vendorHash = "sha256-RZuB0aRiMSccPhX30cGKBBEMCSvmC6r53dWaqDYbmyA="; + vendorHash = "sha256-VlJ2OuHOTqIJeGUm2NbBiz33i8QTxaZnnm0JkVGkw1U="; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix index 88d1ae1c0311..0211d0575337 100644 --- a/pkgs/by-name/nu/nurl/package.nix +++ b/pkgs/by-name/nu/nurl/package.nix @@ -52,7 +52,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nix-community/nurl"; changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.matthiasbeyer ]; + maintainers = with lib.maintainers; [ + figsoda + matthiasbeyer + ]; mainProgram = "nurl"; }; } diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 0ead4f13d7c4..b62877f6a9ad 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,7 +14,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.1.23"; + version = "1.1.25"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; diff --git a/pkgs/by-name/or/orbvis/package.nix b/pkgs/by-name/or/orbvis/package.nix index 4b356e652eaa..6099bb5b8ba5 100644 --- a/pkgs/by-name/or/orbvis/package.nix +++ b/pkgs/by-name/or/orbvis/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "orbvis"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "wojciech-graj"; repo = "orbvis"; tag = "v${finalAttrs.version}"; - hash = "sha256-kPbRhm+HymY6DuR4JgE6qTTYKGIqVxvwxtveu7dOOO0="; + hash = "sha256-U19kslgAULBBFozK5KUtew6KRsFeJ4+h8bL9cXmnzso="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 9a03cf6d1722..4a2746ae109c 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -42,7 +42,7 @@ let python = python3.override { self = python; packageOverrides = final: prev: { - django = prev.django_5_2; + django = prev.django_5; fido2 = prev.fido2.overridePythonAttrs { version = "1.2.0"; diff --git a/pkgs/by-name/pa/part-db/fix-composer-validate.diff b/pkgs/by-name/pa/part-db/fix-composer-validate.diff deleted file mode 100644 index 73060f3e0591..000000000000 --- a/pkgs/by-name/pa/part-db/fix-composer-validate.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/composer.json b/composer.json -index 0659f2ee..5a2dee70 100644 ---- a/composer.json -+++ b/composer.json -@@ -1,4 +1,6 @@ - { -+ "name": "part-db/part-db-server", -+ "description": "Part-DB is an Open source inventory management system for your electronic components", - "type": "project", - "license": "AGPL-3.0-or-later", - "require": { -diff --git a/composer.lock b/composer.lock -index 614a35f7..e0c949eb 100644 ---- a/composer.lock -+++ b/composer.lock -@@ -4,7 +4,7 @@ - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], -- "content-hash": "465fa2ab7f9f8dad2b8cfbeaa640c136", -+ "content-hash": "cec123f8cbf51820ba08c5c69ec2ded4", - "packages": [ - { - "name": "amphp/amp", diff --git a/pkgs/by-name/pa/part-db/package.nix b/pkgs/by-name/pa/part-db/package.nix index 67fe7e1b0e08..0cf1b1cae224 100644 --- a/pkgs/by-name/pa/part-db/package.nix +++ b/pkgs/by-name/pa/part-db/package.nix @@ -7,29 +7,25 @@ nodejs, yarnConfigHook, yarnBuildHook, - yarnInstallHook, + nixosTests, envLocalPath ? "/var/lib/part-db/env.local", cachePath ? "/var/cache/part-db/", logPath ? "/var/log/part-db/", }: let pname = "part-db"; - version = "1.14.5"; + version = "2.4.0"; - srcWithVendor = php.buildComposerProject { + srcWithVendor = php.buildComposerProject2 { inherit pname version; src = fetchFromGitHub { owner = "Part-DB"; repo = "Part-DB-server"; tag = "v${version}"; - hash = "sha256-KtNWog4aSnmgJsFckDuBrlnd9cj1f8kmSFi+nv2cZOg="; + hash = "sha256-z/bvFFzKVMN6lr9RnrBc/hTrZ9a/mjgpkDYslUFHM50="; }; - patches = [ - ./fix-composer-validate.diff - ]; - php = php.buildEnv { extensions = ( { enabled, all }: @@ -40,15 +36,25 @@ let ); }; - vendorHash = "sha256-PJtm/3Vdm2zomUklVMKlDAe/vziJN4e+JNNf/u8N3B4="; + vendorHash = "sha256-gt5HBi+vV5WhaEXNFFIO8xcbX1Z60SICvxXWGNzsn5o="; + # Upstream composer.json file is missing the description field + composerStrictValidation = false; composerNoPlugins = false; postInstall = '' + chmod -R u+w $out/share + cd "$out"/share/php/part-db + echo "Running composer dump-autoload to generate autoload_runtime.php..." + composer dump-autoload --no-interaction + export APP_ENV=prod + export APP_SECRET=dummy + export DATABASE_URL=sqlite:///%kernel.project_dir%/data/app.db + php -d memory_limit=256M bin/console cache:warmup + cd /build mv "$out"/share/php/part-db/* $out/ mv "$out"/share/php/part-db/.* $out/ - cd $out/ - php -d memory_limit=256M bin/console cache:warmup + rm -rf "$out/share" ''; }; in @@ -59,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-Mjss2UUHVUdJ4UAI3GkG6HB6g7LbJTqvgrIXFhZmw1Q="; + hash = "sha256-F9kZ8nAIghkg+xUkglvRZXOSadv2lbKTP0gNfLD4LYE="; }; nativeBuildInputs = [ @@ -79,12 +85,17 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${cachePath} $out/var/cache ''; + passthru.tests = { inherit (nixosTests) part-db; }; + meta = { description = "Open source inventory management system for your electronic components"; homepage = "https://docs.part-db.de/"; changelog = "https://github.com/Part-DB/Part-DB-server/releases/tag/v${version}"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ felbinger ]; + maintainers = with lib.maintainers; [ + felbinger + oddlama + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/pd/pdk/Gemfile.lock b/pkgs/by-name/pd/pdk/Gemfile.lock index c34293761fb2..0c94599445ee 100644 --- a/pkgs/by-name/pd/pdk/Gemfile.lock +++ b/pkgs/by-name/pd/pdk/Gemfile.lock @@ -7,13 +7,13 @@ GEM logger (~> 1.5) cri (2.15.12) deep_merge (1.2.2) - diff-lcs (1.5.1) - ffi (1.17.0) + diff-lcs (1.6.2) + ffi (1.17.2) hitimes (2.0.0) json-schema (4.3.1) addressable (>= 2.8) json_pure (2.6.3) - logger (1.6.1) + logger (1.7.0) minitar (0.12.1) pastel (0.8.0) tty-color (~> 0.5) @@ -34,7 +34,7 @@ GEM tty-prompt (~> 0.23) tty-spinner (~> 0.9) tty-which (~> 0.5) - public_suffix (6.0.1) + public_suffix (6.0.2) puppet-modulebuilder (1.1.0) minitar (~> 0.9) pathspec (>= 0.2.1, < 3.0.0) @@ -60,4 +60,4 @@ DEPENDENCIES pdk (= 3.3.0) BUNDLED WITH - 2.5.16 + 2.6.9 diff --git a/pkgs/by-name/pd/pdk/gemset.nix b/pkgs/by-name/pd/pdk/gemset.nix index 8d53eaed9c38..90aef1568ff3 100644 --- a/pkgs/by-name/pd/pdk/gemset.nix +++ b/pkgs/by-name/pd/pdk/gemset.nix @@ -46,20 +46,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.2"; }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.2"; }; hitimes = { groups = [ "default" ]; @@ -97,10 +97,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; minitar = { groups = [ "default" ]; @@ -164,10 +164,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; puppet-modulebuilder = { dependencies = [ diff --git a/pkgs/by-name/pe/peering-manager/package.nix b/pkgs/by-name/pe/peering-manager/package.nix index bab7c5c14e7a..8534577e3529 100644 --- a/pkgs/by-name/pe/peering-manager/package.nix +++ b/pkgs/by-name/pe/peering-manager/package.nix @@ -10,7 +10,7 @@ let python = python3.override { packageOverrides = final: prev: { - django = prev.django_5_2; + django = prev.django_5; }; }; in diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index 60c036d0bf34..d14537418401 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-qpIMm6ivt+v+Un+F03cCtUYMX2dxN/jVGKeCMA20294="; + hash = "sha256-M3zje2UX03go7i9/06jXb8N2imx4VnZp6PHakJB3oZM="; }; - cargoHash = "sha256-ugoXWn2ybdF/HbKqqUQWfNLqtxMdANTn3qnooOYLDKI="; + cargoHash = "sha256-ulMgapYkfTfynNW3XfiC/jo4GWGJ4HS9TCnXAGqs7Ac="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index aa67696130c7..c4b42b2ce913 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -5,21 +5,22 @@ git, uv, python312, + versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "prek"; - version = "0.2.20"; + version = "0.2.30"; src = fetchFromGitHub { owner = "j178"; repo = "prek"; tag = "v${finalAttrs.version}"; - hash = "sha256-AZyYjgUd2dGnBUHwo/cPagFE8IJmzsgMLwebTypLAgE="; + hash = "sha256-IqFUJNFs7a/M9IUNEwW40EZTAh+6a5Ov37xg5c9iwRc="; }; - cargoHash = "sha256-a1yBu4MuyR0veBSQAUdaE/9rB04i6RVJ/NdWNmpRzmM="; + cargoHash = "sha256-KOpQ3P9cmcWYT3bPKtKpzHPagX4b9hH0EiWGpt98NnE="; nativeCheckInputs = [ git @@ -45,7 +46,13 @@ rustPlatform.buildRustPackage (finalAttrs: { useNextest = true; # some python tests use uv, which in turn needs python - UV_PYTHON = "${python312}/bin/python"; + env = { + UV_PYTHON = "${python312}/bin/python"; + UV_NO_MANAGED_PYTHON = true; + UV_SYSTEM_PYTHON = true; + }; + + cargoTestFlags = [ "--no-fail-fast" ]; checkFlags = map (t: "--skip ${t}") [ # these tests require internet access @@ -67,6 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "rust::remote_hooks" "rust::remote_hooks_with_lib_deps" "unsupported::unsupported_language" + "remote_hook_non_workspace" # "meta_hooks" "reuse_env" "docker::docker" @@ -145,15 +153,37 @@ rustPlatform.buildRustPackage (finalAttrs: { "run_in_non_git_repo" # depends on locale "init_nonexistent_repo" + # https://github.com/astral-sh/uv/issues/8635 + "alternate_config_file" + "basic_discovery" + "color" + "cookiecutter_template_directories_are_skipped" + "empty_entry" + "git_dir_respected" + "git_env_vars_not_leaked_to_pip_install" + "gitignore_respected" + "invalid_entry" + "local_python_hook" + "orphan_projects" + "run_with_selectors" + "run_with_stdin_closed" + "show_diff_on_failure" + "submodule_discovery" + "workspace_install_hooks" + # We don't have git info; we run versionCheckHook instead + "version_info" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; meta = { homepage = "https://github.com/j178/prek"; description = "Better `pre-commit`, re-engineered in Rust "; mainProgram = "prek"; - changelog = "https://github.com/j178/prek/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/j178/prek/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.knl ]; }; diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index c9db67140ba9..c15867c1ca82 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -12,7 +12,7 @@ let python = python3.override { self = python; packageOverrides = final: prev: { - django = prev.django_5_2; + django = prev.django_5; django-countries = prev.django-countries.overridePythonAttrs (oldAttrs: rec { version = "8.1.0"; diff --git a/pkgs/by-name/pu/puppet-bolt/Gemfile.lock b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock index 43c5bea6e0b7..70a706d69e61 100644 --- a/pkgs/by-name/pu/puppet-bolt/Gemfile.lock +++ b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock @@ -7,22 +7,25 @@ GEM rexml addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - aws-eventstream (1.3.0) - aws-partitions (1.968.0) - aws-sdk-core (3.201.5) + aws-eventstream (1.4.0) + aws-partitions (1.1140.0) + aws-sdk-core (3.228.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) + base64 + bigdecimal jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.470.0) - aws-sdk-core (~> 3, >= 3.201.0) + logger + aws-sdk-ec2 (1.544.0) + aws-sdk-core (~> 3, >= 3.228.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) - base64 (0.2.0) - bigdecimal (3.1.8) - bindata (2.5.0) - bolt (3.30.0) + base64 (0.3.0) + bigdecimal (3.2.2) + bindata (2.5.1) + bolt (4.0.0) CFPropertyList (>= 2.2) addressable (~> 2.5) aws-sdk-ec2 (~> 1) @@ -35,57 +38,43 @@ GEM net-scp (>= 1.2, < 5.0) net-ssh (>= 4.0, < 8.0) net-ssh-krb (~> 0.5) - orchestrator_client (~> 0.5) + orchestrator_client (~> 0.7) puppet (>= 6.18.0) puppet-resource_api (>= 1.8.1) puppet-strings (>= 2.3.0, < 5.0) puppetfile-resolver (>= 0.6.2, < 1.0) - r10k (~> 3.10) + r10k (>= 3.10, < 5) ruby_smb (~> 1.0) terminal-table (~> 3.0) winrm (~> 2.0) winrm-fs (~> 1.3) builder (3.3.0) colored2 (3.1.2) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) cri (2.15.12) deep_merge (1.2.2) - erubi (1.13.0) - facter (4.6.1) + erubi (1.13.1) + facter (4.10.0) hocon (~> 1.3) - thor (>= 1.0.1, < 2.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.2) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) + thor (>= 1.0.1, < 1.3) + faraday (2.13.4) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.4.1) + net-http (>= 0.5.0) + faraday-net_http_persistent (2.3.1) + faraday (~> 2.5) + net-http-persistent (>= 4.0.4, < 5) fast_gettext (2.4.0) prime - ffi (1.17.0) + ffi (1.17.2) forwardable (1.3.3) getoptlong (0.2.1) - gettext (3.4.9) + gettext (3.5.1) erubi locale (>= 2.0.5) prime @@ -103,43 +92,49 @@ GEM hiera-eyaml (3.4.0) highline optimist - highline (3.1.0) + highline (3.1.2) reline hocon (1.4.0) - httpclient (2.8.3) - io-console (0.7.2) + httpclient (2.9.0) + mutex_m + io-console (0.8.1) jmespath (1.6.2) - jwt (2.7.1) + json (2.13.2) + jwt (2.10.2) + base64 little-plugger (1.1.4) locale (2.1.4) log4r (1.1.10) + logger (1.7.0) logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) minitar (0.12.1) molinillo (0.8.0) - multi_json (1.15.0) - multipart-post (2.4.1) - net-http-persistent (4.0.2) - connection_pool (~> 2.2) - net-scp (4.0.0) + multi_json (1.17.0) + mutex_m (0.3.0) + net-http (0.6.0) + uri + net-http-persistent (4.0.6) + connection_pool (~> 2.2, >= 2.2.4) + net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) - net-ssh (7.2.3) + net-ssh (7.3.0) net-ssh-krb (0.5.1) gssapi (~> 1.3.0) net-ssh (>= 2.0) nkf (0.2.0) nori (2.7.1) bigdecimal - optimist (3.1.0) - orchestrator_client (0.7.0) - faraday (~> 1.4) - net-http-persistent (~> 4.0) - prime (0.1.2) + optimist (3.2.1) + orchestrator_client (0.7.1) + faraday (>= 1.4, < 3.0) + faraday-net_http_persistent (>= 1.0, < 3.0) + prime (0.1.4) forwardable singleton - public_suffix (6.0.1) - puppet (8.8.1) + public_suffix (6.0.2) + puppet (8.10.0) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) facter (>= 4.3.0, < 5) @@ -152,51 +147,47 @@ GEM semantic_puppet (~> 1.0) puppet-resource_api (1.9.0) hocon (>= 1.0) - puppet-strings (4.1.2) + puppet-strings (4.1.3) rgen (~> 0.9) - yard (~> 0.9) - puppet_forge (3.2.0) - faraday (~> 1.3) - faraday_middleware (~> 1.0) - minitar + yard (~> 0.9, < 0.9.37) + puppet_forge (5.0.4) + faraday (~> 2.0) + faraday-follow_redirects (~> 0.3.0) + minitar (< 1.0.0) semantic_puppet (~> 1.0) puppetfile-resolver (0.6.3) molinillo (~> 0.6) semantic_puppet (~> 1.0) - r10k (3.16.2) + r10k (4.1.0) colored2 (= 3.1.2) cri (>= 2.15.10) - fast_gettext (>= 1.1.0, < 3.0.0) - gettext (>= 3.0.2, < 4.0.0) - gettext-setup (>= 0.24, < 2.0.0) - jwt (>= 2.2.3, < 2.8.0) + gettext-setup (>= 0.24, < 2.0) + jwt (>= 2.2.3, < 3) log4r (= 1.1.10) minitar (~> 0.9) multi_json (~> 1.10) - puppet_forge (>= 2.3.0, < 4.0.0) + puppet_forge (>= 4.1, < 6) racc (1.8.1) - reline (0.5.9) + reline (0.6.2) io-console (~> 0.5) - rexml (3.3.6) - strscan - rgen (0.9.1) - ruby2_keywords (0.0.5) + rexml (3.4.1) + rgen (0.10.2) ruby_smb (1.1.0) bindata rubyntlm windows_error rubyntlm (0.6.5) base64 - rubyzip (2.3.2) + rubyzip (2.4.1) scanf (1.0.0) - semantic_puppet (1.1.0) - singleton (0.2.0) - strscan (3.1.0) + semantic_puppet (1.1.1) + singleton (0.3.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) text (1.3.1) - thor (1.3.1) - unicode-display_width (2.5.0) + thor (1.2.2) + unicode-display_width (2.6.0) + uri (1.0.3) windows_error (0.1.5) winrm (2.3.9) builder (>= 2.1.2) @@ -222,4 +213,4 @@ DEPENDENCIES bolt BUNDLED WITH - 2.5.16 + 2.6.9 diff --git a/pkgs/by-name/pu/puppet-bolt/gemset.nix b/pkgs/by-name/pu/puppet-bolt/gemset.nix index 536eabfe2656..07d6d2930ff5 100644 --- a/pkgs/by-name/pu/puppet-bolt/gemset.nix +++ b/pkgs/by-name/pu/puppet-bolt/gemset.nix @@ -15,36 +15,39 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0m74rrlwv741wlp2imw5y93ybrzczx0r2jvcgp1v4zq299z3zy29"; + sha256 = "1snwg6nj6v1rmqp96xlff3k1lkg0z4jamkj7cj978vdkzsfi807k"; type = "gem"; }; - version = "1.968.0"; + version = "1.1140.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" + "bigdecimal" "jmespath" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l5c37gvarb3p3zsip1p9mpmir0zdccp0aibgx9cy61im4pwaj0q"; + sha256 = "0r3mvwqndqg0c29cnznhmgnkcsmxncx4r6gqwfjwp5imkrgarp86"; type = "gem"; }; - version = "3.201.5"; + version = "3.228.0"; }; aws-sdk-ec2 = { dependencies = [ @@ -55,10 +58,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0z7zk5z9zyqqljh8fxhq8ngp8pixbm85pa9ygpr0nmgdl2b1i7ff"; + sha256 = "0wi5xy62z34r6h1j5padz00wi6q21v4g1i7b04sqnvmb9kxdklzf"; type = "gem"; }; - version = "1.470.0"; + version = "1.544.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -66,40 +69,40 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yf396fxashbqn0drbnvd9srxfg7w06v70q8kqpzi04zqchf6lvp"; + sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9"; type = "gem"; }; - version = "1.9.1"; + version = "1.12.1"; }; base64 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r"; type = "gem"; }; - version = "3.1.8"; + version = "3.2.2"; }; bindata = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19"; + sha256 = "0n4ymlgik3xcg94h52dzmh583ss40rl3sn0kni63v56sq8g6l62k"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.1"; }; bolt = { dependencies = [ @@ -130,10 +133,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0krs4mmy1db531gyibhzaxmghb606yjmqqyfghvriy7b9sgi6bq8"; + sha256 = "0j7yr4v8id58ag521l1xmdqhb7nsmnffb7bv32krfzvwi1f26mrj"; type = "gem"; }; - version = "3.30.0"; + version = "4.0.0"; }; builder = { groups = [ "default" ]; @@ -175,20 +178,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; connection_pool = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.3"; }; cri = { groups = [ "default" ]; @@ -215,10 +218,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; + sha256 = "1naaxsqkv5b3vklab5sbb9sdpszrjzlfsbqpy7ncbnw510xi10m0"; type = "gem"; }; - version = "1.13.0"; + version = "1.13.1"; }; facter = { dependencies = [ @@ -229,145 +232,61 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pxpldfcf40dr9khra3sa131ij7gzd97bba2vpw89c785pl736a7"; + sha256 = "17d561xf4s5016fm9jkfkkafn6660g04fz1yp5xfvkb0j4xj32mp"; type = "gem"; }; - version = "4.6.1"; + version = "4.10.0"; }; faraday = { dependencies = [ - "faraday-em_http" - "faraday-em_synchrony" - "faraday-excon" - "faraday-httpclient" - "faraday-multipart" "faraday-net_http" - "faraday-net_http_persistent" - "faraday-patron" - "faraday-rack" - "faraday-retry" - "ruby2_keywords" + "json" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; - type = "gem"; - }; - version = "1.10.3"; - }; - faraday-em_http = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + sha256 = "09mcghancmn0s5cwk2xz581j3xm3xqxfv0yxg75axnyhrx9gy6f7"; type = "gem"; }; - version = "1.0.0"; + version = "2.13.4"; }; - faraday-excon = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-httpclient = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-multipart = { - dependencies = [ "multipart-post" ]; + faraday-follow_redirects = { + dependencies = [ "faraday" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; + sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr"; type = "gem"; }; - version = "1.0.4"; + version = "0.3.0"; }; faraday-net_http = { + dependencies = [ "net-http" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; + sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9"; type = "gem"; }; - version = "1.0.2"; + version = "3.4.1"; }; faraday-net_http_persistent = { + dependencies = [ + "faraday" + "net-http-persistent" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-retry = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; - }; - faraday_middleware = { - dependencies = [ "faraday" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + sha256 = "18zwd0p2vknmpk7zrw3gz9rsln69is8h2g831yhhfy52sqvvmzr3"; type = "gem"; }; - version = "1.2.0"; + version = "2.3.1"; }; fast_gettext = { dependencies = [ "prime" ]; @@ -385,10 +304,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.2"; }; forwardable = { groups = [ "default" ]; @@ -422,10 +341,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16h0kda5z4s4zqygyk0f52xzs9mlz9r4lnhjwk729hhmdbz68a19"; + sha256 = "0aji3873pxn6gc5qkvnv5y9025mqk0p6h22yrpyz2b3yx9qpzv03"; type = "gem"; }; - version = "3.4.9"; + version = "3.5.1"; }; gettext-setup = { dependencies = [ @@ -487,10 +406,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sxqnaz6wvkwbwzsipwsqcg1zw2kn67x7l362whv87zl5133w60l"; + sha256 = "0jmvyhjp2v3iq47la7w6psrxbprnbnmzz0hxxski3vzn356x7jv7"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.2"; }; hocon = { groups = [ "default" ]; @@ -503,24 +422,25 @@ version = "1.4.0"; }; httpclient = { + dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; io-console = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; + sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y"; type = "gem"; }; - version = "0.7.2"; + version = "0.8.1"; }; jmespath = { groups = [ "default" ]; @@ -532,15 +452,26 @@ }; version = "1.6.2"; }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82"; + type = "gem"; + }; + version = "2.13.2"; + }; jwt = { + dependencies = [ "base64" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; + sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i"; type = "gem"; }; - version = "2.7.1"; + version = "2.10.2"; }; little-plugger = { groups = [ "default" ]; @@ -572,6 +503,16 @@ }; version = "1.1.10"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; logging = { dependencies = [ "little-plugger" @@ -611,20 +552,31 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n"; type = "gem"; }; - version = "1.15.0"; + version = "1.17.0"; }; - multipart-post = { + mutex_m = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; type = "gem"; }; - version = "2.4.1"; + version = "0.3.0"; + }; + net-http = { + dependencies = [ "uri" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + type = "gem"; + }; + version = "0.6.0"; }; net-http-persistent = { dependencies = [ "connection_pool" ]; @@ -632,10 +584,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i1as2lgnw7b4jid0gw5glv5hnxz36nmfsbr9rmxbcap72ijgy03"; + sha256 = "0pfxhhn1lqnxx8dj3ig3lgnhkxq5jsb0brg7w2wnrpwf8c23mfra"; type = "gem"; }; - version = "4.0.2"; + version = "4.0.6"; }; net-scp = { dependencies = [ "net-ssh" ]; @@ -643,20 +595,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; + sha256 = "0p8s7l4pr6hkn0l6rxflsc11alwi1kfg5ysgvsq61lz5l690p6x9"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; net-ssh = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sqbq5aks9xxnldbd2hy20ypnd59zcra98ql0r7jjc26s5rgc18n"; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; type = "gem"; }; - version = "7.2.3"; + version = "7.3.0"; }; net-ssh-krb = { dependencies = [ @@ -698,24 +650,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q4jqq3v1bxlfr9jgqmahnygkvl81lr6s1rhm8qg66c9xr9nz241"; + sha256 = "0kp3f8g7g7cbw5vfkmpdv71pphhpcxk3lpc892mj9apkd7ys1y4c"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.1"; }; orchestrator_client = { dependencies = [ "faraday" - "net-http-persistent" + "faraday-net_http_persistent" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05jb10gjffrj5wy8ps1chki3n0z734bx1nx7a6wahh7cjnrqqmsg"; + sha256 = "0iij18nwivxflzyxfxhx5d0i5085hx1fa87spvi980lq31akhnwy"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; prime = { dependencies = [ @@ -726,20 +678,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1973kz8lbck6ga5v42f55jk8b8pnbgwp9p67dl1xw15gvz55dsfl"; + sha256 = "0pi2g9sd9ssyrpvbybh4skrgzqrv0rrd1q7ylgrsd519gjzmwxad"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.4"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; puppet = { dependencies = [ @@ -758,10 +710,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v2jqkan3nidifxdlpm7lk0ih5s8khl9ps0nz62wj3zlywck0wsi"; + sha256 = "0fia3ji6isnqz4a31aq8k4nd8p7vkxn80hhgqfdc8kkrba7xxxgj"; type = "gem"; }; - version = "8.8.1"; + version = "8.10.0"; }; puppet-resource_api = { dependencies = [ "hocon" ]; @@ -783,15 +735,15 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zcs25xxkfymks4knilryfpr8k0v7z3nazdm61v7a1x4rxhs7sxp"; + sha256 = "0gna12w39bjnczbqdz4gmlizqxhja8h4wvgn1qlpa3zm4w09xlcw"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; puppet_forge = { dependencies = [ "faraday" - "faraday_middleware" + "faraday-follow_redirects" "minitar" "semantic_puppet" ]; @@ -799,10 +751,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03aaznd1gyf3wpqg34y32zfj2yxf67r85m6zfz05pv9ijizrmdnj"; + sha256 = "0d65zri1nmpph8iki5iigdzfqd6rfyc1mlgdfhg69q3566rcff06"; type = "gem"; }; - version = "3.2.0"; + version = "5.0.4"; }; puppetfile-resolver = { dependencies = [ @@ -822,8 +774,6 @@ dependencies = [ "colored2" "cri" - "fast_gettext" - "gettext" "gettext-setup" "jwt" "log4r" @@ -835,10 +785,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1f9fwfmr44lbnx31fdiabm7sb41nsbf10awm96zl79clp8kafxcp"; + sha256 = "0k3fr2f0pwyrabs12wqig31f37sqrqs8qza7jrn01d6blvhvkrb4"; type = "gem"; }; - version = "3.16.2"; + version = "4.1.0"; }; racc = { groups = [ "default" ]; @@ -856,41 +806,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y6kyz7kcilwdpfy3saqfgnar38vr5ys9sp40ndffy6h1znxfbax"; + sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x"; type = "gem"; }; - version = "0.5.9"; + version = "0.6.2"; }; rexml = { - dependencies = [ "strscan" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ik3in0957l9s6iwdm3nsk4za072cj27riiqgpx6zzcd22flbw3s"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.3.6"; + version = "3.4.1"; }; rgen = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1abg3frzak6inwbr4caq6mfd5spx37xnwlxss8615jr12wh525vp"; + sha256 = "0wgk4brd1v63ivdh5nnlkynfxk8m7bac9q50ydgq3d50hx4ghy6r"; type = "gem"; }; - version = "0.9.1"; - }; - ruby2_keywords = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; + version = "0.10.2"; }; ruby_smb = { dependencies = [ @@ -923,10 +862,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; scanf = { groups = [ "default" ]; @@ -943,30 +882,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ndqm3jnpdlwkk1jwqdyyb7yw7gv6r4kmjs30g09ap8siv80ilaj"; + sha256 = "15ksbizvakfx0zfdgjbh34hqnrnkjj47m4kbnsg58mpqsx45pzqm"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; singleton = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qq54imvbksnckzf9hrq9bjzcdb0n8wfv6l5jc0di10n88277jx6"; + sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3"; type = "gem"; }; - version = "0.2.0"; - }; - strscan = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; + version = "0.3.0"; }; terminal-table = { dependencies = [ "unicode-display_width" ]; @@ -994,20 +923,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.3.1"; + version = "1.2.2"; }; unicode-display_width = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; + }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; }; windows_error = { groups = [ "default" ]; diff --git a/pkgs/by-name/pu/puppet-lint/Gemfile.lock b/pkgs/by-name/pu/puppet-lint/Gemfile.lock index 61842458aa5b..e9b1610b37a7 100644 --- a/pkgs/by-name/pu/puppet-lint/Gemfile.lock +++ b/pkgs/by-name/pu/puppet-lint/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - puppet-lint (4.2.4) + puppet-lint (4.3.0) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES puppet-lint BUNDLED WITH - 2.5.6 + 2.6.9 diff --git a/pkgs/by-name/pu/puppet-lint/gemset.nix b/pkgs/by-name/pu/puppet-lint/gemset.nix index 9a30ccf7c232..86ef0aa1f3f6 100644 --- a/pkgs/by-name/pu/puppet-lint/gemset.nix +++ b/pkgs/by-name/pu/puppet-lint/gemset.nix @@ -4,9 +4,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1n2pffwxj1n33hc7aw74g6a4gn5v7rawcs7rglidbdq1g4kzd829"; + sha256 = "1lbr7smgx3k48zxrsp4kkkpwfgr6q2mjyz0bz5r14j0in5j5j3xa"; type = "gem"; }; - version = "4.2.4"; + version = "4.3.0"; }; } diff --git a/pkgs/by-name/qm/qmqtt/package.nix b/pkgs/by-name/qm/qmqtt/package.nix index f9e2c138e6a5..6be416d7470e 100644 --- a/pkgs/by-name/qm/qmqtt/package.nix +++ b/pkgs/by-name/qm/qmqtt/package.nix @@ -3,18 +3,18 @@ stdenv, fetchFromGitHub, cmake, - qt5, + qt6, }: stdenv.mkDerivation rec { pname = "qmqtt"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "emqx"; repo = "qmqtt"; rev = "v${version}"; - hash = "sha256-JLGwEF5e/IKzPzCQBzB710REGWbc/MW+r5AHmyYUkUI="; + hash = "sha256-cIzBnJdMFY25cWf1rBoRQx1G0/5S32igF8vcte+nyHI="; }; outputs = [ @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qt5.qtbase + qt6.qtbase ]; meta = { diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 7a00c9b90c72..9312c9a684f4 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -24,7 +24,7 @@ let in python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "4.0.32"; + version = "4.0.33"; pyproject = false; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { let src-tarball = requireFile { name = "rcu-${version}-source.tar.gz"; - hash = "sha256-0sJyCRDV76HUy78RBO27AgkXGroL217GNwHp8HMSKx8="; + hash = "sha256-ezbG3qUfUyr9JEXyKTrULYCVm4hA4+nvcHPzJpdLaWY="; url = "https://www.davisr.me/projects/rcu/"; }; in diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 634570114df4..1c9c4f777c39 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.22.56"; + version = "1.22.58"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-MGWwXEzgUD4vjBnxolvtma59abK8qpXQLVKMhk54wr4="; + hash = "sha256-xGA3ASWRuM+RloOHcaNregTClf+XUtP7jrTiQRem71s="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index c42956f5c5a8..8cb5f22c883d 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "4.11.1"; + version = "4.11.2"; src = fetchFromGitHub { owner = "RocketChat"; repo = "Rocket.Chat.Electron"; tag = version; - hash = "sha256-JJb4VALCzw2QjiyBc4E9KUMMj1FvZL0SSJvyoEg7Olc="; + hash = "sha256-GTeRrj2zcu36h4z7zPLIYy0pEk94QejTi+6/e3r8XW8="; }; # This might need to be updated between releases. diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix index be1f1d383003..51aa064447e5 100644 --- a/pkgs/by-name/sc/scalafmt/package.nix +++ b/pkgs/by-name/sc/scalafmt/package.nix @@ -9,7 +9,7 @@ let baseName = "scalafmt"; - version = "3.10.3"; + version = "3.10.4"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -19,7 +19,7 @@ let cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHash = "sha256-xJqppoHji0cYvd1iAmhqjCbuX0yV15TvqCvYKrf7Y3E="; + outputHash = "sha256-i4J7qFdzzcSb3RnYH2vAKFBVdMdW1V4hHcxQvNOEjXg="; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index 295238f701ca..6a6215838ab3 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "scooter"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "thomasschafer"; repo = "scooter"; rev = "v${version}"; - hash = "sha256-hOuhgPE24DBF/uFz/S51h+d7j5yDjPs8Mvfkcp2BQsc="; + hash = "sha256-hKF0b3vgZ8kIK9QT129Ms+Rua6+Rrv8Jk2pt81eCc5Y="; }; - cargoHash = "sha256-S2oLItnyRURPyYDroa7PlHbKIhnE4HdXeo1y6cAKvss="; + cargoHash = "sha256-008wp5xa0G6E3e6rIhd1sE8cIIcHQ3LoCBl/cJx76Sw="; # Ensure that only the `scooter` package is built (excluding `xtask`) cargoBuildFlags = [ diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 59dbb4e24f26..bdde132fe399 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,14 +13,14 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2025-11-25"; + version = "0-unstable-2026-01-11"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "ebb9ea45715d655072400b2b5925f03ec96cf5eb"; - hash = "sha256-tRPaQcM7EzDuD4MOK4t81uY8mhl9lzvnC955CS7j/u8="; + rev = "cf74e1d9e9ad662aef450ddd79aedee43554dc3c"; + hash = "sha256-hKnfZBPr8rJyZAYBtVXpyzXwBQqg2DPFwqzH08qCITs="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; @@ -31,9 +31,8 @@ python.pkgs.toPythonModule ( "flask-babel" "httpx-socks" "lxml" - "setproctitle" + "msgspec" "typer-slim" - "typing-extensions" "whitenoise" ]; @@ -62,9 +61,7 @@ python.pkgs.toPythonModule ( with python.pkgs; [ babel - brotli certifi - cryptography fasttext-predict flask flask-babel @@ -78,9 +75,9 @@ python.pkgs.toPythonModule ( pygments python-dateutil pyyaml - setproctitle + sniffio typer-slim - uvloop + typing-extensions valkey whitenoise ] diff --git a/pkgs/by-name/se/selfci/Cargo.toml.patch b/pkgs/by-name/se/selfci/Cargo.toml.patch new file mode 100644 index 000000000000..ab385872ce7a --- /dev/null +++ b/pkgs/by-name/se/selfci/Cargo.toml.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 8f7a1e2..e2062c4 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -10,7 +10,7 @@ readme = "README.md" + keywords = ["ci"] + categories = ["development-tools"] + authors = ["dpc <dpc@dpc.pw>"] +-rust-version = "1.92" ++rust-version = "1.91" + + [[bin]] + name = "selfci" diff --git a/pkgs/by-name/se/selfci/package.nix b/pkgs/by-name/se/selfci/package.nix new file mode 100644 index 000000000000..a5c4f3d33b83 --- /dev/null +++ b/pkgs/by-name/se/selfci/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchgit, + nix-update-script, + rustPlatform, + git, + makeWrapper, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "selfci"; + version = "0-unstable-2026-01-17"; + + src = fetchgit { + url = "https://radicle.dpc.pw/z2tDzYbAXxTQEKTGFVwiJPajkbeDU.git"; + rev = "83e693dada851ce0da32713869d3da02c52ed257"; + hash = "sha256-f0BfHvIQnhhiPie3a+9MeEGzZ+/KcgrbKBneu8Jo+xs="; + }; + + cargoHash = "sha256-Z3f35HIZiNeKeDNFPUVkFvL2OpMWzqRvxOL5/hUEzJw="; + + nativeBuildInputs = [ + makeWrapper + ]; + + patches = [ + ./Cargo.toml.patch + ]; + + doCheck = false; + + postInstall = '' + wrapProgram "$out"/bin/selfci \ + --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Minimalistic local-first Unix-philosophy-abiding CI"; + homepage = "https://app.radicle.xyz/nodes/radicle.dpc.pw/rad%3Az2tDzYbAXxTQEKTGFVwiJPajkbeDU"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + dvn0 + ]; + mainProgram = "selfci"; + }; +}) diff --git a/pkgs/by-name/se/server-box/git-hashes.json b/pkgs/by-name/se/server-box/git-hashes.json index a10caf0c8b05..88acaac055e3 100644 --- a/pkgs/by-name/se/server-box/git-hashes.json +++ b/pkgs/by-name/se/server-box/git-hashes.json @@ -2,7 +2,7 @@ "circle_chart": "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=", "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=", "dartssh2": "sha256-Bl5eLrYU2YnpRcleff3wVXiTS9wuo2A1neiLUClvbGU=", - "fl_build": "sha256-e2BUk4WmwFzFrA2iHg4dG8fRqWhNt8KFuTEZgWL7H4g=", + "fl_build": "sha256-NLKmnx26FDuTRwdm4C/HxwpeRekmZkFypcPJVdvDS4U=", "fl_lib": "sha256-0Dg21LBVIyTH5MLt/v+kGzfOK8PFVYfNiK6P/jcy2jI=", "gtk": "sha256-nt7d2MvIfizxezWhQNm2/yHEzYuPKDvfHGM9Bnq3f04=", "plain_notification_token": "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=", diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix index 77a93cc5449d..a123b962ab6b 100644 --- a/pkgs/by-name/se/server-box/package.nix +++ b/pkgs/by-name/se/server-box/package.nix @@ -13,13 +13,13 @@ }: let - version = "1.0.1276"; + version = "1.0.1291"; src = fetchFromGitHub { owner = "lollipopkit"; repo = "flutter_server_box"; tag = "v${version}"; - hash = "sha256-fmL03BNVi1aKhb0jV7MnEtRKTOEaLBGl6uMJtLr6cFk="; + hash = "sha256-5SEw0hNeZg2a4SaqFnkKASeEVXpLWVjQVNT2NlaJz9c="; }; in flutter338.buildFlutterApplication { diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json index ffae6e8f4310..5b0dce994028 100644 --- a/pkgs/by-name/se/server-box/pubspec.lock.json +++ b/pkgs/by-name/se/server-box/pubspec.lock.json @@ -587,8 +587,8 @@ "dependency": "direct dev", "description": { "path": ".", - "ref": "v1.0.52", - "resolved-ref": "38e7d41ccd71bf44e286d86b4ad656f05c5c2548", + "ref": "v1.0.53", + "resolved-ref": "61ee37ea6f082592f5be56340b7746dce4ffbfda", "url": "https://github.com/lppcg/fl_build.git" }, "source": "git", @@ -1998,7 +1998,7 @@ "version": "2.2.2" }, "url_launcher": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "url_launcher", "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index 96d8144e83a2..aaf07d8d662c 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -52,7 +52,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/TheR1D/shell_gpt"; changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SohamG ]; + maintainers = with lib.maintainers; [ + SohamG + mio + ]; mainProgram = "sgpt"; }; } diff --git a/pkgs/by-name/si/siege/package.nix b/pkgs/by-name/si/siege/package.nix index c45f19b4d2db..c3e5901b6477 100644 --- a/pkgs/by-name/si/siege/package.nix +++ b/pkgs/by-name/si/siege/package.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { "--with-zlib=${zlib.dev}" ]; + # Borrowed solution from homebrew: https://github.com/Homebrew/homebrew-core/blob/1c7c95183c0984a84b1680422afab6578c300a27/Formula/s/siege.rb#L31 + CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; + meta = { description = "HTTP load tester"; homepage = "https://www.joedog.org/siege-home/"; diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix index b314ef9aeadc..f1c20be16c8b 100644 --- a/pkgs/by-name/sp/speed-dreams/package.nix +++ b/pkgs/by-name/sp/speed-dreams/package.nix @@ -152,7 +152,10 @@ stdenv.mkDerivation rec { description = "Car racing game - TORCS fork with more experimental approach"; homepage = "https://www.speed-dreams.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ + raskin + mio + ]; platforms = lib.platforms.linux; mainProgram = "speed-dreams"; }; diff --git a/pkgs/by-name/ss/ssh-agent-mux/package.nix b/pkgs/by-name/ss/ssh-agent-mux/package.nix new file mode 100644 index 000000000000..d33864f444bd --- /dev/null +++ b/pkgs/by-name/ss/ssh-agent-mux/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + openssh, +}: + +rustPlatform.buildRustPackage rec { + pname = "ssh-agent-mux"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "overhacked"; + repo = "ssh-agent-mux"; + rev = "v${version}"; + hash = "sha256-tIGrENlZcT9fGke6MRnsLsmm+kb0Mm3C6DckkZi8hpE="; + }; + + cargoHash = "sha256-u5kGYCYDvEhSuGOLnhdt9IpRwzllXbSJDwY1XzpHBCc="; + + nativeCheckInputs = [ openssh ]; + + meta = { + description = "A proxy that multiplexes SSH agent requests to multiple upstream agents"; + homepage = "https://github.com/overhacked/ssh-agent-mux"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.kalbasit ]; + mainProgram = "ssh-agent-mux"; + }; +} diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index ba3f00e5e95a..b08b779814ff 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { mpl11 mpl20 ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mio ]; # The darwin src zip file holds simply a prebuilt swt.jar file sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin [ lib.sourceTypes.binaryNativeCode diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix index 9f836c1c5bdc..ac2e8a6ccd28 100644 --- a/pkgs/by-name/ts/tsx/package.nix +++ b/pkgs/by-name/ts/tsx/package.nix @@ -2,35 +2,36 @@ lib, stdenv, fetchFromGitHub, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs_22, versionCheckHook, + nix-update-script, }: let - pnpm' = pnpm_9.override { nodejs = nodejs_22; }; + pnpm' = pnpm_10.override { nodejs = nodejs_22; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tsx"; - version = "4.19.3"; + version = "4.21.0"; src = fetchFromGitHub { owner = "privatenumber"; repo = "tsx"; - tag = "v${version}"; - hash = "sha256-wdv2oqJNc6U0Fyv4jT+0LUcYaDfodHk1vQZGMdyFF/E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vlVRq637l84xi9Og0ryzYuu+1b/eBq13jQJIptY0u0o="; }; pnpmDeps = fetchPnpmDeps { - inherit + inherit (finalAttrs) pname version src ; pnpm = pnpm'; fetcherVersion = 1; - hash = "sha256-57KDZ9cHb7uqnypC0auIltmYMmIhs4PWyf0HTRWEFiU="; + hash = "sha256-6ZizQtZC43yXrz634VXksRCKGkDKryICvT3Q+JCuIEw="; }; nativeBuildInputs = [ @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { # because tsx uses semantic-release, the package.json has a placeholder # version number. this patches it to match the version of the nix package, # which in turn is the release version in github. - substituteInPlace package.json --replace-fail "0.0.0-semantic-release" "${version}" + substituteInPlace package.json --replace-fail "0.0.0-semantic-release" "${finalAttrs.version}" runHook postPatch ''; @@ -62,7 +63,10 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - npm run build + pnpm run build + + # remove unneeded files + find dist -type f \( -name '*.cts' -or -name '*.mts' -or -name '*.ts' \) -delete # remove devDependencies that are only required to build # and package the typescript code @@ -93,11 +97,16 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "TypeScript Execute (tsx): The easiest way to run TypeScript in Node.js"; homepage = "https://tsx.is"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.sdedovic ]; + maintainers = with lib.maintainers; [ + sdedovic + higherorderlogic + ]; mainProgram = "tsx"; }; -} +}) diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_108/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_108/package.nix new file mode 100644 index 000000000000..9ec22500a2c3 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_108/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.108"; + hash = "sha256-UsuxILm1G6PkmVw0I/JF12CRltAfCJQFOaT4hFwvR8E="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-iqQiWbsKlLBiJFeqIYiXo3cqxGLSjNM8SOWXGM9u43E="; + }; +} diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 91231da9b554..04749c37a459 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -18,7 +18,7 @@ let python = python3.override { packageOverrides = final: prev: { - django = prev.django_5_2; + django = prev.django_5; }; }; in diff --git a/pkgs/by-name/wo/wowup-cf/package.nix b/pkgs/by-name/wo/wowup-cf/package.nix index 8e9f2bdabce4..fb00c57ec04c 100644 --- a/pkgs/by-name/wo/wowup-cf/package.nix +++ b/pkgs/by-name/wo/wowup-cf/package.nix @@ -5,12 +5,12 @@ }: let - version = "2.20.0"; + version = "2.22.0"; pname = "wowup-cf"; src = fetchurl { url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage"; - hash = "sha256-Fu0FqeWJip0cXSifu1QDktu73SsxGpkEU3cuYbFghxc="; + hash = "sha256-X5gDnj4YBZRBwJEeb8sVMNoGmWUI9iVdWOmsA20bWig="; }; appimageContents = appimageTools.extractType1 { inherit pname version src; }; diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix index af57cdaca2cf..2813bad39a43 100644 --- a/pkgs/by-name/zb/zbus-xmlgen/package.nix +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "zbus_xmlgen"; - version = "5.1.0"; + version = "5.2.0"; src = fetchCrate { inherit pname version; - hash = "sha256-LHY4E2YemGksK8xJx0r3iTHnk3CqMl5abM08VSBPIfo="; + hash = "sha256-CFXOPUWjbzNkE8mb+AC4ZtdvV0MSb/eBr1C0WyreAoU="; }; - cargoHash = "sha256-g5GLyloeyVXcJgMVx21ePYlcYUj+NGFtVarpYeQN9rw="; + cargoHash = "sha256-ggKuTcsUMhfhY39i/iZj7oPrsFchRdcko1oDE+XQLfE="; nativeBuildInputs = [ makeBinaryWrapper ]; nativeCheckInputs = [ rustfmt ]; diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix index 04c3f51473ff..ee05e3b6331e 100644 --- a/pkgs/by-name/zu/zuban/package.nix +++ b/pkgs/by-name/zu/zuban/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zuban"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "zubanls"; repo = "zuban"; tag = "v${finalAttrs.version}"; - hash = "sha256-RLJ5PX/4Fh3OWqhZD3UnS8P2aappNADK8Mb56aRcLng="; + hash = "sha256-3K2PHccGXLD4Jk+DhSoD8dbOG+n40tbiAPfEF27vukg="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/zuban"; - cargoHash = "sha256-7gCUQjt1egnrDQ0TXElHXrwidQfFRS8VSGpUYuqv+bY="; + cargoHash = "sha256-2TlCwbGabJtIusfRVWSnQiZbv6UQIBXfcUBVQrrepYM="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 1e4f24cbc83f..6afe1faca5d6 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -27,9 +27,9 @@ let "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.7".officialRelease.sha256 = "sha256-SaRJ7+iZMhhBdcUDuJpMAY4REQVhrvYMqI2aq3Kz08o="; "22.0.0-git".gitRelease = { - rev = "2c72af88213c0f9c507d9c8b34a39de8173a6fcc"; - rev-version = "22.0.0-unstable-2025-12-28"; - sha256 = "sha256-R7WcZLas5+a4gUDzG0EBLL1S56PvUBZM6c91nYhmEsQ="; + rev = "dcf8ae80289fd5e343b6ca172073388b6d227b62"; + rev-version = "22.0.0-unstable-2026-01-11"; + sha256 = "sha256-7IQ4v4K4onZZ/oBQKUy32LaZ6M7E7N/QIUYdjhOsbqc="; }; } // llvmVersions; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index f5c399c324c6..0e820b93bcff 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4608,15 +4608,15 @@ final: prev: { }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.47.0-1"; + version = "2.47.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.47.0-1.rockspec"; - sha256 = "0gbf79n2glnbcdccli9k555708dgwpjmki2wc8439d2q8l3g2ywm"; + url = "mirror://luarocks/rocks.nvim-2.47.2-1.rockspec"; + sha256 = "01h368ckrpdq8yrczb0lx6bmj3vv1hlj22y784p6isypxma5iyrf"; }).outPath; src = fetchzip { - url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.0.zip"; - sha256 = "0m4cdyj1pbyi85l9vjmwj8qwrzqachpgjh6yhw8yin1hrqzr6d0k"; + url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.2.zip"; + sha256 = "1kzhn02zhydb0shha6lhb2ddqhbvldjhpk3h4fmr0kcfv7sf0r99"; }; disabled = lua.luaversion != "5.1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 8dfa3826fc77..4b9398c296ae 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -127,6 +127,10 @@ in } ]; + env = old.env // { + NIX_CFLAGS_COMPILE = "-std=gnu17"; # for gcc15 + }; + # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua # version, which doesn't work well for us, so modify it postConfigure = @@ -997,6 +1001,27 @@ in ''; }; + rocks-nvim = prev.rocks-nvim.overrideAttrs (oa: { + + nativeCheckInputs = [ + final.nlua + final.busted + writableTmpDirAsHomeHook + ]; + + doCheck = lua.luaversion == "5.1"; + + nvimSkipModules = [ + "bootstrap" # tries to install luarocks from network + ]; + + checkPhase = '' + runHook preCheck + busted --run=offline + runHook postCheck + ''; + }); + rtp-nvim = prev.rtp-nvim.overrideAttrs { doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index 21a08f670d63..18e33ed93875 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -2,21 +2,27 @@ lib, fetchFromGitHub, php, + versionCheckHook, }: -(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject +(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject2 (finalAttrs: { pname = "phan"; - version = "5.5.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "phan"; repo = "phan"; - rev = finalAttrs.version; - hash = "sha256-G17ORkHmu6nkfJ8UrGzcaybPOKPrq1Q+LXVS56aVOZ8="; + tag = finalAttrs.version; + hash = "sha256-1qRGNDptiAdcGc1x+iLrxe9TjLGaL8EM8xuTOUNB+Ww="; }; - vendorHash = "sha256-Ake5/7IyoweC2ONDuWt9jJSbG0JbnU9lmCRu2p6uUQM="; + vendorHash = "sha256-Ro5/lA72xVIkZyuRNix77Cpeyyj1GbW5J4DzjQMq0Rc="; + + composerStrictValidation = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { description = "Static analyzer for PHP"; diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 20b08f490367..d968849c4b95 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -109,6 +109,5 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/danielgtaylor/python-betterproto"; changelog = "https://github.com/danielgtaylor/python-betterproto/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ nikstur ]; }; }) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 572330c12ff7..e94b1ad88430 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.3.14"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; tag = version; - hash = "sha256-dY6utdWlzoQiODjFn7alJBBnDxq+1G9fdGvwu/2Ynfs="; + hash = "sha256-TIvgJL+JvRiEf05pyQCfCkahTg7ld8qFOn5VgCPxasY="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5.nix index d35469b1af38..d35469b1af38 100644 --- a/pkgs/development/python-modules/django/5_2.nix +++ b/pkgs/development/python-modules/django/5.nix diff --git a/pkgs/development/python-modules/dscribe/default.nix b/pkgs/development/python-modules/dscribe/default.nix index 51d7a9498506..28598f530629 100644 --- a/pkgs/development/python-modules/dscribe/default.nix +++ b/pkgs/development/python-modules/dscribe/default.nix @@ -53,10 +53,15 @@ buildPythonPackage rec { "dscribe.ext" ]; - # Prevents python from loading dscribe from the current working directory instead of using $out - preCheck = '' - rm -rf dscribe - ''; + preCheck = + # Prevents python from loading dscribe from the current working directory instead of using $out + '' + rm -rf dscribe + '' + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND="Agg" + ''; nativeCheckInputs = [ pytestCheckHook @@ -72,12 +77,7 @@ buildPythonPackage rec { [ # AssertionError on a numerical test "test_cell_list" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test_examples" - ]; + ]; # Broken due to use of missing _get_constraints attr in ase >= 3.26.0 # https://github.com/SINGROUP/dscribe/issues/160 diff --git a/pkgs/development/python-modules/entsoe-apy/default.nix b/pkgs/development/python-modules/entsoe-apy/default.nix index 248ca09d0708..45db4bdf9b17 100644 --- a/pkgs/development/python-modules/entsoe-apy/default.nix +++ b/pkgs/development/python-modules/entsoe-apy/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "entsoe-apy"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "berrij"; repo = "entsoe-apy"; tag = "v${version}"; - hash = "sha256-ui+F9EOz95yCfn52pSsxDs9p6d0a2g3VpxHd3WjU9W0="; + hash = "sha256-9bfGEBOXILO+bwkyFgnVFSY1k9gA6RmzWv9mEmJGOeM="; }; pyproject = true; diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix index 88a2bab3ea95..287b4a0d1519 100644 --- a/pkgs/development/python-modules/fickling/default.nix +++ b/pkgs/development/python-modules/fickling/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, hatchling, numpy, pytestCheckHook, @@ -10,16 +11,16 @@ torchvision, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fickling"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; repo = "fickling"; - tag = "v${version}"; - hash = "sha256-p2XkHKqheVHqLTQKmUApiYH7NIaHc091B/TjiCDYWtA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uirVOJ6CI7gBu9lOoPtpjUZeBmIhBMI0tjSDI/ASy7w="; }; build-system = [ @@ -40,21 +41,21 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; - disabledTestPaths = [ - # https://github.com/trailofbits/fickling/issues/162 - # AttributeError: module 'numpy.lib.format' has no attribute... - "test/test_polyglot.py" - ]; + # Tests fail upstream in pytorch under python 3.14 + doCheck = pythonOlder "3.14"; pythonImportsCheck = [ "fickling" ]; meta = { description = "Python pickling decompiler and static analyzer"; homepage = "https://github.com/trailofbits/fickling"; - changelog = "https://github.com/trailofbits/fickling/releases/tag/${src.tag}"; + changelog = "https://github.com/trailofbits/fickling/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix index fcf657b3a6b5..58802844660c 100644 --- a/pkgs/development/python-modules/grpclib/default.nix +++ b/pkgs/development/python-modules/grpclib/default.nix @@ -50,6 +50,5 @@ buildPythonPackage rec { homepage = "https://github.com/vmagamedov/grpclib"; changelog = "https://github.com/vmagamedov/grpclib/blob/v${version}/docs/changelog/index.rst"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 37c75b631fe8..59f280501c07 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "sdk==${version}"; - hash = "sha256-pIQuvOYyjXajPxqoRDHuolxNgaBeSmJvPRskinXkkDo="; + hash = "sha256-PGQjIxdd4aDh2t9p1gttMlREBxqMOR9Ghtb10wL0gBI="; }; sourceRoot = "${src.name}/libs/sdk-py"; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 2d336e2bdbbc..c6d4eb68507d 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.5.1"; + version = "0.6.4"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-6iJk8JfGIhrAcEXrsJKWn0G2jJ2kitWjx/YJCWcGNfY="; + hash = "sha256-325A2kEx2UrykxVRzp6WQCPrg92Vy+6R1CfgnCLV2V8="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 74594ae40a5f..b50e649d644c 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -40,16 +40,16 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "magic-wormhole"; - version = "0.21.1"; + version = "0.22.0"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole"; - tag = version; - hash = "sha256-HZ6ZS2dkJoW+yL6F3U9WguUHicfG2KWnk4/YuNPwpUc="; + tag = finalAttrs.version; + hash = "sha256-22UFwBcpuutFDRPFJAS9MBwoTdIx2xW0DSpR44DJ1lU="; }; postPatch = @@ -103,7 +103,7 @@ buildPythonPackage rec { pytestCheckHook pytest-twisted ] - ++ optional-dependencies.dilation + ++ finalAttrs.finalPackage.optional-dependencies.dilation ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ]; __darwinAllowLocalNetworking = true; @@ -112,7 +112,7 @@ buildPythonPackage rec { install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 # https://github.com/magic-wormhole/magic-wormhole/issues/619 - installShellCompletion --cmd ${meta.mainProgram} \ + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \ --bash wormhole_complete.bash \ --fish wormhole_complete.fish \ --zsh wormhole_complete.zsh @@ -122,11 +122,11 @@ buildPythonPackage rec { passthru.updateScript = gitUpdater { }; meta = { - changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md"; + changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${finalAttrs.src.rev}/NEWS.md"; description = "Securely transfer data between computers"; homepage = "https://magic-wormhole.readthedocs.io/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; mainProgram = "wormhole"; }; -} +}) diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index a324761df895..15078af0a068 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -52,15 +52,14 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + MPLBACKEND = "Agg"; + }; + disabledTests = [ # Test requires extra nltk data dependency "test_text_mining" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test_hill_slopes" - "test_two_key_plot" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nifty8/default.nix b/pkgs/development/python-modules/nifty8/default.nix index 687306ee4658..46c05bb3f2f4 100644 --- a/pkgs/development/python-modules/nifty8/default.nix +++ b/pkgs/development/python-modules/nifty8/default.nix @@ -70,22 +70,16 @@ buildPythonPackage rec { openssh ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test_optimize_kl_domain_expansion" - "test_plot_priorsamples" + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND="Agg" + ''; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # [XPASS(strict)] np.vdot inaccurate for single precision "test_vdot" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test/test_plot.py" - ]; - __darwinAllowLocalNetworking = true; postCheck = lib.optionalString diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index b024b3cd442b..3e3610ab82b4 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onedrive-personal-sdk"; - version = "0.0.17"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; tag = "v${version}"; - hash = "sha256-dJ8cFZKnSN8sQxe2wMqwPXf7CaFKUP6TZbS/J4Z0qa0="; + hash = "sha256-97gIkMaX/iBPtEPdE7yjGN3LeknxmVUDPMZGZAKX6q8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index ee240ced4d4d..48c9a87e0a8b 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -84,10 +84,15 @@ buildPythonPackage rec { ]; }; - # grpc tests are racy - preCheck = '' - sed -i '/"grpc",/d' optuna/testing/storages.py - ''; + preCheck = + # grpc tests are racy + '' + sed -i '/"grpc",/d' optuna/testing/storages.py + '' + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND="Agg" + ''; nativeCheckInputs = [ addBinToPathHook @@ -117,24 +122,6 @@ buildPythonPackage rec { "test_plot_intermediate_values" "test_plot_rank" "test_plot_terminator_improvement" - - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test_edf_plot_no_trials" - "test_get_timeline_plot" - "test_plot_contour" - "test_plot_contour_customized_target_name" - "test_plot_edf_with_multiple_studies" - "test_plot_edf_with_target" - "test_plot_parallel_coordinate" - "test_plot_parallel_coordinate_customized_target_name" - "test_plot_param_importances" - "test_plot_param_importances_customized_target_name" - "test_plot_param_importances_multiobjective_all_objectives_displayed" - "test_plot_slice" - "test_plot_slice_customized_target_name" - "test_target_is_none_and_study_is_multi_obj" - "test_visualizations_with_single_objectives" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index e5998caeb092..3f203385238a 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -65,6 +65,5 @@ buildPythonPackage rec { homepage = "https://github.com/mikitex70/plantuml-markdown"; changelog = "https://github.com/mikitex70/plantuml-markdown/releases/tag/${src.tag}"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/pkgs/development/python-modules/plantuml/default.nix b/pkgs/development/python-modules/plantuml/default.nix index 29d89e69935e..e2c46cf32417 100644 --- a/pkgs/development/python-modules/plantuml/default.nix +++ b/pkgs/development/python-modules/plantuml/default.nix @@ -33,6 +33,5 @@ buildPythonPackage { description = "Python interface to a plantuml web service instead of having to run java locally"; homepage = "https://github.com/dougn/python-plantuml"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 38f1a7e95e3c..c3a42c082a73 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -133,6 +133,10 @@ buildPythonPackage rec { # ensure tests can find these '' export PMG_TEST_FILES_DIR="$(realpath ./tests/files)" + '' + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND="Agg" ''; disabledTests = [ @@ -147,25 +151,6 @@ buildPythonPackage rec { "test_mean_field" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - # https://github.com/materialsproject/pymatgen/issues/4452 - "test_angle" - "test_as_dict_from_dict" - "test_attributes" - "test_basic" - "test_core_state_eigen" - "test_eos_func" - "test_get_info_cohps_to_neighbors" - "test_get_plot" - "test_get_point_group_operations" - "test_matplotlib_plots" - "test_ph_plot_w_gruneisen" - "test_plot" - "test_proj_bandstructure_plot" - "test_structure" - "test_structure_environments" - # attempt to insert nil object from objects[1] "test_timer_10_2_7" "test_timer" diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index 56c29e669db5..09028ce8733a 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -264,6 +264,11 @@ buildPythonPackage (finalAttrs: { # Files under this directory are not considered as tests by upstream and should be skipped "extra/" ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Aborted + # in ...onnxruntime/capi/_pybind_state.py", line 32 in <module> + "test/models/test_onnx.py" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # urllib.error.URLError: <urlopen error [SSL: CERTIFICATE_VERIFY_FAILED] # certificate verify failed: self-signed certificate in certificate chain (_ssl.c:1032)> diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix index fd6ddb3c846f..31474f561da8 100644 --- a/pkgs/development/python-modules/types-regex/default.nix +++ b/pkgs/development/python-modules/types-regex/default.nix @@ -5,24 +5,23 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-regex"; - version = "2025.11.3.20251106"; + version = "2026.1.15.20260116"; pyproject = true; src = fetchPypi { pname = "types_regex"; - inherit version; - hash = "sha256-X5go7TmlpScntjf5P38PkJ1W+iIRYE7MIT/Ou1CbnVA="; + inherit (finalAttrs) version; + hash = "sha256-cVGpvMW7+ez8z4M1xFGsqCBPWgmS4GIqr69IKHbO5Pc="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "regex-stubs" - ]; + pythonImportsCheck = [ "regex-stubs" ]; + + # Module has no tests + doCheck = false; meta = { description = "Typing stubs for regex"; @@ -30,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dwoffinden ]; }; -} +}) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index df78ab1250b1..5e54e69137c8 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -958,7 +958,7 @@ let rustc ]; vdiffr = [ pkgs.libpng.dev ]; - V8 = [ pkgs.nodejs.libv8 ]; + V8 = [ pkgs.nodejs_22.libv8 ]; # when unpinning the version, don't forget about the other usages later xactonomial = with pkgs; [ cargo rustc @@ -2514,8 +2514,9 @@ let ''; preConfigure = '' - export INCLUDE_DIR=${pkgs.nodejs.libv8}/include - export LIB_DIR=${pkgs.nodejs.libv8}/lib + # when unpinning the version, don't forget about the other usage earlier + export INCLUDE_DIR=${pkgs.nodejs_22.libv8}/include + export LIB_DIR=${pkgs.nodejs_22.libv8}/lib patchShebangs configure ''; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 53ce5d864945..6e868a43bdad 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.18.4"; # zen + version = "6.18.5"; # zen suffix = "zen1"; # zen - sha256 = "08zx7zs3vs8y27pg7fqd25gdh30hn79kwwclnpxh0g3nr3hix783"; # zen + sha256 = "1slclm2mgv7z3s0lcjrhqhzhbas4yq9yxkdjr27hlx7madplwbmi"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index c8f1bc66a06c..4520f0c9905a 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -31,7 +31,10 @@ bootStages stdenv = assert vanillaPackages.stdenv.hostPlatform == localSystem; assert vanillaPackages.stdenv.targetPlatform == localSystem; - config.replaceStdenv { pkgs = vanillaPackages; }; + let + fn = config.replaceStdenv or null; + in + if fn == null then vanillaPackages.stdenv else fn { pkgs = vanillaPackages; }; }) ] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7fe5c41923da..b554df37753b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1584,6 +1584,7 @@ mapAliases { spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27 sparkle = throw "'sparkle' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29 + speed_dreams = speed-dreams; # Added 2026-01-19 spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26 spoof = throw "'spoof' has been removed, as it is broken with the latest MacOS versions and is unmaintained upstream"; # Added 2025-11-14 spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27 @@ -1768,7 +1769,7 @@ mapAliases { warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03 warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 - wasm-bindgen-cli = wasm-bindgen-cli_0_2_106; + wasm-bindgen-cli = wasm-bindgen-cli_0_2_108; wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06 wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24 wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dc57cde36a5..45b43e5a3a73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2777,10 +2777,6 @@ with pkgs; haste-client = callPackage ../tools/misc/haste-client { }; - halide = callPackage ../development/compilers/halide { - llvmPackages = llvmPackages_19; - }; - hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { }); hdf5 = callPackage ../tools/misc/hdf5 { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9685d224e6d8..42dec1460948 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -120,6 +120,7 @@ mapAliases { django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11 django_3 = throw "Django 3 has reached it's EOL in 2024-04 and has therefore been removed."; # added 2025-01-25 django_5_1 = throw "Django 5.1 has reached it's EOL in 2025-12 and has therefore been removed."; # added 2025-11-30" + django_5_2 = django_5; # added 2026-01-18 django_appconf = throw "'django_appconf' has been renamed to/replaced by 'django-appconf'"; # Converted to throw 2025-10-29 django_classytags = throw "'django_classytags' has been renamed to/replaced by 'django-classy-tags'"; # Converted to throw 2025-10-29 django_colorful = throw "'django_colorful' has been renamed to/replaced by 'django-colorful'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 90f87b9925e5..23bf968e1134 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4368,9 +4368,7 @@ self: super: with self; { # LTS in extended support phase django_4 = callPackage ../development/python-modules/django/4.nix { }; - django_5 = self.django_5_2; - - django_5_2 = callPackage ../development/python-modules/django/5_2.nix { }; + django_5 = callPackage ../development/python-modules/django/5.nix { }; djangocms-admin-style = callPackage ../development/python-modules/djangocms-admin-style { }; |