diff options
author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2017-12-19 08:36:31 -0500 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-12-20 09:17:45 +0100 |
commit | 461f311e355640561d8398e436f4a0a10558b677 (patch) | |
tree | 4d4137bdedba33919fa43591d1b66d94569dab7e /pkgs | |
parent | 22ef441cface9f76636f9ed8c2760542a86343eb (diff) | |
download | nixlib-461f311e355640561d8398e436f4a0a10558b677.tar nixlib-461f311e355640561d8398e436f4a0a10558b677.tar.gz nixlib-461f311e355640561d8398e436f4a0a10558b677.tar.bz2 nixlib-461f311e355640561d8398e436f4a0a10558b677.tar.lz nixlib-461f311e355640561d8398e436f4a0a10558b677.tar.xz nixlib-461f311e355640561d8398e436f4a0a10558b677.tar.zst nixlib-461f311e355640561d8398e436f4a0a10558b677.zip |
haskell-src-exts: 1.19.1 is now the default version
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d6a2bf6dc300..767c581d7da7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -88,7 +88,7 @@ self: super: { # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ - git-annex = (overrideCabal (drv: { + git-annex = (overrideCabal super.git-annex (drv: { src = pkgs.fetchgit { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; @@ -670,9 +670,7 @@ self: super: { mkdir -p $data/share/emacs ln -s $lispdir $data/share/emacs/site-lisp ''; - })).override { - haskell-src-exts = self.haskell-src-exts_1_19_1; - }; + })); # Make elisp files available at a location where people expect it. hindent = (overrideCabal super.hindent (drv: { @@ -684,9 +682,7 @@ self: super: { ln -s $lispdir $data/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 - })).override { - haskell-src-exts = self.haskell-src-exts_1_19_1; - }; + })); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; |