diff --git a/flake.lock b/flake.lock index 2b307089..fff53260 100644 --- a/flake.lock +++ b/flake.lock @@ -167,11 +167,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1717243271, - "narHash": "sha256-M3VxP6DtREz5Lq6MKg1gQ2EeVdIbq6AEp/N1tDSrvoc=", + "lastModified": 1717372940, + "narHash": "sha256-fK1PJqC8kQOy8rD7B+qmJOTx9IV8AOmFtH5Z/ip7340=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f7de25c01e4c073c06e0525226a0c2311d530cee", + "rev": "c987c730bbf2121264ebd68921b443db5bb28543", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", + "lastModified": 1717265169, + "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", + "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1717242134, - "narHash": "sha256-2X835ZESUaQ/KZEuG9HkoEB7h0USG5uvkSUmLzFkxAE=", + "lastModified": 1717392304, + "narHash": "sha256-i9Kh2ty++/xMj4GPTMI7vQrpH4jopjT4BUq2GKX1zug=", "owner": "nixos", "repo": "nixpkgs", - "rev": "61c1d282153dbfcb5fe413c228d172d0fe7c2a7e", + "rev": "77a51024c0f953d503eb3ed364aa4bff378649f8", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1717297459, + "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", "type": "github" }, "original": { diff --git a/hosts/common/net/networkmanager.nix b/hosts/common/net/networkmanager.nix index 31531856..e44e7a87 100644 --- a/hosts/common/net/networkmanager.nix +++ b/hosts/common/net/networkmanager.nix @@ -152,12 +152,6 @@ in { ''; postFixup = (upstream.postFixup or "") + '' - # nixpkgs wpa_supplicant generates a dbus file which has a path like - # /nix/store/abc-wpa_supplicant/nix/store/abc-wpa_supplicant/sbin/... - # upstreaming status: - substituteInPlace $out/share/dbus-1/system-services/* --replace-fail \ - "$out$out" "$out" - # remove unused services to avoid unexpected interactions rm $out/etc/systemd/system/{wpa_supplicant-nl80211@,wpa_supplicant-wired@,wpa_supplicant@}.service ''; diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 4942a1da..1d558e2d 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -46,14 +46,6 @@ in [ hash = "sha256-N4DfNhCeg9etVeTPVzJ73CwiZzf43SozK8nrfXIm0uQ="; }) - (fetchpatch' { - title = "libphonenumber: fix cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/316094"; - saneCommit = "151fb5ea9c43847dbd114cb80c04ce7118fef95d"; - # hash = "sha256-dvgpuldhBlSrpwkqNEtgAHqhaGsrMwoAT+Q5J27NYrQ="; - hash = "sha256-N8ZA/93qTmrCE9eE8VPgkXD/ciTOHdD5zRz9JJLU5gA="; - }) - (fetchpatch' { title = "passt: support cross compilation"; saneCommit = "3ef36d3aa139f94e8716b0721856c5808937c9f2";