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: b80c3646c2da
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1357268b9078
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 22, 2017

  1. haskell infra: Make sure packages get custom stdenv 

    One of the goals of 74f5fe5 was to allow passing in a custom stdenv,
which would be used for genericBuilder's `mkDerivation` call. That does
work, but if packages takes `stdenv` as an parameter for any reason,
they'll get the default one instead. This change remedies it.
    @Ericson2314
    Ericson2314 committed Aug 22, 2017
    Copy the full SHA
    19de1f5 View commit details

Commits on Sep 5, 2017

  1. Merge pull request #28478 from obsidiansystems/haskell-custom-stdenv 

    haskell infra: Make sure packages get custom stdenv
    @peti
    peti authored Sep 5, 2017
    Copy the full SHA
    1357268 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/haskell-modules/make-package-set.nix
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/make-package-set.nix
View file
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ let
};
in stdenv.lib.makeOverridable drvScope (auto // manualArgs);

mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope;
defaultScope = mkScope self;
callPackage = drv: args: callPackageWithScope defaultScope drv args;