summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #38704 from roconnor-blockstream/trezoradisbladis2018-04-12
|\
| * trezord: 1.2.1 -> 2.0.12Russell O'Connor2018-04-11
* | exfat-utils, fuse_exfat -> exfatvolth2018-04-12
* | nixos/postgresql: remove ancient hack for postgres 8.4Austin Seipp2018-04-11
* | Merge pull request #38773 from bandresen/zfsAutoSnapshotYegor Timoshenko2018-04-11
|\ \
| * | zfs.autoSnapshot: make `frequent` run every 15 minsBenjamin Andresen2018-04-11
* | | Merge staging into masterFrederik Rietdijk2018-04-11
|\ \ \
| * | | Merge master into stagingFrederik Rietdijk2018-04-10
| |\| |
| * | | Merge branch 'master' into stagingRobert Schütz2018-04-10
| |\ \ \
| * \ \ \ Merge master into stagingFrederik Rietdijk2018-04-09
| |\ \ \ \
| * | | | | Increase max group name length to 32 charactersaszlig2018-04-08
| * | | | | Merge master into stagingFrederik Rietdijk2018-04-08
| |\ \ \ \ \
| * \ \ \ \ \ Merge master into stagingFrederik Rietdijk2018-04-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge master into stagingFrederik Rietdijk2018-04-04
| |\ \ \ \ \ \ \
| * | | | | | | | Machine.pm: tweak to look for graphical target in waitForXWill Dietz2018-04-03
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-04-03
| |\ \ \ \ \ \ \ \
| * | | | | | | | | nixos testing: significantly reduce deps needed for OCR testsWill Dietz2018-03-31
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-03-30
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into stagingShea Levy2018-03-28
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #37840 from matthewbauer/unixtoolsMatthew Justin Bauer2018-03-27
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | opengl service: don't override mesa non-drivers in runtimeNikolay Amiantov2018-03-26
| * | | | | | | | | | | | qemu-vm service: quote arguments in qemu runnerNikolay Amiantov2018-03-26
| * | | | | | | | | | | | xserver service: cleanup LD_LIBRARY_PATHNikolay Amiantov2018-03-26
| * | | | | | | | | | | | opengl service: move options under common hardware.opengl treeNikolay Amiantov2018-03-26
| * | | | | | | | | | | | nvidia service: rely on libglvndNikolay Amiantov2018-03-26
| * | | | | | | | | | | | wrapper.c: fixup includes to work w/muslWill Dietz2018-03-25
| * | | | | | | | | | | | Merge branch 'master' into stagingShea Levy2018-03-24
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #37647 from abbradar/systemd-238Nikolay Amiantov2018-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | systemd: 237 -> 238Nikolay Amiantov2018-03-22
* | | | | | | | | | | | | | safeeyes: restart only on failureBjornMelgaard2018-04-10
* | | | | | | | | | | | | | safeeyes: add moduleBjornMelgaard2018-04-10
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #38643 from brainrape/prosody-add-dataDirJörg Thalheim2018-04-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | nixos/prosody: add dataDir optionMárton Boros2018-04-09
* | | | | | | | | | | | | nixos/make-ext4-fs: Use closureInfoTuomas Tynkkynen2018-04-10
* | | | | | | | | | | | | Merge pull request #33794 from yrashk/onlykeyMatthew Justin Bauer2018-04-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | config.hardware.onlykey configuration optionYurii Rashkovskii2018-03-18
* | | | | | | | | | | | | nixos/tests.chromium: actually notice the tab crashMichael Raskin2018-04-09
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #38362 from orbekk/acme-pathJörg Thalheim2018-04-09
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix: nixos/nginx certificate locationKjetil Ørbekk2018-04-02
* | | | | | | | | | | | | Merge pull request #38513 from Ma27/clementine-license-fixesJörg Thalheim2018-04-09
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clementine: provide free derivation by defaultMaximilian Bosch2018-04-07
* | | | | | | | | | | | | | lxc: enable pam_cgfs and fix moduleJörg Thalheim2018-04-09
* | | | | | | | | | | | | | Merge pull request #38629 from ivanbrennan/less-configFileJörg Thalheim2018-04-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | nixos/less: add configFile optionivanbrennan2018-04-08
* | | | | | | | | | | | | | | Merge pull request #38533 from nyanloutre/duplicati-packageMatthew Justin Bauer2018-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | duplicati: create servicenyanloutre2018-04-07
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #38094 from volth/patch-120Matthew Justin Bauer2018-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | nixos/network-scripted: print error detailsvolth2018-03-30
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #38547 from Ma27/iftop-moduleJörg Thalheim2018-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | nixos/iftop: add moduleMaximilian Bosch2018-04-07
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |