diff options
| author | Shaun Sharples <shaun.sharples@gmail.com> | 2014-11-10 10:32:41 +0200 |
|---|---|---|
| committer | Shaun Sharples <shaun.sharples@gmail.com> | 2014-11-10 10:32:41 +0200 |
| commit | 094771012b7f8a9081c975ef8ea4d3715b8047d2 (patch) | |
| tree | c0f6f61f5359d521528e1e32b1592fce1aa5886f /pkgs | |
| parent | 9e3137ddf069218f875b385eef27d00d7c0597e1 (diff) | |
| download | nixlib-094771012b7f8a9081c975ef8ea4d3715b8047d2.tar nixlib-094771012b7f8a9081c975ef8ea4d3715b8047d2.tar.gz nixlib-094771012b7f8a9081c975ef8ea4d3715b8047d2.tar.bz2 nixlib-094771012b7f8a9081c975ef8ea4d3715b8047d2.tar.lz nixlib-094771012b7f8a9081c975ef8ea4d3715b8047d2.tar.xz nixlib-094771012b7f8a9081c975ef8ea4d3715b8047d2.tar.zst nixlib-094771012b7f8a9081c975ef8ea4d3715b8047d2.zip | |
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..96353311db07 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 = "143a4f661pigfqqkvhjzfmg24r4j595p1fcsiqiqc763pynccgq9"; + })]; 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) |