3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

138788 commits

Author SHA1 Message Date
Michele Catalano afd3136e8e
nixos/docker-registry: Add support for garbage collector to docker registry 2018-05-01 15:23:47 +02:00
Maximilian Bosch 593dc45141
nixos/docker-registry: cleanup module definition & enhance testcase
The following changes have been applied:

- the property `http.headers.X-Content-Type-Options` must a list of
  strings rather than a serialized list
- instead of `/etc/docker/registry/config.yml` the configuration will be
  written with `pkgs.writeText` and the store path will be used to run
  the registry. This reduces the risk of possible impurities by relying
  on the Nix store only.
- cleaned up the property paths to easy readability and reduce the
  verbosity.
- enhanced the testcase to ensure that digests can be deleted as well
- the `services.docker-registry.extraConfig` object will be merged with
  `registryConfig`

/cc @ironpinguin
2018-05-01 15:23:39 +02:00
Michele Catalano f5c0b3f887
nixos/docker-registry: add more configuration options for docker-registry 2018-05-01 14:53:50 +02:00
Jörg Thalheim d9684a2a0b
Merge pull request #36572 from ryantm/auto-update/gperftools
gperftools: 2.6.1 -> 2.6.3
2018-04-30 07:58:18 +01:00
Jörg Thalheim f5dd1b28e9
Merge pull request #39702 from samueldr/dbeaver/5.0.4
dbeaver: 5.0.3 -> 5.0.4
2018-04-30 07:55:12 +01:00
Jörg Thalheim 6a560f499c gperftools: suppress compilation warning on macOS 2018-04-30 07:44:50 +01:00
Pascal Wittmann e96dc327c8
Merge pull request #39674 from pstn/dehydrated-bump
dehydrated: 0.6.1 -> 0.6.2
2018-04-30 08:29:39 +02:00
adisbladis 5f5257dbce
go-ethereum: 1.8.3 -> 1.8.6 2018-04-30 13:31:09 +08:00
Peter Hoeg 12d89a7ed9
Merge pull request #39147 from peterhoeg/u/tox
tox: libtoxcore and assorted tox client updates
2018-04-30 04:07:30 +00:00
Samuel Dionne-Riel d0c8bf86e4 dbeaver: 5.0.3 -> 5.0.4 2018-04-29 23:19:19 -04:00
Tim Steinbach cf194a9311
linux: 4.17-rc2 -> 4.17-rc3 2018-04-29 22:29:10 -04:00
Graham Christensen 8caaec894e
Merge pull request #39649 from grahamc/hacking-docs
NixOS docs: making it easier to hack on
2018-04-29 21:56:45 -04:00
aszlig f148c5c4a1
nixos/tests: Fix QEMU flags for SCSI disks
The ability to specify "-drive if=scsi" has been removed in QEMU version
2.12 (introduced in 3e3b39f173).

Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes:

> The deprecated way of configuring SCSI devices with "-drive if=scsi"
> on x86 has been removed. Use an appropriate SCSI controller together
> "-device scsi-hd" or "-device scsi-cd" and a corresponding "-blockdev"
> parameter instead.

So whenever the diskInterface is "scsi" we use the new way to specify
the drive and fall back to the deprecated way for the time being. The
reason why I'm not using the new way for "virtio" and "ide" as well is
because there is no simple generic way anymore to specify these.

This also turns the type of the virtualisation.qemu.diskInterface option
to be an enum, so the user knows which values are allowed but we can
also make sure the right value is provided to prevent typos.

I've tested this against a few non-disk-related NixOS VM tests but also
the installer.grub1 test (because it uses "ide" as its drive interface),
the installer.simple test (just to be sure it still works with
"virtio") and all the tests in nixos/tests/boot.nix.

In order to be able to run the grub1 test I had to go back to
8b1cf100cd (which is a known commit where
that test still works) and apply the QEMU update and this very commit,
because right now the test is broken.

Apart from the tests here in nixpkgs, I also ran another[1] test in
another repository which uses the "scsi" disk interface as well (in
comparison to most of the installer tests, this one actually failed
prior to this commit).

All of them now succeed.

[1]: 9b5a119972/tests/system/kernel/bfq.nix

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edostra, @grahamc, @dezgeg, @abbradar, @ts468
2018-04-30 03:02:59 +02:00
aszlig 1907120f23
nixos/tests/udisks2: Fix USB device hotplug
The usb_add and usb_del monitor commands have been removed in QEMU
version 2.12 (introduced in 3e3b39f173).

Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes:

> The deprecated HMP commands "usb_add" and "usb_del" have been removed.
> Use "device_add" and "device_del" as replacement instead.

So we're doing exactly that and the udisks2 test now works again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
2018-04-30 03:02:57 +02:00
Graham Christensen 81c705ad99
Merge pull request #39695 from worldofpeace/patch-1
wire-desktop: correct desktopItem
2018-04-29 20:53:08 -04:00
Jan Tojnar 205d9a720f
Merge pull request #37986 from jtojnar/qpdfview-qt5
qpdfview: port to qt5
2018-04-30 02:43:06 +02:00
worldofpeace 82080d77a0
wire-desktop: correct desktopItem 2018-04-29 20:32:41 -04:00
Jan Tojnar 9e503e039b
qpdfview: remove placeholder usage 2018-04-30 02:26:41 +02:00
Matthew Bauer 47a7383395 darling: fix src
Darling has a case conflict which means that its src hash will be
different between case sensitive and case insensitive file systems.
This is not ideal and the only way around it is basically to remove
the offending files from the output. I use fetchzip here to do that
but I hope there is a better fix available eventually.
2018-04-29 19:15:45 -05:00
Peter Hoeg 8811d1d384 toxvpn: 2017-06-25 -> 2018-04-17 2018-04-30 07:55:07 +08:00
Peter Hoeg 8ce6587966 utox: 0.16.1 -> 0.17.0 2018-04-30 07:55:07 +08:00
Jan Tojnar 62eb285a62
qpdfview: port to qt5 2018-04-30 01:35:46 +02:00
Matthew Justin Bauer f12b93162a
rl-1809: add netcat note 2018-04-29 18:30:42 -05:00
Michael Raskin d917b5adfb
Merge pull request #39408 from timokau/cddlib-094i
cddlib: 0.94h -> 0.94i, add cdd_both_reps binary
2018-04-29 22:32:41 +00:00
xeji 1c380fd6eb
Merge pull request #39652 from ajs124/makemkv_1_12_qt5
makemkv: 1.10.8 -> 1.12.2, switch from qt4 to qt5
2018-04-30 00:11:37 +02:00
aszlig 146cb02542
nixos/tests/hibernate: Fix netcat flags
I'm not sure why 024b501907 used -q 0
because even netcat-openbsd has the -N flag which IMO is the better way
to shutdown the socket on EOF.

Our default netcat implementation has changed once again[1] in
3c3b82234a and we're now using LibreSSL's
implementation, which doesn't have a -q flag.

See https://github.com/NixOS/nixpkgs/pull/39634 for the pull request
introducing the switch.

[1]: https://github.com/NixOS/nixpkgs/pull/19982

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @dtzWill, @Mic92
2018-04-29 23:46:47 +02:00
xeji ff3fe105f2
Merge pull request #39678 from Ma27/fix-awscli
awscli: 1.14.50 -> 1.15.10; fix build
2018-04-29 23:26:42 +02:00
Matthew Justin Bauer e8672c8b37
libressl: fix eval 2018-04-29 15:14:34 -05:00
xeji 5e06ec7ab8
Merge pull request #35361 from sconybeare/master
monkeysphere: wrap the monkeysphere executable with the necessary crypto libraries …
2018-04-29 22:14:32 +02:00
Matthew Justin Bauer 6583ec598b
Merge pull request #39634 from matthewbauer/remove-openbsd-netcat
Replace netcat-openbsd with libressl
2018-04-29 14:48:22 -05:00
Matthew Bauer c2148482c2 libressl: move netcat stuff to '.nc' output
I still feel weird about doing this because it seems a little hacky
but this was requested by @Mic92 and seems understandable to not want
to mix up libressl outputs with netcat stuff.
2018-04-29 14:47:12 -05:00
Matthew Justin Bauer d7e5637791
Merge pull request #39636 from matthewbauer/netbsd
netbsd: cleanups
2018-04-29 14:28:04 -05:00
Matthew Bauer 0be5637139 netbsd.games: disable more games on darwin 2018-04-29 14:27:26 -05:00
Anderson Torres 6cc732ebbe
Merge pull request #38066 from jluttine/calibre-3.20.0
calibre: remove unnecessary patch
2018-04-29 16:07:13 -03:00
xeji ef2b9b6bee
Merge pull request #36005 from ryantm/auto-update/rtaudio-4.1.2-to-5.0.0
rtaudio: 4.1.2 -> 5.0.0
2018-04-29 20:51:31 +02:00
xeji 1937b810b6
Merge pull request #39340 from xeji/interim-fix-39069
nixos/networkd: wait for udev to settle before starting networkd
2018-04-29 20:45:09 +02:00
Matan Shenhav 80bf73b11c pythonPackages.hdbscan: init at 0.8.12 (#37762) 2018-04-29 20:22:12 +02:00
xeji 8b6fe6680f
Merge pull request #39513 from xeji/qemu-2-12
qemu: 2.11.1 -> 2.12.0
2018-04-29 18:41:18 +02:00
Bruno Bigras 80b7298420 ldb: 1.1.27 → 1.1.31
fix #39572
2018-04-29 19:23:01 +03:00
Maximilian Bosch 0e5eafc1fd
awscli: 1.14.50 -> 1.15.10; fix build
As reported in #39676 the build broke because of ca52152 as the bump of
`pythonPackages.botocore` to 1.10.9 clashed with the wanted dependencies
in `awscli`.

In order to reduce the risk of accidental bugs because of loosened
version constraints I bumped the AWS CLI to `1.15.10` which depends on
`botocore@1.10` as well.

Fixes #39676
2018-04-29 17:40:18 +02:00
Léo Gaspard 905b03bce2 chromium: fix build on aarch64
chromium build on aarch64 failed with:
```
FAILED: obj/skia/skia/convolver_neon.o
g++ -MMD -MF obj/skia/skia/convolver_neon.o.d -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_SUPPORT_GPU=1 -DSK_FREETYPE_MINIMUM_RUNTIME_VERSION=\(\(\(FREETYPE_MAJOR\)\ \*\ 0x01000000\)\ \|\ \(\(FREETYPE_MINOR\)\ \*\ 0x00010000\)\ \|\ \(\(FREETYPE_PATCH\)\ \*\ 0x00000100\)\) -DSK_GAMMA_EXPONENT=1.2 -DSK_GAMMA_CONTRAST=0.2 -DSK_DEFAULT_FONT_CACHE_LIMIT=20971520 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DFT_CONFIG_CONFIG_H=\"freetype-custom-config/ftconfig.h\" -DFT_CONFIG_MODULES_H=\"freetype-custom-config/ftmodule.h\" -DFT_CONFIG_OPTIONS_H=\"freetype-custom-config/ftoption.h\" -DPDFIUM_REQUIRED_MODULES -DCHROMIUM_RESTRICT_VISIBILITY -DUSE_LIBJPEG_TURBO=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DUSE_SYSTEM_ZLIB=1 -I../.. -Igen -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/encode -I../../third_party/skia/include/gpu -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/src/gpu -I../../third_party/skia/src/sksl -I../../third_party/skia/include/codec -I../../third_party/skia/include/private -I../../third_party/skia/include/client/android -I../../third_party/skia/src/codec -I../../third_party/skia/src/core -I../../third_party/skia/src/image -I../../third_party/skia/src/images -I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf -I../../third_party/skia/src/ports -I../../third_party/skia/src/shaders -I../../third_party/skia/src/shaders/gradients -I../../third_party/skia/src/sfnt -I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy -I../../third_party/skia/third_party/gif -I../../third_party/skia/src/effects/gradients -Igen/shim_headers/libpng_shim -Igen/shim_headers/zlib_shim -I../../third_party/freetype/include -I../../third_party/freetype/src/include -I../../third_party/harfbuzz-ng/src -I../../third_party/libjpeg_turbo -I../../third_party/fontconfig/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../third_party/sfntly/src/cpp/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -pthread -fno-omit-frame-pointer -g0 -fno-builtin-abs -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -isystem/nix/store/smmxgfkqaqqh43d5gmv5p3abcq19hkzy-glib-2.56.0-dev/include/glib-2.0 -isystem/nix/store/yn3bbw1sxg19h07wzn16k0ja58wr9yiz-glib-2.56.0/lib/glib-2.0/include -isystem/nix/store/f82jgynysk9mvhyfavfzims41zkskb3c-libpng-apng-1.6.34-dev/include/libpng16 -isystem/nix/store/56i89kfi2nmjrv8hifsz6zikr6pq1avw-zlib-1.2.11-dev/include -std=gnu++14 -fno-exceptions -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -fvisibility-inlines-hidden -Wno-narrowing -c ../../skia/ext/convolver_neon.cc -o obj/skia/skia/convolver_neon.o
../../skia/ext/convolver_neon.cc: In function 'int32x4_t skia::AccumRemainder(const unsigned char*, const Fixed*, int)':
../../skia/ext/convolver_neon.cc:26:65: error: cannot convert '<brace-enclosed initializer list>' to 'int32x4_t {aka __vector(4) int}' in return
   return {remainder[0], remainder[1], remainder[2], remainder[3]};
                                                                 ^
```

The following patch appears to fix this build issue.

Source: b84682f31d%5E%21/#F0
Suggested-by: @dezgeg
2018-04-29 18:38:38 +03:00
Léo Gaspard a07881c8b8 chromium: skia patch appears to be still needed with 66 on aarch64
Cc @chaoflow @bendlas
Replaces #39628
2018-04-29 18:38:38 +03:00
Philipp Steinpass 2085b88c01 dehydrated: 0.6.1 -> 0.6.2 2018-04-29 17:19:20 +02:00
Pascal Wittmann 8d6d1363de
Merge pull request #39677 from dywedir/tiled
tiled: 1.1.4 -> 1.1.5
2018-04-29 16:56:55 +02:00
Pascal Wittmann 067ed1c5eb
instead: 3.2.0 -> 3.2.1 2018-04-29 16:47:59 +02:00
viric 613e1485ad
Merge pull request #39672 from pstn/gnunet-git
gnunet: Add gnunet_git.
2018-04-29 16:41:41 +02:00
Vladyslav Mykhailichenko e55677bffa tiled: 1.1.4 -> 1.1.5 2018-04-29 17:09:11 +03:00
aszlig 97adb03a9e
nixos/tests/predictable-interface-names: Refactor
The Nix expression here is really hard to read with multiple (and
unnecessarily) nested lets and it also generates attribute names based
on the derivation generated by makeTest, which will result in these
attribute names:

  * vm-test-run-predictableInterfaceNames
  * vm-test-run-predictableInterfaceNames-with-networkd
  * vm-test-run-unpredictableInterfaceNames
  * vm-test-run-unpredictableInterfaceNames-with-networkd

With the refactor the attribute names are now:

  * predictable
  * predictableNetworkd
  * unpredictable
  * unpredictableNetworkd

So now the code is even shorter and IMHO slightly more readable.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @symphorien, @fpletz, @adisbladis
2018-04-29 15:36:56 +02:00
Jan Tojnar 0e1147d137
Merge pull request #37915 from jtojnar/gimp-2.10
GIMP 2.10
2018-04-29 15:12:27 +02:00
Peter Hoeg a3b69a52c5 uchiwa: 1.1.2 -> 1.2.0 2018-04-29 20:34:52 +08:00