diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2018-03-31 15:40:11 -0400 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-04-02 01:05:03 +0200 |
| commit | da8d48117fa192887f4acfeaee0d123c59b158fc (patch) | |
| tree | 560a02c63e4cba33c3b34653d88d073e63012e08 /pkgs | |
| parent | 5dd5faddc0279378a9cb56ec0025eae755cf0e8f (diff) | |
| download | nixlib-da8d48117fa192887f4acfeaee0d123c59b158fc.tar nixlib-da8d48117fa192887f4acfeaee0d123c59b158fc.tar.gz nixlib-da8d48117fa192887f4acfeaee0d123c59b158fc.tar.bz2 nixlib-da8d48117fa192887f4acfeaee0d123c59b158fc.tar.lz nixlib-da8d48117fa192887f4acfeaee0d123c59b158fc.tar.xz nixlib-da8d48117fa192887f4acfeaee0d123c59b158fc.tar.zst nixlib-da8d48117fa192887f4acfeaee0d123c59b158fc.zip | |
elm: patch elm-package to work with current http-client
partial fix for #38023
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/elm/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/elm/packages/elm-package.nix | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index d2e9ce0f3059..086a40d69add 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -79,15 +79,6 @@ let in elmPkgs // { inherit elmPkgs; elmVersion = elmRelease.version; - # needed for elm-package - http-client = hlib.overrideCabal super.http-client (drv: { - version = "0.4.31.2"; - sha256 = "12yq2l6bvmxg5w6cw5ravdh39g8smwn1j44mv36pfmkhm5402h8n"; - }); - http-client-tls = hlib.overrideCabal super.http-client-tls (drv: { - version = "0.2.4.1"; - sha256 = "18wbca7jg15p0ds3339f435nqv2ng0fqc4bylicjzlsww625ij4d"; - }); # https://github.com/elm-lang/elm-compiler/issues/1566 indents = hlib.overrideCabal super.indents (drv: { version = "0.3.3"; diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index 4a60b3dfb387..49eddb58a142 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary , bytestring, containers, directory, edit-distance, elm-compiler -, fetchgit, filepath, HTTP, http-client, http-client-tls +, fetchgit, fetchurl, filepath, HTTP, http-client, http-client-tls , http-types, mtl, network, optparse-applicative, parallel-io , pretty, stdenv, text, time, unordered-containers, vector , zip-archive @@ -13,6 +13,10 @@ mkDerivation { sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7"; rev = "8bd150314bacab5b6fc451927aa01deec2276fbf"; }; + patches = fetchurl { + url = https://github.com/jerith666/elm-package/commit/40bab60c2fbff70812cc24cdd97f5e09db3844ad.patch; + sha256 = "0j6pi6cv3h9s6vz68bh0c73fysvk83yhhk56kgshvnrmnpcb3jib"; + }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ |