diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2019-11-12 22:26:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 22:26:55 +0100 |
| commit | 6236cffa69757549207ad7d2001d96ac16ad1cdf (patch) | |
| tree | 7965dc463abb0f05e9f3abf8617fda1e4706271d | |
| parent | linux: 4.9.200 -> 4.9.201 (diff) | |
| parent | tokei: 10.0.1 -> 10.1.0 (diff) | |
| download | nixpkgs-6236cffa69757549207ad7d2001d96ac16ad1cdf.tar.gz | |
tokei: 10.0.1 -> 10.1.0 (#73306)
tokei: 10.0.1 -> 10.1.0
| -rw-r--r-- | pkgs/development/tools/misc/tokei/Cargo.lock.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/tokei/default.nix | 9 |
2 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/development/tools/misc/tokei/Cargo.lock.patch b/pkgs/development/tools/misc/tokei/Cargo.lock.patch deleted file mode 100644 index 46bd80a218da..000000000000 --- a/pkgs/development/tools/misc/tokei/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index db09bc4..1e4892d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -961,7 +961,7 @@ dependencies = [ - - [[package]] - name = "tokei" --version = "10.0.0" -+version = "10.0.1" - dependencies = [ - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 104aa4691ab1..e3e8e2c046c8 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,19 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "10.0.1"; + version = "10.1.0"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "0g8p4f8g9zb1fqzzb1qi28idskahi5nldsma6rydjyrgi9gynpa0"; + sha256 = "0l7vqmdagfhi4hnp50ng253zy4g48qjhs5kmnk2xh5v3c59ys4zs"; }; - cargoSha256 = "0pwq1scll5ga8rw4lx97s915zvp7v171b6316cin54f2zzpbrxx5"; - - # Patch for v10.0.1 Cargo.lock issue - patches = [ ./Cargo.lock.patch ]; + cargoSha256 = "140nm0nswmgdp549gqp71dbn99rc5g7cagl9s5m5qirl9mbpys8x"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security |