summary refs log tree commit diff
diff options
context:
space:
mode:
authorNaïm Favier <n@monade.li>2022-12-24 11:02:15 +0100
committerNaïm Favier <n@monade.li>2022-12-24 13:38:34 +0100
commit755d5259c7ab46a3fa726f97b9a2e0084382cd66 (patch)
tree741e8f125a1e290be488d2fdd331398d7d4f589f
parentb467047119513b2e1c4e2253d9699a8bdc3ff9f3 (diff)
downloadnixpkgs-755d5259c7ab46a3fa726f97b9a2e0084382cd66.tar
nixpkgs-755d5259c7ab46a3fa726f97b9a2e0084382cd66.tar.gz
nixpkgs-755d5259c7ab46a3fa726f97b9a2e0084382cd66.tar.bz2
nixpkgs-755d5259c7ab46a3fa726f97b9a2e0084382cd66.tar.lz
nixpkgs-755d5259c7ab46a3fa726f97b9a2e0084382cd66.tar.xz
nixpkgs-755d5259c7ab46a3fa726f97b9a2e0084382cd66.tar.zst
nixpkgs-755d5259c7ab46a3fa726f97b9a2e0084382cd66.zip
maintainers/scripts/haskell: fix regenerate-transitive-broken
- 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.
-rwxr-xr-xmaintainers/scripts/haskell/regenerate-transitive-broken-packages.sh4
-rw-r--r--maintainers/scripts/haskell/transitive-broken-packages.nix2
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}
 ''