colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #232041 from Lassulus/osmo-fix

Browse Source 
Fix attribute 'libosmo-netif' already defined
This commit is contained in:
ajs124 2023-05-15 15:18:47 +02:00 committed by GitHub
commit 28d073e73c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/development/libraries/libosmo-abis/default.nix
View File

@ -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;
};
}

37
pkgs/development/libraries/libosmo-netif/default.nix
View File

@ -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;
};
}

38
pkgs/development/libraries/libosmo-sccp/default.nix
View File

@ -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;
};
}

5
pkgs/servers/osmocom/libosmo-netif/default.nix
View File

@ -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
];
};
}

5
pkgs/servers/osmocom/libosmo-sccp/default.nix
View File

@ -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
];
};
}

5
pkgs/servers/osmocom/libosmoabis/default.nix
View File

@ -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
];
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };