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

Merge pull request #51742 from markuskowa/upd-osmocore

Browse Source 
libosmocore: 0.9.6 -> 0.12.1
This commit is contained in:
markuskowa
2018-12-14 16:20:49 +01:00
committed by GitHub
parent f2f805d6d8 09f9e5456b
commit 052379cd75
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/gnuradio/gsm.nix
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
description = "Gnuradio block for gsm"; description = "Gnuradio block for gsm";
homepage = https://github.com/ptrkrysik/gr-gsm; homepage = https://github.com/ptrkrysik/gr-gsm;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux;
maintainers = with maintainers; [ mog ]; maintainers = with maintainers; [ mog ];
}; };
} }
pkgs/applications/misc/gnuradio/limesdr.nix
+1 -1
View File
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
description = "Gnuradio source and sink blocks for LimeSDR"; description = "Gnuradio source and sink blocks for LimeSDR";
homepage = https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio; homepage = https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio;
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux;
maintainers = [ maintainers.markuskowa ]; maintainers = [ maintainers.markuskowa ];
}; };
} }
pkgs/applications/misc/libosmocore/default.nix
+6 -6
View File
@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, pcsclite, talloc, python2 , pcsclite, talloc, python2, gnutls
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libosmocore-${version}"; name = "libosmocore-${version}";
version = "0.9.6"; version = "0.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osmocom"; owner = "osmocom";
repo = "libosmocore"; repo = "libosmocore";
rev = "3cc757df1822114bf446dc2d5f6a95da92321a25"; rev = version;
sha256 = "0dk7065qcy2kjra0p8q2124p73jcyvvzz3cmhid1kx5scyxmr017"; sha256 = "140c9jii0qs00s50kji1znc2339s22x8sz259x4pj35rrjzyyjgp";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
pcsclite python2 pcsclite python2 gnutls
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "libosmocore"; description = "libosmocore";
homepage = https://github.com/osmocom/libosmocore; homepage = https://github.com/osmocom/libosmocore;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux;
maintainers = with maintainers; [ mog ]; maintainers = with maintainers; [ mog ];
}; };
} }
pkgs/top-level/all-packages.nix
+2 -1
View File
@@ -16906,7 +16906,8 @@ in
gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
inherit (python2Packages) python; inherit (python2Packages) python;
extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds gnuradio-limesdr ]; extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-ais gnuradio-rds ]
++ lib.optionals stdenv.isLinux [ gnuradio-gsm gnuradio-limesdr ];
}; };
gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { }; gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { };