diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index 673d0dffdd49..018cdbe3998e 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -1046,7 +1046,7 @@ lib.mapAttrs mkLicense ( llgplPreamble = { spdxId = "LLGPL"; - fullName = "LLGPL Preamble"; + fullName = "LLGPL Preamble"; # Only used together with LGPL (clarifying C-centric terms of LGPL in context of Lisp), SPDX tracks it separately }; llvm-exception = { diff --git a/lib/services/service.nix b/lib/services/service.nix index 5911202547fe..20d74e1793b2 100644 --- a/lib/services/service.nix +++ b/lib/services/service.nix @@ -12,7 +12,31 @@ }: let inherit (lib) mkEnableOption mkOption types; + + # Paths are interpolated rather than `toString`ed on purpose: interpolation + # copies the path into the store, so the resulting argument still resolves on + # the machine that runs the service. `toString` would yield the path of the + # source tree the configuration was evaluated from, which is not there at + # runtime. pathOrStr = types.coercedTo types.path (x: "${x}") types.str; + + # `argv` and `flags` share a single `lib.mkOrder` space, so flags need a + # priority. This one sits between `lib.modules.defaultOrderPriority` (1000, + # what an unadorned `argv` definition gets) and `lib.mkAfter` (1500): plain + # flags follow plain `argv` entries, while `lib.mkAfter` on `argv` still lands + # after the flags. See the `flags` option description. + unadornedFlagPriority = 1250; + + # `attrListWith` re-emits every flag wrapped in `lib.mkOrder`, using + # `lib.modules.defaultOrderPriority` for flags that carried no ordering + # property of their own. Rewrite exactly that priority; anything else is an + # explicit `lib.mkOrder` from the user and is passed through verbatim. + atFlagPriority = + def: + if def.value._type or null == "order" && def.value.priority == lib.modules.defaultOrderPriority then + def // { value = lib.mkOrder unadornedFlagPriority def.value.content; } + else + def; in { # https://nixos.org/manual/nixos/unstable/#modular-services @@ -49,6 +73,100 @@ in This is a raw command-line that should not contain any shell escaping. If expansion of environmental variables is required then use a shell script or `importas` from `pkgs.execline`. + + When `flags` are set, the arguments rendered from them are merged into + `argv`. See `flags` for how the two are ordered against each other. + ''; + }; + + flagFormat = mkOption { + type = types.functionTo (types.attrsOf types.anything); + default = name: { + option = name; + sep = null; + explicitBool = false; + }; + description = '' + Function mapping flag names to option format specs + for `lib.cli.toCommandLine`. + + Receives the flag name and returns `{ option, sep, explicitBool, formatArg? }`. + ''; + example = lib.literalExpression '' + name: { + option = name; + sep = "="; + explicitBool = false; + } + ''; + }; + + flags = mkOption { + type = types.attrListWith { + elemType = types.nullOr ( + types.oneOf [ + types.bool + types.int + # `pathOrStr`, not `types.path`: `lib.cli.toCommandLine` renders + # values with `lib.generators.mkValueStringDefault`, which has no + # case for paths and would abort. + pathOrStr + ] + ); + asAttrs = true; + }; + default = { }; + description = '' + Flags to pass to the service process. + The key is the flag name (e.g. `"--port"`), the value is the flag value. + + Each `name = value` pair is rendered via `lib.cli.toCommandLine` + using `flagFormat`. + + - `null`: the flag is omitted (regardless of `flagFormat`) + - bool: rendered per `flagFormat.explicitBool` + - `explicitBool = false` (default): `true` emits the bare flag, + `false` is omitted + - `explicitBool = true`: both `true` and `false` are rendered as + explicit arguments via `flagFormat.formatArg` + - string / path / int: rendered as the option's argument, joined to the + option name per `flagFormat.sep` and stringified by + `flagFormat.formatArg` + + To pass the same flag multiple times, use the list form with + repeated keys, e.g. + `[ { "--host" = "a"; } { "--host" = "b"; } ]`. + + The rendered arguments are merged into `argv`, so `argv` and `flags` + share a single `lib.mkOrder` space: + + - A flag with no ordering property of its own is placed at priority + 1250, between `lib.modules.defaultOrderPriority` (1000, which is + what an unadorned `argv` definition gets) and `lib.mkAfter` (1500). + Plain flags therefore follow the command name and any other plain + `argv` arguments. + - `lib.mkAfter` on `argv` still lands after the flags, which is how + trailing positional arguments are expressed. + - `lib.mkOrder` on a flag is honoured verbatim against `argv`, so a + sub-command can be placed between two groups of flags. + + Because 1250 is substituted for flags that carry no ordering property, + `lib.mkOrder 1000` on a flag is indistinguishable from leaving that + flag unadorned. To order a flag around plain `argv` entries, pick a + priority next to 1000, such as 999 or 1001. + ''; + example = lib.literalExpression '' + { + "--port" = "8080"; + "--verbose" = true; + # ordered ahead of the unadorned flags above + "--config" = lib.mkOrder 1100 "/etc/foo.conf"; + } + # or, for repeated flags: + [ + { "--host" = "localhost"; } + { "--host" = "0.0.0.0"; } + ] ''; }; @@ -103,5 +221,9 @@ in process.reloadCommand = lib.mkIf (config.process.reloadSignal != null) ( lib.mkDefault "${pkgs.coreutils}/bin/kill -${config.process.reloadSignal} $MAINPID" ); + + process.argv = lib.modules.mapDefinitionValue ( + attr: lib.cli.toCommandLine config.process.flagFormat attr + ) (lib.mkMerge (map atFlagPriority options.process.flags.valueMeta.definitions)); }; } diff --git a/lib/services/test.nix b/lib/services/test.nix index 65d05ceb39e9..0b08026c335d 100644 --- a/lib/services/test.nix +++ b/lib/services/test.nix @@ -77,6 +77,60 @@ let ]; }; }; + # The default `flagFormat`, and one flag of every supported value kind. + flagsDefault = { + process = { + argv = [ "/bin/flagged" ]; + flags = { + "--bool-off" = false; + "--bool-on" = true; + "--config" = ./test.nix; + "--count" = 3; + "--name" = "example"; + "--unset" = null; + }; + }; + }; + # A `flagFormat` that joins with `=` and spells out booleans. + flagsCustomFormat = { + process = { + argv = [ "/bin/flagged" ]; + flagFormat = name: { + option = "--${name}"; + sep = "="; + explicitBool = true; + }; + flags = { + port = 8080; + quiet = false; + verbose = true; + }; + }; + }; + # The list form, which allows a flag to be repeated. + flagsRepeated = { + process = { + argv = [ "/bin/flagged" ]; + flags = [ + { "--host" = "a"; } + { "--host" = "b"; } + ]; + }; + }; + # `argv` and `flags` share one `lib.mkOrder` space. + flagsOrdering = { + process = { + argv = lib.mkMerge [ + (lib.mkBefore [ "/bin/gt" ]) + (lib.mkOrder 800 [ "server" ]) + (lib.mkAfter [ "TRAILING" ]) + ]; + flags = lib.mkMerge [ + { "--listen" = "a"; } + { "--disable-landlock" = lib.mkOrder 600 true; } + ]; + }; + }; }; }; @@ -91,10 +145,16 @@ let ]; }; + # Every service carries some assertions that hold; only the violated ones are of interest here. + failures = lib.filter (a: !a.assertion); + filterEval = config: lib.optionalAttrs (config ? process) { - inherit (config) assertions warnings process; + inherit (config) warnings; + assertions = failures config.assertions; + # Only `argv` is relevant here; `process` also carries the reload options. + process = { inherit (config.process) argv; }; } // { services = lib.mapAttrs (k: filterEval) config.services; @@ -156,6 +216,65 @@ let assertions = [ ]; warnings = [ ]; }; + flagsDefault = { + process = { + argv = [ + "/bin/flagged" + "--bool-on" + "--config" + "${./test.nix}" + "--count" + "3" + "--name" + "example" + ]; + }; + services = { }; + assertions = [ ]; + warnings = [ ]; + }; + flagsCustomFormat = { + process = { + argv = [ + "/bin/flagged" + "--port=8080" + "--quiet=false" + "--verbose=true" + ]; + }; + services = { }; + assertions = [ ]; + warnings = [ ]; + }; + flagsRepeated = { + process = { + argv = [ + "/bin/flagged" + "--host" + "a" + "--host" + "b" + ]; + }; + services = { }; + assertions = [ ]; + warnings = [ ]; + }; + flagsOrdering = { + process = { + argv = [ + "/bin/gt" + "--disable-landlock" + "server" + "--listen" + "a" + "TRAILING" + ]; + }; + services = { }; + assertions = [ ]; + warnings = [ ]; + }; }; }; @@ -165,7 +284,7 @@ let ]; assert - portable-lib.getAssertions [ "service1" ] exampleEval.config.services.service1 == [ + failures (portable-lib.getAssertions [ "service1" ] exampleEval.config.services.service1) == [ { message = "in service1: you can't enable this for that reason"; assertion = false; @@ -177,7 +296,7 @@ let "in service3.services.exclacow: The `bar' service is deprecated and will go away soon!" ]; assert - portable-lib.getAssertions [ "service3" ] exampleEval.config.services.service3 == [ + failures (portable-lib.getAssertions [ "service3" ] exampleEval.config.services.service3) == [ { message = "in service3.services.exclacow: you can't enable this for such reason"; assertion = false; diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 2eaea67378bb..ca0762676bc6 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -101,6 +101,9 @@ - `services.alps` has been rewritten, see [upstream repository](https://github.com/migadu/alps) for configuration. +- Nginx no longer includes the unmaintained dav module per default. + If you happened to use it via a `dav_*` directive, you can include it with `services.nginx.additionalModules = [ pkgs.nginxModules.dav ]` again. + - Support for the legacy U‐Boot image format has been removed from the initrd generators, as it is deprecated upstream and no longer used by any platform in Nixpkgs. - The `extraArgs` and `check` arguments to `nixos/lib/eval-config.nix` (and therefore to `lib.nixosSystem`) have been removed after being deprecated with a warning since 2021. Passing them is now an evaluation error. Instead of `extraArgs`, set `config._module.args`; instead of `check = false`, set `config._module.check = false`. The `extraArgs` attribute on the resulting configuration has been removed as well. diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix index 9fb10221e418..9ff9d1a02539 100644 --- a/nixos/modules/services/desktop-managers/pantheon.nix +++ b/nixos/modules/services/desktop-managers/pantheon.nix @@ -197,6 +197,7 @@ in pantheon.gnome-settings-daemon pantheon.elementary-session-settings pantheon.elementary-settings-daemon + pantheon.pantheon-agent-polkit ]; programs.dconf.enable = true; networking.networkmanager.enable = mkDefault true; @@ -215,6 +216,12 @@ in environment.PATH = lib.mkForce null; }; + systemd.user.services."io.elementary.desktop.agent-polkit" = { + # Same as above. + wantedBy = [ "gnome-session-initialized.target" ]; + environment.PATH = lib.mkForce null; + }; + # Global environment environment.systemPackages = (with pkgs.pantheon; [ diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 894df7e7dbbb..f2ecf4af0975 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -524,6 +524,7 @@ in early-mount-options = runTest ./early-mount-options.nix; earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix; easytier = runTest ./easytier.nix; + easytier-modular = runTest ./easytier-modular.nix; ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { }; ec2-image = runTest ./ec2-image.nix; ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { }; diff --git a/nixos/tests/autopush-rs.nix b/nixos/tests/autopush-rs.nix index e1075bd3d17f..a77702ff3505 100644 --- a/nixos/tests/autopush-rs.nix +++ b/nixos/tests/autopush-rs.nix @@ -33,6 +33,7 @@ autoendpoint.settings = { #do not use this key in production!!! crypto_key = "[fZQX8jgdESUYFTYfWw3Dv5RRMuwYJPPaaPcbUgHM69Q=]"; + auth_keys = "[fZQX8jgdESUYFTYfWw3Dv5RRMuwYJPPaaPcbUgHM69Q=]"; db_dsn = "redis://localhost:${toString config.services.redis.servers.autopush-rs.port}"; port = 8080; }; diff --git a/nixos/tests/easytier-modular.nix b/nixos/tests/easytier-modular.nix new file mode 100644 index 000000000000..c39dcaaf6709 --- /dev/null +++ b/nixos/tests/easytier-modular.nix @@ -0,0 +1,161 @@ +{ lib, ... }: +{ + _class = "nixosTest"; + + name = "easytier-modular"; + + nodes = + let + genPeer = + hostConfig: + { pkgs, ... }: + lib.mkMerge [ + { + networking.useDHCP = false; + networking.firewall.allowedTCPPorts = [ + 11010 + 11011 + ]; + networking.firewall.allowedUDPPorts = [ + 11010 + 11011 + ]; + + system.services."easytier-default" = { + imports = [ pkgs.easytier.services.default ]; + easytier.settings = { + instance_name = "default"; + dev_name = "et_def"; + rpc_portal = "0.0.0.0:11000"; + network_identity = { + network_name = "easytier_test"; + network_secret = "easytier_test_secret"; + }; + }; + }; + } + hostConfig + ]; + in + { + relay = + { pkgs, ... }@args: + lib.mkMerge [ + (genPeer { + virtualisation.vlans = [ + 1 + 2 + ]; + networking.interfaces.eth1.ipv4.addresses = [ + { + address = "192.168.1.11"; + prefixLength = 24; + } + ]; + networking.interfaces.eth2.ipv4.addresses = [ + { + address = "192.168.2.11"; + prefixLength = 24; + } + ]; + + system.services."easytier-default".easytier.settings = { + ipv4 = "10.144.144.1"; + listeners = [ + "tcp://0.0.0.0:11010" + "wss://0.0.0.0:11011" + ]; + }; + } args) + + { + networking.firewall.allowedTCPPorts = [ 11020 ]; + networking.firewall.allowedUDPPorts = [ 11020 ]; + + system.services."easytier-second" = { + imports = [ pkgs.easytier.services.default ]; + easytier = { + peers = [ + "tcp://192.168.1.11:11010" + "tcp://192.168.2.11:11010" + ]; + settings = { + instance_name = "second"; + ipv4 = "10.144.144.4"; + + rpc_portal = "0.0.0.0:11001"; + + network_identity = { + network_name = "easytier_test"; + network_secret = "easytier_test_secret"; + }; + + listeners = [ "tcp://0.0.0.0:11020" ]; + flags = { + bind_device = false; + no_tun = true; + }; + }; + }; + }; + } + ]; + + peer1 = genPeer { + virtualisation.vlans = [ 1 ]; + system.services."easytier-default".easytier = { + settings.ipv4 = "10.144.144.2"; + peers = [ "tcp://192.168.1.11:11010" ]; + }; + }; + + peer2 = genPeer { + virtualisation.vlans = [ 2 ]; + system.services."easytier-default".easytier = { + settings.ipv4 = "10.144.144.3"; + peers = [ "wss://192.168.2.11:11011" ]; + }; + }; + }; + + testScript = '' + start_all() + + with subtest("Waiting for all services..."): + relay.wait_for_unit("easytier-default.service") + relay.wait_for_unit("easytier-second.service") + peer1.wait_for_unit("easytier-default.service") + peer2.wait_for_unit("easytier-default.service") + + with subtest("relay is accessible by the other hosts"): + peer1.succeed("ping -c5 192.168.1.11") + peer2.succeed("ping -c5 192.168.2.11") + + with subtest("The other hosts are in separate vlans"): + peer1.fail("ping -c5 192.168.2.11") + peer2.fail("ping -c5 192.168.1.11") + + with subtest("Each host can ping themselves through EasyTier"): + relay.succeed("ping -c5 10.144.144.1") + peer1.succeed("ping -c5 10.144.144.2") + peer2.succeed("ping -c5 10.144.144.3") + + with subtest("Relay is accessible by the other hosts through EasyTier"): + peer1.succeed("ping -c5 10.144.144.1") + peer2.succeed("ping -c5 10.144.144.1") + + with subtest("Relay can access the other hosts through EasyTier"): + relay.succeed("ping -c5 10.144.144.2") + relay.succeed("ping -c5 10.144.144.3") + + with subtest("The other hosts in separate vlans can access each other through EasyTier"): + peer1.succeed("ping -c5 10.144.144.3") + peer2.succeed("ping -c5 10.144.144.2") + + with subtest("Relay Second is accessible through EasyTier"): + peer1.succeed("ping -c5 10.144.144.4") + peer2.succeed("ping -c5 10.144.144.4") + ''; + + meta.maintainers = with lib.maintainers; [ moraxyc ]; +} diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index bfb7842100db..73ebc6fec6c7 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2026-07-16"; + version = "0-unstable-2026-07-29"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "61f4282f57934df94e08a2db79ec492aaab5b805"; - hash = "sha256-2pEQzl3aUq5ya9297Aj4MYN2ePkg/dyCvJavRWkyE1U="; + rev = "154a467c3a1ba6fa1d85c6776ac4f3b27558e5ad"; + hash = "sha256-oD0JCgb6csW+LC7TsF2ei7OEaDY5fzj5B8MyKCrr+SU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 203f6a2f1161..26557089c692 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -815,20 +815,20 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "keycloak_keycloak": { - "hash": "sha256-3KlfUM3qQwzRlUkuq+91z1VjRxIL3qcdCHfkVnfYJKQ=", + "hash": "sha256-XYY1xd8IHFSkVbEV6pxVHdnlSzbWgVAT+21mvri7qAs=", "homepage": "https://registry.terraform.io/providers/keycloak/keycloak", "owner": "keycloak", "repo": "terraform-provider-keycloak", - "rev": "v5.8.0", + "rev": "v5.9.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-JTcIyUKoeCRxAzUWJy9FkMCYy3+D70uyzuiSTW3nHlA=" + "vendorHash": "sha256-xzYkFRBLKGF8lf9vDG/dx4Qel6uGN1XpQLFrpVX2HWo=" }, "kislerdm_neon": { - "hash": "sha256-NvAQY8uoTtBoyx6XF8rruaRXVRARAr1yFKFkBes6Css=", + "hash": "sha256-FdC0WBN9jZsLud0QRiKJkQQI9aPxYhyyLNaxRXPp08Q=", "homepage": "https://registry.terraform.io/providers/kislerdm/neon", "owner": "kislerdm", "repo": "terraform-provider-neon", - "rev": "v0.14.0", + "rev": "v0.15.0", "spdx": "MPL-2.0", "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU=" }, @@ -896,13 +896,13 @@ "vendorHash": "sha256-0Z2V8CyIZEHZFFqTNFnseBbvVenOnpNz9Tlbu7zaPOI=" }, "maxlaverse_bitwarden": { - "hash": "sha256-aYgMC2RuRakxztyhP/4MAzQPy/4riKXYZN/XXdT2jQQ=", + "hash": "sha256-2OQsPfhiM46GMKGS1FJIzMhI0fxZwGorw4eF4DEFQ74=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.17.6", + "rev": "v0.18.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58=" + "vendorHash": "sha256-8Zj4nrEJ38Tz0LOYtghlMnJZJnD2zJjsqawVMTEX0Wk=" }, "metio_migadu": { "hash": "sha256-qeN2Zlx4qSrjb7qxjDf4v3uG1GR/faTiCNKD/HZkoyw=", diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index c3537b1ccb0c..d502d3f45320 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -61,8 +61,8 @@ let } else { - version = "2026.2"; - hash = "sha256-0n5EVegkYXeVI2Z5hjGg2tny4fVnQApsuFShaNzAUN0="; + version = "2026.3"; + hash = "sha256-EJS3u8ajlgIjgnEUYmZXEQtACWzflZinJ5NfyE6/iqA="; }; in diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix index 6c7b14d59505..d88cca3418c8 100644 --- a/pkgs/by-name/_3/_389-ds-base/package.nix +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -41,29 +41,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "389-ds-base"; - version = "3.1.3"; + version = "3.3.0"; src = fetchFromGitHub { owner = "389ds"; repo = "389-ds-base"; rev = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-hRTK9xBu8v8+SGa/3IB8Alh/aGUiRRn2LmYOvXy0Yd4="; + hash = "sha256-N/+fTTgkqs25ToR/OH9BaBHxheVDZWR4RANFtC71rBg="; }; patches = [ - (fetchpatch { - # https://github.com/389ds/389-ds-base/pull/6930 - name = "389-ds-base-rustc-1_89.patch"; - url = "https://github.com/389ds/389-ds-base/commit/1701419551c246e9dc21778b118220eeb2258125.patch"; - hash = "sha256-trzY/fDH3rs66DWbWI+PY46tIC9ShuVqspMHqEEKZYA="; - }) ./0001-remove-hard-coded-vendor-paths.patch - (fetchpatch { - # https://github.com/389ds/389-ds-base/security/advisories/GHSA-4qwg-c5j2-q4hp - name = "CVE-2025-14905.patch"; - url = "https://github.com/389ds/389-ds-base/commit/2e424110def2e3998f6045e136fb0d43f47b7f5a.patch"; - hash = "sha256-ItxG0bnuNPWLClL677rChTDvDWXxJ2L6ygx4VY2v80w="; - }) ]; cargoRoot = "src"; @@ -71,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src cargoRoot; name = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-pNzMQjeBpmzFg6oWCxhLDmKGUKIW6jGmZQWai5Yunjc="; + hash = "sha256-1qCH2Onb69Jcqqs3JfDJslavzMrHO6//OtYtDq2iCgY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix index 66c4777d3cec..5f016ba3afe7 100644 --- a/pkgs/by-name/ad/adrs/package.nix +++ b/pkgs/by-name/ad/adrs/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "adrs"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "joshrotenberg"; repo = "adrs"; tag = "v${finalAttrs.version}"; - hash = "sha256-AlmhI7CaKnfLHUQXPRpi8drPBQjZG/Gb9SEqObRuiqA="; + hash = "sha256-enM3r3tJHbcvl6Xf4uyKJm1rCGt3J+0Ruxg4KgP0s0I="; }; - cargoHash = "sha256-CKC6Jr8zWObH9TcEz1o/fSGIXDagM9RgpOcaQchMNqA="; + cargoHash = "sha256-JCwJtqphGxaTY9doDcDy0nSVYwV40Ve032Mowfbcq20="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/am/amneziawg-tools/package.nix b/pkgs/by-name/am/amneziawg-tools/package.nix index 8c39de4114b4..22338aea2d38 100644 --- a/pkgs/by-name/am/amneziawg-tools/package.nix +++ b/pkgs/by-name/am/amneziawg-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "amneziawg-tools"; - version = "3.0.20260730"; + version = "3.0.20260805"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amneziawg-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-jIE2yrTeikJaa9wX7P+QAL/WmeWz6eGwlju9unMny1g="; + hash = "sha256-eVi+pYUv0EgCEpIGcR5ISl3NI/VOgR2m9FPRYDIKw2o="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix index 0616393fd526..1c819c2fb3fd 100644 --- a/pkgs/by-name/an/andcli/package.nix +++ b/pkgs/by-name/an/andcli/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "andcli"; - version = "2.8.0"; + version = "2.8.1"; __structuredAttrs = true; @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { owner = "tjblackheart"; repo = "andcli"; tag = "v${finalAttrs.version}"; - hash = "sha256-yFYO223RbQ7qOw9dPXgMMTQpA+BzQ+xlT+CfWcQMeqk="; + hash = "sha256-BVF+r8N+/PvARxANlL7nPf23ABbp+O1DNPblMyXroq8="; }; vendorHash = "sha256-aFOwfloqFPPMgCufwmDgfM9lDinkFvu4i+BiVUo+Iwk="; diff --git a/pkgs/by-name/ap/apfel-llm/package.nix b/pkgs/by-name/ap/apfel-llm/package.nix index 935634c05a4a..01ac819e98e7 100644 --- a/pkgs/by-name/ap/apfel-llm/package.nix +++ b/pkgs/by-name/ap/apfel-llm/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "apfel-llm"; - version = "1.9.0"; + version = "1.9.1"; __structuredAttrs = true; strictDeps = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1 src = fetchurl { url = "https://github.com/Arthur-Ficial/apfel/releases/download/v${finalAttrs.version}/apfel-${finalAttrs.version}-arm64-macos.tar.gz"; - hash = "sha256-1DnZbp4iXlrC7eUGWd8NEEiryxPvRqndJ1++gAskEYQ="; + hash = "sha256-CWM2S+/+IAF7juSEsLx8glYKUY8q5iKfPySQ9xdQ1AM="; }; sourceRoot = "."; diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix index 30012e5d8ef6..63d6d0d8afc9 100644 --- a/pkgs/by-name/at/atmos/package.nix +++ b/pkgs/by-name/at/atmos/package.nix @@ -2,21 +2,21 @@ lib, buildGoModule, fetchFromGitHub, - terraform, + versionCheckHook, }: buildGoModule (finalAttrs: { pname = "atmos"; - version = "1.220.0"; + version = "1.224.1"; src = fetchFromGitHub { owner = "cloudposse"; repo = "atmos"; tag = "v${finalAttrs.version}"; - hash = "sha256-kUCSa6Kw8wfGfMi3swqwt9mT0ZmniQVE/h5XWkjh+SM="; + hash = "sha256-ew07sucTTLLUU2bdN3HKyJJ6i5z6jqgfYR3fHLnzcHA="; }; - vendorHash = "sha256-X8R0hRTDKvKmBWgV4ujVQrHIE935wG6sogQAzv2fdTg="; + vendorHash = "sha256-MP30jhbhcf6+TWB0q/VLPY6DYd0TLUWZmg3D+d8IpXg="; env.CGO_ENABLED = 0; # Compiles a pure statically linked Go binary. @@ -25,32 +25,23 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" - "-X github.com/cloudposse/atmos/cmd.Version=v${finalAttrs.version}" + "-X github.com/cloudposse/atmos/pkg/version.Version=v${finalAttrs.version}" ]; - nativeCheckInputs = [ terraform ]; + nativeCheckInputs = [ versionCheckHook ]; preCheck = '' # Remove tests that depend on a network connection. rm -f \ - pkg/vender/component_vendor_test.go \ + main_hooks_and_keychain_store_integration_test.go \ + main_hooks_and_store_integration_test.go \ + main_plan_diff_integration_test.go \ pkg/atlantis/atlantis_generate_repo_config_test.go \ - pkg/describe/describe_affected_test.go + pkg/describe/describe_affected_test.go \ + pkg/vender/component_vendor_test.go ''; - # depend on a network connection. - doCheck = false; - - # depend on a network connection. - doInstallCheck = false; - - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/atmos version | grep "v${finalAttrs.version}" - - runHook postInstallCheck - ''; + doInstallCheck = true; meta = { homepage = "https://atmos.tools"; @@ -58,5 +49,6 @@ buildGoModule (finalAttrs: { description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)"; mainProgram = "atmos"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nevivurn ]; }; }) diff --git a/pkgs/by-name/au/autopush-rs/package.nix b/pkgs/by-name/au/autopush-rs/package.nix index 0df14e4c5ad0..56f1a5cf2e9f 100644 --- a/pkgs/by-name/au/autopush-rs/package.nix +++ b/pkgs/by-name/au/autopush-rs/package.nix @@ -47,7 +47,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "autopush"; - version = "1.82.3"; + version = "1.83.1"; __structuredAttrs = true; strictDeps = true; @@ -61,10 +61,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "mozilla-services"; repo = "autopush-rs"; tag = finalAttrs.version; - hash = "sha256-lUmwy5ncMDp4wVP8cwvYV6/QBOPL3NUtlWbxMW1p5bc="; + hash = "sha256-T1FLDDAIU+YEdDRY11XzUvxKQS3ETqufDC7B4U5vyFk="; }; - cargoHash = "sha256-b61aBbc1DdsT9UeUdbCz4xUHnvj9ans7O0fH3DizFl0="; + cargoHash = "sha256-a413jA5s6EcjwF6Jxf8Mnqxv4ULVwXRzpUTnLv2CkCg="; nativeBuildInputs = [ pkg-config @@ -106,13 +106,13 @@ rustPlatform.buildRustPackage (finalAttrs: { imports = [ (lib.modules.importApply ./service-autoconnect.nix { inherit pkgs; }) ]; - package = finalAttrs.finalPackage.out; + autoconnect.package = finalAttrs.finalPackage; }; services.autoendpoint = { imports = [ (lib.modules.importApply ./service-autoendpoint.nix { inherit pkgs; }) ]; - package = finalAttrs.finalPackage.out; + autoendpoint.package = finalAttrs.finalPackage; }; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/au/autopush-rs/service-autoconnect.nix b/pkgs/by-name/au/autopush-rs/service-autoconnect.nix index a7fc8c429f31..9a60d6eeda28 100644 --- a/pkgs/by-name/au/autopush-rs/service-autoconnect.nix +++ b/pkgs/by-name/au/autopush-rs/service-autoconnect.nix @@ -15,21 +15,23 @@ in { _class = "service"; options = { - package = lib.mkPackageOption pkgs "autopush-rs.out" { }; - autoconnect.settings = lib.mkOption { - type = lib.types.submodule { - freeformType = tomlFmt.type; - options = { - db_dsn = lib.mkOption { - description = "Endpoint of the database server."; - type = lib.types.str; - default = ""; - example = lib.literalExpression "redis+socket://\${config.services.redis.servers.autopush-rs.port}"; + autoconnect = { + package = lib.mkPackageOption pkgs "autopush-rs" { }; + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = tomlFmt.type; + options = { + db_dsn = lib.mkOption { + description = "Endpoint of the database server."; + type = lib.types.str; + default = ""; + example = lib.literalExpression "redis+socket://\${config.services.redis.servers.autopush-rs.port}"; + }; }; }; + default = { }; + description = ""; }; - default = { }; - description = ""; }; }; config = @@ -38,7 +40,7 @@ in in { process.argv = [ - "${config.package}/bin/autoconnect" + "${cfg.package}/bin/autoconnect" "-c" (toString configFile) ]; diff --git a/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix b/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix index beaf6060b901..a1a3d8e22fed 100644 --- a/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix +++ b/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix @@ -15,8 +15,8 @@ in { _class = "service"; options = { - package = lib.mkPackageOption pkgs "autopush-rs.out" { }; autoendpoint = { + package = lib.mkPackageOption pkgs "autopush-rs" { }; settings = lib.mkOption { type = lib.types.submodule { freeformType = tomlFmt.type; @@ -40,7 +40,7 @@ in in { process.argv = [ - "${config.package}/bin/autoendpoint" + "${cfg.package}/bin/autoendpoint" "-c" (toString configFile) ]; diff --git a/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json b/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json index 1580aa7937af..ced7faeeacca 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json +++ b/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json @@ -25,16 +25,16 @@ "@esbuild/win32-arm64@npm:0.28.1": "551ada5396e1f10e3d3592dd60a148a7257af1ab2317bba09e9ed18a6d7ee7e5961c68eb1fbaee4e8c1961b504807493e1b8f5c700dd1fb990f0cb36b240ad57", "@esbuild/win32-ia32@npm:0.28.1": "2676ace6b4d63721da34873974152e869aed9fc8bd9fdff4b8df14a3a3e68b78a9b4566e643b90b948b4e85773cbf288a33a59d13979caaadd43b5adad68312c", "@esbuild/win32-x64@npm:0.28.1": "8d658b74ed9b7494b3799093551d4c928a7916865ed42d00a135156cbd08612b53072e9e424f0687c10a93a444d30d6b0294b6a1d5fdba78078d706646ba558f", - "@nx/nx-darwin-arm64@npm:22.7.7": "93f7de46da3da64c42489e7b42676ee59914635183f28640454a40bd0eb9f78b2c6a7b707bbd69024ffd45675e8a51b3ebde1b4ce268232ab9283f47f05001d9", - "@nx/nx-darwin-x64@npm:22.7.7": "5f175cbe8e2281b8055394c8b79afb98c81d1d06158d1866667b392134105db1c7b9c7b8eeea5f2bdcda8be56ff702f728067e8f505a370dbf5e6f80f41dd99e", - "@nx/nx-freebsd-x64@npm:22.7.7": "65cdfbe8663219e971dd50479f59b07ac37e08ed14be234069c67af3bde005c69197bbd28d83f64f0b7cafd5af744d74e6822e2c97b6336b2f4cd599ae510880", - "@nx/nx-linux-arm-gnueabihf@npm:22.7.7": "62925001769e4e21e1b5ef2ad17463ac2b42d5263a117e74e7c72797e26adbb990cb3017749077ed057c27b964823690896ee1785e1a835dc27b6d04a19403e7", - "@nx/nx-linux-arm64-gnu@npm:22.7.7": "bc851f35ca9308a530bf81d0f73e262b0124f40b4edd41ae055b5a0f893f2a24e2368f344817beb8cc9f820957b2fb6ad064df20818d7c356a060d533d5b0dea", - "@nx/nx-linux-arm64-musl@npm:22.7.7": "940e1f0277c180e828b5296437b2a4fd22d39e2f51f342f9f97c6feb2a917c9bc09297d2ca276a053b381909a863e0bb1c3c10bc207afcde24cd3f12c0672304", - "@nx/nx-linux-x64-gnu@npm:22.7.7": "db94d5f9b16600e9892442243f2fc51b614b16311e542ed80cbee0cd71aa72a2d4f4cfe705f3ef0fbc5ce5956abe5d18a7004eb41e18a3467539aa5b52fea6f7", - "@nx/nx-linux-x64-musl@npm:22.7.7": "4f587b7c5014c47bc371943c6eb3882d7473b6f9427a8babd5837eb0c1c45e65b50d393a20e1c932b568365e5f0a0a03c8476d391ed96fe12fb56b967354064b", - "@nx/nx-win32-arm64-msvc@npm:22.7.7": "bb5fc5f779ec467c57e2314038a47c81344ff43c99801650a6074c828c907882bd3bab1153a15f4a4371028c3ec4ba0b961014b225c81e084073bc922f0ab3cc", - "@nx/nx-win32-x64-msvc@npm:22.7.7": "f08aab74096e9c772b45eb20e9aecf6836d9d20511cbeba31d9a303ca29f15eab2c2a7f42bffad8d02508c6c5662816b4d0c107d60366df0a6e2153c15b9dbf9", + "@nx/nx-darwin-arm64@npm:22.7.8": "bc5e8ec97a136e6fd83fe76d0ab88689d4e17b89b57bec271b37802453522cc43fcd87eb3c4cf5096b566e579004f088d08824d75215a45498fef045edc5562f", + "@nx/nx-darwin-x64@npm:22.7.8": "b7020ed4326892493d0cd0aa1239612e16c1f60272ae2ed7f3a5b2b3d2baa936554f96bcaceb2feeb1e7050cf2c043ab8749cb2d3350b92c08435347fbfcd66e", + "@nx/nx-freebsd-x64@npm:22.7.8": "6fa3b5386476a80a6f16bd386299d60f4ec333ac05eb6fae8d75d116a380cfc32b901feeaf88e153100db56f66aefdf8a5875abfc3d5e895e916de7a9b0a283e", + "@nx/nx-linux-arm-gnueabihf@npm:22.7.8": "6b474dcddc19dc859d86d0e8a9bed595016b94b795c1ecc1fbdea66eecc8d5896114bb646e5ca7252b616691a69e4b988ebf08b3bfc03923c1f39c80cc3deca2", + "@nx/nx-linux-arm64-gnu@npm:22.7.8": "46a6c08a47142a8ed1d2b3b784fdefb3813bba4921dc8246b973cfdf772386b4a950cb5e1b6ac10007c2df1b256c8de30bb289d7aa745cd57a147998a96de55e", + "@nx/nx-linux-arm64-musl@npm:22.7.8": "6dacc2727bc4e584f10e4b6936b0a89b3fdca7e7740211a42d05fa39229e69a8a7539b7514a7557e9a196116ce359a1469e67a5bf9f4934194e373fa84570ee6", + "@nx/nx-linux-x64-gnu@npm:22.7.8": "1f4e93f41bf9048b5dbec67a9dcd3e3d23b3c521daa80ae735b9aff32dced72331418eb92866e5716ddfbc6a9c34b9205fe1259205c38d1fa2e9396bd0e00fcc", + "@nx/nx-linux-x64-musl@npm:22.7.8": "5de518e71c4627d6c79aed7be304cebe6a9c8cb00b6c5971872f185a3785a078621ef12e54efdf9410d492b75ffb30751c8eba587a8109585c8f43341220cfc4", + "@nx/nx-win32-arm64-msvc@npm:22.7.8": "7818ecb3b9b4e3f0d9dd297f9346bdf519989cf330f882d5ec4d80367713c2f47565d7965fcd4e38e5b5cccfc09882215a1f98583e77f966966fed37b6aea1cb", + "@nx/nx-win32-x64-msvc@npm:22.7.8": "da4c071aa2e6379dd0b5d50d0b33c813ed15e03379d3531b817e26d99f58d6a185c313535100ed63ef8ae2b9a0cc6f1636c12fff9c66df76080dde6ad3144408", "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc", "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d", "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f", diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix index 0ee65c2f0e9d..46fb281a42a1 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix @@ -17,19 +17,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "aws-cdk-cli"; - version = "2.1134.0"; + version = "2.1135.0"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cdk-cli"; tag = "cdk@v${finalAttrs.version}"; - hash = "sha256-VrP/L8uuTxC4TBEHhmuhNEf0nf5J8kYjOl3Kz1ejUPg="; + hash = "sha256-NF80AuuizRMjD0z127mWFUJGAg6hzjHcLCGdJEaOc/s="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-l6iKJvG8qbV6pp+XWS07lKqr63UABTLd4/dlJnosIRw="; + hash = "sha256-H/jpxsSTA5LFgDz2f2oaLgdB/ITs3hmSJGznqanuS34="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index aadfd756b373..7cc26679c967 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.13.1"; + version = "7.13.3"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-J9soEr5QhHZZLthWyNCr3ofCJD01gVLqT+8XVXgd/oA="; + hash = "sha256-woLNujYV5Za3vbJ5/eLGCVNF2OPIWiTg5Zb6S3phdY4="; }; proxyVendor = true; - vendorHash = "sha256-5GYKo2bs0JBe7aiqv/HVerfJKYf1Ocen7xkQvHQfm44="; + vendorHash = "sha256-eGkbvFB1KDULvmvBoHHbBn80DhQZ274xM6eJ9EkDv20="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ba/basicswap/package.nix b/pkgs/by-name/ba/basicswap/package.nix index 16c64b72be6e..8a8d825184d9 100644 --- a/pkgs/by-name/ba/basicswap/package.nix +++ b/pkgs/by-name/ba/basicswap/package.nix @@ -12,9 +12,9 @@ }: let - secp256k1_anonswap = secp256k1.overrideAttrs (old: { + secp256k1_basicswap = secp256k1.overrideAttrs (old: { src = fetchFromGitHub { - owner = "tecnovert"; + owner = "basicswap"; repo = "secp256k1"; rev = "fd8b63ccf8bcb48358a42c456f34e2488a55a688"; hash = "sha256-/bmKZRBBjirI4YqRKfzoxdAt6UVoWHmrNQQHX7l+eH8="; @@ -27,24 +27,20 @@ let "--enable-module-ecdsaotves" ]; }); - coincurve-anonswap = + coincurve-basicswap = (python3Packages.coincurve.override { - secp256k1 = secp256k1_anonswap; + secp256k1 = secp256k1_basicswap; }).overrideAttrs - (old: { + { + version = "21.0.3"; src = fetchFromGitHub { - owner = "tecnovert"; + owner = "basicswap"; repo = "coincurve"; - rev = "932366c9d4d8e487162b5c1b2a2d9693e24e0483"; - hash = "sha256-zOekPmP1zR/S+zxq/7OrEz24k8SInlsB+wJ8kPlmqe4="; + tag = "basicswap_v0.3"; + hash = "sha256-lSEdwV7jhYa5ERHEVDuLA84JGGVsbvVoOqSRXU5AbCE="; }; patches = [ ]; - preCheck = '' - rm -rf src/coincurve - # don't run benchmark tests - rm tests/test_bench.py - ''; - }); + }; bindir = linkFarm "bindir" ( lib.mapAttrs (_: p: "${lib.getBin p}/bin") { particl = particl-core; @@ -58,14 +54,14 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "basicswap"; - version = "0.14.4"; + version = "0.17.5"; pyproject = true; src = fetchFromGitHub { owner = "basicswap"; repo = "basicswap"; tag = "v${finalAttrs.version}"; - hash = "sha256-UhuBTbGULImqRSsbg0QNb3yvnN7rnSzycweDLbqrW+8="; + hash = "sha256-ezBBe3ubLM1q99+sFfXg0iW9YUfbT4v3H6wG0J2fmTQ="; }; postPatch = '' @@ -80,16 +76,14 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; dependencies = with python3Packages; [ - coincurve-anonswap + coincurve-basicswap wheel pyzmq - protobuf - sqlalchemy_1_4 python-gnupg jinja2 pycryptodome pysocks - mnemonic + websocket-client ]; postInstall = '' diff --git a/pkgs/by-name/bi/bilibili-tui/package.nix b/pkgs/by-name/bi/bilibili-tui/package.nix index 258f6f9a9549..0667c4133c7a 100644 --- a/pkgs/by-name/bi/bilibili-tui/package.nix +++ b/pkgs/by-name/bi/bilibili-tui/package.nix @@ -15,16 +15,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "bilibili-tui"; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "MareDevi"; repo = "bilibili-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-G2aoPw8SMu3ytHbxcQrf1iH6i+b9viM+/EYorv6j5bg="; + hash = "sha256-u7jSOsXJDghyrHdfOkMiwCtN1Pugjc7RRJVvjtR4LOE="; }; - cargoHash = "sha256-ojAN98of7vZp/F1n0a/88e6k4nBPG9HPKyTO1xc8o4Q="; + cargoHash = "sha256-Xxsfa33dRqObwfPFVHezlXOy5bvjQTaQ9FSuU+F1V5U="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/bt/btcpayserver/deps.json b/pkgs/by-name/bt/btcpayserver/deps.json index 5d6ed4b18c3f..eb0349dd9cd4 100644 --- a/pkgs/by-name/bt/btcpayserver/deps.json +++ b/pkgs/by-name/bt/btcpayserver/deps.json @@ -1,13 +1,18 @@ [ { "pname": "AngleSharp", - "version": "0.17.1", - "hash": "sha256-8DLs4SGXeG4ilbAJ8H6KLjaK/GmaXizMEMc3P8ZrEQ0=" + "version": "1.5.0", + "hash": "sha256-290+oGXJRDf3q06rRrcQmg3XbKYhgIa6xjn5vUJWRJ4=" + }, + { + "pname": "AngleSharp", + "version": "1.7.0", + "hash": "sha256-ltWbyN4Bb993PayYfWQmTLpaPR+8Gf11NrkuLLKMqNU=" }, { "pname": "AngleSharp.Css", - "version": "0.17.0", - "hash": "sha256-sXzp9kY/rp3KauGNDpITkpjdgNoO0BdlC38SQYl0u2A=" + "version": "1.0.1", + "hash": "sha256-xWopyn/8oPkEpc/puQehpDFCo9fbf4cfvG4tcchq09Y=" }, { "pname": "AWSSDK.Core", @@ -41,8 +46,8 @@ }, { "pname": "BouncyCastle.Cryptography", - "version": "2.4.0", - "hash": "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA=" + "version": "2.6.2", + "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms=" }, { "pname": "BTCPayServer.Hwi", @@ -51,18 +56,13 @@ }, { "pname": "BTCPayServer.Lightning.All", - "version": "1.6.11", - "hash": "sha256-HId8axtrx8i205y1uytHp/04/DyKsXzJwSEMzpr7Mzk=" - }, - { - "pname": "BTCPayServer.Lightning.Charge", - "version": "1.5.2", - "hash": "sha256-98YtDZBzc5qKO2sK2fpDxodrnVqcfjBPQaagLFXxbss=" + "version": "1.7.6", + "hash": "sha256-weaWvC+NcL5/3rkGkKEh5Deltiyi0X3CDNdbj4LeC88=" }, { "pname": "BTCPayServer.Lightning.CLightning", - "version": "1.6.4", - "hash": "sha256-H6eskDDjfcgIcy6O1w44qrEwFLi2DrqOtgerj6sQhBQ=" + "version": "1.7.5", + "hash": "sha256-gahNBgA4tWgMBvx7kL3vh5Eq/ZgjH6P3Rmc0FAvH34Y=" }, { "pname": "BTCPayServer.Lightning.Common", @@ -71,33 +71,28 @@ }, { "pname": "BTCPayServer.Lightning.Common", - "version": "1.5.2", - "hash": "sha256-5SFwNAIJBBbrix/qqrtsad5QOKQbCUOm7Un/LDA8c6E=" + "version": "1.7.1", + "hash": "sha256-BCugPGQ1Pb4V6zbcproD8OjH0zW5PWbqviCDv59lcxE=" }, { "pname": "BTCPayServer.Lightning.Eclair", - "version": "1.5.7", - "hash": "sha256-UueCAJjSQtY6zH38M4Fc5qY1OaZDAvdNqgY8p6ARTng=" - }, - { - "pname": "BTCPayServer.Lightning.LNBank", - "version": "1.5.3", - "hash": "sha256-zuiPaypkMAq0y0/9XYu1c7QmezdbvEUufOxpbo6CaoA=" + "version": "1.7.1", + "hash": "sha256-b81YxcY9qNl6M5sg9Adq8O8zcKGOtJaTL9U33u5zG4A=" }, { "pname": "BTCPayServer.Lightning.LND", - "version": "1.5.6", - "hash": "sha256-dCx/TarqZSwio0TMQtwL/sxJ2GtnoHj72+Mwe+xoCf8=" + "version": "1.7.1", + "hash": "sha256-OqxqqDVxBe5hy4fDz5GqOLVodQQgdJlQRFGg9lpCYyA=" }, { "pname": "BTCPayServer.Lightning.LNDhub", - "version": "1.5.3", - "hash": "sha256-CbSjeix4JCVtgb8WCfsKgThpl/YbnhbJ3wcPoexpSew=" + "version": "1.7.1", + "hash": "sha256-L8gCb1Go9Yf2ZE/yZnbXyLXRIhGgQzMlHDBVD/EH64U=" }, { "pname": "BTCPayServer.Lightning.Phoenixd", - "version": "1.5.8", - "hash": "sha256-pISNuSZW/B0MZ5VkW8nHAENTOUoFI+YfvrubD/vh74w=" + "version": "1.7.1", + "hash": "sha256-hPnmmoIwAl+sTzp9Bbu10SfWMdvGmI1a6hnQTLl2VLo=" }, { "pname": "BTCPayServer.NTag424", @@ -106,33 +101,33 @@ }, { "pname": "CsvHelper", - "version": "32.0.3", - "hash": "sha256-XbRxWNgxYe3sUZQZr5d9DxLAOl10cBCZ7JGm4xujuMQ=" + "version": "33.1.0", + "hash": "sha256-pEfX4o63xupI7uuwe6qa05One0pJ7UbzzJqLh4Shju8=" }, { "pname": "Dapper", - "version": "2.1.35", - "hash": "sha256-zeroySx7lO1yLtbhKhFQ87diWXOq9gPnv3qFcmNcs9M=" + "version": "2.1.79", + "hash": "sha256-QIGZ+vlnwhSl+nnVZ//s3uwFh/vKJ5kDpgGkmpMjhmw=" }, { "pname": "DigitalRuby.ExchangeSharp", - "version": "1.2.0", - "hash": "sha256-yKgWUkLVpu8EapAOx8jXWEmwsHpUNWAbu2utD3CpNjI=" + "version": "1.2.1", + "hash": "sha256-36JtWd7Bxa7+UBONuWFoGNOq27Kt6H130qU/1AREPXI=" }, { "pname": "Fido2", - "version": "3.0.1", - "hash": "sha256-v8hND0a17nQ94TC0lmfdr35j3I8y/fwO2Ay7oNyPKRs=" + "version": "4.0.1", + "hash": "sha256-bTTmj5//YSgaUENgXMKXY2s1dAxhtdYNu7TAa4iXbEU=" }, { "pname": "Fido2.AspNet", - "version": "3.0.1", - "hash": "sha256-nVAXITj4CkcOD2NQaLBaoLr0QPDo/HE7rTrlBfcDXXM=" + "version": "4.0.1", + "hash": "sha256-ZxWp3u8vUbE4cOIWtRxK95A1vzC7D8UR6vQE8OJrov4=" }, { "pname": "Fido2.Models", - "version": "3.0.1", - "hash": "sha256-awp0JKQxYKZTTA9LygvIUqG36r36ZZWfs6sfcu9yU4U=" + "version": "4.0.1", + "hash": "sha256-upadIQMUYlznjb/0ZTSpjjkCscSF9NrikGjbP88f5cU=" }, { "pname": "Google.Api.Gax", @@ -186,8 +181,8 @@ }, { "pname": "HtmlSanitizer", - "version": "8.0.838", - "hash": "sha256-L2Nxc1qnRMv+FXNRt2SkkB2f3A41+UXh+lQcZEajBcw=" + "version": "9.1.982", + "hash": "sha256-poXCxuxW8Ln+xCbuHeCh2t35SVAENV0xfCOr2NJomHk=" }, { "pname": "Humanizer.Core", @@ -196,13 +191,13 @@ }, { "pname": "JetBrains.Annotations.Sources", - "version": "2025.2.2", - "hash": "sha256-9Aui689O6j0E34FSwTLGEwar5etuswWg3FU7+mIzpdU=" + "version": "2026.2.0", + "hash": "sha256-AqShNJbFCrtUbrqti44j6cUglBApw+VdXWFgsTrO3TU=" }, { "pname": "libsodium", - "version": "1.0.18.2", - "hash": "sha256-gjaW2AYXQSb3LLjtQDjWSxkTmEiqIoIb7NFx0+AlrQs=" + "version": "1.0.20.1", + "hash": "sha256-wd/z31FRbcaVGrogSNVjefEYWjNxTGzQd04DOlY1PFE=" }, { "pname": "LNURL", @@ -211,8 +206,8 @@ }, { "pname": "MailKit", - "version": "4.8.0", - "hash": "sha256-ONvrVOwjxyNrIQM8FMzT5mLzlU56Kc8oOwkzegNAiXM=" + "version": "4.17.0", + "hash": "sha256-LGruedMrHrI0AXHcXOFxsYP2awwPbrC9Q41AeQk4+9U=" }, { "pname": "Microsoft.AspNet.SignalR.Client", @@ -229,85 +224,25 @@ "version": "6.0.0", "hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo=" }, - { - "pname": "Microsoft.AspNetCore.Connections.Abstractions", - "version": "8.0.11", - "hash": "sha256-46JBknVJqIAU3YF87sMs7kKZ0p9vMgxX7DpsGJMeA1Y=" - }, - { - "pname": "Microsoft.AspNetCore.Cryptography.Internal", - "version": "8.0.11", - "hash": "sha256-xEIbxQbMcTvkzNw7KKeYOK9wNMShbTAzhx7DR8QMrvM=" - }, - { - "pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation", - "version": "8.0.11", - "hash": "sha256-qt8zkqW3Q8GbnWqPn7YaVGX8r35N5r4iPqENPmu8iPA=" - }, - { - "pname": "Microsoft.AspNetCore.Http.Connections.Client", - "version": "8.0.11", - "hash": "sha256-umvY77/tqcwWRqrDwnjVwAW7HYurWOOElmqxRobSWj8=" - }, - { - "pname": "Microsoft.AspNetCore.Http.Connections.Common", - "version": "8.0.11", - "hash": "sha256-v2kVUWConlb+5WjVt6pdWbWw43EMxBtpmNHJggGrWaY=" - }, { "pname": "Microsoft.AspNetCore.Identity.EntityFrameworkCore", - "version": "8.0.11", - "hash": "sha256-CGnMxU5tYyhALmSnWEMeaNqQmmA1iXqV503HHoWMAfs=" + "version": "10.0.10", + "hash": "sha256-r2ZhBjaF7d5M+HYtN8FsBMK7hndICSefPkbOfigjS9k=" }, { "pname": "Microsoft.AspNetCore.JsonPatch", - "version": "8.0.11", - "hash": "sha256-7n0O/CWYMjWyicwPZgUUh+YTmdNNZA02rWhBHAzPDPU=" + "version": "10.0.10", + "hash": "sha256-NIFI6z2X1blS3ab3G/CgY42WuJULni5wTa4X8AMx1c0=" }, { "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", - "version": "8.0.11", - "hash": "sha256-oaSZize0xvrX1qf45gjMmXHipD21tBGTp2pkr7ReS5U=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Razor.Extensions", - "version": "6.0.0", - "hash": "sha256-TrR4soDtsyg+czs3P0nYByalKC6g6cmdQiRnOg6NRtA=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation", - "version": "8.0.11", - "hash": "sha256-O+ssoIAS4R9X80bP+f8U/2c3KZhZkTV34qGsAHEAM7k=" - }, - { - "pname": "Microsoft.AspNetCore.Razor.Language", - "version": "6.0.0", - "hash": "sha256-P0bdoAG+VBR/PuYQQN4tXhJomfXw+lArXx5UQqRoWlM=" - }, - { - "pname": "Microsoft.AspNetCore.SignalR.Client", - "version": "8.0.11", - "hash": "sha256-Bh3scWPi7Zf0FidyILH5ANrUXNiImHKAyX74ToIEKAE=" - }, - { - "pname": "Microsoft.AspNetCore.SignalR.Client.Core", - "version": "8.0.11", - "hash": "sha256-pYkxXOwUo+me25kUZSgmbDrJ9sed91tDOUMwuwgAFjI=" - }, - { - "pname": "Microsoft.AspNetCore.SignalR.Common", - "version": "8.0.11", - "hash": "sha256-Bq/maWmZpIZx8DTN81O9m617bepcgVeO5augSI8WiNU=" - }, - { - "pname": "Microsoft.AspNetCore.SignalR.Protocols.Json", - "version": "8.0.11", - "hash": "sha256-drCZEQdUBvWviUe4McpS5EuHmiNor8P3vxTlVnqkkOM=" + "version": "10.0.10", + "hash": "sha256-QlXe8Il3kcDQZTSZg3tCvW7c8ERix7lIWvYGSrrleNE=" }, { "pname": "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson", - "version": "8.0.11", - "hash": "sha256-8TisgYgVIth+MGVxshkggCq4l4eRS29tKG718VjUeaM=" + "version": "10.0.10", + "hash": "sha256-iaG84GdwHEgNNyG7Q9/6NPLg+I91rjEpBjeTowxcm7Y=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -320,114 +255,104 @@ "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" }, { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "pname": "Microsoft.Bcl.Memory", + "version": "9.0.14", + "hash": "sha256-/1YVk+lrwfq7hpr1T5URizzU9keMEO5YVifavEi9c8M=" + }, + { + "pname": "Microsoft.Bcl.TimeProvider", + "version": "8.0.1", + "hash": "sha256-TQRaWjk1aZu+jn/rR8oOv8BJEG31i6mPkf3BkIR7C+c=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "17.11.31", + "hash": "sha256-YS4oASrmC5dmZrx5JPS7SfKmUpIJErlUpVDsU3VrfFE=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "18.0.2", + "hash": "sha256-fO31KAdDs2J0RUYD1ov9UB3ucsbALan7K0YdWW+yg7A=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.2", - "hash": "sha256-pDeaMqX7a01Hp1Qd9P/y/B2rEGAv2eIY0Ld/klBZW5g=" + "version": "3.11.0", + "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.3", - "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY=" - }, - { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.4", - "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + "version": "5.3.0", + "hash": "sha256-eUjU7MDekcbDQxUButcWK7siHx6HmrgdDMLnpGYRVLM=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.0.0", - "hash": "sha256-SfQYaC9FbN60PhSzU3iM56ZeUlb/Y2FFGEnF43/5luc=" + "version": "5.0.0", + "hash": "sha256-g4ALvBSNyHEmSb1l5TFtWW7zEkiRmhqLx4XWZu9sr2U=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.10.0", - "hash": "sha256-gtGxb7gPSOWVN2SS5CaHtZO+i6hvBbiXyA2AZ8dOKzY=" - }, - { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.5.0", - "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I=" + "version": "5.6.0", + "hash": "sha256-Q+34cKCUHLMUdigLSuCunqcpAzagynq7O6LJ09EPu6g=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.0.0", - "hash": "sha256-ZGE+DM8siy3DHhBQcNesEHz9bEL4at+L6Cmj24+X/dc=" + "version": "5.0.0", + "hash": "sha256-ctBCkQGFpH/xT5rRE3xibu9YxPD108RuC4a4Z25koG8=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.10.0", - "hash": "sha256-HjKeyCBJ+tylS3EaF18Z99Qj2F0eJQvUZo/pYrBcfLI=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.5.0", - "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A=" + "version": "5.6.0", + "hash": "sha256-nrzGZk9oLuCEvhDT+IS+XBVOuHVrwL8RGj0rZFP4SRo=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", - "version": "4.5.0", - "hash": "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o=" - }, - { - "pname": "Microsoft.CodeAnalysis.Razor", - "version": "6.0.0", - "hash": "sha256-j1/Mpe9Ta+4dhoa2+Zd7BaMm6MllJfaMtZ4pX+P2cqA=" + "version": "5.0.0", + "hash": "sha256-yWVcLt/f2CouOfFy966glGdtSFy+RcgrU1dd9UtlL/Q=" }, { "pname": "Microsoft.CodeAnalysis.Workspaces.Common", - "version": "4.5.0", - "hash": "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI=" + "version": "5.0.0", + "hash": "sha256-Bir5e1gEhgQQ6upQmVKQHAKLRfenAu60DAzNupNnZsQ=" }, { - "pname": "Microsoft.CSharp", - "version": "4.5.0", - "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY=" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild", + "version": "5.0.0", + "hash": "sha256-+58+iqTayTiE0pDaog1U8mjaDA8bNNDLA8gjCQZZudo=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "8.0.11", - "hash": "sha256-uvcAmj7ob2X/JKLleNwanpNs0X3PkJl3je6ZsHeWooE=" + "version": "10.0.10", + "hash": "sha256-xVZPHGNo5BD9rPUD+G8lzOnK5SwqXrXfo5A7dRBUxPE=" + }, + { + "pname": "Microsoft.EntityFrameworkCore", + "version": "10.0.4", + "hash": "sha256-V3Vwl1MtVMRTPo7a9lAgs6UaeMnFV3eEsKnLyPaPMHA=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "8.0.11", - "hash": "sha256-qKe+WBIlyZ1CS2H9JGWsYiWxkUzGjwIHtx/q3FPCDr8=" + "version": "10.0.10", + "hash": "sha256-On3X52C76cx9WobuQIBu8Rt1IV8dKf2VdY+98SJ2lKo=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "8.0.11", - "hash": "sha256-eKhcGqCN34F2i7/FeKSq1gyMjNq3ikq+UpE/1SbXecY=" + "version": "10.0.10", + "hash": "sha256-tOI7t2TWw1a5BLiiUcoVfR8ai23KO5Fqjh7mnskJRsU=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "8.0.11", - "hash": "sha256-in7Ppl/tEEM/2r+l+uuSjWLXk7fHbJRVmLzskYfAhMQ=" + "version": "10.0.10", + "hash": "sha256-yLbrgLp+YZalYX/5OvfOSnZZsKuVDW3dOX1n2BhrY20=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "8.0.11", - "hash": "sha256-st6V0S7j+FyK7r9X6uObpuhSoac/z5QOF1DUPnhffgE=" + "version": "10.0.10", + "hash": "sha256-3YyfZyXSZpdjW1S+qaVNFURiRyzHwy0sofx+gILCZFQ=" }, { - "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "8.0.0", - "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI=" - }, - { - "pname": "Microsoft.Extensions.Caching.Memory", - "version": "8.0.1", - "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps=" + "pname": "Microsoft.EntityFrameworkCore.Relational", + "version": "10.0.4", + "hash": "sha256-WwGoCwNxDXyqfBvUX9fGa/6X+yiDBuE7hf3csU78+Os=" }, { "pname": "Microsoft.Extensions.Configuration", @@ -439,16 +364,6 @@ "version": "6.0.0", "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA=" }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "8.0.0", - "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" - }, { "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", "version": "6.0.0", @@ -465,65 +380,20 @@ "hash": "sha256-5tUoqvIsWL5hfmMCpCpBW6V1tw/sMUCwfnm/7Y8LD6M=" }, { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "6.0.0", - "hash": "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.1", - "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "6.0.0", - "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.0", - "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.2", - "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + "pname": "Microsoft.Extensions.DependencyModel", + "version": "10.0.0", + "hash": "sha256-oCcIjmwH8H0n9bT3wQBWdotMvYuoiazfiKrXAs2bLiI=" }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "8.0.0", - "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo=" - }, - { - "pname": "Microsoft.Extensions.DependencyModel", - "version": "8.0.2", - "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q=" - }, - { - "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "8.0.0", - "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY=" - }, - { - "pname": "Microsoft.Extensions.Features", - "version": "8.0.11", - "hash": "sha256-/q25irYLMbgzuvIHDva43NmKF+BuFCiZX4cmINKu2/4=" + "version": "10.0.10", + "hash": "sha256-dbMT/THhkYtvENQvdRMnPrn7lKXxpPKjWQlG1HbvaS8=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", "version": "6.0.0", "hash": "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk=" }, - { - "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "8.0.0", - "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" - }, { "pname": "Microsoft.Extensions.FileProviders.Physical", "version": "6.0.0", @@ -534,41 +404,6 @@ "version": "6.0.0", "hash": "sha256-RAWHjkkfvGpjc49Q0kJbZyXgU6UEq/EJ0j557sj2/iU=" }, - { - "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "8.0.0", - "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE=" - }, - { - "pname": "Microsoft.Extensions.Http", - "version": "6.0.0", - "hash": "sha256-JVUjIgj7kblLhiEPsbL1psav8pWrKmjB5Csr4d3GuvM=" - }, - { - "pname": "Microsoft.Extensions.Identity.Core", - "version": "8.0.11", - "hash": "sha256-5ZeJEyzyyQpBBjrS6/z3sWoD/o+jwtyFKksG35wLu3E=" - }, - { - "pname": "Microsoft.Extensions.Identity.Stores", - "version": "8.0.11", - "hash": "sha256-75vJxLs+zzM3TtdxK1ccZx82xwdZzePNss0H/8DnAww=" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "6.0.0", - "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "8.0.1", - "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" - }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "1.0.0", @@ -579,75 +414,55 @@ "version": "6.0.0", "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.0", - "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" - }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.2", - "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "6.0.0", - "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "8.0.0", - "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "8.0.2", - "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" - }, { "pname": "Microsoft.Extensions.Primitives", "version": "6.0.0", "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4=" }, { - "pname": "Microsoft.Extensions.Primitives", - "version": "8.0.0", - "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + "pname": "Microsoft.Identity.Abstractions", + "version": "9.3.0", + "hash": "sha256-vzR37PdbKQaCveLin2/o+nwgGl9EY2ISB36y+t7k1Qc=" }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.2.1", - "hash": "sha256-+9aIQ5tVPM915SEaquiiVUYaW2wk2MvkYWEMTzGYEl4=" + "version": "8.13.1", + "hash": "sha256-zDoi55HDQG0Xr1W0PLbmBXGccRaSMI4afT/73J4GRuo=" + }, + { + "pname": "Microsoft.IdentityModel.Abstractions", + "version": "8.2.0", + "hash": "sha256-e+BmN/Et9mTqWt4M38udL47M4wHHs25Ob299gJSBZIM=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "6.17.0", - "hash": "sha256-mtryNDUNNApvIZLQ0jOiuNqLS/TH+7/zQUoViUvGVzQ=" + "version": "8.13.1", + "hash": "sha256-V8w1vp4BU54GUCn1MeMzbk1erJOhRkaGvfT36CQoQMg=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.2.1", - "hash": "sha256-0tL7K87O8w2IOje7+WFZQiPiYFWLMqMRsVoHKVose+0=" + "version": "8.2.0", + "hash": "sha256-tOzI2GmMISuWO/vDtJIeKmYAaFPYjrB5NhpzCWWcIw4=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "6.17.0", - "hash": "sha256-vdpxEm0mDravY2SQT/AVgmzkQMjhNe3BcoXxWU0ayLo=" + "version": "8.13.1", + "hash": "sha256-Y/djq0pR3iKykXY8TALZnJaU8PhWDcEweCNUWz99QQk=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.2.1", - "hash": "sha256-0FHmPBoogYIEAa7hxVvxIYy1jCCB3NmnVS5eoVWsjrU=" + "version": "8.2.0", + "hash": "sha256-JdrIo2Dg9UPu/eK5TIPKLWfRmvPGhKZrBCQL+MIv72I=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "6.17.0", - "hash": "sha256-XuYVKil1tUQ+cLAPnBe9+OWeLgy4AFAiIrXUhEPXLCg=" + "version": "8.13.1", + "hash": "sha256-+bXBDOsA5qxYRbyIHLCt6h/Zs0y/k/KA4Yyof5q9g7k=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.2.1", - "hash": "sha256-kO/Xrv/XbJ0hKqA0PFWMKJA8EBCuAjBO7D6XoPH0l8k=" + "version": "8.2.0", + "hash": "sha256-QxhnZVUrKKUZEKZgok2+4HjawuXZtVhXCJ2+BDomja8=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -659,55 +474,45 @@ "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.1", - "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.2", - "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" - }, { "pname": "Microsoft.NETCore.Targets", "version": "1.0.1", "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" }, { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + "pname": "Microsoft.VisualStudio.SolutionPersistence", + "version": "1.0.52", + "hash": "sha256-KZGPtOXe6Hv8RrkcsgoLKTRyaCScIpQEa2NhNB3iOXw=" }, { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.3", - "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=" - }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + "pname": "Microsoft.Win32.SystemEvents", + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" }, { "pname": "MimeKit", - "version": "4.8.0", - "hash": "sha256-4EB54ktBXuq5QRID9i8E7FzU7YZTE4wwH+2yr7ivi/Q=" + "version": "4.17.0", + "hash": "sha256-GpWv+8shoprshuPNB+H+C5saffiKQ6Pek3zhLUGklRo=" }, { "pname": "Mono.TextTemplating", - "version": "2.2.1", - "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY=" + "version": "3.0.0", + "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0=" }, { "pname": "NBitcoin", - "version": "9.0.0", - "hash": "sha256-FLqOA3Axa2Xyz7MRgXPnbIQHwMcuKqduTJrUt87/W8Q=" + "version": "10.0.1", + "hash": "sha256-LdxZgCZNaVKpc5aZXVoM63LIzNM+zvf+Cg2c0nxjtCE=" + }, + { + "pname": "NBitcoin", + "version": "10.0.8", + "hash": "sha256-SnJ60lhDv94oD0370ZyrvFG2LDJ0wkixNP1pIvcq8AA=" }, { "pname": "NBitcoin.Altcoins", - "version": "5.0.0", - "hash": "sha256-3dPvHLcVvM26NW1MHcZeHkoIFm/ypcpiv+W948ff1ys=" + "version": "6.0.4", + "hash": "sha256-BpXLxjmFf1JUud0Mwz/Zph0jPVqrEfa6KiMMnsOeIU8=" }, { "pname": "NBitpayClient", @@ -716,14 +521,24 @@ }, { "pname": "NBXplorer.Client", - "version": "5.0.5", - "hash": "sha256-vUP1bGd5iw3roNcvG525JV3SnL/6eXIqjvJKxdy+7dY=" + "version": "5.0.8", + "hash": "sha256-io1df2tgBDDoZL+55yR7Nmb1JmZBDLpuiV2A7LlRF/c=" }, { "pname": "NETStandard.Library", "version": "1.6.1", "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, + { + "pname": "NETStandard.Library.Ref", + "version": "2.1.0", + "hash": "sha256-Ruovy9EKgXaFuFr3zgw5fRKUS9yBIJ4nLeHgXv0zx4o=" + }, + { + "pname": "Newtonsoft.Json", + "version": "12.0.1", + "hash": "sha256-4Xf3RZrJomAh3jaZrEAJX3oPmOowGV8yDB9Y3h0Dw4U=" + }, { "pname": "Newtonsoft.Json", "version": "13.0.1", @@ -734,6 +549,11 @@ "version": "13.0.3", "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" + }, { "pname": "Newtonsoft.Json.Bson", "version": "1.0.1", @@ -766,418 +586,158 @@ }, { "pname": "NLog", - "version": "5.3.4", - "hash": "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k=" + "version": "6.0.3", + "hash": "sha256-lrF4+wTsVr7/hD9sJVAMk3+zwH7JMoOEw/pCZm3ki4g=" }, { "pname": "Npgsql", - "version": "8.0.6", - "hash": "sha256-HebK3NmiuFvq6KfjNwpUs6B/RqA5Uwl9QzTRfaOrK34=" + "version": "10.0.3", + "hash": "sha256-ddCXCSOoyfy7035OvnL+4LEDYqHjZyPoZ3ffG2coMW0=" }, { "pname": "Npgsql.EntityFrameworkCore.PostgreSQL", - "version": "8.0.11", - "hash": "sha256-r4BpmSg4HGvA6TnfftY6QQRJsCeUdDsMLE82Oa8eleI=" + "version": "10.0.3", + "hash": "sha256-2ImviEfJ21Dk7pjLJRFCndi5fqDLOl4gkmtGxH3O48Q=" }, { "pname": "NSec.Cryptography", - "version": "22.4.0", - "hash": "sha256-TVB8MDXan3dQphaYG/rLQMWgpYJ6WE5ORiqiQrfnCW0=" + "version": "25.4.0", + "hash": "sha256-jwsuS+Kp+sD31S41tTHv/zkFqnzxnGOEty2iZVmBb6E=" }, { "pname": "QRCoder", - "version": "1.6.0", - "hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28=" + "version": "1.7.0", + "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU=" }, { "pname": "runtime.any.System.Collections", "version": "4.0.11", "hash": "sha256-4L3fXzSgw8UaCTvdb3cEyihka3K8JHBz/Ujsx0JdhPQ=" }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" - }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.1.0", "hash": "sha256-+PJZWFl6hkqryCerWVtbG+ppIGvZf2l6fu2HWyGqMRA=" }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" - }, { "pname": "runtime.any.System.Globalization", "version": "4.0.11", "hash": "sha256-BgmoUM3WsMUCjtO9KmtjPKsjYRAEVjp74KvEa8zNgAg=" }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" - }, { "pname": "runtime.any.System.IO", "version": "4.1.0", "hash": "sha256-ZbG7B6GOO90k/prj/Z60UGloQUrBepsvmlPQGuV0Wk0=" }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, { "pname": "runtime.any.System.Reflection", "version": "4.1.0", "hash": "sha256-BtdDCQLHDdAgO9qhwE0JBuUqFKc7l9On8p+VlgrQbBo=" }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.0.1", "hash": "sha256-H2ZzRIWLN6FbSh8+q4OXqhssn3nGRnv7/NiV3OO+uf8=" }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, { "pname": "runtime.any.System.Resources.ResourceManager", "version": "4.0.1", "hash": "sha256-eZasny65yEQESxMJHOBaqJQzlrd8CIOIc1ks6+HRr8o=" }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, { "pname": "runtime.any.System.Runtime", "version": "4.1.0", "hash": "sha256-FZC+BNSzSkN3rObLJJAqwW/vNnJ+PiwdvNNufuISWVY=" }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, { "pname": "runtime.any.System.Runtime.Handles", "version": "4.0.1", "hash": "sha256-WlmU4OzK6IpszOCuEb5pdh4dwpkuoBQTYRuT4SF+XM8=" }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, { "pname": "runtime.any.System.Runtime.InteropServices", "version": "4.1.0", "hash": "sha256-H9FNiCk+Qrm+15K+Rje+wnQxwUmkVx60x+FWBoGLqD4=" }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.0.11", "hash": "sha256-pyaH3Lcuv/pEM9NSFWlLcljav/Ksnwwk7cjPEH99m1Q=" }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" - }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.0.11", "hash": "sha256-c/8eunlNexFpzZ+GvNF0p1hi5Xo0VPo7LnkhjRO47eM=" }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" - }, { "pname": "runtime.native.System", "version": "4.0.0", "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" - }, { "pname": "runtime.native.System.Security.Cryptography", "version": "4.0.0", "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w=" }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" - }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.1", - "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY=" - }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.0.11", "hash": "sha256-TTzJP6sR0/mDbbU3+ySnt9LVEcPPLfiAzxnfTaJazRY=" }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" - }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.0.1", "hash": "sha256-1Q50COfWkU4/y9eBWj0jPDp3qvy19vRCZnDKQthrhUU=" }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, { "pname": "runtime.unix.System.Runtime.Extensions", "version": "4.1.0", "hash": "sha256-xB8TkAadhz7gi8Ag3+uYtLdfjtxO8dCLrd/FzU7jLHQ=" }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" - }, { "pname": "Serilog", - "version": "3.1.1", - "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" + "version": "4.3.0", + "hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw=" }, { "pname": "Serilog.AspNetCore", - "version": "8.0.0", - "hash": "sha256-0V4BmXmKeSy5ND5aONhSW3iL/+fZ2jB781HdooJlOjw=" + "version": "10.0.0", + "hash": "sha256-z7dY6pY2Kkns20mpzZN2GOfV172gDWpamKDXHyLhEJs=" }, { "pname": "Serilog.Extensions.Hosting", - "version": "8.0.0", - "hash": "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E=" + "version": "10.0.0", + "hash": "sha256-zFQMZkAPqg+j2ZI0oBN07hO+9MFiyy5YECRbz7msxeU=" }, { "pname": "Serilog.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA=" + "version": "10.0.0", + "hash": "sha256-MgfWK/SJWUPxPzrnCUnxn6Sy+SBVmP3dYd60uy80NdE=" }, { "pname": "Serilog.Formatting.Compact", - "version": "2.0.0", - "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g=" + "version": "3.0.0", + "hash": "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY=" }, { "pname": "Serilog.Settings.Configuration", - "version": "8.0.0", - "hash": "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg=" + "version": "10.0.0", + "hash": "sha256-WJK+wR7XPGAtD+vO+pjF5mn4qy8tO5uWIqHhovL0lAs=" }, { "pname": "Serilog.Sinks.Console", - "version": "5.0.0", - "hash": "sha256-UOVlegJLhs0vK1ml2DZCjFE5roDRZsGCAqD/53ZaZWI=" + "version": "6.1.1", + "hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY=" }, { "pname": "Serilog.Sinks.Debug", - "version": "2.0.0", - "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ=" + "version": "3.0.0", + "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE=" }, { "pname": "Serilog.Sinks.File", - "version": "5.0.1-dev-00968", - "hash": "sha256-gXrvlnNVi2TKtsFfjqoPkGZS3JM+p6vjvy3p2by/4A4=" + "version": "7.0.0", + "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, { "pname": "SocketIO.Core", @@ -1201,667 +761,197 @@ }, { "pname": "SSH.NET", - "version": "2023.0.0", - "hash": "sha256-YiAfBOu8KLKPFk4humKCe+Ne79ppxdODKXgjbcni8po=" - }, - { - "pname": "SshNet.Security.Cryptography", - "version": "1.3.0", - "hash": "sha256-kDpV7/n4plAPh+FqsPbCA/kFHHfmJGsJDTQg2wRLOfk=" - }, - { - "pname": "System.AppContext", - "version": "4.3.0", - "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + "version": "2025.1.0", + "hash": "sha256-vtpvE5B+IxoMkq9CQMehoR5ZRtihaHQ4VyhmkkIjL98=" }, { "pname": "System.CodeDom", - "version": "4.4.0", - "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0=" + "version": "6.0.0", + "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" }, { "pname": "System.Collections", "version": "4.0.11", "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, { "pname": "System.Collections.Concurrent", "version": "4.0.12", "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8=" }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" - }, - { - "pname": "System.Collections.Immutable", - "version": "5.0.0", - "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" - }, - { - "pname": "System.Collections.Immutable", - "version": "6.0.0", - "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" - }, - { - "pname": "System.Collections.Immutable", - "version": "8.0.0", - "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" - }, { "pname": "System.Composition", - "version": "6.0.0", - "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw=" + "version": "9.0.0", + "hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM=" }, { "pname": "System.Composition.AttributedModel", - "version": "6.0.0", - "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc=" + "version": "9.0.0", + "hash": "sha256-a7y7H6zj+kmYkllNHA402DoVfY9IaqC3Ooys8Vzl24M=" }, { "pname": "System.Composition.Convention", - "version": "6.0.0", - "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo=" + "version": "9.0.0", + "hash": "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U=" }, { "pname": "System.Composition.Hosting", - "version": "6.0.0", - "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4=" + "version": "9.0.0", + "hash": "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s=" }, { "pname": "System.Composition.Runtime", - "version": "6.0.0", - "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8=" + "version": "9.0.0", + "hash": "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s=" }, { "pname": "System.Composition.TypedParts", - "version": "6.0.0", - "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k=" + "version": "9.0.0", + "hash": "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog=" }, { "pname": "System.Configuration.ConfigurationManager", - "version": "9.0.0", - "hash": "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk=" - }, - { - "pname": "System.Console", - "version": "4.3.0", - "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + "version": "9.0.8", + "hash": "sha256-i9i8sf1yUj0c1C+Kukl0e3bBHGo1sdvayftw2FoYXtA=" }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "6.0.0", - "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "6.0.1", - "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "8.0.0", - "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs=" - }, - { - "pname": "System.Diagnostics.EventLog", - "version": "9.0.0", - "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" - }, { "pname": "System.Diagnostics.Tracing", "version": "4.1.0", "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ=" }, { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" - }, - { - "pname": "System.Formats.Asn1", - "version": "8.0.1", - "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" - }, - { - "pname": "System.Formats.Cbor", + "pname": "System.Drawing.Common", "version": "6.0.0", - "hash": "sha256-cm27ykIUZ/Ypj8/R73gd+mluE7m/WZFNlTsY5sYjAqQ=" + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" }, { "pname": "System.Globalization", "version": "4.0.11", "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" - }, { "pname": "System.IdentityModel.Tokens.Jwt", - "version": "6.17.0", - "hash": "sha256-H3n0I6H3d5TmaVQ6kUZQ1/8BFrsQcVrwxAoty3eKTfg=" - }, - { - "pname": "System.IdentityModel.Tokens.Jwt", - "version": "8.2.1", - "hash": "sha256-osV3VbG9k5Jb4XSlUsDxqbMEASNR3c7DA6+AKVXVhHQ=" + "version": "8.13.1", + "hash": "sha256-v0JRCOzoOoaWRYd+5M/xd/MIorTjUXgFuNWxCX9j5ZA=" }, { "pname": "System.IO", "version": "4.1.0", "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" - }, - { - "pname": "System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" - }, - { - "pname": "System.IO.Compression.ZipFile", - "version": "4.3.0", - "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" - }, { "pname": "System.IO.Hashing", "version": "6.0.0", "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE=" }, - { - "pname": "System.IO.Pipelines", - "version": "6.0.3", - "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck=" - }, - { - "pname": "System.IO.Pipelines", - "version": "8.0.0", - "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" - }, { "pname": "System.Linq", "version": "4.1.0", "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" - }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, { "pname": "System.Memory.Data", "version": "1.0.2", "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" }, - { - "pname": "System.Net.Http", - "version": "4.3.0", - "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" - }, - { - "pname": "System.Net.Http", - "version": "4.3.4", - "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" - }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" - }, - { - "pname": "System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" - }, { "pname": "System.Private.Uri", "version": "4.0.1", "hash": "sha256-MjVaZHx8DUFnVUxOEEaU9GxF6EyEXbcuI1V7yRXEp0w=" }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" - }, { "pname": "System.Reflection", "version": "4.1.0", "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "5.0.0", - "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "6.0.1", - "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "8.0.0", - "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" - }, { "pname": "System.Reflection.Primitives", "version": "4.0.1", "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" - }, { "pname": "System.Resources.ResourceManager", "version": "4.0.1", "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, { "pname": "System.Runtime", "version": "4.1.0", "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime", - "version": "4.3.1", - "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "5.0.0", - "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, { "pname": "System.Runtime.Handles", "version": "4.0.1", "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, { "pname": "System.Runtime.InteropServices", "version": "4.1.0", "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.3.0", - "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" - }, - { - "pname": "System.Security.Claims", - "version": "4.3.0", - "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.5.0", - "hash": "sha256-9llRbEcY1fHYuTn3vGZaCxsFxSAqXl4bDA6Rz9b0pN4=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" - }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.0", - "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=" - }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + "version": "10.0.0", + "hash": "sha256-d3sLG+LZ3+N/h/6gdJcVKOgbBO6wYb66NfXalAEDqnE=" }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "9.0.0", - "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=" - }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" - }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + "version": "9.0.8", + "hash": "sha256-2My/dEWSuQ9SRGc4USEbZj25mafyORGjOS7CJguOc68=" }, { "pname": "System.Text.Encoding", "version": "4.0.11", "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "4.5.1", - "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "4.7.2", - "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "8.0.0", - "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" - }, - { - "pname": "System.Text.Json", - "version": "4.7.2", - "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" - }, - { - "pname": "System.Text.Json", - "version": "5.0.2", - "hash": "sha256-3eHI5WsaclD9/iV4clLtSAurQxpcJ/qsZA82lkTjoG0=" - }, - { - "pname": "System.Text.Json", - "version": "8.0.0", - "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" - }, - { - "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.3.1", - "hash": "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM=" - }, { "pname": "System.Threading", "version": "4.0.11", "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Channels", - "version": "6.0.0", - "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE=" - }, - { - "pname": "System.Threading.Channels", - "version": "8.0.0", - "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=" - }, { "pname": "System.Threading.Tasks", "version": "4.0.11", "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.3.0", - "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" - }, - { - "pname": "System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.3.0", - "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.3.0", - "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" - }, { "pname": "TwentyTwenty.Storage", - "version": "2.24.2", - "hash": "sha256-RBMEajSVvYTJzJkhekjIzcXWX7ERQvLJ38TJXSBhvFc=" + "version": "2.26.1", + "hash": "sha256-/f+ZsEUyBqRNRU1msH2uvVNvrs+5TdhxW/07PCWxvCY=" }, { "pname": "TwentyTwenty.Storage.Amazon", - "version": "2.24.2", - "hash": "sha256-U/RYB3l16hQ6Ez8ARVkz3kyMIPMI0icxkHHjVKd2HS0=" + "version": "2.26.1", + "hash": "sha256-iBikYcLLjBoweopXo9gbORqKWEowTGzmLiqMsdMxM+g=" }, { "pname": "TwentyTwenty.Storage.Azure", - "version": "2.24.2", - "hash": "sha256-SrjAhf5KTMMvbCv+unogNT3m2MB6ZUbBsz5HsX0zEqE=" + "version": "2.26.1", + "hash": "sha256-1P1TqeomAe8nmDtlN5XZiH2Nkeq6MSH1gdbTzGAlJRE=" }, { "pname": "TwentyTwenty.Storage.Google", - "version": "2.24.2", - "hash": "sha256-EJJnEJbSidOxsiRWBbiO0NhB6K5LdGcXSQ40+JrviiE=" + "version": "2.26.1", + "hash": "sha256-a9bFk18MNYhI0Y32hUx5VjRQD0L5nDxfDAnc7+VKDd4=" }, { "pname": "TwentyTwenty.Storage.Local", - "version": "2.24.2", - "hash": "sha256-OD3TCPNH+So2SZeACLV1KN4Ifjft0csOuiROCuPNSsw=" + "version": "2.26.1", + "hash": "sha256-dUOvIUus5BizZvVMnHFUH6qaTWHJpXLFfsFAVdpvlC4=" }, { "pname": "YamlDotNet", - "version": "8.0.0", - "hash": "sha256-9VInbvbrc9su5rcSyT4/t0wBSfLDpHvSvAy6WqMMGSY=" + "version": "16.3.0", + "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" } ] diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix index dac70a10405f..c3e6e05cb7a6 100644 --- a/pkgs/by-name/bt/btcpayserver/package.nix +++ b/pkgs/by-name/bt/btcpayserver/package.nix @@ -8,20 +8,20 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "2.3.4"; + version = "2.4.2"; src = fetchFromGitHub { owner = "btcpayserver"; repo = "btcpayserver"; tag = "v${version}"; - hash = "sha256-u4VNDKLOb6bEkdhRTmnGxyM+2a6mcdWwV1T4+HFK/14="; + hash = "sha256-UeWiJv6LvKZx4LYy8LBvPTXVNKAIZI1n3qb6sIU5Dd0="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_10_0; buildType = if altcoinSupport then "Altcoins-Release" else "Release"; diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index 176dd895335b..96af0533fea1 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem, - version ? "3.0.0", + version ? "3.0.1", }: stdenv.mkDerivation (finalAttrs: { @@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: { rev = "rel-${finalAttrs.version}"; hash = { + "3.0.1" = "sha256-oHebG9VBtEnxmBpfP6A/f/UNIx2AXbLPs0NHPoNlZfY="; "3.0.0" = "sha256-pymbSC6bwQQ0YCtJd3xWZiC22UEkFiKSLObSOnoQj9I="; "2.2.1" = "sha256-dYRaw9DI63Nqz0IJkfQYU4y00KSfq1Xv0xZuL1G15CY="; "2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4="; diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index edfe49711259..786909274c76 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -8,19 +8,19 @@ buildGoModule (finalAttrs: { pname = "carapace-bridge"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; tag = "v${finalAttrs.version}"; - hash = "sha256-QlYRbGw7QRwMqJRJea0OoHCDQpYK7Uq6eFgc1JahEiI="; + hash = "sha256-0z9yd3hzvldtBO12nj9XcDuNjJAsmUIMXYB90PHK5VE="; }; # buildGoModule tries to run `go mod vendor` instead of `go work vendor` on # the workspace if proxyVendor is off proxyVendor = true; - vendorHash = "sha256-YB8rBIrFgOBzdBLAXf5FjzB0d0dZmNEq8vXFZg1Rd10="; + vendorHash = "sha256-mOgeHluUbLIILplVMdZV8CxYhQC1r9HX6cDr4Fe1jXM="; postPatch = '' substituteInPlace cmd/carapace-bridge/main.go \ diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 6a8a107d883a..f49210db8e19 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -7,13 +7,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-nextest"; - version = "0.9.140"; + version = "0.9.143"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; tag = "cargo-nextest-${finalAttrs.version}"; - hash = "sha256-BPepunROy+2a31mXRn19perolZLWCTg0kseu0xqRbmU="; + hash = "sha256-nbkNUWa3Meht5b4pXjteWP0XVwJZjSx6AuWxaJgdMm0="; }; # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918 @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./no-dtrace-macos.patch ]; - cargoHash = "sha256-uqEIv6zkYuL4cOXuGfN7VxCakvJ3z49eqRUZiTgD9Tk="; + cargoHash = "sha256-j3OciGSKymfDuLqsnMSOInLvpSuAm92/SNMDACP23Gc="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ci/cine/package.nix b/pkgs/by-name/ci/cine/package.nix index dbd8b45cf408..c4b816cd8c91 100644 --- a/pkgs/by-name/ci/cine/package.nix +++ b/pkgs/by-name/ci/cine/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "cine"; - version = "1.8.0"; + version = "1.8.2"; pyproject = false; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Cine"; tag = "v${finalAttrs.version}"; - hash = "sha256-PXZDEtdeb5R5RQUrxrjN+sr4Pi5/48jPkWKuJs+ZUTQ="; + hash = "sha256-kgWK27GThlQFZ0M8UjGR37vKdaPvbg0MfZPB5gq+xGY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cn/cni-plugin-flannel/package.nix b/pkgs/by-name/cn/cni-plugin-flannel/package.nix index 136fb2887c3d..849b9fa6ac28 100644 --- a/pkgs/by-name/cn/cni-plugin-flannel/package.nix +++ b/pkgs/by-name/cn/cni-plugin-flannel/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.9.1-flannel2"; + version = "1.9.1-flannel3"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-ApPv1sQQZSevvP9gem9bTRWRZzHtcDHWNFTwEdCPJ6s="; + sha256 = "sha256-MPR8Nu+EZ/P+xSeEig6EmQVG0qaGt6g6/Fe3jIz1fqU="; }; - vendorHash = "sha256-WoVjhj2r4hVLBFYUYwpwuB7rpvoZFBDLpaEbLrxuFj4="; + vendorHash = "sha256-JTy9MsTyWvnqtRH0hzezYwgB23mfG7KtI9OmynpcESM="; ldflags = [ "-s" diff --git a/pkgs/by-name/co/comfyui/package.nix b/pkgs/by-name/co/comfyui/package.nix index 4d2b79647d2d..93e6cdad3d50 100644 --- a/pkgs/by-name/co/comfyui/package.nix +++ b/pkgs/by-name/co/comfyui/package.nix @@ -74,7 +74,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "comfyui"; - version = "0.30.1"; + version = "0.30.2"; strictDeps = true; __structuredAttrs = true; @@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "Comfy-Org"; repo = "ComfyUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-z8bBKnW2iF8WXI3Ju6Ei+8YpOWqmbUgYiErKiVBBwEk="; + hash = "sha256-fLtgJpK8hEuYcfu1vKGDJtszPfED4mmyKHZYrrq/uiA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix index b6e5b0ca879a..eda047311a54 100644 --- a/pkgs/by-name/co/confluent-cli/package.nix +++ b/pkgs/by-name/co/confluent-cli/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-cli"; - version = "4.70.1"; + version = "4.71.0"; # To get the latest version: # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 @@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${finalAttrs.version}/confluent_${finalAttrs.version}_${system}.tar.gz"; hash = selectSystem { - x86_64-linux = "sha256-ap4jje8SPai7iA0REdxs/LNURUv44S3WlWFOVVtvp1Y="; - aarch64-linux = "sha256-Acjw9ZPERZL9NxenVyLuql9pxYo5rMzzcD44p7LbQ3Y="; - aarch64-darwin = "sha256-XaVoxYTTRStGKFlwoZOcTUHG+Mvalw+kMso7PwKve9U="; + x86_64-linux = "sha256-HLcIIouywKJwZjbjGNFr3VxGDUS3qyCtxpLigbM5KKQ="; + aarch64-linux = "sha256-mWicVfZbD9SHnsCfT8skggxJsdG479MC7qBhOR7yQ1s="; + aarch64-darwin = "sha256-ULn9BLQ/1Z4ZU8OZN2ZKrH7jHRaRokdI3S2KtCFW+d0="; }; }; diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 89f552e48e54..d8f511a923a8 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,18 +21,18 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2026-07-15"; + version = "0-unstable-2026-08-03"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "ffbf0df34699f9670db015962bac83d0d417d7e7"; - hash = "sha256-4z1TXMGOvOMUAED1gluugHPF4mBigjDioxnFneQOIS8="; + rev = "b4a952843aea56f36b1cdccea3cc3b92edc078b8"; + hash = "sha256-yQZ+Sf/pRScIGERyA8J4V9ukCwD0bjbi2QIhIzUHQwA="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-bXATbiA+cRi9aOxpaTLRadBjl4O89x+J84byJ4CrsqI="; + cargoHash = "sha256-wZm3bjXQJXHOgRVq5+AxMA0DJpEp96xvgwxzKBeI9HU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/cr/crowdsec-firewall-bouncer/package.nix b/pkgs/by-name/cr/crowdsec-firewall-bouncer/package.nix index 1344faa9fd61..83f9b69eabcc 100644 --- a/pkgs/by-name/cr/crowdsec-firewall-bouncer/package.nix +++ b/pkgs/by-name/cr/crowdsec-firewall-bouncer/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "crowdsec-firewall-bouncer"; - version = "0.0.34"; + version = "0.0.36"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = "cs-firewall-bouncer"; tag = "v${finalAttrs.version}"; - hash = "sha256-lDO9pwPkbI+FDTdXBv03c0p8wbkRUiIDNl1ip3AZo2g="; + hash = "sha256-MGFplf3keL5B7rr1BcS4PegPWGVAYnFVO6BmxQocBHs="; }; - vendorHash = "sha256-SbpclloBgd9vffC0lBduGRqPOqmzQ0J91/KeDHCh0jo="; + vendorHash = "sha256-n3Do2eCmYHRdYNYqj5L+Ohkyw0OYAAp4HcTU9RI0ncs="; ldflags = [ "-X github.com/crowdsecurity/go-cs-lib/version.Version=v${finalAttrs.version}" diff --git a/pkgs/by-name/cu/curl-impersonate/package.nix b/pkgs/by-name/cu/curl-impersonate/package.nix index 9b6bb058c3cd..bc97666dd282 100644 --- a/pkgs/by-name/cu/curl-impersonate/package.nix +++ b/pkgs/by-name/cu/curl-impersonate/package.nix @@ -7,6 +7,7 @@ buildGoModule, installShellFiles, buildPackages, + c-ares, zlib, zstd, sqlite, @@ -24,6 +25,7 @@ go, p11-kit, nixosTests, + c-aresSupport ? false, }: stdenv.mkDerivation rec { pname = "curl-impersonate"; @@ -45,7 +47,9 @@ stdenv.mkDerivation rec { # warnings on `boringssl`. env.NIX_CFLAGS_COMPILE = "-Wno-error"; + separateDebugInfo = true; strictDeps = true; + __structuredAttrs = true; depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc @@ -125,6 +129,13 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile.in \ --replace-fail "-lc++" "-lstdc++" + + ${lib.optionalString c-aresSupport '' + substituteInPlace Makefile.in \ + --replace-fail \ + 'config_flags="$$config_flags --enable-ipv6";' \ + 'config_flags="$$config_flags --enable-ipv6"; config_flags="$$config_flags --enable-ares=${lib.getDev c-ares}";' + ''} ''; preConfigure = '' diff --git a/pkgs/by-name/cu/curl-impersonateFull/package.nix b/pkgs/by-name/cu/curl-impersonateFull/package.nix new file mode 100644 index 000000000000..57c943a5635d --- /dev/null +++ b/pkgs/by-name/cu/curl-impersonateFull/package.nix @@ -0,0 +1,9 @@ +{ lib, curl-impersonate }: + +# nixpkgs-update: no auto update +curl-impersonate.override { + c-aresSupport = true; +} +// { + meta = lib.removeAttrs (curl-impersonate.meta or { }) [ "position" ]; +} diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index a97529298609..83724d22158b 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -8,21 +8,21 @@ let pname = "dbgate"; - version = "7.2.3"; + version = "7.2.4"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-CgzhxCITg9MvB3c4bL3ffTszBdJM4xubYfEdJ51LgXU="; + hash = "sha256-9X8AyFcKy94blybAEU/H83Ku5oFQU4piVtCTNn4mobE="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-WCRI8THno6e+vHj+PxuiZqX/idI2aVJN8v4aykmNq5U="; + hash = "sha256-v3HPdY5so4IYY8tfk5mqjKOglCvcKk7uKYHV51DoiLM="; }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; - hash = "sha256-Dj0C0M1AZd5VHqsnUd6GLDQcOvtw21qAL+DQaxEx8iI="; + hash = "sha256-GPdDglP2DVGCdchvj1Q5oLU3+DSzTccUbH5LmHGRj/M="; }; } .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported."); diff --git a/pkgs/by-name/db/dbtpl/package.nix b/pkgs/by-name/db/dbtpl/package.nix index d4fa2c6a61b7..d49c97a91a0b 100644 --- a/pkgs/by-name/db/dbtpl/package.nix +++ b/pkgs/by-name/db/dbtpl/package.nix @@ -10,16 +10,16 @@ }: buildGoModule (finalAttrs: { pname = "dbtpl"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "xo"; repo = "dbtpl"; tag = "v${finalAttrs.version}"; - hash = "sha256-r0QIgfDSt7HWnIDnJWGbwkqkXWYWGXoF5H/+zS6gEtE="; + hash = "sha256-mY3UyTDlofSgkOjlJTVCtJz26DVoxzOjzZ9paFBpB3M="; }; - vendorHash = "sha256-scJRJaaccQovxhzC+/OHuPR4NRaE8+u57S1JY40bif8="; + vendorHash = "sha256-Gr2gNIasf5/CGqUx1ONkqICcjJvOQyC322S/lH+a0U0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/de/deja/package.nix b/pkgs/by-name/de/deja/package.nix index f0b19dfb2c75..6b7a3b33d4cc 100644 --- a/pkgs/by-name/de/deja/package.nix +++ b/pkgs/by-name/de/deja/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "deja"; - version = "0.3.2"; + version = "0.4.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "Giammarco-Ferranti"; repo = "deja"; tag = "v${finalAttrs.version}"; - hash = "sha256-ngjnrEq7x6OQ9uFGKmEvbAG7rPtjYX0xLK8110WSZUQ="; + hash = "sha256-SAn/9OM5ivUkJpiBXgV2o01ww85xRo3fQKZp0spwe/w="; }; vendorHash = "sha256-KmLdMK94cGOXMPJwWS6NgLB5OiNmJbszHdnLzauqJm8="; diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index 746f686683a2..ac1b16c123b1 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -95,7 +95,6 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ - cathalmullan anish ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/di/distroshelf/package.nix b/pkgs/by-name/di/distroshelf/package.nix index 683bd78a4395..c9c2bb552b35 100644 --- a/pkgs/by-name/di/distroshelf/package.nix +++ b/pkgs/by-name/di/distroshelf/package.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "distroshelf"; - version = "1.4.8"; + version = "1.5.2"; src = fetchFromGitHub { owner = "ranfdev"; repo = "DistroShelf"; tag = "v${finalAttrs.version}"; - hash = "sha256-3O+KsOZzwH8E2rDSEgiVZK64B2wK1U/uDJ2z37NtJCg="; + hash = "sha256-6UAsG8K/j6lX6mwZOg5JZYbYUe98i6+nPaPLjQMM3w8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-lNKWcpdIr1tm2m50B9uOqFQvhndAEM5ADmmPBPb8sj4="; + hash = "sha256-0ZOgiLGvcjpBcYdEVrcerdIJBPMhS8sPtUOY4t+eUjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ea/earthbuild/package.nix b/pkgs/by-name/ea/earthbuild/package.nix index cc40c0ee1916..1fda67a43022 100644 --- a/pkgs/by-name/ea/earthbuild/package.nix +++ b/pkgs/by-name/ea/earthbuild/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "earthbuild"; - version = "0.8.17"; + version = "0.8.18"; src = fetchFromGitHub { owner = "EarthBuild"; repo = "earthbuild"; rev = "v${finalAttrs.version}"; - hash = "sha256-ATdNA9KjAXsxMiez3AF6TxK7OujNDABY8jB6hXeSNpc="; + hash = "sha256-ydi649sjAnObI4PrbdwVQifWVHyTmJsj2qqJ54rXllQ="; }; - vendorHash = "sha256-49FWzLHEbgwWOXT1uPshdY5risFHInA541Mfhu7v08A="; + vendorHash = "sha256-w5JnfSJ5yNtrc6IM2kCWXAJGbszpvA49rQQJ2+ynlg0="; __structuredAttrs = true; subPackages = [ diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 99f4bc74d4fc..46318dbbf239 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -9,6 +9,10 @@ installShellFiles, mold, withQuic ? false, # with QUIC protocol support + + formats, + bash, + iproute2, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -48,10 +52,17 @@ rustPlatform.buildRustPackage (finalAttrs: { doCheck = false; # tests failed due to heavy rely on network passthru = { - tests = { inherit (nixosTests) easytier; }; + tests = { inherit (nixosTests) easytier easytier-modular; }; updateScript = nix-update-script { }; }; + passthru.services.default = { + imports = [ + (lib.modules.importApply ./service.nix { inherit formats bash iproute2; }) + ]; + easytier.package = finalAttrs.finalPackage; + }; + meta = { homepage = "https://github.com/EasyTier/EasyTier"; changelog = "https://github.com/EasyTier/EasyTier/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/ea/easytier/service.nix b/pkgs/by-name/ea/easytier/service.nix new file mode 100644 index 000000000000..e5cf1cfcbfc8 --- /dev/null +++ b/pkgs/by-name/ea/easytier/service.nix @@ -0,0 +1,201 @@ +# Non-module dependencies (`importApply`) +{ + formats, + iproute2, + bash, +}: + +# Service module +{ + lib, + config, + options, + ... +}: +let + cfg = config.easytier; + instanceName = cfg.settings.instance_name; + toml = formats.toml { }; +in +{ + _class = "service"; + + meta.maintainers = with lib.maintainers; [ moraxyc ]; + + options = { + easytier = { + package = lib.mkOption { + description = "Package to use for easytier"; + defaultText = "The package that provided this module."; + type = lib.types.package; + }; + + peers = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + description = '' + Peers to connect initially. Valid format is: `://:`. + ''; + example = [ + "tcp://example.com:11010" + ]; + }; + + configServer = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + Configure the instance from config server. When this option + set, any other settings for configuring the service manually + except {option}`easytier.settings.hostname` will be ignored. Valid formats are: + + - full uri for custom server: `udp://example.com:22020/` + - username only for official server: `` + ''; + example = "udp://example.com:22020/myusername"; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = toml.type; + options = { + hostname = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = "Hostname shown in peer list and web console."; + }; + instance_name = lib.mkOption { + type = lib.types.str; + description = "Identify different instances on same host"; + }; + network_identity = { + network_name = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = "EasyTier network name."; + }; + network_secret = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + EasyTier network credential used for verification and encryption. + It is highly recommended to use {option}`easytier.environmentFiles` to + avoid leaking the secret into the world-readable Nix store. + ''; + }; + }; + }; + }; + description = "Settings to generate config file"; + }; + + configFile = lib.mkOption { + type = lib.types.path; + description = '' + EasyTier config file. + + When this option is set, it takes precedence over all other + {option}`easytier.settings.*` options. + ''; + }; + + environmentFiles = lib.mkOption { + type = with lib.types; listOf path; + default = [ ]; + description = '' + Files containing environment variables (like {env}`ET_NETWORK_SECRET`) + to be passed to the service. All command-line args + have corresponding environment variables + ''; + example = lib.literalExpression '' + [ + /path/to/.env + /path/to/.env.secret + ] + ''; + }; + + extraArgs = lib.mkOption { + description = "Extra arguments to pass to `easytier-core`"; + type = with lib.types; listOf str; + default = [ ]; + }; + }; + }; + + config = { + easytier = { + settings.peer = lib.mkIf (cfg.peers != [ ]) (map (p: { uri = p; }) cfg.peers); + configFile = lib.mkDefault ( + toml.generate "easytier-${instanceName}.toml" ( + lib.attrsets.filterAttrsRecursive (_: v: v != null) cfg.settings + ) + ); + }; + process = { + argv = [ + (lib.getExe' cfg.package "easytier-core") + ] + ++ lib.optional (cfg.settings.hostname != null) "--hostname=${cfg.settings.hostname}" + ++ lib.optional (cfg.configServer == null) "--config-file=${config.configData."config.toml".path}" + ++ lib.optional (cfg.configServer != null) "--config-server=${cfg.configServer}" + ++ cfg.extraArgs; + }; + configData."config.toml" = { + enable = lib.mkDefault (cfg.configServer == null); + source = cfg.configFile; + }; + } + # Refine the service for systemd + // lib.optionalAttrs (options ? systemd) { + systemd.mainExecStart = config.systemd.lib.escapeSystemdExecArgs config.process.argv; + + systemd.service = { + description = "EasyTier Daemon - ${instanceName}"; + wants = [ + "network-online.target" + "nss-lookup.target" + ]; + after = [ + "network-online.target" + "nss-lookup.target" + ]; + wantedBy = [ "multi-user.target" ]; + path = [ + cfg.package + iproute2 + bash + ]; + restartTriggers = [ cfg.configFile ]; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + StateDirectory = "easytier/easytier-${instanceName}"; + StateDirectoryMode = "0700"; + WorkingDirectory = "%S/easytier/easytier-${instanceName}"; + EnvironmentFile = cfg.environmentFiles; + + # Hardening + DynamicUser = true; + CapabilityBoundingSet = [ + "CAP_NET_RAW" + "CAP_NET_ADMIN" + ]; + AmbientCapabilities = [ + "CAP_NET_RAW" + "CAP_NET_ADMIN" + ]; + DeviceAllow = "/dev/net/tun"; + MemoryDenyWriteExecute = true; + PrivateTmp = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictRealtime = true; + UMask = "0077"; + }; + }; + }; +} diff --git a/pkgs/by-name/er/ergohaven-entropy/package.nix b/pkgs/by-name/er/ergohaven-entropy/package.nix index 22c8bdb8423d..bad66fd33a00 100644 --- a/pkgs/by-name/er/ergohaven-entropy/package.nix +++ b/pkgs/by-name/er/ergohaven-entropy/package.nix @@ -35,16 +35,16 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "ergohaven-entropy"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "ergohaven"; repo = "entropy"; tag = "v${finalAttrs.version}"; - hash = "sha256-ibU379pT0/u6xsIOfgK7KjIlmoyoN9+G3J1T2rYwc44="; + hash = "sha256-+8MuDAGYZuSB/oBiP9pUgDzaRG0tpU8pbtJ5qGZeK9w="; }; - cargoHash = "sha256-e2bLlqH+2Cv4LBV+JooupcXDUe83NmiFI4zPNMTEW3A="; + cargoHash = "sha256-N6VlBT0isBLo/9b1gVOuN/d0GewB5oeanKboYSQQPR0="; __structuredAttrs = true; diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix index 96b66a810569..05c128549e5c 100644 --- a/pkgs/by-name/fa/faugus-launcher/package.nix +++ b/pkgs/by-name/fa/faugus-launcher/package.nix @@ -1,49 +1,60 @@ { + coreutils, fetchFromGitHub, + gamemode, + gawk, + gnugrep, gobject-introspection, + gst_all_1, icoextract, - imagemagick, lib, - libayatana-appindicator, - libcanberra-gtk3, + libadwaita, + libgudev, + libmanette, lsfg-vk, meson, ninja, nix-update-script, python3Packages, umu-launcher, - vulkan-tools, - wrapGAppsHook3, + wrapGAppsHook4, xdg-utils, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "faugus-launcher"; - version = "1.22.8"; + version = "2.0.6"; pyproject = false; src = fetchFromGitHub { owner = "Faugus"; repo = "faugus-launcher"; tag = finalAttrs.version; - hash = "sha256-2FsuD40u5O7VwbziTqhsfVyceyfmSRvdmsizfBy/Xys="; + hash = "sha256-pq5qgerFXZJQNVaNYTOSQjkpr3zKHFFxAH3d/ybCqJI="; }; nativeBuildInputs = [ gobject-introspection meson ninja - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ - libayatana-appindicator - ]; + libadwaita + libmanette + libgudev + ] + ++ (with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gstreamer + ]); dependencies = with python3Packages; [ + dbus-python pillow psutil - pygame pygobject3 requests vdf @@ -59,26 +70,29 @@ python3Packages.buildPythonApplication (finalAttrs: { --replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" ''; - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --suffix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH" + gappsWrapperArgs+=( + --set PYTHONPATH "$out/${python3Packages.python.sitePackages}:$PYTHONPATH" + --set LD_PRELOAD "libgamemode.so:$LD_PRELOAD" + --set LD_LIBRARY_PATH "${lib.getLib gamemode}/lib:$LD_LIBRARY_PATH" --suffix PATH : "${ lib.makeBinPath [ + coreutils + gawk + gnugrep icoextract - imagemagick - libcanberra-gtk3 umu-launcher - vulkan-tools xdg-utils ] }" ) - wrapProgram $out/bin/faugus-launcher ''${makeWrapperArgs[@]} ''; + # has no tests + doCheck = false; + + pythonImportsCheck = [ "faugus" ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/fl/flux9s/package.nix b/pkgs/by-name/fl/flux9s/package.nix index 790c73a0a3d9..55c7b6438426 100644 --- a/pkgs/by-name/fl/flux9s/package.nix +++ b/pkgs/by-name/fl/flux9s/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "flux9s"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "dgunzy"; repo = "flux9s"; tag = "v${finalAttrs.version}"; - hash = "sha256-DpXTWnFjQ023cWEe46Qu+m200vVNnraSq7RNVcr9GxM="; + hash = "sha256-7ZxGzhbEuNZA2eBGOVil6PqbZa4GawBjl0qj4Jeh+18="; }; - cargoHash = "sha256-R3dEHn6XY+6q6kZcp43T/ASGiEIqvtlORRJ9VOgW9f0="; + cargoHash = "sha256-go1HfGDufV/XDhsgHbvTThaHQSlfdLQXx/i6ZqG3h/s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix index 1b721c0119ac..fcdafe3e6f35 100644 --- a/pkgs/by-name/fl/fluxcd-operator/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "flux-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-wx6FI4X5kBtbz1ZWeF35RSNu/FP3y4pfLnnn7ltofRQ="; + hash = "sha256-qY+uxYGkeiffU5UTsh7oVL1Cp8uKMj4/F6+Y62BSUPY="; }; - vendorHash = "sha256-sPAmFrB8Lxedsp1rmmsp2p4at0to7syxK9IR6Geh+ak="; + vendorHash = "sha256-uTj6P6UZtfFf7jBrRZMWJ3HObiSR/tPlFICk6Cw12WQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/fm/fmi-reference-fmus/package.nix b/pkgs/by-name/fm/fmi-reference-fmus/package.nix index 175d114b8844..229aade9b5fe 100644 --- a/pkgs/by-name/fm/fmi-reference-fmus/package.nix +++ b/pkgs/by-name/fm/fmi-reference-fmus/package.nix @@ -10,26 +10,23 @@ # C.f. assert lib.asserts.assertMsg ( - FMIVersion >= 1 && FMIVersion <= 3 -) "FMIVersion must be a valid FMI specification standard: 1, 2, or 3; not ${toString FMIVersion}"; + FMIVersion >= 2 && FMIVersion <= 3 +) "FMIVersion must be a valid FMI specification standard of: 2 or 3; not ${toString FMIVersion}"; -# NB: this derivation does not package the fmusim executables, only -# the FMUs. stdenv.mkDerivation (finalAttrs: { pname = "reference-fmus"; - version = "0.0.39"; + version = "0.0.40"; src = fetchFromGitHub { owner = "modelica"; repo = "reference-fmus"; rev = "v${finalAttrs.version}"; - hash = "sha256-3bjqfEyPhqVrJOHHhniacyUAo82InCd6LLx3tyC8DYg="; + hash = "sha256-GRyvfOncJ6PPQpqxFELlIEZCijcxnSAzbPilmMEwmJQ="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DFMI_VERSION=${toString FMIVersion}" - (lib.cmakeBool "WITH_FMUSIM" false) ]; env = lib.optionalAttrs (FMIVersion == 3) { diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix index 813841875655..b67cd612ef3c 100644 --- a/pkgs/by-name/fz/fzf-git-sh/package.nix +++ b/pkgs/by-name/fz/fzf-git-sh/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "fzf-git-sh"; - version = "0-unstable-2026-07-06"; + version = "0-unstable-2026-08-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf-git.sh"; - rev = "fdf632c53262dfcc44fc09d591e462e9f8fcae83"; - hash = "sha256-3ho7Kn84q36bj9N+Nj+5XEdkXIN4xwYk7h7g/ou3TRM="; + rev = "d5b0a5dcd1e073b8bfca45338d5dfad3e5642471"; + hash = "sha256-j7co9UjWdSMC7Ojyhuz2bIALrucF94o+irF4pJ6hgG4="; }; dontBuild = true; diff --git a/pkgs/by-name/ge/genann/package.nix b/pkgs/by-name/ge/genann/package.nix index 8cc0dedfa7db..5c2ec0f338e2 100644 --- a/pkgs/by-name/ge/genann/package.nix +++ b/pkgs/by-name/ge/genann/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "genann"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "codeplea"; repo = "genann"; rev = "v${finalAttrs.version}"; - sha256 = "0z45ndpd4a64i6jayr4yxfcr5h87bsmhm7lfgnbp35pnfywiclmq"; + sha256 = "sha256-WZuJbCJZXjJE4X6pAcWvlDqHMw3bEdFIBbTvFJNXM04="; }; dontBuild = true; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index c556ff243158..dba05f8df48b 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-yiJqQ+oHXvVC9S78Wj2/xeRMyuD3VA0Wt9gZvzHxNFE="; + hash = "sha256-oPsH9pC8sWSxaVQxL5p+Ok4ed3mOtiVsNvQUH/DfCFk="; }; - vendorHash = "sha256-np5xPpMrJWBRmVU1dJH3wjUZZ0gYRohlSYkk7yrxWWE="; + vendorHash = "sha256-QztH+35KQReYsft50WBZMB0EEBWmQZiSA/mFzsvLSQU="; ldflags = [ "-s" diff --git a/pkgs/by-name/gi/gitlogue/package.nix b/pkgs/by-name/gi/gitlogue/package.nix index d6d1c4853c28..7c992b170e5b 100644 --- a/pkgs/by-name/gi/gitlogue/package.nix +++ b/pkgs/by-name/gi/gitlogue/package.nix @@ -6,21 +6,25 @@ openssl, libgit2, libssh2, + versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "gitlogue"; - version = "0.9.0"; + version = "0.10.0"; + + strictDeps = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "unhappychoice"; repo = "gitlogue"; tag = "v${finalAttrs.version}"; - hash = "sha256-w+5X3NhHCLDXRGQx2JxpIayekMk242uia1bJSRjDDAE="; + hash = "sha256-hmWp22UPcKRjLM6vNDkdWrgkvjO27Ys2xzkx/co8lrE="; }; - cargoHash = "sha256-Ne0dMpQJ2W/JgCXijosqXBr8B6C1XgK4KnOjByckcms="; + cargoHash = "sha256-PfITSo8iTQ1Y3wn/9PD4fsMGF0oRw1f1Xnhki4voqpM="; nativeBuildInputs = [ pkg-config ]; @@ -30,12 +34,26 @@ rustPlatform.buildRustPackage (finalAttrs: { libssh2 ]; + checkFlags = lib.forEach [ + # integration tests + "default_playback_fails_only_after_ui_startup_without_tty" + "default_playback_quits_cleanly_in_pseudo_tty" + "default_playback_with_invalid_theme_fails_before_ui_startup" + "diff_subcommand_reports_no_changes_for_clean_repo" + "diff_subcommand_with_invalid_theme_fails_before_ui_startup" + "diff_subcommand_with_staged_changes_fails_only_after_ui_startup_without_tty" + "diff_subcommand_with_staged_changes_quits_cleanly_in_pseudo_tty" + ] (test: "--skip=${test}"); + env = { OPENSSL_NO_VENDOR = 1; LIBGIT2_NO_VENDOR = 1; LIBSSH2_SYS_USE_PKG_CONFIG = 1; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/go/go-jsonschema/package.nix b/pkgs/by-name/go/go-jsonschema/package.nix index c3dbde804c26..5113e2ea63bc 100644 --- a/pkgs/by-name/go/go-jsonschema/package.nix +++ b/pkgs/by-name/go/go-jsonschema/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "go-jsonschema"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "omissis"; repo = "go-jsonschema"; tag = "v${finalAttrs.version}"; - hash = "sha256-4nQ5sJQnEoOwjfN+8FAnNpc9pnnTM8eKiK6kyl3BbS8="; + hash = "sha256-yxOsZAplHM9sElykebFBMdK+w65EVheBtS4l8Y2VZJw="; }; vendorHash = "sha256-NkqAeSGWVKvIkik4j9wE2O5LV9sDP3RE/B0LilYml7A="; diff --git a/pkgs/by-name/gr/grayjay-frontend/package.nix b/pkgs/by-name/gr/grayjay-frontend/package.nix new file mode 100644 index 000000000000..c04dc044b631 --- /dev/null +++ b/pkgs/by-name/gr/grayjay-frontend/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildNpmPackage, + grayjay, +}: + +buildNpmPackage { + pname = "${grayjay.pname}-frontend"; + + # nixpkgs-update: no auto update + inherit (grayjay) version src; + + sourceRoot = "source/Grayjay.Desktop.Web"; + + __structuredAttrs = true; + strictDeps = true; + npmBuildScript = "build"; + npmDepsHash = "sha256-3yJIPkuEvkFL9Wb4y/r0yEULQbXx/wHqicFBLzOPj68="; + + installPhase = '' + runHook preInstall + cp -r dist/ $out + runHook postInstall + ''; + + meta = { + description = "Grayjay frontend subpackage"; + inherit (grayjay.meta) + homepage + license + maintainers + platforms + ; + }; +} diff --git a/pkgs/by-name/gr/grayjay-libcurlshim/package.nix b/pkgs/by-name/gr/grayjay-libcurlshim/package.nix new file mode 100644 index 000000000000..b25045f21772 --- /dev/null +++ b/pkgs/by-name/gr/grayjay-libcurlshim/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + grayjay, + curl-impersonateFull, +}: + +stdenv.mkDerivation { + pname = "${grayjay.pname}-libcurlshim"; + + # nixpkgs-update: no auto update + inherit (grayjay) version src; + + sourceRoot = "source/curlbind/native"; + + dontConfigure = true; + + __structuredAttrs = true; + strictDeps = true; + separateDebugInfo = true; + buildInputs = [ curl-impersonateFull ]; + buildPhase = '' + runHook preBuild + + $CC -shared -fPIC \ + -I ${lib.getDev curl-impersonateFull}/include \ + "curlshim.c" \ + -o libcurlshim.so \ + -L ${lib.getLib curl-impersonateFull}/lib -lcurl-impersonate + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp libcurlshim.so $out/lib/ + + runHook postInstall + ''; + + meta = { + description = "curl-impersonate shim used by Grayjay"; + inherit (grayjay.meta) + homepage + license + maintainers + platforms + ; + }; +} diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix index 1de247f231af..e7b2a8be22d4 100644 --- a/pkgs/by-name/gr/grayjay/package.nix +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -2,8 +2,11 @@ buildDotnetModule, fetchFromGitLab, dotnetCorePackages, - buildNpmPackage, lib, + ffmpeg, + curl-impersonateFull, + libsodium, + sqlite, libz, icu, openssl, @@ -39,6 +42,8 @@ krb5, wrapGAppsHook3, _experimental-update-script-combinators, + grayjay-frontend, + grayjay-libcurlshim, }: let version = "17"; @@ -51,27 +56,19 @@ let fetchSubmodules = true; fetchLFS = true; }; - frontend = buildNpmPackage { - pname = "grayjay-frontend"; - inherit version src; - - sourceRoot = "source/Grayjay.Desktop.Web"; - - npmBuildScript = "build"; - npmDepsHash = "sha256-3yJIPkuEvkFL9Wb4y/r0yEULQbXx/wHqicFBLzOPj68="; - - installPhase = '' - runHook preInstall - cp -r dist/ $out - runHook postInstall - ''; - }; + getLibrary = + pkg: libnm: + "${lib.getLib pkg}/lib/lib${libnm}${pkg.drvAttrs.stdenv.hostPlatform.extensions.sharedLibrary}"; in buildDotnetModule (finalAttrs: { pname = "grayjay"; - inherit version src frontend; + inherit version src; + frontend = grayjay-frontend; + + __structuredAttrs = true; + strictDeps = true; buildInputs = [ openssl libgbm @@ -84,6 +81,7 @@ buildDotnetModule (finalAttrs: { nss icu krb5 + curl-impersonateFull ]; nativeBuildInputs = [ @@ -135,15 +133,24 @@ buildDotnetModule (finalAttrs: { preBuild = '' rm -r Grayjay.ClientServer/wwwroot/web - cp -r ${frontend} Grayjay.ClientServer/wwwroot/web + cp -r ${grayjay-frontend} Grayjay.ClientServer/wwwroot/web ''; postInstall = '' - chmod +x $out/lib/grayjay/cef/dotcefnative - chmod +x $out/lib/grayjay/ffmpeg - rm $out/lib/grayjay/Portable ln -s /tmp/grayjay-launch $out/lib/grayjay/launch ln -s /tmp/grayjay-cef-launch $out/lib/grayjay/cef/launch + + # Unvendor most stuff + rm -f $out/lib/grayjay/{Portable,ffmpeg,libcurl-impersonate.so,libcurlshim.so,libsodium.so,libe_sqlite3.so,FUTO.Updater.Client} + ln -s ${lib.getExe ffmpeg} $out/lib/grayjay/ffmpeg + ln -s ${getLibrary curl-impersonateFull "curl-impersonate"} $out/lib/grayjay/libcurl-impersonate.so + ln -s ${getLibrary grayjay-libcurlshim "curlshim"} $out/lib/grayjay/libcurlshim.so + ln -s ${getLibrary libsodium "sodium"} $out/lib/grayjay/libsodium.so + ln -s ${getLibrary sqlite "sqlite3"} $out/lib/grayjay/libe_sqlite3.so + + # CEF is still vendored for now + chmod +x $out/lib/grayjay/cef/dotcefnative + mkdir -p $out/share/icons/hicolor/scalable/apps ln -s $out/lib/grayjay/grayjay.png $out/share/icons/hicolor/scalable/apps/grayjay.png ''; @@ -206,8 +213,12 @@ buildDotnetModule (finalAttrs: { maintainers = with lib.maintainers; [ kruziikrel13 samfundev + pandapip1 + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" ]; - platforms = [ "x86_64-linux" ]; mainProgram = "Grayjay"; }; }) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/by-name/hi/highlight/package.nix similarity index 93% rename from pkgs/tools/text/highlight/default.nix rename to pkgs/by-name/hi/highlight/package.nix index 53385e666527..2477c463523e 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/by-name/hi/highlight/package.nix @@ -13,14 +13,17 @@ }: let - self = stdenv.mkDerivation rec { + self = stdenv.mkDerivation (finalAttrs: { pname = "highlight"; version = "4.20"; + strictDeps = true; + __structuredAttrs = true; + src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fMIyMR9RA60hdy1eniJkvLHK+WJPuVehWMyS9Lt6iQ4="; }; @@ -78,7 +81,7 @@ let platforms = lib.platforms.unix; maintainers = [ ]; }; - }; + }); in if stdenv.hostPlatform.isDarwin then self else perl.pkgs.toPerlModule self diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix index 77033747eb46..236bd0ee8d78 100644 --- a/pkgs/by-name/hi/hiredis/package.nix +++ b/pkgs/by-name/hi/hiredis/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiredis"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${finalAttrs.version}"; - hash = "sha256-1qOwuszjiAQLKc7byKw45wVKUSvkTw7HfvRcejbr4OA="; + hash = "sha256-Z5aiwCJ6a5SB0pAtGRtKH31CUA8XBB4hytFFCmENrv4="; }; buildInputs = [ diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix index 25e9c5f44ad9..c086f010657a 100644 --- a/pkgs/by-name/hy/hydrus/package.nix +++ b/pkgs/by-name/hy/hydrus/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "hydrus"; - version = "679"; + version = "681"; pyproject = false; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; tag = "v${finalAttrs.version}"; - hash = "sha256-NIELa4E7l8T1oeF6V0kr1fhS4nj9TSSHAHo0Q3v0GTY="; + hash = "sha256-ZFlYHfWinYTf4aroxMUv5ArXzTwuqtHoqnafgfCJnUg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index c1a5b300893d..9d975df36681 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -42,13 +42,13 @@ gccStdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; tag = finalAttrs.version; - hash = "sha256-4+nW8JJ3CDEPOZZ4p0EZM86h+rAifTuGDZxoFMUI7K0="; + hash = "sha256-RIT425SmLcNb9+va/DrMiU21Gq/gb/obCsd3mEEiXjU="; }; strictDeps = true; diff --git a/pkgs/by-name/im/imgcrypt/package.nix b/pkgs/by-name/im/imgcrypt/package.nix index 74dd378b3d15..c84d002ba06f 100644 --- a/pkgs/by-name/im/imgcrypt/package.nix +++ b/pkgs/by-name/im/imgcrypt/package.nix @@ -6,18 +6,18 @@ buildGoModule (finalAttrs: { pname = "imgcrypt"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "containerd"; repo = "imgcrypt"; rev = "v${finalAttrs.version}"; - hash = "sha256-xHL+vxjGkjkDCEHMVOQsT6uokZq50iFAqGyDj6dDuG4="; + hash = "sha256-nr5M+xbu7TY9zZEBXmIAErIUZuOk0rxMIVrPdFMrg8s="; }; modRoot = "cmd"; - vendorHash = "sha256-tTRYEvqhQm1XpSvXDDXEx5piZYOxAtmcjf2dLL9fGck="; + vendorHash = "sha256-PuubaNqPHSVWqavV5oTNDn6ZiQDGoGnkAN9HS3JAcdA="; ldflags = [ "-X github.com/containerd/containerd/version.Version=${finalAttrs.version}" diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index 6e5b4e15de90..d034dbc700cd 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inlyne"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Inlyne-Project"; repo = "inlyne"; rev = "v${finalAttrs.version}"; - hash = "sha256-bUM9Mn/C9l6s6ucoLRo25m4PbbW3gp5d3AvO/9GTJcI="; + hash = "sha256-ciQcM7JkrCbb5volFovV8JJSpup1jWC2ah2GZ13YT+Q="; }; - cargoHash = "sha256-IaaojW5PYSUwyh1iv2HrDidIV8keEykKHY61rpcCAPc="; + cargoHash = "sha256-03giGUoBvb9y00fflt4cEgllljPXXt21ZHzxndPTOm0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix index 7ea5aa5d8e93..2051f6796f67 100644 --- a/pkgs/by-name/ip/ipatool/package.nix +++ b/pkgs/by-name/ip/ipatool/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "ipatool"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "majd"; repo = "ipatool"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZGy7Oxpjb5ONe//ImAN3bQwl+G9udvaf9V7heLq625c="; + hash = "sha256-jIdjTDs/g41j805vkC1PqLvChtzB055JYmd4GbEHNZU="; }; - vendorHash = "sha256-PZDlJIIW+teFu6XuaTLB5eHHSeVJMUVAuq/StvyIVlc="; + vendorHash = "sha256-HNus5wZUmiuVVdDj4i9X9sO8iyccrq4h//s0zkQNYjY="; # Fixes "import lookup disabled by -mod=vendor" for onepassword-sdk-go on macOS proxyVendor = true; diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix index a7a958462c4b..e7f958a0525e 100644 --- a/pkgs/by-name/jf/jfrog-cli/package.nix +++ b/pkgs/by-name/jf/jfrog-cli/package.nix @@ -9,17 +9,17 @@ buildGoModule (finalAttrs: { pname = "jfrog-cli"; - version = "2.116.0"; + version = "2.118.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-/iB85WdSjVJCvsMileAO1YmuxOIIO3wOUaQl0IkmHzU="; + hash = "sha256-RkrD0VLEAWbaDbyROfQ7SiqC3VhUJEGjfLD/7enX/28="; }; proxyVendor = true; - vendorHash = "sha256-lll0Cr4f2ZQaXY/YnxAe+piSPaCYf5VitCyVWUb4240="; + vendorHash = "sha256-jZtHZ/uIC8NNXr2scuMrdkFAYIhNMxcayVsr3Y7flr8="; checkFlags = "-skip=^(TestReleaseBundle|TestVisibilitySendUsage_RtCurl_E2E)"; diff --git a/pkgs/by-name/ji/jiratui/package.nix b/pkgs/by-name/ji/jiratui/package.nix index 32fd8ae9dfaf..c13b36c983ac 100644 --- a/pkgs/by-name/ji/jiratui/package.nix +++ b/pkgs/by-name/ji/jiratui/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "jiratui"; - version = "1.11.2"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "whyisdifficult"; repo = "jiratui"; tag = "v${finalAttrs.version}"; - hash = "sha256-QxYMaTM6/LmecaBBBNz6wghr3IAF4CyvDDGopdNpzmA="; + hash = "sha256-c+ycttouo6LZr1jaJ9lrS2aAODfsTRNhxyL4o4nqc/c="; }; postPatch = '' diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix index 32d230fdbfee..bc5a4182a5e4 100644 --- a/pkgs/by-name/ki/kin-openapi/package.nix +++ b/pkgs/by-name/ki/kin-openapi/package.nix @@ -5,14 +5,14 @@ }: buildGoModule (finalAttrs: { pname = "kin-openapi"; - version = "0.145.0"; + version = "0.146.0"; vendorHash = "sha256-uprdzJnaxd1UyEdZFFPvmo2Xu/QXJdheC1eqkyKY9Zc="; src = fetchFromGitHub { owner = "getkin"; repo = "kin-openapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-lM+W1qgpvtEgOUQcKxUtsXawLnam6CkXOmX/BKkOyL4="; + hash = "sha256-RvZc0NYp7fj486Ayhk3frowPNAoWxuoMPMmUY3rXNlA="; }; checkFlags = diff --git a/pkgs/by-name/la/lakefs/package.nix b/pkgs/by-name/la/lakefs/package.nix index bfde608e4e2c..47d3b848c0ca 100644 --- a/pkgs/by-name/la/lakefs/package.nix +++ b/pkgs/by-name/la/lakefs/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "lakefs"; - version = "1.84.1"; + version = "1.85.0"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-l9UxuiGiVaI8lxJfpvLlsphX13eEb+OP0colVAPmB78="; + hash = "sha256-SaqLfWB1bm3Rg0nGESnQzyi3IfPUHlLk83ES6IewzHw="; }; webui = buildNpmPackage { diff --git a/pkgs/by-name/li/libgig/package.nix b/pkgs/by-name/li/libgig/package.nix index af935114ac84..e64fb641f145 100644 --- a/pkgs/by-name/li/libgig/package.nix +++ b/pkgs/by-name/li/libgig/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libgig"; - version = "4.5.2"; + version = "4.6.0"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-yivozl4JafkMLfduA9SZ9eJ/tQIe28WH3hgv8n6O/d0="; + sha256 = "sha256-/DMSAiEJGeMXLE02qyQjHeo2Z9hyIUHwx5OcpUURnQE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix index 327c21205901..a3fd7a9e02d3 100644 --- a/pkgs/by-name/li/libxmp/package.nix +++ b/pkgs/by-name/li/libxmp/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxmp"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "libxmp"; repo = "libxmp"; tag = "libxmp-${finalAttrs.version}"; - hash = "sha256-X+oIXTwlrLEl3n8gu5+LlNfIOBkZ02hiivrjTgVrqRk="; + hash = "sha256-0no+WT5cLDDtoRO5GKlsx9BLrv4n2JvDr9Dky0yNOsk="; }; outputs = [ diff --git a/pkgs/by-name/ll/llmfit/package.nix b/pkgs/by-name/ll/llmfit/package.nix index 67c002a452f0..94f1e81b85dc 100644 --- a/pkgs/by-name/ll/llmfit/package.nix +++ b/pkgs/by-name/ll/llmfit/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "llmfit"; - version = "1.1.6"; + version = "1.1.8"; src = fetchFromGitHub { owner = "AlexsJones"; repo = "llmfit"; tag = "v${finalAttrs.version}"; - hash = "sha256-960EP+2kuC1lV3VCjNVsIU5DC3FHT87cOc8SC+dQWE4="; + hash = "sha256-6mARQqRsPtsN0WAp4oKqG1jl062BqDJ1D9AZBLomel8="; }; - cargoHash = "sha256-WXPAnFBlP2kAPtVdzbBToNOBYqN62Lf4eKJVd3Wbx+Q="; + cargoHash = "sha256-iUh9VBtDfuil96av1I5XlO/mZ/Q9HccBJitBfJ+i69A="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index 8fbbe71bcc91..529bc176d27e 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lockbook-desktop"; - version = "26.7.23"; + version = "26.8.4"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-LG6qeFzD1ThBFKfFjy/U012p5DH5FEojQ9W4K+ZA7/o="; + hash = "sha256-ge6uo54T6sWYn4z2fE3teelkTofSLjMPeBGJ84a6N5c="; }; - cargoHash = "sha256-syBXLJISsok1hL4vpBforanVi9F0NI90pRslrxRuuL4="; + cargoHash = "sha256-KPRlvkhHGiYPTOzNoZ3nDmyJ0VmMESTSLpGvQl+I6Oo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix index 59cb7d7891ee..574ebd869266 100644 --- a/pkgs/by-name/ma/mailpit/source.nix +++ b/pkgs/by-name/ma/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.30.5"; - hash = "sha256-Iw5lTBREiFJ8M4igxv729gV8o9Sp2dqdpd48369cv3c="; - npmDepsHash = "sha256-aJmcVMZmVM3QJ6Jh5Kf5efDQVqm+W3qvKwxb3FRDbQ8="; - vendorHash = "sha256-o0svdQvYvTAsplFlP2aOChC2JC1mnzJM1QTyu8HcZjI="; + version = "1.30.6"; + hash = "sha256-XB88EPRfZAcseYvPWsJSuI5FEtbH9VYTg6TuSh503uQ="; + npmDepsHash = "sha256-BgNbQ+hH04GOQllXm0/K0v7YM2DoKE/KXLR6z9p2Bso="; + vendorHash = "sha256-2HPXdCuFAg5AR0hLPlKdzxlkJL6XOdBjZPU+x66wtDE="; } diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 08d1c5b78743..d8e6c26748b8 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-4z+u1IM2pclccv9+IH8IWjCodDxWZmffbqWPC726sIg="; + hash = "sha256-vy9eZYtlAMPXh+xvgAOEeJd7jZirX5Y4sXmNbYLBYGI="; }; - cargoHash = "sha256-HQU0zaK7rLJnTX5WVZrqNEaT5HfFLDzs+pHRxx5XTaA="; + cargoHash = "sha256-3MDbg+vfLIqSDiRqBVZs2zbrg9UUpe4Vx+Ze656yOdE="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; diff --git a/pkgs/by-name/ma/matterircd/package.nix b/pkgs/by-name/ma/matterircd/package.nix index 8fec83348474..9167d6b50510 100644 --- a/pkgs/by-name/ma/matterircd/package.nix +++ b/pkgs/by-name/ma/matterircd/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "matterircd"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-W00q5bRzCXl9R56xGol1bWYeW5w5MUpcoraKVaKimyk="; + sha256 = "sha256-ZlWXPyAK/Z8u3RHp/BwjhkAHT2VFzU1+G9SKGgRf6n8="; }; vendorHash = null; diff --git a/pkgs/by-name/mo/monotone/botan2.nix b/pkgs/by-name/mo/monotone/botan2.nix deleted file mode 100644 index e97561f0a058..000000000000 --- a/pkgs/by-name/mo/monotone/botan2.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkgsStatic, - python3, - docutils, - bzip2, - zlib, - darwin, - static ? stdenv.hostPlatform.isStatic, # generates static libraries *only* - enableForMonotone ? false, # Is it being imported for Monotone use? -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "botan"; - version = "2.19.5"; - - __structuredAttrs = true; - enableParallelBuilding = true; - strictDeps = true; - - outputs = [ - "bin" - "out" - "dev" - "doc" - "man" - ]; - - src = fetchurl { - url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz"; - hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; - }; - - postPatch = '' - sed -e '1i#include ' -i src/cli/cli.h - ''; - - nativeBuildInputs = [ - python3 - docutils - ]; - - buildInputs = [ - bzip2 - zlib - ]; - - buildTargets = [ - "cli" - ] - ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ] - ++ lib.optionals static [ "static" ] - ++ lib.optionals (!static) [ "shared" ]; - - botanConfigureFlags = [ - "--prefix=${placeholder "out"}" - "--bindir=${placeholder "bin"}/bin" - "--docdir=${placeholder "doc"}/share/doc" - "--mandir=${placeholder "man"}/share/man" - "--no-install-python-module" - "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}" - "--with-bzip2" - "--with-zlib" - "--with-rst2man" - "--cpu=${stdenv.hostPlatform.parsed.cpu.name}" - ] - ++ lib.optionals stdenv.cc.isClang [ - "--cc=clang" - ] - ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ - "--os=mingw" - ]; - - configurePhase = '' - runHook preConfigure - python configure.py ''${botanConfigureFlags[@]} - runHook postConfigure - ''; - - preInstall = '' - if [ -d src/scripts ]; then - patchShebangs src/scripts - fi - ''; - - postInstall = '' - cd "$out"/lib/pkgconfig - ln -s botan-*.pc botan.pc || true - ''; - - doCheck = true; - - meta = { - description = "Cryptographic algorithms library"; - homepage = "https://botan.randombit.net"; - mainProgram = "botan"; - maintainers = with lib.maintainers; [ - raskin - ]; - platforms = lib.platforms.unix; - license = lib.licenses.bsd2; - knownVulnerabilities = lib.optional ( - !enableForMonotone - ) "Botan2 is EOL and its full interface surface contains unpatched vulnerabilities"; - }; -}) diff --git a/pkgs/by-name/mo/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch b/pkgs/by-name/mo/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch deleted file mode 100644 index 1ecda436c251..000000000000 --- a/pkgs/by-name/mo/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 70f209ad582121750d54e3692b1e62c7f36af6f9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 7 May 2018 14:09:06 +0200 -Subject: [PATCH] Adapt to changes in pcre-8.42 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -pcre-8.42 replaced internal real_pcre with real_pcre8_or_16. This -broke monotone that decided not to use the public "pcre" type. - -This patch adapts monotone to the pcre >= 8.42. - -Signed-off-by: Petr Písař ---- - src/pcrewrap.cc | 4 ++-- - src/pcrewrap.hh | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/pcrewrap.cc b/src/pcrewrap.cc -index 8c0c9d1..30bafff 100644 ---- a/src/pcrewrap.cc -+++ b/src/pcrewrap.cc -@@ -74,7 +74,7 @@ get_capturecount(void const * bd) - namespace pcre - { - typedef map > -+ pair > - regex_cache; - - class regex_cache_manager -@@ -86,7 +86,7 @@ public: - } - - void store(char const * pattern, -- pair -+ pair - data) - { - cache[pattern] = data; -diff --git a/src/pcrewrap.hh b/src/pcrewrap.hh -index 3359cdd..5008e88 100644 ---- a/src/pcrewrap.hh -+++ b/src/pcrewrap.hh -@@ -18,7 +18,7 @@ - // definitions and so we don't actually expose it here. Unfortunately, this - // means we have to hope this pair of forward declarations will not change... - --struct real_pcre; -+struct real_pcre8_or_16; - struct pcre_extra; - - namespace pcre -@@ -61,7 +61,7 @@ namespace pcre - regex & operator=(regex const &); - - // data -- struct real_pcre const * basedat; -+ struct real_pcre8_or_16 const * basedat; - struct pcre_extra const * extradat; - - // used by constructors --- -2.14.3 - diff --git a/pkgs/by-name/mo/monotone/monotone-1.1-adapt-to-botan2.patch b/pkgs/by-name/mo/monotone/monotone-1.1-adapt-to-botan2.patch deleted file mode 100644 index 1df6a4717d5a..000000000000 --- a/pkgs/by-name/mo/monotone/monotone-1.1-adapt-to-botan2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Botan2 has switched the parameter order in encryption descriptions - ---- monotone-upstream/src/botan_glue.hh 2021-08-17 19:06:32.736753732 +0200 -+++ monotone-patched/src/botan_glue.hh 2021-08-17 19:07:44.437750535 +0200 -@@ -45,7 +45,9 @@ - // In Botan revision d8021f3e (back when it still used monotone) the name - // of SHA-1 changed to SHA-160. - const static char * PBE_PKCS5_KEY_FORMAT = --#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0) -+#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(2,0,0) -+ "PBE-PKCS5v20(TripleDES/CBC,SHA-160)"; -+#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0) - "PBE-PKCS5v20(SHA-160,TripleDES/CBC)"; - #else - "PBE-PKCS5v20(SHA-1,TripleDES/CBC)"; diff --git a/pkgs/by-name/mo/monotone/monotone-base64-error-reporting.patch b/pkgs/by-name/mo/monotone/monotone-base64-error-reporting.patch new file mode 100644 index 000000000000..7d1d911bf0ec --- /dev/null +++ b/pkgs/by-name/mo/monotone/monotone-base64-error-reporting.patch @@ -0,0 +1,13 @@ +Error reporting of broken Base64 has changed + +--- mtn-src/test/func/schema_migration_error_recovery/__driver__.lua 2026-08-05 21:39:46.432609427 +0200 ++++ mtn-src/test/func/schema_migration_error_recovery/__driver__.lua 2026-08-05 21:40:07.650450675 +0200 +@@ -15,7 +15,7 @@ + + -- migrate_files_BLOB + test_one("bad_base64", "1db80c7cee8fa966913db1a463ed50bf1b0e5b0e", +- "invalid base64 character") ++ "base64 decode: invalid character") + test_one("tmp_in_the_way", "1db80c7cee8fa966913db1a463ed50bf1b0e5b0e", + "already another table") + test_one("column_missing", "1db80c7cee8fa966913db1a463ed50bf1b0e5b0e", diff --git a/pkgs/by-name/mo/monotone/monotone-botan-error-reporting.patch b/pkgs/by-name/mo/monotone/monotone-botan-error-reporting.patch new file mode 100644 index 000000000000..395538ca24f9 --- /dev/null +++ b/pkgs/by-name/mo/monotone/monotone-botan-error-reporting.patch @@ -0,0 +1,17 @@ +Botan3 no longer adds the prefixes that Monotone tries to clear + +--- mtn-src/src/transforms.cc 2026-08-05 21:59:22.344598683 +0200 ++++ mtn-src/src/transforms.cc 2026-08-05 21:59:52.318528753 +0200 +@@ -67,12 +67,7 @@ + || typeid(e) == typeid(Botan::Invalid_Argument) + || typeid(e) == typeid(Botan::Integrity_Failure)) + { +- // clean up the what() string a little: throw away the +- // "botan: TYPE: " part... + string w(e.what()); +- string::size_type pos = w.find(':'); +- pos = w.find(':', pos+1); +- w = string(w.begin() + pos + 2, w.end()); + + // ... downcase the rest of it and replace underscores with spaces. + for (string::iterator p = w.begin(); p != w.end(); p++) diff --git a/pkgs/by-name/mo/monotone/monotone-botan-key-format.patch b/pkgs/by-name/mo/monotone/monotone-botan-key-format.patch new file mode 100644 index 000000000000..ddf356a261d2 --- /dev/null +++ b/pkgs/by-name/mo/monotone/monotone-botan-key-format.patch @@ -0,0 +1,12 @@ +Botan2 has switched the parameter order in encryption descriptions +--- monotone-upstream/src/botan_glue.hh 2026-08-05 16:03:52.756485699 +0200 ++++ monotone-upstream/src/botan_glue.hh 2026-08-05 16:05:29.735127399 +0200 +@@ -38,7 +38,7 @@ + // In Botan revision d8021f3e (back when it still used monotone) the name + // of SHA-1 changed to SHA-160. + const static char * PBE_PKCS5_KEY_FORMAT = +- "PBE-PKCS5v20(SHA-160,TripleDES/CBC)"; ++ "PBE-PKCS5v20(TripleDES/CBC,SHA-1)"; + + + typedef Botan::secure_vector secure_byte_vector; diff --git a/pkgs/by-name/mo/monotone/monotone-pcre2.patch b/pkgs/by-name/mo/monotone/monotone-pcre2.patch new file mode 100644 index 000000000000..ca0756e64143 --- /dev/null +++ b/pkgs/by-name/mo/monotone/monotone-pcre2.patch @@ -0,0 +1,482 @@ +Switch to PCRE2 + +--- mtn-src/m4/library.m4 2026-08-05 23:04:45.393285992 +0200 ++++ mtn-src/m4/library.m4 2026-08-05 23:04:53.120785844 +0200 +@@ -216,42 +216,20 @@ + ]) + ]) + +-AC_DEFUN([MTN_FIND_PCRE], +-[MTN_CHECK_MODULE([pcre], [7.4], ++AC_DEFUN([MTN_FIND_PCRE2], ++[MTN_CHECK_MODULE([pcre2-8], [7.4], + [AC_LANG_PROGRAM( +- [#include +- #if PCRE_MAJOR < 7 || (PCRE_MAJOR == 7 && PCRE_MINOR < 4) +- #error out of date +- #endif], ++ [#define PCRE2_CODE_UNIT_WIDTH 8 ++ #include ++ ], + [const char *e; + int dummy; + int o; + /* Make sure some definitions are present. */ +- dummy = PCRE_NEWLINE_CR; +- dummy = PCRE_DUPNAMES; +- pcre *re = pcre_compile("foo", 0, &e, &o, 0);]) ++ dummy = PCRE2_NEWLINE_CR; ++ dummy = PCRE2_DUPNAMES; ++ pcre2_code *re = pcre2_compile("foo", 0, &e, &o, 0);]) + ]) +- save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $pcre_CFLAGS" +- AC_CACHE_CHECK([if pcre.h uses real_pcre8_or_16], mtn_ac_cv_pcre_uses_8_or_16, +- [ +- AC_LANG_PUSH([C++]) +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [#include ], +- [const char *e; +- int o; +- struct real_pcre8_or_16 *re = pcre_compile("foo", 0, &e, &o, 0);]) +- ], +- [mtn_ac_cv_pcre_uses_8_or_16=yes], +- [mtn_ac_cv_pcre_uses_8_or_16=no])] +- ) +- AC_LANG_POP([C++]) +- if test $mtn_ac_cv_pcre_uses_8_or_16 = yes; then +- AC_DEFINE_UNQUOTED(PCRE_USES_8_OR_16, 1, +- [Define if uses real_pcre8_or_16. ]) +- fi +- CPPFLAGS="$save_CPPFLAGS" + ]) + + AC_DEFUN([MTN_FIND_SQLITE], + +--- mtn-src/src/mt_version.cc 2026-08-05 23:49:07.580588987 +0200 ++++ mtn-src/src/mt_version.cc 2026-08-05 23:52:24.163973748 +0200 +@@ -21,8 +21,9 @@ + /* Include third party headers needed for version info */ + #include + #include +-// Lua assumed included by lua.hh +-#include ++ ++#define PCRE2_CODE_UNIT_WIDTH 8 ++#include + + #include "app_state.hh" + #include "lua.hh" +@@ -55,6 +56,8 @@ + get_version(base_version); + string flavour; + get_system_flavour(flavour); ++ char pcre_version [128]; ++ pcre2_config(PCRE2_CONFIG_VERSION, pcre_version); + out = (F("%s\n" + "Running on : %s\n" + "C++ compiler : %s\n" +@@ -72,7 +75,7 @@ + % BOOST_LIB_VERSION + % sqlite3_libversion() % SQLITE_VERSION + % LUA_VERSION +- % pcre_version() % PCRE_MAJOR % PCRE_MINOR ++ % pcre_version % PCRE2_MAJOR % PCRE2_MINOR + % Botan::version_major() % Botan::version_minor() % Botan::version_patch() + % BOTAN_VERSION_MAJOR % BOTAN_VERSION_MINOR % BOTAN_VERSION_PATCH + % string(package_full_revision_constant)) + +--- mtn-src/src/pcrewrap.hh 2026-08-05 23:49:09.600171041 +0200 ++++ mtn-src/src/pcrewrap.hh 2026-08-06 00:39:53.759161556 +0200 +@@ -18,12 +18,8 @@ + // definitions and so we don't actually expose it here. Unfortunately, this + // means we have to hope this pair of forward declarations will not change... + +-#if PCRE_USES_8_OR_16 +-#define real_pcre real_pcre8_or_16 +-#endif +- +-struct real_pcre; +-struct pcre_extra; ++struct pcre2_real_code_8; ++struct pcre2_real_match_context_8; + + namespace pcre + { +@@ -65,8 +61,8 @@ + regex & operator=(regex const &); + + // data +- struct real_pcre const * basedat; +- struct pcre_extra const * extradat; ++ const struct pcre2_real_code_8 * basedat; ++ struct pcre2_real_match_context_8 * extradat; + + // used by constructors + void init(char const *, pcre::flags); + +--- mtn-src/src/pcrewrap.cc 2026-08-05 23:51:00.236884698 +0200 ++++ mtn-src/src/pcrewrap.cc 2026-08-06 01:23:14.728332978 +0200 +@@ -15,11 +15,8 @@ + #include + #include + +-// This dirty trick is necessary to prevent the 'pcre' typedef defined by +-// pcre.h from colliding with namespace pcre. +-#define pcre pcre_t +-#include "pcre.h" +-#undef pcre ++#define PCRE2_CODE_UNIT_WIDTH 8 ++#include "pcre2.h" + + using std::make_pair; + using std::map; +@@ -27,10 +24,9 @@ + using std::string; + using std::vector; + +-static NORETURN(void pcre_compile_error(int errcode, char const * err, +- int erroff, char const * pattern, ++static NORETURN(void pcre_compile_error(int errcode, PCRE2_UCHAR8 const * err, ++ size_t erroff, char const * pattern, + origin::type caused_by)); +-static NORETURN(void pcre_study_error(char const * err, char const * pattern)); + static NORETURN(void pcre_exec_error(int errcode, + origin::type subject_from)); + +@@ -38,11 +34,10 @@ + flags_to_internal(pcre::flags f) + { + using namespace pcre; +-#define C(f_, x) (((f_) & (x)) ? PCRE_##x : 0) ++#define C(f_, x) (((f_) & (x)) ? PCRE2_##x : 0) + unsigned int i = 0; +- i |= C(f, NEWLINE_CR); +- i |= C(f, NEWLINE_LF); +- // NEWLINE_CRLF == NEWLINE_CR|NEWLINE_LF and so is handled above ++ // NEWLINE configuration is more complicated in PCRE2 ++ // Nothing in Monotone seems to use it + i |= C(f, ANCHORED); + i |= C(f, NOTBOL); + i |= C(f, NOTEOL); +@@ -63,8 +58,8 @@ + get_capturecount(void const * bd) + { + unsigned int cc; +- int err = pcre_fullinfo(static_cast(bd), 0, +- PCRE_INFO_CAPTURECOUNT, ++ int err = pcre2_pattern_info(static_cast(bd), ++ PCRE2_INFO_CAPTURECOUNT, + static_cast(&cc)); + I(err == 0); + return cc; +@@ -73,7 +68,7 @@ + namespace pcre + { + typedef map > ++ pair > + regex_cache; + + class regex_cache_manager +@@ -85,7 +80,7 @@ + } + + void store(char const * pattern, +- pair ++ pair + data) + { + cache[pattern] = data; +@@ -103,10 +98,10 @@ + ++iter) + { + if (iter->second.first) +- pcre_free(const_cast(iter->second.first)); ++ pcre2_code_free(const_cast(iter->second.first)); + + if (iter->second.second) +- pcre_free(const_cast(iter->second.second)); ++ pcre2_match_context_free(const_cast(iter->second.second)); + } + } + private: +@@ -118,8 +113,9 @@ + void regex::init(char const * pattern, flags options) + { + int errcode; +- int erroff; +- char const * err; ++ size_t erroff; ++ const int err_msg_max = 2048; ++ PCRE2_UCHAR8 err[err_msg_max+1]; + // use the cached data if we have it + regex_cache::const_iterator iter = compiled.find(pattern); + if (iter != compiled.end()) +@@ -129,29 +125,23 @@ + return; + } + // not in cache - compile them then store in cache +- basedat = pcre_compile2(pattern, flags_to_internal(options), +- &errcode, &err, &erroff, 0); +- if (!basedat) ++ basedat = pcre2_compile((PCRE2_UCHAR8*)pattern, PCRE2_ZERO_TERMINATED, ++ flags_to_internal(options), ++ &errcode, &erroff, 0); ++ if (!basedat) { ++ pcre2_get_error_message(errcode, err, err_msg_max); + pcre_compile_error(errcode, err, erroff, pattern, made_from); +- +- pcre_extra *ed = pcre_study(basedat, 0, &err); +- if (err) +- pcre_study_error(err, pattern); +- if (!ed) +- { +- // I resent that C++ requires this cast. +- ed = (pcre_extra *)pcre_malloc(sizeof(pcre_extra)); +- std::memset(ed, 0, sizeof(pcre_extra)); +- } ++ } + + // We set a fairly low recursion depth to avoid stack overflow. +- // Per pcrestack(3), one should assume 500 bytes per recursion; ++ // Per pcre2api(3), it should be a few hundreds bytes per call. + // it should be safe to let pcre have a megabyte of stack, so + // that's a depth of 2000, give or take. (For reference, the + // default stack limit on Linux is 8MB.) +- ed->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION; +- ed->match_limit_recursion = 2000; ++ pcre2_match_context * ed = pcre2_match_context_create(NULL); ++ pcre2_set_depth_limit(ed, 2000); + extradat = ed; ++ + // store in cache + compiled.store(pattern, make_pair(basedat, extradat)); + } +@@ -176,12 +166,15 @@ + regex::match(string const & subject, origin::type subject_origin, + flags options) const + { +- int rc = pcre_exec(basedat, extradat, +- subject.data(), subject.size(), +- 0, flags_to_internal(options), 0, 0); +- if (rc == 0) ++ pcre2_match_data * matchdata = pcre2_match_data_create_from_pattern(basedat, NULL); ++ int rc = pcre2_match(basedat, ++ (PCRE2_UCHAR8*)subject.data(), subject.size(), ++ 0, flags_to_internal(options), ++ matchdata, extradat); ++ pcre2_match_data_free(matchdata); ++ if (rc > 0) + return true; +- else if (rc == PCRE_ERROR_NOMATCH) ++ else if (rc == PCRE2_ERROR_NOMATCH || rc == 0) + return false; + else + pcre_exec_error(rc, subject_origin); +@@ -193,51 +186,49 @@ + { + matches.clear(); + +- // retrieve the capture count of the pattern from pcre_fullinfo, +- // because pcre_exec might not signal trailing unmatched subpatterns ++ // retrieve the capture count of the pattern from pcre2_pattern_info, ++ // because pcre2_match might not signal trailing unmatched subpatterns + // i.e. if "abc" matches "(abc)(de)?", the match count is two, not + // the expected three +- int cap_count = 0; +- int rc = pcre_fullinfo(basedat, extradat, PCRE_INFO_CAPTURECOUNT, &cap_count); +- I(rc == 0); ++ size_t cap_count = get_capturecount(basedat); + + // the complete regex is captured as well + cap_count += 1; + + int worksize = cap_count * 3; + +- // "int ovector[worksize]" is C99 only (not valid C++, but allowed by gcc/clang) +- // boost::shared_array is I think not plannned to be part of C++0x +- class xyzzy { +- int *data; +- public: +- xyzzy(int len) : data(new int[len]) {} +- ~xyzzy() { delete[] data; } +- operator int*() { return data; } +- } ovector(worksize); +- +- rc = pcre_exec(basedat, extradat, +- subject.data(), subject.size(), +- 0, flags_to_internal(options), ovector, worksize); ++ pcre2_match_data * matchdata = pcre2_match_data_create_from_pattern(basedat, NULL); ++ int rc = pcre2_match(basedat, ++ (PCRE2_UCHAR8*)subject.data(), subject.size(), ++ 0, flags_to_internal(options), ++ matchdata, extradat); + + // since we dynamically set the work size, we should + // always get either a negative (error) or >= 1 match count + I(rc != 0); + +- if (rc == PCRE_ERROR_NOMATCH) ++ if (rc == PCRE2_ERROR_NOMATCH) + return false; + else if (rc < 0) + pcre_exec_error(rc, subject_origin); // throws + +- for (int i=0; i < cap_count; ++i) ++ PCRE2_SIZE * ovector = pcre2_get_ovector_pointer(matchdata); ++ size_t ovector_size = pcre2_get_ovector_count(matchdata); ++ ++ for (size_t i=0; i < cap_count; ++i) + { + string match; ++ ++ //enough captures ++ if(i ovector[2*i]) + match.assign(subject, ovector[2*i], ovector[2*i+1] - ovector[2*i]); + matches.push_back(match); + } + ++ pcre2_match_data_free(matchdata); ++ + return true; + } + } // namespace pcre +@@ -245,39 +236,30 @@ + // When the library returns an error, these functions discriminate between + // bugs in monotone and user errors in regexp writing. + static void +-pcre_compile_error(int errcode, char const * err, +- int erroff, char const * pattern, ++pcre_compile_error(int errcode, PCRE2_UCHAR8 const * err, ++ size_t erroff, char const * pattern, + origin::type caused_by) + { +- // One of the more entertaining things about the PCRE API is that +- // while the numeric error codes are documented, they do not get +- // symbolic names. +- + switch (errcode) + { +- case 21: // failed to get memory ++ case PCRE2_ERROR_NOMEMORY: // failed to get memory + throw std::bad_alloc(); + +- case 10: // [code allegedly not in use] +- case 11: // internal error: unexpected repeat +- case 16: // erroffset passed as NULL +- case 17: // unknown option bit(s) set +- case 19: // [code allegedly not in use] +- case 23: // internal error: code overflow +- case 33: // [code allegedly not in use] +- case 50: // [code allegedly not in use] +- case 52: // internal error: overran compiling workspace +- case 53: // internal error: previously-checked referenced subpattern +- // not found ++ case PCRE2_ERROR_INTERNAL_UNEXPECTED_REPEAT: ++ case PCRE2_ERROR_NULL_ERROROFFSET: ++ case PCRE2_ERROR_BAD_OPTIONS: ++ case PCRE2_ERROR_INTERNAL_CODE_OVERFLOW: ++ case PCRE2_ERROR_INTERNAL_OVERRAN_WORKSPACE: ++ case PCRE2_ERROR_INTERNAL_MISSING_SUBPATTERN: + throw oops((F("while compiling regex '%s': %s") % pattern % err) + .str().c_str()); + + default: + // PCRE fails to distinguish between errors at no position and errors at + // character offset 0 in the pattern, so in practice we give the +- // position-ful variant for all errors, but I'm leaving the == -1 check +- // here in case PCRE gets fixed. +- E(false, caused_by, (erroff == -1 ++ // position-ful variant for all errors, ++ // and now PCRE2 uses unsigned so the API mistake is unfixable ++ E(false, caused_by, (erroff == ((size_t) -1) + ? (F("error in regex '%s': %s") + % pattern % err) + : (F("error near char %d of regex '%s': %s") +@@ -287,18 +269,6 @@ + } + + static void +-pcre_study_error(char const * err, char const * pattern) +-{ +- // This interface doesn't even *have* error codes. +- // If the error is not out-of-memory, it's a bug. +- if (!std::strcmp(err, "failed to get memory")) +- throw std::bad_alloc(); +- else +- throw oops((F("while studying regex '%s': %s") % pattern % err) +- .str().c_str()); +-} +- +-static void + pcre_exec_error(int errcode, + origin::type subject_from) + { +@@ -306,26 +276,55 @@ + // But it doesn't provide string versions of them. As most of them + // indicate bugs in monotone, it's not worth defining our own strings. + ++ const int err_msg_max = 2048; ++ PCRE2_UCHAR8 err[err_msg_max+1]; ++ ++ pcre2_get_error_message(errcode, err, err_msg_max); ++ + switch(errcode) + { +- case PCRE_ERROR_NOMEMORY: ++ case PCRE2_ERROR_NOMEMORY: + throw std::bad_alloc(); + +- case PCRE_ERROR_MATCHLIMIT: ++ case PCRE2_ERROR_MATCHLIMIT: + E(false, subject_from, + F("backtrack limit exceeded in regular expression matching")); + +- case PCRE_ERROR_RECURSIONLIMIT: ++ case PCRE2_ERROR_DEPTHLIMIT: ++ E(false, subject_from, ++ F("depth limit exceeded in regular expression matching")); ++ ++ case PCRE2_ERROR_JIT_STACKLIMIT: + E(false, subject_from, +- F("recursion limit exceeded in regular expression matching")); ++ F("JIT stack limit exceeded in regular expression matching")); + +- case PCRE_ERROR_BADUTF8: +- case PCRE_ERROR_BADUTF8_OFFSET: ++ case PCRE2_ERROR_UTF8_ERR1: ++ case PCRE2_ERROR_UTF8_ERR2: ++ case PCRE2_ERROR_UTF8_ERR3: ++ case PCRE2_ERROR_UTF8_ERR4: ++ case PCRE2_ERROR_UTF8_ERR5: ++ case PCRE2_ERROR_UTF8_ERR6: ++ case PCRE2_ERROR_UTF8_ERR7: ++ case PCRE2_ERROR_UTF8_ERR8: ++ case PCRE2_ERROR_UTF8_ERR9: ++ case PCRE2_ERROR_UTF8_ERR10: ++ case PCRE2_ERROR_UTF8_ERR11: ++ case PCRE2_ERROR_UTF8_ERR12: ++ case PCRE2_ERROR_UTF8_ERR13: ++ case PCRE2_ERROR_UTF8_ERR14: ++ case PCRE2_ERROR_UTF8_ERR15: ++ case PCRE2_ERROR_UTF8_ERR16: ++ case PCRE2_ERROR_UTF8_ERR17: ++ case PCRE2_ERROR_UTF8_ERR18: ++ case PCRE2_ERROR_UTF8_ERR19: ++ case PCRE2_ERROR_UTF8_ERR20: ++ case PCRE2_ERROR_UTF8_ERR21: ++ case PCRE2_ERROR_BADUTFOFFSET: + E(false, subject_from, + F("invalid UTF-8 sequence found during regular expression matching")); + + default: +- throw oops((F("pcre_exec returned %d") % errcode) ++ throw oops((F("pcre2_match returned %d [%s]") % errcode % err) + .str().c_str()); + } + } diff --git a/pkgs/by-name/mo/monotone/monotone-test-nop-migration.patch b/pkgs/by-name/mo/monotone/monotone-test-nop-migration.patch new file mode 100644 index 000000000000..4c97c5cae191 --- /dev/null +++ b/pkgs/by-name/mo/monotone/monotone-test-nop-migration.patch @@ -0,0 +1,13 @@ +Do not expect a nothing-to-do migration to fail on a read-only DB file + +--- mtn-src/test/func/fail_cleanly_on_unreadable_db/__driver__.lua 2026-08-05 21:29:54.727038442 +0200 ++++ mtn-src/test/func/fail_cleanly_on_unreadable_db/__driver__.lua 2026-08-05 21:30:33.397412828 +0200 +@@ -23,7 +23,7 @@ + check(mtn("ls", "branches"), 0, false, false) + check(mtn("db", "info"), 0, false, false) + check(mtn("db", "version"), 0, false, false) +-check(mtn("db", "migrate"), 1, false, false) ++check(mtn("db", "migrate"), 0, false, false) -- A migration is a NOP, RO is OK + check(mtn("commit", "-mfoo"), 1, false, false) + check(mtn("db", "load"), 1, false, false) + check({"chmod", "a+w", "test.db"}) diff --git a/pkgs/by-name/mo/monotone/monotone-test-passphrase-botan3.patch b/pkgs/by-name/mo/monotone/monotone-test-passphrase-botan3.patch new file mode 100644 index 000000000000..d9e0291aa228 --- /dev/null +++ b/pkgs/by-name/mo/monotone/monotone-test-passphrase-botan3.patch @@ -0,0 +1,29 @@ +Passphrase errors now trigger a Botan error changing the exit code + +--- mtn-src/test/func/changing_passphrase_of_a_private_key/__driver__.lua 2026-08-05 21:18:01.996782227 +0200 ++++ mtn-src/test/func/changing_passphrase_of_a_private_key/__driver__.lua 2026-08-05 21:18:06.973363633 +0200 +@@ -7,10 +7,10 @@ + check(mtn("genkey", tkey), 0, false, false, string.rep(tkey.."\n", 2)) + + -- fail to enter any passphrase +-check(mtn("passphrase", tkey), 1, false, false) ++check(mtn("passphrase", tkey), 3, false, false) + + -- fail to give correct old passphrase +-check(mtn("passphrase", tkey), 1, false, false, string.rep("bad\n", 3)) ++check(mtn("passphrase", tkey), 3, false, false, string.rep("bad\n", 3)) + + -- fail to repeat new password + check(mtn("passphrase", tkey), 1, false, false, + +--- mtn-src/test/func/disallowing_persistence_of_passphrase/__driver__.lua 2026-08-05 21:20:28.892980316 +0200 ++++ mtn-src/test/func/disallowing_persistence_of_passphrase/__driver__.lua 2026-08-05 21:20:35.546373425 +0200 +@@ -9,7 +9,7 @@ + + check(mtn("--ssh-sign=no", "--branch=testbranch", "--rcfile=persist.lua", + "commit", "--message=blah-blah"), +- 1, false, false, "tester@test.net\n") ++ 3, false, false, "tester@test.net\n") + + check(mtn("--ssh-sign=no", "--branch=testbranch", "--rcfile=persist.lua", + "commit", "--message=blah-blah"), diff --git a/pkgs/by-name/mo/monotone/monotone-test-pcre2-mtnignore.patch b/pkgs/by-name/mo/monotone/monotone-test-pcre2-mtnignore.patch new file mode 100644 index 000000000000..25981a046ae0 --- /dev/null +++ b/pkgs/by-name/mo/monotone/monotone-test-pcre2-mtnignore.patch @@ -0,0 +1,14 @@ +PCRE2 allows longer group names than PCRE1 did. +A failure case in .mtn-ignore became a valid lone ignoring everything. +Make it invalid again + +--- mtn-src/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore 2026-08-06 03:22:51.680338185 +0200 ++++ mtn-src/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore 2026-08-06 03:22:55.096806215 +0200 +@@ -27,6 +27,6 @@ + (?R) + (?P*) + (?P<*>x) +-(?P) ++(?P) + \777 + ^ignoremetoo$ diff --git a/pkgs/by-name/mo/monotone/package.nix b/pkgs/by-name/mo/monotone/package.nix index 6d745a221080..46f8117c6b4f 100644 --- a/pkgs/by-name/mo/monotone/package.nix +++ b/pkgs/by-name/mo/monotone/package.nix @@ -1,12 +1,13 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromForgejo, + botan3, boost, zlib, libidn, lua, - pcre, + pcre2, sqlite, perl, pkg-config, @@ -19,48 +20,44 @@ texinfo, fetchpatch, callPackage, + runCommand, }: let perlVersion = lib.getVersion perl; - - botan = callPackage ./botan2.nix { enableForMonotone = true; }; in assert perlVersion != ""; stdenv.mkDerivation (finalAttrs: { pname = "monotone"; - version = "1.1-unstable-2021-05-01"; + version = "1.1-unstable-2025-12-11"; strictDeps = true; __structuredAttrs = true; + enableParallelBuilding = true; + # src = fetchurl { # url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; # hash = "sha256-+Vz2CiLU5GG+ydDnL102CcmkV2+xzEX1U9AgLOLjjIg="; # }; - # My mirror of upstream Monotone repository - # Could fetchmtn, but circular dependency; snapshot requested - # https://lists.nongnu.org/archive/html/monotone-devel/2021-05/msg00000.html - src = fetchFromGitHub { - owner = "7c6f434c"; - repo = "monotone-mirror"; - rev = "b30b0e1c16def043d2dad57d1467d5bfdecdb070"; - hash = "sha256-rb5dWCGqwuzStwIbNlsUKbGjGvgQD3gaIyiMq9RG3sE="; + # Upstream developer's mirror for easier access + # Could fetchmtn, but circular dependency + src = fetchFromForgejo { + domain = "git.lapo.it"; + owner = "lapo"; + repo = "monotone"; + rev = "f93a19184e0c6c6ca5842ab050fcd62f2376c4ca"; + hash = "sha256-PT0DfVFDTHIWH1hZlaxpceoG94pytqFbjJvHVpIBNHs="; }; patches = [ - ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch - ./monotone-1.1-adapt-to-botan2.patch - (fetchpatch { - name = "rm-clang-float128-hack.patch"; - url = "https://github.com/7c6f434c/monotone-mirror/commit/5f01a3a9326a8dbdae7fc911b208b7c319e5f456.patch"; - revert = true; - hash = "sha256-7MjkzICYUDOBIgq6BSDq/CnGJgVl7gnx/rT0lshu8js="; - }) + ./monotone-botan-key-format.patch ./monotone-1.1-gcc-14.patch + ./monotone-botan-error-reporting.patch + ./monotone-pcre2.patch ]; postPatch = '' @@ -73,8 +70,6 @@ stdenv.mkDerivation (finalAttrs: { {} + ''; - env.CXXFLAGS = " --std=c++11 "; - nativeBuildInputs = [ pkg-config autoreconfHook @@ -83,10 +78,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost zlib - botan + botan3 libidn lua - pcre + pcre2 sqlite expect openssl @@ -95,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: { perl ]; + env.NIX_LDFLAGS = " -lpcre2-8 "; + postInstall = '' mkdir -p $out/share/monotone-${finalAttrs.version} cp -rv contrib/ $out/share/monotone-${finalAttrs.version}/contrib @@ -109,9 +106,112 @@ stdenv.mkDerivation (finalAttrs: { #doCheck = true; # some tests fail (and they take VERY long) + passthru.tests = { + basicEndToEnd = + runCommand "monotone-test-end-to-end" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } + '' + mkdir -p "$out/share/monotone-test/log/" + target="$out/share/monotone-test/log/monotone-test-end-to-end.log" + + ( + export HOME="$PWD" + set -x + + mtn genkey test@localhost + + mkdir a b c + + mtn -d :test1 db init + mtn -d :test2 db init + + ( + cd a + mtn -d :test1 -b test setup + echo 123 > aaa + mtn add aaa + mtn ci -m 'add aaa' + mtn log + ) + + ( + cd b + mtn -d :test2 sync file:///$HOME/.monotone/databases/test1.mtn'?*' + mtn -d :test2 co -r h:test -b test . + mtn up + echo 456 > bbb + mtn add bbb + mtn ci -m 'add bbb' + mtn log + ) + + ( + cd a + echo 789 > ccc + mtn add ccc + mtn ci -m 'add ccc' + mtn log + ) + + ( + cd c + mtn -d :test1 sync file:///$HOME/.monotone/databases/test2.mtn'?*' + mtn -d :test1 merge -b test + mtn -d :test1 co -r h:test -b test . + mtn up + mtn log + cat aaa bbb ccc | xargs | grep '123 456 789' + ) + + ) 2>&1 | tee "$target" + ''; + packageTests-unit = finalAttrs.finalPackage.overrideAttrs { + pname = "monotone-test"; + doCheck = true; + buildPhase = " cp -iv ${finalAttrs.finalPackage}/bin/* . "; + installPhase = " true; "; + postCheck = " touch $out; "; + checkPhase = '' + runHook preCheck + + make test/unit.status -j $NIX_CORES + + runHook postCheck + grep '^0$' test/unit.status + ''; + }; + packageTests-func = finalAttrs.finalPackage.overrideAttrs { + pname = "monotone-test"; + doCheck = true; + nativeBuildInputs = finalAttrs.nativeBuildInputs ++ [ finalAttrs.finalPackage ]; + buildPhase = " cp -iv ${finalAttrs.finalPackage}/bin/* . "; + installPhase = " true; "; + postCheck = " touch $out; "; + checkPhase = '' + runHook preCheck + + make test/func.status -j $NIX_CORES + + runHook postCheck + grep '^0$' test/func.status || { + cat test/work/*.log + exit 1 + } + ''; + preCheck = '' + sed -e 's@test/func.status *: *mtn$(EXEEXT)@test/func.status : @' -i Makefile* + ''; + patches = (finalAttrs.patches or [ ]) ++ [ + ./monotone-test-passphrase-botan3.patch + ./monotone-test-nop-migration.patch + ./monotone-base64-error-reporting.patch + ./monotone-test-pcre2-mtnignore.patch + ]; + }; + }; + meta = { description = "Free distributed version control system"; - homepage = "https://github.com/7c6f434c/monotone-mirror"; + homepage = "https://git.lapo.it/lapo/monotone"; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index 3533543bb563..a774e8f2b7b2 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.15.2"; + version = "2.16.2"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-3HG3qiUGbrv/2HGvZ1gsLMs59fQZboXxcT/YCUfzT4Y="; + hash = "sha256-KSS9639wke24T4k4Xlcf0sbMswScWY1Uipq0dWt5MV8="; }; - vendorHash = "sha256-PGJ6aSRYgLztkQxHQvXn5ISBK5DIa76lJSOsMTGJNpw="; + vendorHash = "sha256-19g9mzt2YHpwuCeroR6vUEhfsHoo4B0Zkm/goPccZqI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mo/motrix-next/package.nix b/pkgs/by-name/mo/motrix-next/package.nix index 6ff993c596ba..38c049afc4b1 100644 --- a/pkgs/by-name/mo/motrix-next/package.nix +++ b/pkgs/by-name/mo/motrix-next/package.nix @@ -25,16 +25,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "motrix-next"; - version = "3.9.6"; + version = "3.9.7"; src = fetchFromGitHub { owner = "AnInsomniacy"; repo = "motrix-next"; tag = "v${finalAttrs.version}"; - hash = "sha256-ynLi+biCdjU7EOq556YuFonghWaxDV7UtHWiKImq7WE="; + hash = "sha256-REB89vOrNKyqH39OVd/jQonDvuIIYpm5rrBYg6w6Vq8="; }; - cargoHash = "sha256-c17GTD9Wcy9LYLfBcwECNS1Tek5hTWPmie2lXtrbtFc="; + cargoHash = "sha256-mffAas2SsiEL/IXYIsToe/hnMywsaRadEUEwIHOKZBo="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src ; inherit pnpm; - hash = "sha256-WAuHoLAnFLP6i+rJSegt/hI6sb1SDhm7LWgsup70o9E="; + hash = "sha256-hdoXnfM+dn+I5T7EMklUB1L1FvywaI6hGpRGSQYkQvY="; fetcherVersion = 3; }; @@ -76,6 +76,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # Some tests on macOS attempt to retrieve system settings, such as the default browser and system proxy. doCheck = !stdenv.hostPlatform.isDarwin; + tauriBuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--no-sign" ]; + # Deactivate the upstream update mechanism postPatch = '' jq ' diff --git a/pkgs/by-name/mu/musescore-evolution/package.nix b/pkgs/by-name/mu/musescore-evolution/package.nix index c0bf1a2af922..ff64285b872a 100644 --- a/pkgs/by-name/mu/musescore-evolution/package.nix +++ b/pkgs/by-name/mu/musescore-evolution/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; pname = "musescore-evolution"; - version = "3.7.0-unstable-2026-07-25"; + version = "3.7.0-unstable-2026-07-30"; src = fetchFromGitHub { owner = "Jojo-Schmitz"; repo = "MuseScore"; - rev = "bbd207db6b79f905274d561819bf0773b092191c"; - hash = "sha256-XWGTWMhUnUEYR5VEE69jCZ3p/NN+r2bu6BKLs+w1KDc="; + rev = "e37e22e43119153192a573fe2d558b703311bb74"; + hash = "sha256-NGy3MpttueujklFnV7bOlyqMPXHNAF5CqnJ+Hsbjt7k="; }; patches = [ diff --git a/pkgs/by-name/nb/nbxplorer/deps.json b/pkgs/by-name/nb/nbxplorer/deps.json index ca9dfb659219..57062185d053 100644 --- a/pkgs/by-name/nb/nbxplorer/deps.json +++ b/pkgs/by-name/nb/nbxplorer/deps.json @@ -1,99 +1,39 @@ [ { "pname": "Dapper", - "version": "2.1.66", - "hash": "sha256-e5n/wnAFGPDSe30oQQ0fanXrvFZYYa+qCDSTHtfQmPw=" + "version": "2.1.79", + "hash": "sha256-QIGZ+vlnwhSl+nnVZ//s3uwFh/vKJ5kDpgGkmpMjhmw=" }, { "pname": "Microsoft.AspNetCore.JsonPatch", - "version": "10.0.1", - "hash": "sha256-bbX3CGoxG5E8RPUBeEvG9Us8l8WxBHRcjxPR3mJLnbg=" + "version": "10.0.10", + "hash": "sha256-NIFI6z2X1blS3ab3G/CgY42WuJULni5wTa4X8AMx1c0=" }, { "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", - "version": "10.0.1", - "hash": "sha256-E1ciFt7uy39aKRDfmXrHJ6e4SsaWm+C3inQqTzQEC2U=" - }, - { - "pname": "Microsoft.Azure.Amqp", - "version": "2.4.11", - "hash": "sha256-Nd2crPn0GUSgCzicuNhm0fYKiXtpQ3aduBjcjTMMF/4=" - }, - { - "pname": "Microsoft.Azure.ServiceBus", - "version": "5.2.0", - "hash": "sha256-YgxtiQzmlKj6KHyZppnDoWgoeO3wUlyVZimF2dNt1tA=" - }, - { - "pname": "Microsoft.Azure.Services.AppAuthentication", - "version": "1.0.3", - "hash": "sha256-KaGL7asV10S+fGp9dt1i6frelho8ns73epxGzZ4iRis=" + "version": "10.0.10", + "hash": "sha256-QlXe8Il3kcDQZTSZg3tCvW7c8ERix7lIWvYGSrrleNE=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "1.0.0", "hash": "sha256-asIXVFsAK7ELd/f+vLwhxYDdazqRTmf+fGJ4WFtcCeo=" }, - { - "pname": "Microsoft.IdentityModel.Clients.ActiveDirectory", - "version": "3.14.2", - "hash": "sha256-mFlsKSQ6DsKttWuFkv6eMs0uSFHgwocxDad1icMXKj0=" - }, - { - "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "5.4.0", - "hash": "sha256-yKITMgW2JEXhPlQgdmofAyt0eEcCr72P4rM2EC6wrig=" - }, - { - "pname": "Microsoft.IdentityModel.Logging", - "version": "5.4.0", - "hash": "sha256-YKdSKQDO5+ssC5mqLGtBhuJ4lLbLUadMVV4PPJ6/tMU=" - }, - { - "pname": "Microsoft.IdentityModel.Tokens", - "version": "5.4.0", - "hash": "sha256-gCJ+4QwhuBPSkDN+HcMCpTE2LFIQ3htI/SddoHOB7T4=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" - }, { "pname": "NBitcoin", - "version": "9.0.4", - "hash": "sha256-UuzpFfVggaz2dV60kGqjnCYtkLyhOrd9dlzzgmTA+4Q=" + "version": "10.0.8", + "hash": "sha256-SnJ60lhDv94oD0370ZyrvFG2LDJ0wkixNP1pIvcq8AA=" }, { "pname": "NBitcoin.Altcoins", - "version": "5.0.2", - "hash": "sha256-uXjJoS965jLXeeZav0fIndM0TdZ92ODOgCV1duVQAzk=" - }, - { - "pname": "NETStandard.Library", - "version": "1.6.0", - "hash": "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo=" - }, - { - "pname": "NETStandard.Library", - "version": "1.6.1", - "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + "version": "6.0.4", + "hash": "sha256-BpXLxjmFf1JUud0Mwz/Zph0jPVqrEfa6KiMMnsOeIU8=" }, { "pname": "NETStandard.Library.Ref", "version": "2.1.0", "hash": "sha256-Ruovy9EKgXaFuFr3zgw5fRKUS9yBIJ4nLeHgXv0zx4o=" }, - { - "pname": "Newtonsoft.Json", - "version": "10.0.1", - "hash": "sha256-Gw7dQIsmYfmcR5ASTuMsB8cqaI4g3osw0j+LO1jEzJY=" - }, - { - "pname": "Newtonsoft.Json", - "version": "10.0.3", - "hash": "sha256-WEHCjp+OMr5axXQjFsh7TMDE/ttE35nMv5RBPdcxfhs=" - }, { "pname": "Newtonsoft.Json", "version": "12.0.1", @@ -131,17 +71,7 @@ }, { "pname": "Npgsql", - "version": "10.0.1", - "hash": "sha256-cb4z+WH9qynS6n4I43FzSiifWLzgH26HAP/DnZvsjak=" - }, - { - "pname": "RabbitMQ.Client", - "version": "7.2.0", - "hash": "sha256-NkEb2ey0jo/OAeaVOUwIeSbeplqkOsgv1+ys8ZQgemQ=" - }, - { - "pname": "System.IdentityModel.Tokens.Jwt", - "version": "5.4.0", - "hash": "sha256-zLtoejPBG8yeFEPIcXZAkdAb0WDnrVXh5YsUYKULyRU=" + "version": "10.0.3", + "hash": "sha256-ddCXCSOoyfy7035OvnL+4LEDYqHjZyPoZ3ffG2coMW0=" } ] diff --git a/pkgs/by-name/nb/nbxplorer/package.nix b/pkgs/by-name/nb/nbxplorer/package.nix index 0bab98085f76..46de2087242c 100644 --- a/pkgs/by-name/nb/nbxplorer/package.nix +++ b/pkgs/by-name/nb/nbxplorer/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.6.0"; + version = "2.6.10"; src = fetchFromGitHub { owner = "btcpayserver"; repo = "NBXplorer"; tag = "v${version}"; - hash = "sha256-X1+UdsKVOC3QpES22p0MG1Rz1oresilBM+b/4I1nCyI="; + hash = "sha256-bAAEB1wIaWgDygk79bCuvkNDiPvgsUhVDqIrR3LMp7Q="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/by-name/nb/nbxplorer/util/update-common.sh b/pkgs/by-name/nb/nbxplorer/util/update-common.sh index 2ac0118c26df..4928c61a32e8 100755 --- a/pkgs/by-name/nb/nbxplorer/util/update-common.sh +++ b/pkgs/by-name/nb/nbxplorer/util/update-common.sh @@ -50,10 +50,15 @@ repo=$tmpdir/repo trap "rm -rf $tmpdir" EXIT git clone --depth 1 --branch v${newVersion} -c advice.detachedHead=false https://github.com/$(getRepo) $repo export GNUPGHOME=$tmpdir +importKey() { + curl --fail --location --silent --show-error --retry 3 --retry-all-errors \ + "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x$1" \ + | gpg --batch --import +} # Fetch Nicolas Dorier's key (64-bit key ID: 6618763EF09186FE) -gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys AB4CFA9895ACA0DBE27F6B346618763EF09186FE 2> /dev/null +importKey AB4CFA9895ACA0DBE27F6B346618763EF09186FE # Fetch Andrew Camilleri's key (64-bit key ID: 8E5530D9D1C93097) -gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 836C08CF3F523BB7A8CB8ECF8E5530D9D1C93097 2> /dev/null +importKey 836C08CF3F523BB7A8CB8ECF8E5530D9D1C93097 echo echo "Verifying commit" git -C $repo verify-commit HEAD @@ -64,12 +69,7 @@ echo # Update pkg version and hash echo "Updating $pkgName: $oldVersion -> $newVersion" -if [[ $newVersion == $oldVersion ]]; then - # Temporarily set a source version that doesn't equal $newVersion so that $newHash - # is always updated in the next call to update-source-version. - (cd "$nixpkgs" && update-source-version "$pkgName" "0" "0000000000000000000000000000000000000000000000000000") -fi -(cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion" "$newHash") +(cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion" "$newHash" --ignore-same-version) echo # Create deps file diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix index a370884bc3ea..29d1366ca89d 100644 --- a/pkgs/by-name/ne/neo4j/package.nix +++ b/pkgs/by-name/ne/neo4j/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "neo4j"; - version = "2026.06.0"; + version = "2026.07.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${finalAttrs.version}-unix.tar.gz"; - hash = "sha256-Hc9i5+gDXnFzK4ZTK5+OMhnOiVa9BpQNWgAkaWcnGSo="; + hash = "sha256-ANpBduUqBM+60704P34N/dfsBOtL0liPcRBVPxx5rgU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix index 8b66c70997fb..294ab8df1c11 100644 --- a/pkgs/by-name/ni/nixtamal/package.nix +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { pname = "nixtamal"; - version = "1.9.2"; + version = "1.9.3"; release_year = 2026; minimalOCamlVersion = "5.3"; @@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { url = "https://darcs.toastal.in.th/nixtamal/stable/"; mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ]; rev = finalAttrs.version; - hash = "sha256-Df5I5zibVGNLJtJi2j4pWD+x5yu2rO9KSWyVhcus/HU="; + hash = "sha256-NlCm9XQBK5ooX67ruOJr8TWlOAHGoCgNwIU0BKWol84="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 08b6f84b0ab9..3478e67c6807 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -31,14 +31,14 @@ in py.pkgs.buildPythonApplication (finalAttrs: { pname = "oci-cli"; - version = "3.90.0"; + version = "3.90.1"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-oXg195wf9Wg81YDrS25zSZ/It/6WN1RtX2drRwdD64w="; + hash = "sha256-PrtmgkrV1uNNM3TEYqbpIHxXyo7iv9vYY7JTmyKA1wc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 253e17cee4da..e43104a4040d 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ord"; - version = "0.27.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = finalAttrs.version; - hash = "sha256-KtJfiQs+2XkFT2l/rpyjeGf/i15BsLFHjSQjzOZkRfg="; + hash = "sha256-0jcp8zOWeLjIOpop15DE5ue8axSHJiy7Jnv8oQiPbmo="; }; - cargoHash = "sha256-4OFkqErFQ/VPvcHdBJTt877wpd1tALTH89U9u1V2KyY="; + cargoHash = "sha256-HPMRibZTYxKeaXRNmlriXaU3NyCMgm6Yitl2tBbOX8c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix index 9be67c2949f4..526c084c75bc 100644 --- a/pkgs/by-name/os/oscar/package.nix +++ b/pkgs/by-name/os/oscar/package.nix @@ -1,11 +1,12 @@ { lib, stdenv, - qt6, fetchFromGitLab, libGLU, nix-update-script, + qt6, }: + stdenv.mkDerivation (finalAttrs: { pname = "oscar"; version = "2.0.1"; @@ -13,19 +14,21 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "CrimsonNape"; repo = "oscar-sql"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ivOEAP7/pc5yS6mhc/6ButbSjfFmOP4PM7c/S23oyYw="; }; - buildInputs = [ - qt6.qtbase - qt6.qttools - libGLU - ]; nativeBuildInputs = [ - qt6.wrapQtAppsHook qt6.qmake qt6.qtserialport + qt6.qttools + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + libGLU + qt6.qtbase + qt6.qtserialport ]; strictDeps = true; @@ -34,21 +37,25 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace oscar/oscar.pro \ --replace-fail "/bin/bash" "${stdenv.shell}" \ - --replace-fail "\$\$[QT_INSTALL_BINS]/lrelease" "${qt6.qttools}/bin/lrelease" + --replace-fail "\$\$[QT_INSTALL_BINS]/lrelease" "lrelease" + substituteInPlace oscar/SleepLib/common.cpp \ + --replace-fail 'QString( "/usr/share/" )' 'QString( "${placeholder "out"}/share/" )' + substituteInPlace Building/Linux/OSCAR20.desktop \ + --replace-fail "Icon=/usr/share/icons/hicolor/48x48/apps/OSCAR20.png" "Icon=OSCAR20" ''; qmakeFlags = [ "OSCAR_QT.pro" ]; installPhase = '' runHook preInstall - install -D oscar/OSCAR20 -t $out/bin + install -Dm755 oscar/OSCAR20 -t "$out/bin" # help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841 - # install -D oscar/Help/* -t $out/share/OSCAR/Help - install -D oscar/Html/* -t $out/share/OSCAR/Html - install -D oscar/Translations/* -t $out/share/OSCAR/Translations - install -D Building/Linux/OSCAR.png -t $out/share/icons/hicolor/48x48/apps - install -D Building/Linux/OSCAR.svg -t $out/share/icons/hicolor/scalable/apps - install -D Building/Linux/OSCAR.desktop -t $out/share/applications + # install -Dm644 oscar/Help/* -t "$out/share/OSCAR20/Help" + install -Dm644 oscar/Html/* -t "$out/share/OSCAR20/Html" + install -Dm644 oscar/Translations/* -t "$out/share/OSCAR20/Translations" + install -Dm644 Building/Linux/OSCAR20.png -t "$out/share/icons/hicolor/48x48/apps" + install -Dm644 Building/Linux/OSCAR20.svg -t "$out/share/icons/hicolor/scalable/apps" + install -Dm644 Building/Linux/OSCAR20.desktop -t "$out/share/applications" runHook postInstall ''; @@ -61,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.sleepfiles.com/OSCAR/"; + changelog = "https://gitlab.com/CrimsonNape/oscar-sql/-/raw/${finalAttrs.src.tag}/Htmldocs/release_notes.html"; description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; mainProgram = "OSCAR20"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/pa/passless/package.nix b/pkgs/by-name/pa/passless/package.nix index cc28b1bbd917..2b09feffc7fa 100644 --- a/pkgs/by-name/pa/passless/package.nix +++ b/pkgs/by-name/pa/passless/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "passless"; - version = "0.13.0"; + version = "0.15.1"; __structuredAttrs = true; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "pando85"; repo = "passless"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZfIScs+ougawn/tXK8PBme13CEdvxeL8/D38b3F/bcg="; + hash = "sha256-Af8Ab4CD6raaAPs7K7zQlxJ2BW5LNLsP3efqG9dUcKM="; }; - cargoHash = "sha256-RpfegA8nH8chbHXHbuWMRH9drSrnBRQwYJtnw2Sqymw="; + cargoHash = "sha256-M5H/jodA5hoBKCvJaUoZd/YwSxPkq7sIFqrLCY4EyaU="; nativeBuildInputs = [ pkg-config @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postInstall = '' + mkdir -p $out/etc/udev/rules.d install -Dm644 contrib/udev/* $out/etc/udev/rules.d export COMPLETIONS="target/${stdenv.targetPlatform.config}/$cargoBuildType/build/passless-rs-*/out/completions" diff --git a/pkgs/by-name/pa/pax-utils/package.nix b/pkgs/by-name/pa/pax-utils/package.nix index 6280fdb28218..2934a4c85a40 100644 --- a/pkgs/by-name/pa/pax-utils/package.nix +++ b/pkgs/by-name/pa/pax-utils/package.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "pax-utils"; - version = "1.3.10"; + version = "1.3.11"; src = fetchgit { url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; rev = "v${finalAttrs.version}"; - hash = "sha256-qoFXQ/RqvdjsVhXVZZjWKnE0khak9HjOGi/UrfTLS8M="; + hash = "sha256-eeWu8XKBAq6U5K5a93BZYGFGfz2R8ysW/VaCyjN0Um8="; }; strictDeps = true; diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index ed583696715c..ab8584a90694 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-X7BdXhl/Y6tmfZuQXmncgpMkSolvvQRrNjCyI+pQUeY="; + hash = "sha256-+KEO2/YOSdjBYOkxIZidXrza2DjQ4LdH8m736J/SIMA="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index baeb421dc6d7..1733f1dd194a 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "proto"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${finalAttrs.version}"; - hash = "sha256-iA/dE4ekd83hkOVewFYk7pe8TVBT4smT8XWavIiMtY8="; + hash = "sha256-Fzrio8LwfZW//k10aqj/gwVDcrmui/GlQS/BmZASG1A="; }; - cargoHash = "sha256-ZL8uykBCmzUaGwVj5kTpxqv6oYAsRGRUBmTF51fkwQ0="; + cargoHash = "sha256-QoX2ubtcjhTM7Q5pTPdI2QH1ZC9rssG3KHdocdQ26Lk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/pr/proton-cli/package.nix b/pkgs/by-name/pr/proton-cli/package.nix index df3ecf6dc8c5..a31f7df781d2 100644 --- a/pkgs/by-name/pr/proton-cli/package.nix +++ b/pkgs/by-name/pr/proton-cli/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { pname = "proton-cli"; - version = "1.9.12"; + version = "1.10.0"; __structuredAttrs = true; @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { owner = "roman-16"; repo = "proton-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-PjwPdEaoiVwV7Kut6C6jiIVas7sou4v3BxbMcFXnJgg="; + hash = "sha256-Amu7mHH7o5KEqvIjitvnPWNmDrQvz0AgehDOmhiW9YM="; }; vendorHash = "sha256-bFpBsxU9dehg4X5xBjzb8es7S+RdnTeHDiqlUM1kIuY="; diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 6a2efe7f662e..4fa9d11908ca 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication { pname = "ranger"; - version = "1.9.4-unstable-2026-07-28"; + version = "1.9.4-unstable-2026-08-06"; pyproject = true; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "5eee985f4a427f3a1c540851b48b5f8cd4254605"; - hash = "sha256-1tAa6VP2WbXdgGRyr8wGAqnBnmlklD7FnfFYC3XdQjw="; + rev = "d45f14c04dd5cee64cdd6d1c560a1e3e1e9efd05"; + hash = "sha256-Y+kEHp5eEi+ydf87WIwK6xzzohCNrmM5Q5Bv9/RmjdQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix index 8b856fa71313..80b0f9156c97 100644 --- a/pkgs/by-name/ro/routedns/package.nix +++ b/pkgs/by-name/ro/routedns/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "routedns"; - version = "0.1.225"; + version = "0.1.226"; src = fetchFromGitHub { owner = "folbricht"; repo = "routedns"; rev = "v${finalAttrs.version}"; - hash = "sha256-eI8FxaLMIwlWJoI9OcOwA2dGB9/wKiOhIFsLrK/EDRw="; + hash = "sha256-pGAzdZDZeWgw+BIL5JmrqrllxN7w+Se9yWRVozzgt6s="; }; vendorHash = "sha256-w8rZue6/cc8wg40Ey+P216cQGhbCznjSsLi1G4YfRsI="; diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 7983a42407b5..9796b3a12c41 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.2.45"; + version = "0.2.52"; __structuredAttrs = true; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZTvnRu/umgGTk8EmMbdfd5qP+Iqt0+hsl+W+A5NQ6Tg="; + hash = "sha256-/2oa3SYdI6rnDK80ACO5Q8NOv1TxgnjPXMmyxGGaog4="; }; - cargoHash = "sha256-lYVbKzVQBSjoPK3ZRMOUuDDvK32sHrBzq6gHbmNUalc="; + cargoHash = "sha256-wvRht4W5CyzEXFvUiUQGsjUN2uTbchhBQXcYAx41xZw="; cargoBuildFlags = [ "--bin=rumdl" diff --git a/pkgs/by-name/se/serigy/package.nix b/pkgs/by-name/se/serigy/package.nix index 4c0a9e645b35..a4481db6ec90 100644 --- a/pkgs/by-name/se/serigy/package.nix +++ b/pkgs/by-name/se/serigy/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "serigy"; - version = "2.1.1"; + version = "2.3.0"; pyproject = false; # uses meson src = fetchFromGitHub { owner = "CleoMenezesJr"; repo = "Serigy"; tag = finalAttrs.version; - hash = "sha256-WOourIlF2Z1YP34d9VCuX7kysJxeMBz2enOaGu73r8o="; + hash = "sha256-EED7jPGcOfsWp8qUxu/U576+HMkOZbb2SG/dRTdC1Gs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/silo/package.nix b/pkgs/by-name/si/silo/package.nix index dd04f7c97a3b..48e5673287e9 100644 --- a/pkgs/by-name/si/silo/package.nix +++ b/pkgs/by-name/si/silo/package.nix @@ -30,16 +30,16 @@ buildGoModule (finalAttrs: { __structuredAttrs = true; pname = "silo"; - version = "2026-08-04T00-00-00Z"; + version = "2026-08-06T00-00-00Z"; src = fetchFromGitHub { owner = "pgsty"; - repo = "minio"; + repo = "silo"; tag = "RELEASE.${finalAttrs.version}"; - hash = "sha256-F5gyhSBVH4RUoOyo+8UQ0RXuraXkGVO/mGkuFIi0hoc="; + hash = "sha256-mFHgeetimgSgztA39oP4TcxdlFpI+Usjg7cvhyjsYRI="; }; - vendorHash = "sha256-gDcO0q6beKEGSs6MM/C3iKC2+eFk1o6Ug5KLMmK12ek="; + vendorHash = "sha256-7uXfM10x5ouCLNuk204AUi9up5oXVesPdNAbbGFyQ6U="; subPackages = [ "." ]; @@ -60,6 +60,7 @@ buildGoModule (finalAttrs: { "-X ${t}.CopyrightYear=${versionToYear finalAttrs.version}" ]; + # Despite the renaming, the binary result comes out as minio. Upstream's goreleaser pipeline passes an explicit -o silo. The buildGoModule does not. postInstall = '' ln -s "$out/bin/minio" "$out/bin/silo" ''; @@ -71,8 +72,8 @@ buildGoModule (finalAttrs: { meta = { description = "Community-maintained fork of MinIO packaged as silo"; - homepage = "https://github.com/pgsty/minio"; - changelog = "https://github.com/pgsty/minio/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/pgsty/silo"; + changelog = "https://github.com/pgsty/silo/releases/tag/${finalAttrs.src.tag}"; maintainers = with lib.maintainers; [ randoneering ]; license = lib.licenses.agpl3Plus; mainProgram = "silo"; diff --git a/pkgs/by-name/sn/snid/service.nix b/pkgs/by-name/sn/snid/service.nix index f536cdb54825..5e4d279b87c2 100644 --- a/pkgs/by-name/sn/snid/service.nix +++ b/pkgs/by-name/sn/snid/service.nix @@ -10,10 +10,8 @@ }: let inherit (lib) - concatMap getExe mkOption - optional types ; cfg = config.snid; @@ -141,22 +139,26 @@ in process.argv = [ (getExe cfg.package) - "-mode" - cfg.mode - ] - ++ concatMap (l: [ - "-listen" - l - ]) cfg.listen - ++ concatMap (c: [ - "-backend-cidr" - c - ]) cfg.backendCidrs - ++ optional (cfg.defaultHostname != null) "-default-hostname=${cfg.defaultHostname}" - ++ optional (cfg.nat46Prefix != null) "-nat46-prefix=${cfg.nat46Prefix}" - ++ optional (cfg.backendPort != null) "-backend-port=${toString cfg.backendPort}" - ++ optional (cfg.unixDirectory != null) "-unix-directory=${cfg.unixDirectory}" - ++ optional cfg.proxyProto "-proxy-proto"; + ]; + + process.flagFormat = flag: { + option = "-${flag}"; + explicitBool = false; + sep = null; + }; + + process.flags = lib.mkMerge [ + { + mode = cfg.mode; + default-hostname = cfg.defaultHostname; + nat46-prefix = cfg.nat46Prefix; + backend-port = cfg.backendPort; + unix-directory = cfg.unixDirectory; + proxy-proto = cfg.proxyProto; + } + (map (v: { listen = v; }) cfg.listen) + (map (v: { backend-cidr = v; }) cfg.backendCidrs) + ]; } // lib.optionalAttrs (options ? systemd) { systemd.service = { diff --git a/pkgs/by-name/sp/sprite/package.nix b/pkgs/by-name/sp/sprite/package.nix index ce8b794d224d..bae1f0dae5a1 100644 --- a/pkgs/by-name/sp/sprite/package.nix +++ b/pkgs/by-name/sp/sprite/package.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sprite"; - version = "0.0.1-rc46"; + version = "0.0.1-rc47"; src = fetchurl { url = "https://sprites-binaries.t3.storage.dev/client/v${finalAttrs.version}/sprite-${ @@ -17,9 +17,9 @@ stdenv.mkDerivation (finalAttrs: { }-${if stdenv.hostPlatform.isx86_64 then "amd64" else "arm64"}.tar.gz"; hash = { - aarch64-darwin = "sha256-q7GzIi55W6esVYepqgI9hUCziZlL/Fx1mDd1J1aqkWI="; - aarch64-linux = "sha256-c7ldoDrCbGjT1kps/UgYfSAskyu+LYkywpwTpzfpYVw="; - x86_64-linux = "sha256-uOUcgW6W1xv4GXVnDnDeKOXJ9OgYQu8UdmKQXiEqTco="; + aarch64-darwin = "sha256-L+6siRt0WJMAJw7I8qVLoJgVsX64mGpAcsX/EV8CP20="; + aarch64-linux = "sha256-wX0KbxMOXhq/7W/1TyelsAjbMYf4DM58oMLK7hgVW6w="; + x86_64-linux = "sha256-rwOSHuYmb0DIAbLcS0VW83psvcpLLUUqYhG2njmZy44="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/sr/srt-xtransmit/package.nix b/pkgs/by-name/sr/srt-xtransmit/package.nix index 379cc05573a9..1c134e5e0549 100644 --- a/pkgs/by-name/sr/srt-xtransmit/package.nix +++ b/pkgs/by-name/sr/srt-xtransmit/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "srt-xtransmit"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "maxsharabayko"; repo = "srt-xtransmit"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-AEqVJr7TLH+MV4SntZhFFXTttnmcywda/P1EoD2px6E="; + hash = "sha256-v2JMkuSChO6SWh33qG1Js6JSOXAQls0FKFkg314ULUU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stalwart-proxy/package.nix b/pkgs/by-name/st/stalwart-proxy/package.nix index 480e7efd60b3..b1bf38151a16 100644 --- a/pkgs/by-name/st/stalwart-proxy/package.nix +++ b/pkgs/by-name/st/stalwart-proxy/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "proxy"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "proxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-hLVxno+1hsCoMQK5HfTswIbUZkytjcO8Sgddfga/kDA="; + hash = "sha256-C/4KrBkjMKDf7aMpS6F0VGX58Jdikd8u1PVP/Za1pwc="; }; __structuredAttrs = true; __darwinAllowLocalNetworking = true; - cargoHash = "sha256-8TiWM3kqCsqtkTBh4cl4CeLEeM2PZq+FZNw0omcb7ME="; + cargoHash = "sha256-rDD//y1dYW9TVQ+fbKnawuZjK+D+4inyeq8NZ/Re9nc="; # `Result::unwrap()` on an `Err` value: Tls("platform verifier: unexpected error: No CA certificates were loaded from the system") nativeCheckInputs = [ cacert diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index 6115df12f862..cc45f84199d2 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "taisei"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "taisei-project"; repo = "taisei"; tag = "v${finalAttrs.version}"; - hash = "sha256-xjEfSrtxZBBWUU8nv0fyNAofHSGVTeO3CBR/BhKSGHg="; + hash = "sha256-F5fmTY3kl5HW4C/SH5JDZF0vTWescExTANQDYZ2vPmI="; fetchSubmodules = true; }; @@ -73,8 +73,6 @@ stdenv.mkDerivation (finalAttrs: { mimalloc libogg libunibreak - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ glslang spirv-cross ] @@ -91,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "install_freedesktop" stdenv.hostPlatform.isLinux) (lib.mesonEnable "install_macos_bundle" stdenv.hostPlatform.isDarwin) (lib.mesonEnable "install_relocatable" stdenv.hostPlatform.isDarwin) - (lib.mesonEnable "shader_transpiler" stdenv.hostPlatform.isDarwin) ]; preConfigure = '' diff --git a/pkgs/by-name/th/throne/core-also-check-capabilities.patch b/pkgs/by-name/th/throne/core-also-check-capabilities.patch index 5a762ef91ec7..0f12415e5e59 100644 --- a/pkgs/by-name/th/throne/core-also-check-capabilities.patch +++ b/pkgs/by-name/th/throne/core-also-check-capabilities.patch @@ -1,7 +1,7 @@ -diff --git a/server.go b/server.go +diff --git a/core/server/server.go b/core/server/server.go index 4499a6d..4c14d1a 100644 ---- a/server.go -+++ b/server.go +--- a/core/server/server.go ++++ b/core/server/server.go @@ -24,6 +24,7 @@ import ( "github.com/sagernet/sing-box/experimental/clashapi" "github.com/sagernet/sing/common" diff --git a/pkgs/by-name/th/throne/dont-check-parent.patch b/pkgs/by-name/th/throne/dont-check-parent.patch new file mode 100644 index 000000000000..cb2dce830e1e --- /dev/null +++ b/pkgs/by-name/th/throne/dont-check-parent.patch @@ -0,0 +1,13 @@ +diff --git a/core/server/parentcheck/parentcheck.go b/core/server/parentcheck/parentcheck.go +index 0991a7f..58fd32f 100644 +--- a/core/server/parentcheck/parentcheck.go ++++ b/core/server/parentcheck/parentcheck.go +@@ -11,6 +11,8 @@ import ( + ) + + func CheckParentProcess() { ++ return ++ + parentPath, err := getParentExePath(ParentPID) + if err != nil { + log.Fatalf("parent check: cannot read parent executable: %v", err) diff --git a/pkgs/by-name/th/throne/fix-autorun-desktop-exec.patch b/pkgs/by-name/th/throne/fix-desktop-exec.patch similarity index 56% rename from pkgs/by-name/th/throne/fix-autorun-desktop-exec.patch rename to pkgs/by-name/th/throne/fix-desktop-exec.patch index 2a6d6b357c54..683c63893a72 100644 --- a/pkgs/by-name/th/throne/fix-autorun-desktop-exec.patch +++ b/pkgs/by-name/th/throne/fix-desktop-exec.patch @@ -1,5 +1,5 @@ diff --git a/src/sys/linux/AutoRun.cpp b/src/sys/linux/AutoRun.cpp -index 1fafe35..fe04c75 100644 +index 1fafe35..a32e7fe 100644 --- a/src/sys/linux/AutoRun.cpp +++ b/src/sys/linux/AutoRun.cpp @@ -31,18 +31,9 @@ void AutoRun_SetEnabled(bool enable) { @@ -22,3 +22,18 @@ index 1fafe35..fe04c75 100644 if (enable) { if (!QDir().exists(userAutoStartPath) && !QDir().mkpath(userAutoStartPath)) { // qCWarning(lcUtility) << "Could not create autostart folder" +diff --git a/src/sys/linux/UrlScheme.cpp b/src/sys/linux/UrlScheme.cpp +index 63e4118..a9d3a42 100644 +--- a/src/sys/linux/UrlScheme.cpp ++++ b/src/sys/linux/UrlScheme.cpp +@@ -14,9 +14,7 @@ static const QString kDesktopId = "throne-url-handler.desktop"; + // For AppImage the launcher must point at the outer image ($APPIMAGE), not the + // extracted binary inside the mount, which disappears after exit. + static QString execTarget() { +- auto env = QProcessEnvironment::systemEnvironment(); +- if (env.contains("APPIMAGE")) return env.value("APPIMAGE"); +- return QApplication::applicationFilePath(); ++ return "Throne"; + } + + static QString desktopFilePath() { diff --git a/pkgs/by-name/th/throne/nixos-disable-setuid-request.patch b/pkgs/by-name/th/throne/nixos-disable-setuid-request.patch index b5aec5855a8a..72c5bb577d22 100644 --- a/pkgs/by-name/th/throne/nixos-disable-setuid-request.patch +++ b/pkgs/by-name/th/throne/nixos-disable-setuid-request.patch @@ -20,15 +20,15 @@ index 9acfee4..c0c313a 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -163,8 +163,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi - Configs::dataManager->settingsRepo->core_port = MkPort(); - if (Configs::dataManager->settingsRepo->core_port <= 0) Configs::dataManager->settingsRepo->core_port = 19810; + runOnNewThread([=, this] {GetDeviceDetails(); }); + // Prepare core - auto core_path = QApplication::applicationDirPath() + "/"; - core_path += "ThroneCore"; + auto core_path = Configs::FindCoreRealPath(); - QStringList args; - args.push_back("-port"); + bool coreDebugMode = (Configs::dataManager->settingsRepo->log_level == "debug"); + @@ -1296,6 +1295,15 @@ bool MainWindow::get_elevated_permissions(int reason) { return true; } diff --git a/pkgs/by-name/th/throne/package.nix b/pkgs/by-name/th/throne/package.nix index 1a4d4a07f668..c55051e6a158 100644 --- a/pkgs/by-name/th/throne/package.nix +++ b/pkgs/by-name/th/throne/package.nix @@ -6,6 +6,7 @@ fetchFromGitHub, fetchurl, makeDesktopItem, + nix-update-script, protobuf, protoc-gen-go, @@ -17,22 +18,23 @@ qt6Packages, - # override if you want to have more up-to-date rulesets - throne-srslist ? fetchurl { - url = "https://raw.githubusercontent.com/throneproj/routeprofiles/c637d0bb8a3707eb5e122c81753600d3e18a5969/srslist.h"; - hash = "sha256-Kf3TAGXi7Y0PhWjdTOZdPUMlimszWkcrQw9zv8pb76s="; + # To get the latest revision go to the rule-set branch and get the revision of the last commit + # Link: https://github.com/throneproj/routeprofiles/tree/rule-set + throne-srslist-info ? { + rev = "ef80dfa41c3ba2d32c9c79b8ac930c4962cb589d"; + hash = "sha256-GKlrla/Zy+IE+V5zwDHw6oqzWBND/w7uUntnuJx5BJg="; }, }: stdenv.mkDerivation (finalAttrs: { pname = "throne"; - version = "1.1.2"; + version = "1.2.2"; src = fetchFromGitHub { owner = "throneproj"; repo = "Throne"; tag = finalAttrs.version; - hash = "sha256-gtbGKyEOTq+1IP7v4ZhVVohGQFlDtP7NbbhyFD2rCnA="; + hash = "sha256-b0iLGQjG+Iz9ZQeR1El907SPIzXiwrgJt8oZHIDhABc="; }; strictDeps = true; @@ -60,13 +62,21 @@ stdenv.mkDerivation (finalAttrs: { # to make use of security wrappers ./nixos-disable-setuid-request.patch - # sets the Exec field of the auto-run .desktop file to use the Throne binary from PATH - ./fix-autorun-desktop-exec.patch + # sets the Exec field of the auto-run and the scheme-handler .desktop files to use the Throne binary from PATH + ./fix-desktop-exec.patch ]; - preBuild = '' - ln -s ${throne-srslist} ./srslist.h - ''; + preBuild = + let + srslist = fetchurl { + name = "throne-srslist-${throne-srslist-info.rev}.h"; + url = "https://raw.githubusercontent.com/throneproj/routeprofiles/${throne-srslist-info.rev}/srslist.h"; + hash = throne-srslist-info.hash; + }; + in + '' + ln -s ${srslist} ./srslist.h + ''; # we'll wrap manually dontWrapQtApps = true; @@ -100,15 +110,17 @@ stdenv.mkDerivation (finalAttrs: { passthru.core = buildGoModule { pname = "throne-core"; inherit (finalAttrs) version src; - sourceRoot = "${finalAttrs.src.name}/core/server"; + modRoot = "./core/server"; patches = [ # also check cap_net_admin so we don't have to set suid ./core-also-check-capabilities.patch + + # disable a security check, which hopefully is not too bad + ./dont-check-parent.patch ]; - proxyVendor = true; - vendorHash = "sha256-G0ev2my+sHQFYdmfkR2Zq3ujSeqi5fZ4BdrnUS8mfDE="; + vendorHash = "sha256-oJE3xrFKBOtdFcZgpJNTe2xiAJfmiJTfnxaYZKM9a+w="; nativeBuildInputs = [ protobuf @@ -116,14 +128,22 @@ stdenv.mkDerivation (finalAttrs: { protoc-gen-go-grpc ]; - # taken from script/build_go.sh preBuild = '' - pushd gen - protoc -I . --go_out=. --go-grpc_out=. libcore.proto - popd + # run only if we're not in the FOD fetcher + if [ -d vendor ]; then + install -Dm755 vendor/github.com/sagernet/cronet-go/lib/"$GOOS"_"$GOARCH"/libcronet.so -t "$out/lib/" - VERSION_SINGBOX=$(go list -m -f '{{.Version}}' github.com/sagernet/sing-box) - ldflags+=("-X 'github.com/sagernet/sing-box/constant.Version=$VERSION_SINGBOX'") + substituteInPlace vendor/github.com/sagernet/cronet-go/internal/cronet/loader_unix.go \ + --replace-fail "path = findLibrary()" "path = \"$out/lib/libcronet.so\"" + + # taken from script/build_go.sh + pushd gen + protoc -I . --go_out=. --go-grpc_out=. libcore.proto + popd + + VERSION_SINGBOX=$(go list -m -f '{{.Version}}' github.com/sagernet/sing-box) + ldflags+=("-X 'github.com/sagernet/sing-box/constant.Version=$VERSION_SINGBOX'") + fi ''; # ldflags and tags are taken from script/build_go.sh @@ -146,12 +166,16 @@ stdenv.mkDerivation (finalAttrs: { "badlinkname" "tfogo_checklinkname" "with_naive_outbound" - "with_purego" # prebuilt .a files inside cronet-go are annoying to fix + "with_purego" # use prebuilt .so instead of prebuilt .a files for cronet-go ]; }; - # this tricks nix-update into also updating the vendorHash of passthru.core - passthru.goModules = finalAttrs.passthru.core.goModules; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "core" + ]; + }; meta = { description = "Qt based cross-platform GUI proxy configuration manager"; @@ -164,5 +188,9 @@ stdenv.mkDerivation (finalAttrs: { aleksana ]; platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode # libcronet.so used by throne.core + ]; }; }) diff --git a/pkgs/by-name/ti/tinygltf/package.nix b/pkgs/by-name/ti/tinygltf/package.nix index 02c40783ae14..00271dcff0a4 100644 --- a/pkgs/by-name/ti/tinygltf/package.nix +++ b/pkgs/by-name/ti/tinygltf/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinygltf"; - version = "3.0.0"; + version = "3.0.1"; strictDeps = true; __structuredAttrs = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "syoyo"; repo = "tinygltf"; tag = "v${finalAttrs.version}"; - hash = "sha256-qs/7O/nPXpMbn31smMfdd3V9zRbyhAnDyjZwlduseKU="; + hash = "sha256-ZBKtqZMumaSiFBdc8ZYolryOutYQ/WP0JAxuoBf0eMg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tw/twitch-tui/package.nix b/pkgs/by-name/tw/twitch-tui/package.nix index f3128a4c63d7..6076bb742e71 100644 --- a/pkgs/by-name/tw/twitch-tui/package.nix +++ b/pkgs/by-name/tw/twitch-tui/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, rustPlatform, + nix-update-script, pkg-config, openssl, }: @@ -27,6 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Twitch chat in the terminal"; homepage = "https://github.com/Xithrius/twitch-tui"; diff --git a/pkgs/by-name/un/unordered_dense/package.nix b/pkgs/by-name/un/unordered_dense/package.nix index 7f541678efa6..48ed5057d4e6 100644 --- a/pkgs/by-name/un/unordered_dense/package.nix +++ b/pkgs/by-name/un/unordered_dense/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "unordered_dense"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "martinus"; repo = "unordered_dense"; tag = "v${finalAttrs.version}"; - hash = "sha256-JdPlyShWnAcdgixDHRaroFg7YWdPtD4Nl1PmpcQ1SAk="; + hash = "sha256-M8eBkoTVnZ1sjvLIQ3aObaxZyephXcvmpIh1bc6T5Ik="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/va/vault-unseal/package.nix b/pkgs/by-name/va/vault-unseal/package.nix index 0975150c6f27..0d196539282e 100644 --- a/pkgs/by-name/va/vault-unseal/package.nix +++ b/pkgs/by-name/va/vault-unseal/package.nix @@ -5,7 +5,7 @@ }: let - version = "1.0.0"; + version = "1.0.1"; in buildGoModule { pname = "vault-unseal"; @@ -15,10 +15,10 @@ buildGoModule { owner = "lrstanley"; repo = "vault-unseal"; rev = "v${version}"; - hash = "sha256-czfG7DsA6O2n8BlzEEvNtu0Dg277qBnLAdVUZLo6+8w="; + hash = "sha256-AVKQbX5xFCU9aNdDm2uTr+v2w4vnVEhTd3jfgqwXN2E="; }; - vendorHash = "sha256-ma3xbnWH87b1X5fdOjigzsj5gEfhbjyTLoIDyp9eY80="; + vendorHash = "sha256-/ov2rvVZJgRsALgBMTaQE4CXplBJDhBrlIq2rHblO4k="; meta = { changelog = "https://github.com/lrstanley/vault-unseal/releases/tag/v${version}"; diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 4641259958f8..6c765f52012d 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-VIr66Lbp8Zur5/Lo097QLyDyEjKT3Vj+hmWY42NXfAc="; + x86_64-linux = "sha256-PRTudHtVhUdvDi0o1PF0rjZP8DW5J5eocCM77lsxd58="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "23.8"; + version = "23.9"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/by-name/ya/yarn-zpm/package.nix b/pkgs/by-name/ya/yarn-zpm/package.nix index 8f6ce06292b2..388fb901531f 100644 --- a/pkgs/by-name/ya/yarn-zpm/package.nix +++ b/pkgs/by-name/ya/yarn-zpm/package.nix @@ -1,23 +1,26 @@ { lib, fetchFromGitHub, + git, + jq, nix-update-script, + runCommand, rustPlatform, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "yarn-zpm"; - version = "6.0.0-rc.18"; + version = "6.0.0-rc.19"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "zpm"; tag = "v${finalAttrs.version}"; - hash = "sha256-eiI20hptKhQegh/BRKgDwd6ztQ7XsupV3vtGpdxTrdA="; + hash = "sha256-I7iMmTcz+NfZfSebOTNDTe1YTwqGCU3zC+5pRhkYgsQ="; }; - cargoHash = "sha256-mcTlUwnr02pmiQhgkLHOUHoxBxWB8rwuOgjEEqdW0wE="; + cargoHash = "sha256-6TPis4c/2uLGfG3NppY72x8YPo8WyAGRXt4urIwIGt0="; cargoBuildFlags = [ "--package=zpm" ]; cargoTestFlags = [ "--package=zpm" ]; @@ -33,6 +36,35 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru = { updateScript = nix-update-script { }; + tests = { + simple-test = + runCommand "yarn-zpm-simple-test" + { + nativeBuildInputs = [ + jq + git + finalAttrs.finalPackage + ]; + } + '' + export HOME=$(mktemp -d) + git config --global user.name nixbld + git config --global user.email nixbld@localhost + cat > .yarnrc.yml < package.json.tmp + mv package.json.tmp package.json + mkdir workspace-test + jq -n '{name: "workspace-test"}' > workspace-test/package.json + yarn install + jq -e '.name == "workspace-test"' node_modules/workspace-test/package.json + jq -e '.workspaces | has("workspace-test")' yarn.lock + touch $out + ''; + }; }; meta = { diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 61080c03f37e..4810f7e332cc 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.22.0"; + version = "11.22.2"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-r0ODtq+EiOpHWTm3vTW2FI5Xp8yqXK1Ekfh3hP6ns2Q="; + hash = "sha256-jLi4++LYh8vuMjcHW4OkSZkNqrXtiukFSQLqY9/XcjY="; }; - npmDepsHash = "sha256-yzWx39qU/RH5XdY89nz/vZcq9exyAmVQnB5FU4pke48="; + npmDepsHash = "sha256-qmbylSpDTtLtnHVz0VOXLXQ+fhLoeKdcCC/kwgm9OkQ="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 3127c95225ec..51e61bb1d429 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -7,24 +7,26 @@ meson, ninja, vala, + gcr_4, gtk4, libadwaita, libgee, granite7, pantheon-wayland, polkit, + systemd, wrapGAppsHook4, }: stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; - version = "8.0.2"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "pantheon-agent-polkit"; rev = version; - hash = "sha256-tuugtrnamY9QMlF/ju5+4gwcEESFqH4jDH/kz790v5Y="; + hash = "sha256-ge/RZhzujI++ye7Gka/28W9CQjbmy+/5NstjqcVDUXw="; }; nativeBuildInputs = [ @@ -36,12 +38,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gcr_4 granite7 gtk4 libadwaita libgee pantheon-wayland polkit + systemd ]; passthru = { diff --git a/pkgs/development/python-modules/azure-mgmt-automation/default.nix b/pkgs/development/python-modules/azure-mgmt-automation/default.nix index e69405790457..6f06e570fcb4 100644 --- a/pkgs/development/python-modules/azure-mgmt-automation/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-automation/default.nix @@ -4,27 +4,30 @@ fetchPypi, setuptools, msrest, - azure-common, + azure-core, azure-mgmt-core, + isodate, + typing-extensions, }: buildPythonPackage (finalAttrs: { pname = "azure-mgmt-automation"; - version = "1.0.1"; + version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_automation"; inherit (finalAttrs) version; - hash = "sha256-A/NYbg/gllws7cp5plM4CHKuYnwm6lNlpVuqTq1aeO8="; + hash = "sha256-nRVIwul58bj8PtUXc/yEo0BkVSAzU+f3v19A5YEQmRY="; }; build-system = [ setuptools ]; dependencies = [ - msrest - azure-common + azure-core azure-mgmt-core + isodate + typing-extensions ]; # has no tests diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index 37dea5088b6d..d4b48bf479ab 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -22,7 +22,7 @@ confluent-kafka, # test - myst-docutils, + myst-parser, pytestCheckHook, pytest-benchmark, }: @@ -80,7 +80,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - myst-docutils + myst-parser pytestCheckHook pytest-benchmark ] @@ -95,7 +95,7 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # depends on an old myst-docutils version + # depends on an old myst-parser version "docs" ]; diff --git a/pkgs/development/python-modules/colcon/default.nix b/pkgs/development/python-modules/colcon/default.nix index 3fe756ff4de5..86d0f0a0ba64 100644 --- a/pkgs/development/python-modules/colcon/default.nix +++ b/pkgs/development/python-modules/colcon/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "colcon-core"; - version = "0.21.0"; + version = "0.21.1"; pyproject = true; src = fetchFromGitHub { owner = "colcon"; repo = "colcon-core"; tag = version; - hash = "sha256-yERPJD2LYmBrLchyX/axQ+8h5/hRXsjvzF3DkR8CsCs="; + hash = "sha256-nIROvz5HdL8s9gCcXGhbygce1M/0O0KXaHDDs2rP1i0="; }; # Upstream tracking issue: https://github.com/ros2/ros2/issues/1738 diff --git a/pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix b/pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix index c4cbae189f5c..9f809bea5a2b 100644 --- a/pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix +++ b/pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix @@ -8,13 +8,13 @@ buildPythonPackage (finalAttrs: { pname = "comfyui-workflow-templates-core"; - version = "0.3.292"; + version = "0.3.295"; pyproject = true; src = fetchPypi { pname = "comfyui_workflow_templates_core"; inherit (finalAttrs) version; - hash = "sha256-sUOd5A3U8XdbEZ/lyFD55oDKQ9qKCqDNNnpytk9DUVc="; + hash = "sha256-Udr0hfQ41AkE+OXAt/YLJZ3QSQiHWNqjPqaZo0WFIrA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix b/pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix index 612115cbd127..75f8b27c6483 100644 --- a/pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix +++ b/pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix @@ -8,13 +8,13 @@ buildPythonPackage (finalAttrs: { pname = "comfyui-workflow-templates-json"; - version = "0.1.27"; + version = "0.1.30"; pyproject = true; src = fetchPypi { pname = "comfyui_workflow_templates_json"; inherit (finalAttrs) version; - hash = "sha256-rA9gikXDIskrknaHAWak3JffQGp3I+vXIY7cvVSH4D0="; + hash = "sha256-uAjVUvVLCR+2ySpZJn+NITtky0mxl90uul2UuusMJL0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/comfyui-workflow-templates-media-assets-01/default.nix b/pkgs/development/python-modules/comfyui-workflow-templates-media-assets-01/default.nix index 2b41007e1fde..c7415129210e 100644 --- a/pkgs/development/python-modules/comfyui-workflow-templates-media-assets-01/default.nix +++ b/pkgs/development/python-modules/comfyui-workflow-templates-media-assets-01/default.nix @@ -8,13 +8,13 @@ buildPythonPackage (finalAttrs: { pname = "comfyui-workflow-templates-media-assets-01"; - version = "0.1.17"; + version = "0.1.19"; pyproject = true; src = fetchPypi { pname = "comfyui_workflow_templates_media_assets_01"; inherit (finalAttrs) version; - hash = "sha256-wpa3o4tC6IztwBRNwSZTQP0itQpNzvAcGlViCz3zhKk="; + hash = "sha256-N+hWCIJID1r8lnS0hydmEygNTniXObfaZa2AyW7vBP0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/comfyui-workflow-templates/default.nix b/pkgs/development/python-modules/comfyui-workflow-templates/default.nix index 385e1e7bdfa7..ac59c05c67c2 100644 --- a/pkgs/development/python-modules/comfyui-workflow-templates/default.nix +++ b/pkgs/development/python-modules/comfyui-workflow-templates/default.nix @@ -15,13 +15,13 @@ buildPythonPackage (finalAttrs: { pname = "comfyui-workflow-templates"; - version = "0.11.27"; + version = "0.11.31"; pyproject = true; src = fetchPypi { pname = "comfyui_workflow_templates"; inherit (finalAttrs) version; - hash = "sha256-ct20s0Z61lY/xZb1pIIVvpaxaq/O94/x7DPFz6PqdOg="; + hash = "sha256-tE2d5AgU39CW3PGYYW6k8a8YJU+MK837a0ms0gBOaS8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/datalab-platform/default.nix b/pkgs/development/python-modules/datalab-platform/default.nix index f4012144743d..0c6d7302a28a 100644 --- a/pkgs/development/python-modules/datalab-platform/default.nix +++ b/pkgs/development/python-modules/datalab-platform/default.nix @@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: { pname = "datalab-platform"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; __structuredAttrs = true; @@ -61,7 +61,7 @@ buildPythonPackage (finalAttrs: { owner = "DataLab-Platform"; repo = "DataLab"; tag = "v${finalAttrs.version}"; - hash = "sha256-rJDA5qYv2LYMyrckxNy63Gqn8HYU62qG0OAioztKGtA="; + hash = "sha256-c9ze/Qw6FZ78JEkoQzJSESf/0tWvbL9wHuE2xlzKlv8="; }; # NOTE: DataLab is compatible with qt6, but it's apparently not perfect as diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix index b520c6dd8be2..2576c2f9d94c 100644 --- a/pkgs/development/python-modules/exiv2/default.nix +++ b/pkgs/development/python-modules/exiv2/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage (finalAttrs: { pname = "exiv2"; - version = "0.18.1"; + version = "0.19.0"; pyproject = true; src = fetchFromGitHub { owner = "jim-easterbrook"; repo = "python-exiv2"; tag = finalAttrs.version; - hash = "sha256-3r0qGsCkfe2sQuXiCipXzW0vF2JRg77L1IcOiLTPslM="; + hash = "sha256-BIRIq5k4H+n+8d8B4lpr5VpfXA2JkcI54ZPPWDYtajQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 4a9958b594dd..bea18ecf2ae8 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "mail-parser"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "SpamScope"; repo = "mail-parser"; tag = finalAttrs.version; - hash = "sha256-fuL2cWQSkYQKhG/UVNOp4ch4MrZINizvsPCQUzb3Z9c="; + hash = "sha256-nOoDe3k2q/PpnzGpcsY/NcTIMvt1QjSmP7NqKnlwJyY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix deleted file mode 100644 index 2cf526518173..000000000000 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - beautifulsoup4, - buildPythonPackage, - defusedxml, - docutils, - fetchFromGitHub, - flit-core, - jinja2, - markdown-it-py, - mdit-py-plugins, - pytest-param-files, - pytest-regressions, - pytestCheckHook, - pyyaml, - sphinx-pytest, - sphinx, - typing-extensions, -}: - -buildPythonPackage rec { - pname = "myst-docutils"; - version = "5.0.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "executablebooks"; - repo = "MyST-Parser"; - tag = "v${version}"; - hash = "sha256-0lGejdGVVvZar3sPBbvThXzJML7PcR5+shyDHTTtVEY="; - }; - - build-system = [ flit-core ]; - - dependencies = [ - docutils - jinja2 - markdown-it-py - mdit-py-plugins - pyyaml - sphinx - typing-extensions - ]; - - nativeCheckInputs = [ - beautifulsoup4 - defusedxml - pytest-param-files - pytest-regressions - pytestCheckHook - sphinx-pytest - ]; - - pythonImportsCheck = [ "myst_parser" ]; - - disabledTests = [ - # Tests require linkify - "test_cmdline" - "test_extended_syntaxes" - # sphinx compat - "test_sphinx_directives" - ]; - - disabledTestPaths = [ - # Assertion errors - "tests/test_sphinx/" - ]; - - meta = { - description = "Extended commonmark compliant parser, with bridges to docutils/sphinx"; - homepage = "https://github.com/executablebooks/MyST-Parser"; - changelog = "https://github.com/executablebooks/MyST-Parser/blob/${src.tag}/CHANGELOG.md"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/ossapi/default.nix b/pkgs/development/python-modules/ossapi/default.nix index 5f9246e723c4..32723de1f8af 100644 --- a/pkgs/development/python-modules/ossapi/default.nix +++ b/pkgs/development/python-modules/ossapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "ossapi"; - version = "5.3.5"; + version = "5.3.6"; pyproject = true; src = fetchFromGitHub { owner = "Liam-DeVoe"; repo = "ossapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-gkees4d12vCfx5KGNKm9NjW5XmRw+xJy2RISMOKzG+s="; + hash = "sha256-XppjM3WNdu4r3K0oARk/krPfPMiiCxwz2CYRCx8LphA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index b43ed3795ee3..536fa2ff107b 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -77,6 +77,25 @@ buildPythonPackage { "opt_einsum" ]; + pythonRemoveDeps = lib.optionals cudaSupport [ + "cuda-python" + "nvidia-cublas-cu12" + "nvidia-cuda-cccl-cu12" + "nvidia-cuda-cupti-cu12" + "nvidia-cuda-nvrtc-cu12" + "nvidia-cuda-runtime-cu12" + "nvidia-cudnn-cu12" + "nvidia-cufile-cu12" + "nvidia-cufft-cu12" + "nvidia-curand-cu12" + "nvidia-cusolver-cu12" + "nvidia-cusparse-cu12" + "nvidia-cusparselt-cu12" + "nvidia-nccl-cu12" + "nvidia-nvjitlink-cu12" + "nvidia-nvtx-cu12" + ]; + dependencies = [ setuptools httpx diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix index 1da92396040d..d1c1ae49ed86 100644 --- a/pkgs/development/python-modules/pyzx/default.nix +++ b/pkgs/development/python-modules/pyzx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyzx"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; src = fetchFromGitHub { owner = "zxcalc"; repo = "pyzx"; tag = "v${version}"; - hash = "sha256-ovc+7EACfGHbqGtBwD01h7TdSaifOGQK5E4+judVvSI="; + hash = "sha256-NsA+txVj938sk10DEZIsN2Rveo0z6PIioWPHQ3+AIuA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rfc3161-client/default.nix b/pkgs/development/python-modules/rfc3161-client/default.nix index 9d8dfdc33826..a424825542df 100644 --- a/pkgs/development/python-modules/rfc3161-client/default.nix +++ b/pkgs/development/python-modules/rfc3161-client/default.nix @@ -11,19 +11,19 @@ buildPythonPackage (finalAttrs: { pname = "rfc3161-client"; - version = "1.0.6"; + version = "1.0.8"; pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; repo = "rfc3161-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-8OjohrHqUgsKXRZ28Au6Un6Wlzh81XVSQosoQC2f+Fs="; + hash = "sha256-ztszylefOKYqmvJsevM1T18C4oLC6AXRbbUT8DXTjEI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src pname; - hash = "sha256-jQsogV+qR0jAkHz/Slg9oBO/f96osU8YcjuaX4ZJQTk="; + hash = "sha256-ntqiITOKBIGpvuYj1fUrIsP+AGPlHtOXt0IApwLYNWY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index c31dae14e31b..55a8763bde73 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-5eBr1+QqRDKwXZDChQG5Wf5p79zqvCGyCUp3KgNg1yE="; + hash = "sha256-gC0GnwncJ3MPrWrdzz537ihhbJN5uHl/opLnUmcM+RE="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 746286fcf2ea..c8d191df2355 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, six, pytestCheckHook, }: @@ -9,14 +10,19 @@ buildPythonPackage (finalAttrs: { pname = "srptools"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit (finalAttrs) pname version; + pname = "srptools"; + inherit (finalAttrs) version; hash = "sha256-f6QzclahVC6PW7S+0Z4dmuqY/l/5uvdmkzQqHdasfJY="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tree-sitter-grammars/default.nix b/pkgs/development/python-modules/tree-sitter-grammars/default.nix index c2ab41f35662..6f72c6ca703f 100644 --- a/pkgs/development/python-modules/tree-sitter-grammars/default.nix +++ b/pkgs/development/python-modules/tree-sitter-grammars/default.nix @@ -27,7 +27,6 @@ let ) ]; snakeCaseName = lib.replaceStrings [ "-" ] [ "_" ] name; - drvPrefix = "python-${name}"; # If the name of the grammar attribute differs from the grammar's symbol name, # it could cause a symbol mismatch at load time. This manually curated collection # of overrides ensures the binding can find the correct symbol @@ -39,12 +38,12 @@ let in buildPythonPackage { inherit version; - pname = drvPrefix; + pname = name; pyproject = true; build-system = [ setuptools ]; src = symlinkJoin { - name = "${drvPrefix}-source"; + name = "${name}-source"; paths = [ (writeTextDir "${snakeCaseName}/__init__.py" /* python */ '' # AUTO-GENERATED DO NOT EDIT diff --git a/pkgs/development/python-modules/ua-generator/default.nix b/pkgs/development/python-modules/ua-generator/default.nix index c840d86fed57..4f07aa57f677 100644 --- a/pkgs/development/python-modules/ua-generator/default.nix +++ b/pkgs/development/python-modules/ua-generator/default.nix @@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: { pname = "ua-generator"; - version = "2.1.2"; + version = "2.1.3"; pyproject = true; __structuredAttrs = true; @@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: { owner = "iamdual"; repo = "ua-generator"; tag = finalAttrs.version; - hash = "sha256-mpwyhR50a0F8J9VUyOoYNF20IbOKaDl+JpQ1qkLIt6s="; + hash = "sha256-Vs4aD+XPek3ZmmSohsZNuEnWkonfSPtWsF+tXBJ3bQo="; }; build-system = [ setuptools ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f32749404d97..e170f6914819 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -126,12 +126,12 @@ rec { }; dc_580 = generic rec { - version = "580.159.04"; + version = "580.178.04"; url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run"; - sha256_64bit = "sha256-weZnYbCI0Xs632y2l53przi+JoTRArABoXbc+vq9yh4="; - persistencedSha256 = "sha256-vDawiy52GB8JABUKZDiQUc8uda8p/7jCFW7rTu6QMa4="; - fabricmanagerSha256 = "sha256-Jk6XVn/d6vqfxYGAACiD9UHelnjdC4+zOi4EEv8LuKE="; - openSha256 = "sha256-zsNmjZW0cyZWPp3vDT3mNeqAo0hS0M7e9Tbvwvij+F4="; + sha256_64bit = "sha256-WXWobuRb/8tib1GuM9EWmxCBhqLqR61lHnLxP6S21vk="; + persistencedSha256 = "sha256-3Omj160wtWdKAZDzWt/m/cbUTQ9DMJ1rSxMrnIrKXiw="; + fabricmanagerSha256 = "sha256-xZnTQYZy/uPrTLD6mACflGGWtaYB4luzh0AFxTstNIw="; + openSha256 = "sha256-7eXEROG2rQK9+Ag26nG4jFPrnKeveVUQ0ugIAshJZPQ="; useSettings = false; usePersistenced = true; useFabricmanager = true; @@ -155,12 +155,12 @@ rec { # LTSB supported until Aug 2028 legacy_580 = generic { - version = "580.173.02"; - sha256_64bit = "sha256-jY65AB4FqaimY9PV0wT+tk7yhE7hhczf2VJ4aCD0bhs="; - sha256_aarch64 = "sha256-1lvVYIfvTXjwSoCNp4g8NaWQHF/TfpXRUKdgLrqXqoA="; - openSha256 = "sha256-lhloZdf6XbaAFTZBF1DxE0Nv9VC6obY8UPf0VyfVepE="; - settingsSha256 = "sha256-dfdu/3tnwHUfP7WoeQFNOMalMlpmUWjeMDIOnu+yi8E="; - persistencedSha256 = "sha256-j8YM1w231X+JIP3c3TpUNurEBumEu1stVjzFGWu1JXE="; + version = "580.178.04"; + sha256_64bit = "sha256-WXWobuRb/8tib1GuM9EWmxCBhqLqR61lHnLxP6S21vk="; + sha256_aarch64 = "sha256-71nsXSSFDhLW91UOwffPhNtTqEzpxj6zulXvXtDE8Ek="; + openSha256 = "sha256-7eXEROG2rQK9+Ag26nG4jFPrnKeveVUQ0ugIAshJZPQ="; + settingsSha256 = "sha256-KcrGHoR+ZMdsFyI4myU8/eVls2f8GkNSX/j2JnZndyM="; + persistencedSha256 = "sha256-3Omj160wtWdKAZDzWt/m/cbUTQ9DMJ1rSxMrnIrKXiw="; }; # Last one without the bug reported here: diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix index d3523734f3cd..a18fc2f962a2 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix @@ -2,11 +2,11 @@ grafanaPlugin { pname = "grafana-github-datasource"; - version = "2.8.0"; + version = "2.9.0"; zipHash = { - x86_64-linux = "sha256-hKElyWX4fcQtF3eyYVRuaJjvNWY9CV2bNoNkFLeJQLc="; - aarch64-linux = "sha256-+ygxJc+ovlqjcs68QD71JQepINTeauA41sKrJa6h8gc="; - aarch64-darwin = "sha256-s4q+k1gbOBCeMDpkTpui0egOxzoBjbKoX63pwVqmY6A="; + x86_64-linux = "sha256-pGkg4GQwg8oPgUOYThfa/rnf+/jTAURwuwthLYagWvw="; + aarch64-linux = "sha256-/8rEZiUK4OBDktDtwZFl1dlt7Pk1KksjXJTjKZVNl+Y="; + aarch64-darwin = "sha256-Yq4qXFMgEuPwq5+W/gcgTQSwww1QawhzuvPicCdgtEs="; }; meta = { description = "Allows GitHub API data to be visually represented in Grafana dashboards"; diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix index a0b60969d2d4..395d9ec19509 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "marcusolsson-json-datasource"; - version = "1.4.0"; - zipHash = "sha256-DkBZzzLaFfQuiFoElzluUJMXgUx0ZAdTsf6K1/Cv16w="; + version = "1.4.1"; + zipHash = "sha256-tLjb3ZTK26Cb3CQ1qSRTtmbdzYD4S+vzI2OopogsY0M="; meta = { description = "Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana"; license = lib.licenses.asl20; diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix index d9a554dbd286..8c86373628e2 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-azure"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-azure"; tag = "v${version}"; - hash = "sha256-QnVv9bHmgNex+4h/qyFgXd+CXoLrHjfxOReeYfrC/6Q="; + hash = "sha256-SDyNl1AM9/C7mhaWMDTpsC7s876zat0HFs+21XuSPmo="; }; - vendorHash = "sha256-VHLRKdzHCXybcqSTV1xjTk1Edt1EwEmqYvUFtDQNZFM="; + vendorHash = "sha256-FVStqWc50lgaqWv+zc+V6+fIwxLnWdODXmn1Mqx0KbE="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 800c35d48984..72801ca5f4ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1269,7 +1269,6 @@ with pkgs; # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 modules = [ nginxModules.rtmp - nginxModules.dav nginxModules.moreheaders ]; }; @@ -2223,10 +2222,6 @@ with pkgs; threadsafe = true; }; - highlight = callPackage ../tools/text/highlight { - lua = lua5; - }; - host = bind.host; hpccm = with python3Packages; toPythonApplication hpccm; @@ -7449,7 +7444,6 @@ with pkgs; # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 modules = [ nginxModules.rtmp - nginxModules.dav nginxModules.moreheaders ]; }; @@ -7461,7 +7455,6 @@ with pkgs; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 modules = [ - nginxModules.dav nginxModules.moreheaders ]; }; @@ -7486,7 +7479,6 @@ with pkgs; nginxShibboleth = nginxStable.override { modules = [ nginxModules.rtmp - nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 24c90d148c1f..6517c63514f1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -415,6 +415,7 @@ mapAliases { mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25 mypermobil = throw "'mypermobil' was removed because Home Assistant dropped the integration"; # added 2026-08-05 mysql-connector = mysql-connector-python; # added 2026-06-21 + myst-docutils = warnAlias "'myst-docutils' has been removed as it was identical to 'myst-parser'" myst-parser; napari-npe2 = warnAlias "napari-npe2 has been renamed to 'npe2'" npe2; # added 2026-07-28 net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29 ninja-python = throw "'ninja-python' has been renamed to/replaced by 'ninja'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ace6ceb4be9..4027f18d3c17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11480,8 +11480,6 @@ self: super: with self; { mysqlclient = callPackage ../development/python-modules/mysqlclient { }; - myst-docutils = callPackage ../development/python-modules/myst-docutils { }; - myst-nb = callPackage ../development/python-modules/myst-nb { }; myst-parser = callPackage ../development/python-modules/myst-parser { };