about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-07-23
|\
| * Merge pull request #27469 from Ma27/oh-my-zsh/make-pkg-configurableJörg Thalheim2017-07-22
| |\
| | * programs.zsh.ohMyZsh: add `package` option to make package overrides on modul...Maximilian Bosch2017-07-20
| * | exhibitor: Fix bugs in previous packageJoel Thompson2017-07-21
| * | docker module: fix autoPrune.enable descriptionFranz Pletz2017-07-21
| * | exhibitor: init at 3.4.9Joel Thompson2017-07-21
| * | nixos/oauth2_proxy: actually pass provider-specific optionsRhys2017-07-21
| * | docker service: add option to do automatic pruningPascal Bach2017-07-20
| * | Factorio service: fix typo in attribute pathMichael Peyton Jones2017-07-20
| * | Merge pull request #27405 from rvl/postgresql-xmlFranz Pletz2017-07-20
| |\ \
| | * | nixos tests: run postgresql tests with postgres userRodney Lorrimar2017-07-19
| | * | postgresql: enable XML functionsRodney Lorrimar2017-07-15
| | * | nixos tests: fix postgresql testsRodney Lorrimar2017-07-15
| * | | Merge pull request #26419 from roblabla/feature-saslFranz Pletz2017-07-20
| |\ \ \ | | |_|/ | |/| |
| | * | cyrus-sasl: Add saslauthd service supportroblabla2017-06-06
| * | | nixos/ldap: remove tls_checkpeer no when using TLSGraham Christensen2017-07-19
| * | | gitlab: fix archive urls for gitlab serviceDaiderd Jordan2017-07-19
| * | | Merge pull request #26214 from zimbatm/google-compute-imagezimbatm2017-07-19
| |\ \ \
| | * | | google-compute-image module: use google serviceszimbatm2017-07-15
| * | | | Merge pull request #27031 from jerith666/cnijfilter-2-80Benno Fünfstück2017-07-18
| |\ \ \ \
| | * | | | cnijfilter: init at 2.80Matt McHenry2017-07-17
| * | | | | manual: update mailing list linksGraham Christensen2017-07-18
| * | | | | Point to the new mailing list by replacing the old linkDomen Kožar2017-07-18
* | | | | | nixos/tests/keymap: use SLIM theme from nixos/tests/slimThomas Tuegel2017-07-22
* | | | | | Merge branch 'master' into bugfix/staging/stdenvThomas Tuegel2017-07-21
|\| | | | |
| * | | | | Add file with Azure image locations, similar to ec2-amis.nix. Will be used by...Rob Vermaas2017-07-18
| * | | | | Add file with GCE image locations, similar to ec2-amis.nix. Will be used by n...Rob Vermaas2017-07-18
| * | | | | nix: 1.11.12 -> 1.11.13Eelco Dolstra2017-07-18
| * | | | | Merge pull request #27410 from florianjacob/journalwatchJörg Thalheim2017-07-18
| |\ \ \ \ \
| | * | | | | journalwatch & journalwatch service: init at 1.1.0Florian Jacob2017-07-16
| | | |/ / / | | |/| | |
| * | | | | wireguard: allow not storing private keys in world-readable /nix/store (#27433)Aristid Breitkreuz2017-07-17
| * | | | | Strongswan after network-online instead of networkFalco Peijnenburg2017-07-17
| * | | | | nginx: add gzip_vary to recommended settingsWout Mertens2017-07-17
| * | | | | Merge pull request #27057 from Nadrieril/bitlbee-libpurpleJörg Thalheim2017-07-17
| |\ \ \ \ \
| | * | | | | bitlbee service: Add option to load libpurple plugins into bitlbeeNadrieril2017-07-16
| * | | | | | programs.gnupg: use extraInit instead of interactiveShellInitRobin Gloster2017-07-17
* | | | | | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-07-17
|\| | | | | |
| * | | | | | tinc service: BindToAddress and ListenAddress are different options, they sho...Nadrieril2017-07-17
| * | | | | | Merge pull request #27000 from Balletie/fix/pulseaudio-alsa-confBenno Fünfstück2017-07-17
| |\ \ \ \ \ \
| | * | | | | | pulseaudio: Resolve conflicting asound.conf of pulseaudio and alsaBalletie2017-07-01
| * | | | | | | all-hardware.nix: add VMware support. (#27430)volth2017-07-17
| * | | | | | | Merge pull request #26912 from knedlsepp/fix-autoResizeGraham Christensen2017-07-16
| |\ \ \ \ \ \ \
| | * | | | | | | Force check the filesystem before resizingJosef Kemetmueller2017-06-27
| * | | | | | | | Merge pull request #26259 from bachp/mysql-datadir-changelogGraham Christensen2017-07-16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | mysql service: add changelog for changed dataDirPascal Bach2017-07-08
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #25670 from Mic92/cups-hardeningGraham Christensen2017-07-16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | cups: mount private /tmpJörg Thalheim2017-05-10
| * | | | | | | | | Merge pull request #23964 from benley/nixos-manual-launcherGraham Christensen2017-07-16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos: nix snowflake logo for the nixos manual launcherBenjamin Staffin2017-03-16
| * | | | | | | | | | nixos/taskserver: Fix manual PKI managementaszlig2017-07-16