From 17771d614417f9fe460bff44530ab73a6457b9b0 Mon Sep 17 00:00:00 2001
From: nzbr <900Zebra@gmx.de>
Date: Tue, 5 Dec 2023 23:54:11 +0100
Subject: [PATCH 1/2] xstow: 1.1.0 -> 1.1.1

---
 pkgs/tools/misc/xstow/default.nix | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix
index 694634cf0bfe3..e03d8af4d35b7 100644
--- a/pkgs/tools/misc/xstow/default.nix
+++ b/pkgs/tools/misc/xstow/default.nix
@@ -1,11 +1,20 @@
-{ stdenv, lib, fetchurl, ncurses, autoreconfHook }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, ncurses
+, autoreconfHook
+}:
+
 stdenv.mkDerivation rec {
   pname = "xstow";
-  version = "1.1.0";
+  version = "1.1.1";
 
-  src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-wXQ5XSmogAt1torfarrqIU4nBYj69MGM/HBYqeIE+dw=";
+  src = fetchFromGitHub {
+    owner = "majorkingleo";
+    repo = "xstow";
+    rev = version;
+    fetchSubmodules = true;
+    hash = "sha256-c89+thw5N3Cgl1Ww+W7c3YsyhNJMLlreedvdWJFY3WY=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -23,11 +32,11 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     description = "A replacement of GNU Stow written in C++";
-    homepage = "https://xstow.sourceforge.net";
+    homepage = "https://github.com/majorkingleo/xstow";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ nzbr ];
+    broken = stdenv.isDarwin;
     platforms = platforms.unix;
   };
 }

From 2d79d99612071b24176aa9a7426b4e702f59602c Mon Sep 17 00:00:00 2001
From: nzbr <900Zebra@gmx.de>
Date: Fri, 8 Dec 2023 04:27:10 +0100
Subject: [PATCH 2/2] xstow: unmark as broken on darwin

---
 pkgs/tools/misc/xstow/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix
index e03d8af4d35b7..e40cffb516599 100644
--- a/pkgs/tools/misc/xstow/default.nix
+++ b/pkgs/tools/misc/xstow/default.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/majorkingleo/xstow";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ nzbr ];
-    broken = stdenv.isDarwin;
     platforms = platforms.unix;
   };
 }