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

dsview: 1.2.2 -> 1.3.0

authored by

Pascal Bach and committed by
GitHub
1f546bd2 75f9a5ec

+8 -8
+7 -7
pkgs/applications/science/electronics/dsview/default.nix
··· 1 - { lib, mkDerivation, fetchFromGitHub, pkg-config, cmake 2 - , libzip, boost, fftw, qtbase, libusb1 1 + { stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook 2 + , libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1 3 3 , python3, fetchpatch 4 4 }: 5 5 6 - mkDerivation rec { 6 + stdenv.mkDerivation rec { 7 7 pname = "dsview"; 8 8 9 - version = "1.2.2"; 9 + version = "1.3.0"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "DreamSourceLab"; 13 13 repo = "DSView"; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-QaCVu/n9PDbAiJgPDVN6SJMILeUO/KRkKcHYAstm86Q="; 15 + sha256 = "sha256-wnBVhZ3Ky9PXs48OVvSbD1aAUSEqAwaNLg7Ntim7yFM="; 16 16 }; 17 17 18 18 patches = [ ··· 20 20 ./install.patch 21 21 ]; 22 22 23 - nativeBuildInputs = [ cmake pkg-config ]; 23 + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; 24 24 25 25 buildInputs = [ 26 - boost fftw qtbase libusb1 libzip 26 + boost fftw qtbase qtwayland qtsvg libusb1 libzip 27 27 python3 28 28 ]; 29 29
+1 -1
pkgs/top-level/all-packages.nix
··· 7442 7442 7443 7443 dropbear = callPackage ../tools/networking/dropbear { }; 7444 7444 7445 - dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; 7445 + dsview = qt6Packages.callPackage ../applications/science/electronics/dsview { }; 7446 7446 7447 7447 dtach = callPackage ../tools/misc/dtach { }; 7448 7448