Frederik Rietdijk
9894a70299
Merge staging into staging-next
2019-09-06 22:47:40 +02:00
Frederik Rietdijk
66bc7fc1b3
Merge master into staging-next
2019-09-06 22:46:05 +02:00
WilliButz
9118eb3482
nixos/tests: remove prometheus_1 test
2019-09-06 21:55:24 +02:00
WilliButz
bb62066225
nixos/prometheus: remove prometheus1 module, rename prometheus2
...
Prometheus 1 is no longer supported, instead 'services.prometheus'
now configures the Prometheus 2 service.
2019-09-06 21:55:23 +02:00
Nikolay Amiantov
daa9ea2987
murmur service: fix typo in description
2019-09-06 20:29:20 +03:00
worldofpeace
5d4890b58d
Merge pull request #67585 from worldofpeace/system-config-printer
...
nixos/system-config-printer: init
2019-09-06 12:08:23 -04:00
worldofpeace
998f59ccda
nixos/mate: enable system-config-printer
...
After some research this should be installed as a program
in Mate or Cinnamon.
2019-09-06 12:06:32 -04:00
worldofpeace
335b8c65c7
nixos/plasma5: use system-config-printer module
2019-09-06 12:06:32 -04:00
worldofpeace
146532b272
nixos/xfce4-14: use system-config-printer module
2019-09-06 12:06:32 -04:00
worldofpeace
2fe7bd3ab3
nixos/gnome3: use system-config-printer module
2019-09-06 12:06:32 -04:00
worldofpeace
6b99ec2dbe
nixos/pantheon: use system-config-printer module
2019-09-06 12:06:32 -04:00
worldofpeace
c6abb69785
rl-1909: note about system-config-printer
2019-09-06 12:06:32 -04:00
Silvan Mosberger
cd9f199c2b
Merge pull request #68210 from ivan/nixos-railcar-string
...
nixos/railcar: remove use of the deprecated string type
2019-09-06 17:42:50 +02:00
Jan Tojnar
8563088e69
Merge branch 'staging-next' into staging
2019-09-06 16:55:45 +02:00
Jan Tojnar
f9237f3152
Merge branch 'master' into staging-next
2019-09-06 16:55:11 +02:00
Ivan Kozik
5a03f90525
nixos/railcar: remove use of the deprecated string type
...
This fixes the warning being emitted by nixos-rebuild switch:
building Nix...
building the system configuration...
trace: warning: types.string is deprecated because it quietly concatenates strings
It started emitting a warning in #66346 .
2019-09-06 14:53:11 +00:00
worldofpeace
792444af84
nixos/system-config-printer: init
2019-09-06 09:40:17 -04:00
adisbladis
194aac9eed
elk-stack: Add release note about elk-5 stack removal
2019-09-06 14:30:49 +01:00
adisbladis
a3032415f7
kibana5: Remove EOL package
2019-09-06 14:30:49 +01:00
adisbladis
4e30b30a65
logstash5: Remove EOL package
2019-09-06 14:22:15 +01:00
adisbladis
0cce8856b2
elk-5: Remove tests
...
These packages are EOL and are about to be removed
2019-09-06 14:22:14 +01:00
Domen Kožar
d7c4106ce0
Merge pull request #68197 from jtojnar/nixos-doc-make-fix
...
nixos/doc/manual: Fix Makefile
2019-09-06 14:10:23 +02:00
Jan Tojnar
81e755f305
nixos/doc/manual: Fix Makefile
...
We had `./options-to-docbook.xsl` as a dependency for `generated` target but it was moved to a package in https://github.com/NixOS/nixpkgs/pull/66328 .
2019-09-06 12:40:06 +02:00
Jan Tojnar
4564295b3b
rl-1909: make services.gnome3 links sensible ( #68196 )
...
rl-1909: make services.gnome3 links sensible
2019-09-06 12:29:12 +02:00
worldofpeace
270b4866e3
rl-1909: make services.gnome3 links sensible
2019-09-06 05:25:27 -04:00
Sarah Brofeldt
57b66eb3f2
Merge pull request #68138 from johanot/ceph-14.2.3
...
ceph: 14.2.1 -> 14.2.3
2019-09-06 07:31:45 +02:00
Jan Tojnar
306cc9b311
Merge branch 'staging-next' into staging
2019-09-06 03:21:30 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
...
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
ed54a5b51d
Merge branch 'gtk-no-plus'
2019-09-06 02:57:51 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
...
GTK was renamed.
2019-09-06 02:54:53 +02:00
Linus Heckemann
734da72661
Merge pull request #68110 from Ma27/weechat-python3
...
weechat: build with python3 by default
2019-09-05 20:05:47 +02:00
Maximilian Bosch
e4bc0e2b5f
weechatScripts.weechat-xmpp: remove
...
This plugin is fairly outdated and depends on python2 libraries that
don't receive any updates either (xmpppy for instance[1]).
[1] https://pypi.org/project/xmpppy/
2019-09-05 20:03:46 +02:00
Craige McWhirter
169cb996c5
postgresql: improve identMap description
...
This patch provides example usage for identMap based upon PostrgeSQL documentation
@thoughtpolice
2019-09-05 12:28:21 -05:00
Johan Thomsen
161855c033
ceph: 14.2.1 -> 14.2.3
2019-09-05 14:33:29 +02:00
Vladimír Čunát
e5dece4cbf
Merge branch 'staging-next' into staging
2019-09-05 10:23:46 +02:00
Sarah Brofeldt
11e72e547d
Merge pull request #67563 from johanot/kubernetes-1.15-withmodulerevert
...
kubernetes: 1.14.3 -> 1.15.3
Also reverts the module systemd dependencies
2019-09-05 07:34:11 +02:00
aszlig
601bed3849
nixos/tests/quake3: Fix evaluation error
...
In c814d72b51
, a bunch of packages were
changed to use the pname attribute, among them were the quake3-demodata
and quake3-pointrelease which we use for the quake3 test.
Fortunately, having pname available means that we no longer need to
match using a prefix, so fixing this eval error also simplifies our
matching.
I directly pushed this to master because the change is non-controversial
and we can't break things that are already broken :-)
Signed-off-by: aszlig <aszlig@nix.build>
2019-09-05 07:00:12 +02:00
Katharina Fey
589c156869
nixos/railcar: small style changes
2019-09-04 22:46:42 +00:00
Katharina Fey
8f7da8ce0b
nixos/railcar: init
2019-09-04 22:46:42 +00:00
Eelco Dolstra
37e333af9a
nix: 2.2.2 -> 2.3
2019-09-04 21:36:49 +02:00
Sarah Brofeldt
ef76e7df16
nixos/manual: Fix build after broken Ceph release note
2019-09-04 19:33:07 +02:00
Silvan Mosberger
7ff619f440
Merge pull request #68015 from aanderse/zookeeper
...
nixos/zookeeper: recursively set permissions and ownership on dataDir
2019-09-04 19:00:49 +02:00
Andrew Childs
84742e2293
amazon-image.nix: upload prebuilt images
2019-09-05 00:52:21 +09:00
Andrew Childs
25bee972e9
amazon-image.nix: add hydra-build-products and improve metadata
2019-09-05 00:52:20 +09:00
Andrew Childs
9898fd0e8e
nixos/release.nix: add "amazonImage" for building Amazon EC2 Images
2019-09-05 00:52:20 +09:00
Andrew Childs
027e5560bd
amazon-image.nix: default to vpc formatted images
...
These can be imported without converison.
2019-09-05 00:52:20 +09:00
Andrew Childs
5501274b5f
amazon-image.nix: add EFI support, enable by default for aarch64
2019-09-05 00:52:17 +09:00
Johan Thomsen
d891283aa4
nixos/kubernetes: make module compatible with v1.15.x
2019-09-04 17:38:41 +02:00
Johan Thomsen
00975b5628
Revert "Merge pull request #56789 from mayflower/upstream-k8s-refactor"
...
This reverts commit 7dc6e77bc2
, reversing
changes made to bce47ea9d5
.
Motivation for the revert in #67563
2019-09-04 17:37:02 +02:00
Johan Thomsen
fb22d67fa7
ceph: 13.2.4 -> 14.2.1
...
* remove kinetic
* release note
* add johanot as maintainer
nixos/ceph: create option for mgr_module_path
- since the upstream default is no longer correct in v14
* fix module, default location for libexec has changed
* ceph: fix test
2019-09-04 16:17:18 +02:00