From 300e495101245ac3b711415aa8fbb278573cd278 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Wed, 11 May 2016 21:21:35 +0200 Subject: sigrok: update whole suite to latest (2016-01) Release announcement, 2016-01-30: https://www.sigrok.org/blog/major-sigrok-releases-libsigrok-libsigrokdecode-sigrok-cli-pulseview I first tried updating the projects in separate commits. But later I found cyclic dependencies, that would break git bisect, so I ended up squashing the commits: * libsigrok: 0.3.0 -> 0.4.0 Enable building libsigrokcxx.so, the C++ bindings for libsigrok, by adding doxygen, glibmm and python as build deps. This is needed for Pulseview >= 0.3.0. Also update the firmware (sigrok-firmware-fx2lafw) while at it. * libsigrokdecode: 0.3.0 -> 0.4.0 * sigrok-cli: 0.5.0 -> 0.6.0 * pulseview: 0.2.0 -> 0.3.0 New dependency: glibmm (due to libsigrokcxx.pc from libsigrok). Note that collectd is incompatible with the new libsigrok release, so I let it use the old one (0.3.0). --- pkgs/applications/science/electronics/pulseview/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/science/electronics/pulseview') diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 07724d93254..595ad9eeb0a 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, cmake, glib, qt4, boost, libsigrok -, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi +, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi, glibmm }: stdenv.mkDerivation rec { - name = "pulseview-0.2.0"; + name = "pulseview-0.3.0"; src = fetchurl { url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz"; - sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy"; + sha256 = "03jk5xpsird5ssbnwkxw57jnqvnnpivhqh1xjdhdrz02lsvjrzjz"; }; buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok - libsigrokdecode libserialport libzip udev libusb1 libftdi + libsigrokdecode libserialport libzip udev libusb1 libftdi glibmm ]; meta = with stdenv.lib; { -- cgit 1.4.1