Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb8f0cc22799
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 02d1989f8c1c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 14, 2020

  1. networkmanager: 1.22.10 -> 1.22.14 

    https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.22.14/NEWS
    @worldofpeace
    worldofpeace committed Jul 14, 2020
    Copy the full SHA
    b061622 View commit details

Commits on Jul 18, 2020

  1. Merge pull request #93115 from worldofpeace/nm-20.03-update 

    [20.03] networkmanager: 1.22.10 -> 1.22.14
    @worldofpeace
    worldofpeace authored Jul 18, 2020
    Copy the full SHA
    02d1989 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/tools/networking/network-manager/default.nix
6 changes: 4 additions & 2 deletions pkgs/tools/networking/network-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
pname = "network-manager";
version = "1.22.10";
version = "1.22.14";

src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "0xyaizyp3yz6x3pladw3nvl3hf4n5g140zx9jnxfp9qvag0wqa9b";
sha256 = "1pa9r7qdjfpxvibinxf6zs9sxlkjr4qgipsgp99f473ajdqkk2f6";
};

outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@@ -49,6 +49,8 @@ in stdenv.mkDerivation rec {
# Allow using iwd when configured to do so
"-Diwd=true"
"-Dlibaudit=yes-disabled-by-default"
# We don't use firewalld in NixOS
"-Dfirewalld_zone=false"
];

patches = [