diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ca5decb685b5..51e58be7f3d7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -416,6 +416,7 @@ package-maintainers: - rel8 - regex-rure - jacinda + - citeproc # owothia - irc-client - chatter diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 651000b30716..98de2cca6156 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -27,6 +27,10 @@ # If you have an override of this kind, see configuration-common.nix instead. { pkgs, haskellLib }: +let + inherit (pkgs) lib; +in + with haskellLib; # All of the overrides in this set should look like: @@ -788,6 +792,16 @@ self: super: builtins.intersectAttrs super { # Tests access internet prune-juice = dontCheck super.prune-juice; + citeproc = lib.pipe super.citeproc [ + enableSeparateBinOutput + # Enable executable being built and add missing dependencies + (enableCabalFlag "executable") + (addBuildDepends [ self.aeson-pretty ]) + # TODO(@sternenseemann): we may want to enable that for improved performance + # Is correctness good enough since 0.5? + (disableCabalFlag "icu") + ]; + # based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix ihaskell = overrideCabal (drv: { # ihaskell's cabal file forces building a shared executable, which we need diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5190f34178d7..590122de2dff 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -58840,6 +58840,7 @@ self: { ]; description = "Generates citations and bibliography from CSL styles"; license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.sternenseemann ]; }) {}; "citeproc_0_8_0_2" = callPackage @@ -58867,6 +58868,7 @@ self: { description = "Generates citations and bibliography from CSL styles"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; }) {}; "citeproc-hs" = callPackage