From 35c93cadc186f814ed934a55863c346cbb6b34ad Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 14 Jan 2025 12:41:45 -0500 Subject: [PATCH] Release v0.33.0 (#1386) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Drop Determinate Nix support for containers for the moment. The daemon wasn't actually starting in the first place, and a recent change brought the issue to light. Without the daemon, it isn't Determinate Nix. We can bring this back if customers & users need it. * flake.lock: Update Flake lock file updates: • Updated input 'determinate': 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.168%2Brev-29d4697d480dc9ed0e0a1d260d621ac8d4b7fa41/019461c4-62df-70e8-9684-46317d87e052/source.tar.gz?narHash=sha256-guIdbsg1LBURqqoeHYIkU4ECPvYjXX2NI%2BgGeJTR9us%3D' (2025-01-13) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.173%2Brev-fe0c0c36eeff2d6c68cd8457bb10c6c276c0a2b3/019465a8-60d2-7d21-9ed4-06ffab6ff0f4/source.tar.gz?narHash=sha256-D6me9BmbJpMVm5t8qrVKlGRT4nWnLCXsP78kNNiQYbc%3D' (2025-01-14) • Updated input 'nixpkgs': 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.737298%2Brev-ed4a395ea001367c1f13d34b1e01aa10290f67d6/01945f5f-4175-7e72-8809-a1e482c4a443/source.tar.gz?narHash=sha256-jG/%2BMvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA%3D' (2025-01-12) → 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.737779%2Brev-9abb87b552b7f55ac8916b6fc9e5cb486656a2f3/019463c0-2408-72ce-9579-5965e6e5e05b/source.tar.gz?narHash=sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ%3D' (2025-01-13) * Update cargo.lock * 0.33.0 --- Cargo.lock | 17 +++++----- Cargo.toml | 2 +- flake.lock | 20 ++++++------ nix/tests/container-test/default.nix | 32 ------------------- .../default/Dockerfile.determinate | 9 ------ tests/fixtures/linux/linux.json | 4 +-- tests/fixtures/linux/steam-deck.json | 4 +-- tests/fixtures/macos/macos.json | 4 +-- 8 files changed, 26 insertions(+), 66 deletions(-) delete mode 100644 nix/tests/container-test/default/Dockerfile.determinate diff --git a/Cargo.lock b/Cargo.lock index 86f18390c..ab322eae3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -82,11 +82,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] @@ -992,9 +993,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "lzma-sys" @@ -1073,7 +1074,7 @@ dependencies = [ [[package]] name = "nix-installer" -version = "0.32.3" +version = "0.33.0" dependencies = [ "async-trait", "bytes 1.9.0", @@ -2290,9 +2291,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 425b57708..fdc8e60fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nix-installer" description = "The Determinate Nix Installer" -version = "0.32.3" +version = "0.33.0" edition = "2021" resolver = "2" license = "LGPL-2.1" diff --git a/flake.lock b/flake.lock index 2bf909a00..4b6c883f6 100644 --- a/flake.lock +++ b/flake.lock @@ -33,12 +33,12 @@ ] }, "locked": { - "lastModified": 1736806761, - "narHash": "sha256-guIdbsg1LBURqqoeHYIkU4ECPvYjXX2NI+gGeJTR9us=", - "rev": "29d4697d480dc9ed0e0a1d260d621ac8d4b7fa41", - "revCount": 168, + "lastModified": 1736872069, + "narHash": "sha256-D6me9BmbJpMVm5t8qrVKlGRT4nWnLCXsP78kNNiQYbc=", + "rev": "fe0c0c36eeff2d6c68cd8457bb10c6c276c0a2b3", + "revCount": 173, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.168%2Brev-29d4697d480dc9ed0e0a1d260d621ac8d4b7fa41/019461c4-62df-70e8-9684-46317d87e052/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.173%2Brev-fe0c0c36eeff2d6c68cd8457bb10c6c276c0a2b3/019465a8-60d2-7d21-9ed4-06ffab6ff0f4/source.tar.gz" }, "original": { "type": "tarball", @@ -290,12 +290,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", - "revCount": 737298, + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "revCount": 737779, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.737298%2Brev-ed4a395ea001367c1f13d34b1e01aa10290f67d6/01945f5f-4175-7e72-8809-a1e482c4a443/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.737779%2Brev-9abb87b552b7f55ac8916b6fc9e5cb486656a2f3/019463c0-2408-72ce-9579-5965e6e5e05b/source.tar.gz" }, "original": { "type": "tarball", diff --git a/nix/tests/container-test/default.nix b/nix/tests/container-test/default.nix index 73fd316f4..6bfb4c43b 100644 --- a/nix/tests/container-test/default.nix +++ b/nix/tests/container-test/default.nix @@ -34,38 +34,6 @@ let tester = ./default/Dockerfile; system = "x86_64-linux"; }; - - # Found via https://hub.docker.com/_/ubuntu/ under "How is the rootfs build?" - # Jammy (--determinate) - "ubuntu-v22_04-determinate" = { - tarball = builtins.fetchurl { - url = "http://cdimage.ubuntu.com/ubuntu-base/releases/22.04/release/ubuntu-base-22.04-base-amd64.tar.gz"; - sha256 = "01sbpjb32x1z1yr9q78zrk0a6kfw5c4fxw1jqmm23g8ixryffvyz"; - }; - tester = ./default/Dockerfile.determinate; - system = "x86_64-linux"; - }; - - # focal (--determinate) - "ubuntu-v20_04-determinate" = { - tarball = builtins.fetchurl { - url = "http://cdimage.ubuntu.com/ubuntu-base/releases/20.04/release/ubuntu-base-20.04.1-base-amd64.tar.gz"; - sha256 = "0ryn38csmx41a415g9b3wk30csaxxlkgkdij9v4754pk877wpxlp"; - }; - tester = ./default/Dockerfile.determinate; - system = "x86_64-linux"; - }; - - # bionic (--determinate) - "ubuntu-v18_04-determinate" = { - tarball = builtins.fetchurl { - url = "http://cdimage.ubuntu.com/ubuntu-base/releases/18.04/release/ubuntu-base-18.04.5-base-amd64.tar.gz"; - sha256 = "1sh73pqwgyzkyssv3ngpxa2ynnkbdvjpxdw1v9ql4ghjpd3hpwlg"; - }; - tester = ./default/Dockerfile.determinate; - system = "x86_64-linux"; - }; - }; makeTest = containerTool: imageName: diff --git a/nix/tests/container-test/default/Dockerfile.determinate b/nix/tests/container-test/default/Dockerfile.determinate deleted file mode 100644 index cb45fe1cd..000000000 --- a/nix/tests/container-test/default/Dockerfile.determinate +++ /dev/null @@ -1,9 +0,0 @@ -FROM default -COPY nix-installer /nix-installer -RUN chmod +x /nix-installer -COPY binary-tarball /binary-tarball -RUN mv /binary-tarball/nix-*.tar.xz nix.tar.xz -RUN /nix-installer/bin/nix-installer install linux --logger pretty --log-directive nix_installer=trace --nix-package-url file:///nix.tar.xz --init none --extra-conf "sandbox = false" --determinate --no-confirm -vvv -ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin" -RUN nix-build --no-substitute -E 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/bin/sh"; args = ["-c" "echo foobar > $out"]; }' -RUN /nix/nix-installer uninstall --no-confirm diff --git a/tests/fixtures/linux/linux.json b/tests/fixtures/linux/linux.json index 13fca474f..6041f45e6 100644 --- a/tests/fixtures/linux/linux.json +++ b/tests/fixtures/linux/linux.json @@ -1,5 +1,5 @@ { - "version": "0.32.3", + "version": "0.33.0", "actions": [ { "action": { @@ -1164,7 +1164,7 @@ }, "diagnostic_data": { "attribution": null, - "version": "0.32.3", + "version": "0.33.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 c148597d6..01e1ee4e2 100644 --- a/tests/fixtures/linux/steam-deck.json +++ b/tests/fixtures/linux/steam-deck.json @@ -1,5 +1,5 @@ { - "version": "0.32.3", + "version": "0.33.0", "actions": [ { "action": { @@ -1224,7 +1224,7 @@ }, "diagnostic_data": { "attribution": null, - "version": "0.32.3", + "version": "0.33.0", "planner": "steam-deck", "configured_settings": [], "os_name": "SteamOS", diff --git a/tests/fixtures/macos/macos.json b/tests/fixtures/macos/macos.json index 4d90e80f1..7b7085e43 100644 --- a/tests/fixtures/macos/macos.json +++ b/tests/fixtures/macos/macos.json @@ -1,5 +1,5 @@ { - "version": "0.32.3", + "version": "0.33.0", "actions": [ { "action": { @@ -1266,7 +1266,7 @@ }, "diagnostic_data": { "attribution": null, - "version": "0.32.3", + "version": "0.33.0", "planner": "macos", "configured_settings": [], "os_name": "unknown",