From b522ac8786ce5dc145b7312bff05d08671c7d0f2 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 16 Mar 2023 11:59:08 +0100 Subject: [PATCH] signal-desktop: v6.7.0 got backported to release 22.11 branch nixos-22.11 --- flake.lock | 17 ----------------- flake.nix | 1 - overlays/overrides.nix | 5 ----- 3 files changed, 23 deletions(-) diff --git a/flake.lock b/flake.lock index ae5890fd..2e434f29 100644 --- a/flake.lock +++ b/flake.lock @@ -489,22 +489,6 @@ "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", @@ -521,7 +505,6 @@ "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 38e3ec84..68821af9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,6 @@ 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 2a4b7ce9..d22dab3b 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -25,11 +25,6 @@ channels: final: prev: { #inherit (channels.master) # ; - inherit - (channels.pr) - signal-desktop - ; - inherit (channels.fork) qMasterPassword