about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2019-09-06Merge staging into staging-nextFrederik Rietdijk3-0/+40
2019-09-06Merge master into staging-nextFrederik Rietdijk17-688/+511
2019-09-06nixos/tests: remove prometheus_1 testWilliButz3-272/+223
2019-09-06nixos/prometheus: remove prometheus1 module, rename prometheus2WilliButz4-399/+173
2019-09-06nixos/cupsd: passwordless admin for wheel with polkitworldofpeace1-0/+10
2019-09-06murmur service: fix typo in descriptionNikolay Amiantov1-1/+1
2019-09-06Merge pull request #67585 from worldofpeace/system-config-printerworldofpeace9-9/+107
2019-09-06nixos/mate: enable system-config-printerworldofpeace1-0/+3
2019-09-06nixos/plasma5: use system-config-printer moduleworldofpeace1-2/+1
2019-09-06nixos/xfce4-14: use system-config-printer moduleworldofpeace1-2/+1
2019-09-06nixos/gnome3: use system-config-printer moduleworldofpeace1-2/+1
2019-09-06nixos/pantheon: use system-config-printer moduleworldofpeace1-3/+3
2019-09-06rl-1909: note about system-config-printerworldofpeace1-0/+26
2019-09-06Merge pull request #68210 from ivan/nixos-railcar-stringSilvan Mosberger1-7/+7
2019-09-06nixos/iwd: add tmpfiles rule for ead serviceworldofpeace1-0/+1
2019-09-06nixos/gitlab: Extract arbitrary secrets from extraConfigtalyz1-9/+53
2019-09-06nixos/utils: Handle arbitrary secrets in JSON output filestalyz1-0/+112
2019-09-06nixos/gitlab: Use postgresql module options to provision local dbtalyz1-53/+76
2019-09-06Merge branch 'staging-next' into stagingJan Tojnar6-14/+18
2019-09-06Merge branch 'master' into staging-nextJan Tojnar6-14/+18
2019-09-06nixos/gitlab: Add support for storing secrets in filestalyz3-124/+159
2019-09-06nixos/railcar: remove use of the deprecated string typeIvan Kozik1-7/+7
2019-09-06nixos/system-config-printer: initworldofpeace3-0/+72
2019-09-06elk-stack: Add release note about elk-5 stack removaladisbladis1-0/+10
2019-09-06kibana5: Remove EOL packageadisbladis1-1/+1
2019-09-06logstash5: Remove EOL packageadisbladis1-1/+1
2019-09-06elk-5: Remove testsadisbladis1-6/+0
2019-09-06Merge pull request #68197 from jtojnar/nixos-doc-make-fixDomen Kožar1-1/+1
2019-09-06nixos/doc/manual: Fix MakefileJan Tojnar1-1/+1
2019-09-06rl-1909: make services.gnome3 links sensible (#68196)Jan Tojnar1-4/+4
2019-09-06rl-1909: make services.gnome3 links sensibleworldofpeace1-4/+4
2019-09-06nixos/gitlab: Fix missing ca_file for SMTPtalyz1-0/+1
2019-09-06Merge pull request #68138 from johanot/ceph-14.2.3Sarah Brofeldt1-1/+1
2019-09-05nixos/gnome3: enable chrome-gnome-shelllworldofpeace1-0/+1
2019-09-05nixos/chrome-gnome-shell: enable in firefoxworldofpeace1-0/+2
2019-09-06Merge branch 'staging-next' into stagingJan Tojnar39-852/+756
2019-09-06Merge branch 'master' into staging-nextJan Tojnar39-852/+756
2019-09-06Merge branch 'gtk-no-plus'Jan Tojnar11-20/+20
2019-09-06tree-wide: s/GTK+/GTK/gJan Tojnar11-20/+20
2019-09-05Merge pull request #68110 from Ma27/weechat-python3Linus Heckemann1-1/+14
2019-09-05weechatScripts.weechat-xmpp: removeMaximilian Bosch1-1/+14
2019-09-05postgresql: improve identMap descriptionCraige McWhirter1-0/+4
2019-09-05tests/virtualbox: Clean up unnecessary things.Ambroz Bizjak1-18/+6
2019-09-05ceph: 14.2.1 -> 14.2.3Johan Thomsen1-1/+1
2019-09-05Merge branch 'staging-next' into stagingVladimír Čunát9-85/+487
2019-09-05Merge pull request #67563 from johanot/kubernetes-1.15-withmodulerevertSarah Brofeldt14-514/+135
2019-09-05nixos/tests/quake3: Fix evaluation erroraszlig1-2/+2
2019-09-04nixos/railcar: small style changesKatharina Fey1-17/+18
2019-09-04nixos/railcar: initKatharina Fey2-0/+125
2019-09-04nix: 2.2.2 -> 2.3Eelco Dolstra1-4/+4