Skip to content

Commit f8c741a

Browse files
committed
Do not override mkDerivation
1 parent 05d4cdc commit f8c741a

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

nix/default.nix

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,26 @@
22
let
33
nix-pre-commit-hooks = (import (builtins.fetchTarball "https://github.com/cachix/pre-commit-hooks.nix/tarball/master/" + "/nix/") { sources = sources; }).packages;
44
overlay = _self: pkgs:
5-
let sharedOverrides = {
6-
overrides = _self: super: {
7-
mkDerivation = args: super.mkDerivation (args //
8-
{
9-
# skip running tests for Hackage packages
10-
doCheck = args.pname == "ghcide" || args.pname == "haskell-language-server";
11-
# relax upper bounds
12-
jailbreak = args.pname != "jailbreak-cabal";
13-
});
14-
};
5+
let
6+
sharedOverrides = {
7+
overrides = with pkgs.haskell.lib;
8+
_self: super: {
9+
svg-builder = doJailbreak super.svg-builder;
10+
statestack = doJailbreak super.statestack;
11+
active = doJailbreak super.active;
12+
monoid-extras = doJailbreak super.monoid-extras;
13+
size-based = doJailbreak super.size-based;
14+
force-layout = doJailbreak super.force-layout;
15+
dual-tree = doJailbreak super.dual-tree;
16+
diagrams-core = doJailbreak super.diagrams-core;
17+
diagrams-lib = doJailbreak super.diagrams-lib;
18+
# https://github.com/wz1000/HieDb/pull/27
19+
hiedb = dontCheck super.hiedb;
20+
diagrams-postscript = doJailbreak super.diagrams-postscript;
21+
diagrams-svg = doJailbreak super.diagrams-svg;
22+
diagrams-contrib = doJailbreak super.diagrams-contrib;
1523
};
24+
};
1625
gitignoreSource = (import sources.gitignore { inherit (pkgs) lib; }).gitignoreSource;
1726
extended = haskellPackages:
1827
haskellPackages.extend (pkgs.haskell.lib.packageSourceOverrides {

0 commit comments

Comments
 (0)