diff options
| -rwxr-xr-x | maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh | 4 | ||||
| -rw-r--r-- | maintainers/scripts/haskell/transitive-broken-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh index 94104e00edb..69455bfb687 100755 --- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -1,5 +1,5 @@ #! /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 @@ -12,4 +12,4 @@ dont-distribute-packages: EOF 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 diff --git a/maintainers/scripts/haskell/transitive-broken-packages.nix b/maintainers/scripts/haskell/transitive-broken-packages.nix index d4ddaa95765..50ccb14577b 100644 --- a/maintainers/scripts/haskell/transitive-broken-packages.nix +++ b/maintainers/scripts/haskell/transitive-broken-packages.nix @@ -12,5 +12,5 @@ let (getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages); in '' - ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} + ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} '' |