git.iko.soy/schematic
on master help sign in
Upd release.nix
060ed7cDmitry Bushev
release.nix+11−7
compare with master
unifiedsplit
@@ -3,26 +3,30 @@
3}:
3}:
4
4
5let
5let
6− nixpkgs = import <nixpkgs> {};
6+ _nixpkgs = import <nixpkgs> {};
7− inherit (nixpkgs) pkgs lib;
7+ inherit (_nixpkgs) pkgs lib;
8
8
9− stackageOverlayPath = pkgs.fetchFromGitHub (lib.importJSON ./stackage-overlay.json);
9+ stackageOverlayPath = pkgs.fetchFromGitHub {
10+ owner = "typeable";
11+ repo = "nixpkgs-stackage";
12+ rev = "abe0a03ba2bde609b0707ce45301ec836cb3ed29";
13+ sha256 = "0ksdk83zbsgvs30izwsfyjh4xxwz8dsn9a5igrs3pjap4whpzqfv";
14+ };
10
15
11 nixpkgsArgs = {
16 nixpkgsArgs = {
12 overlays = [ (import stackageOverlayPath) ];
17 overlays = [ (import stackageOverlayPath) ];
13− #config = { allowUnfree = false; inHydra = true; };
14 };
18 };
15
19
16 release = import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit nixpkgsArgs supportedSystems; };
20 release = import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit nixpkgsArgs supportedSystems; };
17
21
18− mkSchematic = system:
22+ mkStackage = system:
19 let
23 let
20 nixpkgs = release.pkgsFor system;
24 nixpkgs = release.pkgsFor system;
21 stackage = nixpkgs.haskell.packages.stackage.lib.callStackage2nix "schematic" schematicSrc { inherit nixpkgs; };
25 stackage = nixpkgs.haskell.packages.stackage.lib.callStackage2nix "schematic" schematicSrc { inherit nixpkgs; };
22 in
26 in
23− stackage.schematic;
27+ stackage;
24
28
25in
29in
26 lib.genAttrs supportedSystems (system: {
30 lib.genAttrs supportedSystems (system: {
27− schematic = pkgs.haskell.lib.triggerRebuild (mkSchematic system) 0;
31+ inherit (mkStackage system) schematic;
28 })
32 })
stackage-overlay.jsondeleted−6
@@ -1,6 +0,0 @@
1−{
2− "owner": "4e6",
3− "repo": "nixpkgs-stackage",
4− "rev": "c028e190e6a7dc731d79e66fcec7db362025040d",
5− "sha256": "09b69v611d1bxkv3ak68wpah97gk24xbyc2kgkmi0fgcq87qrd4v"
6−}