downonspot: unstable-2023-11-26 -> unstable-2024-04-30

2 files changed, 143 insertions, 0 deletions

diff --git a/pkgs/by-name/do/downonspot/Cargo.lock.patch b/pkgs/by-name/do/downonspot/Cargo.lock.patch
new file mode 100644
index 0000000000000..e224603a30708
--- /dev/null
+++ b/pkgs/by-name/do/downonspot/Cargo.lock.patch
@@ -0,0 +1,97 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index e6f1267..3bf16a5 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1632,7 +1632,8 @@ dependencies = [
+ [[package]]
+ name = "librespot"
+ version = "0.4.2"
+-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea4c9952ef48968f8184a4a87f8576982426ebe623342d5a28f7d9c4978e4a44"
+ dependencies = [
+  "base64 0.13.1",
+  "env_logger",
+@@ -1658,7 +1659,8 @@ dependencies = [
+ [[package]]
+ name = "librespot-audio"
+ version = "0.4.2"
+-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c176a31355e1ea8e0b9c4ced19df4947bfe4770661c25c142b6fba2365940d9d"
+ dependencies = [
+  "aes-ctr",
+  "byteorder",
+@@ -1673,7 +1675,8 @@ dependencies = [
+ [[package]]
+ name = "librespot-connect"
+ version = "0.4.2"
+-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4ffafb6a443e9445ccb3d5d591573b5b1da3c89a9b8846c63ba2c3710210d3ec"
+ dependencies = [
+  "form_urlencoded",
+  "futures-util",
+@@ -1693,7 +1696,8 @@ dependencies = [
+ [[package]]
+ name = "librespot-core"
+ version = "0.4.2"
+-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "046349f25888e644bf02d9c5de0164b2a493d29aa4ce18e1ad0b756da9b55d6d"
+ dependencies = [
+  "aes",
+  "base64 0.13.1",
+@@ -1733,7 +1737,8 @@ dependencies = [
+ [[package]]
+ name = "librespot-discovery"
+ version = "0.4.2"
+-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2aa877d18f6150364012cb4be5682d62d7c712c88bae2d0d01720fd7c15e2f06"
+ dependencies = [
+  "aes-ctr",
+  "base64 0.13.1",
+@@ -1754,7 +1759,8 @@ dependencies = [
+ [[package]]
+ name = "librespot-metadata"
+ version = "0.4.2"
+-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6b80361fcbcb5092056fd47c08c34d5d51b08385d8efb6941c0d3e46d032c21c"
+ dependencies = [
+  "async-trait",
+  "byteorder",
+@@ -1767,7 +1773,8 @@ dependencies = [
+ [[package]]
+ name = "librespot-playback"
+ version = "0.4.2"
+-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5190a0b9bcc7f70ee4196a6b4a1c731d405ca130d4a6fcd4c561cfdde8b7cfb7"
+ dependencies = [
+  "byteorder",
+  "cpal",
+@@ -1792,7 +1799,8 @@ dependencies = [
+ [[package]]
+ name = "librespot-protocol"
+ version = "0.4.2"
+-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5d6d3ac6196ac0ea67bbe039f56d6730a5d8b31502ef9bce0f504ed729dcb39f"
+ dependencies = [
+  "glob",
+  "protobuf 2.28.0",
+diff --git a/Cargo.toml b/Cargo.toml
+index 40ca2c1..734a3fb 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -29,7 +29,7 @@ reqwest = "0.11"
+ colored = "2"
+ lame = "0.1"
+ aspotify = "0.7.1"
+-librespot = { git = "ssh://git@github.com/oSumAtrIX/free-librespot.git" }
++librespot = "0.4.2"
+ async-std = { version = "1.12", features = ["attributes", "tokio1"] }
+ serde_json = "1.0"
+ async-stream = "0.3"
diff --git a/pkgs/by-name/do/downonspot/package.nix b/pkgs/by-name/do/downonspot/package.nix
new file mode 100644
index 0000000000000..f6e568d964389
--- /dev/null
+++ b/pkgs/by-name/do/downonspot/package.nix
@@ -0,0 +1,46 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, makeWrapper
+, alsa-lib
+, lame
+, openssl
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "downonspot";
+  version = "unstable-2024-04-30";
+
+  src = fetchFromGitHub {
+    owner = "oSumAtrIX";
+    repo = "DownOnSpot";
+    rev = "669dbb18e105129fff4886ba3710596d54a5f33a";
+    hash = "sha256-sUptn+tmQoI2i9WBpJU23MkdQ9h+Lmx590+2+0XXC7w=";
+  };
+
+  # Use official public librespot version
+  cargoPatches = [ ./Cargo.lock.patch ];
+
+  cargoHash = "sha256-GHhijwgTge7jzdkn0qynQIBNYeqtY26C5BaLpQ/UWgQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    openssl
+    alsa-lib
+    lame
+  ];
+
+  meta = with lib; {
+    description = "A Spotify downloader written in rust";
+    homepage = "https://github.com/oSumAtrIX/DownOnSpot";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ onny ];
+    mainProgram = "down_on_spot";
+  };
+}