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
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
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
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
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
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 6dab907ebeeab479a5f0
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
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
