diff --git a/flake.lock b/flake.lock index de415a3f..8aa0f653 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1722339003, + "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", "type": "github" }, "original": { @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1720599442, - "narHash": "sha256-jdm+sKVbBXoyrxcHbVaV0htlpq2iFR+eJw3Xe/DPcDo=", + "lastModified": 1722082646, + "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "cf297a8d248db6a455b60133f6c0029c04ebe50e", + "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-flake": { "locked": { - "lastModified": 1720281493, - "narHash": "sha256-Lic3N1H2k5RsYDtfbmfO+9K2u7uwyXIj+aCaTj2/zSY=", + "lastModified": 1721140942, + "narHash": "sha256-iEqZGdnkG+Hm0jZhS59NJwEyB6z9caVnudWPGHZ/FAE=", "owner": "srid", "repo": "nixos-flake", - "rev": "cab6539d198792f94fbac029e5a63523604fd172", + "rev": "5734c1d9a5fe0bc8e8beaf389ad6227392ca0108", "type": "github" }, "original": { @@ -330,11 +330,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720691131, - "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", + "lastModified": 1722221733, + "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", + "rev": "12bf09802d77264e441f48e25459c10c93eada2e", "type": "github" }, "original": { @@ -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" @@ -519,11 +536,11 @@ }, "unstable": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b5473e13..873f6f56 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 af9faa9b..9ee0524d 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; } ) ];