Vladimír Čunát
6c567ed797
Merge branch 'staging-next' into staging
2019-09-22 10:06:45 +02:00
worldofpeace
76b7dd1ba9
Merge #68739 : openconnect: 8.04 -> 8.05 (security!)
...
(cherry picked from commit 253f714f6b
)
Forward-pick from staging to staging-next. It's quite small rebuild,
compared to what's caused by the parent commit.
2019-09-22 09:57:28 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
...
This reverts commit f8a8fc6c7c
.
2019-09-22 09:38:09 +02:00
Andreas Rammhold
8495566fb6
Merge pull request #68348 from andir/google-cloud-sdk-pythonenv
...
Google cloud sdk pythonenv
2019-09-22 09:15:28 +02:00
Elis Hirwing
f51c0f6671
Merge pull request #69092 from talyz/nomachine-6.8.1
...
nomachine-client: 6.7.6 -> 6.8.1
2019-09-22 07:43:06 +02:00
Mario Rodas
3cd425fa34
Merge pull request #69164 from bbigras/starship
...
starship: 0.17.0 -> 0.18.0
2019-09-21 16:38:46 -05:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
...
This reverts commit 41af38f372
, reversing
changes made to f0fec244ca
.
Let's delay this. We have some serious regressions.
2019-09-21 20:05:09 +02:00
worldofpeace
6be720b3a7
Merge pull request #69174 from HugoReeves/master
...
croc: 6.1.1 -> 6.1.3
2019-09-21 13:41:01 -04:00
markuskowa
765a72a2e8
Merge pull request #69177 from rnhmjoj/bup
...
bup: 0.29.2 -> 0.29.3
2019-09-21 16:04:42 +02:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next'
2019-09-21 13:14:09 +02:00
Matthew Bauer
d8b7b95ac6
Merge remote-tracking branch 'origin/master' into staging
2019-09-20 23:25:24 -04:00
Pierre Bourdon
18b607b71b
zbar: disable Qt assertions
...
Greatly decreases zbar-lib transitive closure size: assertion messages
contain paths to Qt header files, causing zbar-lib to depend on
qtbase-dev.
The Qt specific mkDerivation normally does this automatically, but we
can't use it here due to having only a small part of the project being
Qt related.
2019-09-21 03:46:57 +02:00
Hugo Reeves
72340af111
croc: 6.1.1 -> 6.1.3
2019-09-21 11:32:47 +12:00
Silvan Mosberger
d484f2b7fc
Merge pull request #68178 from utdemir/init-shunit2
...
shunit2: init at 2019-08-10
2019-09-20 22:58:43 +02:00
Bruno Bigras
7b3e8159e9
starship: 0.17.0 -> 0.18.0
2019-09-20 16:20:46 -04:00
rnhmjoj
219ddc54e4
bup: 0.29.2 -> 0.29.3
2019-09-20 22:05:30 +02:00
Anderson Torres
92324d92a6
Merge pull request #68961 from eraserhd/pr/master/plan9port-missing-which
...
plan9port: use command instead of which in builder.sh
2019-09-20 07:34:08 -03:00
Joachim F
22325331d2
Merge pull request #69103 from dtzWill/update/tor-0.4.1.6
...
tor: 0.4.1.5 -> 0.4.1.6
2019-09-20 09:22:18 +00:00
Jörg Thalheim
27994da318
squashfsTools: 4.4dev_20180612 -> 4.4 ( #68275 )
...
squashfsTools: 4.4dev_20180612 -> 4.4
2019-09-20 09:57:30 +01:00
Maximilian Bosch
a7f002ac41
httpie: use python3 by default
...
This package is intended to be used as application and supports
python3[1] (and is about to deprecated python2.7 support[2]),
so there's no reason to not use it in 2019.
[1] https://github.com/jakubroztocil/httpie/tree/1.0.3#python-version
[2] b3d2c1876e
2019-09-20 10:04:18 +02:00
Maximilian Bosch
d50d5817d4
Merge pull request #69094 from madjar/fix-httpie
...
httpie: add missing 'setuptools' to propagatedBuildInputs
2019-09-20 08:28:07 +02:00
aszlig
d69bc56e69
ip2unix: 2.1.0 -> 2.1.1
...
This is just a small bugfix release (essentially adds two lines of code)
which fixes a segfault if using with a program that doesn't pass a
sockaddr buffer to accept() or accept4().
Signed-off-by: aszlig <aszlig@nix.build>
2019-09-20 07:54:04 +02:00
Frederik Rietdijk
f81d43b94c
Merge staging-next into staging
2019-09-19 17:00:07 +02:00
Frederik Rietdijk
0b12d44c06
Merge master into staging-next
2019-09-19 16:59:42 +02:00
Will Dietz
855d3e7eaf
tor: 0.4.1.5 -> 0.4.1.6
...
https://blog.torproject.org/new-release-tor-0416
2019-09-19 09:48:50 -05:00
Marek Mahut
88c68c53e2
Merge pull request #69049 from dtzWill/update/datamash-1.5
...
datamash: 1.4 -> 1.5
2019-09-19 13:50:06 +02:00
Georges Dubus
55bf3b482c
httpie: add missing 'setuptools' to propagatedBuildInputs
...
As a side-effect of f7e28bf
, the build no longer propagated 'setuptools', which
is a run-time dependency. See #68314 for further details.
2019-09-19 13:47:06 +02:00
talyz
43dc5c0e8f
nomachine-client: 6.7.6 -> 6.8.1
2019-09-19 13:16:08 +02:00
Claudio Bley
3b437ebe59
ntopng: Remove broken = true
2019-09-19 12:18:20 +02:00
Claudio Bley
c4486a084f
ntopng: Add patch needed to build with newer libpcap
...
Fixes build errors for the third-party mongoose module:
```
In file included from
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap.h:43,
from /build/ntopng-2.0/include/ntop_includes.h:93,
from src/HTTPserver.cpp:22:
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap/pcap.h:958: note: this is the location of the previous definition
#define INVALID_SOCKET -1
src/../third-party/mongoose/mongoose.c:270:13: error: multiple types in one declaration
typedef int SOCKET;
^~~~~~
```
2019-09-19 09:08:50 +02:00
Matthew Bauer
ca99e4562a
Merge pull request #69039 from samueldr/cross/vboot_reference
...
vboot_reference: use the right ar when cross-compiling
2019-09-18 20:43:03 -04:00
Will Dietz
d57dab74c6
datamash: 1.4 -> 1.5
...
https://lists.gnu.org/archive/html/info-gnu/2019-09/msg00005.html
2019-09-18 17:00:56 -05:00
Jan Tojnar
f5ef80b46d
Merge branch 'staging-next' into staging
2019-09-18 21:16:01 +02:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next
2019-09-18 21:15:35 +02:00
Samuel Dionne-Riel
48859723ac
vboot_reference: use the right ar when cross-compiling
2019-09-18 15:11:21 -04:00
Matthew Bauer
2c32f91bfc
nix: mark unix only
...
Nix is only known to work on unix like platforms.
https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.nix.x86_64-linux
2019-09-18 12:51:00 -04:00
Will Dietz
919a459158
curl: install completions (zsh, fish)
2019-09-18 08:58:25 -04:00
Will Dietz
69ded6f018
curl: 7.65.3 -> 7.66.0
2019-09-18 08:58:25 -04:00
Mario Rodas
bd56ba8096
mtm: 1.0.1 -> 1.1.0
...
Changelog: https://github.com/deadpixi/mtm/releases/tag/1.1.0
2019-09-17 19:50:42 -05:00
worldofpeace
7591343bf3
Merge pull request #68945 from rvolosatovs/update/tendermint
...
tendermint: 0.32.2 -> 0.32.3
2019-09-17 20:42:07 -04:00
Franz Pletz
48277d3f9d
Merge pull request #68992 from alyssais/tarsnap
...
tarsnap: fix license to mark as unfree
2019-09-18 00:15:19 +00:00
Matthew Bauer
1bc7fae62d
Merge pull request #68889 from nspin/pr/various-cross-2
...
Various cross-compilation fixes
2019-09-17 19:35:44 -04:00
Alyssa Ross
39b5f5956e
tarsnap: fix license to mark as unfree
...
tarsnap has always been unfree, but this wasn't expressed properly, so
it wouldn't be caught by allowUnfree = false.
2019-09-17 23:12:56 +00:00
Matthew Bauer
fc6c332677
Merge pull request #68960 from B4dM4n/boringtun-darwin
...
boringtun: fix darwin build
2019-09-17 17:57:14 -04:00
Bjørn Forsman
5667484b64
ntopng: mark as broken
2019-09-17 20:24:28 +02:00
worldofpeace
0f45a7d5e6
Merge pull request #68749 from dtzWill/update/openresolv-3.9.2
...
openresolv: 3.9.1 -> 3.9.2
2019-09-17 13:41:51 -04:00
worldofpeace
5afa02d373
Merge pull request #68401 from NixOS/man-db-default-pager
...
man-db: set less as default pager
2019-09-17 13:39:20 -04:00
worldofpeace
253f714f6b
Merge pull request #68739 from dtzWill/update/openconnect-8.0.5
...
openconnect: 8.04 -> 8.05 (security!)
2019-09-17 13:06:53 -04:00
worldofpeace
fef262cd92
Merge pull request #68893 from sikmir/qt5ct
...
qt5ct: 0.39 -> 0.41
2019-09-17 13:04:33 -04:00
Fabian Möller
f8860eb670
boringtun: fix darwin build
2019-09-17 14:24:04 +02:00