Unverified Commit 8baeaa3e authored by K900's avatar K900 Committed by GitHub
Browse files

calamares: 3.3.13 -> 3.4.0, qt6-ize, clean up (#430636)

parents e7f0683e b424b375

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
    # Add Firefox and other tools useful for installation to the launcher

    favoriteAppsOverride = ''

      [org.gnome.shell]

      favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop', 'io.calamares.calamares.desktop' ]

      favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop', 'calamares.desktop' ]

    '';



    # Override GNOME defaults to disable GNOME tour and disable suspend

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
      ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${

        desktopDir + "org.kde.konsole.desktop"

      }

      ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${

        desktopDir + "io.calamares.calamares.desktop"

      ln -sfT ${pkgs.calamares-nixos}/share/applications/calamares.desktop ${

        desktopDir + "calamares.desktop"

      }

    '';

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 


      ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}

      ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}

      ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${

        desktopDir + "io.calamares.calamares.desktop"

      ln -sfT ${pkgs.calamares-nixos}/share/applications/calamares.desktop ${

        desktopDir + "calamares.desktop"

      }

    '';

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix

+4 −2
Original line number Diff line number Diff line
@@ -4,16 +4,18 @@ 
{ pkgs, ... }:

let

  calamares-nixos-autostart = pkgs.makeAutostartItem {

    name = "io.calamares.calamares";

    name = "calamares";

    package = pkgs.calamares-nixos;

  };

in

{

  imports = [ ./installation-cd-graphical-base.nix ];



  # required for kpmcore to work correctly

  programs.partition-manager.enable = true;



  environment.systemPackages = with pkgs; [

    # Calamares for graphical installation

    libsForQt5.kpmcore

    calamares-nixos

    calamares-nixos-autostart

    calamares-nixos-extensions

nixos/modules/programs/partition-manager.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ in 
    programs.partition-manager = {

      enable = lib.mkEnableOption "KDE Partition Manager";



      package = lib.mkPackageOption pkgs [ "libsForQt5" "partitionmanager" ] { };

      package = lib.mkPackageOption pkgs [ "kdePackages" "partitionmanager" ] { };

    };

  };