From b5efa36c5ed0ec344061f003cb452346d1e79742 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Feb 2022 00:40:27 +0000 Subject: [PATCH 1/2] mdcat: 0.25.1 -> 0.26.0 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index fdf05fe20011..95c7cf76f169 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "sha256-deG2VjyjFs0LFeTXfPYy3zzjj0rpVjxE0DhkpD5PzSQ="; + sha256 = "sha256-boZ3n/EWwpnUNtnDxMy/nT9IKIFg1OwLOkxV7URNdd0="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-bPGSdXooBZMye3yj00f3rWIiW4wfg2B4meH44hpkXTY="; + cargoSha256 = "sha256-8D+YvMr32K0/hx1FUFOCjF8eSOaaf6sbTRx5ikFKPEE="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From e2856ed17ff08920cc32669b72af3725a2d8653e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 15 Feb 2022 14:12:17 +0100 Subject: [PATCH 2/2] mdcat: 0.26.0 -> 0.26.1 also fix license, switch upstream --- pkgs/tools/text/mdcat/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 95c7cf76f169..f6dcd72d7bf2 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitea , rustPlatform , pkg-config , asciidoctor @@ -12,20 +12,21 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.26.0"; + version = "0.26.1"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = pname; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "flausch"; + repo = "mdcat"; rev = "mdcat-${version}"; - sha256 = "sha256-boZ3n/EWwpnUNtnDxMy/nT9IKIFg1OwLOkxV7URNdd0="; + sha256 = "sha256-vB49EwQltonR9Uw8RRMZTPR4WkcylnIqiE0/8+t2R1Q="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-8D+YvMr32K0/hx1FUFOCjF8eSOaaf6sbTRx5ikFKPEE="; + cargoSha256 = "sha256-v52ob5l5HiiZZmo88D9/ldFi0170/BuPzgKIt9ctSgU="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. @@ -50,7 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "cat for markdown"; homepage = "https://github.com/lunaryorn/mdcat"; - license = with licenses; [ asl20 ]; + license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ davidtwco SuperSandro2000 ]; }; }