diff options
| author | freezeboy <freezeboy@users.noreply.github.com> | 2020-11-05 16:19:32 +0100 |
|---|---|---|
| committer | freezeboy <freezeboy@users.noreply.github.com> | 2020-11-20 22:24:18 +0100 |
| commit | 6683f3bf65de78bc02320d46e255d17b0d28043b (patch) | |
| tree | e86e6cf71f0fecf5b0afa136f730c1ce501488a1 | |
| parent | 43dbe816401ed0539bc08d2ff63f2eead78f85a1 (diff) | |
| download | nixpkgs-6683f3bf65de78bc02320d46e255d17b0d28043b.tar nixpkgs-6683f3bf65de78bc02320d46e255d17b0d28043b.tar.gz nixpkgs-6683f3bf65de78bc02320d46e255d17b0d28043b.tar.bz2 nixpkgs-6683f3bf65de78bc02320d46e255d17b0d28043b.tar.lz nixpkgs-6683f3bf65de78bc02320d46e255d17b0d28043b.tar.xz nixpkgs-6683f3bf65de78bc02320d46e255d17b0d28043b.tar.zst nixpkgs-6683f3bf65de78bc02320d46e255d17b0d28043b.zip | |
calaos_installer: 3.1 -> 3.5
Also migrate to Qt 5.15
| -rw-r--r-- | pkgs/misc/calaos/installer/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index 6254c9c24f4..ee7c089bc8e 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }: mkDerivation rec { - name = "calaos_installer-3.1"; - version = "3.1"; + pname = "calaos_installer"; + version = "3.5"; src = fetchFromGitHub { owner = "calaos"; repo = "calaos_installer"; rev = "v${version}"; - sha256 = "0g8igj5sax5vjqzrpbil7i6329708lqqwvg5mwiqd0zzzha9sawd"; + sha256 = "hx7XVF2iueKFR67U0EvSK1vYZnJBnuOpUOkSjx7h1XY="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5b39f40f57..7249629a3b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27147,7 +27147,7 @@ in cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; - calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {}; + calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; ccemux = callPackage ../misc/emulators/ccemux { }; |