From 21a28e12124d48d1f0346b28e9d1f34b86fdbb8e Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 31 Jul 2024 11:44:28 +0200 Subject: [PATCH] element-web, matrix-synapse: pull in updates early element-web 1.11.72 fixes support for Firefox ESR. Also get the latest matrix-synapse version 1.112.0 while we're at it. --- flake.lock | 17 +++++++++++++++++ flake.nix | 2 ++ overlays/default.nix | 3 +++ 3 files changed, 22 insertions(+) diff --git a/flake.lock b/flake.lock index 0c2527d..8aa0f65 100644 --- a/flake.lock +++ b/flake.lock @@ -360,6 +360,22 @@ "type": "github" } }, + "nixpkgs-331083-331168": { + "locked": { + "lastModified": 1722418656, + "narHash": "sha256-C0zLS4tb8yulQ61L0FOQJ+Z3NC3GylewegS7oKJunSs=", + "owner": "teutat3s", + "repo": "nixpkgs", + "rev": "65251f43b4564dbd46a71da90e420326749c02a9", + "type": "github" + }, + "original": { + "owner": "teutat3s", + "ref": "backport-element-desktop-1.11.72", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1719876945, @@ -386,6 +402,7 @@ "nixos-flake": "nixos-flake", "nixpkgs": "nixpkgs", "nixpkgs-2205": "nixpkgs-2205", + "nixpkgs-331083-331168": "nixpkgs-331083-331168", "simple-nixos-mailserver": "simple-nixos-mailserver", "triton-vmtools": "triton-vmtools", "unstable": "unstable" diff --git a/flake.nix b/flake.nix index b5473e1..873f6f5 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-331083-331168.url = "github:teutat3s/nixpkgs/backport-element-desktop-1.11.72"; + nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05"; nix-darwin.url = "github:lnl7/nix-darwin/master"; diff --git a/overlays/default.nix b/overlays/default.nix index af9faa9..9ee0524 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -10,12 +10,15 @@ final: prev: let unstable = import inputs.unstable { system = prev.system; }; + nixpkgs-331083-331168 = import inputs.nixpkgs-331083-331168 { system = prev.system; }; in { element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; }; element-stickerpicker = prev.callPackage ./pkgs/element-stickerpicker { inherit (inputs) element-stickers maunium-stickerpicker; }; + element-web = nixpkgs-331083-331168.element-web; + matrix-synapse-unwrapped = nixpkgs-331083-331168.matrix-synapse-unwrapped; } ) ];