alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

agda: fix passthru

Browse source 
The current `//` override to `agda.passthru.tests` is non-recursive so
it destroys everything else under `passthru`, and furthermore does not
go through `mkDerivation` so that we end up with different values for
`agda.tests` and `agda.passthru.tests`.

Fix it by moving the `allPackages` test to the definition of
`withPackages`.
This commit is contained in:
Naïm Favier 2023-02-12 14:44:16 +01:00
parent c2166eea48
commit 65e774e2a4
No known key found for this signature in database
GPG key ID: 95AFCE8211908325
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/agda/default.nix
View file

@ -20,7 +20,11 @@ let
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
passthru = { passthru = {
unwrapped = Agda; 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; inherit (Agda) meta;
} '' } ''

9
pkgs/top-level/agda-packages.nix
View file

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