BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #280450 from K900/tarball-fixes

Browse source 
Fix tarball job after Nix 2.19
This commit is contained in:
K900 2024-01-12 13:54:52 +03:00 committed by GitHub
commit c9a80739f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/test/release/default.nix
View file

@ -31,13 +31,13 @@ pkgs.runCommand "all-attrs-eval-under-tryEval" {
nix-store --init
cp -r ${pkgs-path + "/lib"} lib
cp -r ${pkgs-path + "/pkgs"} pkgs
cp -r ${pkgs-path + "/default.nix"} default.nix
cp -r ${pkgs-path + "/nixos"} nixos
cp -r ${pkgs-path + "/maintainers"} maintainers
cp -r ${pkgs-path + "/.version"} .version
cp -r ${pkgs-path + "/doc"} doc
cp -r ${pkgs-path}/lib lib
cp -r ${pkgs-path}/pkgs pkgs
cp -r ${pkgs-path}/default.nix default.nix
cp -r ${pkgs-path}/nixos nixos
cp -r ${pkgs-path}/maintainers maintainers
cp -r ${pkgs-path}/.version .version
cp -r ${pkgs-path}/doc doc
echo "Running pkgs/top-level/release-attrpaths-superset.nix"
nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names > /dev/null

2
pkgs/top-level/nixpkgs-basic-release-checks.nix
View file

@ -18,7 +18,7 @@ pkgs.runCommand "nixpkgs-release-checks"
echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix
# Make sure that Nixpkgs does not use <nixpkgs>.
badFiles=$(find $src/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true)
badFiles=$(find $src/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs/' || true)
if [[ -n $badFiles ]]; then
echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."
echo "The offending files: $badFiles"