diff --git a/flake.lock b/flake.lock index 312fbdd5..87670b9a 100644 --- a/flake.lock +++ b/flake.lock @@ -324,11 +324,11 @@ }, "latest": { "locked": { - "lastModified": 1678111249, - "narHash": "sha256-ZTIbK7vthZwti5XeLZE+twkb4l44q01q2XoLMmmJe94=", + "lastModified": 1678654296, + "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a028e2873d7fcf44e66b784b4ba061824315537f", + "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b", "type": "github" }, "original": { @@ -400,11 +400,11 @@ }, "nixos": { "locked": { - "lastModified": 1678072060, - "narHash": "sha256-6a9Tbjhir5HxDx4uw0u6Z+LHUfYf7tsT9QxF9FN/32w=", + "lastModified": 1678703398, + "narHash": "sha256-Y1mW3dBsoWLHpYm+UIHb5VZ7rx024NNHaF16oZBx++o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "47c003416297e4d59a5e3e7a8b15cdbdf5110560", + "rev": "67f26c1cfc5d5783628231e776a81c1ade623e0b", "type": "github" }, "original": { @@ -489,6 +489,22 @@ "type": "indirect" } }, + "pr": { + "locked": { + "lastModified": 1678685944, + "narHash": "sha256-cjpGo5AhuLt2JBeI59SLdx5PRS3EEAgFVXzUpbSpEjo=", + "owner": "equirosa", + "repo": "nixpkgs", + "rev": "5b79e022238bc158b36bba0502f643aeb43064a0", + "type": "github" + }, + "original": { + "owner": "equirosa", + "ref": "backport-signal-desktop-to-release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -505,6 +521,7 @@ "nixos-22-05": "nixos-22-05", "nixos-hardware": "nixos-hardware", "nur": "nur", + "pr": "pr", "triton-vmtools": "triton-vmtools", "tritonshell": "tritonshell" } diff --git a/flake.nix b/flake.nix index 68821af9..38e3ec84 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ latest.url = "github:nixos/nixpkgs/nixos-unstable"; master.url = "github:nixos/nixpkgs/master"; fork.url = "github:teutat3s/nixpkgs/fix/qMasterPassword-styles"; + pr.url = "github:equirosa/nixpkgs/backport-signal-desktop-to-release-22.11"; flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 8fa0e8b3..2a4b7ce9 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -6,12 +6,10 @@ channels: final: prev: { cachix dhall discord - element-desktop rage nix-index qutebrowser alejandra - signal-desktop starship deploy-rs tdesktop @@ -27,6 +25,11 @@ channels: final: prev: { #inherit (channels.master) # ; + inherit + (channels.pr) + signal-desktop + ; + inherit (channels.fork) qMasterPassword