Temporarily removing by-meta build and updating Nix..
svn path=/nixpkgs/trunk/; revision=16884
This commit is contained in:
parent
d109e4cd95
commit
d0443c07fc
@ -5,11 +5,11 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "nix-0.13pre16562";
|
name = "nix-0.13pre16857";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://hydra.nixos.org/build/55767/download/4/${name}.tar.bz2";
|
url = "http://hydra.nixos.org/build/64096/download/4/${name}.tar.bz2";
|
||||||
sha256 = "c82b8b81f624b73487b5c638b7a6b0ce3b714a748495f1f722042b26dfb8a474";
|
sha256 = "1aa2xdnl8aajhx2q59bhf6kkpq16dj7lqccz51knk9gq0cqbgz4j";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [perl curl openssl];
|
buildInputs = [perl curl openssl];
|
||||||
|
@ -33,7 +33,7 @@ let
|
|||||||
(pkgs.lib.getAttrFromPath path pkgs);
|
(pkgs.lib.getAttrFromPath path pkgs);
|
||||||
in testOn job.systems getPkg);
|
in testOn job.systems getPkg);
|
||||||
|
|
||||||
selectMaintained = attrSet: let
|
/* selectMaintained = attrSet: let
|
||||||
pairs = pkgs.lib.concatMap
|
pairs = pkgs.lib.concatMap
|
||||||
(x: let val = builtins.tryEval (processPackage (builtins.getAttr x attrSet)); in
|
(x: let val = builtins.tryEval (processPackage (builtins.getAttr x attrSet)); in
|
||||||
if val.success && val.value != [] then [{name=x; value=val.value;}] else [])
|
if val.success && val.value != [] then [{name=x; value=val.value;}] else [])
|
||||||
@ -48,7 +48,7 @@ let
|
|||||||
if attrSet.meta.maintainers != [] then
|
if attrSet.meta.maintainers != [] then
|
||||||
attrSet.meta.platforms
|
attrSet.meta.platforms
|
||||||
else
|
else
|
||||||
[];
|
[]; */
|
||||||
|
|
||||||
/* Common platform groups on which to test packages. */
|
/* Common platform groups on which to test packages. */
|
||||||
inherit (pkgs.lib.platforms) linux darwin cygwin allBut all;
|
inherit (pkgs.lib.platforms) linux darwin cygwin allBut all;
|
||||||
@ -62,7 +62,7 @@ in {
|
|||||||
|
|
||||||
tarball = import ./make-tarball.nix;
|
tarball = import ./make-tarball.nix;
|
||||||
|
|
||||||
} // (mapTestOn ((selectMaintained pkgs) // rec {
|
} // (mapTestOn (/*(selectMaintained pkgs) // */ rec {
|
||||||
|
|
||||||
MPlayer = linux;
|
MPlayer = linux;
|
||||||
abcde = linux;
|
abcde = linux;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user