From f27054c13e72598e43771cb3f8bfad8ac6c6668f Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Fri, 23 Feb 2024 17:16:51 +0200 Subject: [PATCH] flake.nix: override inputs for xdph and hyprlang --- flake.lock | 46 +++++++++++++++------------------------------- flake.nix | 2 ++ 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index f1047d68..3db95226 100644 --- a/flake.lock +++ b/flake.lock @@ -27,35 +27,17 @@ "inputs": { "nixpkgs": [ "nixpkgs" + ], + "systems": [ + "systems" ] }, "locked": { - "lastModified": 1708005943, - "narHash": "sha256-9TT3xk++LI5/SPYgjYX34xZ4ebR93c1uerIq+SE/ues=", + "lastModified": 1708681732, + "narHash": "sha256-ULZZLZ9C33G13IaXLuAc4oTzHUvnATI8Fj2u6gzMfT0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "aeb3e012adc7b3235335c540b214b82267c2b983", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "nixpkgs": [ - "xdph", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "f4466367ef0a92a6425d482050dc2b8840c0e644", "type": "github" }, "original": { @@ -66,11 +48,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -129,7 +111,9 @@ "hyprland-protocols": [ "hyprland-protocols" ], - "hyprlang": "hyprlang_2", + "hyprlang": [ + "hyprlang" + ], "nixpkgs": [ "nixpkgs" ], @@ -138,11 +122,11 @@ ] }, "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", + "lastModified": 1708696469, + "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", + "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 59ad22ae..675a6d92 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,7 @@ hyprlang = { url = "github:hyprwm/hyprlang"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; }; xdph = { @@ -32,6 +33,7 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "systems"; inputs.hyprland-protocols.follows = "hyprland-protocols"; + inputs.hyprlang.follows = "hyprlang"; }; };