Merge pull request #215990 from ncfavier/agda-tests

agda: fix passthru
This commit is contained in:
Naïm Favier 2023-02-18 16:04:39 +01:00 committed by GitHub
commit 5de1815be9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions

View file

@ -20,7 +20,11 @@ let
nativeBuildInputs = [ makeWrapper ];
passthru = {
unwrapped = Agda;
tests = { inherit (nixosTests) agda; };
inherit withPackages;
tests = {
inherit (nixosTests) agda;
allPackages = withPackages (lib.filter self.lib.isUnbrokenAgdaPackage (lib.attrValues self));
};
};
inherit (Agda) meta;
} ''

View file

@ -1,9 +1,9 @@
{ pkgs, lib, callPackage, newScope, Agda }:
{ pkgs, lib, newScope, Agda }:
let
mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda);
mkAgdaPackages' = Agda: self: let
callPackage = self.callPackage;
inherit (self) callPackage;
inherit (callPackage ../build-support/agda {
inherit Agda self;
inherit (pkgs.haskellPackages) ghcWithPackages;
@ -13,10 +13,7 @@ let
lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; });
agda = withPackages [] // {
inherit withPackages;
passthru.tests.allPackages = withPackages (lib.filter (pkg: self.lib.isUnbrokenAgdaPackage pkg) (lib.attrValues self));
};
agda = withPackages [];
standard-library = callPackage ../development/libraries/agda/standard-library {
inherit (pkgs.haskellPackages) ghcWithPackages;