Lluís Batlle i Rossell
719ba63004
Merge branch 'stdenv-updates' into pi-stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.6/default.nix
pkgs/development/compilers/gcc/4.7/default.nix
The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Eelco Dolstra
88b11196c1
Clean up redundant "if condition then true else false"
2012-12-28 19:57:47 +01:00
Eelco Dolstra
84779a6f7d
Remove unnecessary parentheses around if conditions
...
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
e2d505b24e
More renames
2012-12-28 19:42:10 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
...
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell
ab2520c383
Adding linux-3.6-rpi
...
I picked the change from
7b4d69eeff
2012-12-27 21:29:56 +00:00
Lluís Batlle i Rossell
03cadda7ea
v4l-utils: updating. They didn't build in the new stdenv.
2012-12-21 11:58:31 +01:00
Eelco Dolstra
f364619e22
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-12 17:01:20 +01:00
Shea Levy
9ddd1cc78b
Linux 3.7
...
Kernel configuration succeeds, I'll let hydra test the build
2012-12-11 11:57:04 -05:00
Rickard Nilsson
6d8109555e
Add legacy version 304.64 of the Nvidia driver
...
The current 310.x version of the Nivida driver has dropped support
for some cards (for example 6200LE).
2012-12-11 11:33:40 +01:00
Shea Levy
ce5ba30f64
Linux 3.6.10
2012-12-10 19:26:36 -05:00
Shea Levy
ed994dcbe2
Linux 3.4.23
2012-12-10 19:26:20 -05:00
Shea Levy
81a856c878
Linux 3.0.56
2012-12-10 19:25:00 -05:00
Eelco Dolstra
88ca46bfa0
linux: Update to 3.2
2012-12-07 13:24:40 +01:00
Jack Cummings
462b2b5d7f
ztest: fix hardcoded paths
2012-12-04 14:08:34 -08:00
Eelco Dolstra
5e256ccc88
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-04 17:12:35 +01:00
Mathijs Kwik
fe070086fb
linux-3.6: upgrade to 3.6.9
2012-12-04 12:02:36 +01:00
Mathijs Kwik
38740214cb
linux-3.4: upgrade to 3.4.21
2012-12-04 12:02:36 +01:00
Mathijs Kwik
47362f67ea
linux-3.0: upgrade to 3.0.54
2012-12-04 12:02:36 +01:00
Michael Raskin
51bf29de63
Upstream tracking files for asymptote and fbterm
2012-12-04 14:55:19 +04:00
Michael Raskin
2ab2b27e93
Update FBTerm to current URL of tarball
2012-12-04 11:47:40 +04:00
aszlig
9938f5267a
alsa-plugins: Update to upstream version 1.0.26.
...
Add alsa.cybermirror.org as an alternative URL because at the time of this
commit, ftp.alsa-project.org wasn't available.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-03 11:10:17 +01:00
Eelco Dolstra
2122adcdd1
systemd: Update to 196
...
Main change is that systemd now has its own PCI/USB IDs database, so
it no longer depends on pciutils/usbutils.
2012-11-29 18:50:07 +01:00
Eelco Dolstra
59e979177d
Remove duplicate tcp-wrappers package
2012-11-29 15:26:13 +01:00
Eelco Dolstra
79725bb5bc
Mark some packages as low priority and disambiguate some others
2012-11-29 15:26:13 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Jack Cummings
4775e71049
Need pthread_cancel for zdb to work properly. Add -lgcc_s.
2012-11-26 21:32:24 -08:00
Shea Levy
9b0879bf85
Linux 3.6.8
2012-11-26 15:42:07 -05:00
Shea Levy
d4d1100123
Linux 3.4.20
2012-11-26 15:41:55 -05:00
Shea Levy
1180478089
Linux 3.0.53
2012-11-26 15:37:06 -05:00
Eelco Dolstra
e31cd88d9e
nvidia-x11: Update to 310.19
2012-11-23 11:11:01 +01:00
Peter Simons
15e2bf6050
busybox: fix build by adding a missing <sys/resource.h> include
...
This patch is going to be in the next release: http://lists.busybox.net/pipermail/busybox/2012-May/077766.html
2012-11-21 16:31:32 +01:00
Peter Simons
f67d5a9a39
Merge branch 'master' into stdenv-updates.
...
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons
c5f9242cb6
iwlwifi-6000g2a-ucode: update to version 18.168.6.1
2012-11-18 13:20:46 +01:00
Mathijs Kwik
3ee85e3a8d
linux-3.6: upgrade to 3.6.7
2012-11-18 11:13:04 +01:00
Mathijs Kwik
6a46699855
linux-3.4: upgrade to 3.4.19
2012-11-18 11:13:04 +01:00
Mathijs Kwik
0404c409cc
linux-3.2: upgrade to 3.2.34
2012-11-18 11:13:04 +01:00
Mathijs Kwik
d45b239dcc
linux-3.0: upgrade to 3.0.52
2012-11-18 11:13:03 +01:00
Mathijs Kwik
f215bda5b4
linux-2.6.32: upgrade to 2.6.32.60
2012-11-18 11:13:03 +01:00
Cillian de Róiste
3aef242cc0
Update xf86-video-nested to work on current NixOS Xorg
2012-11-17 20:03:34 +01:00
David Guibert
085825bc3c
spl: remove useless patch
2012-11-15 09:13:03 +01:00
David Guibert
2f98255be8
zfs: remove useless patch
2012-11-15 09:02:27 +01:00
David Guibert
87d2a82628
update spl/zfs to 0.6.0-rc12
2012-11-15 08:58:34 +01:00
David Guibert
c604ff045e
add cifs_timeout to kernel 3.5
2012-11-15 07:41:11 +01:00
Jack Cummings
b61ed12ea3
Add missing patch
2012-11-15 07:41:11 +01:00
Jack Cummings
0611a8b223
Linux-3.6 fixes. Need to ./autogen.sh in zfs now, as the linux-3.6 patch adds autoconf macros. Which means that all of my Makefile.in patches need to be puplifted to Makefile.am patches.
2012-11-15 07:41:11 +01:00
Jack Cummings
b999698440
- add back the plaform, as it is permitted to distribute the binary kernel modules. See https://github.com/NixOS/nixpkgs/pull/145
2012-11-15 07:41:11 +01:00
Jack Cummings
2dd60084f8
- updates from the license discussion in https://github.com/NixOS/nixpkgs/pull/145
2012-11-15 07:41:11 +01:00
Jack Cummings
3dbb87ec8e
- make 'platforms' empty to prohibit building on hydra.
2012-11-15 07:41:11 +01:00
