Frederik Rietdijk
64c8c6dcb3
Merge master into staging
2018-05-10 09:30:56 +02:00
aszlig
67a8c66f68
nixos/dovecot: Fix usage of dhparams option
...
The pull request that added dhparams (#39507 ) was made at the time where
the dhparams module overhaul (#39526 ) wasn't done yet, so it's still
using the old mechanics of the module.
As stated in the release notes:
Module implementers should not set a specific bit size in order to let
users configure it by themselves if they want to have a different bit
size than the default (2048).
An example usage of this would be:
{ config, ... }:
{
security.dhparams.params.myservice = {};
environment.etc."myservice.conf".text = ''
dhparams = ${config.security.dhparams.params.myservice.path}
'';
}
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @qknight, @abbradar, @hrdinka, @leenaars
2018-05-10 08:29:29 +02:00
aszlig
fb9f5e4a03
nixos/testing: Fix output of systemd messages
...
Regression introduced by d4468bedb5
.
No systemd messages are shown anymore during VM test runs, which is not
very helpful if you want to find out about failures.
There is a bit of a conflict between testing and the change that
introduced the regression. While the mentioned commit makes sure that
the primary console is tty0 for virtualisation.graphics = false, our VM
tests need to have the serial console as primary console.
So in order to support both, I added a new virtualisation.qemu.consoles
option, which allows to specify those options using the module system.
The default of this option is to use the changes that were introduced
and in test-instrumentation.nix we use only the serial console the same
way as before.
For test-instrumentation.nix I didn't add a baudrate to the serial
console because I can't find a reason on top of my head why it should
need it. There also wasn't a reason stated when that was introduced in
7499e4a5b9
.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @flokli, @dezgeg, @edolstra
2018-05-10 08:21:20 +02:00
John Ericson
7d8e16d939
Merge pull request #40275 from obsidiansystems/fewer-crossAttrs
...
fontconfig, misc A/V packages: No crossAttrs
2018-05-10 02:17:34 -04:00
John Ericson
7864a17bfb
misc video players: Clean up cross
2018-05-10 01:57:49 -04:00
John Ericson
7d0906eea8
fontconfig: Clean up cross
2018-05-10 01:57:49 -04:00
John Ericson
006422d08d
Merge commit 'feb648ce59ffbed94c58133eb7aa2761992a35e1' into staging
2018-05-10 01:55:26 -04:00
John Ericson
e659c32448
Merge pull request #40270 from obsidiansystems/lib-platform-simplify
...
treewide: Get rid of `*Platform.arch`
2018-05-10 01:54:35 -04:00
John Ericson
c17f79ea3b
Merge remote-tracking branch 'upstream/master' into lib-platform-simplify
2018-05-10 01:40:44 -04:00
John Ericson
feb648ce59
Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify
2018-05-10 01:40:38 -04:00
John Ericson
a02be2bd85
treewide: Get rid of *Platform.arch
...
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
2018-05-10 01:37:31 -04:00
Frederik Rietdijk
3390592cfc
python.pkgs.traitlets: fix build and don't include .pytest_cache
...
Fixes build and prevents including `.pytest_cache` file (#40259 ).
2018-05-10 07:17:37 +02:00
John Ericson
0fd655f355
Merge pull request #40268 from obsidiansystems/uclibc
...
uclibc: Bump and clean
2018-05-10 00:47:30 -04:00
John Ericson
3bc923bf5f
Merge remote-tracking branch 'upstream/master' into uclibc
2018-05-10 00:23:12 -04:00
John Ericson
b3ef322770
Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into uclibc
2018-05-10 00:18:51 -04:00
John Ericson
a31984ecda
uclibc: Bump to uclibc-ng 1.0.30
2018-05-10 00:17:44 -04:00
John Ericson
d65fe65616
uclibc: Fix eval
2018-05-10 00:17:43 -04:00
John Ericson
83fdfb9837
Merge pull request #40210 from ElvishJerricco/fix-android-prebuilt-ghc
...
Fix android prebuilt ghc [Fixes #40194 ]
2018-05-10 00:10:11 -04:00
Peter Hoeg
17b2ef2461
hugo: 0.36.1 -> 0.40.3
2018-05-10 11:54:56 +08:00
Will Fancher
9dadb9e3cb
Fix hsc2hs cross compiler build
2018-05-09 23:53:30 -04:00
John Ericson
f063a860d6
xbursttools: Cleanup slightly
2018-05-09 23:40:13 -04:00
John Ericson
e42a7a5c0b
lib/systems: Add uClibc just like MUSL
2018-05-09 23:39:23 -04:00
John Ericson
0b45f0ebf9
Merge pull request #40261 from obsidiansystems/more-arm
...
lib/systems: Parse more arm cpu types
2018-05-09 20:05:10 -04:00
xeji
2954fa55e9
Merge pull request #40244 from bcdarwin/libminc-update
...
libminc: 2017-09-14 -> 2018-01-17
2018-05-10 01:46:43 +02:00
Yannik Sander
58ab75c639
atom: fix git integration ( #40163 )
2018-05-09 18:34:57 -05:00
xeji
3d6f752c51
Merge pull request #39099 from teto/qemu_agent
...
qemu-guest-agent: init module
2018-05-10 01:22:52 +02:00
Matthew Justin Bauer
1682353805
generic-stack-builder: also support nix-build
...
We need to add the STACK_IN_NIX_EXTRA_ARGS hook in configurePhase also to ensure we get the right args when calling ```nix-build``` (as opposed to nix-shell).
2018-05-09 18:12:13 -05:00
John Ericson
3fa0ba9177
lib/systems: Parse more arm cpu types
2018-05-09 18:57:39 -04:00
John Ericson
12ee278a0d
Merge pull request #40248 from matthewbauer/fix-generic-stack-builder
...
generic-stack-builder: attempt to add propagation
2018-05-09 17:52:00 -04:00
Michael Weiss
038bf4f68b
tdesktopPackages.preview: 1.2.17 -> 1.2.19
2018-05-09 23:22:13 +02:00
Ben Darwin
1e50e178ae
simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings) ( #27451 )
...
* conglomerate: init at 2017-09-10
* simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings)
2018-05-09 15:50:01 -05:00
Matthew Bauer
527abe59cf
generic-stack-builder: attempt to add propagation
...
Fixes #40039
This adds a shellHook to handle propagated dependencies like that seen
in #40039 where gpgme needed libgpg-error.
2018-05-09 15:46:48 -05:00
Matthew Bauer
8a98cf97e9
lib.makeSearchPath: allow null in search path
...
This makes things match ‘buildInputs’ where inputs are allowed to be
null.
2018-05-09 15:44:06 -05:00
Matthew Justin Bauer
37cde0036e
Merge pull request #36358 from nicknovitski/init-cloud-sql-proxy
...
cloud-sql-proxy: init at 1.11
2018-05-09 15:42:32 -05:00
Michael Weiss
7fb1a79b8f
androidStudioPackages.{dev,canary}: 3.2.0.12 -> 3.2.0.13
2018-05-09 22:39:16 +02:00
Ben Darwin
6266387bfa
libminc: 2017-09-14 -> 2018-01-17
2018-05-09 16:25:22 -04:00
xeji
1d3537ba9d
Merge pull request #40241 from romildo/upd.plano-theme
...
plano-theme: 3.24-3 -> 3.28-1
2018-05-09 22:11:12 +02:00
Michael Brantley
df37647ab2
Fix alphabetization of perl modules
2018-05-09 21:56:27 +02:00
Michael Brantley
9410c39b9a
perlPackages.LinuxACL: init at 0.05
2018-05-09 21:56:27 +02:00
Michael Brantley
7b0b4cd397
perlPackages.NetZooKeeper: init at 0.41
2018-05-09 21:55:32 +02:00
José Romildo Malaquias
e745d087c6
plano-theme: 3.24-3 -> 3.28-1
2018-05-09 16:44:28 -03:00
xeji
96c2cad2dd
Merge pull request #39566 from bfortz/owncloud-2.4.1
...
owncloud-client: 2.3.4 -> 2.4.1
2018-05-09 21:43:03 +02:00
xeji
df062e3f7b
Merge pull request #40179 from dtzWill/update/mesa-18.0.3
...
mesa: 17.3.9 -> 18.0.3
2018-05-09 21:28:38 +02:00
xeji
c85d0beca5
Merge pull request #40204 from teto/wireshark_hook
...
wireshark: run binary from nix-shell
2018-05-09 21:24:27 +02:00
xeji
59e9400071
Merge pull request #40238 from va1entin/master
...
keepassxc: 2.3.2 -> 2.3.3
2018-05-09 21:20:55 +02:00
Sarah Brofeldt
3befef8279
Merge pull request #39671 from johanot/keepalived-vrrpInstanceTracking
...
nixos/keepalived: Implemented vrrp-instance track scripts and track interfaces
2018-05-09 20:54:36 +02:00
Valentin Heidelberger
32d8a7d249
keepassxc: 2.3.2 -> 2.3.3
2018-05-09 20:50:06 +02:00
Peter Simons
a9577da115
haskell-brick: update override for ghc-8.4.x to the latest version
2018-05-09 20:41:33 +02:00
Peter Simons
77fbd14d85
haskell-gi: apply upstream patch to fix the doctest suite
2018-05-09 20:41:33 +02:00
Peter Simons
5c26dd3195
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
6ab957cb81
.
2018-05-09 20:41:28 +02:00