Commit Graph

141967 Commits

Author SHA1 Message Date
aszlig
0e7c945e15
nixos/systemd: Allow to override serviceConfig
This has been reported by @qknight in his Stack Overflow question:

https://stackoverflow.com/q/50678639

The correct way to override a single value would be to use something
like this:

systemd.services.nagios.serviceConfig.Restart = lib.mkForce "no";

However, this doesn't work because the check is applied for the attrsOf
type and thus the attribute values might still contain the attribute set
created by mkOverride.

The unitOption type however did already account for this, but at this
stage it's already too late.

So now the actual value is unpacked while checking the values of the
attribute set, which should allow us to override values in
serviceConfig.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @qknight
2018-06-04 15:34:21 +02:00
aszlig
0385d69f87
tests/containers-imperative: Include stdenvNoCC
While building the container there are a few occasions where stdenvNoCC
is used underneath. During the last staging merge, some change now tries
to build texinfo during the test while building stdenvNoCC.

With this change, I'm adding stdenvNoCC to the closure to make sure that
even when we have future stdenv changes, it doesn't break (well, except
if we do have another variation like stdenvNoCC that overrides stdenv).

I haven't bisected the exact change, but I'd suspect that it could be
one of the commits in #39457.

This fixes the test and it no longer fails with the following error:

error: unable to download 'http://ftpmirror.gnu.org/texinfo/texinfo-6.5.tar.xz': Couldn't resolve host name (6)
builder for '/nix/store/r7sf1wjbnimwgnv276jh59nfnzw40x30-texinfo-6.5.tar.xz.drv' failed with exit code 1
cannot build derivation '/nix/store/5w1pv788ayi1wahyy76i90yqv96ai4h5-texinfo-6.5.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/cnsfkf0j5xmm14zzm5a3a66pz66gbc82-stdenv-linux.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv': 1 dependencies couldn't be built
error: build of '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv' failed
/run/current-system/sw/bin/nixos-container: failed to build initial container configuration

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @aristidb, @edolstra, @chaoflow, @kampfschlaefer
2018-06-01 08:20:20 +02:00
Orivej Desh
5662c24302 qpid-cpp: fix build after #28029
When -O2 from hardening does not redefine -O3 from CMake, the build fails with:

     src/qpid/broker/SelectorExpression.cpp: In member function ‘qpid::broker::Expression* qpid::broker::Parse::orExpression(qpid::broker::Tokeniser&)’:
     src/qpid/broker/SelectorExpression.cpp:1041:13: error: ‘*((void*)& s +17)’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
          if (s[1]=='b' || s[1]=='B') {
2018-06-01 06:03:05 +00:00
Anton Latukha
c97fcb4d2b qbittorrent: 4.1.0 -> 4.1.1 (#41252) 2018-06-01 06:02:27 +00:00
Michael Weiss
507d24a7de signal-desktop: 1.11.0 -> 1.12.0 2018-06-01 03:15:31 +02:00
xeji
02b77eaf4a
Merge pull request #41336 from volth/patch-129
frostwire: 6.6.3 -> 6.6.7
2018-06-01 02:10:57 +02:00
Matthew Justin Bauer
b13c4e5465
release: remove nix-repl
nix-repl is not needed anymore because Nix 2.0 comes with repl already. Anyway nix-repl is broken right now on Hydra because Nix 1.11 is broken.

https://hydra.nixos.org/build/74933091
2018-05-31 20:09:20 -04:00
Uli Baum
0046d42397 cargo-edit: remove reference to <nixpkgs>
... it broke nixpkgs.tarball
2018-06-01 01:55:31 +02:00
Michael Weiss
ef7e0e8347 scdoc: 1.3.3 -> 1.3.4 2018-06-01 00:23:33 +02:00
Jan Tojnar
86c4a640b4
Revert "nixos: disable gdk-pixbuf test"
This reverts commit 218ada1ba7.
2018-06-01 00:17:38 +02:00
Jan Tojnar
6d3b9763a6
gdk-pixbuf: make loaders builtin on Darwin
Meson produces faulty loaders on Darwin, building them into the library bypasses that.

4b2f397198
2018-06-01 00:14:59 +02:00
Jan Tojnar
ae8b7a189a
Revert "Revert commit 4b2f3971981272b79da7f87b639ca8854a6ea89c"
This reverts commit 85ae7137ac.
2018-06-01 00:13:15 +02:00
volth
8b984ba61e
frostwire: disable auto-update 2018-05-31 22:10:44 +00:00
volth
2bd46c6b80
frostwire-bin: 6.6.5 -> 6.6.7 2018-05-31 21:34:21 +00:00
symphorien
001a84f22a etherape: 0.9.13 -> 0.9.17 (#41332)
fixes startup
2018-05-31 23:33:48 +02:00
volth
75f20c2e3e
frostwire: 6.6.3 -> 6.6.7 2018-05-31 21:33:15 +00:00
volth
c6c2e65c2d graalvm8: 0.31 -> 1.0.0-rc1 (#41335)
Minor update and fix the build which is broken since the default GCC hardening was changed
2018-05-31 23:27:41 +02:00
coretemp
2d3db84ddb dnscrypt-proxy: make man 8 dnscrypt-proxy work (#41039) 2018-05-31 23:15:19 +02:00
Meghea Iulian
e4ba5dc3d6 gitkraken: 3.6.0 -> 3.6.1 (#41130) 2018-05-31 23:04:50 +02:00
Vincent Ambo
aee19ca7f8 dd-agent: fix compatibility issue with iostat (#41035)
Applies a patch to the dd-agent derivation that fixes a compatibility
issue with the current version of iostat, which no longer contains a
colon after its table headers.

This patch is applied in order for the fix to be backportable to
existing stable releases. A final "proper" fix will be an upgrade to a
newer version of dd-agent, but that requires several other changes.

This fixes #40103.
2018-05-31 22:58:04 +02:00
John Ericson
ecabdfd12f
Merge pull request #41330 from obsidiansystems/haskellSrc2nix-overriding
haskell infra: Allow overriding `haskellSrc2nix`
2018-05-31 16:42:16 -04:00
John Ericson
58ce59dd96 haskell infra: Allow overriding haskellSrc2nix 2018-05-31 16:29:02 -04:00
xeji
f7a96aea20
Merge pull request #41133 from symphorien/os-prober
os-prober: fix dependencies for version >= 1.75
2018-05-31 22:15:47 +02:00
Colin King
0b6dd07980 kafka: include Kafka Connect shell scripts (#41322)
Kafka Connect is a newer addition to Kafka and these scripts may be
handy to keep around.
2018-05-31 22:03:48 +02:00
Vincent Demeester
9d456bf0c1 traefik: 1.5.2 -> 1.6.2 (#41208)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-05-31 21:57:29 +02:00
Matthew Bauer
05eb57b35d Revert "nixpkgs module: Fix defaulting of localSystem and system"
This reverts commit 4fe2898608.

This gives a recursion in certain nixpkgs configs.
2018-05-31 15:55:36 -04:00
R. RyanTM
0fbc3451ef byacc: 20180510 -> 20180525 (#41304)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/byacc/versions.

These checks were done:

- built on NixOS
- /nix/store/bz6434x282zsy6xz19nbd3fhzmdr4yzy-byacc-20180525/bin/yacc passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 20180525 with grep in /nix/store/bz6434x282zsy6xz19nbd3fhzmdr4yzy-byacc-20180525
- directory tree listing: https://gist.github.com/fffd356f1d450bf13fc3f2bf8a8f5304
- du listing: https://gist.github.com/3e8f1a51d1e20db022ff93cedc85b5a7
2018-05-31 21:47:30 +02:00
Patrick Hilhorst
5421c6f156 atom, atom-beta: 1.27.1 -> 1.27.2, 1.28.0-beta1 -> 1.28.0-beta2 (#41318) 2018-05-31 21:42:26 +02:00
xeji
41649f5fce
Merge pull request #41197 from vbgl/ocaml-clean-201805
ocamlPackages.gapi_ocaml: minor cleaning
2018-05-31 21:20:58 +02:00
Peter Simons
8ad1476755 multi-ghc-travis: update to latest git version for ghc-8.4.3 support 2018-05-31 21:19:57 +02:00
R. RyanTM
125ff1ec54 uftp: 4.9.6 -> 4.9.7 (#41236)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/uftp/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftp had a zero exit code or showed the expected version
- /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftpd passed the binary check.
- /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftp_keymgt passed the binary check.
- Warning: no invocation of /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftpproxyd had a zero exit code or showed the expected version
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 4.9.7 with grep in /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7
- directory tree listing: https://gist.github.com/1fe6684f427417f8a9e189f960c84a74
- du listing: https://gist.github.com/15a89b170d541884994e503690c961ef
2018-05-31 20:40:33 +02:00
Matthew Bauer
e4e8967269 haskell: fixup merge of c425a1fc50
This was accidentally included even though setupHaskellDepends is
already listed above.
2018-05-31 14:06:56 -04:00
Austin Seipp
a22faf1060 haskellPackages.ghc84x.criterion: bump to criterion 1.4.1.0
We need base-compat-0.10 for 8.4, but the older version wanted 0.9.
(Criterion 1.4.1.0 now uses base-compat-batteries-0.10, in fact)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-05-31 13:04:58 -05:00
Ryan Trinkle
c425a1fc50 haskell: add *FrameworkDepends arguments 2018-05-31 14:04:10 -04:00
Matthew Bauer
218ada1ba7 nixos: disable gdk-pixbuf test
The test currently relies on installedTests output which was reverted
in 85ae7137ac.

See
85ae7137ac
for discussion.
2018-05-31 14:01:05 -04:00
Austin Seipp
cf2604004e haskellPackages.ghc84x.singletons: disable test suite for ghc-8.4.3
Otherwise, the test suite fails, due to the 'Lambdas' test failing:

    Lambdas:              FAIL (1.06s)
      42c42
      <     foo8 x = (\ Foo a _ -> a) x
      ---
      >     foo8 x = (\ (Foo a _) -> a) x

I assume this is a minor bogus failure due to some change in 8.4.3 that
nobody expected.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-05-31 12:59:01 -05:00
Lancelot SIX
e48b54c078 qgis: 2.18.17 -> 2.18.20 (#41195) 2018-05-31 19:44:31 +02:00
Lancelot SIX
0c7f410604 postgis: 2.4.3 -> 2.4.4 (#41278)
See http://svn.osgeo.org/postgis/tags/2.4.4/NEWS for release notes
2018-05-31 19:39:53 +02:00
xeji
e4a11802e5
Merge pull request #41280 from udono/update_tryton_4_8
Update tryton 4 8
2018-05-31 19:32:38 +02:00
James Kay
9d99fcf8a1 compton-git: 2016-08-10 -> 2018-05-21 (#41317) 2018-05-31 19:24:30 +02:00
Francesco Gazzetta
d38d1ed44f jl: 0.0.4 -> 0.0.5 (#41319) 2018-05-31 19:22:23 +02:00
Matthew Bauer
3c1ee736df Revert "cairo: fix build inputs"
This reverts commit e557a432e0.

Sorry about this. Accidentally got into my git push. Did not mean to
cause a mass rebuild!
2018-05-31 12:41:41 -04:00
Matthew Bauer
050557ef8a PowerManagement: init at 572.50.1 2018-05-31 12:36:23 -04:00
Matthew Bauer
85ae7137ac Revert commit 4b2f397198
This reverts commit 4b2f397198. It
updated gdk_pixbuf to 2.36.12 but unfortunately broke macOS builds.
The new mime sniffing is not working correctly so that .png files
cannot be built.

Fixes #41314

/cc @jtojnar @lnl7
2018-05-31 12:34:16 -04:00
Matthew Bauer
03b3148beb ffmpeg: fix 3.4 on darwin 2018-05-31 12:34:16 -04:00
Matthew Bauer
e557a432e0 cairo: fix build inputs 2018-05-31 12:34:16 -04:00
Matthew Bauer
f492246df2 all-packages remove unused override 2018-05-31 12:34:16 -04:00
Matthew Bauer
2f68e86ce6 zsh: only do promptInit when TERM!=dumb
This allows tramp to be used correctly when default shell is zsh.
2018-05-31 12:34:16 -04:00
Matthew Bauer
ee1d6114a8 emacsMacport: 25.3 -> 26.1 2018-05-31 12:34:16 -04:00
Matthew Bauer
753c63dbc1 qemu-flags: default to qemu-kvm
this is the "generic" version & should work everywhere.

also add darwin case
2018-05-31 12:34:15 -04:00