Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0578f07b91f8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fb069b77ee74
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 10, 2018

  1. callCabal2nix: Use cleanSourceWith for composable filtering

    @shlevy
    shlevy committed Jan 10, 2018
    Copy the full SHA
    fb2b6ac View commit details

Commits on Jan 11, 2018

  1. Merge branch 'callCabal2nix-cleanSourceWith'

    @shlevy
    shlevy committed Jan 11, 2018
    Copy the full SHA
    fb069b7 View commit details
Showing with 10 additions and 18 deletions.
  1. +10 −18 pkgs/development/haskell-modules/make-package-set.nix
28 changes: 10 additions & 18 deletions pkgs/development/haskell-modules/make-package-set.nix
View file
Original file line number Diff line number Diff line change
@@ -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