From 76ec848b235a5bbb7749e1b696cb486e5476f51f Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 22 Mar 2023 09:33:25 +0100
Subject: [PATCH] qMasterPassword Qt styles fix got backported

---
 flake.lock             | 29 ++++++-----------------------
 flake.nix              |  2 --
 overlays/overrides.nix |  5 -----
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2e434f29..d1cc6e23 100644
--- a/flake.lock
+++ b/flake.lock
@@ -284,22 +284,6 @@
         "type": "github"
       }
     },
-    "fork": {
-      "locked": {
-        "lastModified": 1669056793,
-        "narHash": "sha256-xf4QnWQlZsQRVRL0mnjCKg11d92532619dFDIZiXHEc=",
-        "owner": "teutat3s",
-        "repo": "nixpkgs",
-        "rev": "4e2b7d7a929ffa4a63328a71853dabd99ed403ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "teutat3s",
-        "ref": "fix/qMasterPassword-styles",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -324,11 +308,11 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1678898370,
-        "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
+        "lastModified": 1679172431,
+        "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ac718d02867a84b42522a0ece52d841188208f2c",
+        "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
         "type": "github"
       },
       "original": {
@@ -400,11 +384,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1678872516,
-        "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+        "lastModified": 1679224734,
+        "narHash": "sha256-1Ab3xY7Wgo1h1TNwRt6fp2XjV+KUo+hP1Bolh0KiDJs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
+        "rev": "eac7da7b519a5aefe92c33c90b4450a24ebe0ab3",
         "type": "github"
       },
       "original": {
@@ -496,7 +480,6 @@
         "deploy": "deploy",
         "digga": "digga",
         "flake-compat": "flake-compat",
-        "fork": "fork",
         "home": "home",
         "latest": "latest",
         "master": "master",
diff --git a/flake.nix b/flake.nix
index 68821af9..a06d9cff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,6 @@
     nixos.url = "github:nixos/nixpkgs/nixos-22.11";
     latest.url = "github:nixos/nixpkgs/nixos-unstable";
     master.url = "github:nixos/nixpkgs/master";
-    fork.url = "github:teutat3s/nixpkgs/fix/qMasterPassword-styles";
 
     flake-compat.url = "github:edolstra/flake-compat";
     flake-compat.flake = false;
@@ -82,7 +81,6 @@
         nixos-22-05 = {};
         latest = {};
         master = {};
-        fork = {};
       };
 
       lib = import ./lib {lib = digga.lib // nixos.lib;};
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index d22dab3b..0c20ac05 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -25,11 +25,6 @@ channels: final: prev: {
   #inherit (channels.master)
   #  ;
 
-  inherit
-    (channels.fork)
-    qMasterPassword
-    ;
-
   inherit
     (channels.nixos-22-05)
     terraform