summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmil Rangden <emil.rangden@chas.se>2014-08-18 20:06:28 +0200
committerPeter Simons <simons@cryp.to>2014-08-19 23:47:58 +0200
commite15036dbd00f09e07aa0d57786d902545a1c7087 (patch)
tree27fce44a736286e89d7dee2192fd7075a657f6be
parent2c0610fb6f670dba93326b7def6d431e3c0cde1a (diff)
downloadnixpkgs-e15036dbd00f09e07aa0d57786d902545a1c7087.tar
nixpkgs-e15036dbd00f09e07aa0d57786d902545a1c7087.tar.gz
nixpkgs-e15036dbd00f09e07aa0d57786d902545a1c7087.tar.bz2
nixpkgs-e15036dbd00f09e07aa0d57786d902545a1c7087.tar.lz
nixpkgs-e15036dbd00f09e07aa0d57786d902545a1c7087.tar.xz
nixpkgs-e15036dbd00f09e07aa0d57786d902545a1c7087.tar.zst
nixpkgs-e15036dbd00f09e07aa0d57786d902545a1c7087.zip
haskell fix - fay
Remove explicit old aeson version and update to latest
-rw-r--r--pkgs/development/libraries/haskell/fay/default.nix6
-rw-r--r--pkgs/top-level/haskell-packages.nix2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index 8c09bf444ee..edbf19bda62 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.20.1.1";
-  sha256 = "0jcvq880xnkm8aqr69ihwf7by55fc1bbd8wk8152zqgkih74qzc4";
+  version = "0.20.1.2";
+  sha256 = "1ssii9wkml8jn8kcdq8h6sxrq4gap4asyglakvif2zawl3sqrdji";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -21,7 +21,7 @@ cabal.mkDerivation (self: {
     utf8String vector
   ];
   meta = {
-    homepage = "http://fay-lang.org/";
+    homepage = "https://github.com/faylang/fay/wiki";
     description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 283f0fa0304..a27d1acded3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -779,7 +779,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   Extra = callPackage ../development/libraries/haskell/Extra {};
 
-  fay = callPackage ../development/libraries/haskell/fay { aeson = self.aeson_0_7_0_4; };
+  fay = callPackage ../development/libraries/haskell/fay {};
 
   fayBase = callPackage ../development/libraries/haskell/fay-base {};