From 11a5e6bcbfad9d35b843f928145ba698684b427d Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 22 Jun 2022 23:23:46 +0300 Subject: [PATCH] nix: revert to original wlroots repo --- flake.lock | 20 +++++++++++--------- flake.nix | 2 +- nix/update-inputs.sh | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 6f4cc7d0..71e49721 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1655221618, - "narHash": "sha256-ht8HRFthDKzYt+il+sGgkBwrv+Ex2l8jdGVpsrPfFME=", + "lastModified": 1655807518, + "narHash": "sha256-5YV29Ry/DpAJc/0Hc/+ISVBAjwHpJvAkeKkcUG5lWsc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6616de389ed55fba6eeba60377fc04732d5a207c", + "rev": "a72d7811be1162dd6804c4e36e5402d76fb6e921", "type": "github" }, "original": { @@ -25,17 +25,19 @@ "wlroots": { "flake": false, "locked": { + "host": "gitlab.freedesktop.org", "lastModified": 1654618691, "narHash": "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s=", - "owner": "ThatOneCalculator", - "repo": "wlroots-mirror", + "owner": "wlroots", + "repo": "wlroots", "rev": "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc", - "type": "github" + "type": "gitlab" }, "original": { - "owner": "ThatOneCalculator", - "repo": "wlroots-mirror", - "type": "github" + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "type": "gitlab" } } }, diff --git a/flake.nix b/flake.nix index 9d5569d7..882569a8 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; wlroots = { - url = "github:ThatOneCalculator/wlroots-mirror"; + url = "gitlab:wlroots/wlroots?host=gitlab.freedesktop.org"; flake = false; }; }; diff --git a/nix/update-inputs.sh b/nix/update-inputs.sh index 856dd43a..8c238222 100755 --- a/nix/update-inputs.sh +++ b/nix/update-inputs.sh @@ -10,7 +10,7 @@ if [ $SUB_REV != $CRT_REV ]; then nix flake lock --update-input nixpkgs # 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 jq < flake.lock 'del(.nodes.wlroots.original.rev)' | sponge flake.lock