about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into master.upstreamWilliam A. Kennington III2015-11-14
|\
| * lighttpd: fix mod_rewrite appearing twiceGuillaume Maudoux2015-11-14
* | Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""William A. Kennington III2015-11-14
|/
* Merge commit 'cb21b77' into master.upstreamWilliam A. Kennington III2015-11-13
|\
| * Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-07
| |\
| * \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-05
| |\ \
| * \ \ Merge remote-tracking branch 'origin/systemd-219' into stagingEelco Dolstra2015-11-04
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-10-30
| | |\ \ \
| | * | | | systemd: Update to 227Eelco Dolstra2015-10-07
| | * | | | Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-10-01
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-09-21
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into systemd-219Eelco Dolstra2015-09-07
| | |\ \ \ \ \ \
| | * | | | | | | stage-1: fix typo that breaks resumeSpencer Janssen2015-07-31
| | * | | | | | | Merge remote-tracking branch 'origin/staging' into systemd-219Eelco Dolstra2015-07-20
| | |\ \ \ \ \ \ \
| | * | | | | | | | Disable system_tarball_pc and fix evalEelco Dolstra2015-06-15
| | * | | | | | | | systemd: Use upstream tmpfiles.d rulesTuomas Tynkkynen2015-06-03
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-05-22
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | systemd: Update to 220Eelco Dolstra2015-05-22
| | * | | | | | | | | Set up /etc/machine-id before starting systemdEelco Dolstra2015-05-18
| | * | | | | | | | | stage-1: Shut up warnings about swap devices that don't exist yetEelco Dolstra2015-05-11
| | * | | | | | | | | Allow systemd-journald to be restartedEelco Dolstra2015-05-11
| | * | | | | | | | | stage-2: Don't run hwclock in containersEelco Dolstra2015-05-11
| | * | | | | | | | | stage-1: Don't mount /dev/shm if it's already mountedEelco Dolstra2015-05-11
| | * | | | | | | | | Create systemd-{network,resolve} user/group unconditionallyEelco Dolstra2015-05-11
| | * | | | | | | | | Use ConditionVirtualization to disable some services in containersEelco Dolstra2015-05-11
| | * | | | | | | | | systemd: Update to 219Eelco Dolstra2015-05-11
| * | | | | | | | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-04
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-30
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge master into stagingVladimír Čunát2015-10-23
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-15
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Merge pull request #9543 from NixOS/staging.post-15.06"Eelco Dolstra2015-10-06
| * | | | | | | | | | | | | Merge branch 'master.upstream' into staging.post-15.06William A. Kennington III2015-10-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-09-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gnome' into stagingLuca Bruno2015-09-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | gnome3: init 3.18Luca Bruno2015-09-25
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | fix: ihaskell's and xmonad's dependence on haskell-ngLengyel Balázs2015-11-13
* | | | | | | | | | | | | | | | | | Merge pull request #10993 from oxij/nixos-actkbd-tinyfixArseniy Seroka2015-11-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | nixos: add actkbd package to environment in actkbd moduleJan Malakhovski2015-11-12
* | | | | | | | | | | | | | | | | | | Update comment for gdm service.James Cook2015-11-12
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | nixos/autofs: revive and update to systemdNikolay Amiantov2015-11-11
* | | | | | | | | | | | | | | | | | services.tlsdated: use google.com as default host Pascal Wittmann2015-11-11
* | | | | | | | | | | | | | | | | | redshift: document lat/long and temp boundsChris Martin2015-11-10
* | | | | | | | | | | | | | | | | | Merge pull request #10460 from abbradar/remote-askpassNikolay Amiantov2015-11-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | nixos/luksroot: allow to enter passphrase from another consoleNikolay Amiantov2015-10-18
| * | | | | | | | | | | | | | | | | | nixos/luksroot: use 'nuke-refs -e' option to simplify thingsNikolay Amiantov2015-10-18
| * | | | | | | | | | | | | | | | | | nixos/initrd-network: add new moduleNikolay Amiantov2015-10-18
| * | | | | | | | | | | | | | | | | | nixos/stage-1: add postEarlyDeviceCommands hookNikolay Amiantov2015-10-18
* | | | | | | | | | | | | | | | | | | virtualbox service: hide vboxnet0 from NetworkManager, fixes #10862Tomasz Kontusz2015-11-10