git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #147655 from marsam/update-git-filter-repo

git-filter-repo: remove duplicated expression

commit193388b14d33d745a6d901e27c045fe083a5689a authorMario Rodas <marsam@users.noreply.github.com> dateWed 1 Dec 2021, 00:25 (5 years ago) parent3984e4e3b35310
2 files changed+1−31
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix−28 pkgs/top-level/all-packages.nix+1−3
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ lib, stdenv, fetchurl, pythonPackages }:
2−
3−stdenv.mkDerivation rec {
4− pname = "git-filter-repo";
5− version = "2.33.0";
6−
7− src = fetchurl {
8− url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
9− sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk=";
10− };
11−
12− buildInputs = [ pythonPackages.python ];
13−
14− dontBuild = true;
15−
16− installPhase = ''
17− install -Dm755 -t $out/bin git-filter-repo
18− install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1
19− '';
20−
21− meta = with lib; {
22− homepage = "https://github.com/newren/git-filter-repo";
23− description = "Quickly rewrite git repository history (filter-branch replacement)";
24− license = licenses.mit;
25− inherit (pythonPackages.python.meta) platforms;
26− maintainers = [ maintainers.marsam ];
27− };
28−}
pkgs/top-level/all-packages.nix+1−3
@@ -5632,9 +5632,7 @@ with pkgs;
56325632
56335633 git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { };
56345634
5635− git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo {
5636− pythonPackages = python3Packages;
5637− };
5635+ git-filter-repo = with python3Packages; toPythonApplication git-filter-repo;
56385636
56395637 git-gone = callPackage ../applications/version-management/git-and-tools/git-gone {
56405638 inherit (darwin.apple_sdk.frameworks) Security;