fix nixpkgs command with latest nix version
This commit is contained in:
6
flake.lock
generated
6
flake.lock
generated
@@ -78,11 +78,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728538411,
|
||||
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
|
||||
"lastModified": 1729265718,
|
||||
"narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
|
||||
"rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
runCommand,
|
||||
setuptools,
|
||||
stdenv,
|
||||
nixVersions,
|
||||
|
||||
# custom args
|
||||
clan-core-path,
|
||||
@@ -67,24 +68,33 @@ let
|
||||
'';
|
||||
|
||||
# Create a custom nixpkgs for use within the project
|
||||
nixpkgs' = runCommand "nixpkgs" { nativeBuildInputs = [ nix ]; } ''
|
||||
mkdir $out
|
||||
cat > $out/flake.nix << EOF
|
||||
{
|
||||
description = "dependencies for the clan-cli";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "path://${nixpkgs}";
|
||||
};
|
||||
nixpkgs' =
|
||||
runCommand "nixpkgs"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
# old nix version doesn't support --flake flag
|
||||
(if lib.versionAtLeast nix.version "2.24" then nix else nixVersions.latest)
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir $out
|
||||
cat > $out/flake.nix << EOF
|
||||
{
|
||||
description = "dependencies for the clan-cli";
|
||||
|
||||
outputs = _inputs: { };
|
||||
}
|
||||
EOF
|
||||
ln -sf ${nixpkgs} $out/path
|
||||
nix flake update $out \
|
||||
--store ./. \
|
||||
--extra-experimental-features 'nix-command flakes'
|
||||
'';
|
||||
inputs = {
|
||||
nixpkgs.url = "path://${nixpkgs}";
|
||||
};
|
||||
|
||||
outputs = _inputs: { };
|
||||
}
|
||||
EOF
|
||||
ln -sf ${nixpkgs} $out/path
|
||||
HOME=$TMPDIR nix flake update --flake $out \
|
||||
--store ./. \
|
||||
--extra-experimental-features 'nix-command flakes'
|
||||
'';
|
||||
in
|
||||
python3.pkgs.buildPythonApplication {
|
||||
name = "clan-cli";
|
||||
|
||||
Reference in New Issue
Block a user