Silvan Mosberger
c3f00f7c16
Merge pull request #44061 from ljani/avahi-extraconfig
...
nixos/avahi: add support for extraConfig
2018-07-29 20:07:11 +02:00
Michael Weiss
01cfa808ff
Merge pull request #43682 from primeos/never-stop-system.slice
...
nixos/switch-to-configuration: Never stop system.slice
2018-07-28 20:42:22 +02:00
Jani
d17770d0d5
nixos/avahi: add support for extraConfig
2018-07-28 12:48:08 +03:00
Bas van Dijk
72f3a5cf5c
Merge pull request #44038 from LumiGuide/elk-6.3.0
...
elk: 6.2.4 -> 6.3.2
2018-07-28 00:33:18 +02:00
Bas van Dijk
ebcdb822f8
elk: 6.2.4 -> 6.3.2
...
* The ELK stack is upgraded to 6.3.2.
* `elasticsearch6`, `logstash6` and `kibana6` now come with X-Pack which is
a suite of additional features. These are however licensed under the unfree
"Elastic License".
* Fortunately they also provide OSS versions which are now packaged
under: `elasticsearch6-oss`, `logstash6-oss` and `kibana6-oss`.
Note that the naming of the attributes is consistent with upstream.
* The test `nix-build nixos/tests/elk.nix -A ELK-6` will test the OSS
version by default. You can also run the test on the unfree ELK using:
`NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true`
2018-07-28 00:01:31 +02:00
Tuomas Tynkkynen
cad1c18743
nixos/rename: Add temporary aliases for the system.nixos.* rename revert
...
See the previous commit for motivation.
2018-07-28 00:12:55 +03:00
Tuomas Tynkkynen
96190535e5
Revert "nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1"
...
This reverts commit 095fe5b43d
.
Pointless renames considered harmful. All they do is force people to
spend extra work updating their configs for no benefit, and hindering
the ability to switch between unstable and stable versions of NixOS.
Like, what was the value of having the "nixos." there? I mean, by
definition anything in a NixOS module has something to do with NixOS...
2018-07-28 00:12:55 +03:00
Silvan Mosberger
7eb5ba7618
Merge pull request #44015 from alexshpilkin/resolv-unbound
...
nixos/networking: include local Unbound in resolv.conf
2018-07-24 22:53:53 +02:00
Eelco Dolstra
c9ea04b57f
EC2 AMIs: 18.03.131792.becbe4dbe16 -> 18.03.132946.1caae7247b8
2018-07-24 21:19:14 +02:00
Matthew Bauer
1b40dda8a7
Merge pull request #42834 from Synthetica9/patch-1
...
security.sudo.extraRules: documentation fix
2018-07-23 11:29:18 -04:00
Matthew Bauer
ca0522a842
Merge pull request #41970 from aneeshusa/enable-building-systemd-without-libmicrohttpd
...
nixos/systemd: Allow building systemd without libmicrohttpd
2018-07-23 11:24:14 -04:00
Alexander Shpilkin
81fa1ceeee
nixos/networking: include local Unbound in resolv.conf
...
Previously, only BIND, dnsmasq and resolved were included in
resolv.conf. Recognize an Unbound installation as well.
2018-07-23 16:26:03 +02:00
volth
92b3e8f147
fix build with allowAliases=false
2018-07-23 00:12:23 +00:00
volth
cc55a3ebcb
treewide: fix build with disallowed aliases ( #43872 )
...
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
Jörg Thalheim
e9ff0f9448
Merge pull request #43863 from volth/unused4
...
[bot] nixos/*: remove unused arguments in lambdas
2018-07-21 16:39:08 +01:00
Daiderd Jordan
9d72403814
ssh: fix 3572f89bbe
2018-07-21 13:06:16 +02:00
Daiderd Jordan
3572f89bbe
ssh: don't add empty PubkeyAcceptedKeyTypes/HostKeyAlgorithms
...
The options introduced in e2444a433f
would generate a broken
ssh config when set to an empty list.
/etc/ssh/ssh_config line 7: Missing argument.
2018-07-21 12:29:16 +02:00
Daiderd Jordan
e2444a433f
Merge pull request #40686 from Izorkin/ssh
...
ssh: custom config key types
2018-07-21 11:57:41 +02:00
Izorkin
05bc5fed28
ssh: custom config key types
2018-07-21 12:27:16 +03:00
Frederik Rietdijk
8424ac61a9
Merge pull request #43862 from volth/unused3
...
[bot] treewide: remove unused 'args@' in lambdas
2018-07-21 11:14:44 +02:00
Frederik Rietdijk
251a0a9a86
Merge pull request #43860 from volth/unused2
...
treewide: remove unused 'inherit' in let blocks
2018-07-21 11:13:36 +02:00
volth
2e979e8ceb
[bot] nixos/*: remove unused arguments in lambdas
2018-07-20 20:56:59 +00:00
Pascal Wittmann
c271ebdde7
Merge pull request #40768 from CommunicationAnimale/master
...
nixos/thinkfan: use non-deprecated keywords in config file.
2018-07-20 22:27:56 +02:00
volth
dda95bae35
[bot] treewide: remove unused 'args@' in lambdas
2018-07-20 19:54:05 +00:00
volth
6d2857a311
[bot] treewide: remove unused 'inherit' in let blocks
2018-07-20 19:38:19 +00:00
Frederik Rietdijk
1a6af9f88e
Merge pull request #43857 from volth/unused
...
[bot] treewide: remove unreferenced code
2018-07-20 21:06:32 +02:00
volth
87f5930c3f
[bot]: remove unreferenced code
2018-07-20 18:48:37 +00:00
Robert Schütz
55a12c9763
nixos/home-assistant: do not always override extraComponents ( #43845 )
...
Fixes #43843 .
2018-07-20 19:28:29 +02:00
Erik Arvstedt
aecf24a0eb
openvpn: document how to import an external config
2018-07-20 10:51:52 +02:00
Robert Schütz
e7e5aaa0b9
Merge pull request #43782 from Ma27/fix-simpleldap-python3
...
python3Packages.simpleldap: remove
2018-07-19 17:54:13 +02:00
Maximilian Bosch
0adca53c79
inginious: remove
...
Fallout of 9db7f15ea3ce57eee25458daf87cce7a04ea98b2 which removed
simpleldap.
@layus suggests to remove:
* https://github.com/NixOS/nixpkgs/pull/43782#issuecomment-406186881
* https://github.com/NixOS/nixpkgs/pull/31975#issuecomment-346647857
2018-07-19 17:31:40 +02:00
Matthew Bauer
76999cc40e
treewide: remove aliases in nixpkgs
...
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
2018-07-18 23:25:20 -04:00
Silvan Mosberger
810f91f46d
Merge pull request #43308 from Chiiruno/dev/hydron
...
hydron: init at 2018-07-11
2018-07-18 22:10:11 +02:00
Silvan Mosberger
35c069ea02
nixos: systemd.globalEnvironment: fix type
...
Follow up fix of fb2a8d6669
https://github.com/NixOS/nixpkgs/pull/38356
https://github.com/NixOS/nixpkgs/pull/40416
2018-07-18 22:04:26 +02:00
Okina Matara
38f2a3efbf
nixos/hydron: init
2018-07-18 13:16:50 -05:00
Sarah Brofeldt
5672083461
Merge pull request #43728 from srhb/k8srbacfix
...
nixos/kubernetes: Don't lose rbac submodule with no explicit options
2018-07-18 12:37:44 +02:00
Sarah Brofeldt
6dd6f28415
nixos/kubernetes: Don't lose rbac submodule with no explicit options
2018-07-18 12:02:06 +02:00
Johan Thomsen
205b54ed95
nixos/kubernetes: Added missing dependency, awk, to kube-addon-manager path ( #43708 )
2018-07-18 10:47:27 +02:00
Michael Weiss
7098b0fcdf
nixos/switch-to-configuration: Never stop system.slice
...
Problem: Restarting (stopping) system.slice would not only stop X11 but
also most system units/services. We obviously don't want this happening
to users when they switch from 18.03 to 18.09 or nixos-unstable.
Reason: The following change in systemd:
d8e5a93382
The commit adds system.slice to the perpetual units, which means
removing the unit file and adding it to the source code. This is done so
that system.slice can't be stopped anymore but in our case it ironically
would cause this script to stop system.slice because the unit file was
removed (and an older systemd version is still running).
Related issue: https://github.com/NixOS/nixpkgs/issues/39791
2018-07-17 19:37:36 +02:00
Frederik Rietdijk
1ae2f10642
Merge staging-next into master
2018-07-17 10:04:59 +02:00
Silvan Mosberger
f2632f5c60
Merge pull request #42748 from patternspandemic/neo4j-service
...
nixos/neo4j: Update module, make compatible with neo4j 3.4
2018-07-16 22:31:25 +02:00
Frederik Rietdijk
3c09808160
Merge master into staging-next
2018-07-16 07:43:37 +02:00
Wael M. Nasreddine
fd2448b2e6
aerospike: init at 4.2.0.4
...
Co-authored-by: Volth <volth@webmaster.ms>
2018-07-16 04:21:47 +00:00
Franz Pletz
1cfc4963a9
Merge pull request #43147 from Ma27/fix-nixos-option-evaluation
...
nixos/nixos-option: don't abort in case of evaluation errors
2018-07-16 03:57:37 +00:00
xeji
311f017066
Merge pull request #43494 from jb55/clipmenu-master
...
clipmenu: init at 5.4.0
2018-07-16 00:48:31 +02:00
Franz Pletz
8bda93f0b2
Merge pull request #37096 from jfrankenau/feat-cups-socket
...
nixos/cupsd: Add option to start when needed
2018-07-15 21:39:07 +00:00
Franz Pletz
92c82e0933
nixos/thinkfan: add types & fix formatting
2018-07-15 23:28:14 +02:00
William Casarin
6c1eb15a3b
nixos/modules: add clipmenu user service
...
add a clipmenud daemon user service
2018-07-15 12:22:46 -07:00
Matthew Bauer
19fc061a13
Merge pull request #43169 from samueldr/fix/stripDirs
...
Fixes `stripDirs` use after signature change
2018-07-14 19:07:46 -04:00
Johannes Frankenau
d81f819db3
nixos/cupsd: add option to start when needed
2018-07-14 23:39:43 +02:00