diff options
| author | Peter Simons <simons@cryp.to> | 2014-11-10 13:42:05 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-11-10 13:42:05 +0100 |
| commit | 96c66aea67547c83d555cc64b3af9fec10cf7977 (patch) | |
| tree | e7bfa860929fe257a0dff9bd68768f80b8308672 /pkgs | |
| parent | 015368fbfe8facc82419e6fb6ba952886e98dab8 (diff) | |
| parent | b2e9f0906754451817bdf80062cd4690f617c239 (diff) | |
| download | nixlib-96c66aea67547c83d555cc64b3af9fec10cf7977.tar nixlib-96c66aea67547c83d555cc64b3af9fec10cf7977.tar.gz nixlib-96c66aea67547c83d555cc64b3af9fec10cf7977.tar.bz2 nixlib-96c66aea67547c83d555cc64b3af9fec10cf7977.tar.lz nixlib-96c66aea67547c83d555cc64b3af9fec10cf7977.tar.xz nixlib-96c66aea67547c83d555cc64b3af9fec10cf7977.tar.zst nixlib-96c66aea67547c83d555cc64b3af9fec10cf7977.zip | |
Merge pull request #4919 from InternetSolutions/wreq-lens45
Use "fetchpatch" instead of a patch file.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/haskell/wreq/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/haskell/wreq/lens-4.5.patch | 15 |
2 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index a5112b8fa3d9..c16df5863a01 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -3,7 +3,7 @@ { cabal, aeson, attoparsec, doctest, exceptions, filepath , httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson , mimeTypes, temporary, testFramework, testFrameworkHunit, text -, time +, time, fetchpatch }: cabal.mkDerivation (self: { @@ -21,7 +21,10 @@ cabal.mkDerivation (self: { temporary testFramework testFrameworkHunit text ]; doCheck = false; - patches = [ ./lens-4.5.patch ]; + patches = [ (fetchpatch { + url = "https://github.com/relrod/wreq/commit/9a91d57b50a09646ecbda88d126918e49aeb2de4.diff"; + sha256 = "09px4hbqkc9b0ykx7alzq2llzp0nxb2c5zsbaa05rcq9cb3nrq4m"; + })]; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; diff --git a/pkgs/development/libraries/haskell/wreq/lens-4.5.patch b/pkgs/development/libraries/haskell/wreq/lens-4.5.patch deleted file mode 100644 index b47e5647bf1d..000000000000 --- a/pkgs/development/libraries/haskell/wreq/lens-4.5.patch +++ /dev/null @@ -1,15 +0,0 @@ -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) |