alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
176993 commits 217 branches 121 tags 4.5 GiB
Commit graph

12775 commits

Author SHA1 Message Date
Samuel Dionne-Riel 8a74ebeb01
nixos/virtualbox: Fixes configuration to evaluate 
Fixes issue introduced by #57557
 2019-04-22 11:22:00 -04:00
Matthew Bauer 799fa4d404 Merge remote-tracking branch 'origin/master' into staging 2019-04-20 19:31:35 -04:00
Aaron Andersen 4a11ce7f26
cleanup redundant text in modules utilizing mkEnableOption 
Closes #59911
 2019-04-20 14:44:02 +02:00
Jan Tojnar d3259ed673
Merge branch 'master' into staging 2019-04-20 12:49:01 +02:00
Matthew Bauer c1fd154fb6
Merge pull request #57557 from matthewbauer/ova-swap 
nixos/virtualbox: add swap file
 2019-04-19 10:17:36 -04:00
Matthew Bauer dbc4543812 nixos/virtualbox: add swap file 
Puts 2G swap in /var/swap of OVA. This serves as backup when you hit
the memory cap for the image.

Fixes #57171 and fixes #22696
 2019-04-19 10:15:48 -04:00
AmineChikhaoui 548932640b
ec2-amis.nix: add 19.03 amis 2019-04-18 23:07:14 -04:00
Aaron Andersen 3464b50c61
Merge pull request #59389 from aanderse/issue/53853-1 
replace deprecated usage of PermissionsStartOnly (part 1)
 2019-04-18 20:46:28 -04:00
markuskowa dac0051e60
Merge pull request #59188 from gnidorah/maxx 
maxx: 1.1.0 -> 2.0.1
 2019-04-18 21:48:01 +02:00
Linus Heckemann 42c107c2aa
Merge pull request #49537 from mayflower/stage1-symlink-fix 
nixos stage-1: fix init existence test
 2019-04-18 17:59:08 +02:00
Pierre Bourdon 5d2bb3d715 nixos/stage-1: "find-libs" shell script is for the host 2019-04-18 15:02:51 +02:00
Bas van Dijk cccc7a93d2
Merge pull request #59828 from basvandijk/prometheus-refactoring 
nixos/prometheus: refactored & added more missing options
 2019-04-18 13:43:53 +02:00
Bas van Dijk cdd82681b3 nixos/prometheus: add more missing options 2019-04-18 12:53:13 +02:00
Bas van Dijk 285fd3c05a nixos/prometheus: abstract over optional option creation 2019-04-18 11:55:43 +02:00
Domen Kožar 9bc23f31d2
Merge pull request #48337 from transumption/201810/nginx-etag 
nginx: if root is in Nix store, use path's hash as ETag
 2019-04-18 16:41:49 +07:00
aszlig d533285224
nixos/tests/nginx: Add subtest for Nix ETag patch 
This is to make sure that we get different ETag values whenever we
switch to a different store path but with the same file contents.

I've checked this against the old behaviour without the patch and it
fails as expected.

Signed-off-by: aszlig <aszlig@nix.build>
 2019-04-18 09:41:13 +02:00
Frederik Rietdijk 2346182c2c Merge staging-next into staging 2019-04-18 08:26:30 +02:00
worldofpeace 7abeda982a gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas 
gnome3.pomodoro is left out because I don't want to create a conflict.
 2019-04-17 13:39:23 -04:00
Robin Gloster 44afc81af1
Merge pull request #57693 from mayflower/kube-apiserver-proxy-client-certs 
nixos/kubernetes: Add proxy client certs to apiserver
 2019-04-17 16:38:51 +00:00
Robin Gloster 7dc6e77bc2
Merge pull request #56789 from mayflower/upstream-k8s-refactor 
nixos/kubernetes: stabilize cluster deployment/startup across machines
 2019-04-17 16:37:58 +00:00
Bas van Dijk 55ef5d4246 nixos/prometheus: set optional attributes to type types.nullOr 
This makes sure that when a user hasn't set a Prometheus option it
won't show up in the prometheus.yml configuration file. This results
in smaller and easier to understand configuration files.
 2019-04-17 14:49:09 +02:00
Bas van Dijk 57e5b75f9c nixos/prometheus: filter out the _module attr in a central place 
We previously filtered out the `_module` attribute in a NixOS
configuration by filtering it using the option's `apply` function.

This meant that every option that had a submodule type needed to have
this apply function. Adding this function is easy to forget thus this
mechanism is error prone.

We now recursively filter out the `_module` attributes at the place we
construct the Prometheus configuration file. Since we now do the filtering
centrally we don't have to do it per option making it less prone to errors.
 2019-04-17 14:08:16 +02:00
Joachim F d7da5e2af2
Merge pull request #53826 from delroth/randstruct-custom-seed 
nixos: allow customizing the kernel RANDSTRUCT seed
 2019-04-16 17:49:19 +00:00
Bas van Dijk a913d0891c nixos/prometheus: filter out empty srcape_configs attributes 
This results in a smaller prometheus.yml config file.

It also allows us to use the same options for both prometheus-1 and
prometheus-2 since the new options for prometheus-2 default to null
and will be filtered out if they are not set.
 2019-04-16 16:06:11 +02:00
Bas van Dijk a23db5db08 nixos/prometheus: add new ec2_sd_config options for prometheus2 2019-04-16 16:04:33 +02:00
Andrew Childs ad7e232f88 nixos/prometheus: add ec2_sd_configs section to scrape_configs 2019-04-16 13:43:52 +02:00
Bas van Dijk e7fadde7a7 nixos/doc: remove prometheus2 notes from the 19.09 release notes 
prometheus2 has been backported to 19.03 so it won't be new for 19.09.
 2019-04-16 09:47:45 +02:00
Bas van Dijk d1940beb3a nixos/prometheus/pushgateway: add module and test 2019-04-16 08:09:38 +02:00
worldofpeace 27ac8cb2c4
Merge pull request #59185 from worldofpeace/glib-networking 
nixos/glib-networking: init
 2019-04-15 13:17:58 -04:00
worldofpeace 7802b18958 nixos/pantheon: use glib-networking module 2019-04-15 13:11:58 -04:00
Eelco Dolstra 5399f34ad9
nix: 2.2 -> 2.2.2 2019-04-15 19:06:57 +02:00
worldofpeace b0e9f85f47 nixos/glib-networking: init 
Note that we were previously didn't have glib-networking
in systemd.packages so the PacRunner was non-functional.
 2019-04-15 13:04:06 -04:00
adisbladis 9a176d669a
nixos/tox-node: Add descriptions to module options. 
Missing these broke the tarball build
https://hydra.nixos.org/build/92258938/nixlog/1
 2019-04-15 17:11:10 +01:00
José Romildo Malaquias c32b50a5f7
Merge pull request #59520 from romildo/upd.deepin.deepin-daemon 
nixos/dde-daemon: init
 2019-04-15 10:30:51 -03:00
adisbladis 4b4caa9413
Merge pull request #59368 from suhr/tox-node 
nixos/tox-node: init
 2019-04-15 12:28:27 +03:00
adisbladis 454aa43213
nixos/tox-node: Dont hardcode bootstrap nodes 
Get these from upstream tox-node package instead.
This is likely to cause less maintenance overhead over time and
following upstream bootstrap node changes is automated.
 2019-04-15 09:27:32 +01:00
Сухарик 6cb40f7b0b
nixos/tox-node: init 2019-04-15 09:27:27 +01:00
Bas van Dijk e5724e8e66
Merge pull request #59514 from basvandijk/elk-7.0.0 
elk7: init at 7.0.0
 2019-04-15 07:05:13 +02:00
José Romildo Malaquias 46a4e92d92 nixos/deepin-daemon: init 2019-04-14 21:47:45 -03:00
Bas van Dijk 13352f28d2 elk7: init at 7.0.0 
This adds the following new packages:

+ elasticsearch7
+ elasticsearch7-oss
+ logstash7
+ logstash7-oss
+ kibana7
+ kibana7-oss
+ filebeat7
+ heartbeat7
+ metricbeat7
+ packetbeat7
+ journalbeat7

The default major version of the ELK stack stays at 6. We should
probably set it to 7 in a next commit.
 2019-04-14 21:39:46 +02:00
Silvan Mosberger a63c182d53
Merge pull request #59315 from Infinisil/znc-docs-url 
nixos/znc: Fix URL XML for config option
 2019-04-14 17:33:49 +02:00
worldofpeace 4616b4ec85
Merge pull request #21860 from e-user/bugfix/upstream/gnome-pam 
nixos/gdm: use provided PAM login configuration wherever possible
 2019-04-14 09:52:17 -04:00
Alexander Kahl 56bd0110e7 nixos/pam: Add GNOME keyring use_authtok directive to password group 2019-04-14 09:50:22 -04:00
Alexander Kahl 5b9895b1a0 nixos/gdm: use provided PAM login configuration wherever possible 
Fixes #21859
 2019-04-14 09:49:01 -04:00
worldofpeace c9a925d82b
Merge pull request #59433 from romildo/upd.deepin.deepin-menu 
nixos/deepin-menu: init
 2019-04-14 09:18:15 -04:00
José Romildo Malaquias 9e99eed443 nixos/deepin-menu: init 2019-04-14 10:00:44 -03:00
Linus Heckemann 0fc80a576a
Merge pull request #59423 from lheckemann/initramfs-improvements 
Initramfs improvements
 2019-04-14 12:10:26 +02:00
Sarah Brofeldt f839011719
Merge pull request #58512 from aanderse/solr 
solr: init at 8.0.0
 2019-04-14 11:16:28 +02:00
gnidorah 1a4072e90f maxx: 1.1.0 -> 2.0.1 2019-04-14 09:51:29 +03:00
Danylo Hlynskyi eddb31be99
Merge pull request #55121 from Ma27/add-option-support-to-nixos-build-vms 
nixos-build-vms: pass `--option` to `nix-build`
 2019-04-14 02:57:57 +03:00