summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-07-29
|\
| * exhibitor: Fix bug with automatic instance managementJoel Thompson2017-07-28
* | Merge branch 'master' into stagingFranz Pletz2017-07-28
|\|
| * nixos/xserver: Properly validate XKB optionsaszlig2017-07-28
| * zfs, spl: 0.6.5.11 -> 0.7.0Robin Gloster2017-07-27
| * tinc_pre: avoid infinite loop with EBADFD on network restartVolth2017-07-27
| * mongodb: we already set quiet in configMateusz Kowalczyk2017-07-27
| * Merge pull request #27677 from peterhoeg/u/mcelogGraham Christensen2017-07-27
| |\
| | * mcelog: use .service file from upstreamPeter Hoeg2017-07-27
| * | nixos/tahoe: fixup create-introducer, syntax regression from 90acbe5, imprope...Graham Christensen2017-07-26
| * | nixos/tahoe: fixup create-introducer, syntax regression from 90acbe5Graham Christensen2017-07-26
| * | change swap.randomEncryption config option to "coercedTo" for backwards compa...Martin Wohlert2017-07-26
| * | swap: extend randomEncryption to plainOpen and ability to select cipherMartin Wohlert2017-07-26
* | | Merge remote-tracking branch 'upstream/master' into staging-baseJohn Ericson2017-07-26
|\| |
| * | Merge pull request #26761 from gnidorah/master3Peter Hoeg2017-07-26
| |\ \
| | * | qt5ct module: expose qtstylepluginsgnidorah2017-07-23
| * | | autofs service: fix the manualNikolay Amiantov2017-07-26
| * | | environment.noXlibs: Disable gnome when noXLibs is set (#27567)k0ral2017-07-26
| * | | nixos/…/swap.nix: don't create a LUKS header for randomEncryptionedef2017-07-26
| * | | Cleanup tahoe module0xABAB2017-07-25
| | |/ | |/|
| * | tinc service: add CLI tools to the $PATHVolth2017-07-25
| * | Merge pull request #27627 from volth/zookeeper-escape-shellJörg Thalheim2017-07-25
| |\ \
| | * | nixos/zookeeper: escape cfg.extraCmdLineOptionsVolth2017-07-24
| * | | Merge pull request #27347 from cstrahan/osquery-newCharles Strahan2017-07-24
| |\ \ \
| | * | | osquery: init at 2.5.2Charles Strahan2017-07-24
| * | | | wireguard: sometimes module tries to re-add the default route, which fails - ...Aristid Breitkreuz2017-07-23
| * | | | Merge pull request #26632 from jazmit/nixpkgsJoachim F2017-07-23
| |\ \ \ \
| | * | | | coturn: allow use of ports < 1024James2017-06-20
* | | | | | 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