summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #104520 from Izorkin/wsddFlorian Klink2020-11-23
|\
| * nixos/tests/samba-wsdd: add check WSD DiscoveryIzorkin2020-11-23
| * nixos/samba-wsdd: init service samba-wsddIzorkin2020-11-23
* | nixos/*: fix indentationzowoq2020-11-23
* | nixos/tests/fctix: remove trailing whitespacezowoq2020-11-23
* | Merge pull request #104456 from endgame/refresh-instance-metadata-on-bootGraham Christensen2020-11-22
|\ \
| * | rl-21.03: describe EC2 instance user/meta data reloadingJack Kelly2020-11-22
| * | {ec2,openstack}-metadata-fetcher: unconditionally fetch metadataJack Kelly2020-11-22
| * | {ec2,openstack}-metadata-fetcher: introduce wget_imds functionJack Kelly2020-11-22
| * | openstack-metadata-fetcher: stop lying in log messageJack Kelly2020-11-22
| |/
* | Merge pull request #99116 from jslight90/gitlab-13.4.0Florian Klink2020-11-22
|\ \ | |/ |/|
| * nixos/tests/gitlab: add 32 byte secretsMilan Pässler2020-11-21
| * nixos/gitlab: start gitaly after gitlabMilan Pässler2020-11-21
| * nixos/gitlab: add changes for gitlab 13.4.xJeff Slight2020-11-20
* | Merge pull request #94610 from kwohlfahrt/openldapJörg Thalheim2020-11-21
|\ \
| * | nixos/openldap: migrate sssd-ldap to new settingsKai Wohlfahrt2020-11-21
| * | nixos/openldap: Fix sssd-ldap testKai Wohlfahrt2020-11-21
| * | nixos/openldap: use mkRenamedOptionModuleKai Wohlfahrt2020-11-21
| * | nixos/openldap: fix path + base64 value typesKai Wohlfahrt2020-11-21
| * | nixos/openldap: Fix indentationKai Wohlfahrt2020-11-21
| * | nixos/openldap: Remove extraConfig optionsKai Wohlfahrt2020-11-21
| * | nixos/openldap: Mention schemas in migration hintKai Wohlfahrt2020-11-21
| * | nixos/openldap: Add release-notes for OLC configKai Wohlfahrt2020-11-21
| * | nixos/openldap: Add support for base64 valuesKai Wohlfahrt2020-11-21
| * | nixos/openldap: Pick some PR nitsKai Wohlfahrt2020-11-21
| * | nixos/openldap: Allow declarativeContents for multiple databasesKai Wohlfahrt2020-11-21
| * | nixos/openldap: Add delcarativeConfig by suffixKai Wohlfahrt2020-11-21
| * | nixos/openldap: switch to slapd.d configurationKai Wohlfahrt2020-11-21
* | | Merge pull request #78168 from active-group/subversion-apache-config-docsAaron Andersen2020-11-21
|\ \ \ | |/ / |/| |
| * | nixos/doc: Rudimentary documentation for Subversion-inside-Apache HTTP.Mike Sperber2020-11-14
* | | Merge pull request #104052 from TredwellGit/nixos/mallocJoachim F2020-11-21
|\ \ \
| * | | nixos/malloc: fix ScudoTredwellGit2020-11-17
* | | | nixos test-driver: fix single line docstrings, fixes #104467Frederik Rietdijk2020-11-21
* | | | Merge master into staging-nextFrederik Rietdijk2020-11-21
|\ \ \ \
| * \ \ \ Merge pull request #102235 from symphorien/paperwork2Guillaume Girol2020-11-20
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | nixos: add release notes for the paperwork update.Symphorien Gibol2020-11-15
| * | | | Merge pull request #98544 from Mic92/unfuck-update-user-groupGraham Christensen2020-11-20
| |\ \ \ \
| | * | | | nixos/update-users-groups: write files truly atomicJörg Thalheim2020-09-23
| | * | | | nixos/update-users-groups: fix encoding of json databaseJörg Thalheim2020-09-23
| | * | | | nixos/update-users-group: treat all file as utf-8Jörg Thalheim2020-09-23
| * | | | | Merge pull request #104374 from adisbladis/dockertools-cross-aarch64adisbladis2020-11-20
| |\ \ \ \ \
| | * | | | | dockerTools: Always cross compile for another arch in the cross exampleadisbladis2020-11-20
| * | | | | | nix: 2.3.8 -> 2.3.9Eelco Dolstra2020-11-20
| |/ / / / /
* | | | | | Merge master into staging-nextFrederik Rietdijk2020-11-20
|\| | | | |
| * | | | | nixos: release-combined: only build the amazon image for x86_64,aarch64-linux...Graham Christensen2020-11-19
* | | | | | Merge branch 'master' into staging-nextJan Tojnar2020-11-20
|\| | | | |
| * | | | | Merge pull request #104322 from grahamc/amazon-imageGraham Christensen2020-11-19
| |\ \ \ \ \
| | * | | | | nixos/release-small: add amazonImageGraham Christensen2020-11-19
| * | | | | | Merge pull request #104193 from grahamc/ec2-metadata-imdsv2Graham Christensen2020-11-19
| |\ \ \ \ \ \
| | * | | | | | nixos: release: add amazonImage as a channel blockerGraham Christensen2020-11-19