summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'staging', discussion #8844Vladimír Čunát2015-07-19
|\
| * Merge master into stagingVladimír Čunát2015-07-17
| |\
| * | lightdm: Fix location of loaders.cache after 49821433242c4f44cff038a039ead3bc...William A. Kennington III2015-07-15
| * | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-15
| |\ \
| * \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-13
| |\ \ \
| * | | | Set ‘allowSubstitutes = false’ on various derivationsEelco Dolstra2015-07-09
| * | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-08
| |\ \ \ \
| * \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-06
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-05
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-05
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-01
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-30
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | krb5: Break out into a lib and not lib versionWilliam A. Kennington III2015-06-26
| * | | | | | | | | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into stagingThomas Tuegel2015-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge #8363: pure-darwin stdenvVladimír Čunát2015-06-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into stagingLuca Bruno2015-06-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2015-06-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into stagingDomen Kožar2015-06-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | openssl: Remove References to OPENSSL_X509_CERT_FILEWilliam A. Kennington III2015-05-31
* | | | | | | | | | | | | | | | | | | | | | release notes: phpfpm now using default php instead of php54Luca Bruno2015-07-17
* | | | | | | | | | | | | | | | | | | | | | phpfpm: use latest phpLuca Bruno2015-07-17
* | | | | | | | | | | | | | | | | | | | | | slim: use nixos theme by defaultArseniy Seroka2015-07-17
* | | | | | | | | | | | | | | | | | | | | | nixos-generate-config: Container improvementsEelco Dolstra2015-07-17
* | | | | | | | | | | | | | | | | | | | | | Remove obsolete reference to /mediaEelco Dolstra2015-07-17
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | bitlbee service: fix typotv2015-07-16
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | window-manager service: add notionJames Felix Black2015-07-14
* | | | | | | | | | | | | | | | | | | | Make OpenJDK release-criticalEelco Dolstra2015-07-14
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | nixos-install: Don't barf if btrfs is missingEelco Dolstra2015-07-13
* | | | | | | | | | | | | | | | | | | services.openssh.knownHosts.*.publicKey: Update description and add exampleEelco Dolstra2015-07-13
* | | | | | | | | | | | | | | | | | | charybdis service: fix preStart scripttv2015-07-13
* | | | | | | | | | | | | | | | | | | Merge pull request #8163 from qknight/added_meta_to_testslethalman2015-07-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | all tests: added meta.maintainers sectionJoachim Schiele2015-07-12
* | | | | | | | | | | | | | | | | | | | firefox sync-server service: make path to paster executable absoluteLeroy Hopson2015-07-12
* | | | | | | | | | | | | | | | | | | | Merge pull request #6702 from joachifm/dnscrypt-proxyJames Cook2015-07-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | dnscrypt-proxy service: support custom providersJoachim Fasting2015-06-12
| * | | | | | | | | | | | | | | | | | | dnscrypt-proxy service: use mkEnableOptionJoachim Fasting2015-06-12
| * | | | | | | | | | | | | | | | | | | nixos: cosmetic improvements to dnscrypt-proxy service moduleJoachim Fasting2015-06-12
| * | | | | | | | | | | | | | | | | | | nixos: additional hardening for dnscrypt-proxyJoachim Fasting2015-06-12
| * | | | | | | | | | | | | | | | | | | nixos: implement socket-activation for dnscrypt-proxyJoachim Fasting2015-06-12
| * | | | | | | | | | | | | | | | | | | nixos: permit dnscrypt-proxy service to read basic user/group infoJoachim Fasting2015-06-12
* | | | | | | | | | | | | | | | | | | | tests/boot: Remove unused store contentsWilliam A. Kennington III2015-07-08
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | nixos/tests/installer: Add a testcase for fat32 /bootWilliam A. Kennington III2015-07-08
* | | | | | | | | | | | | | | | | | | nixos/bitlbee: fixed protocols optionPascal Wittmann2015-07-08
* | | | | | | | | | | | | | | | | | | nixos/bitlbee: add hostname, config dir and protocols optionsPascal Wittmann2015-07-08
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-29 16:19:55 +0000