From 1e9c5afb4a9779269438bbebbc86276bb0b96ac8 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 21 Feb 2024 11:53:23 -0500 Subject: [PATCH 1/2] test: Detect any system --- test/common.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/common.sh b/test/common.sh index 9c8fbe20..5a9ca396 100644 --- a/test/common.sh +++ b/test/common.sh @@ -5,11 +5,7 @@ function logHeader { echo -e "\n||| $@" } -if [ "$(uname)" == "Darwin" ]; then - SYSTEM=aarch64-darwin -else - SYSTEM=x86_64-linux -fi +SYSTEM=$(nix show-config | grep 'system =' | awk '{print $3}') DIR_OF_COMMON_SH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" HASKELL_FLAKE=${DIR_OF_COMMON_SH}/.. From 17889f3a2833d8085e3f872d0606ed2c34839f53 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 21 Feb 2024 11:59:19 -0500 Subject: [PATCH 2/2] reproducible --- test/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common.sh b/test/common.sh index 5a9ca396..a9c4b39a 100644 --- a/test/common.sh +++ b/test/common.sh @@ -5,7 +5,7 @@ function logHeader { echo -e "\n||| $@" } -SYSTEM=$(nix show-config | grep 'system =' | awk '{print $3}') +SYSTEM=$(nix show-config | grep 'system =' | nix run nixpkgs#gawk '{print $3}') DIR_OF_COMMON_SH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" HASKELL_FLAKE=${DIR_OF_COMMON_SH}/..