From 3b35310cdc4e79a47f11bba28f22c982add599b7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 27 Nov 2021 04:20:00 +0000
Subject: [PATCH] git-filter-repo: remove duplicated expression

---
 .../git-and-tools/git-filter-repo/default.nix | 28 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
deleted file mode 100644
index f5e964d3ca9a..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchurl, pythonPackages }:
-
-stdenv.mkDerivation rec {
-  pname = "git-filter-repo";
-  version = "2.33.0";
-
-  src = fetchurl {
-    url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk=";
-  };
-
-  buildInputs = [ pythonPackages.python ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    install -Dm755 -t $out/bin git-filter-repo
-    install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/newren/git-filter-repo";
-    description = "Quickly rewrite git repository history (filter-branch replacement)";
-    license = licenses.mit;
-    inherit (pythonPackages.python.meta) platforms;
-    maintainers = [ maintainers.marsam ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf51b1df7af8..2c461dee4983 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5618,9 +5618,7 @@ with pkgs;
 
   git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { };
 
-  git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo {
-    pythonPackages = python3Packages;
-  };
+  git-filter-repo = with python3Packages; toPythonApplication git-filter-repo;
 
   git-gone = callPackage ../applications/version-management/git-and-tools/git-gone {
     inherit (darwin.apple_sdk.frameworks) Security;