summary refs log tree commit diff
path: root/nixos/modules/system
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-06-10
|\
| * Merge pull request #15895 from cerana/stage2-sysfsShea Levy2016-06-03
| |\
| | * stage2: if no /proc, also mount /sysNahum Shalman2016-06-01
| * | Rename gummiboot moduleEelco Dolstra2016-06-01
| * | Rename boot.loader.gummiboot.enable -> boot.loader.systemd-boot.enableEelco Dolstra2016-06-01
| * | Use systemd-boot instead of gummibootEelco Dolstra2016-05-31
| |/
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-05-30
|\|
| * Merge branch 'master' into stagingVladimír Čunát2016-05-26
| |\
| | * boot.initrd.luks.devices: Change into an attribute setEelco Dolstra2016-05-25
| | * Remove boot.loader.grub.timeout and boot.loader.gummiboot.timeoutEelco Dolstra2016-05-25
| | * Merge pull request #15598 from rnhmjoj/systemdEelco Dolstra2016-05-23
| | |\
| | | * Remove systemd shell aliasesrnhmjoj2016-05-21
| * | | Merge branch 'master' into stagingVladimír Čunát2016-05-23
| |\| |
| | * | initrd-ssh service: add assertions for host keysNikolay Amiantov2016-05-20
| | |/
| * / treewide: Make explicit that 'dev' output of openssl is usedTuomas Tynkkynen2016-05-19
| |/
* | Merge remote-tracking branch 'origin/master' into hardened-stdenvFranz Pletz2016-05-18
|\|
| * Merge branch 'master' into stagingVladimír Čunát2016-05-08
| |\
| | * initrd-ssh service: fix buildNikolay Amiantov2016-05-07
| | * nixos/stage-1: Don't kill kernel threadsaszlig2016-05-06
| * | dbus: Fix for new 1.10 versionWilliam A. Kennington III2016-05-02
| * | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2016-04-28
| |\|
| * | Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into st...Nikolay Amiantov2016-04-25
| |\ \
| | * | add get* helper functions and mass-replace manual outputs search with themNikolay Amiantov2016-04-25
| | * | makeSearchPathOutputs: refactor to makeSearchPathOutputNikolay Amiantov2016-04-25
* | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-05-02
|\ \ \ \ | | |_|/ | |/| |
| * | | Update `etc` example to not use a real config fileGraham Christensen2016-04-27
| |/ /
| * / treewide: Use correct output of config.nix.package in non-string contextsTuomas Tynkkynen2016-04-25
| |/
| * boot.loader.grub: fix variable name (#14855)Alexander Ried2016-04-20
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-04-18
|\|
| * stage-1: Remove doublePatchelf hackTuomas Tynkkynen2016-04-15
| * Restore default core limit of 0:infinityEelco Dolstra2016-04-14
| * replace makeSearchPath tree-wise to take care of possible multiple outputsNikolay Amiantov2016-04-13
| * Merge branch 'staging', containing closure-size #7701Vladimír Čunát2016-04-13
| |\
| | * Merge branch 'master' into closure-sizeVladimír Čunát2016-04-10
| | |\
| | * \ Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
| | |\ \
| | * \ \ Merge master into closure-sizeVladimír Čunát2016-03-08
| | |\ \ \
| | * \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2016-02-14
| | |\ \ \ \
| | * \ \ \ \ Merge #12779: Mass replace `pkg}/bin`-style stringsVladimír Čunát2016-02-03
| | |\ \ \ \ \
| | | * | | | | treewide: Mass replace 'openssl}/bin' to refer the 'bin' outputTuomas Tynkkynen2016-02-01
| | * | | | | | Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | treewide: Mass replace 'openssl}/lib' to refer the 'out' outputTuomas Tynkkynen2016-01-24
| | * | | | | | treewide: Mass replace 'glibc}/lib' to refer the 'out' outputTuomas Tynkkynen2016-01-24
| | * | | | | | Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2015-12-31
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeLuca Bruno2015-12-11
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into closure-sizeLuca Bruno2015-11-25
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge staging into closure-sizeVladimír Čunát2015-11-20
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into stagingDomen Kožar2015-11-11
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | udev: complete reworkVladimír Čunát2015-10-04
| | * | | | | | | | | | | | nixos/stage-2: Build readonly-mountpoint with normal mkDerivation phasesTuomas Tynkkynen2015-10-03