Skip to content

Commit 482f8ca

Browse files
committed
Use nix-haskell-ci re-exports of nix-haskell/haskell.nix
1 parent 8cb3b66 commit 482f8ca

File tree

8 files changed

+7
-50
lines changed

8 files changed

+7
-50
lines changed

nix/deps/haskell.nix/default.nix

-2
This file was deleted.

nix/deps/haskell.nix/github.json

-8
This file was deleted.

nix/deps/haskell.nix/thunk.nix

-12
This file was deleted.

nix/deps/nix-haskell-ci/github.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"owner": "ymeister",
2+
"owner": "reflex-frp",
33
"repo": "nix-haskell-ci",
44
"branch": "main",
55
"private": false,
6-
"rev": "d9b08e888c6c6b0e426e23ad81c7d492e519e541",
7-
"sha256": "0b6dn5y6sl24smiw20j4faa6061djv33hfb985gr9s5v17wx8wp7"
6+
"rev": "17d1de24e89b9ca2c769d467b093d9c7fe58854e",
7+
"sha256": "01f0dm2rjyiz6dfx8sshdyipmp6vvzx671qnvv88sk6947l0v3cr"
88
}

nix/deps/nix-haskell/default.nix

-2
This file was deleted.

nix/deps/nix-haskell/github.json

-8
This file was deleted.

nix/deps/nix-haskell/thunk.nix

-12
This file was deleted.

nix/shell/haskell.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{ haskellNix ? ../deps/haskell.nix }:
1+
{ haskellNix ? null }:
22

3-
let haskell = import ../deps/nix-haskell { inherit haskellNix; };
3+
let ci = import ../deps/nix-haskell-ci (if haskellNix != null then { inherit haskellNix; } else {});
4+
haskell = ci.nix-haskell;
45
project = import ../project/haskell.nix {};
5-
in haskell.project project;
6+
in haskell.project project

0 commit comments

Comments
 (0)