summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge recent master into stagingVladimír Čunát2014-08-30
|\ | | | | | | | | | | | | | | | | 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)
| * nixos/users-groups: Fix eval on missing uid/gid.aszlig2014-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Merge pull request #3745 from wkennington/master.dnsmasqMichael Raskin2014-08-29
| |\ | | | | | | dnsmasq: Update and enable dbus support
| | * dnsmasq: upgrade to 2.71, fixed dnsmasq modulePaul Colomiets2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The module now has systemd config * Add resolveLocalQueries option which sets up it as a dns server for local host (including reasonable setup of resolvconf) * Add "dnsmasq" user for running daemon * Enabled dbus and dnssec support for the package Conflicts: nixos/modules/misc/ids.nix
| * | 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 Qt
| | * | 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
| |\ \ \ | | | | | | | | | | Grub Update
| | * | | 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
| | | | |
| | * | | nixos/release: Dynamically generate installer testsWilliam A. Kennington III2014-08-28
| | | | |
| | * | | nixos/grub: Catch errors from command executionWilliam A. Kennington III2014-08-28
| | | | |
| | * | | nixos/grub: Refactor install-grub.pl and correct perl syntaxWilliam A. Kennington III2014-08-28
| | | | |
| | * | | nixos/grub: Refactor perl script to remove the Switch moduleWilliam A. Kennington III2014-08-28
| | | | |
| | * | | nixos/grub: Fix typoWilliam A. Kennington III2014-08-28
| | | | |
| | * | | nixos/grub: Fix some silly perl struct accessesWilliam A. Kennington III2014-08-28
| | | | |
| | * | | grub: Add support for detecting btrfs subvolumesWilliam A. Kennington III2014-08-28
| | | | |
| | * | | grub: Add support for forcing devices to be identified with labels or UUIDsWilliam A. Kennington III2014-08-28
| | | | |
| | * | | Update the grub configuration script to handle more complex filesystem ↵William A. Kennington III2014-08-28
| | | | | | | | | | | | | | | | | | | | layouts including full zfs / and /boot
| | * | | Enable grub zfsSupport if zfs is built into the initrdWilliam A. Kennington III2014-08-28
| | | | |
| | * | | Add optional zfsSupport to the nixos grub configurationWilliam A. Kennington III2014-08-28
| | | | |
| | * | | Revert "grub: Allow setting the boot root explicitly"William A. Kennington III2014-08-28
| | | |/ | | |/| | | | | | | | | This reverts commit e4630c1d41d513eb709bddb39043da84442235a7.
| * | | Merge pull request #3200 from wkennington/master.dhcpcdMichael Raskin2014-08-29
| |\ \ \ | | | | | | | | | | nixos/dhcpcd: Add an explicit interfaces option
| | * | | nixos/dhcpcd: Use null instead of empty list to disable allowInterfacesWilliam A. Kennington III2014-08-14
| | | | |
| | * | | nixos/dhcpcd: Add an explicit interfaces optionWilliam A. Kennington III2014-08-14
| | | | |
| * | | | Merge pull request #3100 from tailhook/new-shadowMichael Raskin2014-08-29
| |\ \ \ \ | | | | | | | | | | | | Upgrade "shadow" to 4.2.1
| | * | | | First implementation of subuid/subgid manipulation modulePaul Colomiets2014-08-01
| | | | | |
| | * | | | Upgrade shadow packagePaul Colomiets2014-08-01
| | | | | |
| * | | | | Merge pull request #3047 from chrisfarms/freetdsMichael Raskin2014-08-29
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Simple nixos module to enable configuration of freetds
| | * | | | Simple nixos module to enable configuration of freetds and setup the ↵Chris Farmiloe2014-06-22
| | | | | | | | | | | | | | | | | | | | | | | | expected environment variables
| * | | | | nixos-container run: Execute command using ‘su’Eelco Dolstra2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that the environment is set up correctly.
| * | | | | Containers: Use nsenter to execute commands in containersEelco Dolstra2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove ‘nixos-container set-root-password’, which is kind of pointless now.