From c60bd180065e37891b952c7cbdbe93ed293d6165 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Wed, 17 Mar 2021 22:01:59 +0000 Subject: [PATCH 1/2] agda nixos test: fix hello world program --- nixos/tests/agda.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix index 3773907cff5..f282788519c 100644 --- a/nixos/tests/agda.nix +++ b/nixos/tests/agda.nix @@ -3,8 +3,9 @@ import ./make-test-python.nix ({ pkgs, ... }: let hello-world = pkgs.writeText "hello-world" '' open import IO + open import Level - main = run(putStrLn "Hello World!") + main = run {0ℓ} (putStrLn "Hello World!") ''; in { From 0e162b97d6a35cd96f10ecda5a1c295e6aeed612 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Tue, 30 Mar 2021 13:54:02 +0100 Subject: [PATCH 2/2] agda nixos test: add to passthru for agda + stdlib --- pkgs/build-support/agda/default.nix | 7 +++++-- .../libraries/agda/standard-library/default.nix | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index d610a8f9a61..984d61f1f75 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -1,6 +1,6 @@ # Builder for Agda packages. -{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages }: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages, nixosTests }: with lib.strings; @@ -18,7 +18,10 @@ let in runCommandNoCC "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ makeWrapper ]; - passthru.unwrapped = Agda; + passthru = { + unwrapped = Agda; + tests = { inherit (nixosTests) agda; }; + }; } '' mkdir -p $out/bin makeWrapper ${Agda}/bin/agda $out/bin/agda \ diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 4bd5de8bd48..fd20a0d9a97 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages }: +{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages, nixosTests }: mkDerivation rec { pname = "standard-library"; @@ -19,6 +19,7 @@ mkDerivation rec { rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda ''; + passthru.tests = { inherit (nixosTests) agda; }; meta = with lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler";