diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 893738e3d05e..9f6bb35fb23b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -49,6 +49,10 @@ default-package-overrides: # 2023-04-13: latest version requires ghc-events >= 0.19 but it's not on LTS yet - eventlog2html < 0.10 + # 2023-04-22: For dhall < 1.42 compatibility + - dhall-nixpkgs == 1.0.9 + - dhall-nix == 1.1.25 + extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 623240c0aa0e..3763892798c4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -81090,8 +81090,10 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.26"; - sha256 = "1xgmmfp6bi3mnd9l335ks6xcgpfy2s2kgpcygi7i7p41f795zgma"; + version = "1.1.25"; + sha256 = "1541h6hym254dycq6h40rqn82qbk74d071k67hf62aqd9l2g4y6p"; + revision = "1"; + editedCabalFile = "05hcas28mbi1q3x5wpkapj57b7jw1q9npbhx1lyic3df7sqbjrnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81107,7 +81109,57 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; + "dhall-nix_1_1_26" = callPackage + ({ mkDerivation, base, containers, data-fix, dhall, hnix + , lens-family-core, neat-interpolation, optparse-generic, text + }: + mkDerivation { + pname = "dhall-nix"; + version = "1.1.26"; + sha256 = "1xgmmfp6bi3mnd9l335ks6xcgpfy2s2kgpcygi7i7p41f795zgma"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-fix dhall hnix lens-family-core + neat-interpolation text + ]; + executableHaskellDepends = [ + base dhall hnix optparse-generic text + ]; + description = "Dhall to Nix compiler"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "dhall-to-nix"; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + "dhall-nixpkgs" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , bytestring, data-fix, dhall, foldl, hnix, lens-family-core + , megaparsec, mmorph, neat-interpolation, network-uri + , optparse-applicative, prettyprinter, text, transformers, turtle + }: + mkDerivation { + pname = "dhall-nixpkgs"; + version = "1.0.9"; + sha256 = "1j0i2qhizmzhz2l46xwklgkki6nqa6imzdqdfm6xy3gkfdlna753"; + revision = "1"; + editedCabalFile = "0140jhwf5mz9i5k1v0mbljhr77rgfvhbs5s3ak9naagnxszy725j"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bytestring data-fix + dhall foldl hnix lens-family-core megaparsec mmorph + neat-interpolation network-uri optparse-applicative prettyprinter + text transformers turtle + ]; + description = "Convert Dhall projects to Nix packages"; + license = lib.licenses.bsd3; + mainProgram = "dhall-to-nixpkgs"; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + + "dhall-nixpkgs_1_0_10" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, data-fix, dhall, foldl, hnix, lens-family-core , megaparsec, mmorph, neat-interpolation, network-uri @@ -81127,6 +81179,7 @@ self: { ]; description = "Convert Dhall projects to Nix packages"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "dhall-to-nixpkgs"; maintainers = [ lib.maintainers.Gabriel439 ]; }) {};