summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-13
|\
| * Merge pull request #34705 from etu/php-upgradeFranz Pletz2018-02-13
| |\
| | * php: 7.1.14 -> 7.2.2Elis Hirwing2018-02-07
| * | Merge pull request #34905 from vcunat/p/kresd-TLSJörg Thalheim2018-02-13
| |\ \
| | * | kresd service: add listenTLS optionVladimír Čunát2018-02-12
| * | | nixos/prometheus/alertmanager: double hyphenate long opts (#34914)Ruben Maher2018-02-12
| |/ /
| * | Merge #34866: nixos doc: efficient comparisonsVladimír Čunát2018-02-12
| |\ \
| | * | nixos: doc: trivial cleanup and docstring fixJan Malakhovski2018-02-11
| | * | nixos: doc: make option sorting somewhat more efficientJan Malakhovski2018-02-11
| * | | jid: remove packageProfpatsch2018-02-12
| * | | nixos/testing: use the same qemu in the test driverFranz Pletz2018-02-11
| * | | bird2: init at 2.0.1Franz Pletz2018-02-11
* | | | systemd: 234 -> 237Franz Pletz2018-02-13
* | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-11
|\| | |
| * | | Merge #32774: slurm-spank-x11: init at 0.2.5Vladimír Čunát2018-02-10
| |\ \ \
| | * | | slurm-spank-x11: init at 0.2.5Markus Kowalewski2018-01-25
| * | | | nixos/acpid: pass event parameters to handler (#34190)Daniel Schaefer2018-02-10
| * | | | Merge pull request #34384 from gnidorah/nvidia-optimusJörg Thalheim2018-02-10
| |\ \ \ \
| | * | | | modules/nvidia-optimus: fix module blacklistinggnidorah2018-01-29
| * | | | | Merge pull request #34524 from Infinisil/physlock-allowAnyUserJörg Thalheim2018-02-10
| |\ \ \ \ \
| | * | | | | physlock: add allowAnyUser optionSilvan Mosberger2018-02-02
| * | | | | | Merge pull request #34655 from markus1189/zookeeper-package-optionJörg Thalheim2018-02-10
| |\ \ \ \ \ \
| | * | | | | | zookeeper.service: option for package and add to environmentMarkus Hauck2018-02-06
| * | | | | | | Merge pull request #34728 from dpc/masterJörg Thalheim2018-02-10
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/pam: support for Google AuthenticatorDawid Ciężarkiewicz2018-02-09
| * | | | | | | | Merge pull request #34753 from noqqe/masterJörg Thalheim2018-02-10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Multiple users with hashedPassword is broken in mosquittoFlorian Baumann2018-02-08
| * | | | | | | | | nixos/rdma-core: add module for soft RoCE and test (#34607)markuskowa2018-02-10
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge pull request #33898 from oxij/nixos/related-packages-v5Graham Christensen2018-02-09
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/xen-dom0: add related packages, make it play well with themJan Malakhovski2018-02-09
| | * | | | | | | | nixos/adb: add related packageJan Malakhovski2018-02-09
| | * | | | | | | | nixos/tmux: add related packageJan Malakhovski2018-02-09
| | * | | | | | | | nixos, lib: implement relatedPackages optionJan Malakhovski2018-02-09
| | * | | | | | | | nixos/doc: push all the `enable*' and `package*` options to the top of their ...Jan Malakhovski2018-02-09
| | |/ / / / / / /
| * | | | | | | | Merge pull request #34778 from oxij/os/allow-pkgsGraham Christensen2018-02-09
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos: export packages of the current configuration (its `pkgs` argument)Jan Malakhovski2018-02-09
| | |/ / / / / / /
* | | | | | | | | Merge pull request #34518 from aneeshusa/document-default-kerberos-in-opensshJörg Thalheim2018-02-10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | openssh: Document default Kerberos supportAneesh Agrawal2018-02-02
* | | | | | | | | Merge pull request #33700 from roberth/nixos-externalpkgsFranz Pletz2018-02-09
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nixos: Add nixpkgs.pkgs optionRobert Hensing2018-01-30
* | | | | | | | | | Merge pull request #32582 from Ma27/yabar-moduleFranz Pletz2018-02-09
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | yabar: add moduleMaximilian Bosch2018-01-04
* | | | | | | | | | | nixos/tests: add predictable-interface-names.nix (#34305)symphorien2018-02-09
* | | | | | | | | | | nixos/release*.nix: Clean nixpkgs sources by defaultRobert Hensing2018-02-09
* | | | | | | | | | | Merge pull request #34562 from griff/rspamd-workersAndreas Rammhold2018-02-09
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | nixos/rspamd: options for worker configuration and socket activationBrian Olsen2018-02-09
| * | | | | | | | | | | nixos/tests: add basic tests for services.rspamdBrian Olsen2018-02-03
* | | | | | | | | | | | Merge pull request #34759 from dotlambda/dovecotAndreas Rammhold2018-02-09
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | nixos/dovecot: no " in mailbox.nameRobert Schütz2018-02-09
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* / | | | | | | | | | | nixos/traefik: make group configurable for docker support (#34749)Hamish2018-02-09
|/ / / / / / / / / / /