aiolabs/nix-bitcoin
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

flake: update extra-container

Browse source 
Adds support for NixOS 24.11
This commit is contained in:
Erik Arvstedt 2024-12-13 23:21:32 +01:00
parent 2d53b57636
commit b5e5974b8a
No known key found for this signature in database
GPG key ID: 33312B944DD97846
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
flake.lock generated
View file

@ -10,15 +10,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722175938, "lastModified": 1734005403,
"narHash": "sha256-HKyB4HD+NdX3T233bY31hm76v3/tdQBNeLLvopKbZeY=", "narHash": "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=",
"owner": "erikarvstedt", "owner": "erikarvstedt",
"repo": "extra-container", "repo": "extra-container",
"rev": "37e7207ac9f857eedb58b208b9dc91cd6b24e651", "rev": "f4de6c329b306a9d3a9798a30e060c166f781baa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "erikarvstedt", "owner": "erikarvstedt",
"ref": "0.13",
"repo": "extra-container", "repo": "extra-container",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -9,7 +9,7 @@
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
extra-container = { extra-container = {
url = "github:erikarvstedt/extra-container"; url = "github:erikarvstedt/extra-container/0.13";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };

4
test/lib/extra-container-check-version.sh
View file

@ -1,7 +1,7 @@
containerBin=$(type -P extra-container) || true 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
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 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, # 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 # chown the gcroot symlink to the regular (login) user so that the symlink can be