summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Revert "Merge pull request #2449 from wkennington/master.grub"Michael Raskin2014-08-31
* Add `extraConfig` option for SLiMSuvash Thapaliya2014-08-31
* Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8cRickard Nilsson2014-08-30
* Merge pull request #3864 from nbp/useless-submodulesNicolas B. Pierron2014-08-30
|\
| * Remove useless use of optionSet.Nicolas Pierron2014-08-29
| * Remove useless use of undocumented submodules.Nicolas Pierron2014-08-29
* | nixos/network-interfaces: Support the old ip configuration conventionWilliam A. Kennington III2014-08-30
* | Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask...William A. Kennington III2014-08-30
* | nixos/network-interfaces: Add flush upon interface going downWilliam A. Kennington III2014-08-30
* | nixos/network-interfaces: Add support for multiple ipv4 / ipv6 addressesWilliam A. Kennington III2014-08-30
* | Merge pull request #3863 from wkennington/master.grubfixAristid Breitkreuz2014-08-30
|\ \
| * | nixos/install-grub: Fix IndentationWilliam A. Kennington III2014-08-29
| * | nixos/generate-config: Fix indentationWilliam A. Kennington III2014-08-29
* | | Merge pull request #3344 from ehmry/privoxyMichael Raskin2014-08-30
|\ \ \ | |/ / |/| |
| * | privoxy: upstart to systemd conversion, actions file editingEmery Hemingway2014-08-27
* | | Merge pull request #3773 from nbp/nixos-maintainersNicolas B. Pierron2014-08-29
|\ \ \
| * | | NixOS: Add meta.maintainer option to modules.Nicolas Pierron2014-08-25
* | | | Made Mediawiki rewrite rules work for virtual hostsIgor Pashev2014-08-29
* | | | Fix evaluation of nixos testedLuca Bruno2014-08-29
* | | | Revert "nixos/release: Dynamically generate installer tests"Luca Bruno2014-08-29
* | | | Merge pull request #3838 from oconnorr/masterRob Vermaas2014-08-29
|\ \ \ \
| * | | | Replace depricated gcutil with gcloude compute in gce/create-gce.shRussell O'Connor2014-08-28
| * | | | Abstract bucket name in gce/create-gce.shRussell O'Connor2014-08-28
* | | | | nixos/users-groups: Fix eval on missing uid/gid.aszlig2014-08-29
* | | | | Merge pull request #3745 from wkennington/master.dnsmasqMichael Raskin2014-08-29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | dnsmasq: upgrade to 2.71, fixed dnsmasq modulePaul Colomiets2014-08-28
| | |_|/ | |/| |
* | | | Merge pull request #3275 from taku0/gtk-envMichael Raskin2014-08-29
|\ \ \ \
| * | | | uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qttaku02014-07-14
* | | | | Merge pull request #2449 from wkennington/master.grubMichael Raskin2014-08-29
|\ \ \ \ \
| * | | | | nixos/install-grub: Check /boot against /nix/store instead of /nixWilliam A. Kennington III2014-08-28
| * | | | | nixos-generate-config: Detect btrfs subvolumesWilliam A. Kennington III2014-08-28
| * | | | | nixos/release-combined: Add required installer testsWilliam A. Kennington III2014-08-28
| * | | | | nixos/ova: Grub uuid detection is broken when generating the ovaWilliam A. Kennington III2014-08-28
| * | | | | nixos/grub: Fix spacing and correct subvolume detectionWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: Provided test should add symlinks to /dev/disk if udev doesn'tWilliam A. Kennington III2014-08-28
| * | | | | nixos/grub: Simplify detection of labels / uuids for provided device namesWilliam A. Kennington III2014-08-28
| * | | | | nixos/grub: Fix regex for getting subvolume name in btrfsWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: Fix provided test uuid and label mountsWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: Swapspace should be largerWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: Remove unneeded testsWilliam A. Kennington III2014-08-28
| * | | | | nixos/grub: Kernels don't need to be copied if we can read the nix storeWilliam A. Kennington III2014-08-28
| * | | | | nixos/grub: Grub detection is much simpler using subvol showWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: Fix simple testsWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: Add swap to the new testsWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: fix mountWilliam A. Kennington III2014-08-28
| * | | | | nixos/grub: Needs mount so add utillinux to binWilliam A. Kennington III2014-08-28
| * | | | | installer/btrfs: Typo in subvolWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: Test for more grub configurationsWilliam A. Kennington III2014-08-28
| * | | | | tests/installer: Add btrfs tests for grub and nixos-generate-configWilliam A. Kennington III2014-08-28
| * | | | | grub: Change fsIdentifier to str from stringWilliam A. Kennington III2014-08-28