diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | pkgs/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/shvspy/default.nix | 11 |
3 files changed, 11 insertions, 21 deletions
@@ -126,11 +126,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1677591639, - "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=", + "lastModified": 1677949148, + "narHash": "sha256-dEdcn+UYs8TUK3VTNCQk9TsJapJLEq50A4q7eC3/PTU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce", + "rev": "d63e86cbed3d399c4162594943bd8c1d8392e550", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1677845674, - "narHash": "sha256-9wy/QFibdJUp7WQUe50U5bZKocg3OOHBpJhpl5ddfbE=", + "lastModified": 1677918630, + "narHash": "sha256-XvfzkZr+GQMm+BTYvQ9gMaJ6lkd1mKSEZ6I184OP5RM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dcc47fef8bd1e91baeab8fb34a35337ab8f3a3fd", + "rev": "e0737778444ae0aa3baf8d6512288d3310c372ed", "type": "github" }, "original": { 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 = [ |