gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maintainers/scripts/haskell: fix regenerate-transitive-broken

Browse Source 
- use `restrict-eval` so that we're not affected by the user's environment
- use jq instead of the horrible echo+sed hack

The second point also fixes the indentation before each line to be two
spaces instead of one, so I set it back to one space to avoid a diff.
This commit is contained in:
Naïm Favier
2022-12-24 11:02:15 +01:00
parent b467047119
commit 755d5259c7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
View File

@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell #! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=. #! nix-shell -i bash -p coreutils jq nix -I nixpkgs=.
config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -12,4 +12,4 @@ dont-distribute-packages:
EOF EOF
echo "Regenerating list of transitive broken packages ..." echo "Regenerating list of transitive broken packages ..."
echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | LC_ALL=C.UTF-8 sort -i >> $config_file nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file

2
maintainers/scripts/haskell/transitive-broken-packages.nix
View File

@@ -12,5 +12,5 @@ let
(getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages); (getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages);
in in
'' ''
${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps}
'' ''