summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2023-04-29 09:50:16 -0400
committerGitHub <noreply@github.com>2023-04-29 09:50:16 -0400
commit4acc6ace1e447d7018197b0f1caee62cd7e2ef90 (patch)
treea0539af46f8807715c74264db0f18e90d43ad592 /pkgs/tools
parentb3954eb9e07df5256dca6ce78b582c66a7cabf27 (diff)
parent71d1118bd4383cbb072103af324b2b23873dafee (diff)
downloadnixpkgs-4acc6ace1e447d7018197b0f1caee62cd7e2ef90.tar
nixpkgs-4acc6ace1e447d7018197b0f1caee62cd7e2ef90.tar.gz
nixpkgs-4acc6ace1e447d7018197b0f1caee62cd7e2ef90.tar.bz2
nixpkgs-4acc6ace1e447d7018197b0f1caee62cd7e2ef90.tar.lz
nixpkgs-4acc6ace1e447d7018197b0f1caee62cd7e2ef90.tar.xz
nixpkgs-4acc6ace1e447d7018197b0f1caee62cd7e2ef90.tar.zst
nixpkgs-4acc6ace1e447d7018197b0f1caee62cd7e2ef90.zip
Merge pull request #228788 from figsoda/onefetch
onefetch: 2.17.0 -> 2.17.1
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/onefetch/default.nix6
-rw-r--r--pkgs/tools/misc/onefetch/zstd-pkg-config.patch16
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index 1011ded3a1e..5677c2e8c42 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "onefetch";
-  version = "2.17.0";
+  version = "2.17.1";
 
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = pname;
     rev = version;
-    sha256 = "sha256-5d2u58i5VU+k1iC+bmiyKqe8qNTibryDxXNENxIflEI=";
+    hash = "sha256-mIHaeEnMKOyEeEEkE5OZgQZWwFnm69GZui64iBZkfyo=";
   };
 
-  cargoSha256 = "sha256-PLxccKkJg9LNckAVG2iXU9XB1olAvVZQYRG8R6s+ibU=";
+  cargoHash = "sha256-XFX3J/vgjboEu+xZWTkfo5jmZJkap1u3j9G9ewrzVqc=";
 
   cargoPatches = [
     # enable pkg-config feature of zstd
diff --git a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch
index efe2482f955..667fc23b4f1 100644
--- a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch
+++ b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch
@@ -1,14 +1,14 @@
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -2039,6 +2039,7 @@ dependencies = [
-  "tokei",
-  "toml",
+@@ -2498,6 +2498,7 @@ dependencies = [
+  "typetag",
+  "winres",
   "yaml-rust",
 + "zstd",
  ]
  
  [[package]]
-@@ -3286,4 +3287,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
+@@ -4052,4 +4053,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
  dependencies = [
   "cc",
   "libc",
@@ -16,11 +16,11 @@
  ]
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -58,6 +58,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
+@@ -49,6 +49,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
  tokei = "12.1.2"
- toml = "0.5.9"
+ typetag = "0.2"
  yaml-rust = "0.4.5"
 +zstd = { version = "*", features = ["pkg-config"] }
  
- [target.'cfg(windows)'.dependencies]
- enable-ansi-support = "0.1.2"
+ [dev-dependencies]
+ criterion = "0.4.0"