From 26e68112909a3bb6fca067122e81b3c4fe1c167c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Mon, 15 May 2023 15:02:27 +0200
Subject: [PATCH 1/2] Revert "Merge pull request #229369 from
 markuskowa/add-libsomo-s"

This reverts commit caa013bd886f00717b8be6417ba221f6202ccbac, reversing
changes made to 42aaea3606d15132f158ea5058d1d3d9841a7773.
---
 .../libraries/libosmo-abis/default.nix        | 39 -------------------
 .../libraries/libosmo-netif/default.nix       | 37 ------------------
 .../libraries/libosmo-sccp/default.nix        | 38 ------------------
 pkgs/top-level/all-packages.nix               |  6 ---
 4 files changed, 120 deletions(-)
 delete mode 100644 pkgs/development/libraries/libosmo-abis/default.nix
 delete mode 100644 pkgs/development/libraries/libosmo-netif/default.nix
 delete mode 100644 pkgs/development/libraries/libosmo-sccp/default.nix

diff --git a/pkgs/development/libraries/libosmo-abis/default.nix b/pkgs/development/libraries/libosmo-abis/default.nix
deleted file mode 100644
index ee8b3c926614..000000000000
--- a/pkgs/development/libraries/libosmo-abis/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
-, libosmocore, ortp, bctoolbox
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libosmo-abis";
-  version = "1.4.0";
-
-  src = fetchgit {
-    url = "https://gitea.osmocom.org/osmocom/libosmo-abis";
-    rev = version;
-    sha256 = "sha256-RKJis0Ur3Y0LximNQl+hm6GENg8t2E1S++2c+63D2pQ=";
-  };
-
-  postPatch = ''
-    echo "${version}" > .tarball-version
-  '';
-
-  configureFlags = [ "--disable-dahdi" ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    libosmocore
-    ortp
-    bctoolbox
-  ];
-
-  meta = with lib; {
-    description = "GSM A-bis interface library";
-    homepage = "https://osmocom.org/projects/libosmo-abis";
-    maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
-    license = licenses.agpl3Only;
-  };
-}
diff --git a/pkgs/development/libraries/libosmo-netif/default.nix b/pkgs/development/libraries/libosmo-netif/default.nix
deleted file mode 100644
index 8b1fd40d8dad..000000000000
--- a/pkgs/development/libraries/libosmo-netif/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
-, libosmocore, lksctp-tools
-}:
-
-
-stdenv.mkDerivation rec {
-  pname = "libosmo-netif";
-  version = "1.3.0";
-
-  src = fetchgit {
-    url = "https://gitea.osmocom.org/osmocom/libosmo-netif";
-    rev = version;
-    sha256 = "sha256-PhGi/6JVO8tXxzfGwEKUB/GdrgCJkqROo26TPU+O9Sg=";
-  };
-
-  postPatch = ''
-    echo "${version}" > .tarball-version
-  '';
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    libosmocore
-    lksctp-tools
-  ];
-
-  meta = with lib; {
-    description = "Higher-layer GSM cellular communications protocol implementation";
-    homepage = "https://gitea.osmocom.org/osmocom/libosmo-netif";
-    maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
-    license = licenses.agpl3Only;
-  };
-}
diff --git a/pkgs/development/libraries/libosmo-sccp/default.nix b/pkgs/development/libraries/libosmo-sccp/default.nix
deleted file mode 100644
index 0c3878101066..000000000000
--- a/pkgs/development/libraries/libosmo-sccp/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
-, libosmocore, libosmo-netif, lksctp-tools
-}:
-
-
-stdenv.mkDerivation rec {
-  pname = "libosmo-sccp";
-  version = "1.7.0";
-
-  src = fetchgit {
-    url = "https://gitea.osmocom.org/osmocom/libosmo-sccp";
-    rev = version;
-    sha256 = "sha256-ScJZke9iNmFc9XXqtRjb24ZzKfa5EYws5PDNhcZFb7U=";
-  };
-
-  postPatch = ''
-    echo "${version}" > .tarball-version
-  '';
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    libosmocore
-    libosmo-netif
-    lksctp-tools
-  ];
-
-  meta = with lib; {
-    description = "Implementation of telecom signaling protocols and OsmoSTP";
-    homepage = "https://osmocom.org/projects/osmo-stp/wiki";
-    maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
-    license = licenses.agpl3Only;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70d90c1358d5..f274ef641b31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22236,12 +22236,6 @@ with pkgs;
 
   libosmo-sccp = callPackage ../servers/osmocom/libosmo-sccp { };
 
-  libosmo-abis = callPackage ../development/libraries/libosmo-abis { };
-
-  libosmo-netif = callPackage ../development/libraries/libosmo-netif { };
-
-  libosmo-sccp = callPackage ../development/libraries/libosmo-sccp { };
-
   libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
 
   libotr = callPackage ../development/libraries/libotr { };

From 292ac0da99fc47a38f4ed27f50d2364aea023ff1 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Mon, 15 May 2023 15:07:20 +0200
Subject: [PATCH 2/2] libosmoabis, libosmo-{netif,sccp}: add markuskowa to
 maintainers

---
 pkgs/servers/osmocom/libosmo-netif/default.nix | 5 ++++-
 pkgs/servers/osmocom/libosmo-sccp/default.nix  | 5 ++++-
 pkgs/servers/osmocom/libosmoabis/default.nix   | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/osmocom/libosmo-netif/default.nix b/pkgs/servers/osmocom/libosmo-netif/default.nix
index eed212836a36..746e353fe7d2 100644
--- a/pkgs/servers/osmocom/libosmo-netif/default.nix
+++ b/pkgs/servers/osmocom/libosmo-netif/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
     homepage = "https://osmocom.org/projects/libosmo-netif/wiki";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ janik ];
+    maintainers = with maintainers; [
+      janik
+      markuskowa
+    ];
   };
 }
diff --git a/pkgs/servers/osmocom/libosmo-sccp/default.nix b/pkgs/servers/osmocom/libosmo-sccp/default.nix
index 80edf0f368f0..64dded983e7c 100644
--- a/pkgs/servers/osmocom/libosmo-sccp/default.nix
+++ b/pkgs/servers/osmocom/libosmo-sccp/default.nix
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
     homepage = "https://osmocom.org/projects/libosmo-sccp";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ janik ];
+    maintainers = with maintainers; [
+      janik
+      markuskowa
+    ];
   };
 }
diff --git a/pkgs/servers/osmocom/libosmoabis/default.nix b/pkgs/servers/osmocom/libosmoabis/default.nix
index 1f55017d1892..dc3d3b3955e5 100644
--- a/pkgs/servers/osmocom/libosmoabis/default.nix
+++ b/pkgs/servers/osmocom/libosmoabis/default.nix
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/osmocom/libosmo-abis";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ janik ];
+    maintainers = with maintainers; [
+      janik
+      markuskowa
+    ];
   };
 }