Skip to content
Permalink
Browse files

Merge #1100

1100: use IOHK fork for 'zip' to disable system dependency on bzlib2 r=rvl a=KtorZ

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->

N/A

# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- [x] I have forked the `zip` library waiting for @rvl 's PR to be merged
- [x] I have used our fork in our stack.yaml
- [x] I have used the flag introduced by the PR

# Comments

<!-- Additional comments or screenshots to attach if any -->

Let's see if this fixes Hydra as expected 🙏 

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: KtorZ <matthias.benkort@gmail.com>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
  • Loading branch information
3 people committed Dec 3, 2019
2 parents 52c3178 + 494d0c9 commit c762580f46b646d9c0e6edb858c2b7054def8703
Showing with 135 additions and 3 deletions.
  1. +2 −0 nix/.stack.nix/default.nix
  2. +121 −0 nix/.stack.nix/zip.nix
  3. +1 −1 nix/stack-shell.nix
  4. +2 −2 nix/windows-testing-bundle.nix
  5. +1 −0 release.nix
  6. +8 −0 stack.yaml

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -11,7 +11,7 @@ haskell.lib.buildStackProject rec {

buildInputs =
(with walletPackages; [ jormungandr jormungandr-cli ]) ++
[ zlib bzip2.dev gmp ncurses lzma openssl git systemd.dev nodejs ] ++
[ zlib gmp ncurses lzma openssl git systemd.dev nodejs ] ++
(lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa CoreServices libcxx libiconv ]));

phases = ["nobuildPhase"];
@@ -54,7 +54,7 @@ in pkgs.runCommand name {
${testData.jormungandr}/jormungandr/config.yaml > config.yaml
${pkgs.lib.concatMapStringsSep "\n" (test: ''
pkg=`ls -1 ${test}`
pkg=`ls -1 ${test} | head -1`
exe=`cd ${test}/$pkg; ls -1 *.exe`
name=$pkg-test-$exe
cp ${test}/$pkg/$exe $name
@@ -63,7 +63,7 @@ in pkgs.runCommand name {
'') tests}
${pkgs.lib.concatMapStringsSep "\n" (bench: ''
pkg=`ls -1 ${bench}`
pkg=`ls -1 ${bench} | head -1`
exe=`cd ${bench}/$pkg; ls -1 *.exe`
name=$pkg-bench-$exe
cp ${bench}/$pkg/$exe $name
@@ -41,6 +41,7 @@ let
jobs.native.shell.x86_64-darwin
jobs.cardano-wallet-jormungandr-win64
jobs.cardano-wallet-jormungandr-macos64
jobs.cardano-wallet-jormungandr-tests-win64
]
);

@@ -18,6 +18,10 @@ extra-deps:
- quickcheck-state-machine-0.6.0
- command-0.1.1

# 'zip' with an extra flag to disable bzlib2 library
- git: https://github.com/mrkkrp/zip
commit: 5a39029cebc9ad5b16ed6a5f2f495714b34b02f8

# persistent-2.10.2 with CASCADE DELETE support for SQLite.
#
# See: https://github.com/input-output-hk/persistent/tree/cardano-wallet
@@ -51,5 +55,9 @@ flags:
disable-prometheus: true
disable-systemd: true

# Avoid a system library which causes difficulty with cross-compilation
zip:
disable-bzip2: true

nix:
shell-file: nix/stack-shell.nix

0 comments on commit c762580

Please sign in to comment.
You can’t perform that action at this time.