Author: eelco
Date: Wed Feb 2 16:05:18 2011
New Revision: 25765
URL: https://svn.nixos.org/websvn/nix/?rev=25765&sc=1
Log:
* Updated iputils (though perhaps we should just use GNU inetutils).
Deleted:
nixpkgs/trunk/pkgs/os-specific/linux/iputils/builder.sh
nixpkgs/trunk/pkgs/os-specific/linux/iputils/open-max.patch
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/iputils/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/sysfsutils/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/iputils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/iputils/default.nix Wed Feb 2
15:30:30 2011 (r25764)
+++ nixpkgs/trunk/pkgs/os-specific/linux/iputils/default.nix Wed Feb 2
16:05:18 2011 (r25765)
@@ -1,15 +1,29 @@
-{stdenv, fetchurl, linuxHeaders, glibc}:
+{ stdenv, fetchurl, libsysfs, openssl }:
-assert stdenv.isLinux && stdenv.system != "powerpc-linux";
+assert stdenv ? glibc;
stdenv.mkDerivation {
- name = "iputils-20020927";
- builder = ./builder.sh;
+ name = "iputils-20101006";
+
src = fetchurl {
- url =
ftp://ftp.nl.debian.org/debian/pool/main/i/iputils/iputils_20020927.orig.tar.gz;
- md5 = "b5493f7a2997130a4f86c486c9993b86";
+ url = http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2;
+ sha256 = "1rvfvdnmzlmgy9a6xv5v4n785zmn10v2l7yaq83rdfgbh1ng8fpx";
};
- inherit linuxHeaders glibc;
- patches = [ ./open-max.patch ];
+ buildInputs = [ libsysfs openssl ];
+
+ # Urgh, it uses Make's `-l' dependency "feature".
+ makeFlags = "VPATH=${libsysfs}/lib:${stdenv.glibc}/lib:${openssl}/lib";
+
+ installPhase =
+ ''
+ mkdir -p $out/sbin
+ cp -p arping ping ping6 rdisc tracepath tracepath6 traceroute6 $out/sbin/
+ '';
+
+ meta = {
+ homepage = http://www.skbuff.net/iputils/;
+ description = "A set of small useful utilities for Linux networking";
+ platforms = stdenv.lib.platforms.linux;
+ };
}
Modified: nixpkgs/trunk/pkgs/os-specific/linux/sysfsutils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/sysfsutils/default.nix Wed Feb 2
15:30:30 2011 (r25764)
+++ nixpkgs/trunk/pkgs/os-specific/linux/sysfsutils/default.nix Wed Feb 2
16:05:18 2011 (r25765)
@@ -1,4 +1,5 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
+
stdenv.mkDerivation rec {
name = "sysfsutils-2.1.0";
@@ -9,11 +10,12 @@
meta = {
homepage = http://linux-diag.sourceforge.net/Sysfsutils.html;
- longDescription = "
- These are a set of utilites built upon sysfs, a new virtual
- filesystem in Linux kernel versions 2.5+ that exposes a system's
- device tree.
- ";
+ longDescription =
+ ''
+ These are a set of utilites built upon sysfs, a new virtual
+ filesystem in Linux kernel versions 2.5+ that exposes a system's
+ device tree.
+ '';
license = "GPL-v2 / LGPL-v2.1";
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Feb 2 15:30:30
2011 (r25764)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Feb 2 16:05:18
2011 (r25765)
@@ -4738,12 +4738,7 @@
iproute = callPackage ../os-specific/linux/iproute { };
- iputils = (
- import ../os-specific/linux/iputils {
- inherit fetchurl stdenv;
- glibc = stdenv.gcc.libc;
- linuxHeaders = stdenv.gcc.libc.kernelHeaders;
- });
+ iputils = callPackage ../os-specific/linux/iputils { };
iptables = callPackage ../os-specific/linux/iptables { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
