Commit graph

130563 commits

Author SHA1 Message Date
aszlig 88530e02b6
systemd: Update to latest NixOS branch
Updated to the latest version of the nixos-v237 branch, which fixes two
things:

  * Make sure that systemd looks in /etc for configuration files.
    https://github.com/NixOS/systemd/pull/15
  * Fix handling of the x-initrd.mount option.
    https://github.com/NixOS/systemd/pull/16

I've added NixOS VM tests for both to ensure we won't run into
regressions. The newly added systemd test only tests for that and is by
no means exhaustive, but it's a start.

Personally I only wanted to fix the former issue, because that's the one
I've been debugging. After sending in a pull request for our systemd
fork (https://github.com/NixOS/systemd/pull/17) I got a notice from
@Mic92, that he already fixed this and his fix was even better as it's
even suitable for upstream (so we hopefully can drop that patch
someday).

The reason why the second one came in was simply because it has been
merged before the former, but I thought it would be a good idea to have
tests for that as well.

In addition I've removed the sysconfdir=$out/etc entry to make sure the
default (/etc) is used. Installing is still done to $out, because those
directories that were previously into sysconfdir now get into
factoryconfdir.

Quote from commit NixOS/systemd@98067cc806:

  By default systemd should read all its configuration from /etc.
  Therefore we rely on -Dsysconfdir=/etc in meson as default value.
  Unfortunately this would also lead to installation of systemd's own
  configuration files to `/etc` whereas we are limited to /nix/store. To
  counter that this commit introduces two new configuration variables
  `factoryconfdir` and `factorypkgconfdir` to install systemd's own
  configuration into nix store again, while having executables looking
  up files in /etc.

Tested this change against all of the NixOS VM tests we have in
nixos/release.nix. Between this change and its parent no new tests were
failing (although a lot of them were flaky).

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Mic92, @tk-ecotelecom, @edolstra, @fpletz
Fixes: #35415
Fixes: #35268
2018-03-03 10:39:38 +01:00
Jörg Thalheim 1e53544215
Merge pull request #36234 from Ma27/disable-uutils-coreutils-on-darwin
uutils-coreutils: disable general unix build for now
2018-03-03 08:12:00 +00:00
Jörg Thalheim 41e289108c
Merge pull request #36239 from khumba/remove-app-maintainership
claws-mail, jitsi: remove myself (khumba) from maintainers
2018-03-03 08:09:18 +00:00
Austin Seipp 7270f2139a tlaplus: init at 1.5.6
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-03-02 21:20:54 -06:00
Austin Seipp 0339dc5fae libftdi: enable async mode
Apparently, async mode for libftdi 0.20 is allegedly disabled when using
libusb-compat wrappers, as libftdi does not really support libftdi 1.x. Because
we only ship libusb-compat, this would normally make async mode completely
unavailable.

Except distributions like Ubuntu just disable this check completely! See this
patch from Launchpad:

https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff

In the spirit of good competition (and feature parity for software that
*doesn't* support the synchronous mode, thanks to Ubuntu silently ensuring
their async-only paths work) we enable this just the same.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-03-02 21:20:54 -06:00
Bryan Gardiner 285fd08c0e
claws-mail, jitsi: remove myself (khumba) from maintainers 2018-03-02 18:10:24 -08:00
aszlig ae7efee4fa
systemd: Reident the expression file
The indenting is a bit weird to follow, especially at the end of the
file (right brace without indent, but the opening brace is indented by
two spaces).

No functional change and I've verified this by building it with this
change and without and both lead to the same store paths.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @fpletz, @edolstra
2018-03-03 01:53:16 +01:00
Maximilian Bosch a820dba469
uutils-coreutils: disable general unix build for now
Currently the installation on Darwin fails due to a bug in the
installation script: https://github.com/NixOS/nixpkgs/pull/34840#issuecomment-369227222

As I lack knowledge and resources to properly test this package against
Darwin I'll disallow Darwin builds for now.
2018-03-03 01:47:57 +01:00
Jan Tojnar 618ac29687
cantarell-fonts: rename from cantarell_fonts 2018-03-03 00:36:38 +01:00
Jan Tojnar f6af32c654
cantarell_fonts: 0.0.25 → 0.100 2018-03-03 00:36:38 +01:00
Jörg Thalheim 063669901a
Merge pull request #36211 from Mic92/mlt
mlt: 6.4.1 -> 6.6.0
2018-03-02 23:25:27 +00:00
Jörg Thalheim bf40da750f
Merge pull request #36225 from leenaars/stubby
stubby: init at 0.2.2
2018-03-02 23:24:02 +00:00
Tim Steinbach a1456403a9
ammonite: 1.0.3 -> 1.0.5 2018-03-02 18:12:08 -05:00
Michiel Leenaars 61dc6030bf stubby: init at 0.2.2 2018-03-02 23:29:40 +01:00
Robert Helgesson e232ebe244
abcmidi: 2018.02.07 -> 2018.02.22 2018-03-02 23:06:48 +01:00
Robert Helgesson 87acdcabd1
josm: 13367 -> 13478 2018-03-02 22:59:54 +01:00
lewo 085321ab38
Merge pull request #35648 from ryantm/auto-update/flyway-4.2.0-to-5.0.7
flyway: 4.2.0 -> 5.0.7
2018-03-02 22:15:26 +01:00
lewo ab8cddbc07
Merge pull request #35663 from dywedir/gphoto2
gphoto2: 2.5.11 -> 2.5.15
2018-03-02 22:11:28 +01:00
Daiderd Jordan 9717e6268f
kwm: 4.0.4 -> 4.0.5 2018-03-02 20:54:27 +01:00
Daiderd Jordan d35c7590a2
khd: 2.1.1 -> 3.0.0 2018-03-02 20:54:19 +01:00
Robert Helgesson d78739ca96
svtplay-dl: 1.9.7 -> 1.9.9 2018-03-02 20:03:25 +01:00
Shea Levy 3509c4b7bb
Merge branch 'callCabal2nix-retain-ifd' 2018-03-02 13:22:26 -05:00
Sander van der Burg 51857be0d5 s3fs: 1.82 -> 1.83 2018-03-02 18:16:07 +01:00
Jörg Thalheim 22b4349b3a
Merge pull request #36224 from erosennin/pymetar-0.21
pythonPackages.pymetar: 0.20 -> 0.21
2018-03-02 16:13:51 +00:00
Jörg Thalheim e2f7ef7bf5 python.pkgs.pymetar: modernize 2018-03-02 16:12:08 +00:00
Jörg Thalheim 609f0e05b0
Merge pull request #36152 from aij/infiniband-diags
infiniband-diags: init at 2.0.0
2018-03-02 16:07:11 +00:00
Jon Banafato 004a59f18e
corebird: 1.7.3 -> 1.7.4 2018-03-02 16:48:04 +01:00
Andrey Golovizin a862a0e559 pythonPackages.pymetar: 0.20 -> 0.21 2018-03-02 16:47:28 +01:00
Andrey Golovizin cc2aa6f358 pythonPackages.pymetar: add myself as maintainer 2018-03-02 16:46:36 +01:00
Jörg Thalheim d2850489f7
Merge pull request #36194 from maurer/bap-1.4
BAP update to 1.4
2018-03-02 15:45:24 +00:00
Jörg Thalheim e0b5bdde90
Merge pull request #32095 from elitak/opentx
opentx: init at 2.2.0
2018-03-02 15:40:06 +00:00
Jörg Thalheim 6ef34c6406
Merge pull request #36220 from sternenseemann/spotify
spotify: 1.0.70.399.g5ffabd56-26 -> 1.0.69.336.g7edcc575-39
2018-03-02 15:24:58 +00:00
Jörg Thalheim 4bb17f5860
Merge pull request #36121 from roconnor/bitcoin
bitcoin: 0.15.1 -> 0.16.0
2018-03-02 15:19:35 +00:00
Shea Levy 62a1abe204
haskellPackages.callCabal2nix: Depend on the expression.
This ensures that as long as the package derivation is alive, its nix
expressions do not need to be regenerated.

Fixes #36190.
2018-03-02 09:37:02 -05:00
Jörg Thalheim 336eb53f72
Merge pull request #36207 from lheckemann/mips
memtester: fix cross build
2018-03-02 14:11:30 +00:00
Jörg Thalheim e044db3974 mlt: 6.4.1 -> 6.6.0
fix opencv incompatibility reported in #36170
2018-03-02 14:05:23 +00:00
adisbladis 11d6ada755
seth: 0.6.2 -> 0.6.3 2018-03-02 21:23:31 +08:00
adisbladis 7e39f46427
ethabi: 1.0.4 -> 4.1.0 2018-03-02 21:20:30 +08:00
sternenseemann 7d7d25fb3b spotify: 1.0.70.399.g5ffabd56-26 -> 1.0.69.336.g7edcc575-39 2018-03-02 14:03:57 +01:00
Robin Gloster a8d3aa58dc
Revert "dhcpcd: 6.11.5 -> 7.0.1"
This reverts commit 7cc74d6dc5.

See discussion in https://github.com/NixOS/nixpkgs/pull/35622

cc @vcunat @Mic92 @fpletz
2018-03-02 13:20:56 +01:00
Jörg Thalheim 73af4d6afa
Merge pull request #36197 from DarkScythe97/libretro
libretro: specify license per core
2018-03-02 12:01:17 +00:00
Linus Heckemann a9dd3847f6 memtester: fix cross build 2018-03-02 11:04:58 +00:00
Robin Gloster e43dd6f164
gnome2.gnome-session: remove 2018-03-02 11:56:45 +01:00
Robin Gloster e616cd8840
tex4ht: obsoleted by tex4ht in texlive 2018-03-02 11:56:45 +01:00
Robin Gloster 0e050da0f5
torchat: not broken 2018-03-02 11:56:44 +01:00
adisbladis 054a57d3a6
Merge pull request #35903 from dywedir/nnn
nnn: 1.6 -> 1.7
2018-03-02 18:44:40 +08:00
adisbladis 349e62d97c
Merge pull request #35924 from ryantm/auto-update/nq-0.1-to-0.2.2
nq: 0.1 -> 0.2.2
2018-03-02 18:44:00 +08:00
adisbladis 6c060b0444
Merge pull request #35998 from ryantm/auto-update/riemann-0.2.12-to-0.3.0
riemann: 0.2.12 -> 0.3.0
2018-03-02 18:41:50 +08:00
adisbladis 195f1725eb
Merge pull request #35991 from ryantm/auto-update/rdkafka-0.9.5-to-0.11.3
rdkafka: 0.9.5 -> 0.11.3
2018-03-02 18:41:35 +08:00
Vladimír Čunát 213c2169d6
msitools: remove myself from maintainers
I haven't used it for a very long time,
and there's too much other things going on.
2018-03-02 10:33:26 +01:00