Merge remote-tracking branch 'origin/master' into haskell-updates.

2020-08-10 10:45:40 +02:00
parent 5300a81125 88ba8dd34c
commit 5ecee6daed
450 changed files with 4898 additions and 1121 deletions
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -10,6 +10,8 @@ self: super: {
  multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed"
    + " to haskell-ci, which is now on hackage");

+  dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };
+
  # https://github.com/channable/vaultenv/issues/1
  vaultenv = self.callPackage ../tools/haskell/vaultenv { };