From a2a2be0ca75d97e8cf108c51edc666a47c50a0e9 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 21 May 2022 12:28:39 +0200 Subject: [PATCH] haskellPackages.spago: pin bower-json --- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/configuration-nix.nix | 6 ++--- .../haskell-modules/hackage-packages.nix | 24 ++++++++++++++++--- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b46cd05a2f28..c3fbe8733371 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -453,7 +453,6 @@ broken-packages: - botpp - bottom - boundingboxes - - bower-json - bowntz - bpath - BPS diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f27f89e873f6..8daff3ad4058 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -131,6 +131,7 @@ extra-packages: - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9ed09e6f81d0..87d50eb5f379 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -620,10 +620,10 @@ self: super: builtins.intersectAttrs super { }) super.spago; spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: { - # spago (and its dependency, bower-json) is not yet updated for aeson-2.0 + # spago is not yet updated for aeson 2.0 aeson = hfinal.aeson_1_5_6_0; - # bower-json needs aeson_1_5_6_0 and is marked broken without it. - bower-json = doDistribute (markUnbroken hprev.bower-json); + # bower-json 1.1.0.0 only supports aeson 2.0, so we pull in the older version here. + bower-json = hprev.bower-json_1_0_0_1; }); # Tests require network access. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e159529e1d97..c1faac64ce64 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -46886,6 +46886,27 @@ self: { broken = true; }) {}; + "bower-json_1_0_0_1" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, base, bytestring + , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "bower-json"; + version = "1.0.0.1"; + sha256 = "0wvygg3rdbxzrmr61a9w6ddv9pfric85ih8hnxyk0ydzn7i59abs"; + libraryHaskellDepends = [ + aeson aeson-better-errors base bytestring deepseq ghc-prim mtl + scientific text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring tasty tasty-hunit text unordered-containers + ]; + description = "Read bower.json from Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bower-json" = callPackage ({ mkDerivation, aeson, aeson-better-errors, base, bytestring , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text @@ -46904,8 +46925,6 @@ self: { ]; description = "Read bower.json from Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bowntz" = callPackage @@ -100364,7 +100383,6 @@ self: { ]; description = "Attempt to pretty-print any input"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "friendly-time" = callPackage