diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-22 06:01:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-22 06:01:35 +0000 |
| commit | 0fa884ae1fbf02d5fccb11c75f8bd54aefe099a6 (patch) | |
| tree | 09d5df0a13d79c935b379d7ec75c87bf530b974a /pkgs/test | |
| parent | 09fabcdc4ee7750d9aea71c15f35038e786a3ba5 (diff) | |
| parent | 9d96b5f8ffacf970206cde479757f00f52e36cc7 (diff) | |
| download | nixpkgs-0fa884ae1fbf02d5fccb11c75f8bd54aefe099a6.tar nixpkgs-0fa884ae1fbf02d5fccb11c75f8bd54aefe099a6.tar.gz nixpkgs-0fa884ae1fbf02d5fccb11c75f8bd54aefe099a6.tar.bz2 nixpkgs-0fa884ae1fbf02d5fccb11c75f8bd54aefe099a6.tar.lz nixpkgs-0fa884ae1fbf02d5fccb11c75f8bd54aefe099a6.tar.xz nixpkgs-0fa884ae1fbf02d5fccb11c75f8bd54aefe099a6.tar.zst nixpkgs-0fa884ae1fbf02d5fccb11c75f8bd54aefe099a6.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/haskell/upstreamStackHpackVersion/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix index ddf26770259..f3ddbcd3e01 100644 --- a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix +++ b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix @@ -25,7 +25,7 @@ let # This is a statically linked version of stack, so it should be usable within # the Nixpkgs builder (at least on x86_64-linux). stackDownloadUrl = - "https://github.com/commercialhaskell/stack/releases/download/v${stack.version}/stack-${stack.version}-linux-x86_64-static.tar.gz"; + "https://github.com/commercialhaskell/stack/releases/download/v${stack.version}/stack-${stack.version}-linux-x86_64.tar.gz"; # This test code has been explicitly pulled out of the derivation below so # that it can be hashed and added to the `name` of the derivation. This is @@ -49,10 +49,11 @@ let ) # Fetch the statically-linked upstream Stack binary. + echo "Trying to download a statically linked stack binary from ${stackDownloadUrl} to ./stack.tar.gz ..." "''${curl[@]}" "${stackDownloadUrl}" > ./stack.tar.gz tar xf ./stack.tar.gz - upstream_stack_version_output="$(./stack-${stack.version}-linux-x86_64-static/stack --version)" + upstream_stack_version_output="$(./stack-${stack.version}-linux-x86_64/stack --version)" echo "upstream \`stack --version\` output: $upstream_stack_version_output" nixpkgs_stack_version_output="$(stack --version)" |