public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix signature mismatch

Browse Source 
svn path=/nixpkgs/trunk/; revision=17313
This commit is contained in:
Michael Raskin 2009-09-20 20:37:41 +00:00
parent b13ead6f28
commit cde0f366c2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/top-level/guile-2-test.nix
View File

@ -6,8 +6,9 @@
let let
allPackages = import ./all-packages.nix; allPackages = import ./all-packages.nix;
pkgs = let orig = (allPackages {}); in pkgsFun = {system ? builtins.currentSystem}: let orig = (allPackages {inherit system;}); in
orig // { __overrides = { guile = orig.guile_1_9; }; }; orig // { __overrides = { guile = orig.guile_1_9; }; };
pkgs = pkgsFun {};
toJob = x: if builtins.isAttrs x then x else toJob = x: if builtins.isAttrs x then x else
{ type = "job"; systems = x; schedulingPriority = 10; }; { type = "job"; systems = x; schedulingPriority = 10; };
@ -18,7 +19,7 @@ let
for the platform in question. */ for the platform in question. */
testOn = systems: f: {system ? builtins.currentSystem}: testOn = systems: f: {system ? builtins.currentSystem}:
if pkgs.lib.elem system systems if pkgs.lib.elem system systems
then f (pkgs {inherit system;}) then f (pkgsFun {inherit system;})
else {}; else {};
/* Map an attribute of the form `foo = [platforms...]' to `testOn /* Map an attribute of the form `foo = [platforms...]' to `testOn