about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* U-Boot: 2017.03 -> 2017.11Tuomas Tynkkynen2017-11-18
| | | | | Also move patches from sd-image-aarch64.nix, they might be useful for the older raspberries as well.
* Merge pull request #31378 from michaelpj/imp/plymouth-nixos-brandingOrivej Desh2017-11-18
|\ | | | | breeze-plymouth: add optional nixos branding, enable for plasma5
| * plasma5: enable NixOS branding in plymouth themeMichael Peyton Jones2017-11-18
| |
* | nixos/pam: fix docs about path to u2f_keys fileBjørn Forsman2017-11-17
| | | | | | | | | | | | | | | | | | Looking at upstream git repo (git://github.com/Yubico/pam-u2f.git) the docs initially said the path was ~/.yubico/u2f_keys, but it was later changed to ~/.config/Yubico/u2f_keys (in 2015). I have run pam_u2f.so with "debug" option and observed that the correct path indeed is ~/.config/Yubico/u2f_keys.
* | nixos/tests/acme: update terms of service to fix testFranz Pletz2017-11-17
| |
* | nixos/prometheus: Correct documentation for external_labelsOliver Charles2017-11-17
| | | | | | | | As description is literal XML, I need to escape < and > by hand.
* | nixos/prometheus: add external_labels optionOliver Charles2017-11-17
| |
* | nixos/prometheus: add scrape_configs.honor_labelsOliver Charles2017-11-17
| |
* | Merge pull request #31753 from mbld/show-ipOrivej Desh2017-11-17
|\ \ | | | | | | nixos-container: Make show-ip work together with ipv4 + netmask
| * | nixos-container: Modify existing test to cover show-ip commandMartin Bornhold2017-11-16
| | | | | | | | | | | | | | | Modified the existing test to check that the 'nixos-container show-ip' command can handle ipv4 addresses with submask in CIDR notation.
* | | Merge pull request #31618 from adisbladis/zfs-testsOrivej Desh2017-11-16
|\ \ \ | |/ / |/| | Add basic ZFS tests
| * | Add basic ZFS testsadisbladis2017-11-14
| | |
* | | nixos/nghttpx: add module for the nghttpx proxy server (#31680)Parnell Springmeyer2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | * nghttpx: Add a new NixOS module for the nghttpx proxy server This change also adds a global `uid` and `gid` for a `nghttpx` user and group as well as an integration test. * nixos/nghttpx: fix building manual
* | | Merge pull request #31641 from danbst/patch-13Franz Pletz2017-11-16
|\ \ \ | | | | | | | | mysql module: fix flaky check
| * | | mysql module: fix flaky checkDanylo Hlynskyi2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | | Comparing packages via equality will lead to different results when package and module are from different `nixpkgs` checkouts. Also, because MariaDB is actually supported, added a note to option description to make this knowledge more discover-able.
* | | | Merge pull request #31268 from Ma27/x11-defaultsTim Steinbach2017-11-15
|\ \ \ \ | | | | | | | | | | services.xserver: fix defaults of X11
| * | | | services.xserver: fix `apply` of default DM/WMMaximilian Bosch2017-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | This is needed to pick the first enabled DM/WM if the default is `none`
| * | | | Revert "Revert "services.xserver: assert that either desktop- or window ↵Maximilian Bosch2017-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manager is not "none""" This reverts commit e64dc2543458b52abcd913bad87851f5d7db435d.
* | | | | Merge pull request #31504 from benley/fontconfig-localconfThomas Tuegel2017-11-15
|\ \ \ \ \ | | | | | | | | | | | | fonts: fix fontconfig.localConf when used with penultimate
| * | | | | fonts: fix fontconfig.localConf when used with penultimateBenjamin Staffin2017-11-10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #31500
* | | | | | gnome3.gnome-online-miners: add missing dleyna dependencyJan Tojnar2017-11-15
| | | | | |
* | | | | | dleyna-server: init at 0.6.0Jan Tojnar2017-11-15
| | | | | |
* | | | | | gnome3.gnome-photos: add missing dleyna depenencyJan Tojnar2017-11-15
| | | | | |
* | | | | | dleyna-renderer: init at 0.6.0Jan Tojnar2017-11-15
| | | | | |
* | | | | | nixos-option: don't eval descriptionMaximilian Bosch2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | | see https://github.com/NixOS/nixpkgs/pull/31630#issuecomment-344073438
* | | | | | dovecot: fix config if mailboxes == []Robin Gloster2017-11-14
| | | | | |
* | | | | | Merge pull request #31616 from jerith666/smartd-catFranz Pletz2017-11-14
|\ \ \ \ \ \ | | | | | | | | | | | | | | smartd: fix 'cat: command not found' error
| * | | | | | smartd: fix 'cat: command not found' errorMatt McHenry2017-11-13
| | | | | | |
* | | | | | | Merge pull request #31477 from andir/fix-babeld-configFranz Pletz2017-11-14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix babeld config
| * | | | | | | babeld module: updated example configAndreas Rammhold2017-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previosuly the example config did feature the deprecated `wired` paramter. Wired can now be configured using the `type` parameter.
| * | | | | | | babeld module: support non-boolean default argumentsAndreas Rammhold2017-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previosuly only boolean values would be rendered properly. All other values would cause an error. Even the example configuration did fail.
| * | | | | | | babeld module: separate default options by spaceAndreas Rammhold2017-11-10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the previous version multiple default values would generate an invalid babeld config file since all options would be concatenated without any separator.
* | | | | | | Merge pull request #31545 from rnhmjoj/wirelessFranz Pletz2017-11-14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | docs: document networking.wireless changes
| * | | | | | | docs: document networking.wireless changesrnhmjoj2017-11-12
| | | | | | | |
* | | | | | | | nixos installer tests: Add UEFI Grub testTuomas Tynkkynen2017-11-14
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Fixed merge conflict. Closes #22923.
* | | | | | | tests/boot-stage1: Fix build of kcanary moduleaszlig2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In bfe9c928c18583d3adfb5978a55b48c392649ef5 the default kernel has been updated to version 4.14 and the declarations for allow_signal() and signal_pending() are no longer exposed via kthread.h, so let's actually use the right header files. I've added a condition for kernel 4.10 and upwards to include the linux/sched/signal.h header file, because that got introduced in version 4.10. Even if the declaration would still reside in kthread.h (I haven't checked) for version 4.10 it won't hurt and the compilation will still succeed. Tested against kernel 4.9 and 4.14 and the build now succeeds. Signed-off-by: aszlig <aszlig@nix.build>
* | | | | | | Merge pull request #31630 from Ma27/fix-postgres-quotingGraham Christensen2017-11-13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | services.postgres: fix quoting in the description of `superUser`
| * | | | | | | services.postgres: fix quoting in the description of `superUser`Maximilian Bosch2017-11-13
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `nixos-option` evals the description and the '`' is used to define shell commands. Due to this, the following error appears: ``` $ nixos-option services.postgresql.superUser Value: "root" Default: "root" Description: /run/current-system/sw/bin/nixos-option: line 294: root: command not found /run/current-system/sw/bin/nixos-option: line 294: postgres: command not found NixOS traditionally used as superuser, most other distros use . From 17.09 we also try to follow this standard. Internal since changing this value would lead to breakage while setting up databases. ```
* | | | | | | Merge pull request #31526 from srhb/fix-php-external-pcreOrivej Desh2017-11-13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | php: Fix php pcre by using external lib
| * | | | | | | php: pcre test blocks -small channels as wellSarah Brofeldt2017-11-12
| | | | | | | |
| * | | | | | | php: Add nixos test to ensure php-pcre works in httpdSarah Brofeldt2017-11-12
| | |_|/ / / / | |/| | | | |
* | | | | | | fractalart service: init, Generate wallpapers (#23231)Tom Smeets2017-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a service for generating wallpapers This service will generate a new wallpaper using the "FractalArt" haskell package.
* | | | | | | make-disk-image: fix evalOrivej Desh2017-11-13
| | | | | | |
* | | | | | | Merge pull request #31532 from romildo/upd.enlightenmentSamuel Leathers2017-11-12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | enlightenment: 0.21.10 -> 0.22.0
| * | | | | | | enlightenment: 0.21.10 -> 0.22.0José Romildo Malaquias2017-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update to version 0.22.0 - Switch build tools from autotools to meson - Change handling of setuid programs
* | | | | | | | make-disk-image: embed compression switch into the format nameOrivej Desh2017-11-12
| | | | | | | |
* | | | | | | | make-disk-image: add compressed option to compress qcow2 imagesOrivej Desh2017-11-12
| | | | | | | |
* | | | | | | | make-disk-image: clean upOrivej Desh2017-11-12
| | | | | | | |
* | | | | | | | Merge pull request #31537 from orivej/lklOrivej Desh2017-11-12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | lkl: 2017-10-18 -> 2017-11-10, make-disk-image: do not fake time for cptofs
| * | | | | | | make-disk-image: do not use faketimeOrivej Desh2017-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since https://github.com/lkl/linux/pull/394 cptofs preserves the source time, which is 1970-01-01T00:00:01Z for /nix/store and recent for other files. This reverts commit f5b3f2c5a7f2b51e80ac32fb47fd1d7d3e475ad1.