From 5bc38aa909a3b4eadc8399d418858adeaaac863b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 18 Nov 2024 10:41:36 +0100 Subject: [PATCH] use patched element-web --- flake.lock | 105 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 29 +++++++++++- packages/default.nix | 1 + 3 files changed, 134 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index bfa61ef3..15e1368e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "devshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -20,6 +40,38 @@ "type": "github" } }, + "element-web": { + "inputs": { + "devshell": [ + "devshell" + ], + "flake-compat": [ + "flake-compat" + ], + "flake-parts": [ + "flake-parts" + ], + "matrix-js-sdk": [ + "matrix-js-sdk" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731922168, + "narHash": "sha256-kDHZXas6YvkNWq5Ab038/MMPfobB6rSuJhJTp7V5K1Y=", + "owner": "darkkirb", + "repo": "element-web", + "rev": "c2e3d1415eb376f7c09d0f48c69779936e2e26d6", + "type": "github" + }, + "original": { + "owner": "darkkirb", + "repo": "element-web", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -36,6 +88,26 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -207,6 +279,35 @@ "url": "https://git.lix.systems/lix-project/nixos-module" } }, + "matrix-js-sdk": { + "inputs": { + "devshell": [ + "devshell" + ], + "flake-compat": [ + "flake-compat" + ], + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731919198, + "narHash": "sha256-WOTtlA2pVCh4GmIN2MQiNa0vOs57LLMIwMGKdWxdt1w=", + "owner": "darkkirb", + "repo": "matrix-js-sdk", + "rev": "ff08c2e49038fbd29472d1fe1d13593ecb416136", + "type": "github" + }, + "original": { + "owner": "darkkirb", + "repo": "matrix-js-sdk", + "type": "github" + } + }, "nix-vscode-extensions": { "inputs": { "flake-compat": [ @@ -374,8 +475,11 @@ }, "root": { "inputs": { + "devshell": "devshell", "disko": "disko", + "element-web": "element-web", "flake-compat": "flake-compat", + "flake-parts": "flake-parts", "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "gitignore": "gitignore", @@ -383,6 +487,7 @@ "impermanence": "impermanence", "lix": "lix", "lix-module": "lix-module", + "matrix-js-sdk": "matrix-js-sdk", "nix-vscode-extensions": "nix-vscode-extensions", "nix2container": "nix2container", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index 4d31609e..aae615e3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,30 @@ description = "Lotteā€™s nix configuration"; inputs = { + devshell = { + url = "github:numtide/devshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; + element-web = { + url = "github:darkkirb/element-web"; + inputs.devshell.follows = "devshell"; + inputs.flake-compat.follows = "flake-compat"; + inputs.flake-parts.follows = "flake-parts"; + inputs.matrix-js-sdk.follows = "matrix-js-sdk"; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; flake-utils = { url = "github:numtide/flake-utils"; inputs.systems.follows = "systems"; @@ -42,6 +58,13 @@ inputs.lix.follows = "lix"; inputs.nixpkgs.follows = "nixpkgs"; }; + matrix-js-sdk = { + url = "github:darkkirb/matrix-js-sdk"; + inputs.devshell.follows = "devshell"; + inputs.flake-compat.follows = "flake-compat"; + inputs.flake-parts.follows = "flake-parts"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.flake-compat.follows = "flake-compat"; @@ -229,7 +252,11 @@ // ( if name != "riscv64-linux" then { - inherit (pkgs) kodi-joyn; + inherit (pkgs) + element-desktop + element-web + kodi-joyn + ; } else { } diff --git a/packages/default.nix b/packages/default.nix index b216fe17..fc2becfc 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -2,6 +2,7 @@ final: prev: { art-lotte = final.callPackage ./art/lotte { }; art-lotte-bgs-nsfw = final.callPackage ./art/lotte/bgs-nsfw.nix { }; art-lotte-bgs-sfw = final.callPackage ./art/lotte/bgs-sfw.nix { }; + inherit (prev.inputs.element-web.packages.${prev.system}) element-web; fish = prev.fish.overrideAttrs { postPatch = '' substituteInPlace src/history.cpp --replace-fail 'vacuum = true' 'vacuum = false'