3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

7656 commits

Author SHA1 Message Date
Niklas Hambüchen aa645b51ba jenkins service: Add extraJavaOptions.
This is useful for the common case of passing arguments to
the JVM that runs Jenkins.
2017-06-16 09:23:11 +02:00
Roger Qiu 1b6176e45b gnupg module: Added extra and browser sockets (#26295)
Also added dirmngr and made SSH support false by default
due to programs.ssh.startAgent defaulting to true.
2017-06-15 19:40:09 +02:00
Ekaterina Vaartis c0df448d54 apache-httpd: fix mod_perl by refering to apacheHttpdPackages (#26579) 2017-06-15 13:07:14 +02:00
Pascal Bach c9802321c1 cntlm service: cleanup non working config options (#26578)
- extraConfig was not working
- add possibility to add cntlm.conf in verbatime form
- create cntlm user as system user
- add no proxy option
2017-06-15 12:11:48 +02:00
Edward Tjörnhammar 3dcecf09fc
Remove aiccu package and service due to sunsetting.
https://www.sixxs.net/main/
2017-06-15 06:58:08 +02:00
Joachim Schiele ca17f3b8ef hostapd dependency fix for https://github.com/nixos/nixpkgs/issues/16090 (#26573) 2017-06-14 16:44:46 +02:00
Maximilian Bosch 3803864ca6 thefuck: init at 3.18 (#26529) 2017-06-14 09:57:38 +01:00
Joachim F 631ec734eb Merge pull request #26460 from romildo/fix.nixos-artwork
nixos-artwork: add more wallpapers
2017-06-13 23:20:52 +01:00
Bas van Dijk 2444eab485 ELK: update kibana and the elastic beats to 5.4 (#26252)
* Add kibana5 and logstash5
* Upgrade the elastic beats to 5.4
* Make sure all elastic products use the same version
  (see elk5Version)
* Add a test for the ELK stack
2017-06-13 22:36:08 +02:00
Taylor "Nekroze" Lawson 9fb87f9c9d Kubernetes ABAC policy file fix (#26499)
Fix the incorrect nix map that generates the Kubernetes policy file
2017-06-13 21:54:36 +02:00
Franz Pletz ac5258edb2
caddy service: don't use extra dotdir in dataDir 2017-06-13 21:21:59 +02:00
Franz Pletz 071815cb24
caddy service: sync with upstream systemd unit
Increases security and fixes minor issues.
2017-06-13 21:21:59 +02:00
Joachim F 76430ecd9f Merge pull request #25701 from mayflower/elasticsearch_postStart_script_removal
elasticsearch service: remove postStart script
2017-06-13 00:13:05 +01:00
Eelco Dolstra 0bffe03828
nix: 1.11.9 -> 1.11.10 2017-06-12 20:13:27 +02:00
Robin Gloster c5467a16c4
errbot module: needs network-online to connect properly 2017-06-12 17:44:42 +02:00
Jan Tojnar e35f3c0679
doc: Fix some typos 2017-06-11 22:13:42 +02:00
Vladimír Čunát 32916ab1de
Merge older staging
Enough rebuilds have finished on Hydra now.
2017-06-11 09:01:08 +02:00
Bjørn Forsman 5b48368386 nixos/bcache: add services.udev.packages = [ bcache-tools ]
Adds /dev/disk/by-{id,label}/* symlinks for bcache device nodes, in the
final rootfs.

Symlinks will only be created for bcache devices that contain
filesystems. So if you have a blank bcache device or run LVM on top of
bcache you will not get this kind of symlink.
2017-06-10 17:10:49 +02:00
Bjørn Forsman 581226cfb4 nixos/bcache: /bin/sh -> ${bash}/bin/sh
Or else `services.udev.packages = [ bcache-tools ]` cannot be used.

To not break bcache in the initrd I'm modifying this in stage-1.nix:

  -  --replace /bin/sh ${extraUtils}/bin/sh
  +  --replace ${bash}/bin/sh ${extraUtils}/bin/sh

Reasoning behind that change:

* If not modifying the /bin/sh pattern in any way, it will also match
  ${bash}/bin/sh, creating a broken path like
  /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file.

* The addition of /bin/sh was done in 775f381a9e
  ("stage-1: add bcache support"). It seems somewhat plausible that
  no new users have appeared since then and we can take this opportunity
  to back out of this change without much fear of regressions.

  If there _are_ regressions, they should be in the form of build time
  errors, not runtime (boot), due to how the udev rule output is checked
  for invalid path references. So low risk, IMHO.

* An alternative approach could be to copy the /bin/sh substitute rule
  over to the non-initrd udev rules implementation in NixOS, but I think
  this way is better:
  - The rules file comes with a working path out of the box.
  - We can use more precise pattern matching when modifying the udev
    rules for the initrd.
2017-06-10 17:10:49 +02:00
Benjamin Staffin 700e22f7bf nixos: Add support for scalable fonts in Grub menus (#26227)
The default font is unreadably small on some hidpi displays. This
makes it possible to specify a TrueType or OpenType font at any point
size, and it will automatically be converted to the format the Grub
uses.
2017-06-10 09:53:24 -04:00
Jörg Thalheim 9c0577447c Merge pull request #26191 from romildo/fix.mlocate
locate: fix creation of parent dir of database
2017-06-10 11:56:26 +01:00
David Tulig bb6cf349ff bind service: add listen-on options (#26430)
This adds configuration options for the bind package so that the
interfaces that bind listens on can be configured rather than just
hardcoded as any. The default values preserve the old behavior to be
backwards compatible.
2017-06-10 12:19:07 +02:00
Jörg Thalheim fbe658eea0 Merge pull request #26296 from gnidorah/master3
autorandr: 855c18b -> 1.1
2017-06-10 11:00:53 +01:00
Vladimír Čunát cb9f953c92
Merge branch 'master' into staging
More larger rebuilds.
2017-06-10 10:07:33 +02:00
Joachim Schiele 507c207958 spamassassin: major service fixes -> added more perl packages to spamassassin and abstracted service to not use /etc/spamassassin, also running sa-update as spamd user periodically (#26470)
thanks @grahamc for IRC comments
2017-06-10 09:35:35 +02:00
Bjørn Forsman 6a55fda61e nixos/acme: improve documentation
* Use literalExample for better readability
* Clarify a bit wrt. 'webroot' and 'allowKeysForGroup'
2017-06-09 19:35:17 +02:00
Bjørn Forsman 7a0e958b97 nixos/acme: support "full.pem" (for lighttpd)
* Create "full.pem" from selfsigned certificate
* Tell simp_le to create "full.pem"
* Inject service dependency between lighttpd and the generation of certificates

Side note: According to the internet these servers also use the
"full.pem" format: pound, ejabberd, pure-ftpd.
2017-06-09 19:35:17 +02:00
romildo aa8018103c nixos-artwork: add more wallpapers
Restructure the nixos-artwork to make it easy to selectively
incorporate other components from upstream without needing to download
the full package.

Until now only the Gnome_Dark wallpaper was included. Add other
wallpapers available in the package repository.
2017-06-07 18:00:58 -03:00
Vladimír Čunát ae6df000d0
Merge branch 'master' into staging 2017-06-07 18:11:27 +02:00
gnidorah 5c9f0d00c3 autorandr: 855c18b -> 1.1 2017-06-07 13:23:36 +03:00
Eelco Dolstra 0996ea8a68
NixOS VM tests: Don't create a setgid group in vde_switch
Nix no longer allows this for security reasons.

http://hydra.nixos.org/build/53993125
2017-06-07 11:57:36 +02:00
Eelco Dolstra 338cdea332
Merge branch 'master2' of https://github.com/gnidorah/nixpkgs into staging 2017-06-07 11:46:17 +02:00
Graham Christensen 225a230716 Merge pull request #23173 from nlewo/test/cloudinit
Cloudinit test
2017-06-05 18:34:06 -04:00
Joachim F 602a492bb7 Merge pull request #26277 from avnik/fix/qtile
qtile: Fix using qtile together with desktop
2017-06-05 19:05:58 +01:00
Daniel Fullmer b8ebc60abd programs.zsh.syntaxHighlighting: Fix default value for patterns 2017-06-04 15:30:35 -04:00
Jörg Thalheim d07ad26bfd Merge pull request #26229 from Ma27/refactor/use-attr-set-for-syntax-highlighting-patterns
programs.zsh.syntaxHighlighting: refactor to use attr sets rather than recursive lists for patterns
2017-06-03 19:28:17 +01:00
Mateusz Kowalczyk dcf171bc79 Revert "dd-agent: 5.11.2 -> 5.13.2 + service rework"
This reverts commit af096c8bff.
2017-06-03 12:27:56 +01:00
Mateusz Kowalczyk 668556331b Revert "datadog: Properly use configured package."
This reverts commit 50f53da9ef.
2017-06-03 12:27:43 +01:00
rnhmjoj 2606d395fc
dnschain: allow different bind and external addresses 2017-06-03 12:24:04 +02:00
Emmanuel Rosa 4bee34dcc5
doc: clarify building-nixos CD/DVD instructions
This change updates the instructions for building a NixOS ISO so that it's clear how to do it.

Previously, the instructions stated to set NIXOS_CONFIG prior to running `nix-build`, yet the example provided by-passed NIXOS_CONFIG anyway. But the *really* important missing piece is the need for nixos/default.nix. See #21840.

This change removes the NIXOS_CONFIG verbiage, and adds steps to clone nixpkgs and (most importantly) cd'ing into nixpkgs/nixos. That way, the reader may think: *Oh, so I need a default.nix and a configuration.nix. Ahhh, OK.*

I purposely added the redundant default.nix argument.
2017-06-02 21:13:19 -04:00
Jörg Thalheim 3d17573cd4
resilio: remove systemd user service
this used to be part of the upstream btsync package

fixes #26303
2017-06-02 21:25:21 +01:00
Jörg Thalheim c611d03842
resilio: generate configuration with toJSON 2017-06-02 21:25:07 +01:00
Kjartan Ovmilk 919b39bb7c
resilio service: replaces btsync service, which is no longer supported upstream. 2017-06-02 21:24:49 +01:00
Peter Hoeg a087081ebb network-manager: add support for internal DHCP 2017-06-02 19:21:46 +08:00
Mateusz Kowalczyk 50f53da9ef datadog: Properly use configured package. 2017-06-02 08:16:47 +01:00
Zetok Zalbavar 92b923b378
i2pd: correct docs about bandwidth setting 2017-06-02 06:31:39 +02:00
Frederik Rietdijk 87ee5896fb Merge pull request #25709 from nh2/25620-glusterfs-fix-python-import-errors
Fix: GlusterFS python tools all have import errors
2017-06-01 22:06:21 +02:00
Mateusz Kowalczyk af096c8bff dd-agent: 5.11.2 -> 5.13.2 + service rework 2017-06-01 15:08:50 +01:00
Jörg Thalheim 859267f627
systemd-resolved: fix case when dnsmasq is used as local resolver
fixes #25706
2017-05-31 23:30:35 +01:00
Maximilian Bosch c4e4071ed1
programs.zsh.syntax-highlighting: simplify enable option by using mkEnableOption 2017-05-31 21:52:05 +02:00