From 39acb107ecc319861ef0753bac9356bd0cdb1987 Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@proton.me>
Date: Sun, 28 Apr 2024 00:05:08 +0200
Subject: [PATCH 1/3] maintainers: add jacekpoz

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 12ea34f0fcb3..ab9b6ab6b009 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7625,6 +7625,13 @@
     github = "jacbart";
     githubId = 7909687;
   };
+  jacekpoz = {
+    name = "Jacek Poziemski";
+    email = "jacekpoz@proton.me";
+    matrix = "@jacekpoz:jacekpoz.pl";
+    github = "jacekpoz";
+    githubId = 64381190;
+  };
   jacfal = {
     name = "Jakub Pravda";
     email = "me@jakubpravda.net";

From c9eaf04a688ee66d7da3c02235a5c0b6dab365fc Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@proton.me>
Date: Sun, 28 Apr 2024 00:05:17 +0200
Subject: [PATCH 2/3] libbass: 2.4.15 -> 2.4.17

---
 .../libraries/audio/libbass/default.nix       | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index a8648a1a1c7b..fdbf34d7356f 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -2,31 +2,35 @@
 
 # Upstream changes files in-place, to update:
 # 1. Check latest version at http://www.un4seen.com/
-# 2. Update `version`s and `sha256` sums.
+# 2. Update `version`s and `hash` sums.
 # See also http://www.un4seen.com/forum/?topic=18614.0
 
 let
   allBass = {
     bass = {
       h = "bass.h";
-      version = "2.4.15";
+      version = "2.4.17";
       so = {
-        i686_linux = "libbass.so";
-        x86_64-linux = "x64/libbass.so";
+        i686_linux = "libs/x86/libbass.so";
+        x86_64-linux = "libs/x86_64/libbass.so";
+        armv7l-linux = "libs/armhf/libbass.so";
+        aarch64-linux = "libs/aarch64/libbass.so";
       };
       urlpath = "bass24-linux.zip";
-      sha256 = "1lmysxfhy727zskavml3ibg5w876ir88923bm17c21s59w5lh7l8";
+      hash = "sha256-/JAlvtZtnzuzZjWy3n1WT8Q5ZVLO0BJJAJT7/dELS3o=";
     };
 
     bass_fx = {
       h = "C/bass_fx.h";
       version = "2.4.12.1";
       so = {
-        i686_linux = "libbass_fx.so";
-        x86_64-linux = "x64/libbass_fx.so";
+        i686_linux = "libs/x86/libbass_fx.so";
+        x86_64-linux = "libs/x86_64/libbass_fx.so";
+        armv7l-linux = "libs/armhf/libbass_fx.so";
+        aarch64-linux = "libs/aarch64/libbass_fx.so";
       };
       urlpath = "z/0/bass_fx24-linux.zip";
-      sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin";
+      hash = "sha256-Hul2ELwnaDV8TDRMDXoFisle31GATDkf3PdkR2K9QTs=";
     };
   };
 
@@ -36,7 +40,7 @@ let
 
     src = fetchurl {
       url = "https://www.un4seen.com/files/${bass.urlpath}";
-      inherit (bass) sha256;
+      inherit (bass) hash;
     };
     unpackCmd = ''
       mkdir out
@@ -60,6 +64,7 @@ let
       homepage = "https://www.un4seen.com/";
       license = licenses.unfreeRedistributable;
       platforms = builtins.attrNames bass.so;
+      maintainers = with maintainers; [ jacekpoz ];
       # until upstream has stable URLs, this package is prone to always being broken
       broken = true;
     };

From 737088460225520b75eaace429daec1688184a5f Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@proton.me>
Date: Thu, 26 Sep 2024 20:48:01 +0200
Subject: [PATCH 3/3] libbass: use Internet Archive to avoid URL breakage

---
 pkgs/development/libraries/audio/libbass/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index fdbf34d7356f..21febc10467c 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -5,6 +5,8 @@
 # 2. Update `version`s and `hash` sums.
 # See also http://www.un4seen.com/forum/?topic=18614.0
 
+# Internet Archive used due to upstream URLs being unstable
+
 let
   allBass = {
     bass = {
@@ -16,7 +18,7 @@ let
         armv7l-linux = "libs/armhf/libbass.so";
         aarch64-linux = "libs/aarch64/libbass.so";
       };
-      urlpath = "bass24-linux.zip";
+      url = "https://web.archive.org/web/20240501180538/http://www.un4seen.com/files/bass24-linux.zip";
       hash = "sha256-/JAlvtZtnzuzZjWy3n1WT8Q5ZVLO0BJJAJT7/dELS3o=";
     };
 
@@ -29,7 +31,7 @@ let
         armv7l-linux = "libs/armhf/libbass_fx.so";
         aarch64-linux = "libs/aarch64/libbass_fx.so";
       };
-      urlpath = "z/0/bass_fx24-linux.zip";
+      url = "https://web.archive.org/web/20240926184106/https://www.un4seen.com/files/z/0/bass_fx24-linux.zip";
       hash = "sha256-Hul2ELwnaDV8TDRMDXoFisle31GATDkf3PdkR2K9QTs=";
     };
   };
@@ -39,9 +41,9 @@ let
     inherit (bass) version;
 
     src = fetchurl {
-      url = "https://www.un4seen.com/files/${bass.urlpath}";
-      inherit (bass) hash;
+      inherit (bass) hash url;
     };
+
     unpackCmd = ''
       mkdir out
       ${unzip}/bin/unzip $curSrc -d out
@@ -65,8 +67,6 @@ let
       license = licenses.unfreeRedistributable;
       platforms = builtins.attrNames bass.so;
       maintainers = with maintainers; [ jacekpoz ];
-      # until upstream has stable URLs, this package is prone to always being broken
-      broken = true;
     };
   };