When this box is checked, your system will " +@@ -84,7 +87,10 @@ FinishedPage::retranslate() + ui->mainText->setText( tr( "
When this box is checked, your system will "
+diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
+index 721329c1b..164b9945e 100644
+--- a/src/modules/packagechooser/PackageChooserPage.cpp
++++ b/src/modules/packagechooser/PackageChooserPage.cpp
+@@ -52,6 +52,7 @@ PackageChooserPage::currentChanged( const QModelIndex& index )
+ if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() )
+ {
+ ui->productName->setText( m_introduction.name.get() );
++ ui->productName->setStyleSheet("font-weight: bold");
+ ui->productScreenshot->setPixmap( m_introduction.screenshot );
+ ui->productDescription->setText( m_introduction.description.get() );
+ }
+diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui
+index d021b08b3..fecfa3060 100644
+--- a/src/modules/packagechooser/page_package.ui
++++ b/src/modules/packagechooser/page_package.ui
+@@ -38,19 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
+
+
")
++ font.pointSize: 12
++ wrapMode: Text.WordWrap
++ }
++
++ CheckBox {
++ id: element2
++ anchors.horizontalCenter: parent.horizontalCenter
++ y: 145
++ text: qsTr("Allow unfree software")
++ checked: false
++
++ onCheckedChanged: {
++ if ( checked ) {
++ config.packageChoice = "unfree"
++ } else {
++ config.packageChoice = "free"
++ }
++ }
++ }
++ }
++ }
++ }
++
++}
+diff --git a/src/modules/packagechooserq/unfree.conf b/src/modules/packagechooserq/unfree.conf
+new file mode 100644
+index 000000000..da79a8eac
+--- /dev/null
++++ b/src/modules/packagechooserq/unfree.conf
+@@ -0,0 +1,11 @@
++# SPDX-FileCopyrightText: no
++# SPDX-License-Identifier: CC0-1.0
++#
++---
++qmlLabel:
++ label: "Unfree Software"
++method: legacy
++mode: required
++labels:
++ step: "Unfree Software"
++packageChoice: free
diff --git a/pkgs/tools/misc/calamares/userjob.patch b/pkgs/tools/misc/calamares/userjob.patch
new file mode 100644
index 00000000000..a0bfea9bb05
--- /dev/null
+++ b/pkgs/tools/misc/calamares/userjob.patch
@@ -0,0 +1,31 @@
+diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
+index eedfd274d..0f3e78848 100644
+--- a/src/modules/users/Config.cpp
++++ b/src/modules/users/Config.cpp
+@@ -972,26 +972,11 @@ Config::createJobs() const
+
+ Calamares::Job* j;
+
+- if ( !m_sudoersGroup.isEmpty() )
+- {
+- j = new SetupSudoJob( m_sudoersGroup, m_sudoStyle );
+- jobs.append( Calamares::job_ptr( j ) );
+- }
+-
+- j = new SetupGroupsJob( this );
+- jobs.append( Calamares::job_ptr( j ) );
+-
+- j = new CreateUserJob( this );
+- jobs.append( Calamares::job_ptr( j ) );
+-
+ j = new SetPasswordJob( loginName(), userPassword() );
+ jobs.append( Calamares::job_ptr( j ) );
+
+ j = new SetPasswordJob( "root", rootPassword() );
+ jobs.append( Calamares::job_ptr( j ) );
+
+- j = new SetHostNameJob( this );
+- jobs.append( Calamares::job_ptr( j ) );
+-
+ return jobs;
+ }
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index 064590ef979..c1abe01be56 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,6 +1,6 @@
{ mkDerivation, fetchurl, lib, makeWrapper
, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
-, kconfig, kcrash, kinit, kpmcore
+, kconfig, kcrash, kinit, kpmcore, polkit-qt
, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux
, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs
, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs
@@ -41,16 +41,16 @@ let
in mkDerivation rec {
pname = "partitionmanager";
# NOTE: When changing this version, also change the version of `kpmcore`.
- version = "4.2.0";
+ version = "22.04.0";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
- hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg=";
+ url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";
+ hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];
- propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
+ propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ];
postFixup = ''
wrapProgram $out/bin/partitionmanager \
diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix
index 98b297fe831..20c172fc501 100644
--- a/pkgs/tools/security/jwt-cli/default.nix
+++ b/pkgs/tools/security/jwt-cli/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jwt-cli";
- version = "5.0.2";
+ version = "5.0.3";
src = fetchFromGitHub {
owner = "mike-engel";
repo = pname;
rev = version;
- sha256 = "0w7fqmh8gihknvdamnq1n519253d4lxrpv378jajca9x906rqy1r";
+ sha256 = "01aqqjynfcrn3m36hfjwcfh870imcd0hj5gifxzpnjiqjwpvys59";
};
- cargoSha256 = "0b7m23azy8cb8d5wkawnw6nv8k7lfnfwc06swmbkfvg8vcxfsacs";
+ cargoSha256 = "1n4gmqmi975cd2zyrf0yi4gbxjjg9f99xa191mgmrdyyij7id3cf";
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 94cf34a7d27..cfb1ed91972 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1311,6 +1311,7 @@ mapAliases ({
uberwriter = apostrophe; # Added 2020-04-23
ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21
+ uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02
ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22
ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11
ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a5abce5cfb..f6a6fb4a3df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2867,6 +2867,8 @@ with pkgs;
python = python3;
boost = boost.override { enablePython = true; python = python3; };
};
+ calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });
+ calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions {};
calendar-cli = callPackage ../tools/networking/calendar-cli { };
@@ -22540,8 +22542,6 @@ with pkgs;
check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { };
- uchiwa = callPackage ../servers/monitoring/uchiwa { };
-
shishi = callPackage ../servers/shishi {
pam = if stdenv.isLinux then pam else null;
# see also openssl, which has/had this same trick
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index 7665815d412..d553b624039 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -94,6 +94,21 @@ let
'';
};
+ showDerivationWarnings = mkOption {
+ type = types.listOf (types.enum [ "maintainerless" ]);
+ default = [];
+ description = ''
+ Which warnings to display for potentially dangerous
+ or deprecated values passed into `stdenv.mkDerivation`.
+
+ A list of warnings can be found in
+ /pkgs/stdenv/generic/check-meta.nix.
+
+ This is not a stable interface; warnings may be added, changed
+ or removed without prior notice.
+ '';
+ };
+
};
in {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a9f5f4faa1..1ce394f4cdb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -106,6 +106,7 @@ in {
inherit buildSetupcfg;
inherit (callPackage ../development/interpreters/python/hooks { })
+ sphinxHook
condaInstallHook
condaUnpackHook
eggUnpackHook