about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge staging-next into stagingFrederik Rietdijk2019-08-17
|\
| * Merge master into staging-nextFrederik Rietdijk2019-08-17
| |\
| | * Merge pull request #60422 from kwohlfahrt/device-treeSamuel Dionne-Riel2019-08-16
| | |\
| | | * nixos/hardware.deviceTree: Move things aroundKai Wohlfahrt2019-08-07
| | | * nixos/hardware.deviceTree: new moduleKai Wohlfahrt2019-08-07
| | * | systemd-networkd: link: Name -> OriginalNameEdmund Wu2019-08-15
| | * | nixos-hardened: disable unprivileged userfaultfd syscallsJoachim Fasting2019-08-15
| | * | nixos-hardened: enable page alloc randomizationJoachim Fasting2019-08-15
| | * | Merge pull request #66588 from lschuermann/nixos-enter-silentMarek Mahut2019-08-15
| | |\ \
| | | * | nixos-enter: silent activation script optionLeon Schuermann2019-08-13
| | * | | nixos aws: use in-kernel ixgbevf driver (#58956)Peter Hoeg2019-08-15
| | * | | Merge pull request #66648 (improve xkbvalidate)aszlig2019-08-15
| | |\ \ \
| | | * | | xkbvalidate: Rename output binary to xkbvalidateaszlig2019-08-15
| | * | | | Merge pull request #66638 from worldofpeace/favorite-apps-gnome3worldofpeace2019-08-14
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | nixos/gnome3: set favorite-appsworldofpeace2019-08-14
| | * | | | cups: add myself as maintainerMatthew Bauer2019-08-14
| | * | | | tests/printing: don’t wait for unit servicesMatthew Bauer2019-08-14
| | * | | | nixos: Add release notes for CUPS changesMatthew Bauer2019-08-14
| | * | | | nixos/cupsd: use socket-based activation by defaultMatthew Bauer2019-08-14
| | * | | | nixos/cupsd: include /run/cups/cups.sock in ListenStreamsMatthew Bauer2019-08-14
| | * | | | nixos/cupsd: only enable cups when startWhenNeeded = falseMatthew Bauer2019-08-14
| | * | | | nixos/cupsd: Set CUPS_DATADIR globallyMatthew Bauer2019-08-14
| | * | | | Merge pull request #66338 from worldofpeace/installer/no-rootworldofpeace2019-08-14
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | installer: Don't run as rootworldofpeace2019-08-12
| | * | | | Merge pull request #66480 from primeos/nixos-fuseMatthew Bauer2019-08-14
| | |\ \ \ \
| | | * | | | Fix the indentationMichael Weiss2019-08-12
| | | * | | | nixos/fuse: initMichael Weiss2019-08-11
* | | | | | | treewide: name -> pname (easy cases) (#66585)volth2019-08-15
|/ / / / / /
* | | | | | Merge master into staging-nextFrederik Rietdijk2019-08-14
|\| | | | |
| * | | | | Merge pull request #66612 from fadenb/oxidized_permission_issueWilliButz2019-08-14
| |\ \ \ \ \
| | * | | | | nixos/oxidized: Use symlinks for config filesTristan Helmich (omniIT)2019-08-14
| * | | | | | Merge pull request #66593 from aaronjanse/crashdump-poll-fixworldofpeace2019-08-13
| |\ \ \ \ \ \
| | * | | | | | nixos/modules/misc/crashdump: remove idle=poll (fix #66464)Aaron Janse2019-08-13
| | |/ / / / /
| * | | | | | Merge pull request #66425 from Gerschtli/fix/path-orderMatthew Bauer2019-08-13
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | environment.profiles: fix order of profilesTobias Happ2019-08-10
| * | | | | | Merge pull request #65439 from aanderse/httpd-extra-modulesMarek Mahut2019-08-13
| |\ \ \ \ \ \
| | * | | | | | nixos/httpd: remove duplicate module entries from httpd.confAaron Andersen2019-07-26
| * | | | | | | Merge pull request #65728 from Infinisil/types-eithersAaron Andersen2019-08-13
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/modules: Replace all nested types.either's with types.oneOf'sSilvan Mosberger2019-08-08
| | * | | | | | | lib/types: Add oneOf, extension of either to a list of typesSilvan Mosberger2019-08-06
| * | | | | | | | Merge pull request #63716 from peterhoeg/f/mosquittoPeter Hoeg2019-08-13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/mosquitto: make the tests runPeter Hoeg2019-06-24
| * | | | | | | | | Merge pull request #66561 from Ma27/document-user-services-on-rebuildWilliButz2019-08-13
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos/doc: document that services defined with `systemd.users` aren't restart...Maximilian Bosch2019-08-13
| * | | | | | | | | | Merge pull request #62914 from Ma27/improve-nixos-rebuild-manpageWilliButz2019-08-13
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | doc/nixos-rebuild(8): add Nix options to summaryMaximilian Bosch2019-06-10
| * | | | | | | | | | Merge pull request #66436 from domenkozar/nixos-options-doc-nixDomen Kožar2019-08-13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | pkgs.lib -> libDomen Kožar2019-08-12
| | * | | | | | | | | | make-options-doc: add asciidoc variantDomen Kožar2019-08-10
| | * | | | | | | | | | make-options-doc: expose Nix setDomen Kožar2019-08-10