about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #66405 from NeQuissimus/virtualbox_6_0_10Florian Klink2019-09-06
|\
| * tests/virtualbox: Clean up unnecessary things.Ambroz Bizjak2019-09-05
* | Merge pull request #68233 from worldofpeace/plasma5-enable-libinputworldofpeace2019-09-06
|\ \
| * | nixos/plasma5: enable libinputworldofpeace2019-09-06
* | | Merge pull request #67917 from worldofpeace/lightdm-pam-gnome-keyringworldofpeace2019-09-06
|\ \ \
| * | | nixos/lightdm: fix pam rulesworldofpeace2019-09-06
| |/ /
* | | Merge master into staging-nextFrederik Rietdijk2019-09-06
|\ \ \
| * | | nixos/tests: remove prometheus_1 testWilliButz2019-09-06
| * | | nixos/prometheus: remove prometheus1 module, rename prometheus2WilliButz2019-09-06
| * | | murmur service: fix typo in descriptionNikolay Amiantov2019-09-06
| |/ /
| * | Merge pull request #67585 from worldofpeace/system-config-printerworldofpeace2019-09-06
| |\ \
| | * | nixos/mate: enable system-config-printerworldofpeace2019-09-06
| | * | nixos/plasma5: use system-config-printer moduleworldofpeace2019-09-06
| | * | nixos/xfce4-14: use system-config-printer moduleworldofpeace2019-09-06
| | * | nixos/gnome3: use system-config-printer moduleworldofpeace2019-09-06
| | * | nixos/pantheon: use system-config-printer moduleworldofpeace2019-09-06
| | * | rl-1909: note about system-config-printerworldofpeace2019-09-06
| | * | nixos/system-config-printer: initworldofpeace2019-09-06
| * | | Merge pull request #68210 from ivan/nixos-railcar-stringSilvan Mosberger2019-09-06
| |\ \ \
| | * | | nixos/railcar: remove use of the deprecated string typeIvan Kozik2019-09-06
* | | | | Merge branch 'master' into staging-nextJan Tojnar2019-09-06
|\| | | |
| * | | | elk-stack: Add release note about elk-5 stack removaladisbladis2019-09-06
| * | | | kibana5: Remove EOL packageadisbladis2019-09-06
| * | | | logstash5: Remove EOL packageadisbladis2019-09-06
| * | | | elk-5: Remove testsadisbladis2019-09-06
| |/ / /
| * | | Merge pull request #68197 from jtojnar/nixos-doc-make-fixDomen Kožar2019-09-06
| |\ \ \
| | * | | nixos/doc/manual: Fix MakefileJan Tojnar2019-09-06
| | |/ /
| * | | rl-1909: make services.gnome3 links sensible (#68196)Jan Tojnar2019-09-06
| |\ \ \
| | * | | rl-1909: make services.gnome3 links sensibleworldofpeace2019-09-06
| | |/ /
| * | | Merge pull request #68138 from johanot/ceph-14.2.3Sarah Brofeldt2019-09-06
| |\ \ \ | | |/ / | |/| |
| | * | ceph: 14.2.1 -> 14.2.3Johan Thomsen2019-09-05
* | | | Merge branch 'master' into staging-nextJan Tojnar2019-09-06
|\| | |
| * | | Merge branch 'gtk-no-plus'Jan Tojnar2019-09-06
| |\ \ \
| | * | | tree-wide: s/GTK+/GTK/gJan Tojnar2019-09-06
| * | | | Merge pull request #68110 from Ma27/weechat-python3Linus Heckemann2019-09-05
| |\ \ \ \
| | * | | | weechatScripts.weechat-xmpp: removeMaximilian Bosch2019-09-05
| | | |/ / | | |/| |
| * / | | postgresql: improve identMap descriptionCraige McWhirter2019-09-05
| |/ / /
| * | | Merge pull request #67563 from johanot/kubernetes-1.15-withmodulerevertSarah Brofeldt2019-09-05
| |\ \ \
| | * | | nixos/kubernetes: make module compatible with v1.15.xJohan Thomsen2019-09-04
| | * | | Revert "Merge pull request #56789 from mayflower/upstream-k8s-refactor"Johan Thomsen2019-09-04
| * | | | nixos/tests/quake3: Fix evaluation erroraszlig2019-09-05
| * | | | nixos/railcar: small style changesKatharina Fey2019-09-04
| * | | | nixos/railcar: initKatharina Fey2019-09-04
| * | | | nix: 2.2.2 -> 2.3Eelco Dolstra2019-09-04
| * | | | nixos/manual: Fix build after broken Ceph release noteSarah Brofeldt2019-09-04
| * | | | Merge pull request #68015 from aanderse/zookeeperSilvan Mosberger2019-09-04
| |\ \ \ \
| | * | | | nixos/zookeeper: recursively set permissions and ownership on dataDirAaron Andersen2019-09-03
| * | | | | amazon-image.nix: upload prebuilt imagesAndrew Childs2019-09-05
| * | | | | amazon-image.nix: add hydra-build-products and improve metadataAndrew Childs2019-09-05
| * | | | | nixos/release.nix: add "amazonImage" for building Amazon EC2 ImagesAndrew Childs2019-09-05