From 6ea3694fd0ffa72cb659125319e9f3c4df453c62 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 6 Sep 2021 23:26:17 +0300 Subject: [PATCH] calamares: 3.2.39 -> 3.2.42 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index d65d31d44c4e..fd08f09b9607 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.39"; + version = "3.2.42"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-QGdy49RndRIBR3B+Z7iXbFyx5gxXO2GHNYc+iv0z47w="; + sha256 = "sha256-NbtgtbhauEo7EGvNUNltUQRBpLlzBjAR0GLL9CadgsQ="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4c0ca19eade..f2ca0f3c0ea9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2190,9 +2190,9 @@ with pkgs; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; - calamares = libsForQt514.callPackage ../tools/misc/calamares { + calamares = libsForQt515.callPackage ../tools/misc/calamares { python = python3; - boost = pkgs.boost.override { python = python3; }; + boost = pkgs.boost.override { enablePython = true; python = python3; }; }; calendar-cli = callPackage ../tools/networking/calendar-cli { };