Commit Graph

48093 Commits

Author SHA1 Message Date
Vladimír Čunát
fccf486762 libav: maintenance+security update
CVE-2013-{0848,3672,3674,7020} and CVE-2014-{2098,2263}
2014-08-30 10:17:40 +02:00
Vladimír Čunát
e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Vladimír Čunát
a283bec71c glibc: fix CVE-2014-5119 by Debian patch 2014-08-30 09:44:07 +02:00
Mateusz Kowalczyk
60902b97fe ed: update to 1.10 (close #3852) 2014-08-29 13:58:51 +02:00
Gergely Risko
dd3f3bdcc2 GCC >= 4.8 doesn't depend on ppl 2014-08-29 11:45:22 +02:00
Austin Seipp
4e0d2706f1 Merge pull request #3846 from copumpkin/kernel317
Disable NFC on 3.17 or above
2014-08-29 00:51:34 -05:00
Daniel Peebles
0bb14e4fea Disable NFC on 3.17 or above
This should only be temporary, but there's a bug in the 3.17 rc1 and rc2 that leads to cyclic module dependencies and a segfault during the build process.
2014-08-29 01:49:32 -04:00
aszlig
e0e65cbf8e
nixos/users-groups: Fix eval on missing uid/gid.
This hopefully fixes a regression introduced by 08b214a.

In bf129a2, it was already fixed for normal uid/gid values and it got
reintroduced by sub-uid/gid-handling again, so I've refactored it a bit
into a filterNull function which takes care of also the filtering
introduced by bf129a2.

I have not tested this extensively, but master is already broken for
systems with `mutableUsers = true` and no uid values set.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-29 07:17:19 +02:00
Austin Seipp
fe287a2601 Merge pull request #3845 from copumpkin/kernel317
Add patch to fix 3.17 build breakage
2014-08-28 22:38:22 -05:00
Daniel Peebles
1eb08ee693 Add patch to fix 3.17 build breakage (also submitted to lkml, but not yet merged) 2014-08-28 22:45:32 -04:00
Michael Raskin
844fd2553e Merge pull request #3745 from wkennington/master.dnsmasq
dnsmasq: Update and enable dbus support
2014-08-29 01:43:41 +04:00
Michael Raskin
669969064a Merge pull request #3527 from AndersonTorres/mpv
MPV: update to 0.5.0
2014-08-29 01:41:22 +04:00
Michael Raskin
e8badf3c3b Merge pull request #3275 from taku0/gtk-env
uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt
2014-08-29 01:35:38 +04:00
Michael Raskin
b6bc65ab23 Merge pull request #3805 from iyzsong/anthy
add anthy, Japanese input method
2014-08-29 01:30:58 +04:00
Michael Raskin
5f91365a21 Merge pull request #3813 from AndersonTorres/lilyterm
Lilyterm: New Package (version 0.9.9.4)
2014-08-29 01:30:35 +04:00
Michael Raskin
50b0fd46fb Merge pull request #3817 from bodil/master
Add evilvte package.
2014-08-29 01:29:23 +04:00
Michael Raskin
601a48732e Merge pull request #3820 from ruediger/up/gimp
gimp: Update to 2.8.14.
2014-08-29 01:27:32 +04:00
Michael Raskin
fdfaa7bac4 Merge pull request #3826 from ruediger/up/parallel
parallel: Update to 20140822.
2014-08-29 01:26:26 +04:00
Michael Raskin
6ef40555a2 Merge pull request #3830 from madjar/master
rabbitmq-server: updated to 3.3.5
2014-08-29 01:26:05 +04:00
Michael Raskin
917f93db11 Merge pull request #3834 from ruediger/up/lightning
lightning: Update to 2.0.5.
2014-08-29 01:24:57 +04:00
Michael Raskin
822ce487a2 Merge pull request #3836 from aristidb/master
update virtualbox to 4.3.14
2014-08-29 01:24:11 +04:00
Michael Raskin
469f22d717 Merge pull request #2449 from wkennington/master.grub
Grub Update
2014-08-29 01:22:47 +04:00
Michael Raskin
0078bc5d8f Merge pull request #3316 from aherrmann/pr_mpi
MPI support for HDF5 and SGE support for OpenMPI
2014-08-29 01:22:02 +04:00
Michael Raskin
121050046d Adding flashrom BIOS update utility. Patch by Edward O'Callaghan 2014-08-29 01:27:28 +04:00
Michael Raskin
c7bb162710 Factor out the maintainer 2014-08-29 01:19:24 +04:00
Michael Raskin
ef974b1c24 Merge pull request #3175 from doublec/self
Add Self programming language
2014-08-29 01:09:47 +04:00
Michael Raskin
c42e7dfc0c Merge pull request #3200 from wkennington/master.dhcpcd
nixos/dhcpcd: Add an explicit interfaces option
2014-08-29 01:09:22 +04:00
Michael Raskin
d87b867a24 Merge pull request #3225 from hrdinka/move-glibc-multi
glibc_multi: move glibc_multi script out of all-packages.nix
2014-08-29 01:08:04 +04:00
Michael Raskin
f25709c48a List NCSA license properly 2014-08-29 01:14:10 +04:00
Michael Raskin
55cc5736a9 Merge pull request #3255 from bosu/emscripten2
Add emscripten: LLVM to JavaScript compiler (take 2)
2014-08-29 01:04:26 +04:00
Michael Raskin
1fd14fa415 Merge pull request #3100 from tailhook/new-shadow
Upgrade "shadow" to 4.2.1
2014-08-29 00:42:57 +04:00
Michael Raskin
0036f4d792 Merge pull request #3047 from chrisfarms/freetds
Simple nixos module to enable configuration of freetds
2014-08-29 00:38:23 +04:00
William A. Kennington III
0fdbc44411 grub: Fix typo 2014-08-28 13:36:41 -07:00
William A. Kennington III
cf7f7a5107 nixos/install-grub: Check /boot against /nix/store instead of /nix 2014-08-28 13:35:37 -07:00
William A. Kennington III
36a47733a2 nixos-generate-config: Detect btrfs subvolumes 2014-08-28 13:35:37 -07:00
William A. Kennington III
babcd70c36 nixos/release-combined: Add required installer tests 2014-08-28 13:35:37 -07:00
William A. Kennington III
dd18e67cfb grub: Cleanup efi support 2014-08-28 13:35:37 -07:00
William A. Kennington III
2ea1433b77 grub: Fetch from alpha.gnu.org instead of git 2014-08-28 13:35:36 -07:00
William A. Kennington III
940c57e4e8 nixos/ova: Grub uuid detection is broken when generating the ova 2014-08-28 13:35:36 -07:00
William A. Kennington III
0f6079d999 nixos/grub: Fix spacing and correct subvolume detection 2014-08-28 13:35:36 -07:00
William A. Kennington III
cc62623b37 tests/installer: Provided test should add symlinks to /dev/disk if udev doesn't 2014-08-28 13:35:36 -07:00
William A. Kennington III
4f096c044f nixos/grub: Simplify detection of labels / uuids for provided device names 2014-08-28 13:35:36 -07:00
William A. Kennington III
c02bc3a9de nixos/grub: Fix regex for getting subvolume name in btrfs 2014-08-28 13:35:36 -07:00
William A. Kennington III
6549bcff96 tests/installer: Fix provided test uuid and label mounts 2014-08-28 13:35:36 -07:00
William A. Kennington III
b651097d19 tests/installer: Swapspace should be larger 2014-08-28 13:35:36 -07:00
William A. Kennington III
7264941a46 tests/installer: Remove unneeded tests 2014-08-28 13:35:36 -07:00
William A. Kennington III
3bf22679b3 nixos/grub: Kernels don't need to be copied if we can read the nix store 2014-08-28 13:35:36 -07:00
William A. Kennington III
87d5e457fe nixos/grub: Grub detection is much simpler using subvol show 2014-08-28 13:35:36 -07:00
William A. Kennington III
429f785135 tests/installer: Fix simple tests 2014-08-28 13:35:36 -07:00
William A. Kennington III
8ff4b3b780 tests/installer: Add swap to the new tests 2014-08-28 13:35:36 -07:00