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

Commits on Aug 10, 2017

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    291da85 View commit details

Commits on Aug 18, 2017

  1. Merge pull request #28097 from cocreature/sdistTarball-doc

    haskell: remove any extraneous outputs from sdistTarball
    peti authored Aug 18, 2017
    Copy the full SHA
    b6a746d View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/development/haskell-modules/lib.nix
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/lib.nix
Original file line number Diff line number Diff line change
@@ -75,6 +75,9 @@ rec {

sdistTarball = pkg: lib.overrideDerivation pkg (drv: {
name = "${drv.pname}-source-${drv.version}";
# Since we disable the haddock phase, we also need to override the
# outputs since the separate doc output will not be produced.
outputs = ["out"];
buildPhase = "./Setup sdist";
haddockPhase = ":";
checkPhase = ":";