1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Commit graph

5044 commits

Author SHA1 Message Date
Matthew Bauer ad22b9084d treewide: replace daemon with enableDaemon
broken with the introducation of "daemon" in

96ffba10f5
2019-09-22 20:14:05 -04: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
Vladimír Čunát 41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Hugo Reeves 72340af111
croc: 6.1.1 -> 6.1.3 2019-09-21 11:32:47 +12: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 0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +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
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
Jan Tojnar 62791c3743
Merge branch 'master' into staging-next 2019-09-18 21:15:35 +02: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
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
Fabian Möller f8860eb670
boringtun: fix darwin build 2019-09-17 14:24:04 +02:00
Roman Volosatovs 0f4f80173a
tendermint: 0.32.2 -> 0.32.3 2019-09-16 23:36:39 +02:00
Vladimír Čunát fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Will Dietz c6af7bf1ac
wireguard: 0.0.20190702 -> 0.0.20190913 2019-09-16 10:12:42 -05:00
Mario Rodas 6091d14c58
Merge pull request #67641 from suhr/i2p
i2p: 0.9.41 -> 0.9.42
2019-09-15 16:33:15 -05:00
Maximilian Bosch e6b249ce21
Merge pull request #68685 from B4dM4n/mitmproxy-pytest5
mitmproxy: add pytest5 compatability
2019-09-15 19:23:30 +02:00
Vladimír Čunát b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
obadz 1a848ef93a
Merge pull request #68764 from dtzWill/update/networkmanager-openconnect-1.2.6
networkmanager-openconnect: 1.2.4 -> 1.2.6
2019-09-14 15:08:00 +01:00
Will Dietz 447d625edc networkmanager,modemmanager: fix service symlinks for systemd v243
Fixes problems such as:

systemd[1]: Failed to put bus name to hashmap: File exists
systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.

Problem is that systemd treats symlinks to files outside the service
path differently, causing our old workaround to look like two separate services.

These symlinks are intended to be a means for manually emulating
the behavior of the `Alias=` directive in these services.
Unfortunately even making these symlinks relative isn't enough,
since they don't make it to where it matters--
that only makes the links in /etc/static/systemd/system/*
relative, with systemd still being shown non-relative links
in /etc/systemd/system/*.

To fix this, drop all of this at the package level
and instead simply specify the aliases in the NixOS modules.

Also handle the same for modemmanager,
since the networkmanager NixOS module also handles that.
2019-09-14 08:05:27 -04:00
worldofpeace 3cb0ae999f
Revert "networkmanager,modemmanager: fix service symlinks for systemd v243" 2019-09-14 08:04:28 -04:00
worldofpeace e8bc2a6ac0
Merge pull request #68731 from dtzWill/fix/networkmanager-dbus-service-aliases
networkmanager,modemmanager: fix service symlinks for systemd v243
2019-09-14 08:03:12 -04:00
WilliButz 91bb6cf407
httplz: 1.5.2 -> 1.6.0, add openssl to PATH 2019-09-14 11:58:20 +02:00
Will Dietz 6654b52c8b
networkmanager-openconnect: 1.2.4 -> 1.2.6 2019-09-13 23:11:26 -05:00
Will Dietz f99bdb2b61
networkmanager,modemmanager: fix service symlinks for systemd v243
Fixes problems such as:

systemd[1]: Failed to put bus name to hashmap: File exists
systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.

Problem is that systemd treats symlinks to files outside the service
path differently, causing our old workaround to look like two separate services.

These symlinks are intended to be a means for manually emulating
the behavior of the `Alias=` directive in these services.
Unfortunately even making these symlinks relative isn't enough,
since they don't make it to where it matters--
that only makes the links in /etc/static/systemd/system/*
relative, with systemd still being shown non-relative links
in /etc/systemd/system/*.

To fix this, drop all of this at the package level
and instead simply specify the aliases in the NixOS modules.

Also handle the same for modemmanager,
since the networkmanager NixOS module also handles that.
2019-09-13 21:02:39 -05:00
Fabian Möller 5d0c384fc1
mitmproxy: add pytest5 compatability 2019-09-13 18:30:42 +02:00
Daniel Schaefer acf571eec4 httplz: Fix build with openssl_1_0_2
The rust crate dependency that wraps OpenSSL doesn't support the Openssl
1.1.
2019-09-13 15:02:37 +02:00
Jan Tojnar a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
Austin Seipp f0ad5ebdfb nixos/{chrony,ntpd,openntpd}: add myself as maintainer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-09-12 11:45:51 -05:00
Maximilian Bosch 99b291c73c
Merge pull request #68507 from peterhoeg/f/mtr
nixos/mtr: support for selecting the package
2019-09-12 09:34:22 +02:00
worldofpeace 0f3f515647
Merge pull request #68355 from nlewo/pr-remove-skydive
skydive: remove it from nixpkgs
2019-09-10 09:10:00 -04:00
Antoine Eiche 636e15507b skydive: remove it from nixpkgs
The current Skydive version can not be build with a recent Go version
and the maintainer (lewo) is no longer interested in maintaining it.
2019-09-10 08:34:54 +02:00
Jan Tojnar 1716d62f63
Merge branch 'staging-next' into staging 2019-09-10 07:06:45 +02:00
toonn 5acfae8285 toxvpn: 2018-04-07 -> 2019-09-09
Added myself as maintainer for problems related to mac OS.
2019-09-09 19:16:33 +02:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
Frederik Rietdijk e3f25191c4 Merge staging-next into staging 2019-09-09 08:11:34 +02:00
Frederik Rietdijk 731c82a447
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
2019-09-09 08:09:36 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk 5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
arcnmx c33a44a885 bukubrow: 2.4.0 -> 5.0.0 2019-09-08 08:48:19 -07:00
Frederik Rietdijk e68505e735 Merge remote-tracking branch 'upstream/gcc8' into staging-next 2019-09-06 23:25:18 +02:00
Frederik Rietdijk 66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Doron Behar f1bf4ec1f1 tinc: 1.0.35 -> 1.0.36 2019-09-06 19:13:29 +02:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar ed54a5b51d
Merge branch 'gtk-no-plus' 2019-09-06 02:57:51 +02:00