diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fbcd31680a67..f70503a81afe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2142,12 +2142,6 @@ self: super: { # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; - # Doesn't support aeson >= 2.0 - # https://github.com/channable/vaultenv/issues/118 - vaultenv = super.vaultenv.overrideScope (self: super: { - aeson = self.aeson_1_5_6_0; - }); - # Support network >= 3.1.2 # https://github.com/erebe/wstunnel/pull/107 wstunnel = appendPatch (fetchpatch { diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index b0810d33b50a..bde2dce30eeb 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -19,6 +19,7 @@ , parser-combinators , retry , lib +, quickcheck-instances , text , unix , unordered-containers @@ -28,13 +29,13 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "channable"; repo = "vaultenv"; rev = "v${version}"; - sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI="; + sha256 = "sha256-yoYkAypH+HQSVTvd/qKNFkL5krbB5mZw3ec9ojvy+Pw="; }; buildTools = [ hpack ]; @@ -86,6 +87,7 @@ mkDerivation rec { optparse-applicative parser-combinators retry + quickcheck-instances text unix unordered-containers @@ -96,8 +98,4 @@ mkDerivation rec { description = "Runs processes with secrets from HashiCorp Vault"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lnl7 manveru ]; - - # Does not compile on ghc92 - hydraPlatforms = lib.platforms.none; - broken = true; }