Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fd85e86232e3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b7bf29993b59
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 6, 2020

  1. iproute: Simplify and improve the expression

    @primeos
    primeos committed Apr 6, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aa46e1a View commit details

  2. iproute: Build the netem tools 

    They will be installed now and we can provide $HOSTCC for
cross-compilation.

New files:
+lib/tc/experimental.dist
+lib/tc/normal.dist
+lib/tc/pareto.dist
+lib/tc/paretonormal.dist

Note: The distributions are generated in a reproducible way.

Co-Authored-By: Benjamin Saunders <ben.e.saunders@gmail.com>
    @primeos @Ralith
    primeos and Ralith committed Apr 6, 2020
    Copy the full SHA
    94f2a76 View commit details

Commits on Apr 8, 2020

  1. Merge pull request #82298 from Ralith/netem 

    iproute: include netem tools
    @primeos
    primeos authored Apr 8, 2020
    Copy the full SHA
    b7bf299 View commit details
Showing with 9 additions and 14 deletions.
  1. +9 −14 pkgs/os-specific/linux/iproute/default.nix
23 changes: 9 additions & 14 deletions pkgs/os-specific/linux/iproute/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf, libmnl }:
{ stdenv, fetchurl
, buildPackages, bison, flex, pkg-config
, db, iptables, libelf, libmnl
}:

stdenv.mkDerivation rec {
pname = "iproute2";
@@ -10,20 +13,15 @@ stdenv.mkDerivation rec {
};

preConfigure = ''
patchShebangs ./configure
# Don't try to create /var/lib/arpd:
sed -e '/ARPDDIR/d' -i Makefile
# Don't build netem tools--they're not installed and require HOSTCC
substituteInPlace Makefile --replace " netem " " "
'';

outputs = [ "out" "dev" ];

makeFlags = [
"DESTDIR="
"LIBDIR=$(out)/lib"
"PREFIX=$(out)"
"SBINDIR=$(out)/sbin"
"MANDIR=$(out)/share/man"
"BASH_COMPDIR=$(out)/share/bash-completion/completions"
"DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs
"HDRDIR=$(dev)/include/iproute2"
];
@@ -36,17 +34,14 @@ stdenv.mkDerivation rec {
"CONFDIR=$(out)/etc/iproute2"
];

depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC
nativeBuildInputs = [ bison flex pkg-config ];
buildInputs = [ db iptables libelf libmnl ];
nativeBuildInputs = [ bison flex pkgconfig ];

enableParallelBuilding = true;

postInstall = ''
PATH=${bash}/bin:$PATH patchShebangs $out/sbin
'';

meta = with stdenv.lib; {
homepage = https://wiki.linuxfoundation.org/networking/iproute2;
homepage = "https://wiki.linuxfoundation.org/networking/iproute2";
description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";
platforms = platforms.linux;
license = licenses.gpl2;