From 652cc7801f66dfb3b43b0f1b09b1345c8a35bfa3 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 13 Aug 2024 21:42:09 -0400 Subject: [PATCH] chore: unpin hyprland input --- flake.lock | 51 ++++++++++++++++++++++++++++++++------------------- flake.nix | 7 ++----- inputs.nix | 3 +-- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index d6190b61..c39b123f 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1722347739, - "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", + "lastModified": 1723405438, + "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", + "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66", "type": "github" }, "original": { @@ -530,11 +530,11 @@ ] }, "locked": { - "lastModified": 1721330371, - "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", + "lastModified": 1722623071, + "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", + "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "type": "github" }, "original": { @@ -573,25 +573,23 @@ "nixpkgs": [ "nixpkgs" ], - "systems": [ - "systems" - ], + "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1723172503, - "narHash": "sha256-HVaAneYjMwsXXpbxDVmk+G2h1uQvAhog3QxZGuVDbX8=", + "lastModified": 1723579231, + "narHash": "sha256-PL9C3aOetj+TS+vXvNhh7q5bm3g70oakg+iSu5eQBUQ=", "ref": "refs/heads/main", - "rev": "69e257d19428975d822321891e23f6c776f1be5a", - "revCount": 5072, + "rev": "3b4aabe04c7756fb0a70d78b6f0e701228f46345", + "revCount": 5087, "submodules": true, "type": "git", - "url": "https://github.com/matt1432/Hyprland" + "url": "https://github.com/hyprwm/Hyprland" }, "original": { "submodules": true, "type": "git", - "url": "https://github.com/matt1432/Hyprland" + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-plugins": { @@ -690,11 +688,11 @@ ] }, "locked": { - "lastModified": 1722098849, - "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", + "lastModified": 1722869141, + "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", + "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", "type": "github" }, "original": { @@ -1567,7 +1565,7 @@ "sioyek-theme-src": "sioyek-theme-src", "sops-nix": "sops-nix", "subsync": "subsync", - "systems": "systems", + "systems": "systems_2", "trash-d-src": "trash-d-src", "ts-for-gir-src": "ts-for-gir-src", "vimplugin-easytables-src": "vimplugin-easytables-src", @@ -1705,6 +1703,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "trash-d-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index d127a7e6..37fa9301 100644 --- a/flake.nix +++ b/flake.nix @@ -123,13 +123,10 @@ type = "github"; }; hyprland = { - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - }; + inputs.nixpkgs.follows = "nixpkgs"; submodules = true; type = "git"; - url = "https://github.com/matt1432/Hyprland"; + url = "https://github.com/hyprwm/Hyprland"; }; hyprland-plugins = { inputs = { diff --git a/inputs.nix b/inputs.nix index 6fc3b1fd..ed0b0b0f 100644 --- a/inputs.nix +++ b/inputs.nix @@ -118,8 +118,7 @@ let hyprlandInputs = { hyprland = mkDep { type = "git"; - # FIXME: switch back to hyprwm when build issue fixed - url = "https://github.com/matt1432/Hyprland"; + url = "https://github.com/hyprwm/Hyprland"; submodules = true; };