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

sigrok: update whole suite to latest (2016-01)

Browse Source 
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).
This commit is contained in:
Bjørn Forsman
2016-05-11 22:23:29 +02:00
parent f768098e3e
commit 300e495101
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/electronics/pulseview/default.nix
+4 -4
View File
@@ -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; {