From b5e5974b8a14596280571761eb75c6de957ab9dc Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 13 Dec 2024 23:21:32 +0100 Subject: [PATCH] flake: update extra-container Adds support for NixOS 24.11 --- flake.lock | 7 ++++--- flake.nix | 2 +- test/lib/extra-container-check-version.sh | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0381945..baba37f 100644 --- a/flake.lock +++ b/flake.lock @@ -10,15 +10,16 @@ ] }, "locked": { - "lastModified": 1722175938, - "narHash": "sha256-HKyB4HD+NdX3T233bY31hm76v3/tdQBNeLLvopKbZeY=", + "lastModified": 1734005403, + "narHash": "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "37e7207ac9f857eedb58b208b9dc91cd6b24e651", + "rev": "f4de6c329b306a9d3a9798a30e060c166f781baa", "type": "github" }, "original": { "owner": "erikarvstedt", + "ref": "0.13", "repo": "extra-container", "type": "github" } diff --git a/flake.nix b/flake.nix index b78e459..b5dd486 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; extra-container = { - url = "github:erikarvstedt/extra-container"; + url = "github:erikarvstedt/extra-container/0.13"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; diff --git a/test/lib/extra-container-check-version.sh b/test/lib/extra-container-check-version.sh index 1daf42e..a78a0bd 100644 --- a/test/lib/extra-container-check-version.sh +++ b/test/lib/extra-container-check-version.sh @@ -1,7 +1,7 @@ containerBin=$(type -P extra-container) || true -if [[ ! ($containerBin && $(realpath "$containerBin") == *extra-container-0.12*) ]]; then +if [[ ! ($containerBin && $(realpath "$containerBin") == *extra-container-0.13*) ]]; then echo - echo "Building extra-container. Skip this step by adding extra-container 0.12 to PATH." + echo "Building extra-container. Skip this step by adding extra-container 0.13 to PATH." nix build --out-link /tmp/extra-container "${BASH_SOURCE[0]%/*}"/../..#extra-container # When this script is run as root, e.g. when run in an extra-container shell, # chown the gcroot symlink to the regular (login) user so that the symlink can be