about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2019-06-15Merge staging-next into stagingFrederik Rietdijk9-114/+457
2019-06-15Merge master into staging-nextFrederik Rietdijk2-3/+20
2019-06-14Merge pull request #63135 from Ma27/captive-browser-regressionSamuel Dionne-Riel1-3/+17
2019-06-14nixos/systemd: enable systemd-tmpfiles-setup and -clean for user sessions (#6...Florian Klink1-0/+3
2019-06-14nixos/captive-browser: fix moduleMaximilian Bosch1-3/+17
2019-06-14Merge branch 'master' into staging-nextVladimír Čunát9-114/+445
2019-06-14nixos: Fix build of manualaszlig1-1/+1
2019-06-13Merge pull request #59179 from JohnAZoidberg/cassandra-moduleAaron Andersen3-46/+261
2019-06-13Merge pull request #58036 from volth/captive-browserMaximilian Bosch2-0/+109
2019-06-13Merge pull request #62712 from danbst/module-conflict-namingDanylo Hlynskyi1-14/+18
2019-06-13nixos/cassandra: Don't force SimpleSeedProviderDaniel Schaefer1-7/+8
2019-06-13nixos/cassandra: Test remote auth only on v3.11+Daniel Schaefer1-3/+6
2019-06-13nixos/cassandra: Use docbook instead of markdown styleDaniel Schaefer1-5/+8
2019-06-13nixos/cassandra: Add option for password file pathDaniel Schaefer1-5/+25
2019-06-13nixos/cassandra: Test jmxRolesDaniel Schaefer1-3/+18
2019-06-13nixos/cassandra: Test maxHeapSizeDaniel Schaefer1-0/+15
2019-06-13nixos/cassandra: Set test VM IPs staticallyDaniel Schaefer1-1/+7
2019-06-13nixos/cassandra: Test seedAddressesDaniel Schaefer1-7/+1
2019-06-13nixos/cassandra: Test clusterNameDaniel Schaefer1-0/+7
2019-06-13nixos/cassandra: Use ipAddress and capital lettersDaniel Schaefer1-11/+15
2019-06-13nixos/cassandra: Allow setting JMX credentialsDaniel Schaefer1-1/+37
2019-06-13nixos/cassandra: Reenable testsDaniel Schaefer1-0/+1
2019-06-13nixos/cassandra: Fix test by listening on IPDaniel Schaefer1-11/+9
2019-06-13nixos/cassandra: Add clusterNameDaniel Schaefer1-0/+10
2019-06-13nixos/cassandra: Add nixos conf for Java envDaniel Schaefer1-7/+86
2019-06-13nixos/cassandra: Allow setting of seed addressesDaniel Schaefer1-1/+11
2019-06-13nixos/cassandra: Enable CQL server by defaultDaniel Schaefer1-0/+13
2019-06-13Merge pull request #61923 from aanderse/giteaMaximilian Bosch2-54/+52
2019-06-12Merge pull request #63035 from rvolosatovs/update/goWael Nasreddine1-0/+5
2019-06-12Merge pull request #62966 from bjornfor/nixos-generate-config-bcacheEelco Dolstra1-0/+5
2019-06-12Merge staging-next into stagingFrederik Rietdijk11-5/+55
2019-06-12Merge master into staging-nextFrederik Rietdijk11-6/+60
2019-06-12Merge pull request #62838 from mayflower/fix/cryptsetup-kernel-cryptoFranz Pletz2-1/+2
2019-06-11Merge pull request #62153 from WilliButz/avahi-refactorRobin Gloster4-161/+208
2019-06-11nixos/cgit: mention filters in configText examplepacien1-0/+2
2019-06-11Merge pull request #62101 from michaelpj/imp/lenovo-throttledJörg Thalheim2-0/+22
2019-06-11bind: Remove deprecated flag from rndc-confgenLucas Savva1-1/+1
2019-06-11Merge pull request #61366 from romildo/upd.deepin.dde-file-managerworldofpeace1-0/+3
2019-06-11nixos/deepin: add dde-file-manager servicesJosé Romildo Malaquias1-0/+3
2019-06-10Merge pull request #59803 from volth/patch-316Matthew Bauer1-2/+1
2019-06-10Merge pull request #62941 from woffs/openvpn-urlMatthew Bauer1-1/+1
2019-06-10nixos/gitea: replace deprecated usage of PermissionsStartOnlyAaron Andersen1-16/+9
2019-06-10nixos/gitea: define a gitea group to avoid "nogroup" ownershipAaron Andersen1-2/+10
2019-06-10nixos/gitea: utilize mysql|postgresql.ensureDatabases & ensureUsers to provis...Aaron Andersen2-36/+33
2019-06-10nixos-generate-config: add support for bcacheBjørn Forsman1-0/+5
2019-06-10Merge pull request #62315 from adisbladis/pulseaudio/resample-methodadisbladis2-0/+10
2019-06-10openvpn: fix static key mini howto urlFrank Doepper1-1/+1
2019-06-10Merge pull request #62935 from danieldk/cargo-vendor-change-docMaximilian Bosch1-0/+18
2019-06-10Merge master into staging-nextFrederik Rietdijk3-11/+17
2019-06-10nixos/release-notes: document changed CargoSha256 hashesDaniël de Kok1-0/+18