mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-07 21:46:00 +01:00
Merge branch 'main' of https://github.com/hyprwm/Hyprland
This commit is contained in:
commit
a98c07cd00
3 changed files with 13 additions and 11 deletions
20
flake.lock
20
flake.lock
|
@ -2,11 +2,11 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1655221618,
|
"lastModified": 1655807518,
|
||||||
"narHash": "sha256-ht8HRFthDKzYt+il+sGgkBwrv+Ex2l8jdGVpsrPfFME=",
|
"narHash": "sha256-5YV29Ry/DpAJc/0Hc/+ISVBAjwHpJvAkeKkcUG5lWsc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6616de389ed55fba6eeba60377fc04732d5a207c",
|
"rev": "a72d7811be1162dd6804c4e36e5402d76fb6e921",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -25,17 +25,19 @@
|
||||||
"wlroots": {
|
"wlroots": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
"host": "gitlab.freedesktop.org",
|
||||||
"lastModified": 1654618691,
|
"lastModified": 1654618691,
|
||||||
"narHash": "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s=",
|
"narHash": "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s=",
|
||||||
"owner": "ThatOneCalculator",
|
"owner": "wlroots",
|
||||||
"repo": "wlroots-mirror",
|
"repo": "wlroots",
|
||||||
"rev": "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc",
|
"rev": "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc",
|
||||||
"type": "github"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "ThatOneCalculator",
|
"host": "gitlab.freedesktop.org",
|
||||||
"repo": "wlroots-mirror",
|
"owner": "wlroots",
|
||||||
"type": "github"
|
"repo": "wlroots",
|
||||||
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
wlroots = {
|
wlroots = {
|
||||||
url = "github:ThatOneCalculator/wlroots-mirror";
|
url = "gitlab:wlroots/wlroots?host=gitlab.freedesktop.org";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,7 +10,7 @@ if [ $SUB_REV != $CRT_REV ]; then
|
||||||
nix flake lock --update-input nixpkgs
|
nix flake lock --update-input nixpkgs
|
||||||
|
|
||||||
# update wlroots to submodule revision
|
# update wlroots to submodule revision
|
||||||
nix flake lock --override-input wlroots "github:ThatOneCalculator/wlroots-mirror/$SUB_REV"
|
nix flake lock --override-input wlroots "gitlab:wlroots/wlroots/$SUB_REV?host=gitlab.freedesktop.org"
|
||||||
|
|
||||||
# remove "dirty" mark from lockfile
|
# remove "dirty" mark from lockfile
|
||||||
jq < flake.lock 'del(.nodes.wlroots.original.rev)' | sponge flake.lock
|
jq < flake.lock 'del(.nodes.wlroots.original.rev)' | sponge flake.lock
|
||||||
|
|
Loading…
Reference in a new issue