diff options
| author | Karel Kočí <cynerd@email.cz> | 2023-03-10 09:30:08 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2023-03-10 09:30:08 +0100 |
| commit | d0c21ad4a6915ee3cde11b1979cfe9b3c1cfcf56 (patch) | |
| tree | 9c89806cdfc3cc986a420c08bf1ed9bcf33a5e18 /pkgs | |
| parent | ad26d0668bb9fe17f4fdc52ae1d40a7951d2fdda (diff) | |
| download | nixos-personal-d0c21ad4a6915ee3cde11b1979cfe9b3c1cfcf56.tar.gz nixos-personal-d0c21ad4a6915ee3cde11b1979cfe9b3c1cfcf56.tar.bz2 nixos-personal-d0c21ad4a6915ee3cde11b1979cfe9b3c1cfcf56.zip | |
shvspy: update to latest version
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/shvspy/default.nix | 11 |
2 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index bb3bd42..d7d6989 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -38,15 +38,6 @@ # Elektroline packages shvspy = callPackage ./shvspy {}; - qcoro_task_exception_handling = nixpkgs.libsForQt5.qcoro.overrideAttrs (oldAttrs: { - version = "0.6.0"; - src = nixpkgs.fetchFromGitHub { - owner = "danvratil"; - repo = "qcoro"; - rev = "261663560f59a162c0c82158a6cde41089668871"; - sha256 = "OAYJpoW3b0boSYBfuzLrFvlYSmP3SON8O6HsDQoi+I8="; - }; - }); }; in personalpkgs diff --git a/pkgs/shvspy/default.nix b/pkgs/shvspy/default.nix index 7f5e31d..c8b57f5 100644 --- a/pkgs/shvspy/default.nix +++ b/pkgs/shvspy/default.nix @@ -4,20 +4,19 @@ fetchFromGitHub, cmake, doctest, - libsForQt5, - qcoro_task_exception_handling, + qt6, makeDesktopItem, copyDesktopItems, }: -with libsForQt5; +with qt6; stdenv.mkDerivation rec { name = "shvspy"; src = fetchFromGitHub { owner = "silicon-heaven"; repo = "shvspy"; - rev = "a922e963bf7884164fe2b124a7a4366f7fc802a3"; - sha256 = "ExA+sFlkxFKXk69DKoGzKm80ypiNFwN281MwZkMgaVY="; + rev = "c8a3b52e7300f1f05a54569121da8a2e9bb015aa"; + hash = "sha256-+aknZ/Uo0VuMm45PHqSrvdyfD73hofS8HKVSfkIyM5I="; fetchSubmodules = true; }; @@ -31,8 +30,8 @@ with libsForQt5; qtbase qtserialport qtwebsockets + qtsvg doctest - qcoro_task_exception_handling ]; desktopItems = [ |