* Merged from the trunk. Let's see how well this works with

Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
This commit is contained in:
Eelco Dolstra
2008-12-10 09:59:21 +00:00
331 changed files with 14072 additions and 1377 deletions
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "man-pages-3.05";
stdenv.mkDerivation rec {
name = "man-pages-3.11";
src = fetchurl {
url = mirror://kernel/linux/docs/man-pages/man-pages-3.05.tar.bz2;
sha256 = "08c48w41qjmv37g0fqcr1ky2y2mfnxqn55jxay079qrj5vxraink";
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.bz2";
sha256 = "1pl3jdp7vh6vl2drqdal3ggdc22icdgfkfbswh21k8jlcxf00dn8";
};
preBuild = "
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
meta = {
description = "Linux development manual pages";
homepage = ftp://ftp.win.tue.nl/pub/linux-local/manpages/;
homepage = http://kernel.org/pub/linux/docs/manpages/;
};
}
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "bakoma-ttf";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/bakoma-ttf.tar.bz2;
url = http://nixos.org/tarballs/bakoma-ttf.tar.bz2;
sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
};
+1 -1
View File
@@ -1,5 +1,5 @@
args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec {
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz;
+1 -1
View File
@@ -1,5 +1,5 @@
args : with args;
let localDefs = builderDefs.meta.function {
let localDefs = builderDefs.passthru.function {
src =""; /* put a fetchurl here */
buildInputs = [mkfontdir mkfontscale ttmkfdir];
configureFlags = [];
+1 -1
View File
@@ -1,5 +1,5 @@
args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec {
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
+1 -1
View File
@@ -1,5 +1,5 @@
args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec {
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;