summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorCray Elliott <MP2E@archlinux.us>2015-04-05 00:47:46 -0700
committerCray Elliott <MP2E@archlinux.us>2015-04-05 00:47:49 -0700
commitfd85ddcd500e475c946684a2b13e2a84429fe9cf (patch)
treeed080ec1ba9475f23809c340177f51f036ed30cb /pkgs/development
parent904f24577b87563f97312547aac617b1f233665f (diff)
downloadnixpkgs-fd85ddcd500e475c946684a2b13e2a84429fe9cf.tar
nixpkgs-fd85ddcd500e475c946684a2b13e2a84429fe9cf.tar.gz
nixpkgs-fd85ddcd500e475c946684a2b13e2a84429fe9cf.tar.bz2
nixpkgs-fd85ddcd500e475c946684a2b13e2a84429fe9cf.tar.lz
nixpkgs-fd85ddcd500e475c946684a2b13e2a84429fe9cf.tar.xz
nixpkgs-fd85ddcd500e475c946684a2b13e2a84429fe9cf.tar.zst
nixpkgs-fd85ddcd500e475c946684a2b13e2a84429fe9cf.zip
remove ghc 7.10 patches for yesod-auth, wai-extra, and persistent-template
these patches have all landed upstream
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix14
1 files changed, 0 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 7677930b0e4..14f052b436a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -131,11 +131,6 @@ self: super: {
   haskell-src-meta = overrideCabal (doJailbreak (appendPatch super.haskell-src-meta ./haskell-src-meta-ghc710.patch)) (drv: {
     prePatch = "sed -i -e 's|template-haskell [^,]\\+|template-haskell|' haskell-src-meta.cabal && cat haskell-src-meta.cabal";
   });
-  persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch {
-    url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch";
-    sha256 = "1gphl0v87y2fjwkwp6j0bnksd0d9dr4pis6aw97rij477bm5mrvw";
-    stripLen = 1;
-  });
   mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
     url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
     sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h";
@@ -144,15 +139,6 @@ self: super: {
     url = "https://github.com/fpco/conduit-combinators/pull/16.patch";
     sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3";
   });
-  wai-extra = appendPatch super.wai-extra (pkgs.fetchpatch {
-    url = "https://github.com/yesodweb/wai/pull/339.patch";
-    sha256 = "1rmz1ijfch143v7jg4d5r50lqq9r46zhcmdafq8p9g9pjxlyc590";
-    stripLen = 1;
-  });
-  yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
-    url = "https://github.com/yesodweb/yesod/pull/941.patch";
-    sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq";
-    stripLen = 1;
   });
 
   ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {