From 8158b662c3f83b1a88feb86cd0eedda4833bed05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 8 Oct 2023 18:25:42 +0200 Subject: [PATCH 1/2] mdcat: 2.0.3 -> 2.0.4 Diff: https://github.com/swsnr/mdcat/compare/mdcat-2.0.3...mdcat-2.0.4 --- 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 2675bd176751..6f6ee1e56cdd 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 = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - sha256 = "sha256-S47xJmwOCDrJJSYP9WiUKFWR9UZDNgY3mc/fTHaKsvA="; + hash = "sha256-QGGZv+wk0w01eL6vAsRRUw+CuTdI949sGOM8ot4dGIc="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-g/Il3Sff9NtEfGTXBOGyRw6/GXje9kVwco0URyhv4TI="; + cargoHash = "sha256-VH9MmASMiD62rxDZSKmrW7N+qp0Fpm7Pcyhxpkpl/oM="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From 2749ff487daf5d67c49e8ca54d122e67a27c6c4b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:33:07 +0200 Subject: [PATCH 2/2] mdcat: fix build on darwin --- pkgs/tools/text/mdcat/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 6f6ee1e56cdd..86809e28487e 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -6,6 +6,7 @@ , asciidoctor , openssl , Security +, SystemConfiguration , ansi2html , installShellFiles }: @@ -23,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; cargoHash = "sha256-VH9MmASMiD62rxDZSKmrW7N+qp0Fpm7Pcyhxpkpl/oM="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca6755503964..c90dbae24ce1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10129,7 +10129,7 @@ with pkgs; }; mdcat = callPackage ../tools/text/mdcat { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; inherit (python3Packages) ansi2html; };