Unverified Commit 1f546bd2 authored by Pascal Bach's avatar Pascal Bach Committed by GitHub
Browse files

Merge pull request #247575 from lorenz/dsview-1-3-0 

dsview: 1.2.2 -> 1.3.0
parents 75f9a5ec c317e99e

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

+7 −7
Original line number Diff line number Diff line 
{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake

, libzip, boost, fftw, qtbase, libusb1

{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook

, libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1

, python3, fetchpatch

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "dsview";



  version = "1.2.2";

  version = "1.3.0";



  src = fetchFromGitHub {

      owner = "DreamSourceLab";

      repo = "DSView";

      rev = "v${version}";

      sha256 = "sha256-QaCVu/n9PDbAiJgPDVN6SJMILeUO/KRkKcHYAstm86Q=";

      sha256 = "sha256-wnBVhZ3Ky9PXs48OVvSbD1aAUSEqAwaNLg7Ntim7yFM=";

  };



  patches = [
@@ -20,10 +20,10 @@ mkDerivation rec { 
    ./install.patch

  ];



  nativeBuildInputs = [ cmake pkg-config ];

  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];



  buildInputs = [

    boost fftw qtbase libusb1 libzip

    boost fftw qtbase qtwayland qtsvg libusb1 libzip

    python3

  ];

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -7442,7 +7442,7 @@ with pkgs; 














  dropbear = callPackage ../tools/networking/dropbear { };



























  dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };













  dsview = qt6Packages.callPackage ../applications/science/electronics/dsview { };





























  dtach = callPackage ../tools/misc/dtach { };