diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-07-20 01:26:26 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-07-20 01:34:31 +0200 |
| commit | 0ded80fcf59ff2d0e7485f1d1e39337bd5b6ad3f (patch) | |
| tree | 3e86e083559600ca5ca791c6d908ce76127827f7 | |
| parent | 2ae77417684142658105185a72019c484d5dd0df (diff) | |
| download | nixpkgs-0ded80fcf59ff2d0e7485f1d1e39337bd5b6ad3f.tar nixpkgs-0ded80fcf59ff2d0e7485f1d1e39337bd5b6ad3f.tar.gz nixpkgs-0ded80fcf59ff2d0e7485f1d1e39337bd5b6ad3f.tar.bz2 nixpkgs-0ded80fcf59ff2d0e7485f1d1e39337bd5b6ad3f.tar.lz nixpkgs-0ded80fcf59ff2d0e7485f1d1e39337bd5b6ad3f.tar.xz nixpkgs-0ded80fcf59ff2d0e7485f1d1e39337bd5b6ad3f.tar.zst nixpkgs-0ded80fcf59ff2d0e7485f1d1e39337bd5b6ad3f.zip | |
haskellPackages.digits: work around broken Setup.hs
pandoc now (indirectly) depends on this and it's easy to fix.
3 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 19f9c2d6c2b..bff27fc7775 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2432,6 +2432,8 @@ self: super: { # The shipped Setup.hs file is broken. csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv; + # Build-type is simple, but ships a broken Setup.hs + digits = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.lhs"; }) super.digits; cabal-fmt = doJailbreak (super.cabal-fmt.override { # Needs newer Cabal-syntax version. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f72dc6d7151..e4044bd6802 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1172,7 +1172,6 @@ broken-packages: - digest-pure - DigitalOcean - digitalocean-kzs - - digits - digraph - dijkstra-simple - DimensionalHash diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4777d58a537..39df102013f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -82816,8 +82816,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Converts integers to lists of digits and back"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "digraph" = callPackage |