From 4184848f9ce623a6a6ab32c8f5fec62af6c75706 Mon Sep 17 00:00:00 2001 From: Dakota Marshall Date: Wed, 24 Apr 2024 16:51:06 -0400 Subject: [PATCH] Update Nix flake pinned hash for python3.12 and QT 6.6.3 support --- flake.lock | 6 +++--- flake.nix | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index fa6aa60..5dafd37 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1688072080, - "narHash": "sha256-mPsxREerkmDU2m7zi8j19ooc1F9wKPWBJ77S7swXMmI=", + "lastModified": 1712473363, + "narHash": "sha256-TIScFAVdI2yuybMxxNjC4YZ/j++c64wwuKbpnZnGiyU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a8650469a9f8a1958ff9373bd27fb8e54c4365d", + "rev": "e89cf1c932006531f454de7d652163a9a5c86668", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ec55154..f827ba0 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,8 @@ pkgs.freetype pkgs.dbus pkgs.qt6.qtwayland + pkgs.qt6.full + pkgs.qt6.qtbase pkgs.zstd ]; buildInputs = with pkgs; [ @@ -28,13 +30,12 @@ qt6.full qt6.qtwayland qtcreator - python310Packages.pip - python310Full - python310Packages.virtualenv # run virtualenv . - # python3Packages.pyqt5 # avoid installing via pip - python310Packages.pyusb # fixes the pyusb 'No backend available' when installed directly via pip + python312Packages.pip + python312Full + python312Packages.virtualenv # run virtualenv . + python312Packages.pyusb # fixes the pyusb 'No backend available' when installed directly via pip - gcc.cc.libgcc + libgcc makeWrapper bashInteractive glib @@ -46,7 +47,6 @@ libGL libGLU fontconfig - # wrapQtAppsHook xorg.libxcb