df42a80827c2c3331c6f612eb86464d67ba55e50

Message

nix: fix nix build against props.json change

Diff

This diff is truncated to protect this page.

  1diff --git a/flake.lock b/flake.lock
  2index 75978289c1dbe1220a9a5a766f670febef321d2b..50bae0861d0d95576e0796b954b4c4f10ad7582a 100644
  3--- a/flake.lock
  4+++ b/flake.lock
  5@@ -1,5 +1,38 @@
  6 {
  7   "nodes": {
  8+    "aquamarine": {
  9+      "inputs": {
 10+        "hyprutils": [
 11+          "hyprland",
 12+          "hyprutils"
 13+        ],
 14+        "hyprwayland-scanner": [
 15+          "hyprland",
 16+          "hyprwayland-scanner"
 17+        ],
 18+        "nixpkgs": [
 19+          "hyprland",
 20+          "nixpkgs"
 21+        ],
 22+        "systems": [
 23+          "hyprland",
 24+          "systems"
 25+        ]
 26+      },
 27+      "locked": {
 28+        "lastModified": 1721487522,
 29+        "narHash": "sha256-aF3uwUwUK2CgbItoMe3IJF0yidIEWcDx47AiH5y8VKk=",
 30+        "owner": "hyprwm",
 31+        "repo": "aquamarine",
 32+        "rev": "acfea3bd1d9e756c7152e639240d52c6628844b0",
 33+        "type": "github"
 34+      },
 35+      "original": {
 36+        "owner": "hyprwm",
 37+        "repo": "aquamarine",
 38+        "type": "github"
 39+      }
 40+    },
 41     "hyprcursor": {
 42       "inputs": {
 43         "hyprlang": [
 44@@ -16,11 +49,11 @@
 45         ]
 46       },
 47       "locked": {
 48-        "lastModified": 1718450675,
 49-        "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
 50+        "lastModified": 1720108799,
 51+        "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=",
 52         "owner": "hyprwm",
 53         "repo": "hyprcursor",
 54-        "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
 55+        "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486",
 56         "type": "github"
 57       },
 58       "original": {
 59@@ -31,6 +64,7 @@
 60     },
 61     "hyprland": {
 62       "inputs": {
 63+        "aquamarine": "aquamarine",
 64         "hyprcursor": "hyprcursor",
 65         "hyprlang": "hyprlang",
 66         "hyprutils": "hyprutils",
 67@@ -40,17 +74,17 @@
 68         "xdph": "xdph"
 69       },
 70       "locked": {
 71-        "lastModified": 1720896272,
 72-        "narHash": "sha256-zo1lDMsxjEyko/P+KfCLNYZrCAWQOrX90/J31nqzpy4=",
 73+        "lastModified": 1721579057,
 74+        "narHash": "sha256-x/RIzkL8PwLDNiRV/R308RdCmS8h3G9Xf62XVH/WAp0=",
 75         "ref": "refs/heads/main",
 76-        "rev": "bc6b0880dda2607a80f000c134f573c970452a0f",
 77-        "revCount": 4925,
 78+        "rev": "928d1dd38a6e4a791d4a4374a4a3bf02311adbb2",
 79+        "revCount": 4942,
 80         "submodules": true,
 81         "type": "git",
 82         "url": "https://github.com/hyprwm/Hyprland"
 83       },
 84       "original": {
 85-        "rev": "bc6b0880dda2607a80f000c134f573c970452a0f",
 86+        "rev": "928d1dd38a6e4a791d4a4374a4a3bf02311adbb2",
 87         "submodules": true,
 88         "type": "git",
 89         "url": "https://github.com/hyprwm/Hyprland"
 90@@ -70,11 +104,11 @@
 91         ]
 92       },
 93       "locked": {
 94-        "lastModified": 1714869498,
 95-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
 96+        "lastModified": 1718746314,
 97+        "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=",
 98         "owner": "hyprwm",
 99         "repo": "hyprland-protocols",
100-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
101+        "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290",
102         "type": "github"
103       },
104       "original": {
105diff --git a/flake.nix b/flake.nix
106index bfac52e586eab1fae1ca8c6f5cef66499f50982c..9fd22573e1509726884536e43b7b9d762ee08004 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -1,6 +1,6 @@
110 {
111   inputs = {
112-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&rev=bc6b0880dda2607a80f000c134f573c970452a0f";
113+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&rev=928d1dd38a6e4a791d4a4374a4a3bf02311adbb2";
114   };
115 
116   outputs = { self, hyprland, ... }: let
117@@ -10,12 +10,12 @@
118       (builtins.attrNames hyprland.packages)
119       (system: fn system nixpkgs.legacyPackages.${system});
120 
121-    props = builtins.fromJSON (builtins.readFile "${hyprland}/props.json");
122+    hyprlandVersion = nixpkgs.lib.removeSuffix "\n" (builtins.readFile "${hyprland}/VERSION");
123   in {
124     packages = hyprlandSystems (system: pkgs: rec {
125       hy3 = pkgs.callPackage ./default.nix {
126         hyprland = hyprland.packages.${system}.hyprland;
127-        hlversion = props.version;
128+        hlversion = hyprlandVersion;
129       };
130       default = hy3;
131     });
132@@ -23,13 +23,13 @@
133     devShells = hyprlandSystems (system: pkgs: {
134       default = import ./shell.nix {
135         inherit pkgs;
136-        hlversion = props.version;
137+        hlversion = hyprlandVersion;
138         hyprland = hyprland.packages.${system}.hyprland-debug;
139       };
140 
141       impure = import ./shell.nix {
142         pkgs = import <nixpkgs> {};
143-        hlversion = props.version;
144+        hlversion = hyprlandVersion;
145         hyprland = (pkgs.appendOverlays [ hyprland.overlays.hyprland-packages ]).hyprland-debug.overrideAttrs {
146           dontStrip = true;
147         };