diff options
| author | Shea Levy <shea@shealevy.com> | 2014-01-04 20:57:21 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-01-04 21:17:04 -0500 |
| commit | a589bfae17b66af41794dc3eca1245aa514d6cac (patch) | |
| tree | ad0d19073fe2e67926d3339e3a9eebfb26aa2a05 /pkgs/os-specific/linux/netatop | |
| parent | 6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10 (diff) | |
| download | nixpkgs-a589bfae17b66af41794dc3eca1245aa514d6cac.tar nixpkgs-a589bfae17b66af41794dc3eca1245aa514d6cac.tar.gz nixpkgs-a589bfae17b66af41794dc3eca1245aa514d6cac.tar.bz2 nixpkgs-a589bfae17b66af41794dc3eca1245aa514d6cac.tar.lz nixpkgs-a589bfae17b66af41794dc3eca1245aa514d6cac.tar.xz nixpkgs-a589bfae17b66af41794dc3eca1245aa514d6cac.tar.zst nixpkgs-a589bfae17b66af41794dc3eca1245aa514d6cac.zip | |
Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from linuxPackagesFor) to kernel.dev. Some packages needed more work (though whether that was because of my changes or because they were already broken, I'm not sure). Specifics: * psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that were already there * blcr builds on 3.4 but not 3.10, as noted in comments that were already there * open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on 3.4 or 3.10 on this branch or on master, so they're marked broken * A version-specific kernelHeaders package was added The following packages were removed: * atheros/madwifi is superceded by official ath*k modules * aufs is no longer used by any of our kernels * broadcom-sta v6 (which was already packaged) replaces broadcom-sta * exmap has not been updated since 2011 and doesn't build * iscis-target has not been updated since 2010 and doesn't build * iwlwifi is part of mainline now and doesn't build * nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build Everything not specifically mentioned above builds successfully on 3.10. I haven't yet tested on 3.4, but will before opening a pull request. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/os-specific/linux/netatop')
| -rw-r--r-- | pkgs/os-specific/linux/netatop/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 9a34c503f6d..a863ee8a4d0 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, kernelDev, zlib }: +{ stdenv, fetchurl, kernel, zlib }: stdenv.mkDerivation { - name = "netatop-${kernelDev.version}-0.3"; + name = "netatop-${kernel.version}-0.3"; src = fetchurl { url = http://www.atoptool.nl/download/netatop-0.3.tar.gz; @@ -12,9 +12,9 @@ stdenv.mkDerivation { preConfigure = '' patchShebangs mkversion - sed -i -e 's,^KERNDIR.*,KERNDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build,' \ + sed -i -e 's,^KERNDIR.*,KERNDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,' \ */Makefile - sed -i -e 's,/lib/modules.*extra,'$out'/lib/modules/${kernelDev.modDirVersion}/extra,' \ + sed -i -e 's,/lib/modules.*extra,'$out'/lib/modules/${kernel.modDirVersion}/extra,' \ -e s,/usr,$out, \ -e /init.d/d \ -e /depmod/d \ @@ -23,7 +23,7 @@ stdenv.mkDerivation { preInstall = '' ensureDir $out/bin $out/sbin $out/share/man/man{4,8} - ensureDir $out/lib/modules/${kernelDev.modDirVersion}/extra + ensureDir $out/lib/modules/${kernel.modDirVersion}/extra ''; meta = { |