From 5fd6ef708d4efc336048d3e9dc4420443d97f312 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 28 Mar 2022 20:03:57 -0400
Subject: [PATCH] python3Packages.rosinstall-generator: 0.1.22 ->
 unstable-20211203

Fix GitLab downloads and tests.
---
 pkgs/rosinstall-generator/default.nix | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/rosinstall-generator/default.nix b/pkgs/rosinstall-generator/default.nix
index 1e07f4c381..ba7838a38f 100644
--- a/pkgs/rosinstall-generator/default.nix
+++ b/pkgs/rosinstall-generator/default.nix
@@ -1,23 +1,18 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, catkin-pkg, rosdistro, rospkg
-, pyyaml, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, catkin-pkg, rosdistro
+, rospkg, pyyaml, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "rosinstall_generator";
-  version = "0.1.22";
+  version = "unstable-20211203";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1idq8xacz7s59mb7aakma3g2w1n89i3dkcdjgzvs221zrncjbli2";
+  src = fetchFromGitHub {
+    owner = "ros-infrastructure";
+    repo = pname;
+    # Contains several important fixes
+    rev = "9024a02e0aa0e09b3a533458e05a4e862eae7ddf";
+    sha256 = "sha256-yDKQQyZE75rYDS6hL638fOJxaqkNEQ/g5NG0eBEY/K0=";
   };
 
-  patches = [
-    # Fix GitLab tarball downloads
-    (fetchpatch {
-      url = "https://github.com/lopsided98/rosinstall_generator/commit/16291631160ba9801ea5b551d6840d692acf1e44.patch";
-      sha256 = "0ynbq2n5qd49a72ylcp8cim02b2srmr1956ifp6cww1s1jrvbhgc";
-    })
-  ];
-
   propagatedBuildInputs = [ catkin-pkg rosdistro rospkg pyyaml ];
 
   checkInputs = [ pytestCheckHook ];