From f17dac8f50d38638443c5779f7125eb8547ca820 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Wed, 1 Dec 2021 17:51:34 +0100
Subject: [PATCH] Remove packages overrides that are obsolete with 21.11

---
 pkgs/default.nix | 54 +-----------------------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 732916f..ecfb2a8 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -15,24 +15,6 @@ in
     imprint = callPackage ./imprint { };
   };
 
-  # adapted nixpkgs upstream but changed to buildGoModule and updated to
-  # version that works in my setup
-  # TODO: Remove with 21.11
-  prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { };
-
-  # TODO: Remove when pavucontrol > 4.0 is released
-  pavucontrol = prev.pavucontrol.overrideAttrs (o: o // {
-    patches = [
-      # This fixes context menus on wayland
-      # Bug report: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/issues/63
-      # Merge Request: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20
-      (prev.fetchpatch {
-        url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch";
-        sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj";
-      })
-    ];
-  });
-
   # adapted from https://github.com/NixOS/nixpkgs/pull/85790
   # TODO: Remove when memtest86+ ≥ 5.31b is in nixpkgs
   memtest86plus = prev.memtest86plus.overrideAttrs (o: o // rec {
@@ -51,18 +33,6 @@ in
     checkTarget = "run_self_test";
   });
 
-  # TODO: remove once new version (> 0.3.0) is released and in nixpkgs
-  nar-serve = prev.nar-serve.overrideAttrs (o: o // {
-    version = "unstable-2021-04-08";
-
-    src = prev.fetchFromGitHub {
-      owner = "numtide";
-      repo = "nar-serve";
-      rev = "4243b0efa41910dfa4be8b9936ae460699d3f8f0";
-      sha256 = "0mjs3yilf5rixm67wk4h4jji54dsc0w3vfxd561pvfbxplbmgh3c";
-    };
-  });
-
   vimPlugins = prev.vimPlugins // {
     # TODO: Remove once (if?) https://github.com/LnL7/vim-nix/pull/28 lands
     vim-nix = prev.vimPlugins.vim-nix.overrideAttrs (o: {
@@ -86,26 +56,4 @@ in
       ]);
     });
   };
-} // (
-  let
-    rtw89AttrsOverride = (o: o // {
-      version = "unstable-2021-10-21";
-
-      src = prev.fetchFromGitHub {
-        owner = "lwfinger";
-        repo = "rtw89";
-        rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c";
-        sha256 = "sha256-YhiusEMwchY9XazwE1auFqJ1qL6R/4vy7InrGaLnajM=";
-      };
-    });
-  in
-  {
-    linuxPackages = prev.linuxPackages.extend (lpfinal: lpprev: {
-      rtw89 = lpprev.rtw89.overrideAttrs rtw89AttrsOverride;
-    });
-
-    linuxPackages_latest = prev.linuxPackages_latest.extend (lpfinal: lpprev: {
-      rtw89 = lpprev.rtw89.overrideAttrs rtw89AttrsOverride;
-    });
-  }
-)
+}