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

Merge pull request #65624 from worldofpeace/bump-networkmanager

Browse Source 
networkmanager: 1.18.1 -> 1.18.2
This commit is contained in:
Frederik Rietdijk 2019-08-03 08:02:35 +02:00 committed by GitHub
commit 8fa3fb092e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,11 +11,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
version = "1.18.1"; version = "1.18.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07vg2ryyjaxs5h8kmkwqhk4ki750c4di98g0i7h7zglfs16psiqd"; sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad";
}; };
outputs = [ "out" "dev" "devdoc" "man" "doc" ]; outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
"-Ddnsmasq=${dnsmasq}/bin/dnsmasq" "-Ddnsmasq=${dnsmasq}/bin/dnsmasq"
# Upstream prefers dhclient, so don't add dhcpcd to the closure # Upstream prefers dhclient, so don't add dhcpcd to the closure
"-Ddhcpcd=no" "-Ddhcpcd=no"
"-Ddhcpcanon=no"
"-Dpppd=${ppp}/bin/pppd" "-Dpppd=${ppp}/bin/pppd"
"-Diptables=${iptables}/bin/iptables" "-Diptables=${iptables}/bin/iptables"
# to enable link-local connections # to enable link-local connections
@ -49,6 +50,7 @@ in stdenv.mkDerivation rec {
"-Dqt=false" "-Dqt=false"
# Allow using iwd when configured to do so # Allow using iwd when configured to do so
"-Diwd=true" "-Diwd=true"
"-Dlibaudit=yes-disabled-by-default"
]; ];
patches = [ patches = [