BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Sync with the trunk one last time.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
This commit is contained in:
Eelco Dolstra 2010-02-05 23:06:36 +00:00
commit d8c6bb130c
24 changed files with 96 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/release-notes.xml
View file

@ -5,7 +5,7 @@
<title>Nixpkgs Release Notes</title>
<section><title>Release 0.13 (January NNN, 2010)</title>
<section><title>Release 0.13 (February 5, 2010)</title>
<para>As always, there are many changes. Some of the most important
updates are:

2
maintainers/scripts/copy-tarballs.sh
View file

@ -2,7 +2,7 @@
distDir=/data/webserver/tarballs
urls=$(nix-instantiate --eval-only --xml --strict pkgs/top-level/build-for-release.nix \
urls=$(nix-instantiate --eval-only --xml --strict ./eval-release.nix \
| grep -A2 'name="urls"' \
| grep '<string value=' \
| sed 's/.*"\(.*\)".*/\1/' \

20
maintainers/scripts/eval-release.nix Normal file
View file

@ -0,0 +1,20 @@
# Evaluate `release.nix' like Hydra would (i.e. call each job
# attribute with the expected `system' argument). Too bad
# nix-instantiate can't to do this.
let
lib = (import ../.. {}).lib;
rel = removeAttrs (import ../../pkgs/top-level/release.nix) ["tarball"];
maybe = x: let y = builtins.tryEval x; in if y.success then y.value else null;
call = attrs: lib.flip lib.mapAttrs attrs
(n: v: builtins.trace n (
if builtins.isFunction v then maybe (v { system = "i686-linux"; })
else if builtins.isAttrs v then call v
else null
));
in call rel

4
pkgs/applications/graphics/ImageMagick/default.nix
View file

@ -1,13 +1,13 @@
args: with args;
let version = "6.5.5-6"; in
let version = "6.5.9-1"; in
stdenv.mkDerivation (rec {
name = "ImageMagick-${version}";
src = fetchurl {
url = "mirror://imagemagick/${name}.tar.bz2";
sha256 = "1037nsvfpw7wdgsvvzvi0bn1n5d667d8aj1xam7zgmf7xi6xha3q";
sha256 = "0a4yhhfqagz28yccydngi31050101jfmq5ljln61g69yy6m47ifg";
};
configureFlags = ''

3
pkgs/applications/misc/googleearth/default.nix
View file

@ -68,7 +68,6 @@ stdenv.mkDerivation {
description = "A world sphere viewer";
homepage = http://earth.google.com;
license = "unfree";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
maintainers = [ stdenv.lib.maintainers.viric ];
};
}

2
pkgs/applications/misc/grip/default.nix
View file

@ -15,6 +15,6 @@ stdenv.mkDerivation {
homepage = http://nostatic.org/grip;
license = "GPLv2";
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
#platforms = args.lib.platforms.linux;
};
}

4
pkgs/applications/misc/hello/ex-2/default.nix
View file

@ -1,13 +1,13 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "hello-2.3";
name = "hello-2.3x26";
src = fetchurl {
url = mirror://gnu/hello/hello-2.3.tar.bz2;
sha256 = "0c7vijq8y68bpr7g6dh1gny0bff8qq81vnp4ch8pjzvg56wb3js1";
};
meta = {
description = "A program that produces a familiar, friendly greeting";
longDescription = ''

37
pkgs/build-support/fetchurl/mirrors.nix
View file

@ -141,31 +141,12 @@ rec {
http://bitlbee.intergenia.de/
];
# ImageMagick mirrors, see http://www.imagemagick.org/script/download.php .
# ImageMagick mirrors, see http://www.imagemagick.org/script/download.php.
imagemagick = [
ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/
ftp://ftp.carnet.hr/pub/misc/imagemagick/
ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick
http://imagemagick.linux-mirror.org/download
http://image_magick.veidrodis.com/image_magick/
http://imagemagick.oss-mirror.org/download
ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/
ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org
ftp://zoffy.asahi-net.or.jp/pub/graphics/ImageMagick
http://ftp.nluug.nl/pub/ImageMagick
http://ftp.surfnet.nl/pub/ImageMagick/
ftp://sunsite.icm.edu.pl/packages/ImageMagick/
ftp://ftp.chg.ru/packages/ImageMagick
http://ftp.chg.ru/packages/ImageMagick
http://ftp.efair.ru/pub/software/graphics/ImageMagick/
ftp://ftp.efair.ru/pub/software/graphics/ImageMagick/
ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick
http://www.smudge-it.co.uk/pub/imagemagick/
ftp://www.rx-host.net/pub/graphics/ImageMagick
ftp://ftp.fifi.org/pub/ImageMagick/
ftp://ftp.imagemagick.org/pub/ImageMagick
ftp://ftp.imagemagick.net/pub/ImageMagick
http://imagemagick.site2nd.org/imagemagick
http://ftp.nluug.nl/pub/ImageMagick/
ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
ftp://ftp.imagemagick.org/pub/ImageMagick/
ftp://ftp.imagemagick.net/pub/ImageMagick/
];
# CPAN mirrors.
@ -238,14 +219,6 @@ rec {
ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/
];
# Tcpdump (see http://www.tcpdump.org/mirrors.html).
tcpdump = [
ftp://ftp.wiretapped.net/pub/security/packet-capture/tcpdump.org/
ftp://mirror.aarnet.edu.au/pub/tcpdump/
ftp://gd.tuwien.ac.at/infosys/security/tcpdump.org/
ftp://ftp.gwdg.de/pub/misc/tcpdump/
];
# X.org.
xorg = [
http://xorg.freedesktop.org/releases/

6
pkgs/desktops/kde-4.3/extragear/amarok/default.nix
View file

@ -2,10 +2,10 @@
, kdelibs, automoc4, phonon, strigi, soprano, qca2}:
stdenv.mkDerivation {
name = "amarok-2.2.1";
name = "amarok-2.2.2";
src = fetchurl {
url = mirror://kde/stable/amarok/2.2.1/src/amarok-2.2.1.tar.bz2;
sha256 = "020srkfhly2nz3vp2xb5cd02j27r16ygm46z05vpil2csrbv5nzk";
url = mirror://kde/stable/amarok/2.2.2/src/amarok-2.2.2.tar.bz2;
sha256 = "0kg67b9wz2wi1gyn229vzbib4s0wpgqrjyfqy0032yl9fa2k13bn";
};
includeAllQtDirs=true;
inherit mysql loudmouth;

2
pkgs/development/compilers/ghc/6.12.1.nix
View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
inherit homepage;
description = "The Glasgow Haskell Compiler";
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.platforms.linux;
platforms = stdenv.lib.platforms.linux;
};

4
pkgs/development/libraries/glefw/default.nix
View file

@ -1,9 +1,10 @@
args: with args;
stdenv.mkDerivation {
name = "glefw-2.6";
src = fetchurl {
url = http://prdownloads.sourceforge.net/glfw/glfw-2.6.tar.bz2;
url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2;
sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv";
};
@ -13,6 +14,7 @@ stdenv.mkDerivation {
ensureDir $out
make x11-install PREFIX=$out
'';
installPhase=":";
meta = {

9
pkgs/development/libraries/glew/default.nix
View file

@ -1,18 +1,19 @@
args: with args;
stdenv.mkDerivation {
name = "glew-1.5.2";
src = fetchurl {
url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.2.tgz;
url = mirror://sourceforge/glew/glew-1.5.2.tgz;
sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8";
};
buildInputs = [mesa x11 libXmu libXi];
meta = {
description = "cross-platform open-source C/C++ extension loading library";
homepage = http://glew.sourceforge.net/;
license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0
description = "cross-platform open-source C/C++ extension loading library";
homepage = http://glew.sourceforge.net/;
license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0
};
installPhase="GLEW_DEST=\$out make install";

25
pkgs/development/libraries/libpcap/default.nix
View file

@ -1,23 +1,18 @@
{stdenv, fetchurl, flex, bison}:
{ stdenv, fetchurl, flex, bison }:
stdenv.mkDerivation rec {
name = "libpcap-1.0.0";
src = fetchurl {
url = [
"mirror://tcpdump/release/${name}.tar.gz"
"http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"
];
sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
url = "http://www.tcpdump.org/release/${name}.tar.gz";
sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
};
buildInputs = [flex bison];
configureFlags = [
"${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""}"
"--with-pcap=linux"
];
buildInputs = [ flex bison ];
configureFlags = "--with-pcap=linux";
preInstall = ''ensureDir $out/bin'';
patches = if stdenv.system == "i686-linux"
then []
else [ ./libpcap_amd64.patch ];
patches = [ ./libpcap_amd64.patch ];
}

0
pkgs/development/libraries/tk/8.5.7.nix → pkgs/development/libraries/tk/default.nix
View file

10
pkgs/development/tools/misc/lsof/default.nix
View file

@ -1,15 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "lsof-4.81";
name = "lsof-4.83";
src = fetchurl {
urls = [
http://ftp.uni-bayreuth.de/packages/tools/lsof/lsof_4.81.tar.bz2
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.81.tar.bz2
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_4.81.tar.bz2
];
sha256 = "1fcamd8qpczgb3kz9b2rhflbq6lyd3lic4i7xl7n99fx76ha1n19";
url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.83.tar.bz2;
sha256 = "0i7mn4ygmrf0rvxz5vgzhmr8q7bhxrh9h2q7rpip1f9npq5r77xq";
};
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";

7
pkgs/games/jamp/default.nix
View file

@ -24,10 +24,7 @@ rec {
meta = {
description = "A physics-based game";
maintainers = [
a.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
linux ++ darwin;
maintainers = [ a.lib.maintainers.raskin ];
platforms = a.lib.platforms.linux;
};
}

2
pkgs/lib/platforms.nix
View file

@ -11,5 +11,5 @@ rec {
unix = linux ++ darwin ++ freebsd ++ openbsd;
all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
allBut = platform: lists.filter (x: platform != x) all;
mesaPlatforms = linux ++ darwin ++ freebsd;
mesaPlatforms = linux;
}

10
pkgs/tools/networking/tcpdump/default.nix
View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, libpcap}:
{ stdenv, fetchurl, libpcap }:
stdenv.mkDerivation rec {
name = "tcpdump-3.9.4";
name = "tcpdump-4.0.0";
src = fetchurl {
url = "mirror://tcpdump/release/${name}.tar.gz";
sha256 = "1dbknf6ys7n3mmlb6klr0jh0jgnnq3zd9y44kjdxcbmbdjhp1rvy";
url = "http://www.tcpdump.org/release/${name}.tar.gz";
sha256 = "112j0d12l5zsq56akn4n23i98pwblfb7qhblk567ddbl0bz9xsaz";
};
buildInputs = [libpcap];
buildInputs = [ libpcap ];
meta = {
description = "tcpdump, a famous network sniffer";

6
pkgs/tools/package-management/dpkg/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, perl, zlib, bzip2}:
stdenv.mkDerivation {
name = "dpkg-1.14.25";
name = "dpkg-1.14.28";
src = fetchurl {
url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz;
sha256 = "1111r1ijyh149h7vby9vc8137hl9778ja3dln7ilkxhc1y1yjp2l";
url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.28.tar.gz;
sha256 = "1k3h1rv2qd6ha6mpifhjkpasd4dzr8l45jvc49p7fldqm4nzyixc";
};
configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg";

23
pkgs/tools/package-management/nix/default.nix
View file

@ -1,25 +1,24 @@
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
{ stdenv, fetchurl, aterm, perl, curl, bzip2, openssl ? null
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, supportOldDBs ? true
}:
stdenv.mkDerivation rec {
name = "nix-0.13";
name = "nix-0.14";
src = fetchurl {
url = "http://hydra.nixos.org/build/118589/download/4/${name}.tar.bz2";
sha256 = "6da44cacb7185e67dff39a2339c42f9c722081bac0dc593565bd89674beb1f94";
url = "http://hydra.nixos.org/build/281118/download/4/${name}.tar.bz2";
sha256 = "7df3dd52a7a42354e845302665c3e1f67af287f9cca2bda67f8abb724e52c519";
};
buildInputs = [perl curl openssl];
buildInputs = [ perl curl openssl ];
configureFlags = ''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-aterm=${aterm} --with-bzip2=${bzip2}
${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"}
--disable-init-state
'';
configureFlags =
''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-aterm=${aterm} --with-bzip2=${bzip2}
--disable-init-state
'';
doCheck = true;

19
pkgs/top-level/all-packages.nix
View file

@ -4891,7 +4891,7 @@ let
inherit stdenv fetchurl cmake qt4;
};
tk = import ../development/libraries/tk/8.5.7.nix {
tk = import ../development/libraries/tk {
inherit fetchurl stdenv tcl x11;
};
@ -7288,10 +7288,10 @@ let
};
googleearth = import ../applications/misc/googleearth {
inherit stdenv fetchurl glibc mesa freetype zlib glib;
inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes
libXcursor libXinerama libXext libX11;
};
inherit stdenv fetchurl glibc mesa freetype zlib glib;
inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes
libXcursor libXinerama libXext libX11;
};
gpsbabel = import ../applications/misc/gpsbabel {
inherit fetchurl stdenv zlib expat;
@ -8747,8 +8747,8 @@ let
};
foldingathome = import ../misc/foldingathome {
inherit fetchurl stdenv;
};
inherit fetchurl stdenv;
};
freestyle = import ../misc/freestyle {
inherit fetchurl freeglut qt4 libpng lib3ds libQGLViewer swig;
@ -8833,19 +8833,20 @@ let
nix = makeOverridable (import ../tools/package-management/nix) {
inherit fetchurl stdenv perl curl bzip2 openssl;
aterm = aterm242fixes;
db4 = db45;
supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
};
# The bleeding edge.
nixUnstable = nix;
/*
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
inherit fetchurl stdenv perl curl bzip2 openssl;
aterm = aterm242fixes;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
};
*/
nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix {

4
pkgs/top-level/perl-packages.nix
View file

@ -895,10 +895,10 @@ rec {
};
DBIxClassSchemaLoader = buildPerlPackage rec {
name = "DBIx-Class-Schema-Loader-0.04999_14";
name = "DBIx-Class-Schema-Loader-0.05000";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz";
sha256 = "0xswxcc31g6clwxc1d7skpjfpf5i0sw5y7d16n9v4x5vb8hd55dc";
sha256 = "00lwggmwfwi3qbsx9jl5kdi5aszflpiggvksinmsam6sfyfpz2rq";
};
propagatedBuildInputs = [
DBI DBDSQLite DataDump UNIVERSALrequire

2
pkgs/top-level/python-packages.nix
View file

@ -369,7 +369,7 @@ rec {
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
platforms = stdenv.lib.platforms.linux;
};
});

10
pkgs/top-level/release.nix
View file

@ -94,7 +94,7 @@ let
else [];
/* 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 mesaPlatforms;
/* Platform groups for specific kinds of applications. */
x11Supported = linux;
@ -202,7 +202,7 @@ in {
ghostscriptX = linux;
gimp = linux;
git = linux;
gitFull = linux;
#gitFull = linux;
glibc = linux;
glibcLocales = linux;
glxinfo = linux;
@ -293,7 +293,7 @@ in {
mcron = linux;
mdadm = linux;
mercurial = allBut "i686-cygwin";
mesa = linux ++ darwin;
mesa = mesaPlatforms;
midori = linux;
mingetty = linux;
mk = linux;
@ -500,10 +500,6 @@ in {
gtk = linux;
};
haskellPackages_ghc683 = {
ghc = ghcSupported;
};
haskellPackages_ghc6102 = {
ghc = ghcSupported;
};