From c1e7bdadb04110ace5edc86be53e825b08cf4f15 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 6 Apr 2025 11:33:20 +0200 Subject: [PATCH] maintainers/scripts/haskell/regenerate-hackage-packages.sh: run nixfmt without --fast as well --- maintainers/scripts/haskell/regenerate-hackage-packages.sh | 2 +- .../configuration-hackage2nix/transitive-broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 2f8d7ec3cbcf..e7652540ab8b 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -89,7 +89,6 @@ compiler_config="$(nix-build -A haskellPackages.cabal2nix-unstable.compilerConfi echo "Running hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix …" run_hackage2nix -nixfmt pkgs/development/haskell-modules/hackage-packages.nix if [[ "$REGENERATE_TRANSITIVE" -eq 1 ]]; then @@ -103,6 +102,7 @@ run_hackage2nix fi +nixfmt pkgs/development/haskell-modules/hackage-packages.nix if [[ "$DO_COMMIT" -eq 1 ]]; then git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 43edcf60d6f4..35ed7cc9536d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1578,7 +1578,6 @@ dont-distribute-packages: - haskell-docs - haskell-eigen-util - haskell-ftp - - haskell-language-server - haskell-lsp - haskell-lsp-client - haskell-pdf-presenter diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cf386b296546..694bff171344 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -304443,7 +304443,6 @@ self: { doHaddock = false; description = "LSP server for GHC"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; } ) { };