diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-05-11 21:21:35 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-05-11 22:23:29 +0200 |
commit | 300e495101245ac3b711415aa8fbb278573cd278 (patch) | |
tree | d323b005b3df629dee56a78f378a505a43587e96 /pkgs/development/tools/libsigrok | |
parent | f768098e3eabf85ab014991d067378b5ac65b14d (diff) |
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).
Diffstat (limited to 'pkgs/development/tools/libsigrok')
-rw-r--r-- | pkgs/development/tools/libsigrok/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 5be4f4a27ab40..7671bf18063be 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi, check -, libserialport, librevisa +, libserialport, librevisa, doxygen, glibmm, python +, version ? "0.4.0", sha256 ? "17k63p3yhpx9qbfprgayphqqhn2hdrcph73g6fqxmrinxqziyaaz" }: stdenv.mkDerivation rec { - name = "libsigrok-0.3.0"; + inherit version; + name = "libsigrok-${version}"; src = fetchurl { url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz"; - sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; + inherit sha256; }; firmware = fetchurl { - url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz"; - sha256 = "0w0w6l015d16181mx8mgyjha4bv3ba7x36p86k9n1x52809433gj"; + url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz"; + sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl"; }; buildInputs = [ pkgconfig libzip glib libusb1 libftdi check libserialport - librevisa + librevisa doxygen glibmm python ]; postInstall = '' |