Commit Graph

5224 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
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
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
Danielle Lancashire
de04826d46
offlineimap: 7.2.4 -> 7.3.0 2019-09-21 11:33:34 +02:00
Roman Volosatovs
39b4852972
grpcui: 0.2.0 -> 0.2.1 2019-09-21 10:40:03 +02:00
Matthew Bauer
d8b7b95ac6 Merge remote-tracking branch 'origin/master' into staging 2019-09-20 23:25:24 -04: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
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
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
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
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
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
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
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
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
worldofpeace
8ce26c7971 connman: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:47 -04:00
worldofpeace
d2139443e5 strongswanNM: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:46 -04:00
worldofpeace
61221dfdd5 networkmanager-iodine: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:46 -04:00
worldofpeace
233c878aa9 networkmanager-fortisslvpn: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:46 -04:00
worldofpeace
8d7adf0476 networkmanager-vpnc: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:46 -04:00
worldofpeace
43e14dbdd2 networkmanager-openconnect: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:46 -04:00
worldofpeace
d2680d9fc7 networkmanager-openvpn: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:09 -04:00
worldofpeace
2220086061 dnsmasq: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:09 -04:00
Vladimír Čunát
268872d996
Merge branch 'staging-next' into staging 2019-09-16 19:25:54 +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
worldofpeace
5df6d6fb58
Merge pull request #68762 from dtzWill/update/modemmanager-1.10.4
modemmanager: 1.10.0 -> 1.10.4
2019-09-15 21:33:14 -04:00
Will Dietz
2182157f31 modemmanager: 1.10.0 -> 1.10.4
Update dbus-sys-dir to not use deprecated directory.

https://gitlab.freedesktop.org/mobile-broadband/ModemManager/blob/1.10.4/NEWS
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/blob/1.10.2/NEWS

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
2019-09-15 21:25:25 -04: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
worldofpeace
ce18c0e644
Merge pull request #68714 from worldofpeace/networkmanager-1.20
networkmanager: 1.18.2 -> 1.20.2
2019-09-15 14:00:17 -04:00
Maximilian Bosch
e6b249ce21
Merge pull request #68685 from B4dM4n/mitmproxy-pytest5
mitmproxy: add pytest5 compatability
2019-09-15 19:23:30 +02:00
Maximilian Bosch
bd040c5b8b
Merge pull request #68736 from dtzWill/update/dhcpcd-8.0.6
dhcpcd: 8.0.3 -> 8.0.6
2019-09-15 17:07:43 +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
worldofpeace
1ff3a0c498 networkmanager: 1.18.2 -> 1.20.2
* libnm-glib is gone 👋️
* correct dbus_conf_dir
* remove legacy service symlink
* upstream defaults to 'internal' for dhcp
  NixOS module reflects this.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.20.2/NEWS
2019-09-14 09:01:46 -04: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
4a4586839e
openresolv: 3.9.1 -> 3.9.2
https://roy.marples.name/blog/openresolv-3-9-2-released
2019-09-13 22:14:53 -05:00
Will Dietz
7d2ec5eeb8
openconnect: 8.04 -> 8.05 (security!)
https://www.infradead.org/openconnect/changelog.html

( CVE-2019-16239 )
2019-09-13 21:50:11 -05:00
Will Dietz
0d287a2786
dhcpcd: 8.0.3 -> 8.0.6
https://roy.marples.name/blog/dhcpcd-8-0-6-released
2019-09-13 21:41:47 -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
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz
1895278f20
httpie: 1.0.2 -> 1.0.3 2019-09-03 19:27:05 -05:00
Will Dietz
592274e72a
httpie: fetchPypi 2019-09-03 19:27:03 -05:00
Will Dietz
8ddc4e4731
httpie: pname-ify 2019-09-03 19:27:00 -05:00
Christian Kampka
81d0173023 maintainers: update my maintainer information (#67686) 2019-09-03 22:52:13 +02:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00
worldofpeace
59e68d3b74 treewide: don't use single quotes with placeholder 2019-09-03 13:01:42 -04:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Daiderd Jordan
db131371ef
minio-client: remove go 1.10 override 2019-09-01 10:14:04 +02:00
Samuel Leathers
ba24536ffb
Merge pull request #67575 from leenaars/unbound
Unbound
2019-08-31 08:12:23 -04:00
Niklas Hambüchen
9e78f76ade treewide: Remove unnecessary --disable-static (#66759)
* freetype: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes freetype not being overridable to have static libs.

* treewide: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes these packages not being overridable to have static libs.
2019-08-31 08:10:53 -04:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Michiel Leenaars
44b695a26e
pyunbound: 1.9.0 -> 1.9.3 2019-08-31 07:25:12 -04:00
Michiel Leenaars
ff824dedbc
unbound: 1.9.2 -> 1.9.3 2019-08-31 07:22:44 -04:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
worldofpeace
d327f6a045
Merge pull request #67737 from romildo/fix.cmst
cmst: use Qt mkDerivation
2019-08-30 12:08:07 -04:00
Marek Mahut
a2b8c83b44
Merge pull request #67672 from andir/kea
kea: 1.5.0 -> 1.5.0-P1 (security)
2019-08-30 10:30:55 +02:00
José Romildo Malaquias
a92f096bb6 cmst: use Qt mkDerivation 2019-08-29 21:15:23 -03:00
José Romildo Malaquias
b98adbc2d5 cmst: use pname 2019-08-29 21:14:06 -03:00
Andreas Rammhold
e6e3270bd4
kea: 1.5.0 -> 1.5.0-P1 (security)
Fixes:

* CVE-2019-6472 affects the Kea DHCPv6 server, which can exit
  with an assertion failure if the DHCPv6 server process receives
  a request containing DUID value which is too large.
  (https://kb.isc.org/docs/cve-2019-6474)

* CVE-2019-6473 affects the Kea DHCPv4 server, which can exit with
  an assertion failure if it receives a packed containing a malformed
  option.  (https://kb.isc.org/docs/cve-2019-6473)

* CVE-2019-6474 can cause a condition where the server cannot be
  restarted without manual operator intervention to correct a problem
  that can be deliberately introduced into the stored leases.
  CVE-2019-6474 can only affect servers which are using memfile
  for lease storage.  (https://kb.isc.org/docs/cve-2019-6474)

Annoucement: https://www.openwall.com/lists/oss-security/2019/08/29/1
2019-08-29 10:38:24 +02:00
Daniel Fullmer
33b67761be zerotierone: 1.4.2 -> 1.4.4 (#67648) 2019-08-28 20:28:46 +00:00
Сухарик
7f2b73d948 i2p: 0.9.41 -> 0.9.42 2019-08-28 20:01:35 +03:00
geistesk
e1b208fec6 go-shadowsocks2: init at 0.0.11 2019-08-28 13:55:01 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
worldofpeace
6402a044f3
Merge pull request #67488 from worldofpeace/glib/get-schema-path
glib: add getSchemaPath, makeSchemaPath
2019-08-27 15:19:11 -04:00
Maximilian Bosch
b4a4d98c52 vde2: build with --disable-python by default
This package explicitly depends on `python2` which will be EOLed at the
end of the year[1]. This package provides python bindings for `python2`,
however the latest release (also used by other distros) is from 2011[2]
and doesn't support v3. For instance, debian ships `vde2` without
`python2` support since Debian Jessie[3].

KVM and QEMU appear to build fine, also NixOS tests and ISO builds are
still functional.

By running `nix-review` against this change, only `xen` packages failed,
but those were already broken on master[4].

Finally it's also worth mentioning that the closure size of `vde2` drops
from 99.5M to 33.5M without `python2` according to `nix path-info -S -h`.

[1] https://pythonclock.org/
[2] https://github.com/virtualsquare/vde-2/releases/tag/vde-2
    (vde.sourceforge.net redirects to this github page)
[3] https://packages.debian.org/en/jessie/vde2
[4] https://hydra.nixos.org/build/99185451, https://hydra.nixos.org/build/99187262
2019-08-27 18:19:24 +02:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
worldofpeace
7bb8f05f12 treewide: use glib.{getSchemaPath, makeSchemaPath} 2019-08-26 21:28:17 -04:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Michael Weiss
ba9305c404
tcpflow: 1.4.6 -> 1.5.2
Changelog: https://github.com/simsong/tcpflow/blob/tcpflow-1.5.2/ChangeLog
Does now cross-compile and build with OpenSSL 1.1.1.
I've also restructured/simplified the expression and added additional
meta information.
2019-08-26 20:11:52 +02:00
Robin Gloster
616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8 2019-08-25 18:55:46 +02:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Marek Mahut
d212d864e4
Merge pull request #67202 from kisik21/uwimap-cross-compile-fix
uwimap: Fixed cross-compilation
2019-08-25 14:27:24 +02:00
Jan Tojnar
edcecfee00
Merge pull request #67358 from jtojnar/ofono-progress
nixos/ofono: various improvements
2019-08-24 21:37:42 +02:00
Marek Mahut
1538b64280
Merge pull request #67017 from r-ryantm/auto-update/openconnect
openconnect: 8.03 -> 8.04
2019-08-24 14:01:35 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Jan Tojnar
5db762126c
nixos/ofono: allow adding 3rd party plug-ins 2019-08-23 19:50:53 +02:00
Jan Tojnar
f66613b3b6
nixos/ofono: add module 2019-08-23 19:50:53 +02:00
Linus Heckemann
d1d602f559 Merge remote-tracking branch 'origin/master' into openssl-1.1 2019-08-23 17:27:39 +02:00
Marek Mahut
bd67156e12
Merge pull request #67005 from bbigras/httplz
httplz: 1.5.1 -> 1.5.2
2019-08-23 08:19:28 +02:00
Robin Gloster
c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
Will Dietz
01902aec93
arping: 2.19 -> 2.20
https://github.com/ThomasHabets/arping/releases/tag/arping-2.20
2019-08-22 13:23:52 -05:00
Will Dietz
7d839bd26e
dhcpcd: 8.0.2 -> 8.0.3
https://roy.marples.name/blog/dhcpcd-8-0-3-released
2019-08-22 13:19:51 -05:00
Robin Gloster
6095f88e7e
socat2pre: mark as broken 2019-08-21 20:31:57 +02:00
Vika
a2b474b9b5 uwimap: Fixed cross-compilation
Shouldn't cause a rebuild of native package. The build system, as with
Lua, couldn't find cc, ar and ranlib - I helped it a little.
2019-08-21 16:45:17 +03:00
Robin Gloster
f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
R. RyanTM
ed07403382 zerotierone: 1.4.0 -> 1.4.2 (#67175)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zerotierone/versions
2019-08-21 08:51:31 +00:00
Paul TREHIOU
1e2ad9e6bc networkmanager: hardcode parts of the source URL (#67100)
Broke the build as the pname variable was used to create the URL
Introduced by 46420bbaa3
2019-08-20 17:05:19 -04:00
Robin Gloster
8c0786babe
Merge pull request #67103 from mayflower/globin-maintainership
treewide: update globin's maintained drvs
2019-08-20 17:57:47 +00:00
Marek Mahut
3aa22f44ef
Merge pull request #67001 from r-ryantm/auto-update/nfdump
nfdump: 1.6.17 -> 1.6.18
2019-08-20 19:44:24 +02:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Domen Kožar
40e973776d
Merge pull request #67003 from r-ryantm/auto-update/openapi-generator-cli
openapi-generator-cli: 4.0.3 -> 4.1.0
2019-08-20 15:48:42 +02:00
Rickard Nilsson
225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
R. RyanTM
ed2bbb7bf9 openconnect: 8.03 -> 8.04
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openconnect/versions
2019-08-19 20:55:28 -07:00
Bruno Bigras
fc1f812a44 httplz: 1.5.1 -> 1.5.2 2019-08-19 21:33:13 -04:00
R. RyanTM
1a4644b6ed openapi-generator-cli: 4.0.3 -> 4.1.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openapi-generator-cli/versions
2019-08-19 18:31:42 -07:00
R. RyanTM
b7c70b1bd8 nfdump: 1.6.17 -> 1.6.18
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nfdump/versions
2019-08-19 18:03:23 -07:00
R. RyanTM
df771cf289 memtier-benchmark: 1.2.11 -> 1.2.17
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/memtier-benchmark/versions
2019-08-19 19:29:28 -05:00
Will Dietz
1aaf047918
whois: 5.5.0 -> 5.5.1
https://github.com/rfc1036/whois/blob/v5.5.1/debian/changelog
2019-08-19 14:56:50 -05:00
R. RyanTM
09148726a2 tridactyl-native: 1.16.2 -> 1.16.3 (#66874)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tridactyl-native/versions
2019-08-19 13:28:57 +02:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Frederik Rietdijk
295888c622
Merge pull request #66381 from NixOS/staging-next
Staging next
2019-08-18 08:54:45 +02:00
Maximilian Bosch
4d5d448859 curlie: init at 1.2.0 (#66799) 2019-08-17 20:52:19 -07:00
Marek Mahut
37c22b49f5
Merge pull request #66743 from c089/patch-1
http-prompt: Allow installation on Mac OS
2019-08-17 23:53:51 +02:00
Marek Mahut
4291d44309
Merge pull request #66726 from bbigras/httplz
httplz: 1.5.0 -> 1.5.1
2019-08-17 23:07:21 +02:00
R. RyanTM
8fa7c08c58 babeld: 1.8.5 -> 1.9.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/babeld/versions
2019-08-17 12:17:02 -07:00
Marek Mahut
67ae9491d9 httplz: adding darwin.apple_sdk.frameworks.Security 2019-08-17 19:43:44 +02:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Frederik Rietdijk
c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
Christoph Neuroth
4ef579143c http-prompt: Allow installation on Mac OS
The original pkg author noted that they could only test on linux. I'm running
this package on Mac OS without problems.
2019-08-17 07:58:19 +02:00
Bruno Bigras
42accfb7d1 httplz: 1.5.0 -> 1.5.1 2019-08-16 12:24:10 -04:00
John Wiegley
2edd7103da
mtr: Only include libcap on Darwin
Fixes #66688
2019-08-15 11:29:13 -07:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk
cff9e6429a Merge staging-next into staging 2019-08-14 13:46:33 +02:00
Frederik Rietdijk
8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Jonathan Ringer
cbed276a69 axel: 2.17.3 -> 2.17.5 2019-08-13 19:55:13 -07:00
Marek Mahut
61ea45d6be
Merge pull request #65403 from dtzWill/update/dhcpcd-8.0.1
dhcpcd: 7.2.3 -> 8.0.2
2019-08-13 21:59:37 +02:00
Jan Tojnar
bb4a33ec91
ofono: init at 1.30 (#66565)
ofono: init at 1.30
2019-08-13 15:56:52 +02:00
Jan Tojnar
590310b23f
ofono: init at 1.30 2019-08-13 15:37:16 +02:00
Graham Christensen
5d807f80c7
Merge pull request #63864 from cransom/datadog-agent-integrations-fix
datadog-agent: fix extraIntegrations
2019-08-12 12:15:48 -04:00
edef
068f46f991
Merge pull request #63585 from edef1c/openssh-keysign
openssh: use ssh-keysign from PATH
2019-08-11 12:57:42 +00:00
Daniel Schaefer
e1a5484098 pptp: Fix shebangs
- Remove `which` as build-time input
- Use substituteInPlace instead of sed (warns if it fails to replace)
- Use perl in buildInputs as it's a run-time dependency
- Patch shebangs manually, not sure why fixupPhase doesn't do it
2019-08-11 01:53:08 +09:00
markuskowa
732c1671f5
Merge pull request #66380 from markuskowa/upd-rdma
rdma-core: 24.0 -> 25.0
2019-08-10 11:55:17 +02:00
Marek Mahut
c3b16e827c
Merge pull request #65977 from r-ryantm/auto-update/mcrcon
mcrcon: 0.0.5 -> 0.6.1
2019-08-09 23:48:44 +02:00
Frederik Rietdijk
9bd78cb048 Merge master into staging-next 2019-08-09 14:00:27 +02:00
Markus Kowalewski
f873471bfe
infiniband-diags: remove
All commands provided by infiniband-diags are already
included in rdma-core, which is required to build infiniband-diags.
2019-08-09 13:36:56 +02:00
Mario Rodas
7610e3a33c
shadowsocks-libev: 3.3.0 -> 3.3.1 2019-08-09 03:55:44 -05:00
Alexandre Esteves
a37c058422 tendermint: init at 0.32.2 2019-08-08 11:44:33 +01:00
Marek Mahut
8b85de318d
Merge pull request #66006 from r-ryantm/auto-update/openapi-generator-cli
openapi-generator-cli: 4.0.1 -> 4.0.3
2019-08-07 11:37:52 +02:00
Maximilian Bosch
13d766f8b8
Merge pull request #66179 from r-ryantm/auto-update/whois
whois: 5.4.3 -> 5.5.0
2019-08-06 15:50:41 +02:00
R. RyanTM
1c7d2df130 whois: 5.4.3 -> 5.5.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/whois/versions
2019-08-06 02:02:09 -07:00
Peter Hoeg
49e61479d4 mtr: build a -gui option as well 2019-08-05 17:39:40 +08:00
Peter Hoeg
32526e65bd mtr: 0.92 -> 0.93 2019-08-05 11:46:24 +08:00
R. RyanTM
0204685126 openapi-generator-cli: 4.0.1 -> 4.0.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openapi-generator-cli/versions
2019-08-04 19:16:49 -07:00
R. RyanTM
607171e3e5 mcrcon: 0.0.5 -> 0.6.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mcrcon/versions
2019-08-04 13:15:58 -07:00
R. RyanTM
6e993e3fbc babeld: 1.8.4 -> 1.8.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/babeld/versions
2019-08-03 15:42:09 -07:00
Frederik Rietdijk
8fa3fb092e
Merge pull request #65624 from worldofpeace/bump-networkmanager
networkmanager: 1.18.1 -> 1.18.2
2019-08-03 08:02:35 +02:00
Frederik Rietdijk
6f723b9bad Merge master into staging-next 2019-08-02 09:18:37 +02:00
Robin Gloster
30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-02 03:01:30 +02:00
adisbladis
9e9c6de50c
nodejs-8_x: Drop package
It will be EOL within the support period of 19.09
2019-08-02 02:34:47 +02:00
Frederik Rietdijk
55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
worldofpeace
3b37b0afc7
Merge pull request #65622 from HugoReeves/master
croc: init at 6.1.1
2019-08-01 02:22:08 -04:00
Hugo Reeves
4fa644bcec
croc: init at 6.1.1 2019-08-01 17:07:58 +12:00
edef
9fe10288f0 openssh: use ssh-keysign from PATH
ssh-keysign is used for host-based authentication, and is designed to be used
as SUID-root program. OpenSSH defaults to referencing it from libexec, which
cannot be made SUID in Nix.
2019-07-31 12:19:36 +00:00
Will Dietz
de3bbbf46c networkmanager: libaudit yes but disabled by default 2019-07-31 02:55:25 -04:00
Will Dietz
ee409c1cc1 networkmanager: disable dhcpcanon instead of assuming in /usr/* 2019-07-31 02:55:15 -04:00
worldofpeace
3c77163d46 networkmanager: 1.18.1 -> 1.18.2
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.18.2/NEWS
2019-07-31 02:54:59 -04:00
worldofpeace
f4b9195e36
Merge pull request #62919 from dtzWill/update/networkmanager_strongswan-1.4.5
networkmanager_strongswan: 1.4.4 -> 1.4.5
2019-07-31 02:38:51 -04:00
worldofpeace
4b1dd1c3a3
Merge pull request #65605 from danielfullmer/zerotier-1.4.0
zerotierone: 1.2.12 -> 1.4.0
2019-07-31 01:13:00 -04:00
Will Dietz
a8e9dc728b
dhcpcd: 8.0.1 -> 8.0.2
https://roy.marples.name/blog/dhcpcd-8-0-2-released

> I don't anticipate any more releases for a while as this is looking
really good now!
2019-07-30 17:36:39 -05:00
Daniel Fullmer
8c975f2f38 zerotierone: 1.2.12 -> 1.4.0 2019-07-30 13:19:15 -04:00
Robin Gloster
242e52dbb1
treewide: remove openssl 1.1 pinning 2019-07-30 03:41:32 +02:00
Daniel Schaefer
2f5beaec08 tgt: Install systemd tgtd.service (#65565)
* tgt: Add homepage

* tgt: tgt-admin needs lsof, sg3_utils and tgtadm

Otherwise it fails with return code 72057594037927935.

* tgt: libxslt and docbook_xsl not needed at runtime

They're only there to build the documentation.

* tgt: Install systemd tgtd.service

Resolves #38012

* tgt: Add JohnAZoidberg as maintainer
2019-07-29 23:21:00 +00:00
Robin Gloster
178cb02571
radsecproxy: 1.6.9 -> 1.8.0 2019-07-29 22:17:04 +02:00
Robin Gloster
11961d35e7
libtorrent: remove released patch 2019-07-29 21:56:30 +02:00
Andreas Rammhold
b300c7fe28
mailsend: apply openssl1.1 patch 2019-07-29 21:25:14 +02:00
Andreas Rammhold
8c8c3ab85d
libtorrent: apply openssl 1.1 patch 2019-07-29 21:25:13 +02:00