diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2016-02-11 19:26:04 +0000 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2016-02-11 19:26:04 +0000 |
commit | 7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795 (patch) | |
tree | b434a03b1440411faab77cd7e9c1b2c2430267c2 /shell.nix | |
parent | e310456a054be6d62429c5f3b988da31cf502ced (diff) | |
parent | 7cf5bfd22b4eaa922b58d777776395173dbc05a3 (diff) | |
download | thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.tar thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.tar.gz thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.tar.bz2 thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.tar.xz thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.zip |
Merge branch 'rewrite' of git.yggdrasil.li:thermoprint into rewrite
Diffstat (limited to 'shell.nix')
-rw-r--r-- | shell.nix | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -6,8 +6,7 @@ let | |||
6 | packages = ps: with ps; [ | 6 | packages = ps: with ps; [ |
7 | cabal-install hlint cabal2nix | 7 | cabal-install hlint cabal2nix |
8 | hspec QuickCheck quickcheck-instances | 8 | hspec QuickCheck quickcheck-instances |
9 | aeson-pretty | 9 | ] ++ (builtins.attrValues (import ./default.nix { inherit pkgs; })); |
10 | ] ++ (builtins.attrValues (import ./default.nix {})); | ||
11 | ghc = pkgs.haskell.packages.${compilerName}.ghcWithPackages packages; | 10 | ghc = pkgs.haskell.packages.${compilerName}.ghcWithPackages packages; |
12 | in | 11 | in |
13 | pkgs.stdenv.mkDerivation rec { | 12 | pkgs.stdenv.mkDerivation rec { |