From c50f620c3351e87b84eea8159673a6ca4081005a Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sun, 5 Jun 2022 12:32:34 -0700 Subject: [PATCH 1/4] calamares: 3.2.57 -> 3.2.59 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index a73a2821cbf2..d3a1ea13ff85 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.57"; + version = "3.2.59"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "ef7f564ec2cd8baaf94a44982ce1db88c1192696617f21538d0b8472a63b4c2b"; + sha256 = "55adef250613e80a868f2aa3d1e57bdae5b769387d91decf0fe2b64e3605574f"; }; patches = lib.optionals nixos-extensions [ From 4b863a0256a24517caad65400bc6664407e10a73 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sun, 5 Jun 2022 12:35:51 -0700 Subject: [PATCH 2/4] calamares: increase default verbosity --- pkgs/tools/misc/calamares/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index d3a1ea13ff85..7565aa018253 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -57,7 +57,7 @@ mkDerivation rec { postPatch = '' # Run calamares without root. Other patches make it functional as a normal user - sed -e "s,pkexec calamares,calamares," \ + sed -e "s,pkexec calamares,calamares -D6," \ -i calamares.desktop sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=calamares," \ From 54fcba5b3bb4d77dd58aa08a489aced93ff5da18 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sun, 5 Jun 2022 13:24:33 -0700 Subject: [PATCH 3/4] installation-cd: prevent gnome from sleeping --- .../cd-dvd/installation-cd-graphical-calamares-gnome.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix index 95aeca1a928a..d015e10c11d8 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix @@ -18,7 +18,8 @@ extraGSettingsOverrides = '' [org.gnome.shell] welcome-dialog-last-shown-version='9999999999' - + [org.gnome.desktop.session] + idle-delay=0 [org.gnome.settings-daemon.plugins.power] sleep-inactive-ac-type='nothing' sleep-inactive-battery-type='nothing' From d5e616a3f410e082e7dd362b1548b1b322633205 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sun, 5 Jun 2022 14:07:25 -0700 Subject: [PATCH 4/4] calamares-nixos-extensions: 0.3.8 -> 0.3.10 --- pkgs/tools/misc/calamares-nixos-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix index 793f341a0731..a587cd585e1a 100644 --- a/pkgs/tools/misc/calamares-nixos-extensions/default.nix +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "calamares-nixos-extensions"; - version = "0.3.8"; + version = "0.3.10"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; rev = version; - sha256 = "MtqAOwlY5euVNAGRl2pRkbg/OolJPNOSQcR4DS5gFz4="; + sha256 = "YJyK0rsrftrCwYD+aCAkPe/kAqUXsP/4WBAGtNKIGj8="; }; installPhase = ''