diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | bragi.nix | 2 | ||||
l--------- | custom/trivmix.nix | 1 | ||||
-rw-r--r-- | customized/trivmix.nix | 25 | ||||
m--------- | trivmix | 0 |
5 files changed, 5 insertions, 26 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..617dad33 --- /dev/null +++ b/.gitmodules | |||
@@ -0,0 +1,3 @@ | |||
1 | [submodule "trivmix"] | ||
2 | path = trivmix | ||
3 | url = git://git.yggdrasil.li/trivmix | ||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | nixpkgs.config.packageOverrides = pkgs: | 26 | nixpkgs.config.packageOverrides = pkgs: |
27 | { | 27 | { |
28 | trivmix = let trivmix = pkgs.haskellPackages.callPackage ./customized/trivmix.nix {}; in | 28 | trivmix = let trivmix = pkgs.haskellPackages.callPackage ./custom/trivmix.nix {}; in |
29 | pkgs.stdenv.mkDerivation { | 29 | pkgs.stdenv.mkDerivation { |
30 | name = "trivmix-wrapper"; | 30 | name = "trivmix-wrapper"; |
31 | nativeBuildInputs = [ pkgs.makeWrapper ]; | 31 | nativeBuildInputs = [ pkgs.makeWrapper ]; |
diff --git a/custom/trivmix.nix b/custom/trivmix.nix new file mode 120000 index 00000000..c968101a --- /dev/null +++ b/custom/trivmix.nix | |||
@@ -0,0 +1 @@ | |||
../trivmix/trivmix.nix \ No newline at end of file | |||
diff --git a/customized/trivmix.nix b/customized/trivmix.nix deleted file mode 100644 index a39cf1b0..00000000 --- a/customized/trivmix.nix +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | # This file was auto-generated by cabal2nix. Please do NOT edit manually! | ||
2 | |||
3 | { cabal, filepath, hinotify, jack, optparseApplicative | ||
4 | , transformers, explicitException, process | ||
5 | , fetchgit | ||
6 | }: | ||
7 | |||
8 | cabal.mkDerivation (self: { | ||
9 | pname = "trivmix"; | ||
10 | version = "1.0.0"; | ||
11 | src = fetchgit { | ||
12 | url = git://git.yggdrasil.li/trivmix; | ||
13 | rev = "c51b5c819872b32c354ac7e48261f84ff6a07161"; | ||
14 | sha256 = "f18bc1b6a4af3ca3106db790c3960de41266aadc28acee42af0104a2bba9a122"; | ||
15 | }; | ||
16 | isLibrary = false; | ||
17 | isExecutable = true; | ||
18 | buildDepends = [ | ||
19 | filepath hinotify jack optparseApplicative transformers explicitException process | ||
20 | ]; | ||
21 | meta = { | ||
22 | license = self.stdenv.lib.licenses.publicDomain; | ||
23 | platforms = self.ghc.meta.platforms; | ||
24 | }; | ||
25 | }) | ||
diff --git a/trivmix b/trivmix new file mode 160000 | |||
Subproject 41111d7e0b05f5bd6f17a25ac2abd604944440c | |||