From 7de3b6b55e2d7c90bb8b3c172ef9096dc8cc707b Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 11 Mar 2022 14:16:41 +0100 Subject: [PATCH 1/2] haskellPackages.unicode-show: remove broken marker It compiles just fine? Strange. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6d217a6d1385..b3cac2e3973e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5199,7 +5199,6 @@ broken-packages: - unfix-binders - unfoldable - unicode-prelude - - unicode-show - unicode-symbols - unicode-tricks - uniform-fileio diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f6db635805b5..2e08662a9de5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -286292,8 +286292,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "print and show in unicode"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unicode-symbols" = callPackage From a23d59e2ed6ec675090f90405219fa4a26ba9ab6 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 11 Mar 2022 14:32:36 +0100 Subject: [PATCH 2/2] regenerate-hackage-packages.sh: use runCommandLocal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Running tar will not benefit from running on a builder (it’s mostly I/O load and cannot be parallelized), and the network will dominate. --- maintainers/scripts/haskell/regenerate-hackage-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 285f6ed7cf94..9d51eb4ca4af 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -20,7 +20,7 @@ HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" # See: https://github.com/NixOS/nixpkgs/pull/122023 export LC_ALL=C.UTF-8 -extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' +extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix