diff options
| author | Artturi <Artturin@artturin.com> | 2021-09-07 02:08:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 02:08:16 +0300 |
| commit | 03021c522f94e2b8f144383a0c70474dd4bbe197 (patch) | |
| tree | 7103b2f8d0b67e978bb2fee133e445ce42a5da31 /pkgs | |
| parent | fffe8611bddafc5932888af36da533020eacfc1b (diff) | |
| parent | 6ea3694fd0ffa72cb659125319e9f3c4df453c62 (diff) | |
| download | nixlib-03021c522f94e2b8f144383a0c70474dd4bbe197.tar nixlib-03021c522f94e2b8f144383a0c70474dd4bbe197.tar.gz nixlib-03021c522f94e2b8f144383a0c70474dd4bbe197.tar.bz2 nixlib-03021c522f94e2b8f144383a0c70474dd4bbe197.tar.lz nixlib-03021c522f94e2b8f144383a0c70474dd4bbe197.tar.xz nixlib-03021c522f94e2b8f144383a0c70474dd4bbe197.tar.zst nixlib-03021c522f94e2b8f144383a0c70474dd4bbe197.zip | |
Merge pull request #136929 from Artturin/calamaresupdate
calamares: 3.2.39 -> 3.2.42
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/calamares/default.nix | 4 | ||||
| -rw-r--r-- | 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 0d5b2a04831b..558e6db3cf4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2192,9 +2192,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 { }; |