Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Clean up nix infrastructure for ease of use (#716)
* Better nix structure, revert aeson patch pin * Update gitlab build * Move singleton-bool ghcjs pin downstream * Disable GHCJS in CI
- Loading branch information
1 parent
d2891d3
commit 7e3f454
Showing
5 changed files
with
72 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1 @@ | ||
| { rpRef ? "9afc9a2a1864e5a89981a4959a88c646e7441549" | ||
| , rpSha ? "0rkc6h4mfi5j4d4735b0l7ic6dvww4vdxjwd3kninj5rjlkddhfd" | ||
| , system ? builtins.currentSystem | ||
| }: | ||
|
|
||
| let rpSrc = builtins.fetchTarball { | ||
| url = "https://github.com/reflex-frp/reflex-platform/archive/${rpRef}.tar.gz"; | ||
| sha256 = rpSha; | ||
| }; | ||
| overlay = self: super: { | ||
| z3 = super.z3.overrideAttrs (drv: { | ||
| name = "z3-4.8.5"; | ||
| version = "4.8.5"; | ||
| patches = []; | ||
| src = self.fetchFromGitHub { | ||
| owner = "Z3Prover"; | ||
| repo = "z3"; | ||
| rev = "e79542cc689d52ec4cb34ce4ae3fbe56e7a0bf70"; | ||
| sha256 = "11sy98clv7ln0a5vqxzvh6wwqbswsjbik2084hav5kfws4xvklfa"; | ||
| }; | ||
| }); | ||
| }; | ||
| rp = import rpSrc { inherit system; nixpkgsOverlays = [ overlay ]; }; | ||
| in { | ||
| inherit rpRef rpSha rpSrc overlay rp; | ||
| proj = | ||
| rp.project ({ pkgs, hackGet, ... }: | ||
| let gitignore = pkgs.callPackage (pkgs.fetchFromGitHub { | ||
| owner = "siers"; | ||
| repo = "nix-gitignore"; | ||
| rev = "4f2d85f2f1aa4c6bff2d9fcfd3caad443f35476e"; | ||
| sha256 = "1vzfi3i3fpl8wqs1yq95jzdi6cpaby80n8xwnwa8h2jvcw3j7kdz"; | ||
| }) {}; | ||
| in | ||
| { | ||
| name = "pact"; | ||
| overrides = self: super: (import ./overrides.nix pkgs hackGet self super) // { | ||
| }; | ||
| packages = { | ||
| pact = gitignore.gitignoreSource [".git" ".gitlab-ci.yml" "CHANGELOG.md" "README.md"] ./.; | ||
| }; | ||
| shellToolOverrides = ghc: super: { | ||
| z3 = pkgs.z3; | ||
| stack = pkgs.stack; | ||
| }; | ||
| shells = { | ||
| ghc = ["pact"]; | ||
| ghcjs = ["pact"]; | ||
| }; | ||
|
|
||
| }); | ||
| } | ||
| (import ./project.nix {}).proj.ghc.pact |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| { rpRef ? "9afc9a2a1864e5a89981a4959a88c646e7441549" | ||
| , rpSha ? "0rkc6h4mfi5j4d4735b0l7ic6dvww4vdxjwd3kninj5rjlkddhfd" | ||
| , system ? builtins.currentSystem | ||
| }: | ||
|
|
||
| let rpSrc = builtins.fetchTarball { | ||
| url = "https://github.com/reflex-frp/reflex-platform/archive/${rpRef}.tar.gz"; | ||
| sha256 = rpSha; | ||
| }; | ||
| overlay = self: super: { | ||
| z3 = super.z3.overrideAttrs (drv: { | ||
| name = "z3-4.8.5"; | ||
| version = "4.8.5"; | ||
| patches = []; | ||
| src = self.fetchFromGitHub { | ||
| owner = "Z3Prover"; | ||
| repo = "z3"; | ||
| rev = "e79542cc689d52ec4cb34ce4ae3fbe56e7a0bf70"; | ||
| sha256 = "11sy98clv7ln0a5vqxzvh6wwqbswsjbik2084hav5kfws4xvklfa"; | ||
| }; | ||
| }); | ||
| }; | ||
| rp = import rpSrc { inherit system; nixpkgsOverlays = [ overlay ]; }; | ||
| in { | ||
| inherit rpRef rpSha rpSrc overlay rp; | ||
| proj = | ||
| rp.project ({ pkgs, hackGet, ... }: | ||
| let gitignore = pkgs.callPackage (pkgs.fetchFromGitHub { | ||
| owner = "siers"; | ||
| repo = "nix-gitignore"; | ||
| rev = "4f2d85f2f1aa4c6bff2d9fcfd3caad443f35476e"; | ||
| sha256 = "1vzfi3i3fpl8wqs1yq95jzdi6cpaby80n8xwnwa8h2jvcw3j7kdz"; | ||
| }) {}; | ||
| in | ||
| { | ||
| name = "pact"; | ||
| overrides = self: super: (import ./overrides.nix pkgs hackGet self super) // { | ||
| }; | ||
| packages = { | ||
| pact = gitignore.gitignoreSource [".git" ".gitlab-ci.yml" "CHANGELOG.md" "README.md"] ./.; | ||
| }; | ||
| shellToolOverrides = ghc: super: { | ||
| z3 = pkgs.z3; | ||
| stack = pkgs.stack; | ||
| }; | ||
| shells = { | ||
| ghc = ["pact"]; | ||
| ghcjs = ["pact"]; | ||
| }; | ||
|
|
||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| (import ./. {}).proj.shells.ghc | ||
| (import ./project.nix {}).proj.shells.ghc |