summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* nixos/acme: add webroots to ReadWritePathsFélix Baylac-Jacqué2021-10-04
* Merge branch 'master' into staging-nextRyan Burns2021-09-23
|\
| * Merge pull request #139189 from yurrriq/helm-3.7.0Sandro2021-09-23
| |\
| | * kubernetes-helm: 3.6.3 -> 3.7.0Eric Bailey2021-09-23
| * | Merge pull request #138852 from ryantm/dev/ryantm/discourse-skip-createKim Lindberger2021-09-23
| |\ \ | | |/ | |/|
| | * nixos/discourse: add discourse.admin.skipCreate optionRyan Mulligan2021-09-21
| * | Merge pull request #139026 from rnhmjoj/kube-fixMichele Guerini Rocco2021-09-23
| |\ \
| | * | nixos/kubernetes: fix containerd settingsrnhmjoj2021-09-23
| | * | nixos/containerd: use v2 settings by defaultrnhmjoj2021-09-23
| * | | nixos/trafficserver: avoid input from derivationrnhmjoj2021-09-23
| |/ /
* | | Merge master into staging-nextgithub-actions[bot]2021-09-23
|\| |
| * | nixos/opensmtpd: Add missing brackets in config (#138989)Rickard Nilsson2021-09-22
| * | Merge pull request #138931 from Ma27/safeeyes-appdataMaximilian Bosch2021-09-22
| |\ \
| | * | nixos/safeeyes: add `safeeyes` to the global pathMaximilian Bosch2021-09-22
| | * | nixos/safeeyes: add `alsa-utils` for `aplay` to the service's pathMaximilian Bosch2021-09-22
| | |/
* | | Merge master into staging-nextgithub-actions[bot]2021-09-22
|\| |
| * | Merge #138918: Fix several NixOS errors in Hydra evaluationVladimír Čunát2021-09-22
| |\ \
| | * | nixos/kubernetes: fix deprecation warningrnhmjoj2021-09-22
| | * | nixos/plotinus: fix evaluationrnhmjoj2021-09-22
| | * | nixos/tests/mpv: remove deprecated mpv-with-scriptsrnhmjoj2021-09-22
| | * | nixos/tests/atop: remove top-level stringrnhmjoj2021-09-22
| | * | nixos/tests/wasabibackend: fix bitcoind configrnhmjoj2021-09-22
| | * | nixos/tests/pantheon: fix missing librnhmjoj2021-09-22
| | * | nixos/tests/systemd-networkd-ipv6-prefix-delegation: fix wrapperrnhmjoj2021-09-22
| | * | nixos/atop: fix broken wrapperrnhmjoj2021-09-22
| | * | nixos/tests/mariadb-galera-rsync: fix nogrouprnhmjoj2021-09-22
| | * | nixos/tests/mariadb-galera-mariabackup: fix nogrouprnhmjoj2021-09-22
| | * | nixos/tests/minio: fix deprecation warningrnhmjoj2021-09-22
| | * | nixos/tests/mysql: fix nogrouprnhmjoj2021-09-22
| | * | nixos: filalex77 -> Br1ght0nernhmjoj2021-09-22
| | * | nixos/tests: drop latestKernel.hardenedrnhmjoj2021-09-22
| | * | nixos: heimdalFull -> heimdalrnhmjoj2021-09-22
| | * | nixos/flannel: pkgs.etcdctl -> pkgs.etcdrnhmjoj2021-09-22
| | * | nixos/tests/ec2: fix conflicting option valuesrnhmjoj2021-09-22
| | * | nixos/tests/enlightenment: fix renamed optionsrnhmjoj2021-09-22
| | * | nixos/dnscrypt-wrapper: fix nogrouprnhmjoj2021-09-22
| | * | nixos/tests/cntr: fix evaluationrnhmjoj2021-09-22
| | * | nixos/tests/prometheus-exporters: fix nogrouprnhmjoj2021-09-22
| | * | nixos/tests: stdenv.lib -> librnhmjoj2021-09-22
* | | | Merge remote-tracking branch 'nixpkgs/master' into staging-nextAlyssa Ross2021-09-22
|\| | |
| * | | Merge pull request #138544 from Izorkin/fix-netdataJörg Thalheim2021-09-22
| |\ \ \ | | |_|/ | |/| |
| | * | nixos/netdata: fix working with disabled ipmi pluginIzorkin2021-09-19
| * | | Merge pull request #125966 from ju1m/apparmorSandro2021-09-21
| |\ \ \
| | * | | nixos/apparmor: allow closure of selected mallocLib, fixes #125415Julien Moutinho2021-06-06
| * | | | Merge pull request #135284 from legendofmiracles/weylusSandro2021-09-21
| |\ \ \ \
| | * | | | nixos/weylus: initlegendofmiracles2021-09-02
| * | | | | Merge pull request #138731 from illdefined/feature/memoryallocator-mimallocSandro2021-09-21
| |\ \ \ \ \
| | * | | | | nixos/malloc: add mimallocMikael Voss2021-09-20
| | | |_|_|/ | | |/| | |
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-09-21
|\| | | | |
| * | | | | nixos/mastodon: Add configurable web- and streaming concurrencyembr2021-09-21