diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-12 14:05:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 14:05:06 +0200 |
| commit | 58bbbbd9e2889f10f2452b9a5ae3a77f650a84c7 (patch) | |
| tree | 9184deac9f16349215730a62489ec7e22ef3e0e0 /pkgs/tools | |
| parent | d429573ddbded1ff453745ef42ed006ae952a2e9 (diff) | |
| parent | 0e0577e2e29320570be4cbceb1cd31f881de02b8 (diff) | |
| download | nixlib-58bbbbd9e2889f10f2452b9a5ae3a77f650a84c7.tar nixlib-58bbbbd9e2889f10f2452b9a5ae3a77f650a84c7.tar.gz nixlib-58bbbbd9e2889f10f2452b9a5ae3a77f650a84c7.tar.bz2 nixlib-58bbbbd9e2889f10f2452b9a5ae3a77f650a84c7.tar.lz nixlib-58bbbbd9e2889f10f2452b9a5ae3a77f650a84c7.tar.xz nixlib-58bbbbd9e2889f10f2452b9a5ae3a77f650a84c7.tar.zst nixlib-58bbbbd9e2889f10f2452b9a5ae3a77f650a84c7.zip | |
Merge pull request #48023 from ElvishJerricco/networkmanager-patch-hashes
Fix NetworkManager patches with fetchpatch and updated hashes
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 01b979c3c5bf..66d9434a470a 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus-glib, gnome3 -, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables +{ stdenv, fetchurl, fetchpatch, substituteAll, intltool, pkgconfig, dbus-glib +, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt @@ -67,13 +67,13 @@ in stdenv.mkDerivation rec { patches = [ # https://bugzilla.gnome.org/show_bug.cgi?id=796751 - (fetchurl { + (fetchpatch { url = https://bugzilla.gnome.org/attachment.cgi?id=372953; - sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a"; + sha256 = "0xg7bzs6dvkbv2qp67i7mi1c5yrmfd471xgmlkn15b33pqkzy3mc"; }) - (fetchurl { + (fetchpatch { url = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch; - sha256 = "af1717f7c6fdd6dadb4082dd847f4bbc42cf1574833299f3e47024e785533f2e"; + sha256 = "0r7338q3za7mf419a244vi65b1q497rg84avijybmv6w4x6p1ksd"; }) (substituteAll { src = ./fix-paths.patch; |