diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-07 04:12:45 +0000 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-07 04:12:45 +0000 |
| commit | 4aff88cd487aa947bb732ca1533d1afc8d9c754d (patch) | |
| tree | 0294d04b92c4042553e1bf82bf8ccd39027e1ac8 /pkgs/development/libraries/haskell | |
| parent | f8dd99cf8367ac2523db21d1865762b857552983 (diff) | |
| parent | 314385d7cafb28b21bf0655ffebde5a122ecf606 (diff) | |
Merge pull request #4856 from InternetSolutions/wreq-lens45
patch for wreq 0.2 to work with lens 4.5
Diffstat (limited to 'pkgs/development/libraries/haskell')
| -rw-r--r-- | pkgs/development/libraries/haskell/wreq/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/haskell/wreq/lens-4.5.patch | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 55270cbb21025..a5112b8fa3d92 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -21,12 +21,12 @@ cabal.mkDerivation (self: { temporary testFramework testFrameworkHunit text ]; doCheck = false; + patches = [ ./lens-4.5.patch ]; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/wreq/lens-4.5.patch b/pkgs/development/libraries/haskell/wreq/lens-4.5.patch new file mode 100644 index 0000000000000..b47e5647bf1d6 --- /dev/null +++ b/pkgs/development/libraries/haskell/wreq/lens-4.5.patch @@ -0,0 +1,15 @@ +diff --git a/Network/Wreq/Lens/Machinery.hs b/Network/Wreq/Lens/Machinery.hs +index 782d965..0c97d27 100644 +--- a/Network/Wreq/Lens/Machinery.hs ++++ b/Network/Wreq/Lens/Machinery.hs +@@ -13,8 +13,8 @@ import Language.Haskell.TH.Syntax (Dec, Name, Q, mkName, nameBase) + defaultRules :: LensRules + defaultRules = lensRules + +-fieldName :: (String -> String) -> [Name] -> Name -> [DefName] +-fieldName f _ name = [TopName . mkName . f . nameBase $ name] ++fieldName :: (String -> String) -> Name -> [Name] -> Name -> [DefName] ++fieldName f _ _ name = [TopName . mkName . f . nameBase $ name] + + makeLenses :: Name -> Q [Dec] + makeLenses = makeLensesWith (defaultRules & lensField .~ fieldName id) |