summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-01-08 02:07:34 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-01-08 02:07:34 +0100
commite6c0c98940bc72280216639cd9fb16745b7e1103 (patch)
tree365c0fb567ff279f2475445a8ba001776629df0e /pkgs/tools/text
parent5c072a088d7b0efd3a8185953fe21efcd6c1d94a (diff)
parent9414948a5a19463acce5a7f2b2206c39ecb6359f (diff)
downloadnixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar
nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.gz
nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.bz2
nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.lz
nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.xz
nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.zst
nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.zip
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/mdcat/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index c89d1526257..eb51ad6d260 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -11,19 +11,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdcat";
-  version = "0.22.1";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "lunaryorn";
     repo = pname;
     rev = "mdcat-${version}";
-    hash = "sha256-4sM1xT/JQ+yM5tZkGwK7r0gUT5so9o1MnDJ7apZkRd4=";
+    hash = "sha256-i36MYTMkbSuWxxlWUDsyYMay/4Mg7M5jEFhHM60UrkM=";
   };
 
   nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ];
   buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
 
-  cargoSha256 = "sha256-LoNm2/6/FgTKp95ETODY39D8Ou+9X+IXIy625YW9AFI=";
+  cargoSha256 = "sha256-mnDUIJhEGNoh3eq2Vhww1T/tpZh9RP+RxbRsBNrpOzw=";
 
   checkInputs = [ ansi2html ];
   # Skip tests that use the network and that include files.