mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 17:39:34 +00:00
Code Issues Wiki Activity
138668 commits 196 branches 125 tags 12 GiB
Commit graph

8449 commits

Author SHA1 Message Date
Jörg Thalheim f55a6ab844
Merge pull request #38302 from johannesloetzsch/master 
mate/mate-screensaver: fixed unixAuth
 2018-04-05 21:02:18 +01:00
Frederik Rietdijk a9f37d1c25 Merge master into staging 2018-04-05 19:25:05 +02:00
Rob Vermaas ced3a201e3
gce: needs bigger diskSize 
(cherry picked from commit ac3437aa06)
 2018-04-05 12:19:05 +02:00
Rob Vermaas 0164c94a51
ec2-amis.nix: add 18.03 images 
(cherry picked from commit e5a4fb31bd)
 2018-04-05 11:58:53 +02:00
Michael Raskin b07ce1fb74
Merge pull request #38114 from oxij/nixos/doc-module 
nixos: doc module
 2018-04-05 07:09:32 +00:00
Michael Raskin 195521350a
Merge pull request #38111 from oxij/tree/cleanups 
assorted cleanups
 2018-04-05 07:08:05 +00:00
Franz Pletz 20ad4be383
Merge pull request #38405 from volth/patch-121 
network-interfaces-scripted: wlanInterfaces have .device, …
 2018-04-05 04:45:50 +00:00
Charles Strahan 5c066e2bba
Merge pull request #37218 from cstrahan/kube-test-fix 
nixos: kubernetes fixes
 2018-04-04 19:14:48 -04:00
Frederik Rietdijk 23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Jörg Thalheim b6ec6fd525
Merge pull request #38431 from volth/patch-122 
network-interfaces.nix: dead code removal
 2018-04-04 15:30:22 +01:00
Joachim Schiele 7be79f22f2
nixos/dhcp: fix permissions of statedir 
nixos/dhcp: fix permissions of statedir
 2018-04-04 16:26:25 +02:00
Graham Christensen 9b30d48b2b
Merge pull request #37288 from cleverca22/improve-make-tarball 
make-system-tarball: allow alternate compression methods
 2018-04-04 10:11:25 -04:00
volth b9e01e64b7
network-interfaces.nix: dead code removal 
`wlanDeviceUdevScript` is not used below in the text
 2018-04-04 13:45:49 +00:00
Eelco Dolstra 0236a947d0
mkdir -> install -d 
Fixes #38421.
 2018-04-04 13:04:35 +02:00
nyanloutre 172ca5884b
transmission: settings doc location changed 2018-04-03 22:32:36 +02:00
volth dd9f776509
network-interfaces-scripted: wlanInterfaces have .device, no "${dev}-netdev.service" 2018-04-03 20:00:12 +00:00
Michael Bishop 3c9e579d1e
make-system-tarball: allow alternate compression methods 2018-04-03 11:30:43 -03:00
Kjetil Ørbekk 8614e22297 fix: nixos/nginx certificate location 
Fix issue when using a cert location other than the default.
 2018-04-02 20:34:01 -04:00
Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/top-level/all-packages.nix
 2018-04-03 02:22:54 +03:00
Silvan Mosberger e9fc2558f9
nixos/systemd: Fix environment type -> allows overriding 2018-04-03 00:36:52 +02:00
Tuomas Tynkkynen 1e5cb384d5 nixos/sd-image-*: Raspberry Pi firmware no longer falls under unfree 
It's just unfreeRedistributableFirmware now.
 2018-04-02 23:46:18 +03:00
Nikolay Amiantov 37546be900 nodePackages.parsoid: pin service-runner to 2.3.0 
service-runner had a backwards incompatible update, and parsoid 0.9.0
doesn't work with current stable MediaWiki. Instead use as a source
a repository with 0.8.0 and pinned service-runner version.
 2018-04-02 22:38:40 +03:00
Tuomas Tynkkynen 4c21180a13 nixos/sd-image: Make it more similar to iso-image.nix 
- Add `imageName` and `imageBaseName` options similar to the `isoName`
  and `isoBaseName` options
- Make the filename of the iso match what iso-image.nix does
- Generate a nix-support/hydra-build-products like iso-image.nix does
 2018-04-02 15:18:25 +03:00
Franz Pletz 35f474d61d
nixos/unbound: don't fail on root trust anchor updates 
Exit code on updates is 1 which makes the inital start of unbound fail.
 2018-04-01 23:56:42 +02:00
Bas van Dijk c8eef1d771 pgmanage: the data_root option is renamed to sql_root 2018-04-01 19:16:04 +02:00
Johannes Lötzsch 1ab3736146 mate/mate-screensaver: fixed unixAuth 
Without this fix, it's not possible to unlock the mate-screensaver.
 2018-04-01 19:01:26 +02:00
Joachim Schiele 1b0cb040d9 user/group assertion to not exceed the 32 character limit 2018-03-30 23:43:23 +02:00
Charles Strahan 709b6f664e
nixos: kubernetes fixes 
* Fix reference CNI plugins
  * The plugins were split out of the upstream cni repo around version
    0.6.0

* Fix RBAC and DNS tests
  * Fix broken apiVersion fields
  * Change plugin linking to look in ${package}/bin rather than
    ${package.plugins}

* Initial work towards a working e2e test
  * Test still fails, but at least the expression evaluates now

Continues @srhb's work in #37199

Fixes #37199
 2018-03-30 17:33:45 -04:00
Léo Gaspard b59570eac0 nixos/gogs: allow git operations over ssh 
Without `ROOT_PATH` set, `gogs serv` tries to open logs in writing in
its store directory. This blocks cloning or pushing over ssh, and
results in a gogs internal error.
 2018-03-30 16:37:36 +02:00
Jan Malakhovski 44b8202cab nixos: tcpcrypt: /var/run -> /run, don't drop files out of rundir 2018-03-30 06:56:38 +00:00
Jan Malakhovski 02da27de52 nixos: dysnomia: move into services subtree 2018-03-30 06:56:12 +00:00
Jan Malakhovski 98fd9b7f86 nixos: doc: introduce documentation config subtree 2018-03-30 06:52:26 +00:00
Jan Malakhovski 302c170e1c nixos: replace optionals -> optional in nsswitch 2018-03-30 06:44:18 +00:00
Jan Malakhovski 6d7854a9a8 nixos: users-groups: cleanup 2018-03-30 06:40:13 +00:00
Frederik Rietdijk 9d2ff98571 Merge remote-tracking branch 'upstream/master' into HEAD 2018-03-30 08:14:35 +02:00
volth a6c8e48840
nixos/network-scripted: print error details 2018-03-30 01:18:18 +00:00
Wout Mertens b4e92e0b34
Merge pull request #37921 from gnidorah/gitweb 
nixos/nginx: add gitweb sub-service
 2018-03-30 00:18:44 +02:00
Robin Gloster 68c4605f1a
gitlab: disable 
The last rubygems update broke this
 2018-03-29 19:17:49 +02:00
Franz Pletz e0ae89007b
Merge pull request #37955 from mayflower/fix/nixops-pre-1.6-eval 
nixos/version: fix nixops pre 1.6 compatibility
 2018-03-29 14:44:27 +00:00
gnidorah 05b535c850 git: add more deps to gitweb 2018-03-29 16:46:11 +03:00
gnidorah 2821d3fed7 gitweb: use common options 2018-03-29 16:45:32 +03:00
gnidorah 69a0c9721e nixos/nginx: add gitweb sub-service 2018-03-29 09:06:54 +03:00
Ryan Mulligan 690fcc97ef nixos/monit: restart if config changes 2018-03-28 15:21:56 -07:00
obadz 0a9d7f0809 zerotier module: add option to join networks and open port 2018-03-28 22:18:25 +01:00
Franz Pletz e53d195c4a
Merge pull request #38000 from ryantm/auto-update/dovecot 
dovecot: 2.3.0.1 -> 2.3.1
 2018-03-28 20:05:54 +00:00
Maximilian Bosch 5caa22fe0a Revert restrictive validation behavior for DM/WM defaults in the X module 
The original idea behind this change (described in ticket #11064) was to
improve the assertions to avoid that users of the X server accidentally
forget to configure a DM or WM.

However this caused several issues with setups that require X, but no DM
or WM. The keymap testcases became instable as well as now disabling DMs
needs to be done explicitly.
(see https://github.com/NixOS/nixpkgs/pull/31268#issuecomment-347080036)

In the end the idea behind the change and #11064 was obviously a
mistake, so reverting it completely for now should be fine.
 2018-03-28 20:34:05 +02:00
Franz Pletz 6a15c8d6f7
nixos/dovecot: set group in config 
The dovecot bump to 2.3.1 caused the dovecot service to fail to start
because it would try to chgrp sockets to dovecot whereas our default
dovecot group is called dovecot2.
 2018-03-28 19:16:41 +02:00
Shea Levy 05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
gnidorah 30a56d72db hans: rename option 2018-03-28 10:36:04 +03:00
gnidorah 33c34aff2f hans, iodine: correct script 2018-03-28 10:34:57 +03:00
Anthony Cowley 1f8382547f locate: fix update-locatedb service for mlocate 
This fixes the `update-locatedb` service when using the `mlocate`
package.

The service as-is does not properly handle flags during update of the
relevant database when configured to use the `mlocate` package.

The man entry for `updatedb` associated with `mlocate` does not say
that it supports environment variables in place of command line flags,
whereas the `findutils` package's updatedb does so.

To support this distinction, we pass the relevant settings as flags to
the `updatedb` program when using the `mlocate` package.

Fixes #29279
 2018-03-27 23:34:11 -04:00
Justin Humm 169468c406
apache-httpd: fix typo in config servedFiles 2018-03-28 03:47:25 +02:00
Franz Pletz 70c6f6572d
nixos/version: fix nixops pre 1.6 compatibility 
We should be able to deploy a NixOS 18.03 system with the current nixops
stable release. Some options were renamed, so instead of
`mkRenamedOptionModule` we introduce them as read-only interal options
that won't be rendered in the manual.

Only the options that are needed to make nixops evaluations succeed were
added.

This commit should probably be reverted after or before the 18.09 release,
depending on the nixops 1.6 release.

The user will not get the warning that these have been renamed but
this change is mentioned in the release notes.

Fixes #34253.
 2018-03-28 02:30:50 +02:00
Matthew Justin Bauer 75616ceb49
Merge pull request #37840 from matthewbauer/unixtools 
Cross-platform "unixtools"
 2018-03-27 18:43:03 -05:00
gnidorah 276d10dae6 nixos/iodine: passwordFile option #24288 2018-03-27 22:44:29 +03:00
gnidorah 16c5866cec nixos/hans: passwordFile option #24288 2018-03-27 22:25:31 +03:00
gnidorah b2be363fea nixos/hans: init 2018-03-27 22:25:22 +03:00
Yegor Timoshenko e61d69bfd3
Merge pull request #37897 from mkaito/tarsnap-symlinks-and-restore 
Tarsnap: add symlink options and a restore service
 2018-03-27 16:21:28 +00:00
Michishige Kaito c515f7036e Address @yegortimoshenko review 2018-03-27 16:35:54 +01:00
Shea Levy cd7047c461
Merge branch 'riscv-limitations' 2018-03-27 11:32:38 -04:00
Nikolay Amiantov 25ac79647c linuxPackages.nvidia_x11_legacy173: drop 
There's no kernel in nixpkgs suitable for this old driver -- tested with 4.4.
 2018-03-27 16:43:53 +03:00
Shea Levy cdf9a78a3e
kexectools: Disable only on RISC-V if Linux. 
The isKexecable flag treated Linux without kexec as just a normal
variant, when it really should be treated as a special case incurring
complexity debt to support.
 2018-03-27 08:15:07 -04:00
davidak 41676002b2 nixos/systemd: add option for cgroup accounting 2018-03-27 09:15:22 +02:00
Michishige Kaito bde525aaaf Add restore service for tarsnap archives 
This service will never run automatically, but it encapsulates the
necessary logic and configuration to run a restore of the latest
archive, and allows to hook more specific logic, such as loading
a database dump, via `postStart`.
 2018-03-27 01:19:02 +01:00
Michishige Kaito d462595600 Add support for tarsnap options -H and -L 
A new option `explicitSymlinks` will set `-H` when creating an archive.
This option makes tarsnap follow any symlinks specified explicitly on
the commandline, but not any found inside the file tree.

A new option `followSymlinks` will set `-L` when creating an archive.
This option makes tarsnap follow any symlinks found anywhere in the file
tree instead of storing them as-is.
 2018-03-27 01:19:02 +01:00
Bas van Dijk e9de38eb61 strongswan-swanctl: actually removed the strongswan parameter files 2018-03-26 17:18:08 +02:00
Joachim F 1c889be474
Merge pull request #37827 from oxij/pull/28938-tor-control-port 
nixos/tor: expose control socket
 2018-03-26 13:05:27 +00:00
Nikolay Amiantov cdf1079665 opengl service: don't override mesa non-drivers in runtime 2018-03-26 14:02:06 +03:00
Nikolay Amiantov 220d0decaf qemu-vm service: quote arguments in qemu runner 2018-03-26 14:01:49 +03:00
Nikolay Amiantov 4f0b59de9a xserver service: cleanup LD_LIBRARY_PATH 
X libraries in LD_LIBRARY_PATH seem to not be needed anymore.
I've tracked this addition as far as I could
(02cef04c81) and they seem to be added for unfree
NVIDIA and ATI drivers but at least for NVIDIA they are not needed anymore. We
can add them with patchelf instead if it turns out to be the case with ATI.
 2018-03-26 14:01:49 +03:00
Nikolay Amiantov d61e6c5ed7 opengl service: move options under common hardware.opengl tree 
Purely cosmetic.
 2018-03-26 14:01:49 +03:00
Nikolay Amiantov 0934c8f49b nvidia service: rely on libglvnd 2018-03-26 14:01:49 +03:00
Jaka Hudoklin cb9c1c63c9 nixos/tor: expose control socket 2018-03-26 00:41:10 +00:00
Will Dietz cb30a1b425 wrapper.c: fixup includes to work w/musl 2018-03-25 18:06:02 -05:00
Guillaume Maudoux c948613a65 almir: also remove the corresponding module. 
The almir package was removed in 30291227f2 at about 2017-08
This module can no more be used without it.
 2018-03-25 21:41:19 +01:00
Frank Doepper 66deb3aa29 quagga service: fix service and re-enable test 
adding quagga to quaggavty
reverting 8a18e1f
 2018-03-25 21:26:45 +02:00
Michael Raskin 296dca019b
Merge pull request #35073 from Infinisil/fix/znapzend 
nixos/znapzend: fix when no previous zetup
 2018-03-25 17:29:08 +00:00
Matthew Justin Bauer 8f3091939b
Merge pull request #37752 from ryantm/fix-urls 
treewide: use more HTTPS URLs
 2018-03-25 00:40:17 -05:00
Ryan Mulligan b189247ba0 treewide: use more HTTPS URLs 
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.

Also fixes jbake source URL, which was broken.
 2018-03-24 22:04:25 -07:00
Wout Mertens 527e97f333
acme module: update for simp_le v0.8 
Hopefully fixes #37689
 2018-03-24 17:43:32 +01:00
Shea Levy 0f854cd2d1
Merge branch 'master' into staging 2018-03-24 01:34:53 -04:00
Florian Klink 6ac74d60ad networkmanager-pptp: remove package 
Currently broken on NixOS due to hardcoded modprobe binary path (see
bug #30756 from Oct 2017), no activity on a proposed fix for months.
As the protocol is terribly broken anyways, let's better remove it
completely, and not talk about anymore ;-)

Closes #30756.
 2018-03-23 22:24:50 +01:00
Nikolay Amiantov 91072b7b23
Merge pull request #37647 from abbradar/systemd-238 
[WIP] Update systemd and unbreak staging
 2018-03-23 01:11:32 +03:00
Nikolay Amiantov 0ccab4946d systemd: 237 -> 238 2018-03-22 22:37:26 +03:00
Matthew Justin Bauer 779c25b2fe
Merge pull request #34053 from thpham/serviio 
serviio: init at 1.9
 2018-03-22 11:11:17 -05:00
Robin Gloster fda705527d
nixbot: remove 
obsoleted mostly by ofborg
 2018-03-22 16:17:12 +01:00
WilliButz c54aa1f293
nixos/prometheus-exporters: add postfix exporter & documentation 2018-03-22 14:52:23 +01:00
WilliButz f4d03b5c9c
nixos/prometheus-exporters: rewrite and restructure 
- prometheus exporters are now configured with
  `services.prometheus.exporters.<name>`
- the exporters are now defined by attribute sets
  from which the options for each exporter are generated
- most of the exporter definitions are used unchanged,
  except for some changes that should't have any impact
  on the functionality.
 2018-03-22 14:46:17 +01:00
Robin Gloster 76ea0e1b2e
Merge pull request #32960 from florianjacob/prosody-0.10 
Prosody 0.10.0
 2018-03-22 14:12:57 +01:00
volth f68871764d treewide: replace depecated alias s/mssys/ms-sys/g 2018-03-22 10:13:21 +00:00
Robin Gloster 0a80f2c0f4
prosody: improve module handling 2018-03-22 03:40:46 +01:00
Franz Pletz e5a854e740
gitlab service: use recommended unicorn config 2018-03-22 02:29:28 +01:00
Simon Lackerbauer 1b55905806
gitlab: 10.3.4 -> 10.5.4 2018-03-22 02:29:28 +01:00
Robin Gloster 31d77fd4f3
gitlab-shell: fix config path finding 
and remove TimeoutSec for gitlab
 2018-03-22 02:29:27 +01:00
Robin Gloster fa347164b6
graylog: use jre_headless 2018-03-22 02:29:27 +01:00
Geoffrey Huntley a88ec5e8a5 duosec: use root uid as sshd uid has been retired (#33597) 
* fix: use root uid as sshd uid has been retired

fixes https://github.com/NixOS/nixpkgs/issues/10088
related PR (abandoned) at https://github.com/NixOS/nixpkgs/pull/15391

* must use "sshd" user otherwise duosec does not work in multi user mode

see https://github.com/duosecurity/duo_unix/issues/89#issuecomment-272062632
 2018-03-21 18:46:35 -05:00
Dan Peebles 6fa9d9cdbd hologram-server module: add cache timeout option 
The version of hologram we're using has supported this option for a
while, but we didn't expose it through the NixOS module
 2018-03-21 12:58:25 -04:00
Thomas Karolski e5073bcb80
Fix permission on working directory 
The working directory needs the x flag, otherwise executors (e.g. sparks executor) are unable to cd into their sandbox and create e.g. temporary files.
 2018-03-21 02:26:04 +01:00
Eelco Dolstra 7db841512a
Remove obsolete /nix/var/nix/{manifests,channel-cache} 2018-03-20 18:26:13 +01:00
Jörg Thalheim 35eddf5ef1
Merge pull request #37412 from volth/varnish456 
varnish4: init at 4.1.9; varnish6: init at 6.0.0
 2018-03-20 07:55:52 +00:00
Joel Thompson fe2e4d6fb9 hologram: Enable configuring LDAP authorization 
In AdRoll/hologram#62 support was added to hologram to configure
LDAP-based authorization of which roles a user was allowed to get
credentials for. This adds the ability to configure that.

Additionally, AdRoll/hologram/#94 added support to customize the LDAP
group query, so this also feeds that configuration through.

fixes #37393
 2018-03-20 07:36:23 +00:00
volth 002b460822 varnish4: init at 4.1.9; varnish6: init at 6.0.0 2018-03-20 07:10:36 +00:00
Robert Schütz c484079ac7
Merge pull request #36927 from dotlambda/borg-module 
nixos/borgbackup: init
 2018-03-19 20:30:32 +01:00
WilliButz ca7b29050f grafana: 5.0.2 -> 5.0.3, fix headless phantomjs 2018-03-19 19:59:10 +01:00
Matthew Justin Bauer ce01740dae
Merge pull request #33685 from corngood/amdgpu-pro-upgrade 
amdgpu-pro: 17.10 -> 17.40
 2018-03-19 12:40:03 -05:00
Robert Schütz fdf0f037be nixos/borgbackup: init 2018-03-19 13:12:47 +01:00
Jörg Thalheim 86dd3f854b
Merge pull request #35687 from volth/libvirt-4.1.0 
libvirt: 3.10.0 -> 4.1.0
 2018-03-19 11:42:06 +00:00
Sarah Brofeldt 45241c5cd1
Merge pull request #37272 from erictapen/manual-networking 
nixos/manual: fixed example config for networking.interfaces
 2018-03-18 17:50:37 +01:00
Jörg Thalheim 705fee5150
Merge pull request #37198 from giraffito/patch-2 
nixos/sudo: fix description of sudo.wheelNeedsPassword
 2018-03-18 12:27:43 +00:00
Peter Hoeg 2859483fe9 nixos home-assistant: a couple of fixes (#36338) 
a) set path to /run/wrappers so ping works
b) run via a target so we can easily inject other components (config copier,
appdaemon)
 2018-03-18 12:46:36 +01:00
Jörg Thalheim 5c1c4fbb06
Merge pull request #37084 from herrwiese/evilwm 
nixos/window-managers: actually add evilwm to default.nix
 2018-03-18 11:13:23 +00:00
Jörg Thalheim ac9818fa70
Merge pull request #37216 from teto/qemu_comma_fix 
qemu-vm: passing QEMU_NET_OPTS would fail
 2018-03-18 10:17:50 +00:00
Elis Hirwing fa76c9a385
gitea: fix usage over ssh 
Using gitea over ssh had two isses:
 1. No shell was set for the user
 2. Gitea tried to write logs to
 /nix/store/x83q12kyd9gw1pay036dxz2dq0apf17h-gitea-1.3.2-bin/log when
 serving the ssh usage.
 2018-03-18 10:11:02 +01:00
Yurii Rashkovskii 738bcfdef8
config.hardware.onlykey configuration option 
By default, OnlyKey device (https://crp.to/p/) won't work on Linux (and,
therefore, NixOS). This is unintuitive and requires one to search for a
solution in the documentation.

This change allows one to enable OnlyKey device support directly from
their NixOS configuration.
 2018-03-18 12:49:13 +07:00
Corey O'Connor 28a55f5bd6 jenkins: Add "java.awt.headless=true" to JDK options. 
This is consistent with the recommended jenkins startup script. See:

* https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
 2018-03-17 22:16:59 -07:00
Corey O'Connor 241160aacc jenkins: Include Deja-Vu fonts in system environment to silence jenkins warning. 2018-03-17 22:16:26 -07:00
Justin Humm d69e0d99e0
nixos/manual: fixed example config for networking.interfaces 
The former example gave a "value is a list while a set was expected" error.
 2018-03-17 19:53:06 +01:00
Matthieu Coudron 33b0ad83e9 qemu-vm: passing QEMU_NET_OPTS would fail 
because of a change in #36850.
spotted by @jtojnar b7a2333ebe (commitcomment-28134992)
 2018-03-17 23:21:27 +09:00
giraffito b9639d7e1f
nixos/security: fix description of sudo.wheelNeedsPassword 
the previous description mistakenly described the opposite semantics
 2018-03-16 21:50:46 +00:00
Vladimír Čunát 03cf538ef2
18.09: Jackrabbit -> Jellyfish 
See eb0fa09232 and github discussion on that.
My misgiving about the t-shirts was refuted.
I don't think this flip may negatively affect anyone.
 2018-03-16 12:26:03 +01:00
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master 
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
 2018-03-15 22:30:56 +02:00
Samuel Leathers 5931f463ad
Merge pull request #36924 from etu/gitea-postgres-autocreate-database 
Gitea postgres autocreate database
 2018-03-15 14:01:01 -04:00
Elis Hirwing 1ad75d0c50
gitea: enable and configure postgres service if selected as database 2018-03-15 18:34:54 +01:00
Andreas Wiese c7e1dff94e nixos/window-managers: actually add evilwm to default.nix 
Commit 1f2b938 introduced a module for evilwm as a window-manager, but
did not actually add this module to window-manager's default.nix which
renders it useless.
 2018-03-15 10:22:53 +01:00
Jan Malakhovski 8bbd48e40f nixos: fix install-grub.pl dependencies 
fallback from updates to perl
 2018-03-15 04:51:12 +00:00
Tuomas Tynkkynen 9e78baf5c7 nixos/qemu-vm: Add virtualized display + HID devices on AArch64 2018-03-14 21:18:20 +02:00
Vladimír Čunát eb0fa09232
18.09: let's call it "Jackrabbit" 
I was mainly considering Jellyfish and Jaguar (and Jackrabbit).
Originally I was inclined for Jellyfish, but then I thought of the
release T-shirts someone makes and it didn't seem suitable...
Jaguar would keep the name referring to a car as well, but as a
not-too-old (Mac) OS version is codenamed that way, I didn't go for it.
 2018-03-14 15:13:34 +01:00
lewo 65e5bc713b
Merge pull request #36845 from jbedo/singularity 
singularity: 2.4 -> 2.4.2
 2018-03-14 10:19:10 +01:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
 2018-03-13 23:04:18 +02:00
Michael Raskin bfbc4951a6
Merge pull request #36850 from teto/virtualisation 
Virtualisation
 2018-03-13 13:40:33 +00:00
Florian Jacob 226965da67 prosody: 0.9.12 -> 0.10.0 
updating config options, removing luazlib as mod_compression was removed
for security reasons.
 2018-03-12 20:19:03 +01:00
Jörg Thalheim 9881934b57
Merge pull request #36783 from Infinisil/desciption/update/resilio 
resilio: Adjust option description to 3d17573
 2018-03-12 11:04:51 +00:00
Matthieu Coudron c476d2f592 grub-install.pl: more details on blkid failure 2018-03-12 17:32:59 +09:00
Matthieu Coudron 7b7860ff89 build-vm: remove trailing dot from script path 
Allow to double click/middle click paste path a bit quicker.
 2018-03-12 17:31:24 +09:00
Matthieu Coudron b7a2333ebe qemu-vm: removes warning when running build-vm 
get rid of deprecated qemu commands
 2018-03-12 17:29:55 +09:00
Justin Bedo 5c1e42276d
singularity: 2.4 -> 2.4.2 2018-03-12 15:13:31 +11:00
Silvan Mosberger 86ca617948
resilio: Adjust option description to 3d17573 2018-03-11 01:18:34 +01:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
 2018-03-10 20:38:13 +00:00
Silvan Mosberger 08704aa2f7
nixos/network-interfaces: Fix 2 small typos 2018-03-10 16:16:56 +01:00
Jörg Thalheim 558949f2c0
Merge pull request #36357 from matthewbauer/vbox-usable 
demo: make virtualbox more usable
 2018-03-09 11:36:13 +00:00
volth 632e9e62c8 libvirt: 3.10.0 -> 4.1.0 2018-03-08 23:45:28 +00:00
Daiderd Jordan db6fb869fb
Merge pull request #30418 from LnL7/inline-set-environment 
nixos: inline set-environment for bash and zsh
 2018-03-08 21:07:15 +01:00
Jörg Thalheim 196e21a160 nixos/tomcat: add types + proper systemd integration 
fixes #35443
 2018-03-08 09:09:42 +00:00
Benjamin Smith 024220bd7f nixos/tomcat: add serverXml, environment files and log directories 
* add serverXml verbatim override
* add environment file
* add log directory creation
 2018-03-08 09:09:42 +00:00
Ales Huzik 0555f247dc nixos/bluetooth: allow to specify custom bluez package 2018-03-08 13:56:47 +11:00
Shea Levy a183563cf0
Revert "Merge branch 'setuid-wrapper-readlink'" 
Kernel symlinks don't have st_size. Really thought I tested this, guess I ran the
wrong NixOS test :(

This reverts commit 6dab907ebe, reversing
changes made to eab479a5f0.
 2018-03-07 17:09:05 -05:00
Michael Raskin 5a95fe2939
Merge pull request #36292 from xeji/xen-4-10 
xen: add v 4.10
 2018-03-07 22:07:14 +00:00
xeji 08894b4d8a xen 4.10: link /etc/xen/oxenstored.conf 
this is required for oxenstored to start
 2018-03-07 22:39:19 +01:00
xeji fbc0b8282e xen: fix broken version comparisons 
string compare breaks with xen 4.10 (because "4.10" < "4.8")
 2018-03-07 22:37:40 +01:00
Vladyslav M 2a147bea02 iwd: 2017-12-14 -> 0.1 2018-03-07 20:28:12 +02:00
Shea Levy 6dab907ebe
Merge branch 'setuid-wrapper-readlink' 2018-03-07 12:44:21 -05:00
Shea Levy dffa3d2b1f
nixos: setuid-wrapper: simplify readlink logic 2018-03-07 11:57:43 -05:00
Yegor Timoshenko 5905fe069b
tt-rss: use proper user and package for MySQL 2018-03-06 03:10:24 +00:00
Jörg Thalheim 5fe1be88a5
Merge pull request #36350 from volth/nix-serve 
nix-serve: nix 2.0 fixes
 2018-03-05 23:18:27 +00:00
Matthew Bauer 1e621ff423 demo: autologin through xserver 
also disable upower on virtualbox
Fixes #36348
 2018-03-05 14:48:01 -06:00
volth 30877b1ed8 nix-serve: nix 2.0 fixes 2018-03-05 19:32:42 +00:00
Frederik Rietdijk 8bcdb39a27
Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt 
nixos/networking-scripted: restore bridge slaves dynamically added by…
 2018-03-05 17:31:22 +00:00
Dino Dai Zovi ddf13e6646 nixos/initrd-network: add udhcpc.extraArgs option (#36305) 
This can be used to fix issues where udhcpc times out before
acquiring a lease. For example of these issues, see:

https://bugs.alpinelinux.org/issues/3105#note-8

Signed-off-by: Dino A. Dai Zovi <ddz@theta44.org>
 2018-03-05 15:53:59 +00:00
Franz Pletz 17ba8bb3e0
Merge pull request #30416 from symphorien/luksnokey 
nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
 2018-03-05 10:02:39 +00:00
Will Fancher 6b9a99e55d LightDM: Set default user session when possible. 2018-03-04 23:54:09 +00:00
Vladimír Čunát 498374a8bd
Merge #35554: nixos/opengl: unhide and document 2018-03-04 17:33:01 +01:00
obadz 9dc62dd915
Merge pull request #36272 from obadz/nixos-lustrate-doc 
nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE
 2018-03-04 16:21:54 +00:00
obadz 80ea345494 nixos-enter: specify absolute path to bash 
Not doing so makes it impossible to use nixos-enter from a non-NixOS
distro
 2018-03-04 16:19:52 +00:00
Vladimír Čunát 2069a2a002
Merge #35454: nixos/pump.io: remove 2018-03-04 10:49:25 +01:00
Vladimír Čunát a2b8d8fbe2
nixos/pump.io: also comment-out the uid 2018-03-04 10:48:29 +01:00
Jörg Thalheim a5dcde1a6f Revert "networkd: also load builtin modules" 
This reverts commit d514dc220e.

breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
 2018-03-04 06:29:08 +00:00
Tuomas Tynkkynen 1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Jörg Thalheim 6749f6e26e
Merge pull request #36249 from Ekleog/openldap-module-declarative-contents 
Openldap module declarative contents
 2018-03-03 19:00:13 +00:00
aszlig 0811e7f60e
nixos/netboot: Fix evaluation error 
The function arguments for make-squashfs.nix have changed in
df117acab7, so we need to change them here
as well.

The boot.netboot NixOS VM test now succeeds again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
 2018-03-03 19:31:19 +01:00
Jörg Thalheim 5d0d140f74
Merge pull request #34070 from lukeadams/prl-improve 
Improve parallels-tools
 2018-03-03 17:34:57 +00:00
Vladimír Čunát b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +01:00
Jörg Thalheim 9936ed4920
Merge pull request #31019 from teto/strongswan_rebased 
[RFC/RDY] make l2tp work with Strongswan
 2018-03-03 15:56:05 +00:00
Léo Gaspard aeef7c91f1
openldap module: allow defining contents declaratively 2018-03-03 15:33:23 +01:00
Léo Gaspard cca9ec2a66
openldap module: cleanup 2018-03-03 15:33:01 +01:00
Jan Tojnar 618ac29687
cantarell-fonts: rename from cantarell_fonts 2018-03-03 00:36:38 +01:00
wucke13 9580f22115 Solving #30396 2018-03-02 09:30:19 +01:00
Bjørn Forsman 5de8f99f03 nixos/jenkins: ensure postStart follows redirects 
Pass the -L flag to curl to make it follow redirects. This fixes an
issue I found when setting up reverse proxy for Jenkins. Without this
fix, the returned HTTP code was stuck at 302, making postStart fail the
service (it expects 200 or 403).
 2018-03-02 08:48:38 +01:00
Shea Levy 2802101e9f
Merge branch 'dropbear-2018-76-fix' 2018-03-01 21:35:06 -05:00
Shea Levy f2937b7485
initrd-ssh: Fix for new dropbear version. 
For some reason 2018.76 dropped the -m flag.
 2018-03-01 21:21:27 -05:00
Luke Adams 52747120c1 parallels: add package config option 
allows overriding of package with newer versions
 2018-03-01 17:09:13 -06:00
Luke Adams 2c5efdbec4 parallels: add autoMountShares option 2018-03-01 16:36:37 -06:00
Shea Levy 34487947ce
nixos: Add nixpkgs.crossSystem option for cross-compilation 2018-03-01 14:58:15 -05:00
Shea Levy 95579af5ec
Merge remote-tracking branch 'origin/staging' into cross-nixos 2018-03-01 14:56:58 -05:00
Shea Levy fec543436d
nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
Shea Levy 948e290895
stage-2-init: Use the host bash as SHELL 2018-03-01 14:03:41 -05:00
Frederik Rietdijk 810dd0f984 Merge remote-tracking branch 'upstream/master' into HEAD 2018-03-01 20:00:42 +01:00
Shea Levy 897b7c7e9b
nixos: Fix initrd dependency detection when cross-compiling. 2018-03-01 13:31:36 -05:00
WilliButz 5ea2c87464
grafana: 4.6.3 -> 5.0.0 2018-03-01 17:50:09 +01:00
Shea Levy c54730dde8
gobjectIntrospection: Enable building without X11 support. 
Also disable it when noXlibs in NixOS.
 2018-03-01 07:36:36 -05:00
lejonet 565f22d27a nixos/ceph: init module (#35299) 
All 5 daemon types can be enabled and configured through the module and the module both creates the ceph.conf required but also creates and enables specific services for each daemon, based on the systemd service files that upstream provides.
 2018-03-01 11:47:13 +00:00
Jörg Thalheim 12422149a7
Merge pull request #29768 from Mic92/networkd 
networkd: also load builtin modules
 2018-03-01 09:16:18 +00:00
Tuomas Tynkkynen b8b2225f6b Merge remote-tracking branch 'upstream/master' into staging 2018-03-01 06:09:20 +02:00
Shea Levy 4d5be58a8f
Merge remote-tracking branch 'origin/master' into cross-nixos 2018-02-28 17:07:13 -05:00
Shea Levy 5ff15fbf7d
Merge branch 'nix-ssh-ng' 2018-02-28 17:04:19 -05:00
Shea Levy 4de72b90f3
nixos: nix.sshServe: Support ssh-ng. 2018-02-28 16:55:00 -05:00
Jörg Thalheim 47ce3021a9
Merge pull request #36136 from hedning/nix-bash-completions-on-enableCompletion 
programs/bash: install nix-bash-completions if completion is enabled
 2018-02-28 21:23:53 +00:00
Frederik Rietdijk cf0c20e0de
Merge pull request #35892 from Nadrieril/update-usbguard 
usbguard: 0.7.0 -> 0.7.2
 2018-02-28 20:30:30 +00:00
Sander van der Burg 8fbfd67f1f disnix module: make dbus service configurable 2018-02-28 21:29:24 +01:00
Shea Levy fe406d66b2
nixos: sudo: Use build-time visudo for syntax check. 2018-02-28 15:01:33 -05:00
Shea Levy 8e6520540e
nixos: keymap: Fix cross-compilation. 2018-02-28 15:01:32 -05:00