8 commits

Author	SHA1	Message	Date
Franz Pletz	bcd31489a1	netatop: 0.3 -> 0.7	2016-01-07 16:25:02 +01:00
Domen Kožar	2e8c67d300	kernelPackages_3_17.{netatop,betman-adv}: disable	2014-10-10 21:35:26 +02:00
Peter Simons	2d326e5032	Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix	2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk	7a45996233	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
Eelco Dolstra	40f7b0f9df	Another attempt to eradicate ensureDir ... See c556a6ea46.	2014-06-30 14:56:10 +02:00
Shea Levy	a589bfae17	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>	2014-01-04 21:17:04 -05:00
Lluís Batlle i Rossell	1f2ecd08cc	Updating netatop to 0.3 (linux 3.10)	2013-08-13 09:55:49 +02:00
Lluís Batlle i Rossell	8b79a00c44	Adding netatop module, for atop	2013-05-20 10:13:07 +02:00