summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2016-01-22 13:39:13 +0100
committerDomen Kožar <domen@dev.si>2016-01-22 13:39:18 +0100
commit542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9 (patch)
tree0baae1431e47e5696523dc3b80270835dd05f26f
parent24ae34c0d7a762d2b56a687e8770e8250d7c3382 (diff)
downloadnixpkgs-542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9.tar
nixpkgs-542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9.tar.gz
nixpkgs-542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9.tar.bz2
nixpkgs-542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9.tar.lz
nixpkgs-542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9.tar.xz
nixpkgs-542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9.tar.zst
nixpkgs-542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9.zip
elm: recurseIntroAtrs and use GHC 7.10.3
-rw-r--r--pkgs/development/compilers/elm/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 9b9773e6973..408af6e75c6 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -34,7 +34,7 @@ let
       EOF
     '' + lib.concatStrings cmds;
 
-  hsPkgs = haskell.packages.ghc7102.override {
+  hsPkgs = haskell.packages.ghc7103.override {
     overrides = self: super:
       let hlib = haskell.lib;
           elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b184f26edc..2d87fae76b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3889,7 +3889,7 @@ let
 
   eql = callPackage ../development/compilers/eql {};
 
-  elmPackages = callPackage ../development/compilers/elm { };
+  elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });
 
   adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };