Unverified Commit 860cd4b2 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #291610 from vlinkz/calamares330 

calamares: 3.2.62 -> 3.3.3
parents 0e6d90c2 9e68e652

pkgs/tools/misc/calamares-nixos-extensions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "calamares-nixos-extensions";

  version = "0.3.14";

  version = "0.3.15";



  src = fetchFromGitHub {

    owner = "NixOS";

    repo = "calamares-nixos-extensions";

    rev = version;

    hash = "sha256-wRKZ80yU3WsUkGn5/ft4wDR22s39/WTxTrjFE0/9mlc=";

    hash = "sha256-PZQjrteLWcInXIavuANHfzfl9gOXATWtIlDUp45j5Ao=";

  };



  installPhase = ''

pkgs/tools/misc/calamares/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 


mkDerivation rec {

  pname = "calamares";

  version = "3.2.62";

  version = "3.3.3";



  # release including submodule

  src = fetchurl {

    url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";

    sha256 = "sha256-oPvOwqQ4aTdT/BdCIDVhGa1624orGcMXUYqhywJdbdA=";

    sha256 = "sha256-XCp2Qc2y9eF2Z0BqfTtzUkf6860KzHl1lZE7kiHZbQM=";

  };



  patches = lib.optionals nixos-extensions [

pkgs/tools/misc/calamares/nixos-extensions-paths.patch

+10 −11
Original line number Diff line number Diff line 
diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp

index de709156f..a0b6c5faf 100644

index e0491e5f9..faf272016 100644

--- a/src/calamares/main.cpp

+++ b/src/calamares/main.cpp

@@ -131,6 +132,8 @@ main( int argc, char* argv[] )

     // TODO: umount anything in /tmp/calamares-... as an emergency save function

@@ -132,6 +132,7 @@ main( int argc, char* argv[] )

 #endif

 

+    CalamaresUtils::setNixosDirs();

+

     bool is_debug = handle_args( a );

 

 #ifdef WITH_KF5DBus

     std::unique_ptr< KDSingleApplication > possiblyUnique;

+    Calamares::setNixosDirs();

     const bool is_debug = handle_args( a );

     if ( !is_debug )

     {

diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp

index f333d6e64..6118fb412 100644

index c42768a08..bac98645a 100644

--- a/src/libcalamares/utils/Dirs.cpp

+++ b/src/libcalamares/utils/Dirs.cpp

@@ -115,6 +116,14 @@ setXdgDirs()

@@ -114,6 +114,14 @@ setXdgDirs()

     s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() );

 }
@@ -31,7 +30,7 @@ index f333d6e64..6118fb412 100644 
 extraConfigDirs()

 {

diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h

index 445cbe1f1..da869d446 100644

index d0edd7a4f..26bd16b4e 100644

--- a/src/libcalamares/utils/Dirs.h

+++ b/src/libcalamares/utils/Dirs.h

@@ -50,6 +50,9 @@ DLLEXPORT bool isAppDataDirOverridden();

pkgs/tools/misc/calamares/nonroot.patch

+9 −8
Original line number Diff line number Diff line 
diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp

index c7146c2d7..e165d9a8f 100644

index 632f32028..fe9052449 100644

--- a/src/libcalamares/utils/Runner.cpp

+++ b/src/libcalamares/utils/Runner.cpp

@@ -140,13 +140,13 @@ Calamares::Utils::Runner::run()

@@ -137,13 +137,13 @@ Calamares::Utils::Runner::run()

     }

     if ( m_location == RunLocation::RunInTarget )

     {
@@ -21,10 +21,10 @@ index c7146c2d7..e165d9a8f 100644 
 

     if ( m_output )

diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py

index a3318d1a0..5fbe202fd 100644

index 4202639f3..de2556b91 100644

--- a/src/modules/mount/main.py

+++ b/src/modules/mount/main.py

@@ -152,7 +152,8 @@ def mount_partition(root_mount_point, partition, partitions):

@@ -235,7 +235,8 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun

 

     # Ensure that the created directory has the correct SELinux context on

     # SELinux-enabled systems.
@@ -34,7 +34,7 @@ index a3318d1a0..5fbe202fd 100644 
     try:

         subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point])

     except FileNotFoundError as e:

@@ -193,13 +194,13 @@ def mount_partition(root_mount_point, partition, partitions):

@@ -278,13 +279,13 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun

         for s in btrfs_subvolumes:

             if not s["subvolume"]:

                 continue
@@ -52,10 +52,10 @@ index a3318d1a0..5fbe202fd 100644 
         device = partition["device"]

 

diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp

index ca7219ca4..6ac682ba4 100644

index a58f3df83..b66576b09 100644

--- a/src/modules/welcome/checker/GeneralRequirements.cpp

+++ b/src/modules/welcome/checker/GeneralRequirements.cpp

@@ -371,10 +371,34 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace )

@@ -431,10 +431,35 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace )

     cWarning() << "GeneralRequirements is configured without libparted.";

     return false;

 #else
@@ -88,9 +88,10 @@ index ca7219ca4..6ac682ba4 100644 
+

+    return false;

+}

 

+

 bool

 GeneralRequirements::checkEnoughRam( qint64 requiredRam )

 {

diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h

index b6646da11..ea27324fa 100644

--- a/src/modules/welcome/checker/GeneralRequirements.h

pkgs/tools/misc/calamares/supportedlocale.patch

+1 −1
Original line number Diff line number Diff line 
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp

index 2357019a7..75b547430 100644

index 54ff5eb64..1a2b98c9c 100644

--- a/src/modules/locale/Config.cpp

+++ b/src/modules/locale/Config.cpp

@@ -48,7 +48,7 @@ loadLocales( const QString& localeGenPath )