diff --git a/flake.lock b/flake.lock index f3831766..2b307089 100644 --- a/flake.lock +++ b/flake.lock @@ -167,11 +167,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1717135267, - "narHash": "sha256-RWAKjjxAIdlYk5c33JQoo1wADJ1jccVx1PmjgdqlSr0=", + "lastModified": 1717243271, + "narHash": "sha256-M3VxP6DtREz5Lq6MKg1gQ2EeVdIbq6AEp/N1tDSrvoc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a0a33b56d6279fec4827da602882561ef00f2fb", + "rev": "f7de25c01e4c073c06e0525226a0c2311d530cee", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1717144511, - "narHash": "sha256-ffhcvrJ3BXTjIW+aIv/eF9cAgjEYAtBylSsIcBe8MV8=", + "lastModified": 1717242134, + "narHash": "sha256-2X835ZESUaQ/KZEuG9HkoEB7h0USG5uvkSUmLzFkxAE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ccd1516effbc5510391d3b498a7a3bef92a090b", + "rev": "61c1d282153dbfcb5fe413c228d172d0fe7c2a7e", "type": "github" }, "original": { @@ -223,11 +223,11 @@ ] }, "locked": { - "lastModified": 1717117873, - "narHash": "sha256-d7pL/XDVUwO0XnmqUxSIdWk+mzEVcwhoW9B2sgAVIr4=", + "lastModified": 1717175759, + "narHash": "sha256-KiM5ue/UNQt8ktoqCV4yFqhHxM31U94Mf/piKW9dZ4c=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "1db9b79a45c8e346e03480767e6d9749fabfaf10", + "rev": "93b225ddba91179248b378913a91defbc6aeb899", "type": "github" }, "original": { diff --git a/overlays/cross.nix b/overlays/cross.nix index ad165410..b75d5b2f 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -413,10 +413,6 @@ in with final; { ]; }); - # 2024/05/31: upstreaming is unblocked, out for PR: - # fixes: "src/meson.build:3:0: ERROR: Program 'glib-compile-resources' not found or not executable" - # gnome-color-manager = mvToNativeInputs [ glib ] super.gnome-color-manager; - # 2024/05/31: upstreaming is blocked by a LOT: qtbase, qtsvg, webp-pixbuf-loader, libgweather, gnome-color-manager, appstream, apache-httpd, ibus # fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable" # gnome-control-center = mvToNativeInputs [ glib ] super.gnome-control-center;