about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2016-05-11 21:21:35 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-05-11 22:23:29 +0200
commit300e495101245ac3b711415aa8fbb278573cd278 (patch)
treed323b005b3df629dee56a78f378a505a43587e96 /pkgs/top-level
parentf768098e3eabf85ab014991d067378b5ac65b14d (diff)
downloadnixlib-300e495101245ac3b711415aa8fbb278573cd278.tar
nixlib-300e495101245ac3b711415aa8fbb278573cd278.tar.gz
nixlib-300e495101245ac3b711415aa8fbb278573cd278.tar.bz2
nixlib-300e495101245ac3b711415aa8fbb278573cd278.tar.lz
nixlib-300e495101245ac3b711415aa8fbb278573cd278.tar.xz
nixlib-300e495101245ac3b711415aa8fbb278573cd278.tar.zst
nixlib-300e495101245ac3b711415aa8fbb278573cd278.zip
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/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19b389a633fc..8de856096bd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1052,6 +1052,7 @@ in
   collectd = callPackage ../tools/system/collectd {
     rabbitmq-c = rabbitmq-c_0_4;
     libmysql = mysql.lib;
+    libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet
   };
 
   colormake = callPackage ../development/tools/build-managers/colormake { };
@@ -5999,6 +6000,11 @@ in
   libcxxabi = llvmPackages.libcxxabi;
 
   libsigrok = callPackage ../development/tools/libsigrok { };
+  # old version:
+  libsigrok-0-3-0 = libsigrok.override {
+    version = "0.3.0";
+    sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
+  };
 
   libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };