diff options
118 files changed, 1936 insertions, 1410 deletions
diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix index a43e819aac801..b4016d03f675f 100644 --- a/nixos/modules/services/misc/open-webui.nix +++ b/nixos/modules/services/misc/open-webui.nix @@ -77,6 +77,8 @@ in environment = { STATIC_DIR = "."; DATA_DIR = "."; + HF_HOME = "."; + SENTENCE_TRANSFORMERS_HOME = "."; } // cfg.environment; serviceConfig = { diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 23c04658031fb..9a7d0daa6421f 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -20,14 +20,10 @@ let else toString value; configFile = pkgs.writeText "davfs2.conf" ( - if (cfg.settings != { }) then - (toINIWithGlobalSection { - mkSectionName = escapeString; - mkKeyValue = k: v: "${k} ${formatValue v}"; - } cfg.settings) - else - cfg.extraConfig - ); + toINIWithGlobalSection { + mkSectionName = escapeString; + mkKeyValue = k: v: "${k} ${formatValue v}"; + } cfg.settings); in { @@ -53,29 +49,6 @@ in ''; }; - extraConfig = mkOption { - type = lines; - default = ""; - example = '' - proxy foo.bar:8080 - use_locks 0 - - [/media/dav] - use_locks 1 - - [/home/otto/mywebspace] - gui_optimize 1 - ''; - description = '' - Extra lines appended to the configuration of davfs2. - See {manpage}`davfs2.conf(5)` for available settings. - - **Note**: Please pass structured settings via - {option}`settings` instead, this option - will get deprecated in the future. - '' ; - }; - settings = mkOption { type = submodule { freeformType = let @@ -109,21 +82,6 @@ in config = mkIf cfg.enable { - assertions = [ - { - assertion = cfg.extraConfig != "" -> cfg.settings == { }; - message = '' - services.davfs2.extraConfig and services.davfs2.settings cannot be used together. - Please prefer using services.davfs2.settings. - ''; - } - ]; - - warnings = optional (cfg.extraConfig != "") '' - services.davfs2.extraConfig will be deprecated in future releases; - please use services.davfs2.settings instead. - ''; - environment.systemPackages = [ pkgs.davfs2 ]; environment.etc."davfs2/davfs2.conf".source = configFile; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 511d3c589faef..379496583d25d 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -392,8 +392,6 @@ in { testScript = { nodes, ... }: let caDomain = nodes.acme.test-support.acme.caDomain; - newServerSystem = nodes.webserver.config.system.build.toplevel; - switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test"; in # Note, wait_for_unit does not work for oneshot services that do not have RemainAfterExit=true, # this is because a oneshot goes from inactive => activating => inactive, and never @@ -545,6 +543,12 @@ in { check_fullchain(webserver, "http.example.test") check_issuer(webserver, "http.example.test", "pebble") + # Perform account hash test + with subtest("Assert that account hash didn't unexpected change"): + hash = webserver.succeed("ls /var/lib/acme/.lego/accounts/") + print("Account hash: " + hash) + assert hash.strip() == "d590213ed52603e9128d" + # Perform renewal test with subtest("Can renew certificates when they expire"): hash = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem") diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 3929522a39e73..d420c482ca7f2 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -120,12 +120,14 @@ in { { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; } ]; settings = { - # Must not specify the OpenSSL provided algorithms. - Ciphers = [ "chacha20-poly1305@openssh.com" ]; - KexAlgorithms = [ - "curve25519-sha256" - "curve25519-sha256@libssh.org" - ]; + # Since this test is against an OpenSSH-without-OpenSSL, + # we have to override NixOS's defaults ciphers (which require OpenSSL) + # and instead set these to null, which will mean OpenSSH uses its defaults. + # Expectedly, OpenSSH's defaults don't require OpenSSL when it's compiled + # without OpenSSL. + Ciphers = null; + KexAlgorithms = null; + Macs = null; }; }; users.users.root.openssh.authorizedKeys.keys = [ diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index 625bad268da86..d8bdd4fec98d3 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-ZcpxMVUb24Ckb3CunibNYvDRk6MOsutUCUfElbUQ8Ok="; + hash = "sha256-xnVhPiHhI7VqkSBBlrKJBpdS6kd51DMlKWVnJIo/OQQ="; }; - cargoHash = "sha256-uZlzWxdruwPemUnvhjyh9uKRb8vj7462N/2u2bTGQgI="; + cargoHash = "sha256-Reglc7UtsFk+VIwg4Q9TIChVrWweuV6yPWxbtTDH6mU="; nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 7f6d3c87e5ba6..6e07d531514ce 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.7"; + version = "0.9.3.9"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-NwDVytD6nIM++ixGmLh02FIE+hLKHBwwD3aEAXVZn7I="; + hash = "sha256-EoHCOg4nPkKRSFX/3AUKJaXzS6J1quwtv+mKeKBu5Ns="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 85cf351904919..d1e2e392bc5f3 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -32,15 +32,16 @@ , systemd , xdg-utils , xorg +, libGL }: stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.13.0"; + version = "5.13.1"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-d7JAvpZKdhG9BzCdfwyPlmXcqE49heVLskusaB0uOhg="; + sha256 = "sha256-TnvVm0qjm41if90+f9YtO8wR6NYg6oUZbZd0RiUU33M="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; @@ -84,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXScrnSaver xorg.libxshmfence xorg.libXtst + libGL ]; runtimeDependencies = diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/applications/blockchains/dcrwallet/default.nix index 29a3b12cc5907..71b1782b503d4 100644 --- a/pkgs/applications/blockchains/dcrwallet/default.nix +++ b/pkgs/applications/blockchains/dcrwallet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; rev = "release-v${version}"; - hash = "sha256-vFh3+FDN1+7HiP9fFyW8p1LJkW0lfwAiyLhZjqxQ6J4="; + hash = "sha256-fsmil9YQNvXDyBxyt+Ei3F5U/dvbrzbZ01+v9o3+jVY="; }; - vendorHash = "sha256-rVkQsr14yqATLGxevl8PLBOhVnTCrM4Yo2G5NvX/59g="; + vendorHash = "sha256-ehtgsBCFzMft8285IjpsQ6y9HPb/UpZmcj9X4m8ZKXo="; subPackages = [ "." ]; diff --git a/pkgs/applications/blockchains/quorum/default.nix b/pkgs/applications/blockchains/quorum/default.nix index b50d91a07e895..528caec921763 100644 --- a/pkgs/applications/blockchains/quorum/default.nix +++ b/pkgs/applications/blockchains/quorum/default.nix @@ -2,21 +2,16 @@ buildGoModule rec { pname = "quorum"; - version = "23.4.0"; + version = "24.4.0"; src = fetchFromGitHub { owner = "Consensys"; repo = pname; rev = "v${version}"; - hash = "sha256-N8MlDHo6LQ/m9xFUeOCm6bqDtjnCc86i/s4ebFLjUT0="; + hash = "sha256-vQyKguoSUU6Drkg8XqWtK8Ow/B9dqDKkKq6yeDQk1c0="; }; - vendorHash = "sha256-dTYKGFqVaAnspvKhfBU10bpSzhtQHGTm6KxnNKUVAIg="; - - patches = [ - # Add missing requirements - ./go.mod.patch - ]; + vendorHash = "sha256-YK2zpQz4pAFyA+aHOn6Nx0htl5SJ2HNC+TDV1RdLQJk="; subPackages = [ "cmd/geth" @@ -30,6 +25,6 @@ buildGoModule rec { homepage = "https://consensys.net/quorum/"; license = licenses.lgpl3; maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/quorum/go.mod.patch b/pkgs/applications/blockchains/quorum/go.mod.patch deleted file mode 100644 index 7161371ac60c3..0000000000000 --- a/pkgs/applications/blockchains/quorum/go.mod.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/go.mod b/go.mod -index ace412f41..3336c1e08 100644 ---- a/go.mod -+++ b/go.mod -@@ -89,6 +89,7 @@ require ( - golang.org/x/text v0.3.7 - golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 - google.golang.org/grpc v1.46.0 -+ google.golang.org/protobuf v1.28.0 - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c - gopkg.in/karalabe/cookiejar.v2 v2.0.0-20150724131613-8dcd6a7f4951 - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/applications/display-managers/emptty/default.nix index 2e4650f563ba6..eb25c1b109050 100644 --- a/pkgs/applications/display-managers/emptty/default.nix +++ b/pkgs/applications/display-managers/emptty/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "emptty"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "tvrzna"; repo = pname; rev = "v${version}"; - hash = "sha256-64Ta0k4TzJcQC+RDybHzFUj96ZSRUOeYQ2U9KFjDXjk="; + hash = "sha256-9qNAQBmcFKPpJ+AqfOy3emA1fvqI/XaT39KwI5fpXHU="; }; buildInputs = [ pam libX11 ]; - vendorHash = "sha256-tviPb05puHvBdDkSsRrBExUVxQy+DzmkjB+W9W2CG4M="; + vendorHash = "sha256-PLyemAUcCz9H7+nAxftki3G7rQoEeyPzY3YUEj2RFn4="; meta = with lib; { description = "Dead simple CLI Display Manager on TTY"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix index 9cfa97c4346d0..056f604d5f0d2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix @@ -7,17 +7,17 @@ }: let - rev = "13c9fa22155066acfb5a2e444fe76245738e7fb7"; + rev = "53c40d2395e04761a510aa7007336939538678c0"; in melpaBuild { pname = "edraw"; - version = "20240529.1009"; + version = "20240606.457"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; inherit rev; - hash = "sha256-h2auwVIWjrOBPHPCuLdJv5y3FpoV4V+MEOPf4xprfYg="; + hash = "sha256-gJboLPEMTFC3rP0PiJ679Nj8SmfI+qXYkX7kBLU6ywQ="; }; commit = rev; diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 79fa7648fbe75..7e7090a87a640 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -47,12 +47,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-xn6lFknL5y9WozGZtqiZVyVzOuNheGhwxWlfFOYVFzU="; + hash = "sha256-NVe5dhH3w7RL1C7Z736L5fdi/+aO+Ah9Dpa4u4kn0JY="; rev = "v${version}"; }; diff --git a/pkgs/applications/graphics/mangareader/default.nix b/pkgs/applications/graphics/mangareader/default.nix deleted file mode 100644 index 37a58ea0ba453..0000000000000 --- a/pkgs/applications/graphics/mangareader/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, wrapQtAppsHook -, extra-cmake-modules -, cmake -, kio -, ki18n -, kxmlgui -, kconfig -, karchive -, kcoreaddons -, kconfigwidgets -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "mangareader"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "g-fb"; - repo = pname; - rev = version; - hash = "sha256-YZZcp+HS/P/GxWYyOpO35nByJSzv4HahzzrZSVRcCRs="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - kio - ki18n - kxmlgui - kconfig - karchive - kcoreaddons - kconfigwidgets - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Qt manga reader for local files"; - homepage = "https://github.com/g-fb/mangareader"; - changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}"; - platforms = platforms.linux; - license = with licenses; [ gpl3Plus cc-by-nc-sa-40 ]; - maintainers = with maintainers; [ zendo ]; - }; -} diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 51b662f0ef365..5550cc55ceaa6 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -54,15 +54,15 @@ let version = { - corporate = "24.1.3.843-1"; - beta = "24.4.1.918-1"; - stable = "24.4.1.915-1"; + corporate = "24.4.3.1073-1"; + beta = "24.4.1.952-1"; + stable = "24.4.1.951-1"; }.${edition}; hash = { - corporate = "sha256-rI19YmsC2p2Dsi6Grd8IyNdpjMHWwET3wcVw5r7545M="; - beta = "sha256-EQjjaTMPQKaULITEF+MQuY1lRVXuOjyiGWuGQtIpIz0="; - stable = "sha256-2IIIADFG9kCtzB0X4AfrFI+btqoUzKwd6NlZt7qtL/M="; + corporate = "sha256-f2Q6q3rL+RcVYX46RHRAageF2JKPxmBaV6KHYl5XtN8="; + beta = "sha256-WCyjgb5uj9guqyge6giP0wavndorlMG6yacG134xWjw="; + stable = "sha256-4AsMpANtMXUS2NCPKI+Ut0tWGurRIpWCmS3PhEi1CGo="; }.${edition}; app = { diff --git a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix deleted file mode 100644 index aaaa3d4c29700..0000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; - sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; - sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix deleted file mode 100644 index c7d03c0087b31..0000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - k3sVersion = "1.27.14+k3s1"; - k3sCommit = "b0b34e4d927369147a37f95ee8ba6441e4b4102b"; - k3sRepoSha256 = "0vvglvh8hl83jrpn9i2fgbck6cp7fbbwn292w76nmckmpclm47ap"; - k3sVendorHash = "sha256-eDzBpvaK1rHp28A5zvSsxnk0CNhy4oBSifBT98M7JWc="; - chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.12.2"; - k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.4.0-k3s2"; - k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1.27"; - containerdSha256 = "0bjxw174prhq8izmgrmpyljfxzrj0lh5d0w04g3lyn0rp3kwxqsl"; - criCtlVersion = "1.26.0-rc.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 247ab0f339daa..9f2909802f911 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -338,6 +338,7 @@ buildGoModule rec { util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 conntrack-tools runc + bash ]; k3sKillallDeps = [ diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 6e7cfb0d1325c..c8e3fbc926961 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,17 +12,6 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - # 1_27 can be built with the same builder as 1_30 - k3s_1_27 = common ( - (import ./1_27/versions.nix) - // { - updateScript = [ - ./update-script.sh - "27" - ]; - } - ) extraArgs; - # 1_28 can be built with the same builder as 1_30 k3s_1_28 = common ( (import ./1_28/versions.nix) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index abc77155eb5ce..b710fe68b3ec4 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-OHDQr83EQn0qjObuzldRAa9fDv1itqipkDRcKdt3kxg="; + sha256 = "sha256-sQUX2Ou+fL4G2u/Mdnl9SwdwRkogiyq3tkauUeW//dU="; }; - vendorHash = "sha256-SLr7h830lZpou2FyYqqUsYzRsh/QzMgkTArAJjHzCx0="; + vendorHash = "sha256-j/ouxh4nMg5hyzT2RuP+hJrAeK7+PleT2W0DWxxjOfA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 519482a1cb7dd..2f4db7dcd5c16 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-jksJgWh2FyP2iYOgA9XiRKUpKvINfIv8ini3X36Zy9U="; + hash = "sha256-cnxNIFf0zCpbUg9G+bHNoApxB31O7RH5BVgprYN2GYk="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-2shBVIn/qJQlY+f0xsS9NTZkzcWEnhJpEezNYT6+8F4="; + vendorHash = "sha256-IVmz+2pWHsiZOhHKEK9GW9zZq8m1IH5lpfKeClnmc3o="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 39a7ae4690fb8..4e28f0750e49d 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.35"; + version = "3.11.36"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-L3A0bU35IfFfwDIbcNVAU4jGb00jODgq7Z67RQrT4u0="; + hash = "sha256-6WZALdKORsa0wahPKgkpzjlktJQxnbiiJLXGv3E9MXM="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 5167890de17fb..7bc13c1f85390 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.2"; + version = "5.1.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-KTgID7pd0QSFi5t9cdIVEi4/oQirDgsf7tTcEEtRdY0="; + hash = "sha256-dlPt87SKP17v9QFiRZSSUtSLVGTGbeo05G/p05l2zVc="; }; patches = [ diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 99aaa7fa3bfe6..000942ff68bdd 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { hash = "sha256-YMNf6v40GuyP7Z3ksKh13A9cFnTF9YBP9xkKbGxT3AE="; }; + patches = [ + ./fix-clang-build.diff + ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; diff --git a/pkgs/applications/office/homebank/fix-clang-build.diff b/pkgs/applications/office/homebank/fix-clang-build.diff new file mode 100644 index 0000000000000..1b8c7fd359e23 --- /dev/null +++ b/pkgs/applications/office/homebank/fix-clang-build.diff @@ -0,0 +1,23 @@ +C Standard says in 6.8.1: + + labeled-statement: + identifier : statement + case constant-expression : statement + default : statement + +Notably, only expressions and no declarations are allowed. A common workaround for this +is adding an empty statement. + +diff --git a/src/rep-budget.c b/src/rep-budget.c +index eb5cce6..61e2e77 100644 +--- a/src/rep-budget.c ++++ b/src/rep-budget.c +@@ -255,7 +255,7 @@ gint tmpmode; + } + else + { +-libname: ++libname: ; + gchar *name; + + gtk_tree_model_get(model, iter, diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index 1fa78849db6e8..8ac21c2e2bc41 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , lib , python3 , meson @@ -18,24 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "bitwuzla"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; rev = finalAttrs.version; - hash = "sha256-ZEdV4ml1LwrYwscgOcL2gLx/ijPYqRktXMQH/Njh8OI="; + hash = "sha256-/izxmN+zlrXsY6g6TRC1QqsLqltvrmZquXRd6h8RLRc="; }; - patches = [ - # fix parser on aarch64 - # remove on next release - (fetchpatch { - url = "https://github.com/bitwuzla/bitwuzla/commit/4d914aa5ec34076c37749f0cf6dce976ea510386.patch"; - hash = "sha256-gp+HEamOySjPXCC39tt5DIMdQqEew26a+M15sNdCmTM="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ meson pkg-config git ninja ]; diff --git a/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch b/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch deleted file mode 100644 index 0bc29b9aab5f4..0000000000000 --- a/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile -index ca7da03fa..b05bba115 100644 ---- a/ion/src/simulator/linux/Makefile -+++ b/ion/src/simulator/linux/Makefile -@@ -28,7 +28,6 @@ ion_src += $(addprefix ion/src/simulator/shared/, \ - collect_registers.cpp \ - haptics.cpp \ - journal.cpp \ -- platform_action_modifier_ctrl.cpp \ - state_file.cpp \ - ) - diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/applications/science/math/numworks-epsilon/default.nix index a90ebc67b65b8..98d5d0d4560ad 100644 --- a/pkgs/applications/science/math/numworks-epsilon/default.nix +++ b/pkgs/applications/science/math/numworks-epsilon/default.nix @@ -9,17 +9,18 @@ , imagemagick , gcc-arm-embedded , pkg-config +, python3Packages }: stdenv.mkDerivation rec { pname = "numworks-epsilon"; - version = "15.5.0"; + version = "22.2.0"; src = fetchFromGitHub { owner = "numworks"; repo = "epsilon"; rev = version; - sha256 = "fPBO3FzZ4k5OxG+Ifc6R/au4Te974HNKAEdHz+aFdSg="; + hash = "sha256-E2WaXTn8+Ky9kdZxvQmEt63Ggo6Ns0fZ0Za+rQGIMSg="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,18 +32,13 @@ stdenv.mkDerivation rec { python3 imagemagick gcc-arm-embedded + python3Packages.lz4 ]; makeFlags = [ "PLATFORM=simulator" ]; - patches = [ - # Remove make rule Introduced in cba596dde7 - # which causes it to not build with nix - ./0001-ion-linux-makerules.patch - ]; - installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 56d1d7206249d..ade5239762518 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.11.6"; + version = "8.13.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-00Zh8NenBikdingmx34WYYH5SF+yazeAs+7h1/3UIJY="; + hash = "sha256-Xd8mZ8tsemJ53hAMED2biRyDlEw/gG/Hh1iZSwSB1vY="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix index 052548f32f272..315dc71056730 100644 --- a/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -11,16 +11,17 @@ , libva , libglvnd , libXrandr +, libXfixes }: stdenv.mkDerivation { pname = "gpu-screen-recorder"; - version = "unstable-2023-11-18"; + version = "unstable-2024-05-21"; # printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r418.5a8900e.tar.gz"; - hash = "sha256-Dal6KxQOTqoNH6e8lYk5XEXGFG/vzbguNFZ9yk9nKe0="; + url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r594.e572073.tar.gz"; + hash = "sha256-MTBxhvkoyotmRUx1sRN/7ruXBYwIbOFQNdJHhZ3DdDk="; }; sourceRoot = "."; @@ -37,6 +38,7 @@ stdenv.mkDerivation { libdrm libva libXrandr + libXfixes ]; buildPhase = '' @@ -49,14 +51,14 @@ stdenv.mkDerivation { mv $out/bin/gpu-screen-recorder $out/bin/.wrapped/ makeWrapper "$out/bin/.wrapped/gpu-screen-recorder" "$out/bin/gpu-screen-recorder" \ --prefix LD_LIBRARY_PATH : ${libglvnd}/lib \ - --prefix PATH : $out/bin + --suffix PATH : $out/bin ''; - meta = with lib; { + meta = { description = "A screen recorder that has minimal impact on system performance by recording a window using the GPU only"; homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ babbaj ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.babbaj ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 58de0bd61e896..3329b40dfbf79 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2024-05-28"; + version = "0-unstable-2024-06-07"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "5718579addbd733a4ab190fb9355a78e8b19b0b4"; - hash = "sha256-SD15wFUWryL3sRBbREr94A8oKf8KXVBaiI2bmWxbMx4="; + rev = "38b3e8c12801df68ba15c2d96ee96d7d2362b576"; + hash = "sha256-yVKzkASMzJDmgzS0CxEFky2Y4Bs4vlbRJgUI+uG3muY="; }; dontConfigure = true; diff --git a/pkgs/by-name/dn/dnss/package.nix b/pkgs/by-name/dn/dnss/package.nix new file mode 100644 index 0000000000000..00796cf8df179 --- /dev/null +++ b/pkgs/by-name/dn/dnss/package.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule { + pname = "dnss"; + version = "0-unstable-2024-03-17"; + src = fetchFromGitHub { + owner = "albertito"; + repo = "dnss"; + rev = "da8986dd432870f5710e3e8652c92c95f34b830b"; + hash = "sha256-YjBt+22fc9yHcORRmd//rejNVvf6eK+FAYAcT0fABuI="; + }; + + vendorHash = "sha256-d9aGSBRblkvH5Ixw3jpbgC8lMW/qEYNJfLTVeUlos7A="; + + meta = with lib; { + description = "A daemon for using DNS over HTTPS"; + homepage = "https://blitiri.com.ar/git/r/dnss/"; + license = licenses.asl20; + mainProgram = "dnss"; + maintainers = with maintainers; [ raspher ]; + }; +} diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index 68b5bf783b0e4..c89ee66848459 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fantomas"; - version = "6.3.7"; + version = "6.3.8"; - nugetSha256 = "sha256-tEW1qQTcAqMVwH5tYeyukFQrjel7PrcteubzffgqKvw="; + nugetSha256 = "sha256-dNbs5+gzjjMw2fl0ZRB9qzj9d+rz1o3Wi/qUvBDoz2E="; meta = with lib; { description = "F# source code formatter"; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 2441f765482e6..5a3c6d4882102 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-RJDRxH9VKNxBSfoFl1rDTeKKyLC3C09F0Z3ksJoMDRk="; + hash = "sha256-0kReN7FKrcRhxUuwZoArLTW2F1q40Wbp9/hRoDjKZHs="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/gdtoolkit/default.nix b/pkgs/by-name/gd/gdtoolkit_3/package.nix index ea5e5ec8de9ae..6b6abbfc40260 100644 --- a/pkgs/development/tools/gdtoolkit/default.nix +++ b/pkgs/by-name/gd/gdtoolkit_3/package.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, godot3-server }: let @@ -23,15 +22,15 @@ let }; in python.pkgs.buildPythonApplication rec { - pname = "gdtoolkit"; - version = "3.3.1"; + pname = "gdtoolkit3"; + version = "3.5.0"; # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) src = fetchFromGitHub { owner = "Scony"; repo = "godot-gdscript-toolkit"; rev = version; - sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; + hash = "sha256-cMGD5Xdf9ElS1NT7Q0NPB//EvUO0MI0VTtps5JRisZ4="; }; disabled = python.pythonOlder "3.7"; @@ -48,35 +47,18 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ pytestCheckHook hypothesis - godot3-server ]; - preCheck = - let - godotServerMajorVersion = lib.versions.major godot3-server.version; - gdtoolkitMajorVersion = lib.versions.major version; - msg = '' - gdtoolkit major version ${gdtoolkitMajorVersion} does not match godot-server major version ${godotServerMajorVersion}! - gdtoolkit needs a matching godot-server for its tests. - If you see this error, you can either: - - disable doCheck for gdtoolkit, or - - provide a compatible godot-server version to gdtoolkit" - ''; - in lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg '' - # The tests want to run the installed executables - export PATH=$out/bin:$PATH + preCheck = '' + # The tests want to run the installed executables + export PATH=$out/bin:$PATH - # gdtoolkit tries to write cache variables to $HOME/.cache - export HOME=$TMP + # gdtoolkit tries to write cache variables to $HOME/.cache + export HOME=$TMP + ''; - # Work around https://github.com/godotengine/godot/issues/20503 - # Without this, Godot will complain about a missing project file - touch project.godot - - # Remove broken test case - # (hard to skip via disabledTests since the test name contains an absolute path) - rm tests/potential-godot-bugs/multiline-subscription-expression.gd - ''; + # The tests are not working on NixOS + disabledTests = [ "test_cc_on_empty_file_succeeds" "test_cc_on_file_with_single_function_succeeds" ]; pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; diff --git a/pkgs/by-name/gd/gdtoolkit_4/package.nix b/pkgs/by-name/gd/gdtoolkit_4/package.nix new file mode 100644 index 0000000000000..6f4a25602ee27 --- /dev/null +++ b/pkgs/by-name/gd/gdtoolkit_4/package.nix @@ -0,0 +1,73 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +let + python = python3.override { + packageOverrides = self: super: { + lark = super.lark.overridePythonAttrs (old: rec { + # gdtoolkit needs exactly this lark version + version = "1.1.9"; + src = fetchFromGitHub { + owner = "lark-parser"; + repo = "lark"; + rev = version; + hash = "sha256-vDu+VPAXONY8J+A6oS7EiMeOMgzGms0nWpE+DKI1MVU="; + fetchSubmodules = true; + }; + patches = [ ]; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "gdtoolkit"; + version = "4.2.2"; + + src = fetchFromGitHub { + owner = "Scony"; + repo = "godot-gdscript-toolkit"; + rev = version; + hash = "sha256-SvEKKuDnfxV+5AArg5ssrQzgIwRITdek4KYEs3d0n4Y="; + }; + + disabled = python.pythonOlder "3.7"; + + propagatedBuildInputs = with python.pkgs; [ + docopt + lark + pyyaml + setuptools + ]; + + doCheck = true; + + nativeCheckInputs = with python.pkgs; [ + pytestCheckHook + hypothesis + ]; + + preCheck = '' + # The tests want to run the installed executables + export PATH=$out/bin:$PATH + + # gdtoolkit tries to write cache variables to $HOME/.cache + export HOME=$TMP + ''; + + # The tests are not working on NixOS + disabledTestPaths = [ + "tests/generated/test_expression_parsing.py" + "tests/gdradon/test_executable.py" + ]; + + pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; + + meta = with lib; { + description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; + homepage = "https://github.com/Scony/godot-gdscript-toolkit"; + license = licenses.mit; + maintainers = with maintainers; [ squarepear ]; + }; +} diff --git a/pkgs/by-name/ij/ijhttp/package.nix b/pkgs/by-name/ij/ijhttp/package.nix new file mode 100644 index 0000000000000..e6eabf9223af2 --- /dev/null +++ b/pkgs/by-name/ij/ijhttp/package.nix @@ -0,0 +1,44 @@ +{ + fetchurl, + jdk17_headless, + lib, + makeWrapper, + stdenvNoCC, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "ijhttp"; + version = "241.14494.240"; + + src = fetchurl { + url = "https://download.jetbrains.com/resources/intellij/http-client/${finalAttrs.version}/intellij-http-client.zip"; + hash = "sha256-PecGB+gwdQGQbWd401qeCFLbmr9fmIBd7lGwLlRLaGg="; + }; + + nativeBuildInputs = [ + makeWrapper + unzip + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv lib $out/lib + install -Dm755 ijhttp $out/lib/ijhttp + makeWrapper $out/lib/ijhttp $out/bin/ijhttp \ + --set JAVA_HOME ${jdk17_headless.home} + + runHook postInstall + ''; + + meta = { + description = "Run HTTP requests from a terminal, e.g. for HTTP request testing"; + homepage = "https://www.jetbrains.com/help/idea/http-client-cli.html"; + license = lib.licenses.unfree; + mainProgram = "ijhttp"; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +}) diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index a085106c23a79..5a4f38431fc6e 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kor"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-4l19/vIvcgt7g3o6IWGHhIsXurAy6Ts4fJjs8OMZalk="; + hash = "sha256-fyVMRHDzP7od+cwC01vNP/TOiDctD8E0y8uNWtgiEeA="; }; vendorHash = "sha256-NPmsXS7P+pCF97N8x3nQhCRoHJLMO5plNtcUqxxexVE="; diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/by-name/ld/ldc/bootstrap.nix index ca7fb4f04de35..4355277e8863b 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/by-name/ld/ldc/bootstrap.nix @@ -1,10 +1,17 @@ -{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 -, version, hashes }: +{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 }: let inherit (stdenv) hostPlatform; OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name; + version = "1.30.0"; + hashes = { + # Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. + osx-x86_64 = "sha256-AAWZvxuZC82xvrW6fpYm783TY+H8k3DvqE94ZF1yjmk="; + linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE="; + linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y="; + osx-arm64 = "sha256-Nb/owBdIeroB9jLMDvwjo8bvsTC9vFyJPLMTOMsSAd4="; + }; in stdenv.mkDerivation { pname = "ldc-bootstrap"; inherit version; @@ -12,7 +19,7 @@ in stdenv.mkDerivation { src = fetchurl rec { name = "ldc2-${version}-${OS}-${ARCH}.tar.xz"; url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}"; - sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}"); + hash = hashes."${OS}-${ARCH}" or (throw "missing bootstrap hash for ${OS}-${ARCH}"); }; dontConfigure = true; diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/by-name/ld/ldc/package.nix index 07b6986189c09..77be57e836322 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -1,7 +1,22 @@ -{ version, sha256 }: -{ lib, stdenv, fetchurl, cmake, ninja, llvm_17, curl, tzdata -, libconfig, lit, gdb, unzip, darwin, bash -, callPackage, makeWrapper, runCommand, targetPackages +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, llvm_17 +, curl +, tzdata +, libconfig +, lit +, gdb +, unzip +, darwin +, bash +, callPackage +, makeWrapper +, runCommand +, targetPackages + , ldcBootstrap ? callPackage ./bootstrap.nix { } }: @@ -14,52 +29,44 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldc"; - inherit version; - - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - inherit sha256; + version = "1.38.0"; + + src = fetchFromGitHub { + owner = "ldc-developers"; + repo = "ldc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-d/UREh+fHRRh0r3H60uPjHute+qspcm9TBFWZMbGDxk="; + fetchSubmodules = true; }; # https://issues.dlang.org/show_bug.cgi?id=19553 hardeningDisable = [ "fortify" ]; - postUnpack = '' - patchShebangs . - '' - + '' - rm ldc-${version}-src/tests/dmd/fail_compilation/mixin_gc.d - rm ldc-${version}-src/tests/dmd/runnable/xtest46_gc.d - rm ldc-${version}-src/tests/dmd/runnable/testptrref_gc.d - - # test depends on current year - rm ldc-${version}-src/tests/dmd/compilable/ddocYear.d - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - ''; - postPatch = '' - # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/dmd/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + patchShebangs runtime tools tests + + rm tests/dmd/fail_compilation/mixin_gc.d + rm tests/dmd/runnable/xtest46_gc.d + rm tests/dmd/runnable/testptrref_gc.d + + # test depends on current year + rm tests/dmd/compilable/ddocYear.d + '' + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace runtime/phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace runtime/phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)" + + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r tests/plugins/addFuncEntryCall ''; nativeBuildInputs = [ cmake ldcBootstrap lit lit.python llvm_17.dev makeWrapper ninja unzip - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb ]; @@ -76,7 +83,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DMD=$DMD" ]; - fixNames = lib.optionalString stdenv.hostPlatform.isDarwin '' + fixNames = lib.optionalString stdenv.hostPlatform.isDarwin '' fixDarwinDylibNames() { local flags=() @@ -103,7 +110,7 @@ stdenv.mkDerivation rec { # Build default lib test runners ninja -j$NIX_BUILD_CORES all-test-runners - ${fixNames} + ${finalAttrs.fixNames} # Run dmd testsuite export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD" @@ -116,22 +123,23 @@ stdenv.mkDerivation rec { ctest -V -R "lit-tests" # Run default lib unittests - ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${finalAttrs.additionalExceptions}" ''; postInstall = '' wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; + --prefix PATH : ${targetPackages.stdenv.cc}/bin \ + --set-default CC ${targetPackages.stdenv.cc}/bin/cc + ''; meta = with lib; { description = "The LLVM-based D compiler"; homepage = "https://github.com/ldc-developers/ldc"; + changelog = "https://github.com/ldc-developers/ldc/releases/tag/v${finalAttrs.version}"; # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; mainProgram = "ldc2"; maintainers = with maintainers; [ lionello jtbx ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix index 294b9c34c6b42..cccc2f512e547 100644 --- a/pkgs/by-name/li/libfmvoice/package.nix +++ b/pkgs/by-name/li/libfmvoice/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libfmvoice"; - version = "0-unstable-2024-05-30"; + version = "0-unstable-2024-06-06"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "libfmvoice"; - rev = "0e58cfb323dc6461c705a5fadac4362a17fbec4e"; - hash = "sha256-HyGB180roo28vJ+11/ocoKu1kHpn6GxtEg9NluQsECg="; + rev = "cd89a6a386b3b17c74b1caca11e297b2748cf90d"; + hash = "sha256-yak+pKxkrKOX/qgtwpldjd85deE/JB040bVjDD1mo7A="; }; strictDeps = true; diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 0794bc8c9d2e9..a987e46700d2d 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.123"; + version = "1.123.2"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-tXsJyz8O6Resenjp4ODS3YAYjE8pM0j/JiaCRQWmT9g="; + hash = "sha256-soVFPeoU4Rovk4xpXd90CjzQ1y1rx1OT/4eKCZNTd4Q="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/mangareader/package.nix b/pkgs/by-name/ma/mangareader/package.nix new file mode 100644 index 0000000000000..456803218816a --- /dev/null +++ b/pkgs/by-name/ma/mangareader/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kdePackages, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "mangareader"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "g-fb"; + repo = "mangareader"; + rev = version; + hash = "sha256-XX0VaXVYmAs5vmgwslflKIYx1peITp4VmReLkv1nV3I="; + }; + + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook + ]; + + buildInputs = with kdePackages; [ + qtbase + kio + ki18n + kxmlgui + kconfig + karchive + kcoreaddons + kconfigwidgets + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Qt manga reader for local files"; + homepage = "https://github.com/g-fb/mangareader"; + changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}"; + mainProgram = "mangareader"; + platforms = lib.platforms.linux; + license = with lib.licenses; [ + gpl3Plus + cc-by-sa-40 + ]; + maintainers = with lib.maintainers; [ zendo ]; + }; +} diff --git a/pkgs/by-name/mo/mods/package.nix b/pkgs/by-name/mo/mods/package.nix index a653fb3de0c4c..8f3b3b78220cd 100644 --- a/pkgs/by-name/mo/mods/package.nix +++ b/pkgs/by-name/mo/mods/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mods"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "mods"; rev = "v${version}"; - hash = "sha256-9sr6R7Keg9NQQapZKnjfrMOJilQEYCs8AS04TuNWQ68="; + hash = "sha256-MlFWYoSyk1i2uaD04chajsxKlRMtRceJOCrADMrEL60="; }; - vendorHash = "sha256-BL5bxyeVkcm7GO1Kzk9d/hj2wY50UhauEFq9YQ/JbCE="; + vendorHash = "sha256-bfo91VGwLvCGS+BSfe+9/voTFfG4lMOOfK72gSLyv9c="; ldflags = [ "-s" diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index 36ee25429b817..55a7deb1b4424 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , openssh , gitMinimal -, rsync , nix , coreutils , curl @@ -13,6 +12,7 @@ , lib , makeWrapper , sshpass +, gnutar }: let runtimeDeps = [ @@ -25,17 +25,17 @@ let findutils gnused # needed by ssh-copy-id sshpass # used to provide password for ssh-copy-id - rsync # used to upload extra-files + gnutar # used to upload extra-files ]; in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-u3PFJup/XOz2MBhvqCzm94iH6Z4nrE0KmBgT/OnNDqU="; + hash = "sha256-AdSrhQhJb9ObCgM1iXnoIBBl+6cjRbuTST4Lt02AP5Q="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 32464882fe8c3..7912fe3987f51 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-bGJWo12rIinqyQyfTZEoT6S7OzO4BO/GRdjnC+hWdFM="; + hash = "sha256-sUxeKrtFZDzD68C7yrbnwOnz3jZ+XLOuhs08FvPGINM="; }; - vendorHash = "sha256-FxoSHsIRvRIQuu87l4587Pgb0YjHJISjB621XAHkJNM="; + vendorHash = "sha256-ZeFumtIxRaHtKzsVgBMNpikcOKJ1G5MoFgerKlKXNQo="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index 3a2c20f95bb43..64a90eba0aa14 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "paper-age"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "matiaskorhonen"; repo = "paper-age"; rev = "v${version}"; - hash = "sha256-hrqjnZmcGUgFWn8Z85oJEbeUBaF2SccytMr1AG0GGos="; + hash = "sha256-WWRX5St701ja/7wl4beiqD3+ZEEsb9n5N/pbbjdrgDM="; }; - cargoHash = "sha256-sFofS+POvJwGo/+tiF6dawKgQci/54tUKkQQalqT+K0="; + cargoHash = "sha256-Ede/BNLTSJPMsu/uYyowuUxBVu1oggiqKcE+vWHCtgU="; meta = with lib; { description = "Easy and secure paper backups of secrets"; diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 47a29be92f1de..ab4966ecf417e 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.1.3"; + version = "11.2.0"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-Wq2k44WpUhDhSyIx8ofn/jUR7FS3zn2CCe4OiFKHXEA="; + hash = "sha256-5MWhHMKCy9rrVO1bqyGykWFGw9zI1t6QGVkenvFpGbY="; }; - vendorHash = "sha256-kjMJCrMG08AXX662GAR5+V6w1+WOv8F9r6ONIOowP8Q="; + vendorHash = "sha256-w2Yu0T8omr8F7r5nBZOmRJE0LEdGQ3XAdxNZoK1sx1M="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/pixi/Cargo.lock b/pkgs/by-name/pi/pixi/Cargo.lock index 090963583bd80..0f549ee8b6eae 100644 --- a/pkgs/by-name/pi/pixi/Cargo.lock +++ b/pkgs/by-name/pi/pixi/Cargo.lock @@ -41,6 +41,19 @@ dependencies = [ ] [[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] name = "aho-corasick" version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -87,47 +100,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -135,9 +149,18 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "archspec" @@ -146,7 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9db67cd9cf4f56a10d2cbae6a3b552e5bd36701fd37b74a18c14a231bdf446c7" dependencies = [ "cfg-if", - "itertools", + "itertools 0.12.1", "libc", "serde", "serde_json", @@ -171,22 +194,21 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" +checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" dependencies = [ "brotli", "bzip2", @@ -208,7 +230,7 @@ checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -257,8 +279,8 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.6.0", - "rustix 0.38.32", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -303,44 +325,44 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.32", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ "async-io 2.3.2", - "async-lock 2.8.0", + "async-lock 3.3.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.32", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" @@ -350,7 +372,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -362,9 +384,9 @@ dependencies = [ "bisection", "futures", "http-content-range", - "itertools", + "itertools 0.12.1", "memmap2 0.9.4", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "thiserror", "tokio", @@ -395,9 +417,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backoff" @@ -451,9 +473,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -530,25 +552,23 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ "async-channel", "async-lock 3.3.0", "async-task", - "fastrand 2.0.2", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "brotli" -version = "4.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -557,9 +577,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -666,7 +686,7 @@ dependencies = [ [[package]] name = "cache-key" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "hex", "seahash", @@ -690,9 +710,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2d9a9a8d3e0b61b1110c49ab8f6ed7a76ce4f2b1d53ae48a83152d3d5e8f5b" +checksum = "f6e977de2867ec90a1654882ff95ca5849a526e893bab588f84664cfcdb11c0a" dependencies = [ "anyhow", "core-foundation", @@ -713,12 +733,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.94" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -796,7 +817,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", ] @@ -818,7 +839,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -829,15 +850,15 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -888,18 +909,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -925,9 +946,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -962,9 +983,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -972,27 +993,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.60", + "strsim", + "syn 2.0.65", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -1002,23 +1023,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deno_task_shell" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b44af10161906e1bccc1fc966f074bec0148997bb7e2221ecd29416dcad90b3" +checksum = "97e5ff66a1e89edb7ca0c36b73a8fcdc008ba426c4ad7a36e1dfb3f4a166179e" dependencies = [ "anyhow", "futures", @@ -1053,6 +1074,17 @@ dependencies = [ ] [[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] name = "dialoguer" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1107,9 +1139,20 @@ dependencies = [ ] [[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] name = "distribution-filename" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "pep440_rs", "platform-tags", @@ -1123,13 +1166,14 @@ dependencies = [ [[package]] name = "distribution-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", "cache-key", "distribution-filename", "fs-err", - "itertools", + "git2", + "itertools 0.12.1", "once_cell", "pep440_rs", "pep508_rs", @@ -1156,9 +1200,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elsa" @@ -1202,7 +1246,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -1214,7 +1258,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -1235,7 +1279,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -1246,18 +1290,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ "serde", + "typeid", ] [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1314,9 +1359,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.3.0", "pin-project-lite", @@ -1333,9 +1378,21 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "file_url" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "1cd0e1a8a0c7a1829090615ebce07ebf31911031a08915ca869f1085f0e39032" +dependencies = [ + "itertools 0.12.1", + "percent-encoding", + "typed-path", + "url", +] [[package]] name = "filetime" @@ -1357,9 +1414,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1500,7 +1557,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1515,7 +1572,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -1569,15 +1626,16 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ + "serde", "typenum", "version_check", ] [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1627,19 +1685,99 @@ dependencies = [ ] [[package]] +name = "google-cloud-auth" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf7cb7864f08a92e77c26bb230d021ea57691788fb5dd51793f96965d19e7f9" +dependencies = [ + "async-trait", + "base64 0.21.7", + "google-cloud-metadata", + "google-cloud-token", + "home", + "jsonwebtoken", + "reqwest 0.11.27", + "serde", + "serde_json", + "thiserror", + "time", + "tokio", + "tracing", + "urlencoding", +] + +[[package]] +name = "google-cloud-metadata" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc279bfb50487d7bcd900e8688406475fc750fe474a835b2ab9ade9eb1fc90e2" +dependencies = [ + "reqwest 0.11.27", + "thiserror", + "tokio", +] + +[[package]] +name = "google-cloud-token" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c12ba8b21d128a2ce8585955246977fbce4415f680ebf9199b6f9d6d725f" +dependencies = [ + "async-trait", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -1706,6 +1844,17 @@ dependencies = [ [[package]] name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" @@ -1717,12 +1866,23 @@ dependencies = [ [[package]] name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http", + "http 1.1.0", ] [[package]] @@ -1733,8 +1893,8 @@ checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", "futures-core", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1747,7 +1907,7 @@ dependencies = [ "async-trait", "bincode", "cacache", - "http", + "http 1.1.0", "http-cache-semantics", "httpdate", "serde", @@ -1762,10 +1922,10 @@ checksum = "be3e27c4e2e510571cbcc601407b639667146aa9a4e818d5cc1d97c8b4b27d61" dependencies = [ "anyhow", "async-trait", - "http", + "http 1.1.0", "http-cache", "http-cache-semantics", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "serde", "url", @@ -1777,8 +1937,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ - "http", + "http 1.1.0", "http-serde", + "reqwest 0.12.4", "serde", "time", ] @@ -1795,7 +1956,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1133cafcce27ea69d35e56b3a8772e265633e04de73c5f4e1afdffc1d19b5419" dependencies = [ - "http", + "http 1.1.0", "serde", ] @@ -1834,6 +1995,30 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" @@ -1841,8 +2026,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http", - "http-body", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", "httparse", "itoa", "pin-project-lite", @@ -1853,30 +2039,57 @@ dependencies = [ [[package]] name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.28", + "rustls 0.21.12", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", - "http", - "hyper", + "http 1.1.0", + "hyper 1.3.1", "hyper-util", - "rustls", + "rustls 0.22.4", "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tower-service", ] [[package]] name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.28", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-tls" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper", + "hyper 1.3.1", "hyper-util", "native-tls", "tokio", @@ -1893,11 +2106,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tower", "tower-service", @@ -1977,7 +2190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -2002,9 +2215,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "insta" -version = "1.38.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "globset", @@ -2018,7 +2231,7 @@ dependencies = [ [[package]] name = "install-wheel-rs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "configparser", "csv", @@ -2044,14 +2257,14 @@ dependencies = [ "uv-fs", "uv-normalize", "walkdir", - "zip", + "zip 1.3.1", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", "js-sys", @@ -2092,6 +2305,12 @@ dependencies = [ ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] name = "itertools" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2101,6 +2320,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2108,9 +2336,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2126,31 +2354,45 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" dependencies = [ "serde", "serde_json", "thiserror", - "treediff", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", ] [[package]] name = "junction" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb" +checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa" dependencies = [ "scopeguard", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "keyring" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be8bc4c6b6e9d85ecdad090fcf342a9216f53d747a537cc05e3452fd650ca46" +checksum = "363387f0019d714aa60cc30ab4fe501a747f4c08fc58f069dd14be971bd495a0" dependencies = [ "byteorder", "lazy_static", @@ -2180,7 +2422,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -2191,9 +2433,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" @@ -2291,21 +2533,27 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", ] [[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] name = "log" version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2423,7 +2671,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -2434,7 +2682,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -2445,9 +2693,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minijinja" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5c5e3d2b4c0a6832bd3d571f7c19a7c1c1f05f11a6e85ae1a29f76be5f9455" +checksum = "55e877d961d4f96ce13615862322df7c0b6d169d40cab71a7ef3f9b9e594451e" dependencies = [ "serde", ] @@ -2460,9 +2708,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -2581,9 +2829,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -2595,20 +2843,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -2630,9 +2877,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2641,11 +2888,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2653,9 +2899,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2688,7 +2934,7 @@ dependencies = [ [[package]] name = "once-map" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "dashmap", "tokio", @@ -2729,7 +2975,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -2740,9 +2986,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.0+3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" dependencies = [ "cc", ] @@ -2804,11 +3050,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" dependencies = [ "heck 0.4.1", - "itertools", + "itertools 0.12.1", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -2842,12 +3088,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -2866,22 +3112,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-absolutize" @@ -2908,9 +3154,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[package]] name = "pep440_rs" version = "0.5.0" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "once_cell", "rkyv", @@ -2922,7 +3178,7 @@ dependencies = [ [[package]] name = "pep508_rs" version = "0.4.2" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "derivative", "once_cell", @@ -2944,9 +3200,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap 2.2.6", @@ -2982,7 +3238,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", "unicase", ] @@ -3013,7 +3269,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -3030,19 +3286,20 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-io", ] [[package]] name = "pixi" -version = "0.20.0" +version = "0.23.0" dependencies = [ + "ahash 0.8.11", "assert_matches", "async-once-cell", "cfg-if", @@ -3052,6 +3309,7 @@ dependencies = [ "clap_complete", "console", "crossbeam-channel", + "csv", "deno_task_shell", "dialoguer", "dirs", @@ -3069,13 +3327,14 @@ dependencies = [ "insta", "install-wheel-rs", "is_executable", - "itertools", + "itertools 0.12.1", "lazy_static", "libc", "miette 7.2.0", "minijinja", "nix 0.28.0", "once_cell", + "parking_lot 0.12.2", "pep440_rs", "pep508_rs", "platform-tags", @@ -3092,13 +3351,14 @@ dependencies = [ "rattler_virtual_packages", "regex", "requirements-txt", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "reqwest-retry", "rstest", "self-replace", "serde", "serde-untagged", + "serde_ignored", "serde_json", "serde_with", "serde_yaml", @@ -3106,18 +3366,18 @@ dependencies = [ "shlex", "signal-hook", "spdx", - "strsim 0.11.1", + "strsim", "tabwriter", "tar", "tempfile", "thiserror", "tokio", "tokio-util", - "toml", - "toml_edit 0.22.11", + "toml_edit 0.22.13", "tracing", "tracing-subscriber", "url", + "uv-auth", "uv-build", "uv-cache", "uv-client", @@ -3130,8 +3390,9 @@ dependencies = [ "uv-normalize", "uv-resolver", "uv-types", + "winapi", "xxhash-rust", - "zip", + "zip 1.3.1", ] [[package]] @@ -3153,7 +3414,7 @@ dependencies = [ [[package]] name = "platform-tags" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "rustc-hash", "serde", @@ -3192,15 +3453,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -3246,9 +3507,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] @@ -3261,7 +3522,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", "version_check", "yansi", ] @@ -3300,9 +3561,9 @@ dependencies = [ [[package]] name = "purl" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d153044e55fb5c0a6f0f0f974c3335d15a842263ba4b208d2656120fe530a5ab" +checksum = "c14fe28c8495f7eaf77a6e6106966f95211c0a2404b9da50d248fc32af3a3f14" dependencies = [ "hex", "percent-encoding", @@ -3316,7 +3577,7 @@ dependencies = [ [[package]] name = "pypi-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "chrono", "indexmap 2.2.6", @@ -3409,24 +3670,28 @@ dependencies = [ [[package]] name = "rattler" -version = "0.22.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c954c00bfef8915def6b043db4d61d4d61a4436c89382915839c4360424a02e" +checksum = "b659b13fde86dcd6f8b1adc6aeaaf50eb9d082468ff7639aea45bd2c9ce57c97" dependencies = [ "anyhow", "bytes", "chrono", "clap", + "console", "digest", "dirs", "fs-err", "futures", "fxhash", + "humantime", "indexmap 2.2.6", - "itertools", + "indicatif", + "itertools 0.12.1", "memchr", "memmap2 0.9.4", "once_cell", + "parking_lot 0.12.2", "rattler_conda_types", "rattler_digest", "rattler_networking", @@ -3434,8 +3699,9 @@ dependencies = [ "rattler_shell", "reflink-copy", "regex", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", + "simple_spawn_blocking", "smallvec", "tempfile", "thiserror", @@ -3448,15 +3714,16 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4109edd67464a8f43c3a68b031df0f92c8efe89b3d1cf09fdc407cd90abae" +checksum = "1ae7656866a9e67ea29627c52b350510e0600176b8cf266759368d22ee6f7490" dependencies = [ "chrono", + "file_url", "fxhash", "glob", "hex", - "itertools", + "itertools 0.12.1", "lazy-regex", "nom", "purl", @@ -3471,17 +3738,19 @@ dependencies = [ "strum", "thiserror", "tracing", + "typed-path", "url", ] [[package]] name = "rattler_digest" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7143db952a9256f187ec5f69d6289c87d51b73e591cb21c653034b06fb0de7" +checksum = "9cf69475918dd44152f7df690b13f2909f34cc762ae18a2e2c55824b546de161" dependencies = [ "blake2", "digest", + "generic-array", "hex", "md-5", "serde", @@ -3492,14 +3761,15 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.22.2" +version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6c653f0af03d910a09e8c2d2938da6462c1218518760d3c88eddb776221d57" +checksum = "a97d2aebc838d2c61c9b57f2694e15f82c35e5198dbbebb2e94f6e92e426727c" dependencies = [ "chrono", + "file_url", "fxhash", "indexmap 2.2.6", - "itertools", + "itertools 0.12.1", "pep440_rs", "pep508_rs", "purl", @@ -3507,6 +3777,7 @@ dependencies = [ "rattler_digest", "serde", "serde_json", + "serde_repr", "serde_with", "serde_yaml", "thiserror", @@ -3520,27 +3791,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cef20e8356ea6840294e5754c6a8663b0eb1b97f29d517642f0f99215a2483" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] name = "rattler_networking" -version = "0.20.2" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4586c089e479cfb541d81db67cd8b43e0036507ffbf536e1d393e8147aa685c6" +checksum = "c582ad6d82b397d1e1522910b34dc052bbed4dedc0eed7fb640024de0dc6f5f6" dependencies = [ "anyhow", "async-trait", - "base64 0.22.0", + "base64 0.22.1", + "bytes", "chrono", "dirs", "fslock", + "futures", "getrandom", - "http", - "itertools", + "google-cloud-auth", + "http 1.1.0", + "itertools 0.12.1", "keyring", "netrc-rs", - "reqwest", + "pin-project-lite", + "reqwest 0.12.4", "reqwest-middleware", "retry-policies", "serde", @@ -3552,9 +3827,9 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.20.4" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4761292a1fb0346ad20a76c81da1261454bf87a4993935506b220429d8e2b63c" +checksum = "cb3e5f158b303cac143f0c537e237fd934b6aba9f5e26cb9adebbde1af5a4cd0" dependencies = [ "bzip2", "chrono", @@ -3563,7 +3838,7 @@ dependencies = [ "rattler_conda_types", "rattler_digest", "rattler_networking", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "serde_json", "tar", @@ -3572,39 +3847,51 @@ dependencies = [ "tokio", "tokio-util", "url", - "zip", + "zip 0.6.6", "zstd", ] [[package]] name = "rattler_repodata_gateway" -version = "0.19.7" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f450d02a301c9da95b6f48d8fe29a921af036bb43553eee0b58b390dba70219" +checksum = "724051407513f63016c76e23f3e9d2487f7fd32a402a811adc49d8db31a669db" dependencies = [ "anyhow", "async-compression", + "async-trait", "blake2", + "bytes", "cache_control", "chrono", + "dashmap", + "dirs", + "file_url", "futures", "hex", + "http 1.1.0", + "http-cache-semantics", "humansize", "humantime", - "itertools", + "itertools 0.12.1", "json-patch", "libc", + "md-5", "memmap2 0.9.4", "ouroboros", + "parking_lot 0.12.2", + "percent-encoding", "pin-project-lite", "rattler_conda_types", "rattler_digest", "rattler_networking", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", + "rmp-serde", "serde", "serde_json", "serde_with", + "simple_spawn_blocking", "superslice", "tempfile", "thiserror", @@ -3613,17 +3900,18 @@ dependencies = [ "tracing", "url", "windows-sys 0.52.0", + "zstd", ] [[package]] name = "rattler_shell" -version = "0.20.0" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3d2cc94dc0b26d871688be08bc72d8d24a69cafdf408adf7a1c4dab9dc32e4" +checksum = "f98b0b2c7841458bfb1b19eecd98517a2033e441d116201a638d55900a7c9905" dependencies = [ "enum_dispatch", "indexmap 2.2.6", - "itertools", + "itertools 0.12.1", "rattler_conda_types", "serde_json", "shlex", @@ -3635,13 +3923,13 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "0.20.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ecc29d71862c0b9307a18c8dc8dcddb6042715f26d44085f950426e8b2ef65b" +checksum = "0c58bfe47f340da07709494d04b03e1a7d90c785a8e587171c8c19a0cb29c038" dependencies = [ "chrono", "futures", - "itertools", + "itertools 0.12.1", "rattler_conda_types", "rattler_digest", "resolvo", @@ -3653,9 +3941,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "0.19.7" +version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0ce73b5939df90e9f968d3d3751e97314bc030bc35ee084e6e292a1e27690a" +checksum = "b9a5b06af1855cc4c3257659d9c788f915572c4b1f5b47657772f8d5daf00912" dependencies = [ "archspec", "libloading", @@ -3717,6 +4005,15 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] name = "redox_users" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3729,12 +4026,12 @@ dependencies = [ [[package]] name = "reflink-copy" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dea9fb2ba3bcc8c51607906e56fe392ba2eb9947dcc84597f26d73f56877c66" +checksum = "7c3138c30c59ed9b8572f82bed97ea591ecd7e45012566046cc39e72679cff22" dependencies = [ "cfg-if", - "rustix 0.38.32", + "rustix 0.38.34", "windows 0.56.0", ] @@ -3784,9 +4081,9 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "relative-path" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "rend" @@ -3800,7 +4097,7 @@ dependencies = [ [[package]] name = "requirements-txt" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "fs-err", "pep508_rs", @@ -3818,22 +4115,67 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.3" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-rustls 0.24.2", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.4", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "async-compression", - "base64 0.22.0", + "base64 0.22.1", "bytes", "futures-channel", "futures-core", "futures-util", - "http", - "http-body", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", "http-body-util", - "hyper", - "hyper-rustls", - "hyper-tls", + "hyper 1.3.1", + "hyper-rustls 0.26.0", + "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", @@ -3843,17 +4185,18 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.22.4", "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 2.1.2", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-util", "tower-service", "url", @@ -3861,20 +4204,20 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", - "winreg", + "webpki-roots 0.26.1", + "winreg 0.52.0", ] [[package]] name = "reqwest-middleware" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209efb52486ad88136190094ee214759ef7507068b27992256ed6610eb71a01" +checksum = "a45d100244a467870f6cb763c4484d010a6bed6bd610b3676e3825d93fb4cfbd" dependencies = [ "anyhow", "async-trait", - "http", - "reqwest", + "http 1.1.0", + "reqwest 0.12.4", "serde", "thiserror", "tower-service", @@ -3891,10 +4234,10 @@ dependencies = [ "chrono", "futures", "getrandom", - "http", - "hyper", + "http 1.1.0", + "hyper 1.3.1", "parking_lot 0.11.2", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "retry-policies", "tokio", @@ -3904,15 +4247,15 @@ dependencies = [ [[package]] name = "resolvo" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2016584c3fd9df0fd859a7dcbc7fafdc7fdd2d87b53a576e8e63e62fad140e33" +checksum = "d299d168910c5d71f3c0f5441abe38ca4a6ae21f70fae909bfc6bead28f6620f" dependencies = [ "bitvec", "elsa", "event-listener 5.3.0", "futures", - "itertools", + "itertools 0.13.0", "petgraph", "tracing", ] @@ -3985,9 +4328,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938a142ab806f18b88a97b0dea523d39e0fd730a064b035726adcfc58a8a5188" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -4019,7 +4362,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.60", + "syn 2.0.65", "unicode-ident", ] @@ -4034,9 +4377,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4069,27 +4412,39 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.22.3" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -4101,7 +4456,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 2.1.2", "rustls-pki-types", "schannel", "security-framework", @@ -4109,25 +4464,44 @@ dependencies = [ [[package]] name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -4136,15 +4510,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -4156,6 +4530,15 @@ dependencies = [ ] [[package]] +name = "scc" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" +dependencies = [ + "sdd", +] + +[[package]] name = "schannel" version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4171,6 +4554,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sdd" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" + +[[package]] name = "seahash" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4197,11 +4596,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -4210,9 +4609,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -4231,45 +4630,55 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde-untagged" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a160535368dfc353348e7eaa299156bd508c60c45a9249725f5f6d370d82a66" +checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" dependencies = [ "erased-serde", "serde", + "typeid", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", +] + +[[package]] +name = "serde_ignored" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8e319a36d1b52126a0d608f24e93b2d81297091818cd70625fcf50a15d84ddf" +dependencies = [ + "serde", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "indexmap 2.2.6", "itoa", @@ -4285,14 +4694,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4311,11 +4720,11 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", @@ -4329,14 +4738,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -4354,27 +4763,27 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" dependencies = [ - "dashmap", "futures", - "lazy_static", "log", - "parking_lot 0.12.1", + "once_cell", + "parking_lot 0.12.2", + "scc", "serial_test_derive", ] [[package]] name = "serial_test_derive" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -4449,14 +4858,20 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] name = "simdutf8" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4469,6 +4884,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "simple_spawn_blocking" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b31ed96d1593e129cc76cb7aca364fb5c173558bfda922c15aac4e2f2f5844e" +dependencies = [ + "tokio", +] + +[[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4521,9 +4957,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4575,12 +5011,6 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" @@ -4604,7 +5034,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -4653,9 +5083,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" dependencies = [ "proc-macro2", "quote", @@ -4694,9 +5124,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.11" +version = "0.30.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4708,6 +5138,27 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "tabwriter" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4740,8 +5191,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.2", - "rustix 0.38.32", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -4751,7 +5202,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -4768,22 +5219,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -4859,9 +5310,10 @@ dependencies = [ "libc", "mio", "num_cpus", + "parking_lot 0.12.2", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -4874,7 +5326,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -4889,11 +5341,21 @@ dependencies = [ [[package]] name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -4927,9 +5389,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -4937,26 +5399,25 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.11", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -4974,15 +5435,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.11" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb686a972ccef8537b39eead3968b0e8616cb5040dbb9bba93007c8e07c9215f" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.6", + "winnow 0.6.8", ] [[package]] @@ -5033,7 +5494,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -5076,21 +5537,24 @@ dependencies = [ ] [[package]] -name = "treediff" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5" -dependencies = [ - "serde_json", -] - -[[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] +name = "typed-path" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6069e2cc1d241fd4ff5fa067e8882996fcfce20986d078696e05abccbcf27b43" + +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + +[[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5145,9 +5609,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unsafe-libyaml" @@ -5210,16 +5674,19 @@ dependencies = [ [[package]] name = "uv-auth" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ + "anyhow", "async-trait", - "base64 0.22.0", - "http", + "base64 0.22.1", + "futures", + "http 1.1.0", + "once-map", "once_cell", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "rust-netrc", - "thiserror", + "tokio", "tracing", "url", "urlencoding", @@ -5228,13 +5695,13 @@ dependencies = [ [[package]] name = "uv-build" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", "distribution-types", "fs-err", "indoc", - "itertools", + "itertools 0.12.1", "once_cell", "pep440_rs", "pep508_rs", @@ -5257,7 +5724,7 @@ dependencies = [ [[package]] name = "uv-cache" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "cache-key", "cachedir", @@ -5280,7 +5747,7 @@ dependencies = [ [[package]] name = "uv-client" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", "async-trait", @@ -5293,13 +5760,13 @@ dependencies = [ "fs-err", "futures", "html-escape", - "http", + "http 1.1.0", "install-wheel-rs", "pep440_rs", "pep508_rs", "platform-tags", "pypi-types", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "reqwest-retry", "rkyv", @@ -5327,27 +5794,29 @@ dependencies = [ [[package]] name = "uv-configuration" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", - "itertools", + "itertools 0.12.1", "pep508_rs", + "platform-tags", "rustc-hash", "serde", "serde_json", + "uv-auth", "uv-normalize", ] [[package]] name = "uv-dispatch" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", "distribution-types", "futures", "install-wheel-rs", - "itertools", + "itertools 0.12.1", "pep508_rs", "rustc-hash", "tracing", @@ -5364,7 +5833,7 @@ dependencies = [ [[package]] name = "uv-distribution" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", "cache-key", @@ -5373,19 +5842,17 @@ dependencies = [ "fs-err", "futures", "install-wheel-rs", - "md-5", "nanoid", "once_cell", "pep440_rs", "pep508_rs", "platform-tags", "pypi-types", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "rmp-serde", "rustc-hash", "serde", - "sha2", "tempfile", "thiserror", "tokio", @@ -5400,13 +5867,13 @@ dependencies = [ "uv-git", "uv-normalize", "uv-types", - "zip", + "zip 1.3.1", ] [[package]] name = "uv-extract" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "async-compression", "async_zip", @@ -5422,13 +5889,13 @@ dependencies = [ "tokio-tar", "tokio-util", "tracing", - "zip", + "zip 1.3.1", ] [[package]] name = "uv-fs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "backoff", "dunce", @@ -5448,10 +5915,10 @@ dependencies = [ [[package]] name = "uv-git" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", - "base64 0.22.0", + "base64 0.22.1", "cache-key", "cargo-util", "fs-err", @@ -5460,7 +5927,7 @@ dependencies = [ "hmac", "home", "rand", - "reqwest", + "reqwest 0.12.4", "sha1", "tokio", "tracing", @@ -5471,7 +5938,7 @@ dependencies = [ [[package]] name = "uv-installer" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", "async-channel", @@ -5485,7 +5952,6 @@ dependencies = [ "pypi-types", "rayon", "requirements-txt", - "rmp-serde", "rustc-hash", "serde", "tempfile", @@ -5510,7 +5976,7 @@ dependencies = [ [[package]] name = "uv-interpreter" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "cache-key", "configparser", @@ -5532,6 +5998,7 @@ dependencies = [ "uv-cache", "uv-fs", "uv-toolchain", + "uv-warnings", "which", "winapi", ] @@ -5539,7 +6006,7 @@ dependencies = [ [[package]] name = "uv-normalize" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "rkyv", "serde", @@ -5548,7 +6015,7 @@ dependencies = [ [[package]] name = "uv-resolver" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anstream", "anyhow", @@ -5562,7 +6029,7 @@ dependencies = [ "futures", "indexmap 2.2.6", "install-wheel-rs", - "itertools", + "itertools 0.12.1", "once-map", "once_cell", "owo-colors", @@ -5594,7 +6061,7 @@ dependencies = [ [[package]] name = "uv-toolchain" version = "0.1.0" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", "fs-err", @@ -5602,11 +6069,10 @@ dependencies = [ "once_cell", "pep440_rs", "pep508_rs", - "reqwest", + "reqwest 0.12.4", "reqwest-middleware", "tempfile", "thiserror", - "tokio", "tokio-util", "tracing", "url", @@ -5618,18 +6084,16 @@ dependencies = [ [[package]] name = "uv-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anyhow", "distribution-types", - "itertools", "once-map", "pep440_rs", "pep508_rs", "pypi-types", + "requirements-txt", "rustc-hash", - "serde", - "serde_json", "thiserror", "url", "uv-cache", @@ -5640,13 +6104,13 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.1.32" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +version = "0.1.38" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" [[package]] name = "uv-virtualenv" version = "0.0.4" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anstream", "cachedir", @@ -5660,12 +6124,13 @@ dependencies = [ "uv-cache", "uv-fs", "uv-interpreter", + "uv-version", ] [[package]] name = "uv-warnings" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +source = "git+https://github.com/astral-sh/uv?tag=0.1.38#0b23caa18d7eb2f874d73e57b7b4bdf35e881a46" dependencies = [ "anstream", "once_cell", @@ -5693,9 +6158,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -5743,7 +6208,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", "wasm-bindgen-shared", ] @@ -5777,7 +6242,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5828,6 +6293,12 @@ dependencies = [ [[package]] name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" @@ -5843,7 +6314,7 @@ checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" dependencies = [ "either", "home", - "rustix 0.38.32", + "rustix 0.38.34", "winsafe", ] @@ -5865,11 +6336,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5927,7 +6398,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -5938,7 +6409,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -6100,15 +6571,25 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] [[package]] name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" @@ -6139,8 +6620,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.32", + "linux-raw-sys 0.4.14", + "rustix 0.38.34", ] [[package]] @@ -6232,6 +6713,26 @@ dependencies = [ ] [[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] name = "zeroize" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6251,6 +6752,37 @@ dependencies = [ ] [[package]] +name = "zip" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b7a5a9285bd4ee13bdeb3f8a4917eb46557e53f270c783849db8bef37b0ad00" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "flate2", + "indexmap 2.2.6", + "thiserror", + "time", + "zopfli", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] name = "zstd" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 660126bebefc5..86abbff58246a 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "pixi"; - version = "0.20.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; rev = "v${version}"; - hash = "sha256-7ah5u3E9nodo/0YSuaswRY07zz8EQgvttbVKjw/USCc="; + hash = "sha256-uLlScqcTU9nnBQiufRo+eee1TNyP5R52oI1jUaH6L1M="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; - "cache-key-0.0.1" = "sha256-qGFjI/LNf2p11BOgacYHU0hoXvCEjjnyAcAAIcD7YTo="; + "cache-key-0.0.1" = "sha256-fbaIeM4wgwi/3S8s9KRux8wKe6FbCBNPZFPekmrq2jA="; "pubgrub-0.2.1" = "sha256-sqC7R2mtqymYFULDW0wSbM/MKCZc8rP7Yy/gaQpjYEI="; }; }; @@ -66,10 +66,14 @@ rustPlatform.buildRustPackage rec { "--skip=test_alias" "--skip=test_cwd" "--skip=test_compressed_mapping_catch_missing_package" + "--skip=test_compressed_mapping_catch_not_pandoc_not_a_python_package" + "--skip=test_dont_record_not_present_package_as_purl" "--skip=test_incremental_lock_file" "--skip=test_purl_are_added_for_pypi" - "--skip=test_task_with_env" # `/usr/bin/env` required + # `/usr/bin/env` required + "--skip=test_task_with_env" + "--skip=cli::shell_hook::tests::test_environment_json" ]; postInstall = '' @@ -87,7 +91,7 @@ rustPlatform.buildRustPackage rec { description = "Package management made easy"; homepage = "https://pixi.sh/"; license = licenses.bsd3; - maintainers = with lib.maintainers; [ aaronjheng edmundmiller ]; + maintainers = with maintainers; [ aaronjheng edmundmiller ]; mainProgram = "pixi"; }; } diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 48e530ad948f2..234903e6fbeb8 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.35.5"; + version = "0.36.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-KbrRACXFtchhsV5BjtHBckTxFcKf0Xe1/uGgDikSQww="; + hash = "sha256-UziA1TlsVbFqdsg8A4ClNOioZFHMzmiA4N4bHqCiwZw="; }; - cargoHash = "sha256-CCjrbHYVERSVJayL+9kGo03ItCTaXwy5jEj+qGxyS1o="; + cargoHash = "sha256-Eehx5wXQcdLKVfVp4vB3kzOAZ9SDJn5BweTe1d1KKHM="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 388831d78dcb9..d790b51d52eb3 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.365"; + version = "1.1.366"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-plXNjT36xLmGftkLREsjKGHQWBGA12hIUOBCtTf8710="; + hash = "sha256-xs93PnDTtDsdi9YeZk0nyinCs4+eJJNFg7NagHF15rI="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-oBpW4nEyiDGZhv+Yt0+yKg2xrLULpFjIOFRxIBLZ3bk="; + npmDepsHash = "sha256-jGLzsrf5RuqfyI3BJpmVsqijxtNlFexsub0186cUR+8="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-/P2rx7BgaHZPHBC3DO89JjYtPD5ri2goGmgCkGWfby4="; + npmDepsHash = "sha256-8d3gRx93wfusvI3mov2B0jJuG+WpVaL8b+jdFzmqA3w="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/re/redka/package.nix b/pkgs/by-name/re/redka/package.nix index d4f62134483b9..669cd5a3535eb 100644 --- a/pkgs/by-name/re/redka/package.nix +++ b/pkgs/by-name/re/redka/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redka"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "nalgeon"; repo = "redka"; rev = "v${version}"; - hash = "sha256-PlEZMOrAPQh9RxJBw3zhaUoAH44lor7SFSpmODxUM4U="; + hash = "sha256-URPuAltTh95hXePx5zW/bdP2woAoEsKRpf4DHBwzdw4="; }; vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro="; diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index f057a71e3ff0e..d262dbd5a50d2 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-riJHJbl19UHJskQjWxSJUNhDEBE7FSoGE2lQecs/qvM="; + hash = "sha256-EYoUsxJgG9xqXtjys0InJJaqvX1XXcef9PYQ3nZPNuo="; }; appimageContents = appimageTools.extract { @@ -26,10 +26,17 @@ in appimageTools.wrapType2 { extraInstallCommands = '' install --mode=444 -D ${appimageContents}/chat.simplex.app.desktop --target-directory=$out/share/applications substituteInPlace $out/share/applications/chat.simplex.app.desktop \ - --replace 'Exec=simplex' 'Exec=${pname}' + --replace-fail 'Exec=simplex' 'Exec=simplex-chat-desktop' cp -r ${appimageContents}/usr/share/icons $out/share ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/simplex-chat/simplex-chat"; + rev-prefix = "v"; + # skip tags that does not correspond to official releases, like vX.Y.Z-(beta,fdroid,armv7a). + ignoredVersions = "-"; + }; + meta = with lib; { description = "Desktop application for SimpleX Chat"; mainProgram = "simplex-chat-desktop"; @@ -39,11 +46,4 @@ in appimageTools.wrapType2 { maintainers = with maintainers; [ yuu ]; platforms = [ "x86_64-linux" ]; }; - - passthru.updateScript = gitUpdater { - url = "https://github.com/simplex-chat/simplex-chat"; - rev-prefix = "v"; - # skip tags that does not correspond to official releases, like vX.Y.Z-(beta,fdroid,armv7a). - ignoredVersions = "-"; - }; } diff --git a/pkgs/by-name/sr/sr2t/package.nix b/pkgs/by-name/sr/sr2t/package.nix new file mode 100644 index 0000000000000..e49303258a165 --- /dev/null +++ b/pkgs/by-name/sr/sr2t/package.nix @@ -0,0 +1,40 @@ +{ + lib, + python3, + fetchFromGitLab, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sr2t"; + version = "0.0.26"; + pyproject = true; + + src = fetchFromGitLab { + owner = "0bs1d1an"; + repo = "sr2t"; + rev = "refs/tags/${version}"; + hash = "sha256-BPsYnKBTxt5WUd2+WumMdVi8p6iryOWG2MjI97qbaCw="; + }; + + build-system = with python3.pkgs; [ hatchling ]; + + dependencies = with python3.pkgs; [ + prettytable + pyyaml + setuptools + xlsxwriter + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "sr2t" ]; + + meta = with lib; { + description = "Tool to convert scanning reports to a tabular format"; + homepage = "https://gitlab.com/0bs1d1an/sr2t"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "sr2t"; + }; +} diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix index 5b82f368df6b7..4388e8753442c 100644 --- a/pkgs/by-name/td/tdl/package.nix +++ b/pkgs/by-name/td/tdl/package.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "tdl"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "iyear"; repo = "tdl"; rev = "v${version}"; - hash = "sha256-bIDgxCv9jSN3OxS0FydFwfJYr8BUQ+8U/0s2BkM4M70="; + hash = "sha256-qyoZqd6VLiq8L4p4ubKIM6HWJdn7SaQDQN9kIArbnls="; }; - vendorHash = "sha256-uCQ5HixoChppLO9kJvMWVENhHDnQsEe/qiJnbwUjE70="; + vendorHash = "sha256-Xfd98qce/xThwF+dssNznny8FgrORGsAhDALfW9bWEQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 686e3768f14c8..b27dc057d274d 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-zSSUXJtIyVUUo2g1DTdnUCbCqtelphYRRLaJXbQBgIw="; + hash = "sha256-bK5Z6aoyZti46GLulpdxGPxHM+EfEVQgeAUY6fRc7YY="; }; - cargoHash = "sha256-1J8Z6gmn1d4v15q9Jrp5usY2MTQDdexaa89PY3lTDxw="; + cargoHash = "sha256-iq5V+FGOcK2opmA4ot0KF9ZToYWC82gRsRyVqftuFPA="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ] diff --git a/pkgs/development/compilers/dotnet/9/deps.nix b/pkgs/development/compilers/dotnet/9/deps.nix index d1dcc2bf54dde..fe8a5ffff5d98 100644 --- a/pkgs/development/compilers/dotnet/9/deps.nix +++ b/pkgs/development/compilers/dotnet/9/deps.nix @@ -1,10 +1,14 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "83ea1b2eaf1035365d25ed1119e7c69f72893b9ece82a0771b1f2e342a23bdf3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.2.24080.1/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.2.24080.1.nupkg"; version = "9.0.0-preview.2.24080.1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "96166f18c89084cd4b11dd2cd5cb949d088dd33f1c3446ba95c74b2c88273a22"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.2.24080.1/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.2.24080.1.nupkg"; version = "9.0.0-preview.2.24080.1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; sha256 = "09nd4ymm06cqia4r5laikgfffjhjk5m4c1snlz6sbpa29nhh5smr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.2.24080.1/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.2.24080.1.nupkg"; version = "9.0.0-preview.2.24080.1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; sha256 = "0iarbcblf33lcx19xgaa40bjgfsrskfp1205kpl4pv1jw3l4hgkd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.2.24080.1/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.2.24080.1.nupkg"; version = "9.0.0-preview.2.24080.1"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "5ff20db7bef1c0adb9473a71b95dcfc02034fa40295fdf6bcbd826027d51d47d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.2.24080.1/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.2.24080.1.nupkg"; version = "9.0.0-preview.2.24080.1"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "7e91613aeda779d2722f818ce137f5c969b7b05888db204d50c32e403ec4729b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.2.24080.1/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.2.24080.1.nupkg"; version = "9.0.0-preview.2.24080.1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "d38c42cd85d1491a6db85e2800c5a4c19d14580968074a1ff2248b3ea3a0b57a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.2.24080.1/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.2.24080.1.nupkg"; version = "9.0.0-preview.2.24080.1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "0d4879e7d02cdd818ff97f1cb1400ef00ad253691d561a354d34606e818e9c21"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.2.24080.1/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.2.24080.1.nupkg"; version = "9.0.0-preview.2.24080.1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "8da8c9ac5a27821b1f84865630037566565a3a428f6d3098e061cf6530b32684"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.4.24178.3/runtime.linux-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "4bdb3f8d5e79f9005bf2ec400c4ac568e705b79b6a30e105518601d2bc34903d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.4.24178.3/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "a64fdf69c38170171ad953f6dbf574148b49250c58d0924b6cf8b31bd8075bd5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.4.24178.3/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; sha256 = "1scxjf10sp9v1qd4di9fhgz25bkz5wfycsqw67ss436m5zi2jqk7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.4.24178.3/runtime.linux-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; sha256 = "0va18cvcw0363y7bhc7phkv14jgic0sijipyayq9gjjmmii4mlyq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.4.24178.3/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; sha256 = "07ykhb6x5j3j72ghnyx509lckmjxzamss0i95rs3bfz9v7ysj96c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.4.24178.3/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "982e4180fd9e2f72f5b391a57ea0135f13606cbef86139acf281e414eaa68541"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.4.24178.3/runtime.osx-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "abcae0134c2ceb067213d516020efca190c1bdfddb705718361c670c339d29f3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.4.24178.3/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "ee8e084cbbc12081b1954c230cf715113e1d5ee138f1c25d0a15173fa7488f37"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.4.24178.3/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; sha256 = "7b390c2be4e2625542dd0a7b9ef306f0f7e49e1a4fe2a8d77833c5da4d103035"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.4.24178.3/runtime.osx-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "4139a98cfbc264193eab5792690d6561c2325a5cb20fee663e70624e1661ee40"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.4.24178.3/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "43bf2b28c49b991a759d19e608a9e1d805dac8eec12ad9bb4e2e6bd7ca7707ac"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.4.24178.3/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) ] diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index 584fa364f8c75..7da9e30a58961 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-RbKpnIwSVPhOFCMGtm+Q6p1m0tiAEAV8YwAdIobzMXA=", - "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.2.24104.1.centos.8-x64.tar.gz", - "artifactsHash": "sha256-Ou1Efq+iWhsqsIDNPZeceoyxGhBST7MOQNpSrWUUKRI=" + "tarballHash": "sha256-gUFeHgtPfyaqqbKASmZqbmKLTjP+GUewa1D/xNuR+b0=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.4.24179.1.centos.8-x64.tar.gz", + "artifactsHash": "sha256-P3hk1NfC+Pha1e2NBeDkM1kNNu46jsWAE1XRdzRvP4w=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index 3e600587f0747..5b3f327136bfc 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.0-preview.2", + "release": "9.0.0-preview.4", "channel": "9.0", - "tag": "v9.0.0-preview.2.24128.5", - "sdkVersion": "9.0.100-preview.2.24158.1", - "runtimeVersion": "9.0.0-preview.2.24128.5", - "aspnetcoreRuntimeVersion": "9.0.0-preview.2.24128.4", + "tag": "v9.0.0-preview.4.24266.19", + "sdkVersion": "9.0.100-preview.4.24267.1", + "runtimeVersion": "9.0.0-preview.4.24266.19", + "aspNetCoreVersion": "9.0.0-preview.4.24267.6", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "14eb446d301de0fa50afd32daf0dcbf1b3716ae5" + "sourceVersion": "7b92d4092abc8b04f79a9412a712257966724494" } diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index c7a8e048121e0..4ce789e00b912 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -71,7 +71,7 @@ in { aspnetcore = mkCommon "aspnetcore" rec { pname = "dotnet-aspnetcore-runtime"; - version = releaseManifest.aspnetcoreRuntimeVersion or releaseManifest.runtimeVersion; + version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion; src = vmr; dontUnpack = true; diff --git a/pkgs/development/compilers/dotnet/patch-restored-packages.proj b/pkgs/development/compilers/dotnet/patch-restored-packages.proj index bef12d6308f94..17afb946565f1 100644 --- a/pkgs/development/compilers/dotnet/patch-restored-packages.proj +++ b/pkgs/development/compilers/dotnet/patch-restored-packages.proj @@ -1,8 +1,8 @@ <Project> <Target Name="PatchIlasm" AfterTargets="ResolveIlToolPaths"> - <Exec Command="patch-nupkgs $(NUGET_PACKAGES) 2>&1"/> + <Exec Command="patch-nupkgs '$(NUGET_PACKAGES)' 2>&1"/> </Target> <Target Name="PatchCrossgen" AfterTargets="Restore;_PrepareForReadyToRunCompilation;PrepareForCrossGen"> - <Exec Command="patch-nupkgs $(NUGET_PACKAGES) 2>&1"/> + <Exec Command="patch-nupkgs '$(NUGET_PACKAGES)' 2>&1"/> </Target> </Project> diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index 1295f9b35c017..c5ab45fb4fefe 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -4,144 +4,143 @@ let packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.2.24128.4"; sha256 = "0sxv7581axjyc9d8q2ij0rizbf24d7lrfqphnihxbf2gnphbixqa"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.2.24128.4"; sha256 = "03zyr7dn151hlzgjkks4vixh5air3h4d2ml188521p3sv5kkhr63"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.2.24128.4"; sha256 = "054qw93b9gw6fm9iaiki8msjglpw5nhchh96v42hfpggdk84ki1x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.2.24128.4"; sha256 = "11f8hmw1rxqcf3qsan6mjd7vrq442hsh90fpmx1gkfflibj8psjz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.2.24128.4"; sha256 = "1bpa4l0n3ahyk5s62ns35pr13idjnvbmahnpvjg2ay2n8fhr4wrh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.2.24128.4"; sha256 = "1z6gwynwfndhkv3gkqqaxbahx48ajx5ir2dfm8rfxg7hrc3x8sdx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.2.24128.4"; sha256 = "0vs4n68qlmqgizbn2i4h1wascx416slw0dmdib3dzxcivzfrv51j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.2.24128.4"; sha256 = "0cjhbli0p8b0nxvrp75dzk4pm112pwqy9cl1ajgr6ra6g3n9jypf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.2.24128.4"; sha256 = "0152n8y2gx8jcws6hrqfb91bsd3bfrk89hvls7rw8mazg5hac3yd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.2.24128.4"; sha256 = "1m7ynhxz62msv3fzaxpnb1lq5369wn8bwfbk70bxr32fz5smnar0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.2.24128.4"; sha256 = "11dg6qs92lc9n1n3h6jmi8iz62na9l3xhk8h7x0k92pcwax8dcwb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.2.24128.4"; sha256 = "1rq42nly7hq6bng7x39sh6zgklfsk44mhzxf91nb0nna5rvqy2v5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.2.24128.5"; sha256 = "0plcb424mj45pwd3lwsshrqqsmfcxfhzv9gwcsx4vmhk4p0lgynd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1h3hq06csy8nn1ms39gi4gpz1vs4rci09w602pal9cdn3qr946yl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1a1h62xisa7jy0ac0mj5kyqnhs4mrhnr2mnj56i3savyhj0n53gb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0bz3ckck2ixyk8brjl5si6d161ml4kdzm4qk85ghvglc6ac192hx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "06jfjb853z5jxwxw107xbii7xlj9ardhh4k59bnck79vplh7abqd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0521d38bwh94lzv3fkj6yir8v4zx1riiaiwk860303ljp79iyxdp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1wjybjhalhdbxndyalgy3alkr8ra8yj88g7h7ysjlsfxp4gx3xha"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0xgfbi9r6hnmqh18z2smfp04693fy3l66y30v7337jlvamxmz0hi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.2.24128.5"; sha256 = "0mjgb3vnkx845lrx7w99q62c5s12n924pi5fh37c52jn1mvaj1za"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.2.24128.5"; sha256 = "1adjb3wp3zxjj3vgyf7xk34sqv3zxavss9v2d1zr4hdvrbwsv2hp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1w00m6hnalndscssc6prsm4dhbn43fclm20h39icll2z4p2jyly2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "16087b037vlrra853ls9iardxl1g14zm57q3flrylmd8wdhm7caj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0p5kq3ccrc5v5cfj7fvqliyh9k0vrgxmw11mcmlv0s2m1ziikvgf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0f9g2vj3vb9q3ryqywn76604ah276whpkn93r876sxqkvgsdbnvq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0jdq6s36y9733sqsq9ppr08642sv3dgmjg2c36wf0ag1v3vlz2ab"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0lc5d6jkcz31znv9bi0li4xy1j3kji48xww8v2df3dsjgq62bbjj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "11h38px2i2hw0g1y5annpffn0xlq26m29xm5mvnjdjsz05khnwhb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.2.24128.5"; sha256 = "0a7jr03d66jzzzyajs552i1qn0jgzq1rlzpqch30k51ssnrbljpg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "1a4han0cbhwj63ja5lnkjbaa012769j69hir21nc4k706hyf09pk"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "09s4mdzbgmrm5v3a4d9zdw918cwpsg9r84ywla1na6dh6i0400w5"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "0c46wbnn1jh6k05khjysmmn0x69p0nh6b17lszvbr2p6v7nbfa78"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "1izlvyk9xl0s888byw2c1n4jpvd6hh1yqx53z5mh0zi9jmc430mi"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "1sr07f4zyyllmkzkqs0lqa4b01ig4bcpxghhn37nys7ab2f15619"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "1l12jxmlvy116a9dzfqn28ain7c4nwk3fawiw54qiaikc1dbz8zc"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "0bcr4zbl1kpnbk34m2i221rb6bl1jiyylak0hvs790bldj47c6lk"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "089dll9w3mgf9xx22gk5z2wgw01ydwvw5snn3ij2jwrjakz611hc"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "09adk3i17biq3sjzx4amnxjvp6viwch3p6nklb3ybknsncn9ix5v"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "1jfi2wzl5lrij3h4v0ix38vs3g57wg2nmv8c7iwmf2k4i8nf523y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.2.24128.5"; sha256 = "1030gjhrwqwc01sqdi88ynz1phh4ccpjqfnbs0i3kwjb3sg3iy3k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "12136vhid3aj3gn40vfrilcypr9n9izhx110q65c57m0kgg41k13"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.2.24128.5"; sha256 = "0nnsfxbrf8m6zn0s021c6dvq4kif1b2cv2l6rlw4986y92g6147p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1fhfsjp1caxnn73is92zrrmpinyr5hkzd7mcp1dnrsqllx6v1w52"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.2.24128.5"; sha256 = "0syi6dlgmvpnfcgkvnwyf1i7gnn1k71nd6rc6fc9b0jwi4ys5y3n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.2.24128.5"; sha256 = "08ran7vyfn2f4hhj1hc1hfdw1c2k6whbjyvkj8p78f66zqkh11ic"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "02pk28mghl4jqzyv10ab92iidg581lnpsj49pfw818w324dk2hpp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "01yagr5c4d3347a3ljbsjz27420igvzf856275nj7yn6psini72p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1wa54f15xp32277h85hxamxdyj62yldi7vpmldsqds3n7r2wg3q2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1a138w5bh1d5ilq4ynpxcawfj6n1dl1jqa5z1a7p7fgry2362pp7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0nwkqpn1qsk45nqxc4ih3bi4ik13a0hck0jbkc5jrl9301839l15"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1a1iw32fmhapsr0r7mm6iz69clwvnhqg6q4jqbdlp12id2v9r3l6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.2.24128.5"; sha256 = "06j1scfv8vb3b9n3jpa0nsx6rxk413xsjr7fpxgsiraqfi9cl4ch"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "15v4idsw83bfypqv17r8a8vwvpsf3fa30gvja9zzbj4v639s2n28"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.2.24128.5"; sha256 = "1nqjazr7dwsahy6qix5fa1bby8qhcxqwpvpp7aj3slpgp88ag795"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.2.24128.5"; sha256 = "0i2plc6nr1fsx0wa6ff2fda3xig6aaxcnb7v9l1w1da2qw767f23"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1h2sd4pcsh1p1fim0jydl8i70pj54lxywwqdz31b3x7x7r05hjgw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1f30y1hwcprm1j549v00kq9w5a3jxls7z6pryyjx379axaspd805"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.2.24128.5"; sha256 = "1b09s5v153wxv0mqr5nvhym5dvavc7jilmflzs6wh7jjn1gq06q8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1z0s40i0nnxxwhgh85aacfh6qd1sygwz1z94hppnmaamdhqmf6wg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "13w3kpyilk1n2vy6lnm5h44zskblfnrhdnbjx4f13hwzc1127a2b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.2.24128.5"; sha256 = "0r79zrqxvvkg1f4vb8yqaa22fb7ix93fkkwsmqpj8f43z71aizjh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.2.24128.5"; sha256 = "1l3k9sgiqjvxaagvbfza9q136p36kixl434xg9qhzr8rl6m2g2ih"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.2.24128.5"; sha256 = "1dq6mir5n319a7pjzgvhxlm90py4wslx6y4n68x1g8ifd97cxnhy"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.2.24128.5"; sha256 = "07y3hhf3h4p59wyv25wmb58wzayhrqp4wawb777k8x6r448c5xaz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.2.24128.5"; sha256 = "1kyigz0zzlbl22cr31na8lzf7595zvysnck44xlay1if99crkndg"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.2.24128.5"; sha256 = "0rr2ka6ivsx54p9c2k4gp4aligkw605j2z1wkviq0aa7mrn2vjiw"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.2.24128.5"; sha256 = "1cmjncpcyiyn3mpzlhh5iya2b8pjl37mpssr8wbvhlzi86f6sh1n"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.2.24128.5"; sha256 = "11nl8nqkhx012nw1wgjss05sdxkz4j5k5frzbpj19n46pxh3mx9v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.2.24128.5"; sha256 = "0lcrwv09qp47vli4xa6nsjvgglbz9add3pqa6282pl5b221q83rc"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.2.24128.5"; sha256 = "1i83fpfx50z1yadrfg40m91r2qmji6v1vyipaqp6863646z2fa4z"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.2.24128.5"; sha256 = "11n78chcg40lj7cjadsmaynczbviqmw1kp1araixnrkmy2xpdzqd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.4.24267.6"; sha256 = "1mk35a5gq5rl9gmj28qbhq4bpasnarzvv5ahqjj2qg8cvj9pizkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.4.24267.6"; sha256 = "0izgyf61gr59zgbxzqlfwkd6by1h7zjksm9y5mgz891m4b6klp71"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.4.24267.6"; sha256 = "1b6dbb5bcxvr40cgqrnmkm6d9bwiy3b7dbfknxsm2dr85bwg6k77"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.4.24267.6"; sha256 = "1fzkp4n1646218i9iqw1cz9sk36wk3s06y7c6lgpml2wxwvkx1vi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.4.24267.6"; sha256 = "0yknkbjyr6mqjfn8wml6plnkpr3cfcgxa9l4b6ysk9v44x514lh1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.4.24267.6"; sha256 = "1zmzih8276hdk3pr6sqrbdp60z8qzjg1yasviq6jcvbw86jsdpki"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.4.24267.6"; sha256 = "1ffvpw79k306sydlyqi39fchjr7iyl8bkd689vvnqk3y51zq6x30"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.4.24267.6"; sha256 = "0z2vqgkmv41pbqv9s73f1whc995v1pliii7yn1m3jqfmrbjm0mhx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.4.24267.6"; sha256 = "04ff0iwk09xflmmmmm9vwd87k5gpaqn4xqgr1gfq0kjaf3f38bbw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.4.24267.6"; sha256 = "1g0kjad0d1drgsm4dqji2fk8npj6grbwsqlqw2xfhjb2v451mssv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.4.24267.6"; sha256 = "0n4vhg5yzwg7rnly29504inkjp0xygynp29n04wdwxzajwf235gi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.4.24267.6"; sha256 = "0cygbmv53j9nyy14gxp35a27kbcakvnyzgiyicq6r64n6y4dhdin"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "1lskbq8piijz0l80cd4gsplhm4hmqpn432awha0g4qrmk1zlk91x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0aid69wcqyv53nxxvl353j01cfi7l9ywgjxs8q51jkbnd1r499v8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "016vdk29s6wgfklr9swbc4c8zba4cyv7f9nh2nbk8c67q3hyqann"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1bffb76snadzpak7z01dxm9ij1ks6xfjg3fc4s1dkfldq4gv3bl4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0jqk8zirqbkxd6dvra7h5alkxx857260d6p13ylw2kwqib5mhym5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "04h65p4ckrf4p371jb8zh23p8llc82jyib6rkc9s6nwmz1yfbyvj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "089z1g4bw1w78awdpk98h95mdn5j2ngfzryjh0d2s6ypga9r4wib"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0nv1ha9jswpm7ck8ry4g0xdmnssxxiwr13n18yh9645idfdxfjhp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.4.24266.19"; sha256 = "1kch2j544ad5y6akzqpcgidmfrz5yrglw9yblgcaai5d8m6n5sad"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "1k6kcbjppxbnv0b205s7i3hjpy9q94q7nvm7ni8zxaw3w6jb9vq0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1c6q5k9bvgr7w5p1908nk7rm68ryzvvdxxb87r06kmr5zwkqrs75"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "019vfmirn4asngsays81q0dfnrnlk1mcwbfkvp7p89gqpri8svyp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1d3fr9yn84ib6431k3jhna1iajak2hvkq4jyi3byrlpb7a07hhxm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0l15nnxjsinhccvzp0bziffqs827lbrjk6ivx5lwjn8yj6cgi3y1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1ndga03pksafyprivvib8ma17slmmpk7yfr67n0rg440dzzfv1l2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1cdjh0mc6shs89ai3a713lasmr2bim3r1nrscyqxwhhcca9k9chp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0xga9s2f4xh8c6snlpgyb7w71h1q9xxn1xf1r4mcnzrmlyb3k67j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.4.24266.19"; sha256 = "0y44nk9jy4pvv7hkrlq0wmzb8r41kmk11ifvjpwh9lvq42ac7knl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "1l21vi04yr6f9dw26gmmgch36dp89whl4amrsfn89l3f0qk85ll0"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "001zv6cba1pgg5y00nx0pczl3svl0s31xfszar5068kikvqyi4ln"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "0n6qvc74qd3w31v32sibl19q37rlfbb5hxsjsiz8kxrjcic280l5"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "0whm0c3l91dq2zdh8cqzpnj38lnxcrxdqir994adzgbp67a8r787"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "1wsy82wv7vs5g4rx5ak6r7nwbhrdjk1z0svjdnb84xd1kvlqk60a"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "0r7n0lbkn3gzxkfr5rs9lj86zzib6ij3sbxq2mjgdgmjs3lldxs8"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "06ssvqs6rvzfcj2rvqdhdf2lg5djn2jjzl9jfadkqlci9plf5cbx"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "19iglvppa79433676isxhkbcib65mvx7bsx43m91vphp17yai6f4"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "0zx8g8hhav0sphrhjqqijh9awybkxgi5q7h00cld5cnf0g7ppjg4"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "176vymq9nz41c8g3rcb8d22wm315nz3blww66afl502yx39q0qqr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "0ssfhdsdz86d2dpbf3fkzd9020gfbnnj6g83i6dw7h9nrg164lmj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1ni22lfm4c1784hq19qbfjqx8nqpkf4v810qkqjac7nb5lhxch3h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "0rc1f7ibvlrwgpyjm3dxnqqxnpwlzyp0b30dm3001rilc4vab6cp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0r0hyq38fpb91rqkvr31490g5ladg5jdb785r6ihybfdf6fx39jx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.4.24266.19"; sha256 = "124rrv9bjvcsgznwyqi7kswr74hjnkag1a4kqvxkg45rhzpry5if"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "0l6qkgwfwy4q8w2kbijvxgy4wz87nm83g56amqrjdzsv325sv6n8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1g90ali4yxm4rmb8069k1zbg7w60x8izcm2qawmyggcxyrwi4rmn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0spdpbq357ql7rkzhm5m9c7mcbz12yqq9qy6j199k9n5615b1igl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0426bcfnkd3czshnvk44xiarxibbmzab8lvlk1csl9h0gj1i2lsd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "08gphb4pq48qhpwym45j8xd38xd4jn94nqf53ap4kwl6ajinb0kj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "12x1j7dyfwb3rvjdkvzip9rilrc3klkj4589n8lr4d736sv8jmd7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "10sigmdn5yyah8hp8yd07qi1k7m4s8r20ndnl5fh79kd1slm08cs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.4.24266.19"; sha256 = "1p0spiz588b8wv2rdq65m0l70k62s9g25j346q80dpqqp3gpicvw"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "1jb4pps4sg2sb04s8w25nzv17x9hsrnkkgwjcqxc70s59vnva2z8"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "14zf89ji0ikp71p9c8ryn51i70v262z3jj3fdjgj27hyrir6mcrv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "0c7l5ln186n8v5q5cfnd8dcwk78x8n87slpb0zgk7hci4j00im79"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "03g6jcmnzd9f9hzgw8yyvwlbmk5a4lbmi1bjsg8384f69ckiywyh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "09v5h6ip89li6b4y58gxjj98m71d4mkshxdm3nh5g91vl0mb5gkl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "1qw9ksddn4y8kmf3kl1b4a5bmf86jvbv6yzbqfgmf44m80d6kqgn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0vj734vhq43kc97w87afqnpi0mymj01rfyrwd1cxnkja1csfs3vj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0w70251ril85hk5gyxflmkacy53zscpnnzvj145iz23j3gz392z9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0yh1s8ydnf0h7vyfpbp571pcmk53357x4f2lg277s112nygvq1c2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1q9gizqsyn6viqby3c0f8l4fmv2hiy2kh17g2kbf1krsp6wcxwmv"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "0d59q4yc9hbzmpighh9dbpcalrbwwgmzfanvz6sgfr4536pnrb14"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "1vza6ylc64pr7ahyh16q8q8ia5q30pm4k02ni9vlb1wcxawmz29c"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "03aicxklpi081lm7xnwaii37dfyiy8q9aap77lr92argz5hdf7wk"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "0blk1h5gng9nqx5lmidmy9cr3qd80dnlkzrp9fcy3jr3qr11f8aq"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "1qrcvby9bq9z3i0an13vmjm33msxalawdv6xr1393nky13zb808j"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "0g2hfxa0pdxinffkfcb1nz9qllaraavmrnfyk78gvvysszs441xj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "1a0anv73bw2h5v1mh5h43ixskfh7y8qkgc2bnl7ad3x43ndbnyy0"; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.4.24266.19"; sha256 = "1h2734krsqjzgid9ha3bcjwbax3cvfvwff35jg01n6ihs9x0d6vb"; }) ]; in rec { - release_9_0 = "9.0.0-preview.2"; + release_9_0 = "9.0.0-preview.4"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.0-preview.2.24128.4"; + version = "9.0.0-preview.4.24267.6"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e3e81a61-4493-433a-ac40-ce2bceb3370d/ce1c59a7054d200dd24a7e4987666b8c/aspnetcore-runtime-9.0.0-preview.2.24128.4-linux-x64.tar.gz"; - sha512 = "9d836edc539ace64ef8fa883bdfc881d89f4cf30d048640246dae9d54e46e79f2e82ebcdf366c1b69017d86d1bf1496acef5d56c3133297ea0bddb2df2eb4523"; + url = "https://download.visualstudio.microsoft.com/download/pr/6f889c70-8c50-44d0-9877-0d0376c031ab/d73ca2ec30f5fc3e537b16f37c029daa/aspnetcore-runtime-9.0.0-preview.4.24267.6-linux-x64.tar.gz"; + sha512 = "ee65f640c894ac6e67589c40682b2fc215f2ab7037695589b9f92801073a0f8a8d071c3caf4608679f61e10830f02d21e916107f77b68c58e59b1f191ec8039a"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/cb8d7d43-e403-44b3-9ee8-477a947f3e6b/3e38a543b6b9144e0fed12cf18eae7f9/aspnetcore-runtime-9.0.0-preview.2.24128.4-linux-arm64.tar.gz"; - sha512 = "6f7a5575d02197f1908c56d580f0a9049f393ae68a4ad4b73935e981d9c6766e028463d2828d3ba0aeb4049237516fee2e116196e790948fefd65436ea804f35"; + url = "https://download.visualstudio.microsoft.com/download/pr/bc6ae1a6-a98c-446f-8aa9-fe4bdd18412d/569b1a10883293eaa5aae3275d8a4e2f/aspnetcore-runtime-9.0.0-preview.4.24267.6-linux-arm64.tar.gz"; + sha512 = "6f457cfc870a8ea3a8f9e5cbc6b4554dd98c7380ced6f4c6f05bf918545e22937b1c446cc696125e08f964f78dacb2215c0d9e42fdd86ea1c3a4a57af199dac1"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/dbbdbf43-8860-4aae-b1aa-57d44f976cc8/f4f6c6c4a740de95a332ed2c693d1d6f/aspnetcore-runtime-9.0.0-preview.2.24128.4-osx-x64.tar.gz"; - sha512 = "c0c37a504f8c3113c90b8108f1f784fbb61387475e3eab37d303c49f627e06034ef6e917ee9c780e910cbf565c20050173f240f215fdead4fabb1f3795f3ac08"; + url = "https://download.visualstudio.microsoft.com/download/pr/7ccc886e-61cc-475e-9ab4-b1723078e7e4/093617db718ce4669b6a93f2d8934b1f/aspnetcore-runtime-9.0.0-preview.4.24267.6-osx-x64.tar.gz"; + sha512 = "614fc10a69d3c78a1b1478b1d49d1e5d7dcadb02b6edd1ece510b81075e19f6267a53c7252ee4cdba1c5df1353f17ad64a54a08459d3a3a8a4baf707e4bef7f2"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/9f27cd5d-334b-4dfe-8876-33186210815a/2752edc7662b603b734219e4fee20ba0/aspnetcore-runtime-9.0.0-preview.2.24128.4-osx-arm64.tar.gz"; - sha512 = "81b5860e68e9e660a535568f96d8058ab6f98dd6b0a8305e3e3358ee721da610c08baf0b59a52d7e30184c39784ab18544f9328a55d8490d400d07be734059a4"; + url = "https://download.visualstudio.microsoft.com/download/pr/57b0954f-d550-42af-b1b5-8c9ef5da0d58/a4c7f9677ac41fa3421050bf9822c56a/aspnetcore-runtime-9.0.0-preview.4.24267.6-osx-arm64.tar.gz"; + sha512 = "2440f43ec72f5298679126527af6c1c410cc542a98ab4e0c5aca0ffda40d29b7dc52e1f1aaa869b2d5b86b7bcd80579bada8fe20d0ba9e48a64ea147ed3b4c0c"; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.0-preview.2.24128.5"; + version = "9.0.0-preview.4.24266.19"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d7900df-fefb-4aba-8dbc-e3d755111a85/c849ddf0290aeae485414ba46ad961c3/dotnet-runtime-9.0.0-preview.2.24128.5-linux-x64.tar.gz"; - sha512 = "6433959a75103f2f1108bbc16cfe348f9ba04fec1c8f9b6895019241bfcb7b21fab675cc13971f2c1a66b46b044a95f91e1e2b46e6e8bdd893d277906f82545a"; + url = "https://download.visualstudio.microsoft.com/download/pr/bd635e31-a279-4078-ac0d-f82ad8940f84/2e9b04bbe40e28507e8483c73eafdd7c/dotnet-runtime-9.0.0-preview.4.24266.19-linux-x64.tar.gz"; + sha512 = "b366a4f19f25281c5b325e737f8c9fe0fa97ca4e19e0e8f00cd42cac84f4134469d02558b07412c66cde62e53f1cb1a7efd68357713ce4d3e816c19ee538e9b6"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ab7bbaf3-c61e-481d-8dbf-b0dc2bcc80f6/0467f280265fe3b33ddcd345b04cdfa1/dotnet-runtime-9.0.0-preview.2.24128.5-linux-arm64.tar.gz"; - sha512 = "5ae4c5f4acf1465c8aba29a90aa3ee99ab47ffece9f932e9fb4de8937d05feace4c5d3b53d4b8bf226eb99de16a0aad0e71f091827651f0722261513c8a8a2e7"; + url = "https://download.visualstudio.microsoft.com/download/pr/18801fdd-b1f5-4856-8288-c306b11f0f43/5c62f28b9a269b1a840cfb310a9a9f86/dotnet-runtime-9.0.0-preview.4.24266.19-linux-arm64.tar.gz"; + sha512 = "ce8c21b6c854b6772578e84d42e2df5f5144d5a15aff3e6d48953feb1aad517215b6349c20fc22542364a9c439fe19a562f070f88eabf14b5d95ab50fe1ecc00"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8ccc8b00-80b0-48c4-9948-9adfa67f42e3/b93918f628eee154b3400fe05774d1be/dotnet-runtime-9.0.0-preview.2.24128.5-osx-x64.tar.gz"; - sha512 = "9f83d1d7dbfb8c8df1c7530fed3ddbb1571e60100954051bf07b8ee758edc600d1d988819c91711cd8b4baa05dd97f9900d1edf2ae5035ac74930a920951f380"; + url = "https://download.visualstudio.microsoft.com/download/pr/6bd91ad7-ac3c-4027-8674-239367730906/007b8c98680c550fb801c34dea28bc9f/dotnet-runtime-9.0.0-preview.4.24266.19-osx-x64.tar.gz"; + sha512 = "9e7364e1448d98df03922bd315f788ce564dfcbec1a9e83c9e1437c22d8d52f72f061750de2f9e149e7662c168b7a781e7450d2c1e8b7f048cb62b360f12d6f6"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6401083b-8213-431e-94b3-bb1bba37d792/551aca92ab4da13513ead1e7865d57e2/dotnet-runtime-9.0.0-preview.2.24128.5-osx-arm64.tar.gz"; - sha512 = "cc7b8626cdec48427ef79f14c0919a09a3500bdc1c2933c6b5cf80886cc590ab20ccbd07bdb3a6081e47b80f372db3b4887b5276a12252887b7360a7f23e9901"; + url = "https://download.visualstudio.microsoft.com/download/pr/c53cab87-a771-422e-be8e-f33a8a6ca637/6e72c3d16f517c6e692572a5cc9546c2/dotnet-runtime-9.0.0-preview.4.24266.19-osx-arm64.tar.gz"; + sha512 = "f9e8188c71ab47631c28d3fb9314b382eec31ae5592a73eaf8c944fcdc240147ac23ef4530a871e9a5deaf311b84ac5b0d5a1f4b6ff22134a8f4eda4555c43a2"; }; }; }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100-preview.2.24157.14"; + version = "9.0.100-preview.4.24267.66"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/911f82cf-0f87-46c2-8d70-44fab9a0f3c9/137ec23686722b8119bd62def8d7b117/dotnet-sdk-9.0.100-preview.2.24157.14-linux-x64.tar.gz"; - sha512 = "c44df5e11791e4b22720834ed7f28102e33ab475670fa8e132d73d5dd03d8f4ed3f4a548deac67a79e06db6f776c9f632eda4503b6fdc9eef7ffb001cc9963c0"; + url = "https://download.visualstudio.microsoft.com/download/pr/87f2eabb-8ba2-4677-9f91-526672f51857/9ed7fb997d40a369c038269a514fc4e4/dotnet-sdk-9.0.100-preview.4.24267.66-linux-x64.tar.gz"; + sha512 = "28b63633a1e6f4078ccc60218b9f7b6663eb960f0ab1c41069ed8f7f67757fa22ce9f4c04d88b9015c417aad34a7a57986451682bd7aa7b966eda45ace23d283"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b64ba1b3-ad10-40a2-b588-73db9ed9d99d/f772743c20f55a5a8aea3da2e1480676/dotnet-sdk-9.0.100-preview.2.24157.14-linux-arm64.tar.gz"; - sha512 = "1d591e504352f765a35092394719451c024a628c69efb6a10d0a5d57947c466a004243e799b46147fdf6316a23b4335b1e8fb1fc5513def1dec9f96c6c845dc7"; + url = "https://download.visualstudio.microsoft.com/download/pr/098a764a-8756-47c5-97e9-118431c31b9f/2e1b737cb4750deadb0136283346c7ed/dotnet-sdk-9.0.100-preview.4.24267.66-linux-arm64.tar.gz"; + sha512 = "519d529c74a972484af49ea72053466e09fbfaec0142cd924705dddc117dc40901ac22ddcb11c05caf7b43ef8cf44ec8a0a9dd4c56fbd329b0f750513ae3100c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5d2259a0-cb6e-4079-96fa-e0de6f0448c5/9b299e3cc15adf6153c28c24cba35fef/dotnet-sdk-9.0.100-preview.2.24157.14-osx-x64.tar.gz"; - sha512 = "a5a02f596e3976e65650d6a780903a755d4d700491c670b4f3c2f167224da632b98ad03ab7a087dc18561c5cc3ae6a3be78d5c6ca2f7312c7d7c417d909a481a"; + url = "https://download.visualstudio.microsoft.com/download/pr/c3cee1ac-1bb3-48b0-8a35-813e511d1d41/dbcba8b2e6d28886d07bec53ab509225/dotnet-sdk-9.0.100-preview.4.24267.66-osx-x64.tar.gz"; + sha512 = "da35a51180e75a238b7a4b5d1a5b7e3e33f1a1c179b40957deee98c8e01a9bfade62e2c909d2e5b377f43cf2dc78687b34b349b27b2f8f841165c3c05b3fe443"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/30628efc-01f0-468d-baf1-fc487e55093a/4c2bf86dbebb6c522d4d667516dc5930/dotnet-sdk-9.0.100-preview.2.24157.14-osx-arm64.tar.gz"; - sha512 = "1c7166a594ba6c07d0233aac44428e561e2131f1f1812cdfee75807d19f1fe53f40f9d93e88d4a478c885993424ec2ec7b9aaf8f174332f587e6ff10813680ec"; + url = "https://download.visualstudio.microsoft.com/download/pr/e003d2d1-abfd-45f6-aca2-e3f2199e3633/dcefd0cccdfb48a3fbb20b14fd2fe22c/dotnet-sdk-9.0.100-preview.4.24267.66-osx-arm64.tar.gz"; + sha512 = "3791e2134f7cae53c430ae5306f325eecb84058da07d90f276f8d4045701c6c85567472ffc2c535002bb3066817683c0a8e82d23ba6ce32a52f7217867db30d2"; }; }; inherit packages; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index fe5880f54c1d9..32e10419d0b8b 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -224,7 +224,7 @@ in stdenv.mkDerivation rec { --inplace \ -s //Project -t elem -n Import \ -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ - src/aspnetcore/eng/SourceBuild.props + src/aspnetcore/eng/DotNetBuild.props '' + lib.optionalString (lib.versionAtLeast version "9") '' # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 @@ -233,8 +233,34 @@ in stdenv.mkDerivation rec { --replace-fail \ "'\$(DotNetBuildSourceOnly)' == 'true'" \ "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" + + # https://github.com/dotnet/source-build/issues/4325 + xmlstarlet ed \ + --inplace \ + -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ + eng/init-source-only.proj + + # AOT is currently broken in binary SDKs, and the resulting executable is + # unable to find ICU + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NativeAotSupported -v false \ + src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.props + + # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] + substituteInPlace \ + src/runtime/src/coreclr/ilasm/CMakeLists.txt \ + --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" + + # https://github.com/dotnet/source-build/issues/4444 + xmlstarlet ed \ + --inplace \ + -s '//Project/Target/MSBuild[@Targets="Restore"]' \ + -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ + src/aspnetcore/eng/Tools.props '' - + lib.optionalString isLinux '' + + lib.optionalString isLinux ('' substituteInPlace \ src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' @@ -247,18 +273,20 @@ in stdenv.mkDerivation rec { src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' - - # TODO: we should really make sure the first one (9.0) or the rest (8.0) - # works, but --replace-fail results in an empty file + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' + '' + + lib.optionalString (lib.versionOlder version "9") '' substituteInPlace \ src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-warn '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' \ --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' - '' + '') + lib.optionalString isDarwin ('' substituteInPlace \ - src/runtime/src/mono/CMakeLists.txt \ src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' @@ -284,6 +312,12 @@ in stdenv.mkDerivation rec { substituteInPlace \ src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ --replace-fail ' -no_code_signature_warning' "" + + # ld: library not found for -ld_classic + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ + --replace-fail 'Include="-ld_classic"' "" '' + lib.optionalString (lib.versionOlder version "9") '' # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: @@ -294,14 +328,24 @@ in stdenv.mkDerivation rec { substituteInPlace \ build.proj \ --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' + + substituteInPlace \ + src/runtime/src/mono/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' ''); prepFlags = [ "--no-artifacts" "--no-prebuilts" + "--with-packages" dotnetSdk.artifacts ]; - configurePhase = '' + configurePhase = let + prepScript = + if (lib.versionAtLeast version "9") + then "./prep-source-build.sh" + else "./prep.sh"; + in '' runHook preConfigure # The build process tries to overwrite some things in the sdk (e.g. @@ -309,7 +353,7 @@ in stdenv.mkDerivation rec { cp -Tr ${dotnetSdk} .dotnet chmod -R +w .dotnet - ./prep.sh $prepFlags + ${prepScript} $prepFlags runHook postConfigure ''; @@ -367,8 +411,10 @@ in stdenv.mkDerivation rec { mkdir "$out" pushd "artifacts/${assets}/Release" - for archive in *.tar.gz; do - target=$out/''${archive%.tar.gz} + find . -name \*.tar.gz | while read archive; do + target=$out/$(basename "$archive" .tar.gz) + # dotnet 9 currently has two copies of the sdk tarball + [[ ! -e "$target" ]] || continue mkdir "$target" tar -C "$target" -xzf "$PWD/$archive" done diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix deleted file mode 100644 index aa25fb77fc526..0000000000000 --- a/pkgs/development/compilers/ldc/bootstrap.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage }: -callPackage ./binary.nix { - version = "1.30.0"; - hashes = { - # Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. - osx-x86_64 = "sha256-AAWZvxuZC82xvrW6fpYm783TY+H8k3DvqE94ZF1yjmk="; - linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE="; - linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y="; - osx-arm64 = "sha256-Nb/owBdIeroB9jLMDvwjo8bvsTC9vFyJPLMTOMsSAd4="; - }; -} diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix deleted file mode 100644 index 6b07612177038..0000000000000 --- a/pkgs/development/compilers/ldc/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./generic.nix { - version = "1.36.0"; - sha256 = "sha256-oAx5BzEjqIfBf0Rsd4KklVajUSo9Natna31Trhu41u8="; -} diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/development/embedded/teensy-loader-cli/default.nix index cd318d7a1ca52..19f7051f0a302 100644 --- a/pkgs/development/embedded/teensy-loader-cli/default.nix +++ b/pkgs/development/embedded/teensy-loader-cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "teensy-loader-cli"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "PaulStoffregen"; repo = "teensy_loader_cli"; rev = finalAttrs.version; - sha256 = "sha256-C9Qhd6LhAES7X0sh4rofjAM+gxwuosahVQHeR76LyIo="; + sha256 = "sha256-NYqCNWO/nHEuNc9eOzsUqJEHJtZ3XaNz1VYNbeuqEk8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index ea3fd6e1ac784..8a895c36e8657 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UPAYqgZSJMp6/pRIVJYqh8i5olBSVoMUv2zCd14JBOg="; + sha256 = "sha256-J1fP3CtTLkUMZxzsbu3ZMbg4ag1NFvaI5AibFT7eZso="; }; passthru = { diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/development/libraries/libwbxml/default.nix index b5dc8c18208a6..30e7a99e6f106 100644 --- a/pkgs/development/libraries/libwbxml/default.nix +++ b/pkgs/development/libraries/libwbxml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libwbxml"; - version = "0.11.8"; + version = "0.11.9"; src = fetchFromGitHub { owner = "libwbxml"; repo = "libwbxml"; rev = "${pname}-${version}"; - sha256 = "sha256-WCVKfIk6R2rVaz1SbJL9eLqNC0f4VzL74Sw2IKdDE9I="; + sha256 = "sha256-zmMsp5xS13rqfSWXXb0FGQcGZkrSMRYc/GQppO4/+Z4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 781287da17caf..372a2940e0ae3 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "precice"; repo = "precice"; rev = "v${version}"; - hash = "sha256-AkIyrjL4OSqX6B1tt1QFopuwnkQaTtb4LmIssY3d3fQ="; + hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index a500e5dbc045c..66c70fcf4dd00 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -2,25 +2,18 @@ stdenv.mkDerivation rec { pname = "rabbitmq-c"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "alanxz"; repo = "rabbitmq-c"; rev = "v${version}"; - sha256 = "sha256-4tSZ+eaLZAkSmFsGnIrRXNvn3xA/4sTKyYZ3hPUMcd0="; + hash = "sha256-ffdnLEgUg+4G12JntjFag3ZXMvEL42hsrY6VT58ccJ0="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ openssl popt xmlto ]; - # https://github.com/alanxz/rabbitmq-c/issues/733 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - ''; - meta = with lib; { description = "RabbitMQ C AMQP client library"; homepage = "https://github.com/alanxz/rabbitmq-c"; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 02b202365b9bf..6eb3c3db64278 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Vc"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "sha256-tbHDGbul68blBAvok17oz7AfhHpEY9Y7RIEsqCQvOJ0="; + sha256 = "sha256-A2qUzjXv50unFcoZp2nRVinkph+CoHyiU7AgOphDphM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 0d21b69cdef60..19e61f789cbb2 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -5,11 +5,12 @@ amaranth, setuptools, setuptools-scm, + unstableGitUpdater, }: buildPythonPackage rec { pname = "amaranth-boards"; - version = "0-unstable-2023-12-13"; + version = "0-unstable-2024-05-01"; pyproject = true; # python setup.py --version realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; @@ -17,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "170675812b71ee722bcf8ccdb88409a9ad97ffe2"; - hash = "sha256-dwZCKMJnEY9RjzkcJ9r3TEC7W+Wfi/P7Hjl4/d60/qo="; + rev = "aba2300dc83216523e1c98fdb22471cb4bac5027"; + hash = "sha256-IMhNMkOf6dg4Djyi39TDTpU0S3TQM1+e6TBoyiITaos="; }; nativeBuildInputs = [ @@ -37,6 +38,8 @@ buildPythonPackage rec { # no tests doCheck = false; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Board definitions for Amaranth HDL"; homepage = "https://github.com/amaranth-lang/amaranth-boards"; diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index d7cd667ed7aa7..78cdea45edff0 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -4,20 +4,24 @@ fetchFromGitHub, amaranth, pdm-backend, + unstableGitUpdater, }: buildPythonPackage rec { pname = "amaranth-soc"; - version = "0-unstable-2024-02-16"; + version = "0.1a-unstable-2024-05-17"; pyproject = true; # from `pdm show` - realVersion = "0.1a1.dev1+g${lib.substring 0 7 src.rev}"; + realVersion = let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "9f46553aa4289e2a11788a73fade6410a371b162"; - hash = "sha256-ZllDSrZEu16jZtbQ7crQSj3XCbsthueXtaAvyf45dmY="; + rev = "45ff663b83694b09b2b8f3fc0f10c555a12ba987"; + hash = "sha256-Ql8XYC13wscPL96HY0kXselq78D747BpLK8X1sxpwz0="; }; nativeBuildInputs = [ pdm-backend ]; @@ -27,6 +31,8 @@ buildPythonPackage rec { export PDM_BUILD_SCM_VERSION="${realVersion}" ''; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + meta = with lib; { description = "System on Chip toolkit for Amaranth HDL"; homepage = "https://github.com/amaranth-lang/amaranth-soc"; diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index 8762410587dad..d81f01b34fc5f 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "clarabel"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-03GEFzlvzLeedKVeDokdHGArwjunh3Zm8cJQL90mI+o="; + hash = "sha256-DW0/6IAL5bS11AqOFL1JJmez5GzF2+N2d85e0l8HGdQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-9zBr9SUd8jJDSqRX9Xs0mDV5gck/qfqJ3VfEAOz7EsA="; + hash = "sha256-NNvrDXBodrO3bxr4X1HEn5uHmHDJ1s9C70lPv7OkSCo="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 244b95ec38ec1..e531471812840 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.5.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-FHE7/VL0mnf0eBPzCsrr8ISr7OmfFvI9xuV0CPa7JdU="; + hash = "sha256-MnAGtoev20Cn1WUmX8imUNQCJftU4jw+hInYI7dhb4M="; }; build-system = [ @@ -94,11 +94,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Basic tools and wrappers for enabling not-too-alien syntax when running columnar Collider HEP analysis"; homepage = "https://github.com/CoffeaTeam/coffea"; changelog = "https://github.com/CoffeaTeam/coffea/releases/tag/v${version}"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ veprbl ]; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix index a4cf7924c9795..f5f44c351c15f 100644 --- a/pkgs/development/python-modules/crc32c/default.nix +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -4,12 +4,13 @@ fetchFromGitHub, pythonOlder, pytestCheckHook, + setuptools }: buildPythonPackage rec { - version = "2.3.post0"; + version = "2.4"; pname = "crc32c"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -17,9 +18,11 @@ buildPythonPackage rec { owner = "ICRAR"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lPEojWeAhfWpGR+k+Tuo4n68iZOk7lUDxjWXj5vN4I0="; + hash = "sha256-rWR2MtTLhqqvgdqEyevg/i8ZHM3OU1bJb27JkBx1J3w="; }; + nativeBuildInputs = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index e2d8c01e98742..0e12fe09c775b 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -14,33 +14,36 @@ buildPythonPackage rec { pname = "dicom2nifti"; - version = "2.4.8"; - format = "setuptools"; + version = "2.4.11"; + pyproject = true; + disabled = pythonOlder "3.6"; # no tests in PyPI dist src = fetchFromGitHub { owner = "icometrix"; repo = pname; - rev = version; - hash = "sha256-2Pspxdeu3pHwXpbjS6bQQnvdeMuITRwYarPuLlmNcv8"; + rev = "refs/tags/${version}"; + hash = "sha256-/JauQZcCQDl1ukcSE3YPbf1SyhVxDNJUlqnFwdlwYQY="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy - setuptools ]; # python-gdcm just builds the python interface provided by the "gdcm" package, so # we should be able to replace "python-gdcm" with "gdcm" but this doesn't work # (similar to https://github.com/NixOS/nixpkgs/issues/84774) postPatch = '' - substituteInPlace setup.py --replace "python-gdcm" "" - substituteInPlace tests/test_generic.py --replace "from common" "from dicom2nifti.common" + substituteInPlace setup.py --replace-fail "python-gdcm" "" + substituteInPlace tests/test_generic.py --replace-fail "from common" "from dicom2nifti.common" + substituteInPlace tests/test_ge.py --replace-fail "import convert_generic" "import dicom2nifti.convert_generic as convert_generic" ''; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 0d9c9d3f1c9ab..25a375bf7eb6f 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.19"; + version = "1.0.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-q9hY/icvc1tPI0xBYxExc2a+gv0i6utaB4GBnJwQPCw="; + hash = "sha256-huXvfQz7E+OCqRrhLC5dUaG/A2PQXrPBzseIFx7ZIeE="; }; build-system = [ diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix index 5217bf09b2c83..d637618255275 100644 --- a/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gardena-bluetooth"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "gardena-bluetooth"; rev = "refs/tags/${version}"; - hash = "sha256-WnurxoSzzNTNxz6S1HSKb/lTuOyox6fG2I0Hlj95Ub0="; + hash = "sha256-eze99JvNSwhot8t43oy30iaFrrkpeMNFyHvfQcA56IM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index b069f3300164d..261f636fb3196 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -1,14 +1,15 @@ { lib, buildPythonPackage, - fetchPypi, pythonOlder, + fetchPypi, + pythonRelaxDepsHook, + setuptools, matplotlib, numpy, opencv4, pillow, scikit-learn, - setuptools, torch, torchvision, ttach, @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "grad-cam"; - version = "1.5.0"; + version = "1.5.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aw7Z/6/AMKH2PVBcOr8HxsmRDa6c3v8Xd4xa8HTiFGA="; + hash = "sha256-WhC3QjMDh4E8NnO8SyCtg9rFgDJkYP6/xdWNcTvlKFU="; }; postPatch = '' @@ -32,9 +33,19 @@ buildPythonPackage rec { --replace "opencv-python" "opencv" ''; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "torchvision" + ]; + + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy opencv4 @@ -60,10 +71,10 @@ buildPythonPackage rec { "pytorch_grad_cam.utils.model_targets" ]; - meta = with lib; { + meta = { description = "Advanced AI explainability for computer vision."; homepage = "https://jacobgil.github.io/pytorch-gradcam-book"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix index 440b9dd861f2d..fc32e80a8c1bf 100644 --- a/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/pkgs/development/python-modules/gradio-pdf/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "gradio-pdf"; - version = "0.0.9"; + version = "0.0.11"; format = "pyproject"; src = fetchPypi { pname = "gradio_pdf"; inherit version; - hash = "sha256-3mua+cZBzseXp5jONIy2OSmNpqz4s0Uvx5oW/eKgP1Y="; + hash = "sha256-HCfjJdd9DIRqm/dS00xlU9AYGM7U/b3zNo2IgZHtasc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 79b3643629ab5..768e5e3f99565 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "0.20.1"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,9 +38,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; - rev = "refs/tags/@gradio/client@${version}"; + # not to be confused with @gradio/client@${version} + rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-55RxoZR/A6WCWGgYggdwjGornIxF8BcjJpWw3p6jrzU="; + hash = "sha256-nbOWg2ZPcXTft7e4tR5p5xecVU62en0hEdXqAgLDZF4="; }; prePatch = '' cd client/python @@ -98,7 +99,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; passthru.updateScript = nix-update-script { - extraArgs = [ "--version-regex" "@gradio/client@(.*)" ]; + extraArgs = [ "--version-regex" "gradio_client@(.*)" ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 4328c8dfbc3c0..039f21168f688 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.33.0"; + version = "4.36.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -71,7 +71,7 @@ buildPythonPackage rec { # We use the Pypi release, since it provides prebuilt webui assets src = fetchPypi { inherit pname version; - hash = "sha256-zPBTUAHpPvNUzb+2MtdqEvIARU6f1r9PpZOUTXQBZWI="; + hash = "sha256-gcHwR9eiou6HKBI4ab06+5CtOa3OtfdvB/sPL35dt2w="; }; # fix packaging.ParserSyntaxError, which can't handle comments diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix new file mode 100644 index 0000000000000..d8b9ff2441d02 --- /dev/null +++ b/pkgs/development/python-modules/hakuin/default.nix @@ -0,0 +1,42 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + jinja2, + nltk, + setuptools, +}: + +buildPythonPackage rec { + pname = "hakuin"; + version = "0-unstable-2024-03-31"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pruzko"; + repo = "hakuin"; + rev = "3b7b76dcbfb8ab2b98e6dee08df02158327af772"; + hash = "sha256-tRjo9a0ZCBjKxbXTkiKFzfL4pL5awF5vXmsJlYxwoIw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + jinja2 + nltk + ]; + + # Module has no test + doCheck = false; + + pythonImportsCheck = [ "hakuin" ]; + + meta = with lib; { + description = "Blind SQL Injection optimization and automation framework"; + homepage = "https://github.com/pruzko/hakuin"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index ba8cb7db308f6..e820964e5e1ed 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.33.1"; + version = "2.35.0"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ZPCL3Xle4qEw2pNIcja252meep26W/RbVEk2suzywYI="; + hash = "sha256-u1gnv2eDYhF0C4r88VMIedxUEk6WU88Q0mlweVKLaoc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 9895f34a86a2d..b0e007460f9b8 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.6.2"; + version = "2024.6.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-vbEAlmb7j7QeFdYj3FZMPsDtawOzige/WQKDbPPxzoY="; + hash = "sha256-y5+l9XSnKzrNrZQc+PklgjFtA32svzTPZz9PI1d8Pe4="; }; build-system = [ diff --git a/pkgs/development/python-modules/repl-python-wakatime/default.nix b/pkgs/development/python-modules/repl-python-wakatime/default.nix new file mode 100644 index 0000000000000..929a51dbce98d --- /dev/null +++ b/pkgs/development/python-modules/repl-python-wakatime/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, ptpython +, ipython +, setuptools +, setuptools-scm +, setuptools-generate +}: + +let + pname = "repl-python-wakatime"; + version = "0.0.6"; +in + +buildPythonPackage { + inherit pname version; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-s2UelniMn4+wWILbVIIKidRCFaOvo/nNNofA7yf2+9c="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + setuptools-generate + ]; + + propagatedBuildInputs = [ + ptpython + ipython + ]; + + pythonImportsCheck = [ + "repl_python_wakatime" + ]; + + meta = with lib; { + description = "Python REPL plugin for automatic time tracking and metrics generated from your programming activity"; + homepage = "https://github.com/wakatime/repl-python-wakatime"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jfvillablanca ]; + }; +} diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index f98c85a0b7455..550465962e313 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.24"; + version = "1.25"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-JLFUdg7kbjhlpGgrQ29U1TRTKhjDlvMGc/FRE+awfLc="; + hash = "sha256-ukS0vxG2Rd71GsF1lmpsDSM2JovwqhXsaAnZdF8WGQo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index 5b5d2faa301c7..d0dbb244299d8 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "0.0.57"; + version = "0.0.59"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-9K3HF67BOFYuZSuV2nT8aBWpQiMdlxMUhWuB9DTBuUw="; + hash = "sha256-LZHniQNIEP2p1iIigmLokse7P7PFyqbjF+xi4EOwnLc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 8758b6c538411..daa6282fb1a3e 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.4.0"; + version = "4.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2vblZxXeLpPdkF6Sb5uxDSPcQVf5ckqnyqtdDiiWPlY="; + hash = "sha256-dn/jyGa6dObZqdIWw07MHP4vvz8SmmwR1ZhxcFpZGro="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 07da59891b396..952f43fff4fd2 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "air"; - version = "1.52.1"; + version = "1.52.2"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; rev = "v${version}"; - hash = "sha256-KTutLvcLH1dOsJFDaEU2c4wGbQyRE7qUHah4mEXCL08="; + hash = "sha256-j1iyVEvg7hqZ634hbAvH5RmVnV7bNsezw72OJ1CNvmY="; }; vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 0efbd75773ff7..8d75f994aee61 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -29,8 +29,8 @@ }: let - # FIXME: Compare revision with - # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L26-L27 + # NOTE: Check these revision changes when updating the package. + # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L25-L26 arm64 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-arm64"; @@ -44,15 +44,15 @@ let hash = "sha256-YhfgJ7M8ys53jh1clOzj0I2yfJshXQm5zP0L9kMYsmk="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "radare2"; - version = "5.9.0"; + version = "5.9.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; - rev = "refs/tags/${version}"; - hash = "sha256-h2IYOGr+yCgCJR1gB4jibcUt1A+8IuNVoTUcJ83lKHw="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-smsjGfTvSTVwd7nhWhptYpkus2fEQ2EVdT5bDt/rHZE="; }; preBuild = '' @@ -66,30 +66,27 @@ stdenv.mkDerivation rec { ''; postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath $out/lib $out/lib/libr_io.${version}.dylib + install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib ''; mesonFlags = [ + "-Dr2_gittap=${finalAttrs.version}" "-Duse_sys_capstone=true" + "-Duse_sys_lz4=true" "-Duse_sys_magic=true" - "-Duse_sys_zip=true" + "-Duse_sys_openssl=true" "-Duse_sys_xxhash=true" - "-Duse_sys_lz4=true" - "-Dr2_gittap=${version}" + "-Duse_sys_zip=true" ]; - # TODO: remove when upstream fixes the issue - # https://github.com/radareorg/radare2/issues/22793 - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ - "-DTHREAD_CONVERT_THREAD_STATE_TO_SELF=1" - ]); - enableParallelBuilding = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; strictDeps = true; nativeBuildInputs = [ pkg-config meson ninja python3 ]; + buildInputs = [ capstone file @@ -113,11 +110,27 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "UNIX-like reverse engineering framework and command-line tools"; + description = "UNIX-like reverse engineering framework and command-line toolset"; + longDescription = '' + r2 is a complete rewrite of radare. It provides a set of libraries, tools + and plugins to ease reverse engineering tasks. Distributed mostly under + LGPLv3, each plugin can have different licenses. + + The radare project started as a simple command-line hexadecimal editor + focused on forensics. Today, r2 is a featureful low-level command-line + tool with support for scripting with the embedded JavaScript interpreter + or via r2pipe. + + r2 can edit files on local hard drives, view kernel memory, and debug + programs locally or via a remote gdb/windbg servers. r2's wide + architecture support allows you to analyze, emulate, debug, modify, and + disassemble any binary. + ''; homepage = "https://radare.org"; - changelog = "https://github.com/radareorg/radare2/releases/tag/${version}"; - license = licenses.gpl2Plus; + changelog = "https://github.com/radareorg/radare2/releases/tag/${finalAttrs.version}"; + license = with licenses; [ gpl3Only lgpl3Only ]; maintainers = with maintainers; [ azahi raskin makefu mic92 arkivm ]; + mainProgram = "radare2"; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 3797491ab4d0b..0fecd23a708b6 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { version = "2.5.11"; src = fetchFromGitHub { - owner = "AlexAkulov"; + owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; hash = "sha256-MqtlrAn4FRjZEocGRLRbbTJePvWPZbhE+7MaFZQgyeY="; @@ -31,11 +31,10 @@ buildGoModule rec { }; meta = with lib; { - description = "Tool for easy ClickHouse backup and restore with cloud storages support"; + description = "Tool for easy ClickHouse backup and restore using object storage for backup files"; mainProgram = "clickhouse-backup"; - homepage = "https://github.com/AlexAkulov/clickhouse-backup"; + homepage = "https://github.com/Altinity/clickhouse-backup"; license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + maintainers = with maintainers; [ devusb ]; }; } diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix index 0c9680c69289b..b010b220eed06 100644 --- a/pkgs/development/tools/database/dblab/default.nix +++ b/pkgs/development/tools/database/dblab/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dblab"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-PXIV9MLdBRTvXwvtKraX3530H/EDz+4HA7SeKyeEJB4="; + hash = "sha256-xaggGX1BROyfexPV3I2TGYf3BPHg2uFebm8XZ0qwXUw="; }; - vendorHash = "sha256-WzyH3Ja/Znk/9aavIoBQRpJVnGb5o/ded0g92MTa4M4="; + vendorHash = "sha256-RmZkSlA6KU1wXKFHPLYVhRjwxsDjO1XNoGBdNCmeGSw="; ldflags = [ "-s -w -X main.version=${version}" ]; diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/development/tools/eask/default.nix index 8aeac6fe1c2d4..b0ff5461f12f1 100644 --- a/pkgs/development/tools/eask/default.nix +++ b/pkgs/development/tools/eask/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "eask"; - version = "0.9.5"; + version = "0.9.9"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-olVR+TTDfSnQ+eJEb5qbNq96KnRr1WYx74/nC275+gI="; + hash = "sha256-BW2Kw5arYJStz468uLokNj7c1nFVdvYMPdVoaU6dRts="; }; - npmDepsHash = "sha256-LqJ6cJxrQ3uHuQqXHQ7pfhTlndqFuqoMee9CNSteCP4="; + npmDepsHash = "sha256-lgkPyu7kM6ZW/MgO2eBsf46Z767wDObrgh8dCLl+dGA="; dontBuild = true; diff --git a/pkgs/development/tools/frink/default.nix b/pkgs/development/tools/frink/default.nix index c8794ba0e8fd5..127cb39858415 100644 --- a/pkgs/development/tools/frink/default.nix +++ b/pkgs/development/tools/frink/default.nix @@ -1,46 +1,50 @@ -{ fetchurl -, frink -, jdk -, lib -, rlwrap -, stdenv -, testers +{ + fetchurl, + frink, + jdk, + lib, + rlwrap, + stdenv, + testers, }: stdenv.mkDerivation rec { pname = "frink"; - version = "2023-12-02"; + version = "2024-05-09"; src = fetchurl { # Upstream does not provide versioned download links - url = "https://web.archive.org/web/20231210094124/https://frinklang.org/frinkjar/frink.jar"; - sha256 = "sha256-oURRTrgyVMPD4cOdM6g0bDpZ0KMlVsLqa0nzC1UvqIs="; + url = "https://web.archive.org/web/20240605193919/https://frinklang.org/frinkjar/frink-tng.jar"; + sha256 = "sha256-ceV1p9wsXprcNLhol79evswVZ1SpH5IzfSbl8st4cmU="; }; dontUnpack = true; nativeBuildInputs = [ jdk ]; - buildInputs = [ jdk rlwrap ]; + buildInputs = [ + jdk + rlwrap + ]; installPhase = '' runHook preInstall mkdir -p $out/bin $out/lib - cp ${src} $out/lib/frink.jar + cp ${src} $out/lib/frink-tng.jar # Generate rlwrap helper files. # See https://frinklang.org/fsp/colorize.fsp?f=listUnits.frink # and https://frinklang.org/fsp/colorize.fsp?f=listFunctions.frink - java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter -e 'joinln[lexicalSort[units[]]]' > $out/lib/unitnames.txt - java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter -e 'joinln[map[{|f| + java -classpath "$out/lib/frink-tng.jar" frink.gui.FrinkStarter -e 'joinln[lexicalSort[units[]]]' > $out/lib/unitnames.txt + java -classpath "$out/lib/frink-tng.jar" frink.gui.FrinkStarter -e 'joinln[map[{|f| f =~ %s/\s+//g return "$f$" }, lexicalSort[functions[]]]]' > $out/lib/functionnames.txt cat > "$out/bin/frink" << EOF #!${stdenv.shell} - exec ${rlwrap}/bin/rlwrap -f $out/lib/unitnames.txt -b '$' -f $out/lib/functionnames.txt ${jdk}/bin/java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter "\$@" + exec ${rlwrap}/bin/rlwrap -f $out/lib/unitnames.txt -b '$' -f $out/lib/functionnames.txt ${jdk}/bin/java -classpath "$out/lib/frink-tng.jar" frink.gui.FrinkStarter "\$@" EOF chmod a+x "$out/bin/frink" diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 14e813046fee5..9f8a779f3d767 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.10"; + version = "7.1.11"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-Y2c+qcI+IuPE7kmgPXTDLSkqCBw7wPmdmmYhZmBjwJ8="; + hash = "sha256-gXxYN6WIbQNhFTCcrT6Kioo0FjbJM5gxHTjAK71LMjs="; }; - cargoHash = "sha256-GRIR5CfrELLlImw3jKn2CDrmxQ+6WWTi674esic2O2U="; + cargoHash = "sha256-bz8iAgdRxTQyZJsTVVwIpiC/ktas4Sv/S7PCqQ+/HDY="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index c3a42b7a059a2..9881b7050e0f8 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.34.2"; + version = "0.35.0"; src = fetchCrate { inherit pname version; - hash = "sha256-cqFpvhlhgmytv8MzhwKafZYTWwLUXl9o2FQPCY8EN6Y="; + hash = "sha256-NRL+7v1K2Y6lm1yuNZODkMaf2Xeib8KjOvPbn+nvbA4="; }; - cargoHash = "sha256-HaZqvsM8QsHo5sdMKHrKdTdWgHIXpBiU3eTojqZXIDA="; + cargoHash = "sha256-/IpSIqZfBliiWzDXoSJMK/B8wDw1eyJ/gecHwd90c+A="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/development/tools/steamos-devkit/default.nix index 894bfff77da83..462bf620e7308 100644 --- a/pkgs/development/tools/steamos-devkit/default.nix +++ b/pkgs/development/tools/steamos-devkit/default.nix @@ -12,14 +12,14 @@ let # steamos-devkit requires a build of the unreleased pyimgui 2.0 branch, move to pythonPackages when 2.0 is released. pyimgui = python3.pkgs.buildPythonPackage { pname = "pyimgui"; - version = "unstable-2022-03-06"; + version = "2.0.0"; src = fetchFromGitHub { owner = "pyimgui"; repo = "pyimgui"; - rev = "1f095af5886f424ee12f26fa93b108b6420fafa4"; # dev/version-2.0 branch + rev = "2.0.0"; fetchSubmodules = true; - sha256 = "sha256-k070ue132m8H1Zm8bo7J7spCS5dSTGOj689ci7vJ+aw="; + sha256 = "sha256-sw/bLTdrnPhBhrnk5yyXCbEK4kMo+PdEvoMJ9aaZbsE="; }; nativeBuildInputs = with python3.pkgs; [ @@ -57,14 +57,14 @@ let in python3.pkgs.buildPythonPackage rec { pname = "steamos-devkit"; - version = "0.20230411.0"; + version = "0.20240216.0"; src = fetchFromGitLab { domain = "gitlab.steamos.cloud"; owner = "devkit"; repo = "steamos-devkit"; rev = "v${version}"; - sha256 = "sha256-DQIyjEpUFnC0OjMjKMrGYs4+HoEDfcSc3m3rfXLPyZ0="; + sha256 = "sha256-eOtESkGMIjcijAFITOcYKPsXH6xH/Xcj9D+OItMqebM="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 80c46140e4a0c..7a5a3e4bad083 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.20.0"; + version = "5.20.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-PTA/TsmppbBG8LvofKe8vBjaotShbohEM8tNq1D6q6Y="; + hash = "sha256-tS30wEXUhzPUPh5gY+UZF274/EOfwMGU19glXUrDuw0="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/web/edge-runtime/Cargo.lock b/pkgs/development/web/edge-runtime/Cargo.lock index d21116d0f79b0..6f3f1aa872b0e 100644 --- a/pkgs/development/web/edge-runtime/Cargo.lock +++ b/pkgs/development/web/edge-runtime/Cargo.lock @@ -1956,6 +1956,7 @@ dependencies = [ "deno_core", "log", "serde", + "strum", "tokio", "uuid", ] @@ -4795,6 +4796,7 @@ name = "sb_module_loader" version = "0.1.0" dependencies = [ "anyhow", + "base64 0.21.7", "deno_ast", "deno_core", "deno_fs", diff --git a/pkgs/development/web/edge-runtime/default.nix b/pkgs/development/web/edge-runtime/default.nix index 07d7cb59785da..cae336b3b0812 100644 --- a/pkgs/development/web/edge-runtime/default.nix +++ b/pkgs/development/web/edge-runtime/default.nix @@ -11,7 +11,7 @@ let pname = "edge-runtime"; - version = "1.53.3"; + version = "1.53.4"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-eGFLwypLgoTKUapG3kbI9J9jSyR39JtKgM0dwtkR9zk="; + hash = "sha256-sDgGfQiAUuI+JaF0BRB5lwvjbWWIoTV/k/tbQsBBc4E="; fetchSubmodules = true; }; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 72100b1ac0af2..fecc10a6d1ce1 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.10.0"; + version = "10.11.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-InuaitDoSuE091PG5OwSo/DNplitpIcOgZQ4Dcyz2iI="; + hash = "sha256-2RK+OTMlMGA0Y/LDifJjGZOzgv6/QoNSB2NXUEO5ry8="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-Tt+Be5zsngQokC18cvQ+r5EU1h8FXQ7kfzbRFBse5TQ="; + vendorHash = "sha256-rQLnCY4tdNKYJcCpRs/J5SII0hSkxHxtVZkl4O4Ytyk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 1d8ced4dd5d74..28401bf4adfa5 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -14,7 +14,7 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_unstable"; # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.9"; + kernelCompatible = kernel.kernelOlder "6.10"; latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8; @@ -22,13 +22,13 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.4"; - # rev = ""; + version = "2.2.4-unstable-2024-05-29"; + rev = "2eab4f7b396a1abb9adf7cab82d6ff47f9d78e9b"; isUnstable = true; tests = [ nixosTests.zfs.unstable ]; - hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4="; + hash = "sha256-xcEiZRHsFtIWvjy47kaLai/No/XYfhkJ5+zi/1KWqUE="; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6c600f0f5acb1..c4ef0e60adcc7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.6.0"; + version = "2024.6.1"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -84,7 +84,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -113,7 +112,6 @@ ]; "aladdin_connect" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; # missing inputs: genie-partner-sdk @@ -123,10 +121,8 @@ adext ]; "alert" = ps: with ps; [ - isal ]; "alexa" = ps: with ps; [ - isal pyturbojpeg ]; "alpha_vantage" = ps: with ps; [ @@ -155,7 +151,6 @@ ]; "analytics" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -197,14 +192,12 @@ aioapcaccess ]; "api" = ps: with ps; [ - isal ]; "appalachianpower" = ps: with ps; [ ]; "apple_tv" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant pyatv sqlalchemy @@ -212,7 +205,6 @@ ]; "application_credentials" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -252,7 +244,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -275,7 +266,6 @@ "arve" = ps: with ps; [ ]; # missing inputs: asyncarve "arwn" = ps: with ps; [ - isal paho-mqtt ]; "aseko_pool_live" = ps: with ps; [ @@ -285,7 +275,6 @@ ha-ffmpeg hassil home-assistant-intents - isal mutagen webrtc-noise-gain ]; @@ -326,10 +315,8 @@ pyaussiebb ]; "auth" = ps: with ps; [ - isal ]; "automation" = ps: with ps; [ - isal ]; "avea" = ps: with ps; [ avea @@ -345,7 +332,6 @@ ]; "axis" = ps: with ps; [ axis - isal paho-mqtt ]; "azure_data_explorer" = ps: with ps; [ @@ -361,7 +347,6 @@ ]; "backup" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant securetar sqlalchemy @@ -434,7 +419,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -457,7 +441,6 @@ dbus-fast fnv-hash-fast habluetooth - isal psutil-home-assistant pyserial pyudev @@ -481,7 +464,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -508,7 +490,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -532,7 +513,6 @@ boschshcpy fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy zeroconf @@ -591,7 +571,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -613,10 +592,8 @@ caldav ]; "calendar" = ps: with ps; [ - isal ]; "camera" = ps: with ps; [ - isal pyturbojpeg ]; "canary" = ps: with ps; [ @@ -630,7 +607,6 @@ hassil home-assistant-intents ifaddr - isal mutagen plexapi plexauth @@ -677,7 +653,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen psutil-home-assistant python-matter-server @@ -720,7 +695,6 @@ "coned" = ps: with ps; [ ]; "config" = ps: with ps; [ - isal ]; "configurator" = ps: with ps; [ ]; @@ -730,7 +704,6 @@ "conversation" = ps: with ps; [ hassil home-assistant-intents - isal ]; "coolmaster" = ps: with ps; [ pycoolmasternet-async @@ -753,7 +726,6 @@ crownstone-sse crownstone-uart fnv-hash-fast - isal psutil-home-assistant pyserial pyudev @@ -812,7 +784,6 @@ home-assistant-frontend home-assistant-intents ifaddr - isal mutagen numpy pillow @@ -839,7 +810,6 @@ fnv-hash-fast hassil home-assistant-intents - isal pillow psutil-home-assistant sqlalchemy @@ -855,7 +825,6 @@ devialet fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy zeroconf @@ -864,7 +833,6 @@ ]; "device_sun_light_trigger" = ps: with ps; [ fnv-hash-fast - isal pillow psutil-home-assistant sqlalchemy @@ -875,7 +843,6 @@ devolo-home-control-api fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy zeroconf @@ -892,10 +859,8 @@ cached-ipaddress ]; "diagnostics" = ps: with ps; [ - isal ]; "dialogflow" = ps: with ps; [ - isal ]; "diaz" = ps: with ps; [ ]; @@ -929,7 +894,6 @@ fnv-hash-fast getmac ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -937,7 +901,6 @@ async-upnp-client fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -945,7 +908,6 @@ aiodns ]; "dominos" = ps: with ps; [ - isal ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow @@ -953,7 +915,6 @@ ]; "doorbird" = ps: with ps; [ doorbirdpy - isal ]; "dooya" = ps: with ps; [ ]; @@ -975,7 +936,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant py-dormakaba-dkey @@ -994,14 +954,12 @@ ]; "drop_connect" = ps: with ps; [ dropmqttapi - isal paho-mqtt ]; "dsmr" = ps: with ps; [ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ - isal paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ @@ -1028,7 +986,6 @@ dynalite-panel fnv-hash-fast home-assistant-frontend - isal pillow psutil-home-assistant sqlalchemy @@ -1062,7 +1019,6 @@ ]; # missing inputs: py-sucks "ecowitt" = ps: with ps; [ aioecowitt - isal ]; "eddystone_temperature" = ps: with ps; [ ]; # missing inputs: beacontools @@ -1084,7 +1040,6 @@ ]; # missing inputs: pyElectra "electric_kiwi" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; # missing inputs: electrickiwi-api @@ -1098,7 +1053,6 @@ elkm1-lib fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -1110,7 +1064,6 @@ ]; "elvia" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; # missing inputs: elvia @@ -1127,7 +1080,6 @@ "emulated_hue" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -1138,7 +1090,6 @@ emulated-roku fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -1148,7 +1099,6 @@ ]; "energy" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -1204,7 +1154,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -1234,7 +1183,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -1267,7 +1215,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -1329,13 +1276,11 @@ file-read-backwards ]; "file_upload" = ps: with ps; [ - isal ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -1353,7 +1298,6 @@ "fitbit" = ps: with ps; [ fitbit fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -1382,7 +1326,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -1424,7 +1367,6 @@ flux-led fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -1441,7 +1383,6 @@ ]; "forked_daapd" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant spotipy sqlalchemy @@ -1453,7 +1394,6 @@ libpyfoscam ]; "foursquare" = ps: with ps; [ - isal ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms @@ -1470,7 +1410,6 @@ fnv-hash-fast fritzconnection ifaddr - isal psutil-home-assistant sqlalchemy xmltodict @@ -1489,7 +1428,6 @@ "frontend" = ps: with ps; [ fnv-hash-fast home-assistant-frontend - isal pillow psutil-home-assistant sqlalchemy @@ -1500,7 +1438,6 @@ "fujitsu_anywair" = ps: with ps; [ ]; "fully_kiosk" = ps: with ps; [ - isal paho-mqtt python-fullykiosk ]; @@ -1534,7 +1471,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -1552,14 +1488,12 @@ ]; "generic" = ps: with ps; [ ha-av - isal pillow ]; "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -1577,12 +1511,10 @@ "geocaching" = ps: with ps; [ fnv-hash-fast geocachingapi - isal psutil-home-assistant sqlalchemy ]; "geofency" = ps: with ps; [ - isal ]; "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes @@ -1617,14 +1549,12 @@ fnv-hash-fast gcal-sync ical - isal oauth2client psutil-home-assistant sqlalchemy ]; "google_assistant" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant python-matter-server pyturbojpeg @@ -1633,7 +1563,6 @@ "google_assistant_sdk" = ps: with ps; [ fnv-hash-fast gassist-text - isal psutil-home-assistant sqlalchemy ]; @@ -1647,7 +1576,6 @@ ha-ffmpeg hassil home-assistant-intents - isal mutagen voluptuous-openapi webrtc-noise-gain @@ -1655,7 +1583,6 @@ "google_mail" = ps: with ps; [ fnv-hash-fast google-api-python-client - isal psutil-home-assistant sqlalchemy ]; @@ -1668,14 +1595,12 @@ "google_sheets" = ps: with ps; [ fnv-hash-fast gspread - isal psutil-home-assistant sqlalchemy ]; "google_tasks" = ps: with ps; [ fnv-hash-fast google-api-python-client - isal psutil-home-assistant sqlalchemy ]; @@ -1706,7 +1631,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -1719,7 +1643,6 @@ fnv-hash-fast govee-local-api ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -1727,7 +1650,6 @@ gps3 ]; "gpslogger" = ps: with ps; [ - isal ]; "graphite" = ps: with ps; [ ]; @@ -1735,7 +1657,6 @@ fnv-hash-fast greeclimate ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -1746,7 +1667,6 @@ ]; # missing inputs: greenwavereality "group" = ps: with ps; [ fnv-hash-fast - isal pillow psutil-home-assistant sqlalchemy @@ -1766,7 +1686,6 @@ habitipy ]; "hardkernel" = ps: with ps; [ - isal psutil-home-assistant ]; "hardware" = ps: with ps; [ @@ -1779,7 +1698,6 @@ aioharmony ]; "hassio" = ps: with ps; [ - isal ]; "havana_shade" = ps: with ps; [ ]; @@ -1815,13 +1733,11 @@ ]; "history" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; "history_stats" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -1842,7 +1758,6 @@ "home_connect" = ps: with ps; [ fnv-hash-fast homeconnect - isal psutil-home-assistant sqlalchemy ]; @@ -1855,7 +1770,6 @@ "homeassistant_green" = ps: with ps; [ bellows fnv-hash-fast - isal pillow psutil-home-assistant pyserial @@ -1873,7 +1787,6 @@ "homeassistant_hardware" = ps: with ps; [ bellows fnv-hash-fast - isal pillow psutil-home-assistant pyserial @@ -1891,7 +1804,6 @@ "homeassistant_sky_connect" = ps: with ps; [ bellows fnv-hash-fast - isal pillow psutil-home-assistant pyserial @@ -1909,7 +1821,6 @@ "homeassistant_yellow" = ps: with ps; [ bellows fnv-hash-fast - isal pillow psutil-home-assistant pyserial @@ -1930,7 +1841,6 @@ ha-ffmpeg hap-python ifaddr - isal psutil-home-assistant pyqrcode pyturbojpeg @@ -1956,7 +1866,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyroute2 @@ -1988,11 +1897,9 @@ python-hpilo ]; "html5" = ps: with ps; [ - isal pywebpush ]; "http" = ps: with ps; [ - isal ]; "huawei_lte" = ps: with ps; [ huawei-lte-api @@ -2015,7 +1922,6 @@ "husqvarna_automower" = ps: with ps; [ aioautomower fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -2060,7 +1966,6 @@ home-assistant-intents ibeacon-ble ifaddr - isal mutagen psutil-home-assistant pyserial @@ -2090,7 +1995,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -2102,7 +2006,6 @@ "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ - isal pyfttt ]; "iglo" = ps: with ps; [ @@ -2114,19 +2017,15 @@ defusedxml ]; # missing inputs: ihcsdk "image" = ps: with ps; [ - isal ]; "image_processing" = ps: with ps; [ - isal pyturbojpeg ]; "image_upload" = ps: with ps; [ - isal pillow ]; "imap" = ps: with ps; [ aioimaplib - isal ]; "imgw_pib" = ps: with ps; [ ]; # missing inputs: imgw_pib @@ -2148,7 +2047,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -2185,7 +2083,6 @@ home-assistant-intents ifaddr inkbird-ble - isal mutagen psutil-home-assistant pyserial @@ -2212,7 +2109,6 @@ fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant - isal pillow psutil-home-assistant pyinsteon @@ -2226,7 +2122,6 @@ intellifire4py ]; "intent" = ps: with ps; [ - isal ]; "intent_script" = ps: with ps; [ ]; @@ -2236,7 +2131,6 @@ "ios" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy zeroconf @@ -2327,7 +2221,6 @@ hassil home-assistant-intents ifaddr - isal kegtron-ble mutagen psutil-home-assistant @@ -2363,7 +2256,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pymicrobot @@ -2378,7 +2270,6 @@ ]; "kitchen_sink" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -2391,7 +2282,6 @@ "knx" = ps: with ps; [ fnv-hash-fast home-assistant-frontend - isal knx-frontend pillow psutil-home-assistant @@ -2400,11 +2290,9 @@ xknxproject ]; "kodi" = ps: with ps; [ - isal pykodi ]; "konnected" = ps: with ps; [ - isal konnected ]; "kostal_plenticore" = ps: with ps; [ @@ -2445,7 +2333,6 @@ hassil home-assistant-intents ifaddr - isal lmcloud mutagen psutil-home-assistant @@ -2458,13 +2345,11 @@ "lametric" = ps: with ps; [ demetriek fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; "landisgyr_heat_meter" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant pyserial pyudev @@ -2505,7 +2390,6 @@ hassil home-assistant-intents ifaddr - isal ld2410-ble mutagen psutil-home-assistant @@ -2533,7 +2417,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -2560,7 +2443,6 @@ hassil home-assistant-intents ifaddr - isal led-ble mutagen psutil-home-assistant @@ -2575,7 +2457,6 @@ "lg_netcast" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant pylgnetcast sqlalchemy @@ -2594,7 +2475,6 @@ aiolifx-themes fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -2639,7 +2519,6 @@ "local_ip" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -2647,14 +2526,12 @@ ical ]; "locative" = ps: with ps; [ - isal ]; "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ fnv-hash-fast home-assistant-frontend - isal pillow psutil-home-assistant sqlalchemy @@ -2665,7 +2542,6 @@ ]; "logi_circle" = ps: with ps; [ ha-ffmpeg - isal logi-circle ]; "london_air" = ps: with ps; [ @@ -2681,7 +2557,6 @@ hass-nabucasa hassil home-assistant-intents - isal loqedapi mutagen psutil-home-assistant @@ -2691,7 +2566,6 @@ webrtc-noise-gain ]; "lovelace" = ps: with ps; [ - isal pillow ]; "luci" = ps: with ps; [ @@ -2716,29 +2590,24 @@ "lyric" = ps: with ps; [ aiolyric fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; "madeco" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ - isal ]; "mailgun" = ps: with ps; [ - isal pymailgunner ]; "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ - isal paho-mqtt ]; "map" = ps: with ps; [ fnv-hash-fast home-assistant-frontend - isal pillow psutil-home-assistant sqlalchemy @@ -2758,7 +2627,6 @@ ]; "matter" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant python-matter-server sqlalchemy @@ -2789,7 +2657,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -2799,14 +2666,11 @@ zeroconf ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ - isal yt-dlp ]; "media_player" = ps: with ps; [ - isal ]; "media_source" = ps: with ps; [ - isal ]; "mediaroom" = ps: with ps; [ pymediaroom @@ -2834,7 +2698,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -2844,7 +2707,6 @@ zeroconf ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ - isal ]; "message_bird" = ps: with ps; [ messagebird @@ -2871,22 +2733,18 @@ ]; # missing inputs: mficlient "microbees" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; # missing inputs: microBeesPy "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ - isal pyturbojpeg ]; "microsoft_face_detect" = ps: with ps; [ - isal pyturbojpeg ]; "microsoft_face_identify" = ps: with ps; [ - isal pyturbojpeg ]; "mijndomein_energie" = ps: with ps; [ @@ -2926,7 +2784,6 @@ hassil home-assistant-intents ifaddr - isal moat-ble mutagen psutil-home-assistant @@ -2942,7 +2799,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen pillow psutil-home-assistant @@ -2959,7 +2815,6 @@ ]; "modem_callerid" = ps: with ps; [ fnv-hash-fast - isal phone-modem psutil-home-assistant pyserial @@ -2979,7 +2834,6 @@ ]; # missing inputs: pymonoprice "monzo" = ps: with ps; [ fnv-hash-fast - isal monzopy psutil-home-assistant sqlalchemy @@ -3004,7 +2858,6 @@ hassil home-assistant-intents ifaddr - isal mopeka-iot-ble mutagen psutil-home-assistant @@ -3017,7 +2870,6 @@ "motion_blinds" = ps: with ps; [ fnv-hash-fast ifaddr - isal motionblinds psutil-home-assistant sqlalchemy @@ -3040,7 +2892,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -3050,7 +2901,6 @@ zeroconf ]; # missing inputs: motionblindsble "motioneye" = ps: with ps; [ - isal motioneye-client ]; "motionmount" = ps: with ps; [ @@ -3060,23 +2910,18 @@ mpd2 ]; "mqtt" = ps: with ps; [ - isal paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ - isal paho-mqtt ]; "mqtt_json" = ps: with ps; [ - isal paho-mqtt ]; "mqtt_room" = ps: with ps; [ - isal paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ - isal paho-mqtt ]; "msteams" = ps: with ps; [ @@ -3094,7 +2939,6 @@ "my" = ps: with ps; [ fnv-hash-fast home-assistant-frontend - isal pillow psutil-home-assistant sqlalchemy @@ -3102,12 +2946,10 @@ "myq" = ps: with ps; [ ]; "mysensors" = ps: with ps; [ - isal paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ - isal python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ @@ -3115,7 +2957,6 @@ ]; "myuplink" = ps: with ps; [ fnv-hash-fast - isal myuplink psutil-home-assistant sqlalchemy @@ -3134,7 +2975,6 @@ ]; "neato" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant pybotvac sqlalchemy @@ -3149,7 +2989,6 @@ fnv-hash-fast google-nest-sdm ha-ffmpeg - isal psutil-home-assistant sqlalchemy ]; @@ -3159,7 +2998,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen psutil-home-assistant pyatmo @@ -3178,12 +3016,10 @@ eternalegypt ]; "netio" = ps: with ps; [ - isal ]; # missing inputs: pynetio "network" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -3229,7 +3065,6 @@ fnv-hash-fast getmac ifaddr - isal netmap psutil-home-assistant sqlalchemy @@ -3247,7 +3082,6 @@ pymetno ]; "notify" = ps: with ps; [ - isal ]; "notify_events" = ps: with ps; [ notify-events @@ -3264,7 +3098,6 @@ nuheat ]; "nuki" = ps: with ps; [ - isal pynuki ]; "numato" = ps: with ps; [ @@ -3304,7 +3137,6 @@ ha-ffmpeg hassil home-assistant-intents - isal mutagen webrtc-noise-gain ]; # missing inputs: ollama-hass @@ -3315,14 +3147,12 @@ omnilogic ]; "onboarding" = ps: with ps; [ - isal pillow ]; "oncue" = ps: with ps; [ aiooncue ]; "ondilo_ico" = ps: with ps; [ - isal ondilo ]; "onewire" = ps: with ps; [ @@ -3343,7 +3173,6 @@ ha-ffmpeg hassil home-assistant-intents - isal mutagen openai voluptuous-openapi @@ -3387,7 +3216,6 @@ ]; "opower" = ps: with ps; [ fnv-hash-fast - isal opower psutil-home-assistant sqlalchemy @@ -3412,7 +3240,6 @@ hassil home-assistant-intents ifaddr - isal mutagen oralb-ble psutil-home-assistant @@ -3437,7 +3264,6 @@ bellows fnv-hash-fast ifaddr - isal pillow psutil-home-assistant pyroute2 @@ -3472,7 +3298,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen paho-mqtt psutil-home-assistant @@ -3497,7 +3322,6 @@ "panel_custom" = ps: with ps; [ fnv-hash-fast home-assistant-frontend - isal pillow psutil-home-assistant sqlalchemy @@ -3505,7 +3329,6 @@ "panel_iframe" = ps: with ps; [ fnv-hash-fast home-assistant-frontend - isal pillow psutil-home-assistant sqlalchemy @@ -3530,7 +3353,6 @@ "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ - isal pillow ]; "pge" = ps: with ps; [ @@ -3563,7 +3385,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen psutil-home-assistant pyplaato @@ -3574,12 +3395,10 @@ ]; "plant" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; "plex" = ps: with ps; [ - isal plexapi plexauth plexwebsocket @@ -3593,7 +3412,6 @@ pycketcasts ]; "point" = ps: with ps; [ - isal pypoint ]; "poolsense" = ps: with ps; [ @@ -3622,7 +3440,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -3641,7 +3458,6 @@ "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ - isal prometheus-client ]; "prosegur" = ps: with ps; [ @@ -3676,7 +3492,6 @@ aiopurpleair ]; "push" = ps: with ps; [ - isal ]; "pushbullet" = ps: with ps; [ pushbullet-py @@ -3717,7 +3532,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -3754,7 +3568,6 @@ "rabbitair" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant python-rabbitair sqlalchemy @@ -3766,7 +3579,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen psutil-home-assistant python-matter-server @@ -3797,7 +3609,6 @@ "rainforest_raven" = ps: with ps; [ aioraven fnv-hash-fast - isal psutil-home-assistant pyserial pyudev @@ -3826,7 +3637,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -3837,7 +3647,6 @@ zeroconf ]; "raspberry_pi" = ps: with ps; [ - isal psutil-home-assistant ]; "raspyrfm" = ps: with ps; [ @@ -3852,7 +3661,6 @@ ]; "recorder" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -3863,7 +3671,6 @@ hassil home-assistant-frontend home-assistant-intents - isal mutagen pillow psutil-home-assistant @@ -3897,11 +3704,9 @@ renson-endura-delta ]; "reolink" = ps: with ps; [ - isal reolink-aio ]; "repairs" = ps: with ps; [ - isal ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng @@ -3920,7 +3725,6 @@ pyrfxtrx ]; "rhasspy" = ps: with ps; [ - isal ]; "ridwell" = ps: with ps; [ aioridwell @@ -3971,12 +3775,10 @@ rpi-bad-power ]; "rss_feed_template" = ps: with ps; [ - isal ]; "rtorrent" = ps: with ps; [ ]; "rtsp_to_webrtc" = ps: with ps; [ - isal pyturbojpeg rtsp-to-webrtc ]; @@ -3997,7 +3799,6 @@ dbus-fast fnv-hash-fast habluetooth - isal psutil-home-assistant pyserial pyudev @@ -4021,7 +3822,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4047,7 +3847,6 @@ fnv-hash-fast getmac ifaddr - isal psutil-home-assistant samsungctl samsungtvws @@ -4090,7 +3889,6 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ fnv-hash-fast - isal pillow psutil-home-assistant sqlalchemy @@ -4127,7 +3925,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4139,7 +3936,6 @@ ]; "sensor" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -4163,7 +3959,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4191,7 +3986,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4207,7 +4001,6 @@ "senz" = ps: with ps; [ aiosenz fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -4244,7 +4037,6 @@ fnv-hash-fast habluetooth ifaddr - isal psutil-home-assistant pyserial pyudev @@ -4254,7 +4046,6 @@ shodan ]; "shopping_list" = ps: with ps; [ - isal ]; "sia" = ps: with ps; [ pysiaalarm @@ -4308,13 +4099,11 @@ ]; # missing inputs: goslide-api "slimproto" = ps: with ps; [ aioslimproto - isal ]; "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ - isal pysmappee ]; "smart_blinds" = ps: with ps; [ @@ -4332,7 +4121,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen psutil-home-assistant pysmartapp @@ -4359,7 +4147,6 @@ snapcast ]; "snips" = ps: with ps; [ - isal paho-mqtt ]; "snmp" = ps: with ps; [ @@ -4383,7 +4170,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4422,7 +4208,6 @@ async-upnp-client fnv-hash-fast ifaddr - isal plexapi plexauth plexwebsocket @@ -4440,7 +4225,6 @@ libsoundtouch ]; "spaceapi" = ps: with ps; [ - isal ]; "spc" = ps: with ps; [ pyspcwebgw @@ -4455,7 +4239,6 @@ ]; # missing inputs: hass-splunk "spotify" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant spotipy sqlalchemy @@ -4474,7 +4257,6 @@ async-upnp-client fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -4490,7 +4272,6 @@ ]; "statistics" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -4505,7 +4286,6 @@ discovery30303 fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -4519,7 +4299,6 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ ha-av - isal numpy pyturbojpeg ]; @@ -4527,7 +4306,6 @@ streamlabswater ]; "stt" = ps: with ps; [ - isal ]; "subaru" = ps: with ps; [ subarulink @@ -4582,7 +4360,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4612,7 +4389,6 @@ "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ - isal py-synologydsm-api ]; "synology_srm" = ps: with ps; [ @@ -4622,7 +4398,6 @@ "system_bridge" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy systembridgeconnector @@ -4630,7 +4405,6 @@ zeroconf ]; "system_health" = ps: with ps; [ - isal ]; "system_log" = ps: with ps; [ ]; @@ -4661,7 +4435,6 @@ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ hatasmota - isal paho-mqtt ]; "tautulli" = ps: with ps; [ @@ -4676,15 +4449,12 @@ xmltodict ]; "tedee" = ps: with ps; [ - isal pytedee-async ]; "telegram" = ps: with ps; [ - isal python-telegram-bot ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "telegram_bot" = ps: with ps; [ - isal python-telegram-bot ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "tellduslive" = ps: with ps; [ @@ -4699,7 +4469,6 @@ ]; "template" = ps: with ps; [ fnv-hash-fast - isal pillow psutil-home-assistant sqlalchemy @@ -4740,7 +4509,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4770,7 +4538,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4795,7 +4562,6 @@ "thread" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant pyroute2 python-otbr-api @@ -4806,7 +4572,6 @@ ]; "tibber" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant pytibber sqlalchemy @@ -4834,7 +4599,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -4856,7 +4620,6 @@ "tod" = ps: with ps; [ ]; "todo" = ps: with ps; [ - isal ]; "todoist" = ps: with ps; [ todoist-api-python @@ -4875,7 +4638,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen psutil-home-assistant python-matter-server @@ -4885,7 +4647,6 @@ webrtc-noise-gain ]; "torque" = ps: with ps; [ - isal ]; "totalconnect" = ps: with ps; [ total-connect-client @@ -4895,7 +4656,6 @@ "tplink" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant python-kasa sqlalchemy @@ -4909,7 +4669,6 @@ "tplink_tapo" = ps: with ps; [ ]; "traccar" = ps: with ps; [ - isal pytraccar stringcase ]; @@ -4950,7 +4709,6 @@ ]; "tts" = ps: with ps; [ ha-ffmpeg - isal mutagen ]; "tuya" = ps: with ps; [ @@ -4961,15 +4719,12 @@ twentemilieu ]; "twilio" = ps: with ps; [ - isal twilio ]; "twilio_call" = ps: with ps; [ - isal twilio ]; "twilio_sms" = ps: with ps; [ - isal twilio ]; "twinkly" = ps: with ps; [ @@ -4977,7 +4732,6 @@ ]; "twitch" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy twitchapi @@ -5008,7 +4762,6 @@ unifiled ]; "unifiprotect" = ps: with ps; [ - isal pyunifiprotect unifi-discovery ]; @@ -5030,7 +4783,6 @@ fnv-hash-fast getmac ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -5043,7 +4795,6 @@ ]; "usb" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant pyserial pyudev @@ -5073,7 +4824,6 @@ ]; "velbus" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant pyserial pyudev @@ -5132,7 +4882,6 @@ ha-ffmpeg hassil home-assistant-intents - isal mutagen webrtc-noise-gain ]; # missing inputs: voip-utils @@ -5189,7 +4938,6 @@ apple-weatherkit ]; "webhook" = ps: with ps; [ - isal ]; "webmin" = ps: with ps; [ ]; # missing inputs: webmin-xmlrpc @@ -5198,7 +4946,6 @@ ]; "websocket_api" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy ]; @@ -5228,7 +4975,6 @@ hass-nabucasa hassil home-assistant-intents - isal mutagen psutil-home-assistant python-matter-server @@ -5239,7 +4985,6 @@ "wiz" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant pywizlight sqlalchemy @@ -5267,7 +5012,6 @@ ha-ffmpeg hassil home-assistant-intents - isal mutagen webrtc-noise-gain wyoming @@ -5276,7 +5020,6 @@ ]; "xbox" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy xbox-webapi @@ -5308,7 +5051,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -5355,7 +5097,6 @@ hassil home-assistant-intents ifaddr - isal mutagen psutil-home-assistant pyserial @@ -5373,7 +5114,6 @@ async-upnp-client fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy ]; @@ -5389,7 +5129,6 @@ async-upnp-client fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy yeelight @@ -5402,7 +5141,6 @@ ]; "yolink" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy yolink-api @@ -5412,7 +5150,6 @@ ]; "youtube" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant sqlalchemy youtubeaio @@ -5429,7 +5166,6 @@ "zeroconf" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy zeroconf @@ -5445,7 +5181,6 @@ "zha" = ps: with ps; [ bellows fnv-hash-fast - isal pillow psutil-home-assistant pyserial @@ -5475,7 +5210,6 @@ ]; "zwave_js" = ps: with ps; [ fnv-hash-fast - isal psutil-home-assistant pyserial pyudev @@ -5485,7 +5219,6 @@ "zwave_me" = ps: with ps; [ fnv-hash-fast ifaddr - isal psutil-home-assistant sqlalchemy url-normalize diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ef2140d640627..ab903005f3e24 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -533,7 +533,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.6.0"; + hassVersion = "2024.6.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -551,13 +551,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-MO7JtWedZJCqK4kVgwxNGaEikBoFTddMSYf8ZG8e9ic="; + hash = "sha256-T6qmmY7AIWUHwxD/WIrr9x685jrXzQ/1brTxWZTKsmw="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-0gNwlkZoEDRk4vlX63lkpa6ykH79WxmiUeOv7oS6n2A="; + hash = "sha256-Qp22sOVgxpbU9mglfK+IbWRvuyYm/jR70I4YvnDuF6s="; }; build-system = with python.pkgs; [ @@ -577,6 +577,7 @@ in python.pkgs.buildPythonApplication rec { "orjson" "pillow" "pyopenssl" + "requests" "sqlalchemy" "typing-extensions" "urllib3" diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 5af94223ec83c..300f685b981b1 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { "--enable-pcre" "--enable-zshenv=${placeholder "out"}/etc/zshenv" "--disable-site-fndir" - "--enable-function-subdirs" + # --enable-function-subdirs is not enabled due to it being slow at runtime in some cases ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba "zsh_cv_shared_environ=yes" diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/tools/audio/dl-librescore/default.nix index 3f9a652bde47e..913efd645a30f 100644 --- a/pkgs/tools/audio/dl-librescore/default.nix +++ b/pkgs/tools/audio/dl-librescore/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dl-librescore"; - version = "0.35.7"; + version = "0.35.17"; src = fetchFromGitHub { owner = "LibreScore"; repo = "dl-librescore"; rev = "v${version}"; - hash = "sha256-g/dOQj2S9iUmN3Ohj7RPBpSk/4N9a39qY+/UIbsKDf4="; + hash = "sha256-u09aquwZIT2XxxaqirrMU5Q3PpXbj70bcI3pOflxVAE="; }; - npmDepsHash = "sha256-Boa/WnptJYJNRdcLgua5GmLT2H9tBpZR+vvAFZC1s4k="; + npmDepsHash = "sha256-LZgVQNFXUqFbzXKdXk8wsMDBqApmtXFLRUw6zIKDAqs="; # see https://github.com/LibreScore/dl-librescore/pull/32 # TODO can be removed with next update diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index aa1abaef4796e..287314205f54d 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-xBlol+09rogbNSYM6Ok5EWb6IEfrVb+/wNMqAA3ZELU="; + sha256 = "sha256-aK1XZPHZSgTf6MTrJv+5SBr7FCT53VNXSTZQVnHM2GA="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 09123767d1160..12e93981ef2de 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nebula"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JCYH3MTHHIKTA12G99e9VJQtQ6UDSxdTNCLX6ZeOKsM="; + hash = "sha256-G4v1lCGTEPOfYeHWl8xy2TowloRefKFAc/P17zWB9kk="; }; vendorHash = "sha256-4BnFvA0dxsEK7ictDUZ6nol6PtM54kk9dwKPTQbRUR0="; diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/tools/security/argocd-vault-plugin/default.nix index d8d13d207d896..0a4cf28b644cb 100644 --- a/pkgs/tools/security/argocd-vault-plugin/default.nix +++ b/pkgs/tools/security/argocd-vault-plugin/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "argocd-vault-plugin"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-5UIiWtEj2Hoiyp4+WDFKCe6u8Why+YJmg6vXQ5Vwi0I="; + hash = "sha256-rWNR4GVivuEprdX/xhwk/9SReeJ19UWDWx8Bf8z6CTI="; }; - vendorHash = "sha256-M/lnm+nBs6zXwPfm2sGtLZtsxRSVnRvEZPY3JVlEFuk="; + vendorHash = "sha256-iZ3WWM5p0UuKpdLq6wczLtgX01q6Vtx8j/XCAH+4POs="; ldflags = [ "-X=github.com/argoproj-labs/argocd-vault-plugin/version.Version=v${version}" diff --git a/pkgs/tools/security/binbloom/default.nix b/pkgs/tools/security/binbloom/default.nix index ce99de997cc0b..766e40f8f0594 100644 --- a/pkgs/tools/security/binbloom/default.nix +++ b/pkgs/tools/security/binbloom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "binbloom"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "quarkslab"; repo = pname; rev = "v${version}"; - hash = "sha256-UiKiDey/pHtJDr4UYqt+T/TneKig5tT8YU2u98Ttjmo="; + hash = "sha256-ox4o9RPtqMsme//8dVatNUo+mA/6dM9eI/T5lsuSAus="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/tools/security/iaito/default.nix index 2ba6dd0aec265..79d9a65136c51 100644 --- a/pkgs/tools/security/iaito/default.nix +++ b/pkgs/tools/security/iaito/default.nix @@ -13,13 +13,13 @@ let pname = "iaito"; - version = "5.9.0"; + version = "5.9.2"; main_src = fetchFromGitHub rec { owner = "radareorg"; repo = pname; - rev = version; - hash = "sha256-Ep3Cbi0qjY4PKG0urr12y0DgX/l/Tsq8w1qlyH0lu3s="; + rev = "refs/tags/${version}"; + hash = "sha256-bq4kaP3BmDprKAxMxO+OvTceEQFeAxJ7aGDnRFHjVDA="; name = repo; }; @@ -31,8 +31,7 @@ let name = repo; }; in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit pname version; srcs = [ main_src translations_src ]; @@ -61,9 +60,6 @@ stdenv.mkDerivation rec { radare2 ]; - # the radare2 binary package seems to not install all necessary headers. - env.NIX_CFLAGS_COMPILE = toString [ "-I" "${radare2.src}/shlr/sdb/include/sdb" ]; - postBuild = '' pushd ../../../${translations_src.name} make build -j$NIX_BUILD_CORES PREFIX=$out @@ -86,16 +82,16 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An official graphical interface of radare2"; - mainProgram = "iaito"; + description = "Official Qt frontend of radare2"; longDescription = '' - iaito is the official graphical interface of radare2. It's the - continuation of Cutter for radare2 after the Rizin fork. + iaito is the official graphical interface for radare2, a libre reverse + engineering framework. ''; homepage = "https://radare.org/n/iaito.html"; - changelog = "https://github.com/radareorg/iaito/releases/tag/${version}"; - license = licenses.gpl3Plus; + changelog = "https://github.com/radareorg/iaito/releases/tag/${finalAttrs.version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ azahi ]; + mainProgram = "iaito"; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 5cdedcffd1f4e..5c09ebf70253a 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.14"; + version = "2.0.15"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6jHuN3Ojswhh7dVODlcPWttBxin3kpPn74h88o6QuoM="; + sha256 = "sha256-iYsZSWWgapKj5EwGdAsv4YR2sEqGEol3VsZsOPFHAtA="; }; - cargoHash = "sha256-EvBinuz3/a4IXLEHin9szng+PvDkf0nu5HWGgrb6G6A="; + cargoHash = "sha256-ZlKG+KU1CjxSMA+hZ+kWrJ68kuJjDLJF8dAU/BHCBRw="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 104b13076b4c0..2a89512a8f213 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -493,6 +493,8 @@ mapAliases ({ godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 + gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17 + google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 @@ -602,6 +604,7 @@ mapAliases ({ k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_25 = throw "'k3s_1_25' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 + k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take it's place kube3d = k3d; # Added 2022-0705 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67c3c0e2bf76f..1ac8d35e86b8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8228,8 +8228,6 @@ with pkgs; gdmap = callPackage ../tools/system/gdmap { }; - gdtoolkit = callPackage ../development/tools/gdtoolkit { }; - gef = callPackage ../development/tools/misc/gef { }; gelasio = callPackage ../data/fonts/gelasio { }; @@ -9620,8 +9618,6 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; - ldc = callPackage ../development/compilers/ldc { }; - ligo = let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in callPackage ../development/compilers/ligo { @@ -10478,8 +10474,6 @@ with pkgs; mandoc = callPackage ../tools/misc/mandoc { }; - mangareader = libsForQt5.callPackage ../applications/graphics/mangareader { }; - mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; mangohud32 = pkgsi686Linux.mangohud; @@ -32019,7 +32013,7 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; go = go_1_21; - }) k3s_1_27 k3s_1_28 k3s_1_29; + }) k3s_1_28 k3s_1_29; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo122Module; go = go_1_22; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf01a385c30fc..90a852fc9c919 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5298,6 +5298,8 @@ self: super: with self; { hahomematic = callPackage ../development/python-modules/hahomematic { }; + hakuin = callPackage ../development/python-modules/hakuin { }; + halo = callPackage ../development/python-modules/halo { }; halohome = callPackage ../development/python-modules/halohome { }; @@ -13198,6 +13200,8 @@ self: super: with self; { repeated-test = callPackage ../development/python-modules/repeated-test { }; + repl-python-wakatime = callPackage ../development/python-modules/repl-python-wakatime { }; + repocheck = callPackage ../development/python-modules/repocheck { }; reportengine = callPackage ../development/python-modules/reportengine { }; |