summary refs log tree commit diff
path: root/pkgs/applications/science/electronics/pulseview
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/applications/science/electronics/pulseview
parentf768098e3eabf85ab014991d067378b5ac65b14d (diff)
downloadnixpkgs-300e495101245ac3b711415aa8fbb278573cd278.tar
nixpkgs-300e495101245ac3b711415aa8fbb278573cd278.tar.gz
nixpkgs-300e495101245ac3b711415aa8fbb278573cd278.tar.bz2
nixpkgs-300e495101245ac3b711415aa8fbb278573cd278.tar.lz
nixpkgs-300e495101245ac3b711415aa8fbb278573cd278.tar.xz
nixpkgs-300e495101245ac3b711415aa8fbb278573cd278.tar.zst
nixpkgs-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/applications/science/electronics/pulseview')
-rw-r--r--pkgs/applications/science/electronics/pulseview/default.nix8
1 files changed, 4 insertions, 4 deletions
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; {