mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #136929 from Artturin/calamaresupdate
calamares: 3.2.39 -> 3.2.42
This commit is contained in:
commit
03021c522f
2 changed files with 4 additions and 4 deletions
|
@ -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 ];
|
||||
|
|
|
@ -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 { };
|
||||
|
|
Loading…
Reference in a new issue