about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAycan iRiCAN <iricanaycan@gmail.com>2014-08-22 12:38:10 +0300
committerAycan iRiCAN <iricanaycan@gmail.com>2014-08-22 12:38:10 +0300
commitfec81c392f255fed231d13e9ca363632648a05c5 (patch)
tree6df0875743a3d989b0d44c8bcfc221a83c9ab20d /pkgs
parent53fab4004e171a3490842c921abd8551a73278b1 (diff)
downloadnixlib-fec81c392f255fed231d13e9ca363632648a05c5.tar
nixlib-fec81c392f255fed231d13e9ca363632648a05c5.tar.gz
nixlib-fec81c392f255fed231d13e9ca363632648a05c5.tar.bz2
nixlib-fec81c392f255fed231d13e9ca363632648a05c5.tar.lz
nixlib-fec81c392f255fed231d13e9ca363632648a05c5.tar.xz
nixlib-fec81c392f255fed231d13e9ca363632648a05c5.tar.zst
nixlib-fec81c392f255fed231d13e9ca363632648a05c5.zip
Revert "Merge pull request #3718 from MP2E/lens_4_4_update"
This reverts commit 53fab4004e171a3490842c921abd8551a73278b1, reversing
changes made to 08e4d586009768e0f2a874125ac618424703b7f5.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/haskell/cabal-lenses/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/lens-aeson/default.nix24
-rw-r--r--pkgs/development/libraries/haskell/lens/default.nix29
-rw-r--r--pkgs/top-level/haskell-packages.nix2
4 files changed, 16 insertions, 40 deletions
diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index ccd23434fe0d..a4ac5164e1f3 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -7,7 +7,6 @@ cabal.mkDerivation (self: {
   version = "0.3";
   sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl";
   buildDepends = [ Cabal lens unorderedContainers ];
-  jailbreak = true;
   meta = {
     description = "Lenses and traversals for the Cabal library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
deleted file mode 100644
index d19b0bf6dd78..000000000000
--- a/pkgs/development/libraries/haskell/lens-aeson/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving
-, lens, scientific, semigroups, simpleReflect, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens-aeson";
-  version = "1";
-  sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r";
-  buildDepends = [
-    aeson attoparsec lens scientific text unorderedContainers vector
-  ];
-  testDepends = [
-    doctest filepath genericDeriving semigroups simpleReflect
-  ];
-  meta = {
-    homepage = "http://github.com/lens/lens-aeson/";
-    description = "Law-abiding lenses for aeson";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 7a179d54f6bf..655525e4d598 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -1,23 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
-, doctest, exceptions, filepath, free, genericDeriving, hashable
-, hlint, HUnit, mtl, nats, parallel, primitive, profunctors
-, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
-, split, tagged, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
-, transformersCompat, unorderedContainers, vector, void, zlib
+{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant
+, deepseq, distributive, doctest, exceptions, filepath, free
+, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
+, primitive, profunctors, QuickCheck, reflection, scientific
+, semigroupoids, semigroups, simpleReflect, split, tagged
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, testFrameworkTh, text, transformers, transformersCompat
+, unorderedContainers, vector, void, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.4";
-  sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w";
+  version = "4.3.3";
+  sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f";
   buildDepends = [
-    bifunctors comonad contravariant distributive exceptions filepath
-    free hashable mtl parallel primitive profunctors reflection
-    semigroupoids semigroups split tagged text transformers
-    transformersCompat unorderedContainers vector void zlib
+    aeson attoparsec bifunctors comonad contravariant distributive
+    exceptions filepath free hashable mtl parallel primitive
+    profunctors reflection scientific semigroupoids semigroups split
+    tagged text transformers transformersCompat unorderedContainers
+    vector void zlib
   ];
   testDepends = [
     deepseq doctest filepath genericDeriving hlint HUnit mtl nats
@@ -25,6 +27,7 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
     transformers unorderedContainers vector
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d09f8119d8db..acf164d57c7a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1459,8 +1459,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   lens = callPackage ../development/libraries/haskell/lens {};
 
-  lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
-
   lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
 
   lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};