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: 751d397ad486
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01a3f0b8aabd
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Sep 28, 2017

  1. Fix tarball

    @shlevy
    shlevy committed Sep 28, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    9ce7175 View commit details

  2. Avoid polluting lib namespace unncessarily

    @shlevy
    shlevy committed Sep 28, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    01a3f0b View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 lib/customisation.nix
  2. +1 −1 lib/default.nix
  3. +1 −1 pkgs/top-level/haskell-packages.nix
  4. +1 −1 pkgs/top-level/splice.nix
2 changes: 1 addition & 1 deletion lib/customisation.nix
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ rec {
});
};

in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: {
in lib.fixedPoints.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: {
args = origArgs;
val = f output self.args self.val;
});
2 changes: 1 addition & 1 deletion lib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ let
nixpkgsVersion mod;

inherit (fixedPoints) fix fix' extends composeExtensions
makeExtensible makeExtensibleWithCustomName makeExtensibleWithInterface;
makeExtensible makeExtensibleWithCustomName;
inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
getAttrFromPath attrVals attrValues catAttrs filterAttrs
filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
2 changes: 1 addition & 1 deletion pkgs/top-level/haskell-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ let
};

callPackage = lib.callPackageWith (pkgs // { inherit haskellLib; });
callPackageWithOutput = lib.callPackageWithOutputWith (pkgs // { inherit haskellLib; });
callPackageWithOutput = lib.customisation.callPackageWithOutputWith (pkgs // { inherit haskellLib; });

in rec {
lib = haskellLib;
2 changes: 1 addition & 1 deletion pkgs/top-level/splice.nix
View file
Original file line number Diff line number Diff line change
@@ -86,5 +86,5 @@ in

newScope = extra: lib.callPackageWith (splicedPackages // extra);

newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra);
newScopeWithOutput = extra: lib.customisation.callPackageWithOutputWith (splicedPackages // extra);
}