Skip to content

Commit 2da54d3

Browse files
committed
Switch to nixpkgs-unstable
1 parent 4631f56 commit 2da54d3

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

nix/default.nix

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,23 @@ let
55
let
66
sharedOverrides = {
77
overrides = with pkgs.haskell.lib;
8+
let f = drv: dontCheck (doJailbreak drv);
9+
in
810
_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;
11+
svg-builder = f super.svg-builder;
12+
statestack = f super.statestack;
13+
active = f super.active;
14+
monoid-extras = f super.monoid-extras;
15+
size-based = f super.size-based;
16+
force-layout = f super.force-layout;
17+
dual-tree = f super.dual-tree;
18+
diagrams-core = f super.diagrams-core;
19+
diagrams-lib = f super.diagrams-lib;
1820
# https://github.com/wz1000/HieDb/pull/27
1921
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;
22+
diagrams-postscript = f super.diagrams-postscript;
23+
diagrams-svg = f super.diagrams-svg;
24+
diagrams-contrib = f super.diagrams-contrib;
2325
};
2426
};
2527
gitignoreSource = (import sources.gitignore { inherit (pkgs) lib; }).gitignoreSource;

nix/sources.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
},
2626
"nixpkgs": {
27-
"branch": "haskell-updates",
27+
"branch": "nixpkgs-unstable",
2828
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
2929
"homepage": "https://github.com/NixOS/nixpkgs",
3030
"owner": "NixOS",
3131
"repo": "nixpkgs",
32-
"rev": "01742ad805d6faef06a696d489573026fe32f496",
33-
"sha256": "13scmisrglk0mrj28lscb9imkhlnqh5f3s54l0rx8dayg1ysr0kw",
32+
"rev": "a2b0ea6865b2346ceb015259c76e111dcca039c5",
33+
"sha256": "12dgwajv3w94p13scj68c24v01p055k9hcpcsn7w9i8fys72s99d",
3434
"type": "tarball",
35-
"url": "https://github.com/NixOS/nixpkgs/archive/01742ad805d6faef06a696d489573026fe32f496.tar.gz",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/a2b0ea6865b2346ceb015259c76e111dcca039c5.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
}
3838
}

0 commit comments

Comments
 (0)