diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/ifplugd/default.nix | 16 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release-small.nix | 1 |
4 files changed, 3 insertions, 22 deletions
diff --git a/pkgs/os-specific/linux/ifplugd/default.nix b/pkgs/os-specific/linux/ifplugd/default.nix deleted file mode 100644 index 2d9ff16c8ad..00000000000 --- a/pkgs/os-specific/linux/ifplugd/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libdaemon}: - -stdenv.mkDerivation { - name = "ifplugd-0.28"; - src = fetchurl { - url = http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz; - sha256 = "1w21cpyzkr7igp6vsf4a0jwp2b0axs3kwjiapy676bdk9an58is7"; - }; - buildInputs = [pkgconfig libdaemon]; - configureFlags = "--with-initdir=$out/etc/init.d --disable-lynx"; - patches = [ - # From http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch?rev=1.1. - ./interface.patch - ]; - patchFlags = "-p0"; -} diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4b5cd20e831..9b0ec5c355a 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5-rc5"; - modDirVersion = "4.5.0-rc5"; + version = "4.5-rc6"; + modDirVersion = "4.5.0-rc6"; extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "06qlypnrlkckxhf3clq6l2d3kps7rwfw811sxapjbnhzjd75fcx8"; + sha256 = "1cpbg6w0mzlxrc6crgqh5n4c8wxxr4yyikmk0bkpgsbr6qk3bydk"; }; features.iwlwifi = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c971f3157b9..cb592d252df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10242,8 +10242,6 @@ let i7z = callPackage ../os-specific/linux/i7z { }; - ifplugd = callPackage ../os-specific/linux/ifplugd { }; - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { }; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 01786591973..fbfa4903b45 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -71,7 +71,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; iana_etc = linux; icewm = linux; idutils = all; - ifplugd = linux; inetutils = linux; iputils = linux; jnettop = linux; |