Merge pull request #139688 from terinjokes/patches/stgit-1.3

stgit: 1.1 -> 1.3

1 files changed, 17 insertions, 8 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 4393a9dc51c..02888b3f87e 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -4,6 +4,7 @@
 , python3Packages
 , asciidoc
 , docbook_xsl
+, docbook_xml_dtd_45
 , git
 , perl
 , xmlto
@@ -11,16 +12,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "stgit";
-  version = "1.1";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "stacked-git";
     repo = "stgit";
     rev = "v${version}";
-    sha256 = "sha256-gfPf1yRmx1Mn1TyCBWmjQJBgXLlZrDcew32C9o6uNYk=";
+    sha256 = "0wa3ba7afnbb1h08n9xr0cqsg93rx0qd9jv8a34mmpp0lpijmjw6";
   };
 
-  nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl ];
+  nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ];
 
   format = "other";
 
@@ -34,6 +35,14 @@ python3Packages.buildPythonApplication rec {
         --replace http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl \
                   ${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl
     done
+
+    substituteInPlace Documentation/texi.xsl \
+      --replace http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd \
+                ${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd
+
+    cat > stgit/_version.py <<EOF
+    __version__ = "${version}"
+    EOF
   '';
 
   makeFlags = [
@@ -47,13 +56,13 @@ python3Packages.buildPythonApplication rec {
   checkTarget = "test";
   checkFlags = [ "PERL_PATH=${perl}/bin/perl" ];
 
-  installTargets = [ "install" "install-doc" ];
+  installTargets = [ "install" "install-doc" "install-html" ];
   postInstall = ''
     installShellCompletion --cmd stg \
-      --fish $out/share/stgit/completion/stg.fish \
-      --bash $out/share/stgit/completion/stgit.bash \
-      --zsh $out/share/stgit/completion/stgit.zsh
-    '';
+      --fish completion/stg.fish \
+      --bash completion/stgit.bash \
+      --zsh completion/stgit.zsh
+  '';
 
   meta = with lib; {
     description = "A patch manager implemented on top of Git";