From 3837061baf99ef45d15e1d322a0b01ad1406cd16 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Feb 2023 17:55:44 -0500 Subject: [PATCH] as-tree: 0.12.0 -> unstable-2021-03-09 Upstream has not seen any activity in 2 years, this update gets rid of the patch and makes migration to importCargoLock easier: https://github.com/NixOS/nixpkgs/pull/217084#discussion_r1111253151. Diff: https://github.com/jez/as-tree/compare/0.12.0...0036c20f66795774eb9cda3ccbae6ca1e1c19444 --- pkgs/tools/misc/as-tree/cargo-lock.patch | 13 ------------- pkgs/tools/misc/as-tree/default.nix | 15 +++++---------- 2 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 pkgs/tools/misc/as-tree/cargo-lock.patch diff --git a/pkgs/tools/misc/as-tree/cargo-lock.patch b/pkgs/tools/misc/as-tree/cargo-lock.patch deleted file mode 100644 index f7a06c050d2d..000000000000 --- a/pkgs/tools/misc/as-tree/cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 991ecd8..9e94574 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -11,7 +11,7 @@ dependencies = [ - - [[package]] - name = "as-tree" --version = "0.11.1" -+version = "0.12.0" - dependencies = [ - "ansi_term", - "atty", diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/tools/misc/as-tree/default.nix index 4b2ce65d3dbf..3b0c7c270dba 100644 --- a/pkgs/tools/misc/as-tree/default.nix +++ b/pkgs/tools/misc/as-tree/default.nix @@ -1,27 +1,22 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "as-tree"; - version = "0.12.0"; + version = "unstable-2021-03-09"; src = fetchFromGitHub { owner = "jez"; repo = pname; - rev = version; - sha256 = "0c0g32pkyhyvqpgvzlw9244c80npq6s8mxy3may7q4qyd7hi3dz5"; + rev = "0036c20f66795774eb9cda3ccbae6ca1e1c19444"; + sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk="; }; - cargoSha256 = "1m334shcja7kg134b7lnq1ksy67j5b5vblkzamrw06f6r1hkn1rc"; - # the upstream 0.12.0 release didn't update the Cargo.lock file properly - # they have updated their release script, so this patch can be removed - # when the next version is released. - cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM="; meta = with lib; { description = "Print a list of paths as a tree of paths"; homepage = "https://github.com/jez/as-tree"; license = with licenses; [ blueOak100 ]; maintainers = with maintainers; [ jshholland ]; - platforms = platforms.all; }; }