Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 10 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/nixpkgs/pkgs/tools/compression/dtrx/default.nix
index ae736f18026d..2bfe975d033c 100644
--- a/nixpkgs/pkgs/tools/compression/dtrx/default.nix
+++ b/nixpkgs/pkgs/tools/compression/dtrx/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, gitUpdater
 , python3Packages
 , gnutar
 , unzip
@@ -21,28 +22,30 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "dtrx";
-  version = "8.5.1";
+  version = "8.5.3";
 
   src = fetchFromGitHub {
     owner = "dtrx-py";
     repo = "dtrx";
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-KOHafmvl17IABlcBuE7isHVCIYRbA68Dna6rgiiWlkQ=";
+    rev = version;
+    sha256 = "sha256-LB3F6jcqQPRsjFO4L2fPAPnacDAdtcaadgGbwXA9LAw=";
   };
 
-  postInstall =
+  makeWrapperArgs =
     let
       archivers = lib.makeBinPath (
         [ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield bzip2 xz lzip ]
         ++ lib.optional (unzipSupport) unzip
         ++ lib.optional (unrarSupport) unrar
       );
-    in ''
-      wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}"
-    '';
+    in [
+      ''--prefix PATH : "${archivers}"''
+    ];
 
   nativeBuildInputs = [ python3Packages.invoke ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
     description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
     homepage = "https://github.com/dtrx-py/dtrx";