Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de683046c3d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cb4263a7a8a7
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 3, 2018

  1. network-manager: 1.12.0 -> 1.12.2 

    fix VPN activation through nm-applet (#43806),
upstream bug https://gitlab.gnome.org/GNOME/network-manager-applet/issues/12
    @flokli
    flokli committed Aug 3, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moser-ss Stephane Moser
    GPG key ID: 51EA3CB018868B76
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    88b2b6c View commit details

  2. network-manager-applet: add patch for import file chooser

    @flokli
    flokli committed Aug 3, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moser-ss Stephane Moser
    GPG key ID: D8EC4CC760EEE98B
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e63ef63 View commit details

  3. networkmanager: fix compile error due to NM_AVAILABLE_IN_1_12_2 macro

    @flokli
    flokli committed Aug 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    24726a3 View commit details

Commits on Aug 4, 2018

  1. Merge pull request #44037 from flokli/fix-nm-applet-vpn 

    networkmanager: fix VPN activation through nm-applet
    @jtojnar
    jtojnar authored Aug 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moser-ss Stephane Moser
    GPG key ID: D8EC4CC760EEE98B
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb4263a View commit details
Showing with 25 additions and 7 deletions.
  1. +19 −0 pkgs/tools/networking/network-manager/applet.nix
  2. +6 −7 pkgs/tools/networking/network-manager/default.nix
19 changes: 19 additions & 0 deletions pkgs/tools/networking/network-manager/applet.nix
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,25 @@ in stdenv.mkDerivation rec {
url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch;
sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk";
})

# following 3 patches:
# https://gitlab.gnome.org/GNOME/network-manager-applet/issues/11
# should be fixed in 1.8.16
(fetchpatch {
name = "0001-connection-editor-hold-GApplication-while-the-import.patch";
url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/419c459e70ac752eb9226b0db1192fb0433d5d5e.patch;
sha256 = "0zi4fn2ynymi6ckkdrj8vcl78pwmkan4n8l53axaqb4kn0wnahdj";
})
(fetchpatch {
name = "0002-connection-list-attempt-a-VPN-import-first.patch";
url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/9d79ffdb148b31c7194c66946c87b6cd57ed54a3.patch;
sha256 = "1v0pdvkglrcfl1khp9j17cw0gvwg8scdha0wfziy054s1r6kyj23";
})
(fetchpatch {
name = "0003-bluetooth-fix-an-assert-failure-on-creation-cancella.patch";
url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/516f3f6c70ef9694d6004c64d50a9f3cd2725ab7.patch;
sha256 = "1msk4hmri3x5chmclxm7sdj1v9jg7pxqqrarlvsmfmshdwq4ljwk";
})
];

mesonFlags = [
13 changes: 6 additions & 7 deletions pkgs/tools/networking/network-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@ let
pname = "NetworkManager";
in stdenv.mkDerivation rec {
name = "network-manager-${version}";
version = "1.12.0";
version = "1.12.2";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "15bzjkrfa7sw5p5hkdha4a67y1zfnzh1s6za11sh8s1yxmyvkziq";
sha256 = "09hsh34m8hg4m402pw5n11f29vsfjw6lm3p5m56yxwq57bwnzq3b";
};

outputs = [ "out" "dev" ];
@@ -66,16 +66,15 @@ in stdenv.mkDerivation rec {
];

patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=796752
(fetchurl {
url = https://bugzilla.gnome.org/attachment.cgi?id=372955;
sha256 = "17rl19lprnsz4wjmp54c1qw6a3pf8x97bhd69xavwy7cx6z84b3n";
})
# https://bugzilla.gnome.org/show_bug.cgi?id=796751
(fetchurl {
url = https://bugzilla.gnome.org/attachment.cgi?id=372953;
sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a";
})
(fetchurl {
url = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch;
sha256 = "af1717f7c6fdd6dadb4082dd847f4bbc42cf1574833299f3e47024e785533f2e";
})
(substituteAll {
src = ./fix-paths.patch;
inherit inetutils kmod openconnect;