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

Merged with trunk again

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
This commit is contained in:
Yury G. Kudryashov
2008-01-23 18:11:03 +00:00
parent 4de89f61b0
commit da57804fff
109 changed files with 1394 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/system/gdmap/0.7.5.nix
View File

@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://dfn.dl.sourceforge.net/sourceforge/gdmap/gdmap-0.7.5.tar.gz;
@@ -9,10 +9,11 @@ args : with args;
buildInputs = [gtk pkgconfig libxml2 intltool];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "gdmap"+version;
builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Recursive rectangle map of disk usage.

10
pkgs/tools/system/pciutils/default.nix
View File

@@ -1,16 +1,16 @@
{stdenv, fetchurl, zlib}:
stdenv.mkDerivation {
name = "pciutils-2.2.5";
name = "pciutils-2.2.8";
builder = ./builder.sh;
src = fetchurl {
url = mirror://kernel/software/utils/pciutils/pciutils-2.2.5.tar.bz2;
sha256 = "1zlamdax1i8cf3kvzg7dh7nshvvzlhvkwlxdmym0hbnmbf0p100p";
url = mirror://kernel/software/utils/pciutils/pciutils-2.2.8.tar.bz2;
sha256 = "0hgri2ancnjl56ld2flb9w606dyvr5gly8gsz3bzl71r8s464qsq";
};
buildInputs = [zlib];
pciids = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/pci.ids.20070226.bz2;
sha256 = "1wrpq4dxm03v5jvvdlvwl8nrkj3hspgifkw5czmd647lzikp13qc";
url = http://nix.cs.uu.nl/dist/tarballs/pci.ids.20080118.bz2;
sha256 = "0dl6psdac62llbklxn4dvkzbw1j1sdadw9i4l36vpd6mvqa7lz0a";
};
}

14
pkgs/tools/system/which/default.nix
View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
name = "which-2.17";
args: with args;
stdenv.mkDerivation {
name = "which-2.19";
src = fetchurl {
url = http://ftp.gnu.org/gnu/which/which-2.17.tar.gz;
sha256 = "1nnnbn83da8481blmcyv96gm15ccsilr93fmgmwdlzj8a72fjvqp";
url = mirror://gnu/which/which-2.19.tar.gz;
sha256 = "0lnd8mfpc0r1r2ch54vl3vc6r0fnzfl33sqdda2aq62iyrsbhybx";
};
buildInputs = [readline];
}