From 36bb7be495eff53a5950ebfef834b97d0ea3ba92 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 8 Oct 2023 12:23:10 +0900 Subject: [PATCH] tests.haskell.upstreamStackHpackVersion: update breakfor stack-2.13.1 The tarball that contains the statically-linked stack package has changed paths. See the release notes for more details: https://github.com/commercialhaskell/stack/releases/tag/v2.13.1 --- pkgs/test/haskell/upstreamStackHpackVersion/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix index ddf267702592..f3ddbcd3e016 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)"