summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into stagingFrederik Rietdijk2018-04-04
|\
| * nixos/tests/openldap: Fix nameTuomas Tynkkynen2018-04-04
| * Merge pull request #38431 from volth/patch-122Jörg Thalheim2018-04-04
| |\
| | * network-interfaces.nix: dead code removalvolth2018-04-04
| * | nixos/dhcp: fix permissions of statedirJoachim Schiele2018-04-04
| * | Merge pull request #37288 from cleverca22/improve-make-tarballGraham Christensen2018-04-04
| |\ \ | | |/ | |/|
| | * make-system-tarball: allow alternate compression methodsMichael Bishop2018-04-03
| * | mkdir -> install -dEelco Dolstra2018-04-04
| * | Merge pull request #38407 from nyanloutre/masterJörg Thalheim2018-04-04
| |\ \
| | * | transmission: settings doc location changednyanloutre2018-04-03
| * | | 18.03 release notes: final editsVladimír Čunát2018-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/sd-image-*: Raspberry Pi firmware no longer falls under unfreeTuomas Tynkkynen2018-04-02
| * | nodePackages.parsoid: pin service-runner to 2.3.0Nikolay Amiantov2018-04-02
| * | nixos/release.nix: Add Hydra job for AArch64 SD imageTuomas Tynkkynen2018-04-02
| * | nixos/sd-image: Make it more similar to iso-image.nixTuomas Tynkkynen2018-04-02
| * | nixos.tests.containers-imperative: fix impurity failureVladimír Čunát2018-04-02
| * | nixos/maintainers/option-usages.nix: Improve spelling and grammarAndré-Patrick Bubel2018-04-02
| * | nixos/unbound: don't fail on root trust anchor updatesFranz Pletz2018-04-01
| * | nixos/containers-physical_interfaces: use new bond option interfaceJörg Thalheim2018-03-31
| * | user/group assertion to not exceed the 32 character limitJoachim Schiele2018-03-30
| * | nixos/gogs: allow git operations over sshLéo Gaspard2018-03-30
* | | nixos testing: significantly reduce deps needed for OCR testsWill Dietz2018-03-31
* | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-03-30
|\| |
| * | Merge pull request #37921 from gnidorah/gitwebWout Mertens2018-03-30
| |\ \
| | * | git: add more deps to gitwebgnidorah2018-03-29
| | * | gitweb: use common optionsgnidorah2018-03-29
| | * | nixos/nginx: add gitweb sub-servicegnidorah2018-03-29
| * | | gitlab: disableRobin Gloster2018-03-29
| * | | Merge pull request #37955 from mayflower/fix/nixops-pre-1.6-evalFranz Pletz2018-03-29
| |\ \ \
| | * | | nixos/version: fix nixops pre 1.6 compatibilityFranz Pletz2018-03-28
| | |/ /
| * | | nixos/monit: restart if config changesRyan Mulligan2018-03-28
| * | | zerotier module: add option to join networks and open portobadz2018-03-28
| * | | Merge pull request #38000 from ryantm/auto-update/dovecotFranz Pletz2018-03-28
| |\ \ \
| | * | | nixos/dovecot: set group in configFranz Pletz2018-03-28
| * | | | Revert restrictive validation behavior for DM/WM defaults in the X moduleMaximilian Bosch2018-03-28
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into stagingShea Levy2018-03-28
|\| | |
| * | | Merge pull request #37507 from xeji/p/test-atdFranz Pletz2018-03-28
| |\ \ \
| | * | | nixos/tests/atd : remove test of batch commandxeji2018-03-21
| * | | | apache-httpd: fix typo in config servedFilesJustin Humm2018-03-28
| | |/ / | |/| |
| * | | Merge pull request #37897 from mkaito/tarsnap-symlinks-and-restoreYegor Timoshenko2018-03-27
| |\ \ \
| | * | | Address @yegortimoshenko reviewMichishige Kaito2018-03-27
| | * | | Add restore service for tarsnap archivesMichishige Kaito2018-03-27
| | * | | Add support for tarsnap options -H and -LMichishige Kaito2018-03-27
| * | | | Merge branch 'riscv-limitations'Shea Levy2018-03-27
| |\ \ \ \
| | * | | | kexectools: Disable only on RISC-V if Linux.Shea Levy2018-03-27
| * | | | | linuxPackages.nvidia_x11_legacy173: dropNikolay Amiantov2018-03-27
| |/ / / /
| * / / / nixos/systemd: add option for cgroup accountingdavidak2018-03-27
| |/ / /
| * | | Merge pull request #37827 from oxij/pull/28938-tor-control-portJoachim F2018-03-26
| |\ \ \