Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6219,6 +6219,12 @@
githubId = 2507744;
name = "Roland Koebler";
};
rkrzr = {
email = "ops+nixpkgs@channable.com";
github = "rkrzr";
githubId = 82817;
name = "Robert Kreuzer";
};
rlupton20 = {
email = "richard.lupton@gmail.com";
github = "rlupton20";
Expand Down
14 changes: 3 additions & 11 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1250,17 +1250,6 @@ self: super: {
'';
});

# Version bounds for http-client are too strict:
# https://github.com/bitnomial/prometheus/issues/34
prometheus = doJailbreak super.prometheus;

# Tasty-tap tests are out-of-date with TAP format
# https://github.com/MichaelXavier/tasty-tap/issues/2
tasty-tap = appendPatch super.tasty-tap (pkgs.fetchpatch {
url = https://patch-diff.githubusercontent.com/raw/MichaelXavier/tasty-tap/pull/3.diff;
sha256 = "0l8zbc56dy8ilxl3k49aiknmfhgpcg3jhs72lh3dk51d0a09d9sv";
});

# The doctests in universum-1.5.0 are broken. The doctests in versions of universum after
# 1.5.0 should be fixed, so this should be able to be removed.
universum = dontCheck super.universum;
Expand Down Expand Up @@ -1496,4 +1485,7 @@ self: super: {
sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp";
});

# Needs a version that's newer than LTS-15.x provides.
weeder = super.weeder.override { generic-lens = self.generic-lens_2_0_0_0; };

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,7 @@ self: super: {
# Newer versions don't compile.
resolv = self.resolv_0_1_1_2;

# The old Haddock cannot process the newer documentation syntax.
fast-logger = dontHaddock super.fast-logger;

}
Loading