diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2016-04-17 20:40:52 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2016-04-17 20:40:52 +0200 |
| commit | 3c0776f07f39f35597f85a176924dd84c265c0a2 (patch) | |
| tree | 1de76b53d2f78556d37e4de3f2b32d93f4656d9e | |
| parent | 34405c67012884b9ffad6c013444b2beb8ec64f1 (diff) | |
| parent | 00ccb93caaebc67e323b3e71f83e546bc950fed2 (diff) | |
| download | trivmix-3c0776f07f39f35597f85a176924dd84c265c0a2.tar trivmix-3c0776f07f39f35597f85a176924dd84c265c0a2.tar.gz trivmix-3c0776f07f39f35597f85a176924dd84c265c0a2.tar.bz2 trivmix-3c0776f07f39f35597f85a176924dd84c265c0a2.tar.xz trivmix-3c0776f07f39f35597f85a176924dd84c265c0a2.zip | |
Merge commit '00ccb93'
Conflicts:
package.nix
trivmix.cabal
| -rw-r--r-- | default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/default.nix b/default.nix index 2c2a8cc..804e871 100644 --- a/default.nix +++ b/default.nix | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | let | 1 | let |
| 2 | pkgs = import <nixpkgs> {}; | 2 | pkgs = import <nixpkgs> {}; |
| 3 | in rec { | 3 | in rec { |
| 4 | trivmix = pkgs.stdenv.lib.overrideDerivation (pkgs.myHaskellPackages.callPackage ./trivmix.nix {}) (attrs : { | 4 | trivmix = pkgs.stdenv.lib.overrideDerivation (pkgs.haskellPackages.callPackage ./trivmix.nix {}) (attrs : { |
| 5 | src = ./.; | 5 | src = ./.; |
| 6 | }); | 6 | }); |
| 7 | } | 7 | } |