diff options
| author | Domen Kožar <domen@dev.si> | 2020-03-25 12:51:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 12:51:45 +0100 |
| commit | 2f3981609c178f7f4d94e79a9fc2714ce1f73bfa (patch) | |
| tree | 11e15d5b11a56320b9058a13e6e9e89052146ed3 /pkgs/development/compilers | |
| parent | 765b2fd86636903953165c762705a70ef9525ecd (diff) | |
| parent | 63c871e1480cf83c45a140df64279dfb3cd356b7 (diff) | |
| download | nixpkgs-2f3981609c178f7f4d94e79a9fc2714ce1f73bfa.tar nixpkgs-2f3981609c178f7f4d94e79a9fc2714ce1f73bfa.tar.gz nixpkgs-2f3981609c178f7f4d94e79a9fc2714ce1f73bfa.tar.bz2 nixpkgs-2f3981609c178f7f4d94e79a9fc2714ce1f73bfa.tar.lz nixpkgs-2f3981609c178f7f4d94e79a9fc2714ce1f73bfa.tar.xz nixpkgs-2f3981609c178f7f4d94e79a9fc2714ce1f73bfa.tar.zst nixpkgs-2f3981609c178f7f4d94e79a9fc2714ce1f73bfa.zip | |
Merge pull request #83352 from turboMaCk/elm-instrument-remove-patch
elmPackages.elm-instrument: remove patch
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/elm/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/compilers/elm/packages/elm-instrument.nix | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index fa9f72ebd04..3e2d3ce2ad2 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -52,14 +52,6 @@ let })); elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: { - patches = [( - # GHC 8.8.1 and Cabal >= 1.25.0 support - # https://github.com/zwilias/elm-instrument/pull/3 - fetchpatch { - url = "https://github.com/turboMaCk/elm-instrument/commit/4272db2aea742c8b54509e536fa4f35d04f95da5.patch"; - sha256 = "1d1lc43lp3x5jfhlyb1b7na7nj1g1i1vc1np26pcisg9c2s7gjz6"; - } - )]; prePatch = '' sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place ''; diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix index bd769016227..54077994fbd 100644 --- a/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -3,15 +3,15 @@ , fetchgit, filepath, free, HUnit, indents, json, mtl , optparse-applicative, parsec, process, QuickCheck, quickcheck-io , split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck -, text, elm +, text }: mkDerivation { pname = "elm-instrument"; version = "0.0.7"; src = fetchgit { - url = "https://github.com/zwilias/elm-instrument.git"; - sha256 = "14yfzwsyvgc6rzn19sdmwk2mc1vma9hcljnmjnmlig8mp0271v56"; - rev = "31b527e405a6afdb25bb87ad7bd14f979e65cff7"; + url = "https://github.com/zwilias/elm-instrument"; + sha256 = "167d7l2547zxdj7i60r6vazznd9ichwc0bqckh3vrh46glkz06jv"; + rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e"; fetchSubmodules = true; }; isLibrary = true; |