diff options
author | Shea Levy <shea@shealevy.com> | 2018-01-11 09:21:50 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-01-11 09:21:50 -0500 |
commit | fb069b77ee742140b1607ebe6e9fa8cafd20e224 (patch) | |
tree | 2d9fb4a7de203988583e8d98141907d6c2cdc98a | |
parent | 0578f07b91f8761baec98a7920928da062c1f4a7 (diff) | |
parent | fb2b6ac373a5faf560f1a5daf085df35ced5205e (diff) | |
download | nixlib-fb069b77ee742140b1607ebe6e9fa8cafd20e224.tar nixlib-fb069b77ee742140b1607ebe6e9fa8cafd20e224.tar.gz nixlib-fb069b77ee742140b1607ebe6e9fa8cafd20e224.tar.bz2 nixlib-fb069b77ee742140b1607ebe6e9fa8cafd20e224.tar.lz nixlib-fb069b77ee742140b1607ebe6e9fa8cafd20e224.tar.xz nixlib-fb069b77ee742140b1607ebe6e9fa8cafd20e224.tar.zst nixlib-fb069b77ee742140b1607ebe6e9fa8cafd20e224.zip |
Merge branch 'callCabal2nix-cleanSourceWith'
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index f85259e699bc..5a2f7fb89f0d 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -142,24 +142,16 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: self.callPackage (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: args: if builtins.typeOf src != "path" - then self.callPackage (haskellSrc2nix { inherit name src; }) args - else - # When `src` is a Nix path literal, only use `cabal2nix` on - # the cabal file, so that the "import-from-derivation" is only - # recomputed when the cabal file changes, and so your source - # code isn't duplicated into the nix store on every change. - # This can only be done when `src` is a Nix path literal - # because that is the only kind of source that - # `builtins.filterSource` works on. But this filtering isn't - # usually important on other kinds of sources, like - # `fetchFromGitHub`. - overrideCabal (self.callPackage (haskellSrc2nix { - inherit name; - src = builtins.filterSource (path: type: - pkgs.lib.hasSuffix "${name}.cabal" path || pkgs.lib.hasSuffix "package.yaml" path - ) src; - }) args) (_: { inherit src; }); + callCabal2nix = name: src: args: + overrideCabal (self.callPackage (haskellSrc2nix { + inherit name; + src = pkgs.lib.cleanSourceWith + { inherit src; + filter = path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || + pkgs.lib.hasSuffix "package.yaml" path; + }; + }) args) (_: { inherit src; }); # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet # Given a set whose values are either paths or version strings, produces |