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 | |
parent | f768098e3eabf85ab014991d067378b5ac65b14d (diff) | |
download | nixlib-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).
-rw-r--r-- | pkgs/applications/science/electronics/pulseview/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/libsigrok/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/tools/libsigrokdecode/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/sigrok-cli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
5 files changed, 22 insertions, 14 deletions
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 07724d932541..595ad9eeb0a0 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; { diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 5be4f4a27ab4..7671bf18063b 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 = '' diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 87ecd637b4e2..706b9bde3273 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index b2e6dea09e67..7ea394039b9f 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -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 ]; 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 { }; |