colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

NetworkManager: 1.46.0 -> 1.48.0

Browse Source 
mostly so i can review the PR and get this update mainlined sooner :)
This commit is contained in:
Colin
2024-06-03 11:23:33 +00:00
parent 1448cb4444
commit 682143d47f
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
hosts/common/net/networkmanager.nix
View File

@@ -1,16 +1,17 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
networkmanager = pkgs.networkmanager.overrideAttrs (upstream: { networkmanager = pkgs.networkmanager;
src = pkgs.fetchFromGitea { # networkmanager = pkgs.networkmanager.overrideAttrs (upstream: {
domain = "git.uninsane.org"; # src = pkgs.fetchFromGitea {
owner = "colin"; # domain = "git.uninsane.org";
repo = "NetworkManager"; # owner = "colin";
# patched to fix polkit permissions (with `nmcli`) when NetworkManager runs as user networkmanager # repo = "NetworkManager";
rev = "dev-sane-1.46.0"; # # patched to fix polkit permissions (with `nmcli`) when NetworkManager runs as user networkmanager
hash = "sha256-S5ZiOfCpwtVVVO+DP6OPodJqzSc/LW4waI42DRkT+RA="; # rev = "dev-sane-1.46.0";
}; # hash = "sha256-S5ZiOfCpwtVVVO+DP6OPodJqzSc/LW4waI42DRkT+RA=";
# patches = []; # };
}); # # patches = [];
# });
# split the package into `daemon` and `nmcli` outputs, because the networkmanager *service* # split the package into `daemon` and `nmcli` outputs, because the networkmanager *service*
# doesn't need `nmcli`/`nmtui` tooling # doesn't need `nmcli`/`nmtui` tooling
networkmanager-split = pkgs.networkmanager-split.override { inherit networkmanager; }; networkmanager-split = pkgs.networkmanager-split.override { inherit networkmanager; };

6
nixpatches/list.nix
View File

@@ -32,6 +32,12 @@ in [
# etc, where "date" is like "20240228181608" # etc, where "date" is like "20240228181608"
# and can be found with `nix-repl > :lf . > lastModifiedDate` # and can be found with `nix-repl > :lf . > lastModifiedDate`
(fetchpatch' {
title = "networkmanager: 1.46.0 → 1.48.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/316417";
hash = "sha256-LfQyB3tzQa3UNyZl9HWCuoyBznIhinodlTL6TnPn0Uk=";
})
(fetchpatch' { (fetchpatch' {
title = "nixos/networkmanager: split ModemManager bits into own module"; title = "nixos/networkmanager: split ModemManager bits into own module";
prUrl = "https://github.com/NixOS/nixpkgs/pull/316824"; prUrl = "https://github.com/NixOS/nixpkgs/pull/316824";