dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 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 21:21:35 +02:00
parent f768098e3e
commit 300e495101
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/electronics/pulseview/default.nix
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; {

14
pkgs/development/tools/libsigrok/default.nix
View File

@ -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 = ''

4
pkgs/development/tools/libsigrokdecode/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:
stdenv.mkDerivation rec {
name = "libsigrokdecode-0.3.0";
name = "libsigrokdecode-0.4.0";
src = fetchurl {
url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
sha256 = "13s7ss52dqj7fccjgrkx10zkj41ygxn8ml1l0bs1vgczz4fvnkpf";
sha256 = "0drmxjc2xavccjl2i6vcjipijrn7459nv8cpmm788pi4fcdrszpx";
};
buildInputs = [ pkgconfig glib python3 libsigrok check ];

4
pkgs/development/tools/sigrok-cli/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }:
stdenv.mkDerivation rec {
name = "sigrok-cli-0.5.0";
name = "sigrok-cli-0.6.0";
src = fetchurl {
url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
sha256 = "0g3jzspq9iwz2szzxil9ilim1and85qd605f4jbc04sva80hb8vk";
sha256 = "0g3jhi7azm256gnryka70wn7j3af42yk19c9kbhqffaz4i7dwbmb";
};
buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ];

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };