summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2020-11-06
|\
| * Merge pull request #98661 from doronbehar/doc/nixos/systemd-nixos-specificMichele Guerini Rocco2020-11-06
| |\
| | * doc/nixos: Explain better NixOS specific Systemd stuffDoron Behar2020-11-06
| * | Merge pull request #102202 from danderson/danderson/post-stopAaron Andersen2020-11-05
| |\ \
| | * | nixos/tailscale: use upstream systemd service config.David Anderson2020-11-03
| * | | Merge pull request #96639 from xfix/support-microsoft-usb-keyboardsTimo Kaufmann2020-11-05
| |\ \ \
| | * | | nixos/availableKernelModules: add microsoft hidKonrad Borowski2020-08-29
| * | | | Merge pull request #102928 from NeQuissimus/scala_testTim Steinbach2020-11-05
| |\ \ \ \
| | * | | | scala: Refactor, add testsTim Steinbach2020-11-05
| * | | | | nixos/systemd-resolved: fix incorrect userPeter Hoeg2020-11-05
| * | | | | Merge pull request #102273 from rnhmjoj/bluetoothWout Mertens2020-11-05
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | nixos/bluetooth: disable restart on unit changesrnhmjoj2020-10-31
| * | | | | Merge pull request #102850 from NeQuissimus/oh-my-zsh_updateTim Steinbach2020-11-05
| |\ \ \ \ \
| | * | | | | oh-my-zsh: Add testTim Steinbach2020-11-04
* | | | | | | Merge branch 'master' into staging-nextJan Tojnar2020-11-05
|\| | | | | |
| * | | | | | Merge pull request #102817 from NeQuissimus/ammonite_updateTim Steinbach2020-11-04
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | ammonite: Add test reference, update scriptTim Steinbach2020-11-04
| * | | | | | Merge pull request #102642 from NeQuissimus/sbt_1_4_2Tim Steinbach2020-11-04
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | sbt: Add testTim Steinbach2020-11-04
| * | | | | | Merge pull request #102652 from freezeboy/remove-btc1Marek Mahut2020-11-04
| |\ \ \ \ \ \
| | * | | | | | btc1: removefreezeboy2020-11-04
| * | | | | | | Merge pull request #99003 from martinetd/stunnel-docDaniel Schaefer2020-11-04
| |\ \ \ \ \ \ \
| | * | | | | | | stunnel: make servers accept more lenientDominique Martinet2020-11-02
| | * | | | | | | stunnel service: fix servers exampleDominique Martinet2020-11-01
| * | | | | | | | Support virtio_scsi devices on nixos-generate-configVictor Nawothnig2020-11-04
* | | | | | | | | Merge staging-next into stagingFrederik Rietdijk2020-11-04
|\| | | | | | | |
| * | | | | | | | Merge pull request #101249 from Izorkin/dhcpd-ipv6Jörg Thalheim2020-11-04
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | nixos/dhcpcd: if disabled IPv6 don't solicit or accept IPv6Izorkin2020-10-21
| * | | | | | | | nixos/modules/services/network-filesystems/ipfs: refactorFabián Heredia Montiel2020-11-03
| * | | | | | | | Merge pull request #102530 from Ma27/fix-initrd-network-ssh-testMaximilian Bosch2020-11-04
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | nixos/initrd-network-ssh: fix testMaximilian Bosch2020-11-02
| * | | | | | | | Merge pull request #102528 from wizeman/u/fix-chrony-perm2Kevin Cox2020-11-03
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/chrony: fix owner of chrony drift fileRicardo M. Correia2020-11-02
| * | | | | | | | | Merge pull request #99906 from talyz/keycloakKim Lindberger2020-11-03
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos/keycloak: Add support for MySQL and external DBs with SSLtalyz2020-10-29
| | * | | | | | | | | rl-2103: Note the addition of the Keycloak servicetalyz2020-10-29
| | * | | | | | | | | nixos/keycloak: Add documentationtalyz2020-10-29
| | * | | | | | | | | nixos/keycloak: Document internal functionstalyz2020-10-29
| | * | | | | | | | | nixos/keycloak: Add testtalyz2020-10-29
| | * | | | | | | | | nixos/keycloak: Inittalyz2020-10-27
| * | | | | | | | | | Merge pull request #102551 from freezeboy/remove-freepopsajs1242020-11-03
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | nixos(freepops): remove modulefreezeboy2020-11-03
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #102541 from helsinki-systems/init/promtailWilliButz2020-11-03
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos/promtail: Add a promtail moduleJanne Heß2020-11-03
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #100495 from DianaOlympos/riak-cs-deleteKevin Cox2020-11-03
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | riak-cs: deleteThomas Depierre2020-10-28
| * | | | | | | | | | Merge pull request #99632 from midchildan/update/epgstationTimo Kaufmann2020-11-03
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | epgstation: 1.7.4 -> 1.7.5midchildan2020-10-21
| | * | | | | | | | | | epgstation: add updateScriptmidchildan2020-10-20
* | | | | | | | | | | | Merge staging-next into stagingFrederik Rietdijk2020-11-03
|\| | | | | | | | | | |