summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Added cross-references to NixOS manualReuben D'Netto2018-04-12
|
* 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
| * | xen: fix broken version comparisonsxeji2018-03-07
| | | | | | | | | | | | string compare breaks with xen 4.10 (because "4.10" < "4.8")
* | | Merge branch 'setuid-wrapper-readlink'Shea Levy2018-03-07
|\ \ \
| * | | nixos: setuid-wrapper: simplify readlink logicShea Levy2018-03-07
| | | |
* | | | nixos release: more evaluation fixesVladimír Čunát2018-03-07
| | | | | | | | | | | | | | | | ... if missing x86 in supportedSystems
* | | | nixos/release: fix evaluation if missing x86Vladimír Čunát2018-03-07
| |/ / |/| | | | | | | | ... in supportedSystems
* | | nixos doc: give context and definition re NIXOS_LUSTRATEobadz2018-03-07
| | | | | | | | | | | | Re #36272
* | | Merge pull request #36367 from NixOS/yegortimoshenko-patch-1Jörg Thalheim2018-03-06
|\ \ \ | | | | | | | | tt-rss: use proper user and package for MySQL
| * | | tt-rss: use proper user and package for MySQLYegor Timoshenko2018-03-06
| | | |
* | | | Merge pull request #35844 from adisbladis/jquery-mvadisbladis2018-03-06
|\ \ \ \ | | | | | | | | | | jquery & jquery-ui: Move to nixos/lib/testing/
| * | | | jquery & jquery-ui: Move to nixos/lib/testing/adisbladis2018-02-27
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | These (outdated) derivations are only used by nixos/lib/testing.nix. If we want to provide jquery & jquery-ui packages this is better done in nodePackages.
* | | | nixos/tests/keymap: Remove OCR-friendly SLiM themeaszlig2018-03-06
| |/ / |/| | | | | | | | | | | | | | | | | The test doesn't use OCR, so we actually don't need an OCR-friendly theme here. Signed-off-by: aszlig <aszlig@nix.build>
* | | Merge pull request #36350 from volth/nix-serveJörg Thalheim2018-03-05
|\ \ \ | | | | | | | | nix-serve: nix 2.0 fixes
| * | | nix-serve: nix 2.0 fixesvolth2018-03-05
| | | |
* | | | 18.03 -> 18.09Vladimír Čunát2018-03-05
| | | | | | | | | | | | | | | | I don't have a name ready :-( so I have to fill it later.
* | | | Merge pull request #27678 from ↵Frederik Rietdijk2018-03-05
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | volth/restore-bridge-slaves-dynamically-added-by-libvirt nixos/networking-scripted: restore bridge slaves dynamically added by…
| * | | | add separator in case if a VM connected to more than 1 bridgeVolth2017-08-21
| | | | |
| * | | | support lxc:/// and ignore weird bridges (like openvswitch)Volth2017-08-01
| | | | |
| * | | | nixos/networking-scripted: restore bridge slaves dynamically added by libvirtVolth2017-07-27
| | | | |
* | | | | nixos/initrd-network: add udhcpc.extraArgs option (#36305)Dino Dai Zovi2018-03-05
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to fix issues where udhcpc times out before acquiring a lease. For example of these issues, see: https://bugs.alpinelinux.org/issues/3105#note-8 Signed-off-by: Dino A. Dai Zovi <ddz@theta44.org>
* | | | Merge pull request #30416 from symphorien/luksnokeyFranz Pletz2018-03-05
|\ \ \ \ | | | | | | | | | | nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
| * | | | luksroot.nix: rename fallback to fallbackToPasswordSymphorien Gibol2017-12-14
| | | | |
| * | | | nixos/luksroot.nix: add option boot.initrd.luks.devices.<name?>.fallbackSymphorien Gibol2017-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option, if set to true, enables fallbacking to an interactive passphrase prompt when the specified keyFile is not found. The default is false, which is compatible with previous behavior and doesn't prevent unattended boot.
| * | | | nixos/luksroot.nix: fallback to interactive password entry when no keyfile foundSymphorien Gibol2017-10-14
| | | | |
* | | | | LightDM: Set default user session when possible.Will Fancher2018-03-04
| | | | |
* | | | | Merge pull request #32248 from awakesecurity/parnell/fetchdockerFranz Pletz2018-03-04
|\ \ \ \ \ | | | | | | | | | | | | Support fetching docker images from V2 registries
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into parnell/fetchdockerParnell Springmeyer2018-02-13
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into parnell/fetchdockerParnell Springmeyer2018-01-10
| |\ \ \ \ \ \
| * | | | | | | hocker: Don't check package and wrap the binaries with PATH to nixParnell Springmeyer2017-12-02
| | | | | | | |
| * | | | | | | fetchdocker: Integration test exercising hocker and fetchdockerParnell Springmeyer2017-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a simple integration test exercising the fetchdocker Nix code and hocker utilities for the simple `hello-world` docker container. We exercise: - Fetching the docker image configuration json - Fetching the docker image layers - Building a compositor script - Loading the `hello-world` docker image into docker using the compositor script and `docker load` - Running that loaded container
* | | | | | | | Merge #35554: nixos/opengl: unhide and documentVladimír Čunát2018-03-04
|\ \ \ \ \ \ \ \
| * | | | | | | | nixos/opengl: unhide and document enable optionLinus Heckemann2018-02-25
| | | | | | | | |
* | | | | | | | | Merge pull request #36272 from obadz/nixos-lustrate-docobadz2018-03-04
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE
| * | | | | | | | | nixos-enter: specify absolute path to bashobadz2018-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not doing so makes it impossible to use nixos-enter from a non-NixOS distro
| * | | | | | | | | nixos doc: document the installation process from other distros as well as ↵obadz2018-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NIXOS_LUSTRATE
* | | | | | | | | | Merge #35454: nixos/pump.io: removeVladimír Čunát2018-03-04
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | nixos/pump.io: also comment-out the uidVladimír Čunát2018-03-04
| | | | | | | | | | |
| * | | | | | | | | | Release notes: mention removal of pump.io moduleRodney Lorrimar2018-02-27
| | | | | | | | | | |
| * | | | | | | | | | nixos/pump.io: removeRodney Lorrimar2018-02-27
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would probably be better maintained in a separate repo as an external NixOS module which gets imported into user's configuration.
* | | | | | | | | | Revert "networkd: also load builtin modules"Jörg Thalheim2018-03-04
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d514dc220e9fad27a46ef329360bb8db2cdf22ea. breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
* | | | | | | | | Merge pull request #36249 from Ekleog/openldap-module-declarative-contentsJörg Thalheim2018-03-03
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Openldap module declarative contents
| * | | | | | | | | nixos/openldap: add testJörg Thalheim2018-03-03
| | | | | | | | | |
| * | | | | | | | | openldap module: allow defining contents declarativelyLéo Gaspard2018-03-03
| | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-17 14:47:39 +0000