From c35b5503f4da5ceeb12ba4370703e18575229f22 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Wed, 9 Nov 2022 04:00:17 +0100 Subject: [PATCH] dsview: 1.1.2 -> 1.2.1 --- .../science/electronics/dsview/default.nix | 28 ++++------------- .../science/electronics/dsview/install.patch | 30 ++++++++++++------- .../electronics/dsview/libsigrok4dsl.nix | 28 ----------------- .../dsview/libsigrokdecode4dsl.nix | 27 ----------------- .../science/electronics/dsview/qt515.patch | 13 -------- pkgs/top-level/all-packages.nix | 4 --- 6 files changed, 24 insertions(+), 106 deletions(-) delete mode 100644 pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix delete mode 100644 pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix delete mode 100644 pkgs/applications/science/electronics/dsview/qt515.patch diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index eb8246a584d3..c8d5fc5dde74 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,47 +1,29 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config, cmake -, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl -, libsigrokdecode4dsl, python3, fetchpatch +, libzip, boost, fftw, qtbase, libusb1 +, python3, fetchpatch }: mkDerivation rec { pname = "dsview"; - version = "1.12"; + version = "1.2.1"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; rev = "v${version}"; - sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U="; + sha256 = "sha256-TE2yfzv2h77GLMkmoVGXmzs7J0l/N+n1eYxyrtnrnGU="; }; - sourceRoot = "source/DSView"; - patches = [ # Fix absolute install paths ./install.patch - - # Fix buld with Qt5.15 already merged upstream for future release - # Using local file instead of content of commit #33e3d896a47 because - # sourceRoot make it unappliable - ./qt515.patch - - # Change from upstream master that removes extern-C scopes which - # cause failures with modern glib. This can likely be removed if - # there is an upstream release >1.12 - (fetchpatch { - name = "fix-extern-c.patch"; - url = "https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch"; - sha256 = "sha256-TLfLQa3sdyNHTpMMvId/V6uUuOFihOZMFJOj9frnDoY="; - stripLen = 2; - extraPrefix = ""; - }) ]; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + boost fftw qtbase libusb1 libzip python3 ]; diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/applications/science/electronics/dsview/install.patch index 75c3e9628656..9fd9133e2795 100644 --- a/pkgs/applications/science/electronics/dsview/install.patch +++ b/pkgs/applications/science/electronics/dsview/install.patch @@ -1,15 +1,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1c33e1..208a184 100644 +index eb9be42..220817c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -427,8 +427,8 @@ - install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) - install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) - install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) --install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) --install(FILES DSView.desktop DESTINATION /usr/share/applications/) -+install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/) -+install(FILES DSView.desktop DESTINATION share/applications/) +@@ -662,16 +662,8 @@ install(FILES DSView/icons/logo.svg DESTINATION share/icons/hicolor/scalable/app + install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) - #=============================================================================== - #= Packaging (handled by CPack) + if(CMAKE_SYSTEM_NAME MATCHES "Linux") +- install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) +- +- if(IS_DIRECTORY /usr/lib/udev/rules.d) +- install(FILES DSView/DreamSourceLab.rules DESTINATION /usr/lib/udev/rules.d RENAME 60-dreamsourcelab.rules) +- elseif(IS_DIRECTORY /lib/udev/rules.d) +- install(FILES DSView/DreamSourceLab.rules DESTINATION /lib/udev/rules.d RENAME 60-dreamsourcelab.rules) +- elseif(IS_DIRECTORY /etc/udev/rules.d) +- install(FILES DSView/DreamSourceLab.rules DESTINATION /etc/udev/rules.d RENAME 60-dreamsourcelab.rules) +- endif() +- ++ install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop) ++ install(FILES DSView/DreamSourceLab.rules DESTINATION etc/udev/rules.d RENAME 60-dreamsourcelab.rules) + endif() + + install(FILES NEWS25 DESTINATION share/DSView RENAME NEWS25) diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix deleted file mode 100644 index c33bfd408b92..000000000000 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, pkg-config, autoreconfHook, -glib, libzip, libserialport, check, libusb1, libftdi, -systemd, alsa-lib, dsview -}: - -stdenv.mkDerivation { - inherit (dsview) version src; - - pname = "libsigrok4dsl"; - - postUnpack = '' - export sourceRoot=$sourceRoot/libsigrok4DSL - ''; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = [ - glib libzip libserialport libusb1 libftdi systemd check alsa-lib - ]; - - meta = with lib; { - description = "A fork of the sigrok library for usage with DSView"; - homepage = "https://www.dreamsourcelab.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bachp ]; - }; -} diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix deleted file mode 100644 index 09eed4a67c57..000000000000 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, pkg-config, autoreconfHook, -glib, check, python3, dsview -}: - -stdenv.mkDerivation { - inherit (dsview) version src; - - pname = "libsigrokdecode4dsl"; - - postUnpack = '' - export sourceRoot=$sourceRoot/libsigrokdecode4DSL - ''; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = [ - python3 glib check - ]; - - meta = with lib; { - description = "A fork of the sigrokdecode library for usage with DSView"; - homepage = "https://www.dreamsourcelab.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bachp ]; - }; -} diff --git a/pkgs/applications/science/electronics/dsview/qt515.patch b/pkgs/applications/science/electronics/dsview/qt515.patch deleted file mode 100644 index 552f2062ec57..000000000000 --- a/pkgs/applications/science/electronics/dsview/qt515.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp -index 921d3db..16cdce9 100755 ---- a/pv/view/viewport.cpp -+++ b/pv/view/viewport.cpp -@@ -37,7 +37,7 @@ - - #include - #include -- -+#include - - #include - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6555457e87a9..66ba1d9a5608 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16820,10 +16820,6 @@ with pkgs; python3 = python38; }; - # special forks used for dsview - libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; - libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { }; - sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; cli11 = callPackage ../development/tools/misc/cli11 { };