Loading pkgs/tools/typesetting/lowdown/default.nix +11 −37 Original line number Diff line number Diff line { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook , fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , enableDarwinSandbox ? true Loading @@ -9,49 +8,15 @@ stdenv.mkDerivation rec { pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}"; version = "1.1.0"; version = "1.1.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; hash = "sha512-EpAWTz7Zy+2qqJGgzLrt0tK7WEZ+hHbdyqzAmMiaqc6uNXscR88git6/UbTjvB9Yanvetvw9huSuyhcORCEIug=="; hash = "sha512-KHQi5NpMU6Kw4Ij+BoGE52aU0vIP1pgMhjnBAUdMh6GV/xHCxfTXJduqh9bSfVMeOim08aZSIM7iq1io0VS8LA=="; }; patches = [ # Improve UTF-8 handling on macOS by not treating bytes >=0x80, which tend to be # UTF-8 continuation bytes, as control characters. # # This leaves control characters U+0080 through U+009F in the output # (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net # win. # # See: https://github.com/kristapsdz/lowdown/pull/140 (fetchpatch { url = "https://github.com/kristapsdz/lowdown/commit/5a02866dd682363a8e4f6b344c223cfe8b597da9.diff"; hash = "sha256-7tGhZJQQySeBv4h6A4r69BBbQkPRX/3JTw/80A8YXjQ="; }) (fetchpatch { url = "https://github.com/kristapsdz/lowdown/commit/c033a6886e4d6efb948782fbc389fe5f673acf36.diff"; hash = "sha256-7DvKFerAMoPifuTn7rOX4ru888HfBkpspH1opIbzj08="; }) # Don't output a newline after .SH # # This fixes `makewhatis` output on macOS and (as a result) `man` # completions for `fish` on macOS. # # See: https://github.com/kristapsdz/lowdown/pull/138 (fetchpatch { url = "https://github.com/kristapsdz/lowdown/commit/e05929a09a697de3d2eb14d0f0a087a6fae22e11.diff"; hash = "sha256-P03W+hFeBKwfJB+DhGCPq0DtiOiLLc+0ZvWrWqXFvVU="; }) (fetchpatch { url = "https://github.com/kristapsdz/lowdown/commit/9906f8ceac586c54eb39ae78105fd84653a89c33.diff"; hash = "sha256-nBnAgTb8RDe/QpUhow3lyeR7UIVJX2o4lmP78e2fw/E="; }) ]; nativeBuildInputs = [ which dieHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; Loading @@ -70,6 +35,13 @@ stdenv.mkDerivation rec { runHook postConfigure ''; # Fix rpath change on darwin to avoid failure like: # error: install_name_tool: changing install names or # rpaths can't be redone for: liblowdown.1.dylib (for architecture # arm64) because larger # https://github.com/NixOS/nixpkgs/pull/344532#issuecomment-238475791 env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; makeFlags = [ "bins" # prevents shared object from being built unnecessarily ]; Loading Loading @@ -109,8 +81,10 @@ stdenv.mkDerivation rec { installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) '' runHook preInstallCheck echo '# TEST' > test.md $out/bin/lowdown test.md runHook postInstallCheck ''; Loading Loading
pkgs/tools/typesetting/lowdown/default.nix +11 −37 Original line number Diff line number Diff line { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook , fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , enableDarwinSandbox ? true Loading @@ -9,49 +8,15 @@ stdenv.mkDerivation rec { pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}"; version = "1.1.0"; version = "1.1.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; hash = "sha512-EpAWTz7Zy+2qqJGgzLrt0tK7WEZ+hHbdyqzAmMiaqc6uNXscR88git6/UbTjvB9Yanvetvw9huSuyhcORCEIug=="; hash = "sha512-KHQi5NpMU6Kw4Ij+BoGE52aU0vIP1pgMhjnBAUdMh6GV/xHCxfTXJduqh9bSfVMeOim08aZSIM7iq1io0VS8LA=="; }; patches = [ # Improve UTF-8 handling on macOS by not treating bytes >=0x80, which tend to be # UTF-8 continuation bytes, as control characters. # # This leaves control characters U+0080 through U+009F in the output # (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net # win. # # See: https://github.com/kristapsdz/lowdown/pull/140 (fetchpatch { url = "https://github.com/kristapsdz/lowdown/commit/5a02866dd682363a8e4f6b344c223cfe8b597da9.diff"; hash = "sha256-7tGhZJQQySeBv4h6A4r69BBbQkPRX/3JTw/80A8YXjQ="; }) (fetchpatch { url = "https://github.com/kristapsdz/lowdown/commit/c033a6886e4d6efb948782fbc389fe5f673acf36.diff"; hash = "sha256-7DvKFerAMoPifuTn7rOX4ru888HfBkpspH1opIbzj08="; }) # Don't output a newline after .SH # # This fixes `makewhatis` output on macOS and (as a result) `man` # completions for `fish` on macOS. # # See: https://github.com/kristapsdz/lowdown/pull/138 (fetchpatch { url = "https://github.com/kristapsdz/lowdown/commit/e05929a09a697de3d2eb14d0f0a087a6fae22e11.diff"; hash = "sha256-P03W+hFeBKwfJB+DhGCPq0DtiOiLLc+0ZvWrWqXFvVU="; }) (fetchpatch { url = "https://github.com/kristapsdz/lowdown/commit/9906f8ceac586c54eb39ae78105fd84653a89c33.diff"; hash = "sha256-nBnAgTb8RDe/QpUhow3lyeR7UIVJX2o4lmP78e2fw/E="; }) ]; nativeBuildInputs = [ which dieHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; Loading @@ -70,6 +35,13 @@ stdenv.mkDerivation rec { runHook postConfigure ''; # Fix rpath change on darwin to avoid failure like: # error: install_name_tool: changing install names or # rpaths can't be redone for: liblowdown.1.dylib (for architecture # arm64) because larger # https://github.com/NixOS/nixpkgs/pull/344532#issuecomment-238475791 env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; makeFlags = [ "bins" # prevents shared object from being built unnecessarily ]; Loading Loading @@ -109,8 +81,10 @@ stdenv.mkDerivation rec { installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) '' runHook preInstallCheck echo '# TEST' > test.md $out/bin/lowdown test.md runHook postInstallCheck ''; Loading