Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cfceaaec17c2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f1a37a4f1cd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 5, 2020

  1. mdcat: 0.19.0 -> 0.20.0

    @davidtwco
    davidtwco committed Jul 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    davidtwco David Wood
    GPG key ID: 2592E76C87381FD9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9b9fe30 View commit details

  2. Merge pull request #92353 from davidtwco/mdcat-0.20.0 

    mdcat: 0.19.0 -> 0.20.0
    @danieldk
    danieldk authored Jul 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6f1a37a View commit details
Showing with 8 additions and 7 deletions.
  1. +8 −7 pkgs/tools/text/mdcat/default.nix
15 changes: 8 additions & 7 deletions pkgs/tools/text/mdcat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,30 +2,31 @@

rustPlatform.buildRustPackage rec {
pname = "mdcat";
version = "0.19.0";
version = "0.20.0";

src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
rev = "mdcat-${version}";
hash = "sha256-/ZhhDiiUc+swXr3IuuQD4YqIIdgh8PeRWm/ko9Lc0rM=";
hash = "sha256-1qxz6p7VaJ9eMcLQaTW/M4+Xo0WLihzyEAycbkjjPyA=";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;

cargoSha256 = "sha256-SGX94XY7e38xySvTO+CDTUBDTfYybPy12iWFoFc2Nto=";
cargoSha256 = "sha256-/mAwlxed1MOFUA1jDSrgPzJuURbKzwucBWORVVHlrt8=";

checkInputs = [ ansi2html ];
checkPhase = ''
# Skip tests that use the network and that include files.
cargo test -- --skip terminal::iterm2 \
--skip magic::tests::detect_mimetype_of_svg_image \
--skip magic::tests::detect_mimetype_of_png_image \
cargo test -- \
--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \
--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \
--skip magic::tests::detect_mimetype_of_png_image \
--skip magic::tests::detect_mimetype_of_svg_image \
--skip resources::tests::read_url_with_http_url_fails_when_status_404 \
--skip resources::tests::read_url_with_http_url_returns_content_when_status_200
--skip resources::tests::read_url_with_http_url_returns_content_when_status_200 \
--skip iterm2_tests_render_md_samples_images_md
'';

meta = with stdenv.lib; {