summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-01-15 13:49:17 +0000
committerGitHub <noreply@github.com>2018-01-15 13:49:17 +0000
commit4c63cc8c4b05d53794f03d5c4499ff056b24e62c (patch)
tree4ce6c67a666deafa6e2fa9994c4af6b710bb6577 /pkgs
parent272ecfccb9c615ac4fc31676333a2ad55f018d63 (diff)
parentc6c3344cc47e215b4edb4d0ed0759889f15a6119 (diff)
downloadnixpkgs-4c63cc8c4b05d53794f03d5c4499ff056b24e62c.tar
nixpkgs-4c63cc8c4b05d53794f03d5c4499ff056b24e62c.tar.gz
nixpkgs-4c63cc8c4b05d53794f03d5c4499ff056b24e62c.tar.bz2
nixpkgs-4c63cc8c4b05d53794f03d5c4499ff056b24e62c.tar.lz
nixpkgs-4c63cc8c4b05d53794f03d5c4499ff056b24e62c.tar.xz
nixpkgs-4c63cc8c4b05d53794f03d5c4499ff056b24e62c.tar.zst
nixpkgs-4c63cc8c4b05d53794f03d5c4499ff056b24e62c.zip
Merge pull request #33895 from dywedir/tokei
tokei: 6.1.2 -> 7.0.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/misc/tokei/default.nix13
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 2759b18e35c..d1f6cc4ea29 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,26 +2,21 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tokei-${version}";
-  version = "6.1.2";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "Aaronepower";
     repo = "tokei";
     rev = "v${version}";
-    sha256 = "1bzs3mr6f9bna39b9ddwwq0raas07nbn106mnq3widxg59i0gxhd";
+    sha256 = "1c8m2arhy58ky8pzj0dp3w9gpacia9jwmayi0il640l4fm8nr734";
   };
 
-  cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz";
-
-  buildPhase = ''
-    # do not pass --frozen since Cargo.lock has the wrong tokei version
-    cargo build --release
-  '';
+  cargoSha256 = "1cl4fjbvrw7zhpb8rxj566ddlxbj9vdsb1cp7mh6llmvaia2vgks";
 
   meta = with stdenv.lib; {
     description = "Count code, quickly";
     homepage = https://github.com/Aaronepower/tokei;
-    license = licenses.mit;
+    license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ gebner ];
     platforms = platforms.all;
   };