From f18347fd0705820d375426d985369eddb1b501b8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 26 Sep 2024 23:22:16 +0200
Subject: [PATCH 1/4] dablin: fix license

---
 pkgs/applications/radio/dablin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix
index 5ccce0a2dc36..3f0944c2de02 100644
--- a/pkgs/applications/radio/dablin/default.nix
+++ b/pkgs/applications/radio/dablin/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Play DAB/DAB+ from ETI-NI aligned stream";
     homepage = "https://github.com/Opendigitalradio/dablin";
-    license = with licenses; [ gpl3 lgpl21 ];
+    license = with licenses; [ gpl3Plus lgpl21Only ];
     platforms = platforms.linux;
     maintainers = [ maintainers.markuskowa ];
   };

From 3392b9135083da26f7ee7d9a3c4a59ac538aa629 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 26 Sep 2024 23:23:32 +0200
Subject: [PATCH 2/4] dablin: fix "with lib" in meta

---
 pkgs/applications/radio/dablin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix
index 3f0944c2de02..6afd108fea2c 100644
--- a/pkgs/applications/radio/dablin/default.nix
+++ b/pkgs/applications/radio/dablin/default.nix
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ];
 
-  meta = with lib; {
+  meta = {
     description = "Play DAB/DAB+ from ETI-NI aligned stream";
     homepage = "https://github.com/Opendigitalradio/dablin";
-    license = with licenses; [ gpl3Plus lgpl21Only ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.markuskowa ];
+    license = with lib.licenses; [ gpl3Plus lgpl21Only ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.markuskowa ];
   };
 }
 

From bd1ce053f2194b40ecf1815b762d879b61c02db6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 26 Sep 2024 23:29:01 +0200
Subject: [PATCH 3/4] dablin: apply nixfmt

---
 pkgs/applications/radio/dablin/default.nix | 34 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix
index 6afd108fea2c..a86a6d505721 100644
--- a/pkgs/applications/radio/dablin/default.nix
+++ b/pkgs/applications/radio/dablin/default.nix
@@ -1,6 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, mpg123, SDL2, gtkmm3, faad2, pcre
-} :
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  mpg123,
+  SDL2,
+  gtkmm3,
+  faad2,
+  pcre,
+}:
 
 stdenv.mkDerivation rec {
   pname = "dablin";
@@ -13,16 +22,27 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
 
-  buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ];
+  buildInputs = [
+    faad2
+    mpg123
+    SDL2
+    gtkmm3
+    pcre
+  ];
 
   meta = {
     description = "Play DAB/DAB+ from ETI-NI aligned stream";
     homepage = "https://github.com/Opendigitalradio/dablin";
-    license = with lib.licenses; [ gpl3Plus lgpl21Only ];
+    license = with lib.licenses; [
+      gpl3Plus
+      lgpl21Only
+    ];
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.markuskowa ];
   };
 }
-

From 735a134c88ff23f979c900cb0aa04579a705c4b0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 26 Sep 2024 23:31:41 +0200
Subject: [PATCH 4/4] dablin: move to pkgs/by-name

---
 .../radio/dablin/default.nix => by-name/da/dablin/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/radio/dablin/default.nix => by-name/da/dablin/package.nix} (100%)

diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/by-name/da/dablin/package.nix
similarity index 100%
rename from pkgs/applications/radio/dablin/default.nix
rename to pkgs/by-name/da/dablin/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36909331c849..8e26a8b4d97f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28947,8 +28947,6 @@ with pkgs;
 
   cyclone = callPackage ../applications/audio/pd-plugins/cyclone  { };
 
-  dablin = callPackage ../applications/radio/dablin { };
-
   daktilo = callPackage ../tools/misc/daktilo { };
 
   darcs = haskell.lib.compose.disableCabalFlag "library"