diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 10:11:03 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 10:11:03 -0400 |
| commit | 446cb32ea192a650c90e5e0e20e4862bae2761be (patch) | |
| tree | 464f967a65f0cc767ce01cb5aa8f2126c9deca21 /pkgs/development/haskell-modules | |
| parent | 17316643fd1a0bca5cafddaef227327542c2e832 (diff) | |
| download | nixlib-446cb32ea192a650c90e5e0e20e4862bae2761be.tar nixlib-446cb32ea192a650c90e5e0e20e4862bae2761be.tar.gz nixlib-446cb32ea192a650c90e5e0e20e4862bae2761be.tar.bz2 nixlib-446cb32ea192a650c90e5e0e20e4862bae2761be.tar.lz nixlib-446cb32ea192a650c90e5e0e20e4862bae2761be.tar.xz nixlib-446cb32ea192a650c90e5e0e20e4862bae2761be.tar.zst nixlib-446cb32ea192a650c90e5e0e20e4862bae2761be.zip | |
haskell generic-builder: Remove merge conflict
I forgot this in 17316643fd1a0bca5cafddaef227327542c2e832
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 32e7734dd0bd..b6dcf3558eac 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -173,10 +173,6 @@ let propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ allPkgconfigDepends ++ -======= - otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ ->>>>>>> upstream/master optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; |