From 2e146c3a6baed521739e941f556a19a1f63c7cbb Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Mon, 1 Feb 2021 09:42:03 -0500 Subject: [PATCH 1/2] asciidoc: set revdate --- pkgs/tools/typesetting/asciidoc/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 61af8102f51e..228d264ca40f 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -147,6 +147,8 @@ stdenv.mkDerivation rec { pname = "asciidoc"; version = "9.0.4"; + # Note: a substitution to improve reproducibility should be updated once 10.0.0 is + # released. See the comment in `patchPhase` for more information. src = fetchFromGitHub { owner = "asciidoc"; repo = "asciidoc-py3"; @@ -262,6 +264,15 @@ stdenv.mkDerivation rec { patchShebangs . sed -i -e "s,/etc/vim,,g" Makefile.in + # Note: this substitution will not work in the planned 10.0.0 release: + # + # https://github.com/asciidoc/asciidoc-py3/commit/dfffda23381014481cd13e8e9d8f131e1f93f08a + # + # Update this substitution to: + # + # --replace "python3 -m asciidoc.a2x" "python3 -m asciidoc.a2x -a revdate=01/01/1980" + substituteInPlace Makefile.in \ + --replace "python3 a2x.py" "python3 a2x.py -a revdate=01/01/1980" ''; preInstall = "mkdir -p $out/etc/vim"; From fb6c18938b88c3a46b7604d7c2375d9be4e4ffc0 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Wed, 3 Feb 2021 22:37:18 -0500 Subject: [PATCH 2/2] asciidoc: remove superfluous sed --- pkgs/tools/typesetting/asciidoc/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 228d264ca40f..849da7e606c0 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -263,7 +263,6 @@ stdenv.mkDerivation rec { '') + '' patchShebangs . - sed -i -e "s,/etc/vim,,g" Makefile.in # Note: this substitution will not work in the planned 10.0.0 release: # # https://github.com/asciidoc/asciidoc-py3/commit/dfffda23381014481cd13e8e9d8f131e1f93f08a