Unverified Commit 47072d10 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

Merge pull request #259629 from vifino/sigrok-nightly 

sigrok and friends: Update to nightly
parents d6531984 881fdbcc

pkgs/applications/science/electronics/pulseview/default.nix

+12 −24
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok

, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm

, pcre, python3, qtsvg, qttools, wrapQtAppsHook, desktopToDarwinBundle

{ lib, stdenv, fetchgit, pkg-config, cmake, glib, boost, libsigrok

, libsigrokdecode, libserialport, libzip, libftdi1, hidapi, glibmm

, pcre, python3, qtsvg, qttools, bluez

, wrapQtAppsHook, desktopToDarwinBundle

}:



stdenv.mkDerivation rec {

  pname = "pulseview";

  version = "0.4.2";

  version = "0.4.2-unstable-2024-01-26";



  src = fetchurl {

    url = "https://sigrok.org/download/source/pulseview/pulseview-${version}.tar.gz";

    hash = "sha256-8EL3ej4bNb8wZmMw427Dj6uNJIw2k8N7fjXUAcO/q8s=";

  src = fetchgit {

    url = "git://sigrok.org/pulseview";

    rev = "9b8b7342725491d626609017292fa9259f7d5e0e";

    hash = "sha256-UEJunADzc1WRRfchO/n8qqxnyrSo4id1p7gLkD3CKaM=";

  };



  nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]

    ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;



  buildInputs = [

    glib boost libsigrok libsigrokdecode libserialport libzip libusb1 libftdi1 glibmm

    glib boost libsigrok libsigrokdecode libserialport libzip libftdi1 hidapi glibmm

    pcre python3

    qtsvg

  ] ++ lib.optional stdenv.isLinux udev;



  patches = [

    # Allow building with glib 2.68

    # PR at https://github.com/sigrokproject/pulseview/pull/39

    (fetchpatch {

      url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch";

      hash = "sha256-0PlE/z4tbN1JFfAUBeZiXc3ENzwuhCaulIBRmXTULh4=";

    })

    # Fixes replaced/obsolete Qt methods

    (fetchpatch {

      url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch";

      hash = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8=";

    })

  ];

  ] ++ lib.optionals stdenv.isLinux [ bluez ];



  meta = with lib; {

    description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)";

    homepage = "https://sigrok.org/";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ bjornfor ];

    maintainers = with maintainers; [ bjornfor vifino ];

    platforms = platforms.unix;

  };

}

pkgs/by-name/sm/smuview/package.nix

0 → 100644
+58 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, pkg-config

, cmake

, glib

, boost

, libsigrok

, libserialport

, libzip

, libftdi1

, hidapi

, glibmm

, python3

, bluez

, pcre

, libsForQt5

, desktopToDarwinBundle

, qt5

}:



stdenv.mkDerivation rec {

  pname = "smuview";

  version = "0.0.5-unstable-2023-04-12";



  src = fetchFromGitHub {

    owner = "knarfS";

    repo = "smuview";

    rev = "a5ffb66287b725ebcdecc1eab04a4574c8585f66";

    hash = "sha256-WH8X75yk0aMivbBBOyODcM1eBWwa5UO/3nTaKV1LCGs=";

  };



  nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook ]

    ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;



  buildInputs = [

    glib

    boost

    libsigrok

    libserialport

    libzip

    libftdi1

    hidapi

    glibmm

    python3

    pcre

    libsForQt5.qwt

  ] ++ lib.optionals stdenv.isLinux [ bluez ];



  meta = with lib; {

    description = "A Qt based source measure unit GUI for sigrok";

    longDescription = "SmuView is a GUI for sigrok that supports power supplies, electronic loads and all sorts of measurement devices like multimeters, LCR meters and so on";

    homepage = "https://github.com/knarfS/smuview";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ vifino ];

    platforms = platforms.unix;

  };

}

pkgs/development/tools/libsigrok/default.nix

+9 −7
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, fetchgit

, autoreconfHook

, pkg-config

, libzip

, glib
@@ -19,16 +20,17 @@ 


stdenv.mkDerivation rec {

  pname = "libsigrok";

  version = "0.5.2";

  version = "0.5.2-unstable-2024-01-03";



  src = fetchurl {

    url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";

    sha256 = "0g6fl684bpqm5p2z4j12c62m45j1dircznjina63w392ns81yd2d";

  src = fetchgit {

    url = "git://sigrok.org/libsigrok";

    rev = "b503d24cdf56abf8c0d66d438ccac28969f01670";

    hash = "sha256-9EW0UCzU6MqBX6rkT5CrBsDkAi6/CLyS9MZHsDV+1IQ=";

  };



  enableParallelBuilding = true;



  nativeBuildInputs = [ doxygen pkg-config python ];

  nativeBuildInputs = [ autoreconfHook doxygen pkg-config python ];

  buildInputs = [

    libzip glib libusb1 libftdi1 check libserialport glibmm hidapi

  ] ++ lib.optionals stdenv.isLinux [ libieee1284 bluez ];
@@ -56,6 +58,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://sigrok.org/";

    license = licenses.gpl3Plus;

    platforms = platforms.linux ++ platforms.darwin;

    maintainers = with maintainers; [ bjornfor ];

    maintainers = with maintainers; [ bjornfor vifino ];

  };

}

pkgs/development/tools/libsigrokdecode/default.nix

+7 −11
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }:

{ lib, stdenv, fetchgit, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }:



stdenv.mkDerivation rec {

  pname = "libsigrokdecode";

  version = "0.5.3";

  version = "0.5.3-unstable-2023-10-23";



  src = fetchurl {

    url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";

    sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265";

  src = fetchgit {

    url = "git://sigrok.org/libsigrokdecode";

    rev = "0c35c5c5845d05e5f624c99d58af992d2f004446";

    hash = "sha256-1kQB7uk2c+6Uriw+1o6brThDcBLoCdPV0MVWAha7ohk=";

  };



  # upstream was rleased before Python 3.9 and thus only checks versions up to 3.8

  postPatch = ''

    substituteInPlace configure.ac --replace '[python-3.8-embed]' '[python3-embed]'

  '';



  nativeBuildInputs = [ pkg-config autoreconfHook ];

  buildInputs = [ glib python3 libxcrypt ];

  nativeCheckInputs = [ check ];
@@ -24,6 +20,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://sigrok.org/";

    license = licenses.gpl3Plus;

    platforms = platforms.linux ++ platforms.darwin;

    maintainers = [ maintainers.bjornfor ];

    maintainers = with maintainers; [ bjornfor vifino ];

  };

}

pkgs/development/tools/sigrok-cli/default.nix

+8 −7
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }:

{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, glib, libsigrok, libsigrokdecode }:



stdenv.mkDerivation rec {

  pname = "sigrok-cli";

  version = "0.7.2";

  version = "0.7.2-unstable-2023-04-10";



  src = fetchurl {

    url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";

    sha256 = "sha256-cdBEPzaJe/Vlcy3sIGgw2+oPJ4m2YBzxBTayhtEUCrg=";

  src = fetchgit {

    url = "git://sigrok.org/sigrok-cli";

    rev = "9d9f7b82008e3b3665bda12a63a3339e9f7aabc3";

    hash = "sha256-B2FJxRkfKELrtqxZDv5QTvntpu9zJnTK15CAUYbf+5M=";

  };



  nativeBuildInputs = [ pkg-config ];

  nativeBuildInputs = [ autoreconfHook pkg-config ];

  buildInputs = [ glib libsigrok libsigrokdecode ];



  meta = with lib; {
@@ -17,6 +18,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://sigrok.org/";

    license = licenses.gpl3Plus;

    platforms = platforms.linux ++ platforms.darwin;

    maintainers = [ maintainers.bjornfor ];

    maintainers = with maintainers; [ bjornfor vifino ];

  };

}