From edd2e49f9904e5c377d76bf74351e1d12e5b9016 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Fri, 6 Oct 2023 21:18:31 +0200 Subject: [PATCH 1/4] quarto: added 'x86_64-darwin' 'aarch64-linux' 'aarch64-darwin' to platforms --- pkgs/development/libraries/quarto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index e87243fe8ef0..cb6a0cbe04d5 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (final: { changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson mrtarantoga ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; }; }) From ce5371f719e1a0bdc90a168df456572d0bda60ec Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 7 Oct 2023 00:17:12 +0200 Subject: [PATCH 2/4] quarto: add even more platforms --- pkgs/development/libraries/quarto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index cb6a0cbe04d5..782433007641 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (final: { changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson mrtarantoga ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; + platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; }; }) From c7fc9de18b4a47bc057a3696e21725f1f430fcc7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 7 Oct 2023 00:17:57 +0200 Subject: [PATCH 3/4] quarto: fix passthru tests on darwin --- pkgs/development/libraries/quarto/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 782433007641..d89a41811b16 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -13,6 +13,7 @@ , python3 , quarto , extraPythonPackages ? ps: with ps; [] +, sysctl }: stdenv.mkDerivation (final: { @@ -64,7 +65,9 @@ stdenv.mkDerivation (final: { ''; passthru.tests = { - quarto-check = runCommand "quarto-check" {} '' + quarto-check = runCommand "quarto-check" { + nativeBuildInputs = lib.optionals stdenv.isDarwin [ sysctl ]; + } '' export HOME="$(mktemp -d)" ${quarto}/bin/quarto check touch $out From 4182db564df9c462540c3238697556673588b1c2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 7 Oct 2023 00:19:20 +0200 Subject: [PATCH 4/4] quarto: fix postInstall overrides --- pkgs/development/libraries/quarto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index d89a41811b16..47cfae648294 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (final: { mv bin/* $out/bin mv share/* $out/share - runHook preInstall + runHook postInstall ''; passthru.tests = {