From 613cfb8beefaa7c0f709476159febb4edbc76c78 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 20 Dec 2024 22:30:49 +0100 Subject: [PATCH] libosmo-sigtran: init at 2.0.1 libosmo-sigtran replaced libosomo-sccp --- .../{libosmo-sccp => libosmo-sigtran}/package.nix | 14 +++++++------- pkgs/by-name/os/osmo-bsc/package.nix | 4 ++-- pkgs/by-name/os/osmo-hnbgw/package.nix | 4 ++-- pkgs/by-name/os/osmo-hnodeb/package.nix | 4 ++-- pkgs/by-name/os/osmo-iuh/package.nix | 4 ++-- pkgs/by-name/os/osmo-msc/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + 7 files changed, 18 insertions(+), 17 deletions(-) rename pkgs/by-name/li/{libosmo-sccp => libosmo-sigtran}/package.nix (76%) diff --git a/pkgs/by-name/li/libosmo-sccp/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix similarity index 76% rename from pkgs/by-name/li/libosmo-sccp/package.nix rename to pkgs/by-name/li/libosmo-sigtran/package.nix index 1d11203f6652..491ba6344c1b 100644 --- a/pkgs/by-name/li/libosmo-sccp/package.nix +++ b/pkgs/by-name/li/libosmo-sigtran/package.nix @@ -2,7 +2,7 @@ lib, stdenv, autoreconfHook, - fetchFromGitHub, + fetchgit, lksctp-tools, pkg-config, libosmocore, @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - pname = "libosmo-sccp"; - version = "1.9.0"; + pname = "libosmo-sigtran"; + version = "2.0.1"; - src = fetchFromGitHub { - owner = "osmocom"; - repo = "libosmo-sccp"; + # fetchFromGitea hangs + src = fetchgit { + url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git"; rev = version; - hash = "sha256-XEpkLLOjq28ipAbAyR1uBpo3i77xRZyD9NJ35HlRWXU="; + hash = "sha256-tNSe5FFietdjl80hhQntsdgG90CP7z7RWyTpGhsApt0="; }; configureFlags = [ "--with-systemdsystemunitdir=$out" ]; diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix index 6c6328fe44eb..108753250f11 100644 --- a/pkgs/by-name/os/osmo-bsc/package.nix +++ b/pkgs/by-name/os/osmo-bsc/package.nix @@ -7,7 +7,7 @@ libosmocore, libosmoabis, libosmo-netif, - libosmo-sccp, + libosmo-sigtran, osmo-mgw, }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libosmocore libosmoabis libosmo-netif - libosmo-sccp + libosmo-sigtran osmo-mgw ]; diff --git a/pkgs/by-name/os/osmo-hnbgw/package.nix b/pkgs/by-name/os/osmo-hnbgw/package.nix index 63640d549506..2713c05d0a06 100644 --- a/pkgs/by-name/os/osmo-hnbgw/package.nix +++ b/pkgs/by-name/os/osmo-hnbgw/package.nix @@ -8,7 +8,7 @@ lksctp-tools, libosmo-netif, libasn1c, - libosmo-sccp, + libosmo-sigtran, osmo-iuh, osmo-mgw, }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { lksctp-tools libosmo-netif libasn1c - libosmo-sccp + libosmo-sigtran osmo-iuh osmo-mgw ]; diff --git a/pkgs/by-name/os/osmo-hnodeb/package.nix b/pkgs/by-name/os/osmo-hnodeb/package.nix index 035cd37c2482..751077fb85b4 100644 --- a/pkgs/by-name/os/osmo-hnodeb/package.nix +++ b/pkgs/by-name/os/osmo-hnodeb/package.nix @@ -9,7 +9,7 @@ libasn1c, libosmoabis, libosmo-netif, - libosmo-sccp, + libosmo-sigtran, osmo-iuh, }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libasn1c libosmoabis libosmo-netif - libosmo-sccp + libosmo-sigtran osmo-iuh ]; diff --git a/pkgs/by-name/os/osmo-iuh/package.nix b/pkgs/by-name/os/osmo-iuh/package.nix index 8b23f5c20b21..367d294feb09 100644 --- a/pkgs/by-name/os/osmo-iuh/package.nix +++ b/pkgs/by-name/os/osmo-iuh/package.nix @@ -7,7 +7,7 @@ libosmocore, lksctp-tools, libosmo-netif, - libosmo-sccp, + libosmo-sigtran, libasn1c, python3, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libosmocore lksctp-tools libosmo-netif - libosmo-sccp + libosmo-sigtran libasn1c ]; diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix index ab396cfae304..2444f1e5f462 100644 --- a/pkgs/by-name/os/osmo-msc/package.nix +++ b/pkgs/by-name/os/osmo-msc/package.nix @@ -8,7 +8,7 @@ sqlite, libosmoabis, libosmo-netif, - libosmo-sccp, + libosmo-sigtran, osmo-mgw, osmo-hlr, lksctp-tools, @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sqlite libosmoabis libosmo-netif - libosmo-sccp + libosmo-sigtran osmo-mgw osmo-hlr lksctp-tools diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6107678de675..5a57a02449b2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -651,6 +651,7 @@ mapAliases { liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 + libosmo-sccp = libosmo-sigtran; # Added 2024-12-20 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11