From 5338fa05530900a136a4d5b31848ec467c1e1eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Thu, 14 Mar 2024 07:44:22 +0100 Subject: [PATCH] fix element desktop --- flake.lock | 145 +------------------------------------------ flake.nix | 6 -- overlays/default.nix | 1 - 3 files changed, 3 insertions(+), 149 deletions(-) diff --git a/flake.lock b/flake.lock index 41e68a04..623e9dcf 100644 --- a/flake.lock +++ b/flake.lock @@ -218,35 +218,6 @@ "type": "github" } }, - "element-web": { - "inputs": { - "devshell": [ - "devshell" - ], - "flake-compat": "flake-compat_3", - "flake-parts": [ - "flake-parts" - ], - "matrix-js-sdk": "matrix-js-sdk", - "matrix-react-sdk": "matrix-react-sdk", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707065344, - "narHash": "sha256-BdrBBz4JGpDpW4eXHB3LE1dknKMZ9NN3OyAzsRN8fRw=", - "owner": "DarkKirb", - "repo": "element-web", - "rev": "12cf42cab992092d19a0b4ae8133b678cff8a93d", - "type": "github" - }, - "original": { - "owner": "DarkKirb", - "repo": "element-web", - "type": "github" - } - }, "firefox": { "inputs": { "cachix": [ @@ -310,51 +281,6 @@ } }, "flake-compat_3": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -370,7 +296,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -547,70 +473,6 @@ "type": "github" } }, - "matrix-js-sdk": { - "inputs": { - "devshell": [ - "element-web", - "devshell" - ], - "flake-compat": "flake-compat_4", - "flake-parts": [ - "element-web", - "flake-parts" - ], - "nixpkgs": [ - "element-web", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707031683, - "narHash": "sha256-0stR5QA474/djL1rNqxHXPYWLJCCxIK5GMlq+I6NAHc=", - "owner": "darkkirb", - "repo": "matrix-js-sdk", - "rev": "e127a27efd1c4cc94000178589654f151e71ba37", - "type": "github" - }, - "original": { - "owner": "darkkirb", - "repo": "matrix-js-sdk", - "type": "github" - } - }, - "matrix-react-sdk": { - "inputs": { - "devshell": [ - "element-web", - "devshell" - ], - "flake-compat": "flake-compat_5", - "flake-parts": [ - "element-web", - "flake-parts" - ], - "matrix-js-sdk": [ - "element-web", - "nixpkgs" - ], - "nixpkgs": [ - "element-web", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707031704, - "narHash": "sha256-3A1GL/S1zMjBL6y4RpYqvCaSITEPXizoU0/oUy0/FkE=", - "owner": "darkkirb", - "repo": "matrix-react-sdk", - "rev": "6c57dc6dc7f3d6370c9a945d15f8fbe29c16ca0c", - "type": "github" - }, - "original": { - "owner": "darkkirb", - "repo": "matrix-react-sdk", - "type": "github" - } - }, "mautrix-cleanup": { "inputs": { "flake-utils": [ @@ -653,7 +515,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_4", "lowdown-src": "lowdown-src", "nixpkgs": [ "hydra", @@ -857,9 +719,8 @@ "crane": "crane", "devshell": "devshell", "dns": "dns", - "element-web": "element-web", "firefox": "firefox", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "flake-utils": "flake-utils_2", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index c261370a..2447bd28 100644 --- a/flake.nix +++ b/flake.nix @@ -55,12 +55,6 @@ rec { inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; }; - element-web = { - url = "github:DarkKirb/element-web"; - inputs.devshell.follows = "devshell"; - inputs.flake-parts.follows = "flake-parts"; - inputs.nixpkgs.follows = "nixpkgs"; - }; firefox = { url = "github:nix-community/flake-firefox-nightly"; inputs.cachix.follows = "nixpkgs"; diff --git a/overlays/default.nix b/overlays/default.nix index 82d971f2..5a457ba9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -74,5 +74,4 @@ in doCheck = false; doInstallCheck = false; }); - inherit (inputs.element-web.packages.${system}) element-web; }