Merge pull request #207540 from ncfavier/ghc-api-compat-broken

maintainers/scripts/haskell: fix regenerate-transitive-broken
2022-12-24 17:53:11 +01:00
parent 4a6d66b322 755d5259c7
commit 4dd35bddae
2 changed files with 3 additions and 3 deletions
@@ -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
@@ -12,5 +12,5 @@ let
    (getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages);
 in
 ''
-  ${lib.concatMapStringsSep "\n" (x: "  - ${x}") brokenDeps}
+  ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps}
 ''