diff --git a/flake.lock b/flake.lock index 4c56b470..f5e559cd 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1710072067, - "narHash": "sha256-bR5I3bkuPZnPzldk63qk4mcn+cetedCNxCRnwFFXDJA=", + "lastModified": 1710093662, + "narHash": "sha256-6VYhHUUVsQRbrRvrTPNtUaFKn0pwKuE+mU+BOGjhPmY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32f638e62d638c9a0011c0162ed1be4a13d00ea9", + "rev": "85e4390bb2db2543b65a61a6fb601819ba331399", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1710077484, - "narHash": "sha256-yrckbLTj7YA9sQJKGmki7OnfY2dRjQuO55XEEOcL/RI=", + "lastModified": 1710108207, + "narHash": "sha256-wrflk+FhejffeVo6i5S/cQH5BwS1txIXsnA6ajN9LX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9fc2bd0eef6d2651638656c82fbe0b7a40478c3b", + "rev": "c916d4cbac62b2d8b70a3940d3471dbd0c57d2f4", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 860a0d9d..6dd95265 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -158,11 +158,6 @@ in [ # hash = "sha256-eTwEbVULYjmOW7zUFcTUqvBZqUFjHTKFhvmU2m3XQeo="; # }) - (fetchpatch' { - title = "conky: enable Wayland support and cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/278071"; - hash = "sha256-e6o+Vjd3KCI9dFj0TdAWyyqfreX8cf0RfYGdyvebYC0="; - }) (fetchpatch' { title = "gthumb: make the webservices feature be optional"; prUrl = "https://github.com/NixOS/nixpkgs/pull/240602";