public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next'

Browse Source 
It's not perfect, but I think we can deal with the rest of the
regressions directly on master, so that this process does not stall.
This commit is contained in:
Vladimír Čunát
2019-10-13 15:50:37 +02:00
parent 84c09b109e b5697c6954
commit 4e6826a3b2
220 changed files with 3185 additions and 2178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/X11/screen-message/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3, hicolor-icon-theme }:
{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
stdenv.mkDerivation rec {
pname = "screen-message";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ gtk3 hicolor-icon-theme ];
buildInputs = [ gtk3 ];
# screen-message installs its binary in $(prefix)/games per default
makeFlags = [ "execgamesdir=$(out)/bin" ];

6
pkgs/tools/admin/awscli/default.nix
View File

@@ -38,7 +38,7 @@ in py.pkgs.buildPythonApplication rec {
# No tests included
doCheck = false;
propagatedBuildInputs = with py.pkgs; [
pythonPath = with py.pkgs; [
botocore
bcdoc
s3transfer
@@ -49,6 +49,10 @@ in py.pkgs.buildPythonApplication rec {
pyyaml
groff
less
urllib3
dateutil
jmespath
futures
];
postInstall = ''

16
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@@ -7,13 +7,15 @@
# 3) used by `google-cloud-sdk` only on GCE guests
#
{ stdenv, lib, fetchurl, makeWrapper, python, cffi, cryptography, pyopenssl,
crcmod, google-compute-engine, with-gce ? false }:
{ stdenv, lib, fetchurl, makeWrapper, python, with-gce ? false }:
let
pythonInputs = [ cffi cryptography pyopenssl crcmod ]
++ lib.optional (with-gce) google-compute-engine;
pythonPath = lib.makeSearchPath python.sitePackages pythonInputs;
pythonEnv = python.withPackages (p: with p; [
cffi
cryptography
pyopenssl
crcmod
] ++ lib.optional (with-gce) google-compute-engine);
baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
sources = name: system: {
@@ -53,8 +55,8 @@ in stdenv.mkDerivation rec {
programPath="$out/google-cloud-sdk/bin/$program"
binaryPath="$out/bin/$program"
wrapProgram "$programPath" \
--set CLOUDSDK_PYTHON "${python}/bin/python" \
--prefix PYTHONPATH : "${pythonPath}"
--set CLOUDSDK_PYTHON "${pythonEnv}/bin/python" \
--prefix PYTHONPATH : "${pythonEnv}/${python.sitePackages}"
mkdir -p $out/bin
ln -s $programPath $binaryPath

4
pkgs/tools/archivers/xarchiver/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }:
{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }:
stdenv.mkDerivation rec {
version = "0.5.4.14";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ];
buildInputs = [ gtk3 intltool libxslt ];
meta = {
description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";

10
pkgs/tools/bluetooth/blueman/default.nix
View File

@@ -1,7 +1,7 @@
{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
, gnome3, librsvg, wrapGAppsHook, gobject-introspection
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
let
pythonPackages = python3Packages;
@@ -26,6 +26,14 @@ in stdenv.mkDerivation rec {
++ pythonPath
++ lib.optional withPulseAudio libpulseaudio;
patches = [
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/blueman-project/blueman/pull/1103.patch";
sha256 = "0zqdi6ya97jljwinn10n9q6bixl23ww55c0pkhskn140qnrj42wf";
})
];
postPatch = lib.optionalString withPulseAudio ''
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
'';

2
pkgs/tools/graphics/zbar/default.nix
View File

@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--without-python"
] ++ (if enableDbus then [
"--with-dbusconfdir=${placeholder "out"}/etc"
"--with-dbusconfdir=${placeholder "out"}/share"
] else [
"--without-dbus"
]) ++ (if enableVideo then [

2
pkgs/tools/inputmethods/ibus/default.nix
View File

@@ -98,6 +98,8 @@ stdenv.mkDerivation rec {
})
];
outputs = [ "out" "dev" ];
postPatch = ''
echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh
cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make .

4
pkgs/tools/misc/gparted/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3
, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2, hicolor-icon-theme
, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2
, gpart, hdparm, procps, utillinux, polkit, wrapGAppsHook, substituteAll
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-doc" ];
buildInputs = [ parted glib libuuid gtkmm3 libxml2 hicolor-icon-theme polkit.bin gnome3.adwaita-icon-theme ];
buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ intltool gettext pkgconfig wrapGAppsHook ];
preFixup = ''

3
pkgs/tools/misc/hdf5/default.nix
View File

@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
inherit mpi;
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ removeReferencesTo ];
buildInputs = []
@@ -51,6 +53,7 @@ stdenv.mkDerivation rec {
postInstall = ''
find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
moveToOutput bin/h5cc "''${!outputDev}"
'';
meta = {

1
pkgs/tools/misc/man-db/default.nix
View File

@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
"--with-config-file=${placeholder "out"}/etc/man_db.conf"
"--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-pager=less"
] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [
"ac_cv_func__set_invalid_parameter_handler=no"
"ac_cv_func_posix_fadvise=no"

8
pkgs/tools/misc/rpm-ostree/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc,
gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake,
libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit,
bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit }:
bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit, fetchpatch }:
stdenv.mkDerivation rec {
pname = "rpm-ostree";
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-449777169
# https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-452177080
./fix-introspection-build.patch
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://github.com/coreos/rpm-ostree/commit/60053d0d3d2279d120ae7007c6048e499d2c4d14.patch";
sha256 = "0ig21zip09iy2da7ksg87jykaj3q8jyzh8r7yrpzyql85qxiwm0m";
})
];
outputs = [ "out" "dev" "man" "devdoc" ];

10
pkgs/tools/misc/snapper/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
, lvm2, pam, python, utillinux }:
, lvm2, pam, python, utillinux, fetchpatch }:
stdenv.mkDerivation rec {
pname = "snapper";
@@ -23,6 +23,14 @@ stdenv.mkDerivation rec {
lvm2 pam python utillinux
];
patches = [
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://github.com/openSUSE/snapper/commit/c51708aea22d9436da287cba84424557ad03644b.patch";
sha256 = "106pf7pv8z3q37c8ckmgwxs1phf2fy7l53a9g5xq5kk2rjj1cx34";
})
];
postPatch = ''
# Hard-coded root paths, hard-coded root paths everywhere...
for file in {client,data,pam,scripts}/Makefile.am; do

4
pkgs/tools/networking/connman/default.nix
View File

@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--sysconfdir=\${out}/etc"
"--localstatedir=/var"
"--with-dbusconfdir=\${out}/etc"
"--with-dbusdatadir=\${out}/usr/share"
"--with-dbusconfdir=${placeholder "out"}/share"
"--with-dbusdatadir=${placeholder "out"}/share"
"--disable-maintainer-mode"
"--enable-openconnect=builtin"
"--with-openconnect=${openconnect}/sbin/openconnect"

7
pkgs/tools/networking/curl/default.nix
View File

@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
assert gssSupport -> libkrb5 != null;
stdenv.mkDerivation rec {
name = "curl-7.65.3";
name = "curl-7.66.0";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/${name}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
];
sha256 = "02g5zj4rq5sr15jzjqk70xk4k92i2pdmpq00xb4pnba8ps1mx18a";
sha256 = "0hd1wwplw357hn876s4n2gk7dpmd1gfw5d2c3yi21i1m09726636";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@@ -94,6 +94,9 @@ stdenv.mkDerivation rec {
postInstall = ''
moveToOutput bin/curl-config "$dev"
# Install completions
make -C scripts install
'' + stdenv.lib.optionalString scpSupport ''
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport ''

4
pkgs/tools/networking/dhcpcd/default.nix
View File

@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
# when updating this to >=7, check, see previous reverts:
# nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
pname = "dhcpcd";
version = "8.0.3";
version = "8.0.6";
src = fetchurl {
url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
sha256 = "07cg0sp8sk9b6ch2ajmvkbn6z08bgyx8xbd004s5mkasrlgrfx4n";
sha256 = "0kxxpb79j564m6bjvjb9gsn0yzs13c0arfgsycm51gw3xnch3db6";
};
nativeBuildInputs = [ pkgconfig ];

2
pkgs/tools/networking/dnsmasq/default.nix
View File

@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \
--replace "/usr/local/sbin" "$out/bin"
'' + optionalString stdenv.isLinux ''
install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf
install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf
install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time
install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release
install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6

6
pkgs/tools/networking/modem-manager/default.nix
View File

@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "modem-manager";
version = "1.10.0";
version = "1.10.4";
package = "ModemManager";
src = fetchurl {
url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
sha256 = "1qkfnxqvaraz1npahqvm5xc73mbxxic8msnsjmlwkni5c2ckj3zx";
sha256 = "0w6wdj9dh7zwhzl68775h1ni6zcgvss524dp17kph50zpas6nmgs";
};
nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-polkit"
"--with-udev-base-dir=${placeholder "out"}/lib/udev"
"--with-dbus-sys-dir=${placeholder "out"}/etc/dbus-1/system.d"
"--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--sysconfdir=/etc"
"--localstatedir=/var"

32
pkgs/tools/networking/network-manager/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus, dbus-glib
{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, fetchpatch, dbus
, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala
, libgcrypt, dnsmasq, bluez5, readline, libselinux, audit
, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup
@@ -10,11 +10,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
pname = "network-manager";
version = "1.18.2";
version = "1.20.2";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad";
sha256 = "115cgz448vypc7c592lqqjd7lp2kzdczhjk4ran6qls65hzkfkji";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
# to enable link-local connections
"-Dudev_dir=${placeholder "out"}/lib/udev"
"-Dresolvconf=${openresolv}/bin/resolvconf"
"-Ddbus_conf_dir=${placeholder "out"}/etc/dbus-1/system.d"
"-Ddbus_conf_dir=${placeholder "out"}/share/dbus-1/system.d"
"-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"-Dkernel_firmware_dir=/run/current-system/firmware"
"--sysconfdir=/etc"
@@ -43,8 +43,6 @@ in stdenv.mkDerivation rec {
"-Dmodem_manager=true"
"-Dnmtui=true"
"-Ddocs=true"
# TODO: legacy library, will be *removed* in next release!
"-Dlibnm_glib=true"
"-Dtests=no"
"-Dqt=false"
# Allow using iwd when configured to do so
@@ -53,6 +51,15 @@ in stdenv.mkDerivation rec {
];
patches = [
# 1.20.2 added a decorators.sh script but they forgot to distribute it (breaking the build)
# as it was to fix things with gtk-doc 1.32 we can safely revert it.
(fetchpatch {
url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/2d941dc95a1d94d023ac8f98df2f344dbb1d223e.patch";
sha256 = "1mvbajddwd6diwk6dgjg5p65i6852gx6b9p3949rs63d2i6yzg21";
excludes = [ "tools/decorators.sh" ];
revert = true;
})
(substituteAll {
src = ./fix-paths.patch;
inherit iputils kmod openconnect ethtool gnused dbus;
@@ -69,19 +76,17 @@ in stdenv.mkDerivation rec {
bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson
];
propagatedBuildInputs = [ dbus-glib gnutls libgcrypt ];
propagatedBuildInputs = [ gnutls libgcrypt ];
nativeBuildInputs = [
meson ninja intltool pkgconfig
vala gobject-introspection
dbus-glib # for dbus-binding-tool
vala gobject-introspection dbus
# Docs
gtk-doc libxslt docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 pythonForDocs
];
doCheck = false; # requires /sys, the net
postPatch = ''
patchShebangs ./tools
patchShebangs libnm/generate-setting-docs.py
@@ -96,13 +101,6 @@ in stdenv.mkDerivation rec {
ln -s $PWD/libnm/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0
'';
postInstall = ''
# Add the legacy service name from before #51382 to prevent NetworkManager
# from not starting back up:
# TODO: remove this once 19.10 is released
ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;

8
pkgs/tools/networking/network-manager/fix-install-paths.patch
View File

@@ -1,6 +1,8 @@
diff --git a/meson.build b/meson.build
index 4105a9c80..3d912557f 100644
--- a/meson.build
+++ b/meson.build
@@ -925,9 +925,9 @@
@@ -884,9 +884,9 @@ meson.add_install_script(
join_paths('tools', 'meson-post-install.sh'),
nm_datadir,
nm_bindir,
@@ -12,9 +14,11 @@
enable_docs ? 'install_docs' : '',
nm_mandir,
)
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build
index 58acdcfcb..e3a16d597 100644
--- a/src/settings/plugins/ifcfg-rh/meson.build
+++ b/src/settings/plugins/ifcfg-rh/meson.build
@@ -70,7 +70,7 @@
@@ -69,7 +69,7 @@ install_data(
)
meson.add_install_script('sh', '-c',

28
pkgs/tools/networking/network-manager/fix-paths.patch
View File

@@ -1,6 +1,8 @@
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 204b7c286..8bdb734c2 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -214,10 +214,7 @@
@@ -215,10 +215,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
NULL,
};
@@ -10,21 +12,25 @@
- return FALSE;
+ path = "@openconnect@/bin/openconnect";
argv[0] = (char *) path;
argv[1] = "--authenticate";
if (!g_spawn_sync (NULL,
(char **) NM_MAKE_STRV (path, "--authenticate", host),
diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
index e398cb9f2..31c56596a 100644
--- a/data/84-nm-drivers.rules
+++ b/data/84-nm-drivers.rules
@@ -7,6 +7,6 @@
@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
# Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
DRIVERS=="?*", GOTO="nm_drivers_end"
-PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
LABEL="nm_drivers_end"
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 2f442bf23..c3e797bf4 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -8,7 +8,7 @@
@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
[Service]
Type=dbus
BusName=org.freedesktop.NetworkManager
@@ -33,9 +39,11 @@
#ExecReload=/bin/kill -HUP $MAINPID
ExecStart=@sbindir@/NetworkManager --no-daemon
Restart=on-failure
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 823cf48a5..cda16e48d 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -12451,14 +12451,14 @@ nm_device_start_ip_check (NMDevice *self)
@@ -12822,14 +12822,14 @@ nm_device_start_ip_check (NMDevice *self)
gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
if (gw) {
nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
@@ -53,10 +61,10 @@
}
}
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 6f55e62a7..93721e7fb 100644
index d896d4d33..4cacb5cb6 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -442,7 +442,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *
@@ -446,7 +446,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *
/* construct the argument list */
argv = g_ptr_array_sized_new (4);

7
pkgs/tools/networking/network-manager/fortisslvpn/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3,
networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch }:
let
pname = "NetworkManager-fortisslvpn";
@@ -17,6 +17,11 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch;
inherit openfortivpn;
})
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/merge_requests/11.patch";
sha256 = "0l7l2r1njh62lh2pf497ibf99sgkvjsj58xr76qx3jxgq9zfw6n9";
})
];
buildInputs = [ openfortivpn networkmanager ppp ]

7
pkgs/tools/networking/network-manager/iodine/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
, withGnome ? true, gnome3 }:
, withGnome ? true, gnome3, fetchpatch }:
let
pname = "NetworkManager-iodine";
@@ -17,6 +17,11 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch;
inherit iodine;
})
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/network-manager-iodine/merge_requests/2.patch";
sha256 = "108pkf0mddj32s46k7jkmpwcaq2ylci4dqpp7wck3zm9q2jffff2";
})
];
buildInputs = [ iodine networkmanager ]

7
pkgs/tools/networking/network-manager/openconnect/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, autoreconfHook, networkmanager, gcr, libsecret, file
, gtk3, withGnome ? true, gnome3, kmod }:
, gtk3, withGnome ? true, gnome3, kmod, fetchpatch }:
let
pname = "NetworkManager-openconnect";
@@ -17,6 +17,11 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch;
inherit kmod openconnect;
})
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/merge_requests/9.patch";
sha256 = "0yd2dmq6gq6y4czr7dqdgaiqvw2vyv2gikznpfdxyfn2v1pcrk9m";
})
];
buildInputs = [ openconnect networkmanager ]

7
pkgs/tools/networking/network-manager/openvpn/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
, gtk3, withGnome ? true, gnome3, kmod }:
, gtk3, withGnome ? true, gnome3, kmod, fetchpatch }:
let
pname = "NetworkManager-openvpn";
@@ -17,6 +17,11 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch;
inherit kmod openvpn;
})
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/merge_requests/13.patch";
sha256 = "06cvqi28v72dd53fw8ix95mqj885xhwi8qcs2q7hvm5bvnhwn704";
})
];
buildInputs = [ openvpn networkmanager ]

7
pkgs/tools/networking/network-manager/vpnc/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret
, gtk3, withGnome ? true, gnome3, kmod, file }:
, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch }:
let
pname = "NetworkManager-vpnc";
version = "1.2.6";
@@ -16,6 +16,11 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch;
inherit vpnc kmod;
})
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/merge_requests/5.patch";
sha256 = "0z0x5vqmrsap3ynamhya7gh6c6k5grhj2vqpy76alnv9xns8dzi6";
})
];
buildInputs = [ vpnc networkmanager ]

4
pkgs/tools/networking/openresolv/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "openresolv";
version = "3.9.1";
version = "3.9.2";
src = fetchurl {
url = "mirror://roy/openresolv/${pname}-${version}.tar.xz";
sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q";
sha256 = "0wyk9sl1xgvxjvj1v3nlgs79nykdr0b76k5zp3v6cm9fd10y5mql";
};
buildInputs = [ makeWrapper ];

8
pkgs/tools/networking/strongswan/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, fetchpatch
, pkgconfig, autoreconfHook
, gmp, python, iptables, ldns, unbound, openssl, pcsclite
, openresolv
@@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
./ext_auth-path.patch
./firewall_defaults.patch
./updown-path.patch
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/strongswan/strongswan/pull/150.patch";
sha256 = "1irfxb99blb8v3hs0kmlhzkkwbmds1p0gq319z8lmacz36cgyj2c";
})
];
postPatch = optionalString stdenv.isLinux ''

4
pkgs/tools/package-management/disnix/default.nix
View File

@@ -8,6 +8,10 @@ stdenv.mkDerivation {
sha256 = "1kc4520zjc1z72mknylfvrsyda9rbmm5c9mw8w13zhdwg3zbna06";
};
configureFlags = [
" --with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ];

4
pkgs/tools/package-management/packagekit/default.nix
View File

@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
"--disable-offline-update"
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-dbus-sys=$(out)/etc/dbus-1/system.d"
"--with-systemdsystemunitdir=$(out)/lib/systemd/system/"
"--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system/"
]
++ lib.optional enableNixBackend "--enable-nix"
++ lib.optional (!enableBashCompletion) "--disable-bash-completion"

8
pkgs/tools/security/fprintd/default.nix
View File

@@ -1,6 +1,7 @@
{ thinkpad ? false
, stdenv
, fetchurl
, fetchpatch
, pkgconfig
, intltool
, libfprint-thinkpad ? null
@@ -22,6 +23,13 @@ stdenv.mkDerivation rec {
sha256 = "182gcnwb6zjwmk0dn562rjmpbk7ac7dhipbfdhfic2sn1jzis49p";
};
patches = [
(fetchpatch {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/16.patch";
sha256 = "1y39zsmxjll9hip8464qwhq5qg06c13pnafyafgxdph75lvhdll7";
})
];
nativeBuildInputs = [
intltool
pkgconfig

7
pkgs/tools/system/thermald/default.nix
View File

@@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
"--sysconfdir=$(out)/etc" "--localstatedir=/var"
"--with-dbus-sys-dir=$(out)/etc/dbus-1/system.d"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--sysconfdir=${placeholder "out"}/etc"
"--localstatedir=/var"
"--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
];
meta = with stdenv.lib; {