1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Commit graph

14239 commits

Author SHA1 Message Date
Frederik Rietdijk 4b929acf67 Merge staging-next into staging 2019-09-08 22:33:17 +02:00
Frederik Rietdijk 47caef475f Merge master into staging-next 2019-09-08 20:45:29 +02:00
Vladimír Čunát 7e91247596
Merge branch 'staging-next' into staging 2019-09-08 18:28:11 +02:00
Andreas Rammhold f59b4cb8d5
nixos/tests/login: fix the seat test by loading sound drivers
It turned out that /dev/snd/* always exists even if there are no sound
drivers loaded at all. Loading `snd` and `snd_timer` fixes that
situation. It is probably fair to assume someone that wants to use sound
also enables that in the NixOS configuration.
2019-09-08 17:14:14 +02:00
Andreas Rammhold 2b605e96c2
nixos/networkd: continue supporting 99-main with wildcard interface match
With systemd version 243 network units with empty match block will
generate warnigs. The reasoning seems to be that the intended behaviour
is hard to infere. Being explicit about really meaning any interface is
the reasonable thing here.

We want to get rid of this mechanism in the long run but as long as we
do not have a replacement we should stick with it and keep it in
reasonable good shape.
2019-09-08 17:14:13 +02:00
Sarah Brofeldt 0771a1273d
Merge pull request #68308 from srhb/rerec-utils
nixos/lib/utils: Make the set recursive again, unbreak eval
2019-09-08 15:36:59 +02:00
rnhmjoj 7468809e72
nixos/doc: inform users of startx about -xkbdir argument needed 2019-09-08 15:16:16 +02:00
rnhmjoj e57c0f3bf9
nixos/xserver: export configuration with startx and extra layouts
If the X server is run manually it must be started with an `-xkbdir` argument
pointing to the custom xkb directory. So we export it to /etc/X11/xkb.
2019-09-08 14:51:23 +02:00
Frederik Rietdijk e73f871285 Merge master into staging-next 2019-09-08 14:49:25 +02:00
worldofpeace 362c2f67f9
Merge pull request #68037 from dtzWill/update/upower-0.99.11
upower: 0.99.10 -> 0.99.11
2019-09-08 08:14:35 -04:00
Sarah Brofeldt 7ca5b39125 nixos/lib/utils: Make the set recursive again, unbreak eval 2019-09-08 13:31:18 +02:00
worldofpeace 16083defb5 nixos/upower: drop resumeCommands hack
Introduced 7 years ago, it's likely the issue has
been fixed. Even possible this could cause issues
with recent upower.
2019-09-08 07:02:58 -04:00
worldofpeace 92740dd4a8 nixos/upower: drop custom unit
All of these changes ++ are in the upstream unit
Also drop glib in path of unit as I don't believe
this should be needed anymore.
2019-09-08 07:02:58 -04:00
worldofpeace ab48ede4c3 nixos/upower: don't use activation script to create statedir
Systemd now handles this completely.
2019-09-08 07:02:57 -04:00
Vladimír Čunát 707c7e4ea8
deluge service: fix my bad conflict resolution from f21211ebf
I'm sorry.  Thanks to aszlig.
2019-09-08 08:42:53 +02:00
Florian Klink 2f3b9cd52c
Merge pull request #66274 from talyz/gitlab
nixos/gitlab: Add support for secure secrets and more
2019-09-07 12:52:44 -07:00
Calvin Kim fa53852804 nixos/cmt: add cmt module
Adds custom touchpad drivers for Chromebooks.
2019-09-08 03:02:25 +09:00
adisbladis 8e2fc57a80
postgresql_9_4: Remove package
It's only supported until February 13, 2020 which is during the 19.09 life cycle.
2019-09-07 15:31:27 +01:00
Jan Tojnar 9fcdb3bd16
Merge branch 'master' into staging-next 2019-09-07 14:55:03 +02:00
adisbladis 88a70c9669
nixos/kibana: Filter empty lists
Some options (in particular elasticsearch.ssl.certificateAuthorities)
are not allowed to be empty.
2019-09-07 13:24:24 +01:00
Marek Mahut a2550e2af5
Merge pull request #68243 from mmahut/jormungandr
nixos/jormungandr: adding RUST_BACKTRACE until service is stable
2019-09-07 11:29:51 +02:00
Frederik Rietdijk 7e9e5cab45 Merge master into staging-next 2019-09-07 09:53:09 +02:00
worldofpeace 416f057bc3
Merge pull request #68213 from worldofpeace/ead/fix
nixos/iwd: add tmpfiles rule for ead service
2019-09-07 03:40:06 -04:00
adisbladis b3a06f10d1 iso-image-kde: Disable synaptics
It's been deprecated since 17.09 and libinput is a better default
2019-09-07 03:30:45 -04:00
worldofpeace 93e5683353
Merge pull request #68182 from worldofpeace/chrome-gnome-shell
nixos/gnome3: enable chrome-gnome-shelll
2019-09-07 03:13:22 -04:00
Marek Mahut af9c515c8b nixos/jormungandr: adding RUST_BACKTRACE until service is stable 2019-09-07 08:31:28 +02:00
Florian Klink db1f05c763
Merge pull request #66405 from NeQuissimus/virtualbox_6_0_10
virtualbox: 6.0.8 -> 6.0.10
2019-09-06 20:33:35 -07:00
worldofpeace e49049493a
Merge pull request #68233 from worldofpeace/plasma5-enable-libinput
nixos/plasma5: enable libinput
2019-09-06 19:23:28 -04:00
worldofpeace 466f5e5346 nixos/plasma5: enable libinput 2019-09-06 19:18:52 -04:00
worldofpeace 4e89375846
Merge pull request #67917 from worldofpeace/lightdm-pam-gnome-keyring
nixos/lightdm: fix pam rules
2019-09-06 18:50:07 -04:00
worldofpeace 0c602541a3 nixos/lightdm: fix pam rules
Rules are a translation of what's done in the
GDM module and adjustments based of looking at
Arch Linux's configuration and upstream's.

A side effect of this change is that gnome-keyring
and kwallet modules should work as expected when in-
cluded.

Fixes #64259 #62045
2019-09-06 18:22:22 -04:00
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
worldofpeace b9d9045d57 nixos/cupsd: passwordless admin for wheel with polkit 2019-09-06 13:51:38 -04: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
worldofpeace 3722f1d20e nixos/iwd: add tmpfiles rule for ead service
This is needed for the wired service ead.service.
(in ReadWritePaths)
2019-09-06 11:32:55 -04:00
talyz 240649a510 nixos/gitlab: Extract arbitrary secrets from extraConfig
Adds the ability to make any parameter specified in extraConfig secret
by defining it an attrset containing the attr _secret, which in turn
is a path to a file containing the actual secret.
2019-09-06 16:57:23 +02:00
talyz 64358cb0e9 nixos/utils: Handle arbitrary secrets in JSON output files
Introduce new functions which allows modules to define options where,
if the input is an attrset and the output is JSON, the user can define
arbitrary secrets.
2019-09-06 16:56:25 +02:00
talyz b351454cac nixos/gitlab: Use postgresql module options to provision local db
Use the postgresql module to provision a local db (if
databaseCreateLocally is true) instead of doing this locally.

Switch to using the local unix socket for db connections by default;
this is needed since dbs created by the postgresql module only support
peer authentication.

Instead of running the rake tasks db:schema:load, db:migrate and
db:seed_fu, run gitlab:db:configure, which in turn runs these tasks
when needed.

Solves issue #53852 for gitlab.
2019-09-06 16:56:20 +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
talyz cbdf94c0f3 nixos/gitlab: Add support for storing secrets in files
Add support for storing secrets in files outside the nix store, since
files in the nix store are world-readable and secrets therefore can't
be stored safely there.

The old string options are kept, since they can potentially be handy
for testing purposes, but their descriptions now state that they
shouldn't be used in production. The manual section is updated to use
the file options rather than the string options and the tests now test
both.
2019-09-06 16:54:22 +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
talyz 7648b4f8ba nixos/gitlab: Fix missing ca_file for SMTP
Work around upstream issue #790 by explicitly referencing the
ca-certificates.crt file.
2019-09-06 10:17:31 +02: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
worldofpeace ca5ec234ce nixos/gnome3: enable chrome-gnome-shelll 2019-09-05 23:10:09 -04:00
worldofpeace 2f14615ddc nixos/chrome-gnome-shell: enable in firefox 2019-09-05 23:07:59 -04: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
Ambroz Bizjak a97a047419
tests/virtualbox: Clean up unnecessary things.
Always enable the UART because the VirtualBug bug that required running without the UART was fixed in 6.0.10. Stop using an old kernel version because the tests work with the default kernel.

(cherry picked from commit ae93571e8d04cebd69491a789d902d6481e05d3f)
2019-09-05 09:30:05 -04: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
Kristoffer 85baedaca3 ceph: 12.2.7 -> 13.2.4
* maintain only one version
* ceph-client: init
* include ceph-volume python tool in output

nixos/ceph: extraConfig, fix test, wait for ceph-mgr to become active

* run ceph with disk group permission
* add extraConfig option for the global section
needed per cluster
* clear up how ceph.conf is generated
* fix ceph testcase
2019-09-04 16:01:42 +02:00
Peter Hoeg 5eef8c231a
Merge pull request #68094 from peterhoeg/f/darkhttp
nixos/darkhttpd: fix package reference
2019-09-04 17:08:14 +08:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Christian Kampka 81d0173023 maintainers: update my maintainer information (#67686) 2019-09-03 22:52:13 +02:00
Silvan Mosberger ce944b4bde
Merge pull request #64552 from evanjs/feature/openrazer-2.3.1
openrazer: init at 2.6.0
2019-09-03 19:14:58 +02:00
Aaron Andersen b54a120a82 nixos/zookeeper: recursively set permissions and ownership on dataDir 2019-09-03 11:57:57 -04:00
Silvan Mosberger ad13ebe029
Merge pull request #55510 from florianjacob/declarative-printers
nixos/printers: declarative configuration
2019-09-03 17:46:53 +02:00
Jan Tojnar d1f9fcbbbc
libgdata.tests: add installedTests 2019-09-03 16:51:47 +02:00
worldofpeace 42f63ff5a8
Merge pull request #67957 from jtojnar/glib-networking-cleanup
glib-networking: clean up & add installed tests
2019-09-03 10:42:31 -04:00