alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
48295 commits 217 branches 121 tags 4.5 GiB
Commit graph

1399 commits

Author SHA1 Message Date
Longrin Wischnewski 196c6260be grub: fix grub merge error 2014-08-31 12:29:13 +02:00
Rob Vermaas ea8910652f Revert "Merge pull request #3182 from wkennington/master.ipv6" 
This reverts commit b23fd65854, reversing
changes made to 43654cba2c.
 2014-08-31 10:58:54 +02:00
Rob Vermaas 2f697bf693 Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c" 
This reverts commit 704e91bab0.
 2014-08-31 10:58:50 +02:00
Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" 
This reverts commit 469f22d717, reversing
changes made to 0078bc5d8f.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
 2014-08-31 12:58:37 +04:00
Suvash Thapaliya 9073a30cee Add extraConfig option for SLiM 
so that various configuration options can be set without having to
expose every single configurable parameter
 2014-08-31 03:21:37 +02:00
Rickard Nilsson 704e91bab0 Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c 2014-08-30 19:54:37 +02:00
Nicolas B. Pierron a5d6219897 Merge pull request #3864 from nbp/useless-submodules 
Remove useless use of undocumented submodules.
 2014-08-30 18:21:17 +02:00
William A. Kennington III 4d8390be60 nixos/network-interfaces: Support the old ip configuration convention 2014-08-30 08:05:00 -07:00
William A. Kennington III 86c0f8c549 Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes 2014-08-30 07:33:38 -07:00
William A. Kennington III 1ff4b83875 nixos/network-interfaces: Add flush upon interface going down 2014-08-30 07:33:38 -07:00
William A. Kennington III 098c8f4c77 nixos/network-interfaces: Add support for multiple ipv4 / ipv6 addresses 2014-08-30 07:33:38 -07:00
Aristid Breitkreuz 032e93b9ab Merge pull request #3863 from wkennington/master.grubfix 
Fix perl indentation
 2014-08-30 15:11:42 +02:00
Michael Raskin 8937b70d07 Merge pull request #3344 from ehmry/privoxy 
privoxy: upstart to systemd conversion, actions file editing
 2014-08-30 14:19:57 +04:00
William A. Kennington III 7d16a429f0 nixos/install-grub: Fix Indentation 2014-08-29 12:19:13 -07:00
William A. Kennington III 4428178847 nixos/generate-config: Fix indentation 2014-08-29 12:19:13 -07:00
Nicolas Pierron 8c19690d99 Remove useless use of optionSet. 2014-08-29 18:43:03 +02:00
Nicolas Pierron 43e52ef001 Remove useless use of undocumented submodules. 2014-08-29 18:28:34 +02:00
Nicolas B. Pierron 7bc9d59303 Merge pull request #3773 from nbp/nixos-maintainers 
NixOS: Add meta.maintainer option to modules.
 2014-08-29 14:57:20 +02:00
Igor Pashev 019bc6bb2b Made Mediawiki rewrite rules work for virtual hosts 
Related to cdd1785cd6
 2014-08-29 13:56:23 +02:00
Luca Bruno 01f0b1cf1a Fix evaluation of nixos tested 2014-08-29 11:49:36 +02:00
Luca Bruno a34a0dfdc5 Revert "nixos/release: Dynamically generate installer tests" 
This reverts commit 5870ae613f.

It makes it hard to comment out installer tests.
 2014-08-29 11:49:36 +02:00
Rob Vermaas b7a0101578 Merge pull request #3838 from oconnorr/master 
Update create-gce.sh
 2014-08-29 10:08:55 +02: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
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
Russell O'Connor a7ef1a50cb Replace depricated gcutil with gcloude compute in gce/create-gce.sh 2014-08-28 21:42:49 +00:00
Russell O'Connor cef0d1a41b Abstract bucket name in gce/create-gce.sh 2014-08-28 21:41:30 +00: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 469f22d717 Merge pull request #2449 from wkennington/master.grub 
Grub Update
 2014-08-29 01:22: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 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 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 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
William A. Kennington III 8b36bf5c59 tests/installer: fix mount 2014-08-28 13:35:36 -07:00
William A. Kennington III d4a9645ef0 nixos/grub: Needs mount so add utillinux to bin 2014-08-28 13:35:35 -07:00
William A. Kennington III 62fedf6081 installer/btrfs: Typo in subvol 2014-08-28 13:35:35 -07:00
William A. Kennington III 2b703f82d5 tests/installer: Test for more grub configurations 2014-08-28 13:35:35 -07:00