Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 87c698a5ca65
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3907a44b70dc
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 2, 2020

  1. haskell/with-packages-wrapper.nix: install "doc" outputs 

    We were previously just installing the "out" output which broke when
we recently changed to generating multiple outputs.

Fixes #76837
    @matthewbauer
    matthewbauer committed Jan 2, 2020
    Copy the full SHA
    e915608 View commit details

Commits on Jan 6, 2020

  1. haskell/with-packages-wrapper.nix: remove /bin symlink if it exists 

    The wrapper need a writable directory to work, so remove the symlink
to a read-only one if it occurs.
    @matthewbauer
    matthewbauer committed Jan 6, 2020
    Copy the full SHA
    93aabab View commit details

Commits on Jan 7, 2020

  1. Merge branch 'fix-doc-in-ghc-wrapper' into release-19.03

    @matthewbauer
    matthewbauer committed Jan 7, 2020
    Copy the full SHA
    3907a44 View commit details
Showing with 12 additions and 2 deletions.
  1. +12 −2 pkgs/development/haskell-modules/with-packages-wrapper.nix
14 changes: 12 additions & 2 deletions pkgs/development/haskell-modules/with-packages-wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
{ lib, stdenv, ghc, llvmPackages, packages, buildEnv, makeWrapper
, withLLVM ? false
, postBuild ? ""
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
@@ -51,15 +51,25 @@ let
++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang);
in
if paths == [] && !withLLVM then ghc else
symlinkJoin {
buildEnv {
# this makes computing paths from the name attribute impossible;
# if such a feature is needed, the real compiler name should be saved
# as a dedicated drv attribute, like `compiler-name`
name = ghc.name + "-with-packages";
paths = paths ++ [ghc];
extraOutputsToInstall = ["doc"];
postBuild = ''
. ${makeWrapper}/nix-support/setup-hook
# We make changes to ghc binaries in $out/bin. buildEnv gives a
# symlink if only one of the paths has the subdirectory. If so,
# we need to remove it for our new wrappers.
if [ -L "$out/bin" ]; then
rm -f "$out/bin"
mkdir -p "$out/bin"
fi
# wrap compiler executables with correct env variables
for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do