summary refs log tree commit diff
path: root/nixos/modules
Commit message (Collapse)AuthorAge
* nixos/security: fix description of sudo.wheelNeedsPasswordgiraffito2018-03-16
| | | the previous description mistakenly described the opposite semantics
* 18.09: Jackrabbit -> JellyfishVladimír Čunát2018-03-16
| | | | | | See eb0fa09232 and github discussion on that. My misgiving about the t-shirts was refuted. I don't think this flip may negatively affect anyone.
* Merge commit '3ab2949' from staging into masterTuomas Tynkkynen2018-03-15
|\ | | | | | | | | | | Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix
| * Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-03-13
| |\ | | | | | | | | | | | | Conflicts: pkgs/development/tools/build-managers/conan/default.nix
| * \ Merge branch 'master' into stagingJan Malakhovski2018-03-10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
| * \ \ Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into stagingTuomas Tynkkynen2018-03-03
| |\ \ \
| * | | | nixos: Add nixpkgs.crossSystem option for cross-compilationShea Levy2018-03-01
| | | | |
| * | | | Merge remote-tracking branch 'origin/staging' into cross-nixosShea Levy2018-03-01
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-03-01
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-03-01
| | |\ \ \ \ \
| * | | | | | | nixos: Move uses of stdenv.shell to runtimeShell.Shea Levy2018-03-01
| | | | | | | |
| * | | | | | | stage-2-init: Use the host bash as SHELLShea Levy2018-03-01
| | | | | | | |
| * | | | | | | nixos: Fix initrd dependency detection when cross-compiling.Shea Levy2018-03-01
| | | | | | | |
| * | | | | | | gobjectIntrospection: Enable building without X11 support.Shea Levy2018-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also disable it when noXlibs in NixOS.
| * | | | | | | Merge remote-tracking branch 'origin/master' into cross-nixosShea Levy2018-02-28
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | nixos: sudo: Use build-time visudo for syntax check.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: keymap: Fix cross-compilation.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: stage-1: Don't try to test binaries when cross-compiling.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: Take glibcLocales from buildPackages.Shea Levy2018-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to cross-compile pure data...
| * | | | | | | nixos: udev: Generate hwdb with build-native udevadm.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: kexec: Disable on non-keexecable systems.Shea Levy2018-02-28
| | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
| * \ \ \ \ \ \ Merge master into stagingVladimír Čunát2018-02-26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to cleanup the (re-)revert of merge to master.
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-24
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | cups service: fix client socketsNikolay Amiantov2018-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use systemd to create the directory for UNIX socket. Also use localhost instead of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when available.
* | | | | | | | | | | Merge pull request #36924 from etu/gitea-postgres-autocreate-databaseSamuel Leathers2018-03-15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Gitea postgres autocreate database
| * | | | | | | | | | | gitea: enable and configure postgres service if selected as databaseElis Hirwing2018-03-15
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | nixos: fix install-grub.pl dependenciesJan Malakhovski2018-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fallback from updates to perl
* | | | | | | | | | | nixos/qemu-vm: Add virtualized display + HID devices on AArch64Tuomas Tynkkynen2018-03-14
| | | | | | | | | | |
* | | | | | | | | | | 18.09: let's call it "Jackrabbit"Vladimír Čunát2018-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was mainly considering Jellyfish and Jaguar (and Jackrabbit). Originally I was inclined for Jellyfish, but then I thought of the release T-shirts someone makes and it didn't seem suitable... Jaguar would keep the name referring to a car as well, but as a not-too-old (Mac) OS version is codenamed that way, I didn't go for it.
* | | | | | | | | | | Merge pull request #36845 from jbedo/singularitylewo2018-03-14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | singularity: 2.4 -> 2.4.2
| * | | | | | | | | | singularity: 2.4 -> 2.4.2Justin Bedo2018-03-12
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #36850 from teto/virtualisationMichael Raskin2018-03-13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Virtualisation
| * | | | | | | | | | | grub-install.pl: more details on blkid failureMatthieu Coudron2018-03-12
| | | | | | | | | | | |
| * | | | | | | | | | | build-vm: remove trailing dot from script pathMatthieu Coudron2018-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to double click/middle click paste path a bit quicker.
| * | | | | | | | | | | qemu-vm: removes warning when running build-vmMatthieu Coudron2018-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get rid of deprecated qemu commands
* | | | | | | | | | | | Merge pull request #36783 from Infinisil/desciption/update/resilioJörg Thalheim2018-03-12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | resilio: Adjust option description to 3d17573
| * | | | | | | | | | | resilio: Adjust option description to 3d17573Silvan Mosberger2018-03-11
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* / | | | | | | | | | nixos/network-interfaces: Fix 2 small typosSilvan Mosberger2018-03-10
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #36357 from matthewbauer/vbox-usableJörg Thalheim2018-03-09
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | demo: make virtualbox more usable
| * | | | | | | | | | demo: autologin through xserverMatthew Bauer2018-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also disable upower on virtualbox Fixes #36348
* | | | | | | | | | | Merge pull request #30418 from LnL7/inline-set-environmentDaiderd Jordan2018-03-08
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nixos: inline set-environment for bash and zsh
| * | | | | | | | | | | nixos: inline set-environment for bash and zshDaiderd Jordan2017-10-14
| | | | | | | | | | | |
* | | | | | | | | | | | nixos/tomcat: add types + proper systemd integrationJörg Thalheim2018-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #35443
* | | | | | | | | | | | nixos/tomcat: add serverXml, environment files and log directoriesBenjamin Smith2018-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add serverXml verbatim override * add environment file * add log directory creation
* | | | | | | | | | | | Revert "Merge branch 'setuid-wrapper-readlink'"Shea Levy2018-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kernel symlinks don't have st_size. Really thought I tested this, guess I ran the wrong NixOS test :( This reverts commit 6dab907ebe9c8015b8cbc4871313ed48c64c548c, reversing changes made to eab479a5f0e46ad461ebda9953477be8f1e5e2bb.
* | | | | | | | | | | | Merge pull request #36292 from xeji/xen-4-10Michael Raskin2018-03-07
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | xen: add v 4.10
| * | | | | | | | | | | | xen 4.10: link /etc/xen/oxenstored.confxeji2018-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is required for oxenstored to start