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

Commits on Mar 2, 2019

  1. stack-hook: deduplicate better 

    No need to check for duplicates as it is now handled by setup.sh
deduplication. Also should use targetOffset here instead of hostOffset
because we are using stack-hook natively.
    @matthewbauer
    matthewbauer committed Mar 2, 2019
    Copy the full SHA
    71f189f View commit details

Commits on Mar 9, 2019

  1. Merge pull request #56661 from matthewbauer/stack-hook-fixup 

    stack-hook: deduplicate better
    @matthewbauer
    matthewbauer authored Mar 9, 2019
    Copy the full SHA
    ca6e931 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/haskell-modules/stack-hook.sh
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/stack-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
addStackArgs () {
if [ -d "$1/lib" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-lib-dirs=$1/lib"* ]]; then
if [ -n "$(echo $1/lib/lib*)" ]; then
STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$1/lib"
fi

if [ -d "$1/include" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-include-dirs=$1/include"* ]]; then
if [ -d "$1/include" ]; then
STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$1/include"
fi
}

addEnvHooks "$hostOffset" addStackArgs
addEnvHooks "$targetOffset" addStackArgs