From 7b215e6ca1d65e07b434aa387fd5b27517b58a8b Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 22 Dec 2025 16:27:08 +0100 Subject: [PATCH] extra-container: 0.13 -> 0.14 Adds support for NixOS 25.11 --- flake.lock | 8 ++++---- flake.nix | 2 +- test/lib/extra-container-check-version.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 036efc5..cc5a919 100644 --- a/flake.lock +++ b/flake.lock @@ -10,16 +10,16 @@ ] }, "locked": { - "lastModified": 1734005403, - "narHash": "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=", + "lastModified": 1766155727, + "narHash": "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "f4de6c329b306a9d3a9798a30e060c166f781baa", + "rev": "b450bdb24fca1076973c852d87bcb49b8eb5fd49", "type": "github" }, "original": { "owner": "erikarvstedt", - "ref": "0.13", + "ref": "0.14", "repo": "extra-container", "type": "github" } diff --git a/flake.nix b/flake.nix index f33fdf8..f43ce7e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ nixpkgs-25_05.url = "github:NixOS/nixpkgs/nixos-25.05"; flake-utils.url = "github:numtide/flake-utils"; extra-container = { - url = "github:erikarvstedt/extra-container/0.13"; + url = "github:erikarvstedt/extra-container/0.14"; 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 a78a0bd..3017859 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.13*) ]]; then +if [[ ! ($containerBin && $(realpath "$containerBin") == *extra-container-0.14*) ]]; then echo - echo "Building extra-container. Skip this step by adding extra-container 0.13 to PATH." + echo "Building extra-container. Skip this step by adding extra-container 0.14 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