JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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
commit 052379cd75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/gnuradio/gsm.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
description = "Gnuradio block for gsm";
homepage = https://github.com/ptrkrysik/gr-gsm;
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.linux;
maintainers = with maintainers; [ mog ];
};
}

2
pkgs/applications/misc/gnuradio/limesdr.nix
View File

@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
description = "Gnuradio source and sink blocks for LimeSDR";
homepage = https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio;
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.linux;
maintainers = [ maintainers.markuskowa ];
};
}

12
pkgs/applications/misc/libosmocore/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, pcsclite, talloc, python2
, pcsclite, talloc, python2, gnutls
}:
stdenv.mkDerivation rec {
name = "libosmocore-${version}";
version = "0.9.6";
version = "0.12.1";
src = fetchFromGitHub {
owner = "osmocom";
repo = "libosmocore";
rev = "3cc757df1822114bf446dc2d5f6a95da92321a25";
sha256 = "0dk7065qcy2kjra0p8q2124p73jcyvvzz3cmhid1kx5scyxmr017";
rev = version;
sha256 = "140c9jii0qs00s50kji1znc2339s22x8sz259x4pj35rrjzyyjgp";
};
propagatedBuildInputs = [
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
pcsclite python2
pcsclite python2 gnutls
];
enableParallelBuilding = true;
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "libosmocore";
homepage = https://github.com/osmocom/libosmocore;
license = licenses.gpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.linux;
maintainers = with maintainers; [ mog ];
};
}

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

@ -16906,7 +16906,8 @@ in
gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
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 { };