diff --git a/Cargo.lock b/Cargo.lock index 8c8777d67..59d934234 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,9 +201,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.21" +version = "4.5.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "69371e34337c4c984bbe322360c2547210bf632eb2814bbe78a6e87a2935bd2b" dependencies = [ "clap_builder", "clap_derive", @@ -211,9 +211,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "6e24c1b4099818523236a8ca881d2b45db98dadfb4625cf6608c12069fcbbde1" dependencies = [ "anstream", "anstyle", @@ -592,9 +592,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes 1.9.0", "fnv", @@ -1070,7 +1070,7 @@ dependencies = [ [[package]] name = "nix-installer" -version = "0.31.0" +version = "0.32.0" dependencies = [ "async-trait", "bytes 1.9.0", @@ -1302,7 +1302,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.3", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -1321,7 +1321,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.3", + "thiserror 2.0.4", "tinyvec", "tracing", "web-time", @@ -1936,11 +1936,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl 2.0.4", ] [[package]] @@ -1956,9 +1956,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" dependencies = [ "proc-macro2", "quote", @@ -1977,9 +1977,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -1998,9 +1998,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -2033,9 +2033,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes 1.9.0", @@ -2074,12 +2074,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ "rustls", - "rustls-pki-types", "tokio", ] @@ -2097,9 +2096,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes 1.9.0", "futures-core", diff --git a/Cargo.toml b/Cargo.toml index d2e263230..097cdf887 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nix-installer" description = "The Determinate Nix Installer" -version = "0.31.0" +version = "0.32.0" edition = "2021" resolver = "2" license = "LGPL-2.1" diff --git a/flake.lock b/flake.lock index 3fd989b9b..e4033d80d 100644 --- a/flake.lock +++ b/flake.lock @@ -17,12 +17,12 @@ ] }, "locked": { - "lastModified": 1732231026, - "narHash": "sha256-tuqod7g+1+PvtUXUlLl4MwY9B+gr4rAEOGvhmhtWLbE=", - "rev": "29b7b7dfb1c878267383aa91c357ef464bef0f0d", - "revCount": 159, + "lastModified": 1733429316, + "narHash": "sha256-EZTAm9hVL2NIub5kdWb5k2BFMe+ASiBvN7s20x/d6+U=", + "rev": "65c2bebd71e0e92a34997030ca5408a7a0025379", + "revCount": 163, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.159%2Brev-29b7b7dfb1c878267383aa91c357ef464bef0f0d/01935106-420e-7097-93f6-ef4f1b11ffde/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.163%2Brev-65c2bebd71e0e92a34997030ca5408a7a0025379/01939872-fc76-7ade-bcd8-ca56d6311636/source.tar.gz" }, "original": { "type": "tarball", @@ -32,37 +32,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-6E9DFC4lTpjmErG2TvV7rIS1tiyGZZYg0Kd4pT5GOkU=", + "narHash": "sha256-FIQdKceChaoDlYYfIfoTiyRfmNyxp8+EXPzCg584uB4=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.5/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.5/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-CnbFYAL7dAl8qBIvAFMVjW4KpQgmWlghnK3qfoLEP8Q=", + "narHash": "sha256-IPrjf/cntNxn1CKc1Z3SNsoxVw2iR+AKTzGR4UqfH+U=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.5/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.5/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-0w3gbvncDwukX4PHVWeOZeD6F6vsEuePoNOIlAvdEq0=", + "narHash": "sha256-NrWVnTNDkF31KXBcpPOoKksfapvkIH1M3sBQo3adNbY=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.5/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.5/x86_64-linux" } }, "fenix": { @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1721727458, - "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", + "lastModified": 1733346208, + "narHash": "sha256-a4WZp1xQkrnA4BbnKrzJNr+dYoQr5Xneh2syJoddFyE=", "owner": "nix-community", "repo": "naersk", - "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", + "rev": "378614f37a6bee5a3f2ef4f825a73d948d3ae921", "type": "github" }, "original": { @@ -215,16 +215,16 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1730373645, - "narHash": "sha256-y1z53C9+yH1LUCWuouuA0i4vzXEAm8bmK0gyNAY/fyc=", - "rev": "34ca8a4d254e15adfdaaee98aea882511bba01b4", - "revCount": 104, + "lastModified": 1733248733, + "narHash": "sha256-rOFE8TSwWoup+LPNbmtTs6oLy7lYZ12L9GN+aZuQQaA=", + "rev": "98bbabc68ac8c897c2ad873c3557125691c45120", + "revCount": 108, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.10/0192e251-cc5a-7b3c-8339-faf088a24136/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.25.3/01939864-5191-788c-b898-163d916a3333/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/nix/%3D2.24.10.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/nix/%3D2.25.3.tar.gz" } }, "nix_2": { @@ -238,16 +238,16 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1730321079, - "narHash": "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=", - "rev": "597fcc98e18e3178734d06a9e7306250e8cb8d74", - "revCount": 18185, + "lastModified": 1732881227, + "narHash": "sha256-T+wFMm3cj8pGJSwXmPuxG5pz+1gRDJoToF9OBxtzocA=", + "rev": "218cd6c16c0981cc32a45e3a15be1d3c1a68eb85", + "revCount": 18724, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.24.10/0192e247-90bb-7e27-ba8d-f7ee8344a03e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.25.3/01938786-bc70-79e3-b7ee-bb61f8e7f238/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nix/%3D2.24.10" + "url": "https://flakehub.com/f/NixOS/nix/%3D2.25.3" } }, "nixpkgs": { diff --git a/flake.nix b/flake.nix index 12db49ff5..9a3e076ca 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ }; nix = { - url = "https://flakehub.com/f/DeterminateSystems/nix/=2.24.10.tar.gz"; + url = "https://flakehub.com/f/DeterminateSystems/nix/=2.25.3.tar.gz"; # Omitting `inputs.nixpkgs.follows = "nixpkgs";` on purpose }; @@ -96,6 +96,7 @@ nativeBuildInputs = with final; [ ]; buildInputs = with final; [ ] ++ lib.optionals (final.stdenv.isDarwin) (with final.darwin.apple_sdk.frameworks; [ SystemConfiguration + final.darwin.libiconv ]); copyBins = true; diff --git a/tests/fixtures/linux/linux.json b/tests/fixtures/linux/linux.json index c9371bbda..21bc18a63 100644 --- a/tests/fixtures/linux/linux.json +++ b/tests/fixtures/linux/linux.json @@ -1,5 +1,5 @@ { - "version": "0.31.0", + "version": "0.32.0", "actions": [ { "action": { @@ -1151,7 +1151,7 @@ }, "diagnostic_data": { "attribution": null, - "version": "0.31.0", + "version": "0.32.0", "planner": "linux", "configured_settings": [], "os_name": "Ubuntu", diff --git a/tests/fixtures/linux/steam-deck.json b/tests/fixtures/linux/steam-deck.json index 4dc2b3db8..bad3b6acf 100644 --- a/tests/fixtures/linux/steam-deck.json +++ b/tests/fixtures/linux/steam-deck.json @@ -1,5 +1,5 @@ { - "version": "0.31.0", + "version": "0.32.0", "actions": [ { "action": { @@ -1199,7 +1199,7 @@ }, "diagnostic_data": { "attribution": null, - "version": "0.31.0", + "version": "0.32.0", "planner": "steam-deck", "configured_settings": [], "os_name": "SteamOS", diff --git a/tests/fixtures/macos/macos.json b/tests/fixtures/macos/macos.json index 5cf553ec4..cda082930 100644 --- a/tests/fixtures/macos/macos.json +++ b/tests/fixtures/macos/macos.json @@ -1,5 +1,5 @@ { - "version": "0.31.0", + "version": "0.32.0", "actions": [ { "action": { @@ -1253,7 +1253,7 @@ }, "diagnostic_data": { "attribution": null, - "version": "0.31.0", + "version": "0.32.0", "planner": "macos", "configured_settings": [], "os_name": "unknown",