Merge pull request #136929 from Artturin/calamaresupdate

calamares: 3.2.39 -> 3.2.42

authored by

Artturi and committed by
GitHub
03021c52 fffe8611

+4 -4
+2 -2
pkgs/tools/misc/calamares/default.nix
··· 6 6 7 7 mkDerivation rec { 8 8 pname = "calamares"; 9 - version = "3.2.39"; 9 + version = "3.2.42"; 10 10 11 11 # release including submodule 12 12 src = fetchurl { 13 13 url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; 14 - sha256 = "sha256-QGdy49RndRIBR3B+Z7iXbFyx5gxXO2GHNYc+iv0z47w="; 14 + sha256 = "sha256-NbtgtbhauEo7EGvNUNltUQRBpLlzBjAR0GLL9CadgsQ="; 15 15 }; 16 16 17 17 nativeBuildInputs = [ cmake extra-cmake-modules ];
+2 -2
pkgs/top-level/all-packages.nix
··· 2192 2192 2193 2193 traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; 2194 2194 2195 - calamares = libsForQt514.callPackage ../tools/misc/calamares { 2195 + calamares = libsForQt515.callPackage ../tools/misc/calamares { 2196 2196 python = python3; 2197 - boost = pkgs.boost.override { python = python3; }; 2197 + boost = pkgs.boost.override { enablePython = true; python = python3; }; 2198 2198 }; 2199 2199 2200 2200 calendar-cli = callPackage ../tools/networking/calendar-cli { };