commit 3ec2fd8203d39a59960806d9519125740dc78400 · pyrox.dev/nixpkgs

+52 -14

pkgs/tools/misc/calamares/default.nix

···

       1
       1
       -
       { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore

     

       2
       2
       -
       , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase

     

       3
       3
       -
       , qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata

     

       1
       1
       +
       { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2

     

       2
       2
       +
       , kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python

     

       3
       3
       +
       , qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata

     

       4
       4
        
       , ckbcomp, xkeyboard_config, mkDerivation

     

       5
       5
       +
       , nixos-extensions ? false

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       mkDerivation rec {

     

       8
       9
        
         pname = "calamares";

     

       9
       9
       -
         version = "3.2.55";

     

       10
       10
       +
         version = "3.2.56";

     

       10
       11
        
       

     

       11
       12
        
         # release including submodule

     

       12
       13
        
         src = fetchurl {

     

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

     

       14
       14
       -
           sha256 = "sha256-1xf02rjy6+83zbU2yxGUGjcIGJfYS8ryqi4CBzrh7kI=";

     

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

     

       15
       15
       +
           sha256 = "e1402d7693659b85c5e553481a7252d91350c3f33ffea413488d7712d3281e03";

     

       15
       16
        
         };

     

       16
       17
        
       

     

       18
       18
       +
         patches = lib.optionals nixos-extensions [

     

       19
       19
       +
           # Modifies the users module to only set passwords of user and root

     

       20
       20
       +
           # as the users will have already been created in the configuration.nix file

     

       21
       21
       +
           ./userjob.patch

     

       22
       22
       +
           # Makes calamares search /run/current-system/sw/share/calamares/ for extra configuration files

     

       23
       23
       +
           # as by default it only searches /usr/share/calamares/ and /nix/store/<hash>-calamares-<version>/share/calamares/

     

       24
       24
       +
           # but calamares-nixos-extensions is not in either of these locations

     

       25
       25
       +
           ./nixos-extensions-paths.patch

     

       26
       26
       +
           # Uses pkexec within modules in order to run calamares without root permissions as a whole

     

       27
       27
       +
           # Also fixes storage check in the welcome module

     

       28
       28
       +
           ./nonroot.patch

     

       29
       29
       +
           # Adds unfree qml to packagechooserq

     

       30
       30
       +
           ./unfreeq.patch

     

       31
       31
       +
           # Adds config to change name of packagechooserq

     

       32
       32
       +
           # Upstreamed in PR: https://github.com/calamares/calamares/pull/1932

     

       33
       33
       +
           ./packagechooserq.patch

     

       34
       34
       +
           # Modifies finished module to add some NixOS resources

     

       35
       35
       +
           # Modifies packagechooser module to change the UI

     

       36
       36
       +
           ./uimod.patch

     

       37
       37
       +
           # Remove options for unsupported partition types

     

       38
       38
       +
           ./partitions.patch

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       17
       41
        
         nativeBuildInputs = [ cmake extra-cmake-modules ];

     

       18
       42
        
         buildInputs = [

     

       19
       19
       -
           boost kparts.dev kpmcore.out kservice.dev

     

       20
       20
       -
           libatasmart libxcb libyamlcpp parted polkit-qt python qtbase

     

       21
       21
       -
           qtquickcontrols qtsvg qttools qtwebengine.dev util-linux

     

       43
       43
       +
           boost kparts.dev kpmcore.out kservice.dev kirigami2

     

       44
       44
       +
           libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python

     

       45
       45
       +
           qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux

     

       22
       46
        
         ];

     

       23
       47
        
       

     

       24
       48
        
         cmakeFlags = [

     
···

       32
       56
        
         POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions";

     

       33
       57
        
       

     

       34
       58
        
         postPatch = ''

     

       59
       59
       +
           # Run calamares without root. Other patches make it functional as a normal user

     

       60
       60
       +
           sed -e "s,pkexec calamares,calamares," \

     

       61
       61
       +
               -i calamares.desktop

     

       62
       62
       +
       

     

       63
       63
       +
           sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=io.calamares.calamares," \

     

       64
       64
       +
               -i calamares.desktop

     

       65
       65
       +
       

     

       66
       66
       +
           # Fix desktop reference with wayland

     

       67
       67
       +
           mv calamares.desktop io.calamares.calamares.desktop

     

       68
       68
       +
       

     

       69
       69
       +
           sed -e "s,calamares.desktop,io.calamares.calamares.desktop," \

     

       70
       70
       +
               -i CMakeLists.txt

     

       71
       71
       +
       

     

       35
       72
        
           sed -e "s,/usr/bin/calamares,$out/bin/calamares," \

     

       36
       36
       -
               -i calamares.desktop \

     

       37
       73
        
               -i com.github.calamares.calamares.policy

     

       38
       74
        
       

     

       39
       75
        
           sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \

     

       40
       40
       -
               -i src/modules/locale/SetTimezoneJob.cpp

     

       76
       76
       +
               -i src/modules/locale/SetTimezoneJob.cpp \

     

       77
       77
       +
               -i src/libcalamares/locale/TimeZone.cpp

     

       41
       78
        
       

     

       42
       79
        
           sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \

     

       43
       43
       -
               -i src/modules/keyboard/keyboardwidget/keyboardglobal.h

     

       80
       80
       +
               -i src/modules/keyboard/keyboardwidget/keyboardglobal.cpp

     

       44
       81
        
       

     

       45
       82
        
           sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \

     

       46
       83
        
               -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp

     
···

       51
       88
        
       

     

       52
       89
        
         meta = with lib; {

     

       53
       90
        
           description = "Distribution-independent installer framework";

     

       54
       54
       -
           license = with licenses; [ gpl3Plus bsd2 ];

     

       55
       55
       -
           maintainers = with maintainers; [ manveru ];

     

       91
       91
       +
           homepage = "https://calamares.io/";

     

       92
       92
       +
           license = with licenses; [ gpl3Plus bsd2 cc0 ];

     

       93
       93
       +
           maintainers = with maintainers; [ manveru vlinkz ];

     

       56
       94
        
           platforms = platforms.linux;

     

       57
       95
        
         };

     

       58
       96
        
       }

+46

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

···

       1
       1
       +
       diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp

     

       2
       2
       +
       index de709156f..a0b6c5faf 100644

     

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

     

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

     

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

     

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

     

       7
       7
       +
        #endif

     

       8
       8
       +
        

     

       9
       9
       +
       +    CalamaresUtils::setNixosDirs();

     

       10
       10
       +
       +

     

       11
       11
       +
            bool is_debug = handle_args( a );

     

       12
       12
       +
        

     

       13
       13
       +
        #ifdef WITH_KF5DBus

     

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

     

       15
       15
       +
       index f333d6e64..6118fb412 100644

     

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

     

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

     

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

     

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

     

       20
       20
       +
        }

     

       21
       21
       +
        

     

       22
       22
       +
       +void

     

       23
       23
       +
       +setNixosDirs()

     

       24
       24
       +
       +{

     

       25
       25
       +
       +    s_extraConfigDirs << "/run/current-system/sw/share/calamares/";

     

       26
       26
       +
       +    s_extraDataDirs << "/run/current-system/sw/share/calamares/";

     

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

     

       28
       28
       +
       +}

     

       29
       29
       +
       +

     

       30
       30
       +
        QStringList

     

       31
       31
       +
        extraConfigDirs()

     

       32
       32
       +
        {

     

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

     

       34
       34
       +
       index 445cbe1f1..da869d446 100644

     

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

     

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

     

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

     

       38
       38
       +
        /** @brief Setup extra config and data dirs from the XDG variables.

     

       39
       39
       +
         */

     

       40
       40
       +
        DLLEXPORT void setXdgDirs();

     

       41
       41
       +
       +/** @brief Setup extra config and data dirs fir NixOS.

     

       42
       42
       +
       + */

     

       43
       43
       +
       +DLLEXPORT void setNixosDirs();

     

       44
       44
       +
        /** @brief Are any extra directories configured? */

     

       45
       45
       +
        DLLEXPORT bool haveExtraDirs();

     

       46
       46
       +
        /** @brief XDG_CONFIG_DIRS, each guaranteed to end with / */

+105

pkgs/tools/misc/calamares/nonroot.patch

···

       1
       1
       +
       diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp

     

       2
       2
       +
       index c7146c2d7..e165d9a8f 100644

     

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

     

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

     

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

     

       6
       6
       +
            }

     

       7
       7
       +
            if ( m_location == RunLocation::RunInTarget )

     

       8
       8
       +
            {

     

       9
       9
       +
       -        process.setProgram( "chroot" );

     

       10
       10
       +
       -        process.setArguments( QStringList { workingDirectory.absolutePath() } << m_command );

     

       11
       11
       +
       +        process.setProgram( "pkexec" );

     

       12
       12
       +
       +        process.setArguments( QStringList { "chroot" } + QStringList { workingDirectory.absolutePath() } << m_command );

     

       13
       13
       +
            }

     

       14
       14
       +
            else

     

       15
       15
       +
            {

     

       16
       16
       +
       -        process.setProgram( "env" );

     

       17
       17
       +
       -        process.setArguments( m_command );

     

       18
       18
       +
       +        process.setProgram( "pkexec" );

     

       19
       19
       +
       +        process.setArguments( QStringList { "env" } + m_command );

     

       20
       20
       +
            }

     

       21
       21
       +
        

     

       22
       22
       +
            if ( m_output )

     

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

     

       24
       24
       +
       index a3318d1a0..5fbe202fd 100644

     

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

     

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

     

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

     

       28
       28
       +
        

     

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

     

       30
       30
       +
            # SELinux-enabled systems.

     

       31
       31
       +
       -    os.makedirs(mount_point, exist_ok=True)

     

       32
       32
       +
       +    subprocess.check_call(["pkexec", "mkdir", "-p", mount_point])

     

       33
       33
       +
       +

     

       34
       34
       +
            try:

     

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

     

       36
       36
       +
            except FileNotFoundError as e:

     

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

     

       38
       38
       +
                for s in btrfs_subvolumes:

     

       39
       39
       +
                    if not s["subvolume"]:

     

       40
       40
       +
                        continue

     

       41
       41
       +
       -            os.makedirs(root_mount_point + os.path.dirname(s["subvolume"]), exist_ok=True)

     

       42
       42
       +
       -            subprocess.check_call(["btrfs", "subvolume", "create",

     

       43
       43
       +
       +            subprocess.check_call(["pkexec", "mkdir", "-p", root_mount_point + os.path.dirname(s["subvolume"])])

     

       44
       44
       +
       +            subprocess.check_call(["pkexec", "btrfs", "subvolume", "create",

     

       45
       45
       +
                                           root_mount_point + s["subvolume"]])

     

       46
       46
       +
                    if s["mountPoint"] == "/":

     

       47
       47
       +
                        # insert the root subvolume into global storage

     

       48
       48
       +
                        libcalamares.globalstorage.insert("btrfsRootSubvolume", s["subvolume"])

     

       49
       49
       +
       -        subprocess.check_call(["umount", "-v", root_mount_point])

     

       50
       50
       +
       +        subprocess.check_call(["pkexec", "umount", "-v", root_mount_point])

     

       51
       51
       +
        

     

       52
       52
       +
                device = partition["device"]

     

       53
       53
       +
        

     

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

     

       55
       55
       +
       index ca7219ca4..6ac682ba4 100644

     

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

     

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

     

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

     

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

     

       60
       60
       +
            return false;

     

       61
       61
       +
        #else

     

       62
       62
       +
       -    return check_big_enough( requiredSpace );

     

       63
       63
       +
       +    return big_enough( requiredSpace );

     

       64
       64
       +
        #endif

     

       65
       65
       +
        }

     

       66
       66
       +
        

     

       67
       67
       +
       +bool

     

       68
       68
       +
       +GeneralRequirements::big_enough( qint64 requiredSpace )

     

       69
       69
       +
       +{

     

       70
       70
       +
       +    FILE *fpipe;

     

       71
       71
       +
       +    char command[128];

     

       72
       72
       +
       +    snprintf(command, sizeof(command), "lsblk --bytes -no SIZE,TYPE | grep disk | awk '$1 > %llu {print $1}'", requiredSpace);

     

       73
       73
       +
       +    char c = 0;

     

       74
       74
       +
       +

     

       75
       75
       +
       +    if (0 == (fpipe = (FILE*)popen(command, "r")))

     

       76
       76
       +
       +    {

     

       77
       77
       +
       +        cWarning() << "Failed to check storage size.";

     

       78
       78
       +
       +        return false;

     

       79
       79
       +
       +    }

     

       80
       80
       +
       +

     

       81
       81
       +
       +    while (fread(&c, sizeof c, 1, fpipe))

     

       82
       82
       +
       +    {

     

       83
       83
       +
       +        pclose(fpipe);

     

       84
       84
       +
       +        return true;

     

       85
       85
       +
       +    }

     

       86
       86
       +
       +

     

       87
       87
       +
       +    pclose(fpipe);

     

       88
       88
       +
       +

     

       89
       89
       +
       +    return false;

     

       90
       90
       +
       +}

     

       91
       91
       +
        

     

       92
       92
       +
        bool

     

       93
       93
       +
        GeneralRequirements::checkEnoughRam( qint64 requiredRam )

     

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

     

       95
       95
       +
       index b6646da11..ea27324fa 100644

     

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

     

       97
       97
       +
       +++ b/src/modules/welcome/checker/GeneralRequirements.h

     

       98
       98
       +
       @@ -36,6 +36,7 @@ private:

     

       99
       99
       +
            bool checkHasPower();

     

       100
       100
       +
            bool checkHasInternet();

     

       101
       101
       +
            bool checkIsRoot();

     

       102
       102
       +
       +    bool big_enough( qint64 requiredSpace );

     

       103
       103
       +
        

     

       104
       104
       +
            qreal m_requiredStorageGiB;

     

       105
       105
       +
            qreal m_requiredRamGiB;

+136

pkgs/tools/misc/calamares/packagechooserq.patch

···

       1
       1
       +
       diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp

     

       2
       2
       +
       index 491fe5c25..667621597 100644

     

       3
       3
       +
       --- a/src/modules/packagechooser/Config.cpp

     

       4
       4
       +
       +++ b/src/modules/packagechooser/Config.cpp

     

       5
       5
       +
       @@ -237,6 +237,12 @@ Config::setPackageChoice( const QString& packageChoice )

     

       6
       6
       +
            emit packageChoiceChanged( m_packageChoice.value_or( QString() ) );

     

       7
       7
       +
        }

     

       8
       8
       +
        

     

       9
       9
       +
       +QString

     

       10
       10
       +
       +Config::prettyName() const

     

       11
       11
       +
       +{

     

       12
       12
       +
       +    return m_stepName ? m_stepName->get() : tr( "Packages" );

     

       13
       13
       +
       +}

     

       14
       14
       +
       +

     

       15
       15
       +
        QString

     

       16
       16
       +
        Config::prettyStatus() const

     

       17
       17
       +
        {

     

       18
       18
       +
       @@ -343,4 +349,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )

     

       19
       19
       +
                    cWarning() << "Single-selection QML module must use 'Legacy' method.";

     

       20
       20
       +
                }

     

       21
       21
       +
            }

     

       22
       22
       +
       +

     

       23
       23
       +
       +    bool labels_ok = false;

     

       24
       24
       +
       +    auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

     

       25
       25
       +
       +    if ( labels_ok )

     

       26
       26
       +
       +    {

     

       27
       27
       +
       +        if ( labels.contains( "step" ) )

     

       28
       28
       +
       +        {

     

       29
       29
       +
       +            m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

     

       30
       30
       +
       +        }

     

       31
       31
       +
       +    }

     

       32
       32
       +
        }

     

       33
       33
       +
       diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h

     

       34
       34
       +
       index b04b1c30b..d1b783a8d 100644

     

       35
       35
       +
       --- a/src/modules/packagechooser/Config.h

     

       36
       36
       +
       +++ b/src/modules/packagechooser/Config.h

     

       37
       37
       +
       @@ -98,6 +98,7 @@ public:

     

       38
       38
       +
            QString packageChoice() const { return m_packageChoice.value_or( QString() ); }

     

       39
       39
       +
            void setPackageChoice( const QString& packageChoice );

     

       40
       40
       +
        

     

       41
       41
       +
       +    QString prettyName() const;

     

       42
       42
       +
            QString prettyStatus() const;

     

       43
       43
       +
        

     

       44
       44
       +
        signals:

     

       45
       45
       +
       @@ -120,6 +121,7 @@ private:

     

       46
       46
       +
             * Reading the property will return an empty QString.

     

       47
       47
       +
             */

     

       48
       48
       +
            std::optional< QString > m_packageChoice;

     

       49
       49
       +
       +    CalamaresUtils::Locale::TranslatedString* m_stepName;  // As it appears in the sidebar

     

       50
       50
       +
        };

     

       51
       51
       +
        

     

       52
       52
       +
        

     

       53
       53
       +
       diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp

     

       54
       54
       +
       index 9057004de..8eacf82ec 100644

     

       55
       55
       +
       --- a/src/modules/packagechooser/PackageChooserViewStep.cpp

     

       56
       56
       +
       +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp

     

       57
       57
       +
       @@ -29,7 +29,6 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent )

     

       58
       58
       +
            : Calamares::ViewStep( parent )

     

       59
       59
       +
            , m_config( new Config( this ) )

     

       60
       60
       +
            , m_widget( nullptr )

     

       61
       61
       +
       -    , m_stepName( nullptr )

     

       62
       62
       +
        {

     

       63
       63
       +
            emit nextStatusChanged( false );

     

       64
       64
       +
        }

     

       65
       65
       +
       @@ -41,14 +40,12 @@ PackageChooserViewStep::~PackageChooserViewStep()

     

       66
       66
       +
            {

     

       67
       67
       +
                m_widget->deleteLater();

     

       68
       68
       +
            }

     

       69
       69
       +
       -    delete m_stepName;

     

       70
       70
       +
        }

     

       71
       71
       +
        

     

       72
       72
       +
       -

     

       73
       73
       +
        QString

     

       74
       74
       +
        PackageChooserViewStep::prettyName() const

     

       75
       75
       +
        {

     

       76
       76
       +
       -    return m_stepName ? m_stepName->get() : tr( "Packages" );

     

       77
       77
       +
       +    return m_config->prettyName();

     

       78
       78
       +
        }

     

       79
       79
       +
        

     

       80
       80
       +
        

     

       81
       81
       +
       @@ -139,16 +136,6 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap

     

       82
       82
       +
            m_config->setDefaultId( moduleInstanceKey() );

     

       83
       83
       +
            m_config->setConfigurationMap( configurationMap );

     

       84
       84
       +
        

     

       85
       85
       +
       -    bool labels_ok = false;

     

       86
       86
       +
       -    auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

     

       87
       87
       +
       -    if ( labels_ok )

     

       88
       88
       +
       -    {

     

       89
       89
       +
       -        if ( labels.contains( "step" ) )

     

       90
       90
       +
       -        {

     

       91
       91
       +
       -            m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

     

       92
       92
       +
       -        }

     

       93
       93
       +
       -    }

     

       94
       94
       +
       -

     

       95
       95
       +
            if ( m_widget )

     

       96
       96
       +
            {

     

       97
       97
       +
                hookupModel();

     

       98
       98
       +
       diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h

     

       99
       99
       +
       index 7561f2bd7..76b35aed8 100644

     

       100
       100
       +
       --- a/src/modules/packagechooser/PackageChooserViewStep.h

     

       101
       101
       +
       +++ b/src/modules/packagechooser/PackageChooserViewStep.h

     

       102
       102
       +
       @@ -50,7 +50,6 @@ private:

     

       103
       103
       +
        

     

       104
       104
       +
            Config* m_config;

     

       105
       105
       +
            PackageChooserPage* m_widget;

     

       106
       106
       +
       -    CalamaresUtils::Locale::TranslatedString* m_stepName;  // As it appears in the sidebar

     

       107
       107
       +
        };

     

       108
       108
       +
        

     

       109
       109
       +
        CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory )

     

       110
       110
       +
       diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

     

       111
       111
       +
       index 543c9771d..7c4d5fda7 100644

     

       112
       112
       +
       --- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

     

       113
       113
       +
       +++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

     

       114
       114
       +
       @@ -29,7 +29,7 @@ PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent )

     

       115
       115
       +
        QString

     

       116
       116
       +
        PackageChooserQmlViewStep::prettyName() const

     

       117
       117
       +
        {

     

       118
       118
       +
       -    return tr( "Packages" );

     

       119
       119
       +
       +    return m_config->prettyName();

     

       120
       120
       +
        }

     

       121
       121
       +
        

     

       122
       122
       +
        QString

     

       123
       123
       +
       @@ -83,4 +83,13 @@ PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configuration

     

       124
       124
       +
            m_config->setDefaultId( moduleInstanceKey() );

     

       125
       125
       +
            m_config->setConfigurationMap( configurationMap );

     

       126
       126
       +
            Calamares::QmlViewStep::setConfigurationMap( configurationMap );  // call parent implementation last

     

       127
       127
       +
       +    /*bool labels_ok = false;

     

       128
       128
       +
       +    auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

     

       129
       129
       +
       +    if ( labels_ok )

     

       130
       130
       +
       +    {

     

       131
       131
       +
       +        if ( labels.contains( "step" ) )

     

       132
       132
       +
       +        {

     

       133
       133
       +
       +            m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

     

       134
       134
       +
       +        }

     

       135
       135
       +
       +    }*/

     

       136
       136
       +
        }

+28

pkgs/tools/misc/calamares/partitions.patch

···

       1
       1
       +
       diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp

     

       2
       2
       +
       index c5b17c69e..353b6f964 100644

     

       3
       3
       +
       --- a/src/modules/partition/gui/CreatePartitionDialog.cpp

     

       4
       4
       +
       +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp

     

       5
       5
       +
       @@ -107,7 +107,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device,

     

       6
       6
       +
            {

     

       7
       7
       +
                // We need to ensure zfs is added to the list if the zfs module is enabled

     

       8
       8
       +
                if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )

     

       9
       9
       +
       -             || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )

     

       10
       10
       +
       +             || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended

     

       11
       11
       +
       +             && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix ) )

     

       12
       12
       +
                {

     

       13
       13
       +
                    fsNames << userVisibleFS( fs );  // This is put into the combobox

     

       14
       14
       +
                    if ( fs->type() == defaultFSType )

     

       15
       15
       +
       diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp

     

       16
       16
       +
       index 0bc35cabe..3cf8a7fa2 100644

     

       17
       17
       +
       --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp

     

       18
       18
       +
       +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp

     

       19
       19
       +
       @@ -95,7 +95,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,

     

       20
       20
       +
            {

     

       21
       21
       +
                // We need to ensure zfs is added to the list if the zfs module is enabled

     

       22
       22
       +
                if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )

     

       23
       23
       +
       -             || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )

     

       24
       24
       +
       +             || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended

     

       25
       25
       +
       +             && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix) )

     

       26
       26
       +
                {

     

       27
       27
       +
                    fsNames << userVisibleFS( fs );  // For the combo box

     

       28
       28
       +
                }

+85

pkgs/tools/misc/calamares/uimod.patch

···

       1
       1
       +
       diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp

     

       2
       2
       +
       index 6c5f9ad16..24d75e07b 100644

     

       3
       3
       +
       --- a/src/modules/finished/FinishedPage.cpp

     

       4
       4
       +
       +++ b/src/modules/finished/FinishedPage.cpp

     

       5
       5
       +
       @@ -71,7 +71,10 @@ FinishedPage::retranslate()

     

       6
       6
       +
                {

     

       7
       7
       +
                    ui->mainText->setText( tr( "<h1>All done.</h1><br/>"

     

       8
       8
       +
                                               "%1 has been set up on your computer.<br/>"

     

       9
       9
       +
       -                                       "You may now start using your new system." )

     

       10
       10
       +
       +                                       "You may now start using your new system.<br/>"

     

       11
       11
       +
       +                                       "You can change every setting later except the bootloader.<br/>"

     

       12
       12
       +
       +                                       "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"

     

       13
       13
       +
       +                                       "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>")

     

       14
       14
       +
                                               .arg( branding->versionedName() ) );

     

       15
       15
       +
                    ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"

     

       16
       16
       +
                                                         "<p>When this box is checked, your system will "

     

       17
       17
       +
       @@ -84,7 +87,10 @@ FinishedPage::retranslate()

     

       18
       18
       +
                    ui->mainText->setText( tr( "<h1>All done.</h1><br/>"

     

       19
       19
       +
                                               "%1 has been installed on your computer.<br/>"

     

       20
       20
       +
                                               "You may now restart into your new system, or continue "

     

       21
       21
       +
       -                                       "using the %2 Live environment." )

     

       22
       22
       +
       +                                       "using the %2 Live environment.<br/>"

     

       23
       23
       +
       +                                       "You can change every setting later except the bootloader.<br/>"

     

       24
       24
       +
       +                                       "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"

     

       25
       25
       +
       +                                       "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>")

     

       26
       26
       +
                                               .arg( branding->versionedName(), branding->productName() ) );

     

       27
       27
       +
                    ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"

     

       28
       28
       +
                                                         "<p>When this box is checked, your system will "

     

       29
       29
       +
       diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp

     

       30
       30
       +
       index 721329c1b..164b9945e 100644

     

       31
       31
       +
       --- a/src/modules/packagechooser/PackageChooserPage.cpp

     

       32
       32
       +
       +++ b/src/modules/packagechooser/PackageChooserPage.cpp

     

       33
       33
       +
       @@ -52,6 +52,7 @@ PackageChooserPage::currentChanged( const QModelIndex& index )

     

       34
       34
       +
            if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() )

     

       35
       35
       +
            {

     

       36
       36
       +
                ui->productName->setText( m_introduction.name.get() );

     

       37
       37
       +
       +        ui->productName->setStyleSheet("font-weight: bold");

     

       38
       38
       +
                ui->productScreenshot->setPixmap( m_introduction.screenshot );

     

       39
       39
       +
                ui->productDescription->setText( m_introduction.description.get() );

     

       40
       40
       +
            }

     

       41
       41
       +
       diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui

     

       42
       42
       +
       index d021b08b3..fecfa3060 100644

     

       43
       43
       +
       --- a/src/modules/packagechooser/page_package.ui

     

       44
       44
       +
       +++ b/src/modules/packagechooser/page_package.ui

     

       45
       45
       +
       @@ -38,19 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later

     

       46
       46
       +
             </item>

     

       47
       47
       +
             <item>

     

       48
       48
       +
       -      <layout class="QVBoxLayout" name="verticalLayout" stretch="1,30,1">

     

       49
       49
       +
       +      <layout class="QVBoxLayout" name="verticalLayout" stretch="30,1,1">

     

       50
       50
       +
       -       <item>

     

       51
       51
       +
       -        <widget class="QLabel" name="productName">

     

       52
       52
       +
       -         <property name="sizePolicy">

     

       53
       53
       +
       -          <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">

     

       54
       54
       +
       -           <horstretch>0</horstretch>

     

       55
       55
       +
       -           <verstretch>0</verstretch>

     

       56
       56
       +
       -          </sizepolicy>

     

       57
       57
       +
       -         </property>

     

       58
       58
       +
       -         <property name="text">

     

       59
       59
       +
       -          <string>Product Name</string>

     

       60
       60
       +
       -         </property>

     

       61
       61
       +
       -        </widget>

     

       62
       62
       +
       -       </item>

     

       63
       63
       +
               <item>

     

       64
       64
       +
                <widget class="FixedAspectRatioLabel" name="productScreenshot">

     

       65
       65
       +
                 <property name="sizePolicy">

     

       66
       66
       +
       @@ -67,6 +54,19 @@ SPDX-License-Identifier: GPL-3.0-or-later

     

       67
       67
       +
                 </property>

     

       68
       68
       +
                </widget>

     

       69
       69
       +
               </item>

     

       70
       70
       +
       +       <item>

     

       71
       71
       +
       +        <widget class="QLabel" name="productName">

     

       72
       72
       +
       +         <property name="sizePolicy">

     

       73
       73
       +
       +          <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">

     

       74
       74
       +
       +           <horstretch>0</horstretch>

     

       75
       75
       +
       +           <verstretch>0</verstretch>

     

       76
       76
       +
       +          </sizepolicy>

     

       77
       77
       +
       +         </property>

     

       78
       78
       +
       +         <property name="text">

     

       79
       79
       +
       +          <string>Product Name</string>

     

       80
       80
       +
       +         </property>

     

       81
       81
       +
       +        </widget>

     

       82
       82
       +
       +       </item>

     

       83
       83
       +
               <item>

     

       84
       84
       +
                <widget class="QLabel" name="productDescription">

     

       85
       85
       +
                 <property name="sizePolicy">

+109

pkgs/tools/misc/calamares/unfreeq.patch

···

       1
       1
       +
       diff --git a/src/modules/packagechooserq/packagechooserq.qrc b/src/modules/packagechooserq/packagechooserq.qrc

     

       2
       2
       +
       index 1b892dce1..ee80a934b 100644

     

       3
       3
       +
       --- a/src/modules/packagechooserq/packagechooserq.qrc

     

       4
       4
       +
       +++ b/src/modules/packagechooserq/packagechooserq.qrc

     

       5
       5
       +
       @@ -4,5 +4,6 @@

     

       6
       6
       +
                <file>images/libreoffice.jpg</file>

     

       7
       7
       +
                <file>images/no-selection.png</file>

     

       8
       8
       +
                <file>images/plasma.png</file>

     

       9
       9
       +
       +        <file>packagechooserq@unfree.qml</file>

     

       10
       10
       +
            </qresource>

     

       11
       11
       +
        </RCC>

     

       12
       12
       +
       diff --git a/src/modules/packagechooserq/packagechooserq@unfree.qml b/src/modules/packagechooserq/packagechooserq@unfree.qml

     

       13
       13
       +
       new file mode 100644

     

       14
       14
       +
       index 000000000..cb87d864a

     

       15
       15
       +
       --- /dev/null

     

       16
       16
       +
       +++ b/src/modules/packagechooserq/packagechooserq@unfree.qml

     

       17
       17
       +
       @@ -0,0 +1,75 @@

     

       18
       18
       +
       +/* === This file is part of Calamares - <https://calamares.io> ===

     

       19
       19
       +
       + *

     

       20
       20
       +
       + *   SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>

     

       21
       21
       +
       + *   SPDX-License-Identifier: GPL-3.0-or-later

     

       22
       22
       +
       + *

     

       23
       23
       +
       + *   Calamares is Free Software: see the License-Identifier above.

     

       24
       24
       +
       + *

     

       25
       25
       +
       + */

     

       26
       26
       +
       +

     

       27
       27
       +
       +import io.calamares.core 1.0

     

       28
       28
       +
       +import io.calamares.ui 1.0

     

       29
       29
       +
       +

     

       30
       30
       +
       +import QtQuick 2.15

     

       31
       31
       +
       +import QtQuick.Controls 2.15

     

       32
       32
       +
       +import QtQuick.Layouts 1.3

     

       33
       33
       +
       +

     

       34
       34
       +
       +Item {

     

       35
       35
       +
       +    

     

       36
       36
       +
       +    SystemPalette {

     

       37
       37
       +
       +        id: palette

     

       38
       38
       +
       +        colorGroup: SystemPalette.Active

     

       39
       39
       +
       +    }

     

       40
       40
       +
       +

     

       41
       41
       +
       +    width:  parent.width

     

       42
       42
       +
       +    height: parent.height

     

       43
       43
       +
       +

     

       44
       44
       +
       +    Rectangle {

     

       45
       45
       +
       +        anchors.fill: parent

     

       46
       46
       +
       +        color: palette.window

     

       47
       47
       +
       +

     

       48
       48
       +
       +        ButtonGroup {

     

       49
       49
       +
       +            id: switchGroup

     

       50
       50
       +
       +        }

     

       51
       51
       +
       +

     

       52
       52
       +
       +        Column {

     

       53
       53
       +
       +            id: column

     

       54
       54
       +
       +            anchors.centerIn: parent

     

       55
       55
       +
       +            spacing: 5

     

       56
       56
       +
       +

     

       57
       57
       +
       +            Rectangle {

     

       58
       58
       +
       +                width: 700

     

       59
       59
       +
       +                height: 200

     

       60
       60
       +
       +                color: palette.base

     

       61
       61
       +
       +                radius: 10

     

       62
       62
       +
       +                border.width: 0

     

       63
       63
       +
       +                Text {

     

       64
       64
       +
       +                    color: palette.text

     

       65
       65
       +
       +                    width: 600

     

       66
       66
       +
       +                    height: 150

     

       67
       67
       +
       +                    anchors.centerIn: parent

     

       68
       68
       +
       +                    text: qsTr("NixOS is fully open source, but it also provides software packages with unfree licenses. By default unfree packages are not allowed, but you can enable it here. If you check this box, software installed might have additional End User License Agreements (EULAs) attached. If not enabled, some hardware might not work fully when no suitable open source drivers are available.<br/>")

     

       69
       69
       +
       +                    font.pointSize: 12

     

       70
       70
       +
       +                    wrapMode: Text.WordWrap

     

       71
       71
       +
       +                }

     

       72
       72
       +
       +

     

       73
       73
       +
       +                CheckBox {

     

       74
       74
       +
       +                    id: element2

     

       75
       75
       +
       +                    anchors.horizontalCenter: parent.horizontalCenter

     

       76
       76
       +
       +                    y: 145

     

       77
       77
       +
       +                    text: qsTr("Allow unfree software")

     

       78
       78
       +
       +                    checked: false

     

       79
       79
       +
       +

     

       80
       80
       +
       +                    onCheckedChanged: {

     

       81
       81
       +
       +                        if ( checked ) {

     

       82
       82
       +
       +                            config.packageChoice = "unfree"

     

       83
       83
       +
       +                        } else {

     

       84
       84
       +
       +                            config.packageChoice = "free"

     

       85
       85
       +
       +                        }

     

       86
       86
       +
       +                    }

     

       87
       87
       +
       +                }

     

       88
       88
       +
       +            }

     

       89
       89
       +
       +        }

     

       90
       90
       +
       +    }

     

       91
       91
       +
       +

     

       92
       92
       +
       +}

     

       93
       93
       +
       diff --git a/src/modules/packagechooserq/unfree.conf b/src/modules/packagechooserq/unfree.conf

     

       94
       94
       +
       new file mode 100644

     

       95
       95
       +
       index 000000000..da79a8eac

     

       96
       96
       +
       --- /dev/null

     

       97
       97
       +
       +++ b/src/modules/packagechooserq/unfree.conf

     

       98
       98
       +
       @@ -0,0 +1,11 @@

     

       99
       99
       +
       +# SPDX-FileCopyrightText: no

     

       100
       100
       +
       +# SPDX-License-Identifier: CC0-1.0

     

       101
       101
       +
       +#

     

       102
       102
       +
       +---

     

       103
       103
       +
       +qmlLabel:

     

       104
       104
       +
       +    label: "Unfree Software"

     

       105
       105
       +
       +method: legacy

     

       106
       106
       +
       +mode: required

     

       107
       107
       +
       +labels:

     

       108
       108
       +
       +    step: "Unfree Software"

     

       109
       109
       +
       +packageChoice: free

+31

pkgs/tools/misc/calamares/userjob.patch

···

       1
       1
       +
       diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp

     

       2
       2
       +
       index eedfd274d..0f3e78848 100644

     

       3
       3
       +
       --- a/src/modules/users/Config.cpp

     

       4
       4
       +
       +++ b/src/modules/users/Config.cpp

     

       5
       5
       +
       @@ -972,26 +972,11 @@ Config::createJobs() const

     

       6
       6
       +
        

     

       7
       7
       +
            Calamares::Job* j;

     

       8
       8
       +
        

     

       9
       9
       +
       -    if ( !m_sudoersGroup.isEmpty() )

     

       10
       10
       +
       -    {

     

       11
       11
       +
       -        j = new SetupSudoJob( m_sudoersGroup, m_sudoStyle );

     

       12
       12
       +
       -        jobs.append( Calamares::job_ptr( j ) );

     

       13
       13
       +
       -    }

     

       14
       14
       +
       -

     

       15
       15
       +
       -    j = new SetupGroupsJob( this );

     

       16
       16
       +
       -    jobs.append( Calamares::job_ptr( j ) );

     

       17
       17
       +
       -

     

       18
       18
       +
       -    j = new CreateUserJob( this );

     

       19
       19
       +
       -    jobs.append( Calamares::job_ptr( j ) );

     

       20
       20
       +
       -

     

       21
       21
       +
            j = new SetPasswordJob( loginName(), userPassword() );

     

       22
       22
       +
            jobs.append( Calamares::job_ptr( j ) );

     

       23
       23
       +
        

     

       24
       24
       +
            j = new SetPasswordJob( "root", rootPassword() );

     

       25
       25
       +
            jobs.append( Calamares::job_ptr( j ) );

     

       26
       26
       +
        

     

       27
       27
       +
       -    j = new SetHostNameJob( this );

     

       28
       28
       +
       -    jobs.append( Calamares::job_ptr( j ) );

     

       29
       29
       +
       -

     

       30
       30
       +
            return jobs;

     

       31
       31
       +
        }

pkgs/top-level/all-packages.nix

···

       2855
       2855
        
           python = python3;

     

       2856
       2856
        
           boost = boost.override { enablePython = true; python = python3; };

     

       2857
       2857
        
         };

     

       2858
       2858
       +
         calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });

     

       2858
       2859
        
         calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions {};

     

       2859
       2860
        
       

     

       2860
       2861
        
         calendar-cli = callPackage ../tools/networking/calendar-cli { };