pyrox.dev
Merge commit 'refs/pull/14421/head' of git://github.com/NixOS/nixpkgs
+4
-2
pkgs/tools/networking/network-manager-applet/default.nix
+4
-2
pkgs/tools/networking/network-manager-applet/default.nix
···
6
6
let
7
7
pn = "network-manager-applet";
8
8
major = "1.0";
9
-
version = networkmanager.version;
9
+
# With version 1.0.12 of NM, we are no longer in sync
10
+
# version = "${networkmanager.version}.10";
11
+
version = "${major}.10";
10
12
in
11
13
12
14
stdenv.mkDerivation rec {
···
14
16
15
17
src = fetchurl {
16
18
url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
17
-
sha256 = "1yj0m6fb9v12d0di0rfmk3hx1vmygjkiff2c476rf792sbh56kax";
19
+
sha256 = "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh";
18
20
};
19
21
20
22
configureFlags = [ "--sysconfdir=/etc" ];
+4
-2
pkgs/tools/networking/network-manager/default.nix
+4
-2
pkgs/tools/networking/network-manager/default.nix
···
6
6
7
7
stdenv.mkDerivation rec {
8
8
name = "network-manager-${version}";
9
-
version = "1.0.6";
9
+
version = "1.0.12";
10
10
11
11
src = fetchurl {
12
12
url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz";
13
-
sha256 = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd";
13
+
sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs";
14
14
};
15
15
16
16
preConfigure = ''
···
18
18
substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
19
19
substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping
20
20
substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
21
+
substituteInPlace data/84-nm-drivers.rules \
22
+
--replace /bin/sh ${stdenv.shell}
21
23
substituteInPlace data/85-nm-unmanaged.rules \
22
24
--replace /bin/sh ${stdenv.shell} \
23
25
--replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \