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

Merge pull request #74771 from danieldk/dump1090-3.7.2

Browse Source 
dump1090: 2014-10-31 -> 3.7.1
This commit is contained in:
markuskowa 2019-12-02 16:37:04 +01:00 committed by GitHub
commit 0804fd6a5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -206,6 +206,14 @@
<option>hardware.bluetooth.enable</option>. <option>hardware.bluetooth.enable</option>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <literal>dump1090</literal> derivation has been changed to use FlightAware's dump1090
as its upstream. However, this version does not have an internal webserver anymore. The
assets in the <literal>share/dump1090</literal> directory of the derivation can be used
in conjunction with an external webserver to replace this functionality.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

30
pkgs/applications/radio/dump1090/default.nix
View File

@ -1,21 +1,31 @@
{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }: { stdenv
, fetchFromGitHub
, pkgconfig
, libbladeRF
, libusb
, ncurses
, rtl-sdr
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dump1090"; pname = "dump1090";
version = "2014-10-31"; version = "3.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MalcolmRobb"; owner = "flightaware";
repo = pname; repo = pname;
rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe"; rev = "v${version}";
sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy"; sha256 = "0vlv9bd805kid202xxkrnl51rh02cyrl055gbcqlqgk51j5rrq8w";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libusb rtl-sdr ]; buildInputs = [
libbladeRF
makeFlags = [ "PREFIX=$(out)" ]; libusb
ncurses
rtl-sdr
];
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share mkdir -p $out/bin $out/share
@ -25,8 +35,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple Mode S decoder for RTLSDR devices"; description = "A simple Mode S decoder for RTLSDR devices";
homepage = https://github.com/MalcolmRobb/dump1090; homepage = "https://github.com/flightaware/dump1090";
license = licenses.bsd3; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ earldouglas ]; maintainers = with maintainers; [ earldouglas ];
}; };