Merge pull request #215990 from ncfavier/agda-tests

agda: fix passthru

authored by

Naïm Favier and committed by
GitHub
5de1815b 4bfb6411

+8 -7
+5 -1
pkgs/build-support/agda/default.nix
··· 20 nativeBuildInputs = [ makeWrapper ]; 21 passthru = { 22 unwrapped = Agda; 23 - tests = { inherit (nixosTests) agda; }; 24 }; 25 inherit (Agda) meta; 26 } ''
··· 20 nativeBuildInputs = [ makeWrapper ]; 21 passthru = { 22 unwrapped = Agda; 23 + inherit withPackages; 24 + tests = { 25 + inherit (nixosTests) agda; 26 + allPackages = withPackages (lib.filter self.lib.isUnbrokenAgdaPackage (lib.attrValues self)); 27 + }; 28 }; 29 inherit (Agda) meta; 30 } ''
+3 -6
pkgs/top-level/agda-packages.nix
··· 1 - { pkgs, lib, callPackage, newScope, Agda }: 2 3 let 4 mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); 5 mkAgdaPackages' = Agda: self: let 6 - callPackage = self.callPackage; 7 inherit (callPackage ../build-support/agda { 8 inherit Agda self; 9 inherit (pkgs.haskellPackages) ghcWithPackages; ··· 13 14 lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); 15 16 - agda = withPackages [] // { 17 - inherit withPackages; 18 - passthru.tests.allPackages = withPackages (lib.filter (pkg: self.lib.isUnbrokenAgdaPackage pkg) (lib.attrValues self)); 19 - }; 20 21 standard-library = callPackage ../development/libraries/agda/standard-library { 22 inherit (pkgs.haskellPackages) ghcWithPackages;
··· 1 + { pkgs, lib, newScope, Agda }: 2 3 let 4 mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); 5 mkAgdaPackages' = Agda: self: let 6 + inherit (self) callPackage; 7 inherit (callPackage ../build-support/agda { 8 inherit Agda self; 9 inherit (pkgs.haskellPackages) ghcWithPackages; ··· 13 14 lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); 15 16 + agda = withPackages []; 17 18 standard-library = callPackage ../development/libraries/agda/standard-library { 19 inherit (pkgs.haskellPackages) ghcWithPackages;