Franz Pletz
ca0639837c
Merge pull request #53871 from elseym/fix-container-extraveths
...
nixos/containers: explicitly set link up on host for extraVeths
2019-01-14 03:59:19 +00:00
Vladimír Čunát
9d16949d42
nixos manual: fix a typo that made it invalid XML
...
The problem was merge to master in the bfbadab4
2019-01-13 23:23:32 +01:00
Jörg Thalheim
bfbadab4a4
Merge pull request #53801 from Mic92/nixos-builders
...
nixos-rebuild: allow to override builders
2019-01-13 21:59:43 +00:00
Jan Tojnar
e35acd7f1c
gnome3: link nautilus-python paths to environment
2019-01-13 17:43:33 +01:00
Profpatsch
c8c53fcb11
modules/profiles/minimal: sound is disabled by default
...
The option is `false` by default since
e349ccc77f
2019-01-13 13:47:36 +01:00
elseym
8a8bf886b5
nixos/containers: explicitly set link up on host for extraVeths
2019-01-13 11:27:39 +01:00
Vladimír Čunát
570d84a01e
Merge branch 'staging-next'
2019-01-13 00:39:38 +01:00
Silvan Mosberger
497e6f1705
Merge pull request #51661 from eonpatapon/testing-hosts
...
test: set machines fqdn in /etc/hosts
2019-01-12 20:41:13 +01:00
Frederik Rietdijk
9f827d66f5
Update nixos/doc/manual/man-nixos-rebuild.xml
...
Co-Authored-By: Mic92 <Mic92@users.noreply.github.com>
2019-01-12 18:26:00 +00:00
Frederik Rietdijk
f45195fb44
Update nixos/doc/manual/man-nixos-rebuild.xml
...
Co-Authored-By: Mic92 <Mic92@users.noreply.github.com>
2019-01-12 18:25:52 +00:00
Samuel Dionne-Riel
2646a64fbc
Merge pull request #53827 from samueldr/feature/data-in-logs
...
tests: Logs timing in tests
2019-01-12 12:54:56 -05:00
Samuel Dionne-Riel
3b68ddb6fe
Merge pull request #53828 from samueldr/feature/double-alarm-time
...
tests: Wait for shell for twice as long (10m)
2019-01-12 12:08:14 -05:00
Vladimír Čunát
bde8efe792
Merge branch 'master' into staging-next
...
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
Samuel Dionne-Riel
b28b37eb00
tests: Wait for shell for twice as long (10m)
...
See #49441 for an earlier attempt, which was subsequently reverted. I am
assuming that doubling the time will be sufficient if the machine is
overloaded since so many of the tests already pass at 5 minutes, while
still not holding back failures for needlessly long.
2019-01-11 22:40:19 -05:00
Samuel Dionne-Riel
5d93e2c01c
test-driver: Logs time taken for nests
2019-01-11 22:36:31 -05:00
Samuel Dionne-Riel
1fe0018df8
test-driver: Adds time it took to connect to guest in logs
...
This will make it possible to track whether the time is generous or not
when ran on hydra.
2019-01-11 22:36:31 -05:00
Joachim F
8ffae68b22
Merge pull request #53806 from pbogdan/krb-test-eval
...
nixos/tests/kerberos: fix evaluation
2019-01-11 17:09:38 +00:00
Eelco Dolstra
94ea1c2d83
nix: 2.1.3 -> 2.2
2019-01-11 12:47:06 +01:00
Jörg Thalheim
e40bfa4d85
nixos-rebuild: allow to override builders
...
Since nix 2.0 the no-build-hook option was replaced by the builders options
that allows to override remote builders ad-hoc.
Since it is useful to disable remote builders updating nixos without network,
this commit reintroduces the option.
2019-01-11 11:40:25 +00:00
Piotr Bogdan
cfc281f571
nixos/tests/kerberos: fix evaluation
2019-01-11 04:36:51 +00:00
Maximilian Bosch
44a80294f7
Merge pull request #53746 from zaninime/patch-1
...
nexus: 3.12.1 -> 3.14.0-04
2019-01-10 23:01:26 +01:00
Maximilian Bosch
edcd1494f7
nixos/nexus: increase disk size of VM test to 8GB
...
Nexus increased their default minimum disk space requirement to 4GB:
```
com.orientechnologies.orient.core.exception.OLowDiskSpaceException: Error occurred while executing a
write operation to database 'OSystem' due to limited free space on the disk (1823 MB). The database
is now working in read-only mode. Please close the database (or stop OrientDB), make room on your hard
drive and then reopen the database. The minimal required space is 4096 MB. Required space is now
set to 4096MB (you can change it by setting parameter storage.diskCache.diskFreeSpaceLimit) .
server# [ 72.560866] zqnav3mg7m6ixvdcacgj7p5ibijpibx5-unit-script-nexus-start[627]: DB name="OSystem"
```
Including the rest on the VM 8GB should be the most suitable solution.
As the installer test also takes 8GB of disk size this should still be
in an acceptable range.
2019-01-10 22:44:26 +01:00
lewo
7612a6add4
Merge pull request #52870 from xtruder/pkgs/dockerTools/buildLayeredImage/extraCommands
...
dockerTools: allow to pass extraCommands, uid and gid to buildLayered image
2019-01-10 19:00:19 +01:00
Yorick
4d68e82dbc
nixos/borgbackup: use coercedTo instead of apply on paths ( #53756 )
...
so multiple declarations merge properly
2019-01-10 16:34:02 +01:00
Jaka Hudoklin
954cda5c9d
dockerTools: allow to pass extraCommands, uid and gid to buildLayeredImage
2019-01-10 16:02:23 +01:00
Vladimír Čunát
287144e342
Merge branch 'master' into staging-next
2019-01-10 13:07:21 +01:00
Vladimír Čunát
829ada37bf
Merge #53365 : nixos/nsd: Don't override bind via nixpkgs.config
2019-01-10 11:00:40 +01:00
Claudio Bley
cb0b629894
nixos/luksroot: Fix typo Verifiying -> Verifying
2019-01-08 15:45:02 -05:00
Robin Gloster
c75571d66c
Merge pull request #53598 from mayflower/atlassian-updates
...
atlassian updates
2019-01-08 17:56:13 +00:00
Silvan Mosberger
6a942aec5b
Merge pull request #52765 from Izorkin/datadog-agent
...
datadog-agent: 6.4.2 -> 6.8.3
2019-01-08 16:01:26 +01:00
Jörg Thalheim
ba9f589180
Merge pull request #53446 from Mic92/systemd-udev-settle
...
nixos/systemd-udev-settle: don't restart on upgrades
2019-01-08 13:05:25 +01:00
Izorkin
47a8b13efa
datadog-agent: 6.4.2 -> 6.8.3
2019-01-08 11:16:44 +03:00
Matthew Bauer
04373fd3cc
Merge pull request #52594 from matthewbauer/fix-51025
...
make-disk-image: use filterSource instead of cleanSource
2019-01-07 16:29:58 -06:00
Matthew Bauer
f05d8f31ec
make-disk-image: use filterSource instead of cleanSource
...
cleanSource does not appear to work correctly in this case. The path
does not get coerced to a string, resulting in a dangling symlink
produced in channel.nix. Not sure why, but this
seems to fix it.
Fixes #51025 .
/cc @elvishjericco
2019-01-07 16:28:50 -06:00
Robin Gloster
89d24aca93
atlassian-crowd: 3.2.5 -> 3.3.3
2019-01-07 21:54:23 +01:00
Franz Pletz
b60f8fc6e2
atlassian modules: don't chown home recursively
...
This can take a long time and should not be necassary anyway.
2019-01-07 21:54:20 +01:00
Matthew Bauer
de30f4e61d
Merge pull request #51570 from eonpatapon/cassandra-logging
...
cassandra: add option to configure logging
2019-01-07 12:41:07 -06:00
Bas van Dijk
6ac10cd764
Merge pull request #53399 from LumiGuide/feat-wordpress-copy-plugins
...
apache-httpd/wordpress: copy plugins and themes instead of symlinking
2019-01-07 13:41:29 +01:00
Tim Steinbach
289fe57eea
urxvt: Allow switching out package
2019-01-07 07:35:20 -05:00
Matthew Bauer
751c03e8fd
Merge pull request #47665 from erikarvstedt/initrd-improvements
...
Minor initrd improvements
2019-01-06 21:48:26 -06:00
Falco Peijnenburg
9d2c9157d7
nixos/apache-httpd/wordpress: copy plugins and themes instead of symlinking
...
Symlinking works for most plugins and themes, but Avada, for instance, fails to
understand the symlink, causing its file path stripping to fail. This results in
requests that look like:
https://example.com/wp-content//nix/store/...plugin/path/some-file.js
Since hard linking directories is not allowed, copying is the next best thing.
2019-01-06 17:51:31 +01:00
Joachim Fasting
e6538caa48
nixos/tests: re-enable hardened test
...
Has been okay since 62623b60d5
2019-01-06 14:08:20 +01:00
Joachim Fasting
39c30a33c1
nixos/tests/hardened: test loading out-of-tree-modules
2019-01-06 13:19:28 +01:00
Frederik Rietdijk
a4250d1478
Merge staging-next into staging
2019-01-06 09:48:31 +01:00
Frederik Rietdijk
e5381cdece
Merge master into staging-next
2019-01-06 09:36:23 +01:00
Jörg Thalheim
09fb07e4af
Merge pull request #52943 from ck3d/vdr-enableLirc
...
nixos vdr: introduce option enableLirc
2019-01-05 17:51:41 +01:00
Jörg Thalheim
8a2389e4a1
Merge pull request #53404 from Mic92/xsslock
...
nixos/xss-lock: specify a default locker
2019-01-05 16:44:29 +01:00
Jörg Thalheim
2614c8a6c5
nixos/xss-lock: specify a default locker
...
Having a default locker is less error-prone and more convenient.
Incorrect values might leave the machine vulnerable since there is no
fallback.
2019-01-05 16:42:30 +01:00
Vladimír Čunát
d84a33d85b
Merge branch 'master' into staging-next
...
A few more rebuilds (~1k on x86_64-linux).
2019-01-05 15:02:04 +01:00
Joachim Fasting
167578163a
nixos/hardened profile: always enable pti
2019-01-05 14:07:39 +01:00
