about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2020-06-15
|\
| * Merge pull request #90380 from mdlayher/mdl-corerad-passasfileSilvan Mosberger2020-06-15
| |\
| | * nixos/corerad: use passAsFile while converting settings JSON to TOMLMatt Layher2020-06-14
| * | Merge pull request #90297 from lheckemann/other-distro-tool-install-commandMaximilian Bosch2020-06-15
| |\ \ | | |/ | |/|
| | * manual: use less weird way of installing nixos toolsLinus Heckemann2020-06-14
| * | Merge pull request #89781 from mdlayher/mdl-corerad-settingsSilvan Mosberger2020-06-14
| |\ \
| | * | nixos/corerad: add settings option to supersede configFileMatt Layher2020-06-14
| * | | Merge pull request #90261 from prusnak/installer-zstd-rmPeter Hoeg2020-06-14
| |\ \ \
| | * | | images: remove original files when using zstd for compressionPavol Rusnak2020-06-14
| | | |/ | | |/|
| * | | Merge pull request #89772 from rnhmjoj/dnschainMichele Guerini Rocco2020-06-13
| |\ \ \
| | * | | nixos/release-notes: document dnschain removalrnhmjoj2020-06-13
| | * | | dnschain: remove package and NixOS modulernhmjoj2020-06-13
| | | |/ | | |/|
| * | | nixos/timesyncd: Make dbus-activatibleArian van Putten2020-06-13
| * | | nixos/networkd: Make activatible through dbus and netlinkArian van Putten2020-06-13
| * | | nixos/resolved: Include dbus alias of resolved unitArian van Putten2020-06-13
* | | | Merge master into staging-nextFrederik Rietdijk2020-06-13
|\| | |
| * | | nixos/lib/make-disk-image.nix: VDI supportEmery Hemingway2020-06-13
| * | | Merge pull request #90157 from obsidiansystems/socket-based-ipfsJohn Ericson2020-06-12
| |\ \ \
| | * | | nixos/ipfs: only set listenstream when gateway/api is defaultMatthew Bauer2020-06-12
| | * | | nixos/ipfs: always expose socketsMatthew Bauer2020-06-12
| | * | | nixos/ipfs: actually use upstream systemd unitsMatthew Bauer2020-06-12
| | * | | nixos/ipfs: add startWhenNeeded optionMatthew Bauer2020-06-12
| | * | | nixos/ipfs: consolidate services into one ipfs.serviceMatthew Bauer2020-06-11
| | * | | nixos/ipfs: remove unused auto migrate featureMatthew Bauer2020-06-11
| * | | | Merge pull request #87178 from hax404/teeworlds-module-testJörg Thalheim2020-06-12
| |\ \ \ \
| | * | | | nixos/{modules,tests}/teeworlds: initGeorg Haas2020-06-06
| * | | | | Merge pull request #89662 from aanderse/ssmtpMaximilian Bosch2020-06-12
| |\ \ \ \ \
| | * | | | | nixos/ssmtp: drop authPass option in favor of authPassFile, or services.ssmtp...Aaron Andersen2020-06-12
| | * | | | | nixos/ssmtp: add settings optionAaron Andersen2020-06-07
| | |/ / / /
| * | | | | Merge pull request #89159 from datafoo/fix-issue-89158Michele Guerini Rocco2020-06-12
| |\ \ \ \ \
| | * | | | | nixos/networking: check interface state files exist before acting on themdatafoo2020-05-29
* | | | | | | Merge master into staging-nextFrederik Rietdijk2020-06-12
|\| | | | | |
| * | | | | | Merge pull request #88718 from adisbladis/vmware-xorg-driver-defaultsadisbladis2020-06-11
| |\ \ \ \ \ \
| | * | | | | | services.x11.videoDrivers: Don't include vmware driver by defaultadisbladis2020-06-11
| * | | | | | | nixos/prometheus-lnd-exporter: initMartin Milata2020-06-11
| |/ / / / / /
| * | | | | | Merge pull request #89540 from Patryk27/fixes/lxd-lxcfsMatthew Bauer2020-06-11
| |\ \ \ \ \ \
| | * | | | | | lxd: Add testsPatryk Wychowaniec2020-06-08
| | * | | | | | lxd: When `lxcfs` is enabled, start `lxd` with explicit `LXD_LXC_TEMPLATE_CON...Patryk Wychowaniec2020-06-05
| | * | | | | | lxd: Add proper support for `nftables`Patryk Wychowaniec2020-06-05
| * | | | | | | Merge pull request #90128 from vcunat/p/locales-priorityMatthew Bauer2020-06-11
| |\ \ \ \ \ \ \
| | * | | | | | | nixos i18n.supportedLocales: increase systemPackages priorityVladimír Čunát2020-06-11
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #90077 from mdlayher/mdl-nixos-apcupsdWilliButz2020-06-11
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/prometheus-apcupsd-exporter: new moduleMatt Layher2020-06-10
| * | | | | | | | Merge pull request #89810 from mdlayher/mdl-keylight-exporterWilliButz2020-06-11
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | nixos/prometheus-keylight-exporter: new moduleMatt Layher2020-06-10
| * | | | | | | | Merge pull request #90027 from Mic92/redisJörg Thalheim2020-06-10
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | nixos/redis: add redis groupJörg Thalheim2020-06-10
* | | | | | | | | Merge branch 'master' into staging-nextVladimír Čunát2020-06-10
|\| | | | | | | |
| * | | | | | | | transmission: add libstdc++ and libgcc_s permissions to apparmor profileDavid Izquierdo2020-06-10
| * | | | | | | | Merge branch 'staging-next'Vladimír Čunát2020-06-10
| |\ \ \ \ \ \ \ \