diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-05-16 22:15:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 22:15:15 +0200 |
| commit | 1aa25b4a6f1ddc10f1c7cd3a14b5cd4aecff8b53 (patch) | |
| tree | 4b35f2985edc449a277b5d9ed31b25ef592dd9fb | |
| parent | 2c203d37e1d1e6945e9fd14ad2c12d9ad8bc9d63 (diff) | |
| parent | cd41959fd70eaf76bd6107ac5d3453255d5b3af5 (diff) | |
Merge pull request #312186 from Sigmanificient/tip-3.3.2
tipp10: 3.2.1 -> 3.3.2, move to Qt6
| -rw-r--r-- | pkgs/applications/misc/tipp10/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 090d192b5240e..dd3c2ab4fe1a1 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -1,18 +1,18 @@ -{ cmake, lib, mkDerivation, fetchFromGitLab, - qtmultimedia, qttools, ... }: +{ stdenv, cmake, lib, fetchFromGitLab, + qtmultimedia, qttools, wrapQtAppsHook, ... }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "tipp10"; - version = "3.2.1"; + version = "3.3.2"; src = fetchFromGitLab { owner = "tipp10"; repo = "tipp10"; rev = "v${version}"; - sha256 = "4cxN2AnvYhZAMuA/qfmdLVICJNk6VCpRnfelbxYRvPg="; + sha256 = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4="; }; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ qtmultimedia ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b301eb454f6af..3abd5c9b465db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34851,7 +34851,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - tipp10 = qt5.callPackage ../applications/misc/tipp10 { }; + tipp10 = qt6.callPackage ../applications/misc/tipp10 { }; tkrev = callPackage ../applications/version-management/tkrev { }; |