summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge #19081: gnome-3.22Vladimír Čunát2016-10-20
|\
| * NetworkManager-strongswan: init at 1.4.0Alexander Ried2016-10-15
| * xserverArgs fuckupAlexander Ried2016-10-15
| * gdm module: enable user dbus sessionAlexander Ried2016-10-15
| * gdm module: only make xserver args overrideableAlexander Ried2016-10-15
| * gnome3_22.gnome-session: lookup of gnome-settings-daemon.desktopAlexander Ried2016-10-15
| * displayManager.gdm: only gnome-session needs to be on pathAlexander Ried2016-10-15
| * gnome3.gvfs module: make systemd services availableAlexander Ried2016-10-15
| * gnome3.tracker module: add self to systemd pathAlexander Ried2016-10-15
| * gnome3.evolution-data-server module: add self to systemd pathAlexander Ried2016-10-15
| * gnome3.gnome-terminal-server: init moduleAlexander Ried2016-10-15
| * Merge pull request #19498 from grahamc/houndGraham Christensen2016-10-15
| |\
| | * hound: init moduleGraham Christensen2016-10-15
| * | audit module: only enable service if kernel has audit (#19569)Alexander Ried2016-10-15
| |/
| * qlipper: init at 2016-09-26romildo2016-10-15
| * screengrab: init at 2016-02-24romildo2016-10-15
* | Merge pull request #19309 from FRidh/outputsFrederik Rietdijk2016-10-13
|\ \ | |/ |/|
| * Python: remove modules and pythonFullFrederik Rietdijk2016-10-10
* | Merge branch 'master' into stagingVladimír Čunát2016-10-13
|\ \
| * \ Merge pull request #19490 from regnat/taskserverFrederik Rietdijk2016-10-12
| |\ \
| | * | taskserver : use pythonPackage.buildPythonPackageregnat2016-10-12
| * | | Merge pull request #19438 from primeos/vim-serviceArseniy Seroka2016-10-12
| |\ \ \
| | * | | vim module: initMichael Weiss2016-10-11
| | |/ /
| * | | dockerRegistry module: re-init with new underlying softwareRobin Gloster2016-10-12
| * | | errbot module: initRobin Gloster2016-10-12
| * | | crowd module: initFranz Pletz2016-10-12
| * | | jira module: initFranz Pletz2016-10-12
| * | | confluence module: initFranz Pletz2016-10-12
| * | | Merge pull request #19464 from kampfschlaefer/fix_sit_evaluationJörg Thalheim2016-10-12
| |\ \ \
| | * | | sit interfaces: fix dependency trackingArnold Krille2016-10-12
| * | | | nixos: make it easy to apply kernel patchesCharles Strahan2016-10-11
| |/ / /
| * | | nixos network: fix evaluation after #19128Jörg Thalheim2016-10-12
| * | | Merge #18861: add AMDGPU-PRO driverVladimír Čunát2016-10-11
| |\ \ \
| | * | | amdgpu-pro: Init at 16.30.3-315407David McFarland2016-10-11
* | | | | release-notes: fixup bad conflict resolution in bef6befVladimír Čunát2016-10-13
* | | | | stdenv/stripHash: print to stdout, not to variableProfpatsch2016-10-11
|/ / / /
* | / / timezone service: link localtime to /etc/zoneinfo instead of tzinfo directlyNikolay Amiantov2016-10-11
| |/ / |/| |
* | | x11 module: don't restart the display manager indefinitely (#19418)zimbatm2016-10-10
* | | Merge pull request #19420 from romildo/new.qpsJoachim F2016-10-10
|\ \ \
| * | | qps: init at 1.10.16romildo2016-10-10
| | |/ | |/|
* | | Merge pull request #19367 from cransom/smokeping-fixJoachim F2016-10-10
|\ \ \
| * | | smokeping module: fix missing js, broken alertsCasey Ransom2016-10-08
* | | | Merge pull request #19128 from kampfschlaefer/fix_device_wait_in_containersJörg Thalheim2016-10-10
|\ \ \ \ | |_|/ / |/| | |
| * | | containers: Improve device dependency trackingArnold Krille2016-10-08
| * | | containers: Do not wait for udev for network devicesArnold Krille2016-10-08
* | | | Merge pull request #17922 from bjornfor/php-config-file-scan-dirJörg Thalheim2016-10-09
|\ \ \ \
| * | | | nixos/release-notes: PHP config-file-scan-dir /etc -> /etc/php.dBjørn Forsman2016-09-08
* | | | | Merge pull request #19391 from kampfschlaefer/fix_container_extra_vethsJörg Thalheim2016-10-09
|\ \ \ \ \
| * | | | | container: fix extraVeth submodule usageArnold Krille2016-10-09
| | |/ / / | |/| | |
* | | | | nixbot module: initRobin Gloster2016-10-09