===
-+ *
-+ * SPDX-FileCopyrightText: 2021 Anke Boersma
-+ * SPDX-License-Identifier: GPL-3.0-or-later
-+ *
-+ * Calamares is Free Software: see the License-Identifier above.
-+ *
-+ */
-+
-+import io.calamares.core 1.0
-+import io.calamares.ui 1.0
-+
-+import QtQuick 2.15
-+import QtQuick.Controls 2.15
-+import QtQuick.Layouts 1.3
-+
-+Item {
-+
-+ SystemPalette {
-+ id: palette
-+ colorGroup: SystemPalette.Active
-+ }
-+
-+ width: parent.width
-+ height: parent.height
-+
-+ Rectangle {
-+ anchors.fill: parent
-+ color: palette.window
-+
-+ ButtonGroup {
-+ id: switchGroup
-+ }
-+
-+ Column {
-+ id: column
-+ anchors.centerIn: parent
-+ spacing: 5
-+
-+ Rectangle {
-+ width: 700
-+ height: 250
-+ color: palette.base
-+ radius: 10
-+ border.width: 0
-+ Text {
-+ color: palette.text
-+ width: 600
-+ height: 200
-+ anchors.centerIn: parent
-+ text: qsTr("NixOS is fully open source, but it also provides optional software packages that do not respect users' freedom to run, copy, distribute, study, change and improve the software, and are commonly not open source. By default such \"unfree\" packages are not allowed, but you can enable it here. If you check this box, you agree that unfree software may be installed which might have additional End User License Agreements (EULAs) that you need to agree to. If not enabled, some hardware (notably Nvidia GPUs and some WiFi chips) might not work or not work optimally.
")
-+ font.pointSize: 12
-+ wrapMode: Text.WordWrap
-+ }
-+
-+ CheckBox {
-+ id: element2
-+ anchors.horizontalCenter: parent.horizontalCenter
-+ y: 190
-+ 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/0005-Modifies-finished-module-to-add-some-NixOS-resources.patch b/pkgs/tools/misc/calamares/0005-Modifies-finished-module-to-add-some-NixOS-resources.patch
deleted file mode 100644
index 7155f0b7870d..000000000000
--- a/pkgs/tools/misc/calamares/0005-Modifies-finished-module-to-add-some-NixOS-resources.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Victor Fuentes
-Date: Thu, 1 Aug 2024 16:01:53 -0400
-Subject: [PATCH] Modifies finished module to add some NixOS resources.
-
-Modifies packagechooser module to change the UI.
----
- src/modules/finished/FinishedPage.cpp | 12 +++++---
- .../packagechooser/PackageChooserPage.cpp | 1 +
- src/modules/packagechooser/page_package.ui | 28 +++++++++----------
- 3 files changed, 23 insertions(+), 18 deletions(-)
-
-diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp
-index 51be52678..307607232 100644
---- a/src/modules/finished/FinishedPage.cpp
-+++ b/src/modules/finished/FinishedPage.cpp
-@@ -74,8 +74,10 @@ FinishedPage::retranslate()
- {
- ui->mainText->setText( tr( "All done.
"
- "%1 has been set up on your computer.
"
-- "You may now start using your new system.",
-- "@info" )
-+ "You may now start using your new system.
"
-+ "You can change every setting later except the bootloader.
"
-+ "Check the manual for instructions on how to install software, upgrade the system or enable services.
"
-+ "You can find ways to get in touch with the community on the website!", "@info" )
- .arg( branding->versionedName() ) );
- ui->restartCheckBox->setToolTip( tr( ""
- "When this box is checked, your system will "
-@@ -89,8 +91,10 @@ FinishedPage::retranslate()
- ui->mainText->setText( tr( "
All done.
"
- "%1 has been installed on your computer.
"
- "You may now restart into your new system, or continue "
-- "using the %2 Live environment.",
-- "@info" )
-+ "using the %2 Live environment.
"
-+ "You can change every setting later except the bootloader.
"
-+ "Check the manual for instructions on how to install software, upgrade the system or enable services.
"
-+ "You can find ways to get in touch with the community on the website!", "@info" )
- .arg( branding->versionedName(), branding->productName() ) );
- ui->restartCheckBox->setToolTip( tr( ""
- "When this box is checked, your system will "
-diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
-index 44a570d2f..4dc931bf3 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 2ab5b7f13..bed462069 100644
---- a/src/modules/packagechooser/page_package.ui
-+++ b/src/modules/packagechooser/page_package.ui
-@@ -37,20 +37,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
-
- -
--
--
-
--
--
--
-- 0
-- 0
--
--
--
-- Product Name
--
--
--
-+
- -
-
-
-@@ -67,6 +54,19 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
-
-
-+ -
-+
-+
-+
-+ 0
-+ 0
-+
-+
-+
-+ Product Name
-+
-+
-+
- -
-
-
diff --git a/pkgs/tools/misc/calamares/0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch b/pkgs/tools/misc/calamares/0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch
deleted file mode 100644
index 9c65859e0fc4..000000000000
--- a/pkgs/tools/misc/calamares/0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Victor Fuentes
-Date: Thu, 31 Oct 2024 10:34:25 -0700
-Subject: [PATCH] Fix setting the kayboard layout on GNOME wayland.
-
-By default the module uses the setxkbmap, which will not change the
-keyboard
----
- src/modules/keyboard/Config.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
-index 54ee7649c..60fe2d7d0 100644
---- a/src/modules/keyboard/Config.cpp
-+++ b/src/modules/keyboard/Config.cpp
-@@ -306,6 +306,10 @@ Config::applyXkb()
- m_additionalLayoutInfo.groupSwitcher ) );
- QProcess::execute( "setxkbmap", basicArguments );
-
-+ QString xkbmap = QString( "[('xkb','%1\%2'),('xkb','%3\%4')]").arg(
-+ m_selectedLayout, ((!m_selectedVariant.isEmpty()) ? "+" + m_selectedVariant : ""),
-+ m_additionalLayoutInfo.additionalLayout, ((!m_additionalLayoutInfo.additionalVariant.isEmpty()) ? "+" + m_additionalLayoutInfo.additionalVariant : ""));
-+ QProcess::execute( "sh", { "-c", "if command -v gsettings; then gsettings set org.gnome.desktop.input-sources sources \"$0\"; fi", xkbmap });
- cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
- << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
- << " since current layout is not ASCII-capable)";
-@@ -314,6 +318,8 @@ Config::applyXkb()
- {
- basicArguments.append( xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
- QProcess::execute( "setxkbmap", basicArguments );
-+ QString xkbmap = QString( "[('xkb','%1\%2')]").arg( m_selectedLayout, ((!m_selectedVariant.isEmpty()) ? "+" + m_selectedVariant : "") );
-+ QProcess::execute( "sh", { "-c", "if command -v gsettings; then gsettings set org.gnome.desktop.input-sources sources \"$0\"; fi", xkbmap });
- cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
- }
- m_applyTimer.stop();
\ No newline at end of file
diff --git a/pkgs/tools/misc/calamares/0008-Change-default-location-where-calamares-searches-for.patch b/pkgs/tools/misc/calamares/0008-Change-default-location-where-calamares-searches-for.patch
deleted file mode 100644
index 58b53758609f..000000000000
--- a/pkgs/tools/misc/calamares/0008-Change-default-location-where-calamares-searches-for.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Victor Fuentes
-Date: Thu, 1 Aug 2024 16:03:53 -0400
-Subject: [PATCH] Change default location where calamares searches for locales
-
----
- src/modules/locale/Config.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
-index 8fa17a768..79b5419b6 100644
---- a/src/modules/locale/Config.cpp
-+++ b/src/modules/locale/Config.cpp
-@@ -48,7 +48,7 @@ loadLocales( const QString& localeGenPath )
- // supported locales. We first try that one, and if it doesn't exist, we fall back
- // to parsing the lines from locale.gen
- localeGenLines.clear();
-- QFile supported( "/usr/share/i18n/SUPPORTED" );
-+ QFile supported( "/run/current-system/sw/share/i18n/SUPPORTED" );
- QByteArray ba;
-
- if ( supported.exists() && supported.open( QIODevice::ReadOnly | QIODevice::Text ) )
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
deleted file mode 100644
index ecab0d9c0fab..000000000000
--- a/pkgs/tools/misc/calamares/default.nix
+++ /dev/null
@@ -1,144 +0,0 @@
-{
- lib,
- fetchurl,
- boost,
- cmake,
- extra-cmake-modules,
- kparts,
- kpmcore,
- kirigami2,
- kservice,
- libatasmart,
- libxcb,
- yaml-cpp,
- libpwquality,
- parted,
- polkit-qt,
- python3,
- qtbase,
- qtquickcontrols,
- qtsvg,
- qttools,
- qtwebengine,
- util-linux,
- tzdata,
- ckbcomp,
- xkeyboard_config,
- mkDerivation,
- nixos-extensions ? false,
- # passthru.tests
- calamares-nixos,
-}:
-
-mkDerivation rec {
- pname = "calamares";
- version = "3.3.13";
-
- # release including submodule
- src = fetchurl {
- url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz";
- sha256 = "sha256-5Jz32JTgK6BImM0HcMtXi04k39CAirdmC/lbskVmSNQ=";
- };
-
- # On major changes, or when otherwise required, you *must* :
- # 1. reformat the patches,
- # 2. `git am path/to/00*.patch` them into a calamares worktree,
- # 3. rebase to the more recent calamares version,
- # 4. and export the patches again via
- # `git -c format.signoff=false format-patch v${version} --no-numbered --zero-commit --no-signature`.
- patches = lib.optionals nixos-extensions [
- ./0001-Modifies-the-users-module-to-only-set-passwords-of-u.patch
- ./0002-Makes-calamares-search-run-current-system-sw-share-c.patch
- ./0003-Uses-pkexec-within-modules-in-order-to-run-calamares.patch
- ./0004-Adds-unfree-qml-to-packagechooserq.patch
- ./0005-Modifies-finished-module-to-add-some-NixOS-resources.patch
- ./0006-Remove-options-for-unsupported-partition-types.patch
- ./0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch
- ./0008-Change-default-location-where-calamares-searches-for.patch
- ];
-
- nativeBuildInputs = [
- cmake
- extra-cmake-modules
- ];
- buildInputs = [
- boost
- kparts.dev
- kpmcore.out
- kservice.dev
- kirigami2
- libatasmart
- libxcb
- yaml-cpp
- libpwquality
- parted
- polkit-qt
- python3
- qtbase
- qtquickcontrols
- qtsvg
- qttools
- qtwebengine.dev
- util-linux
- ];
-
- cmakeFlags = [
- "-DPYTHON_LIBRARY=${python3}/lib/lib${python3.libPrefix}.so"
- "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
- "-DCMAKE_VERBOSE_MAKEFILE=True"
- "-DWITH_PYTHONQT:BOOL=ON"
- ];
-
- POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions";
-
- postPatch = ''
- # Run calamares without root. Other patches make it functional as a normal user
- sed -e "s,pkexec calamares,calamares -D6," \
- -i calamares.desktop
-
- sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=calamares," \
- -i calamares.desktop
-
- # Fix desktop reference with wayland
- mv calamares.desktop io.calamares.calamares.desktop
-
- sed -e "s,calamares.desktop,io.calamares.calamares.desktop," \
- -i CMakeLists.txt
-
- sed -e "s,/usr/bin/calamares,$out/bin/calamares," \
- -i com.github.calamares.calamares.policy
-
- sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \
- -i src/modules/locale/SetTimezoneJob.cpp \
- -i src/libcalamares/locale/TimeZone.cpp
-
- sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \
- -i src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
-
- sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \
- -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
-
- sed "s,\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR},''${out}/share/polkit-1/actions," \
- -i CMakeLists.txt
- '';
-
- passthru.tests = {
- inherit calamares-nixos;
- };
-
- meta = with lib; {
- description = "Distribution-independent installer framework";
- homepage = "https://calamares.io/";
- license = with licenses; [
- gpl3Plus
- bsd2
- cc0
- ];
- maintainers = with maintainers; [
- manveru
- vlinkz
- ];
- platforms = platforms.linux;
- mainProgram = "calamares";
- };
-}
diff --git a/pkgs/tools/package-management/nix/common-autoconf.nix b/pkgs/tools/package-management/nix/common-autoconf.nix
index a33a48e00a1f..8dfefe1544a2 100644
--- a/pkgs/tools/package-management/nix/common-autoconf.nix
+++ b/pkgs/tools/package-management/nix/common-autoconf.nix
@@ -22,7 +22,6 @@
assert (hash == null) -> (src != null);
let
atLeast24 = lib.versionAtLeast version "2.4";
- atLeast224 = lib.versionAtLeast version "2.24pre";
atLeast225 = lib.versionAtLeast version "2.25pre";
in
{
@@ -118,7 +117,7 @@ let
]
++ lib.optional stdenv.hostPlatform.isMusl "fortify";
- nativeInstallCheckInputs = lib.optionals atLeast224 [
+ nativeInstallCheckInputs = [
git
man
];
@@ -131,21 +130,11 @@ let
flex
jq
]
- ++ lib.optionals enableDocumentation (
- if atLeast224 then
- [
- (lib.getBin lowdown-unsandboxed)
- mdbook
- mdbook-linkcheck
- ]
- else
- [
- libxslt
- libxml2
- docbook_xsl_ns
- docbook5
- ]
- )
+ ++ lib.optionals enableDocumentation [
+ (lib.getBin lowdown-unsandboxed)
+ mdbook
+ mdbook-linkcheck
+ ]
++ lib.optionals stdenv.hostPlatform.isLinux [
util-linuxMinimal
];
@@ -163,8 +152,6 @@ let
gtest
libarchive
lowdown
- ]
- ++ lib.optionals atLeast224 [
libgit2
toml11
rapidcheck
@@ -184,8 +171,6 @@ let
propagatedBuildInputs = [
boehmgc
- ]
- ++ lib.optionals atLeast224 [
nlohmann_json
];
@@ -204,24 +189,7 @@ let
chmod u+w $out/lib/*.so.*
patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.*
''}
- ''
- +
- # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which
- # removes config.nix entirely and is not present in 2.3.x, we need to
- # patch around an issue where the Nix configure step pulls in the build
- # system's bash and other utilities when cross-compiling.
- lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && !atLeast224) ''
- mkdir tmp/
- substitute corepkgs/config.nix.in tmp/config.nix.in \
- --subst-var-by bash ${bash}/bin/bash \
- --subst-var-by coreutils ${coreutils}/bin \
- --subst-var-by bzip2 ${bzip2}/bin/bzip2 \
- --subst-var-by gzip ${gzip}/bin/gzip \
- --subst-var-by xz ${xz}/bin/xz \
- --subst-var-by tar ${gnutar}/bin/tar \
- --subst-var-by tr ${coreutils}/bin/tr
- mv tmp/config.nix.in corepkgs/config.nix.in
- '';
+ '';
configureFlags = [
"--with-store-dir=${storeDir}"
@@ -235,7 +203,7 @@ let
++ lib.optionals stdenv.hostPlatform.isLinux [
"--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
]
- ++ lib.optionals (atLeast224 && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [
+ ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [
"--enable-embedded-sandbox-shell"
]
++
@@ -252,7 +220,7 @@ let
# RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
"--disable-seccomp-sandboxing"
]
- ++ lib.optionals (atLeast224 && stdenv.cc.isGNU && !enableStatic) [
+ ++ lib.optionals (stdenv.cc.isGNU && !enableStatic) [
"--enable-lto"
];
@@ -277,7 +245,7 @@ let
installFlags = [ "sysconfdir=$(out)/etc" ];
doInstallCheck = true;
- installCheckTarget = if atLeast224 then "installcheck" else null;
+ installCheckTarget = "installcheck";
# socket path becomes too long otherwise
preInstallCheck =
@@ -290,10 +258,10 @@ let
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
''
# See https://github.com/NixOS/nix/issues/5687
- + lib.optionalString (atLeast224 && stdenv.hostPlatform.isDarwin) ''
+ + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
echo "exit 99" > tests/gc-non-blocking.sh
'' # TODO: investigate why this broken
- + lib.optionalString (atLeast224 && stdenv.hostPlatform.system == "aarch64-linux") ''
+ + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") ''
echo "exit 0" > tests/functional/flakes/show.sh
''
+ ''
@@ -301,7 +269,7 @@ let
export MANPATH=$man/share/man:$MANPATH
'';
- separateDebugInfo = stdenv.hostPlatform.isLinux && (atLeast224 -> !enableStatic);
+ separateDebugInfo = stdenv.hostPlatform.isLinux && !enableStatic;
enableParallelBuilding = true;
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 982d52c5087b..231f514a627b 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -147,32 +147,6 @@ lib.makeExtensible (
self:
(
{
- nix_2_3 =
- (commonAutoconf {
- version = "2.3.18";
- hash = "sha256-jBz2Ub65eFYG+aWgSI3AJYvLSghio77fWQiIW1svA9U=";
- patches = [
- patch-monitorfdhup
- ];
- self_attribute_name = "nix_2_3";
- knownVulnerabilities = [
- "CVE-2024-38531"
- "CVE-2024-47174"
- "CVE-2025-46415"
- "CVE-2025-46416"
- "CVE-2025-52991"
- "CVE-2025-52992"
- "CVE-2025-52993"
- ];
- maintainers = with lib.maintainers; [ flokli ];
- teams = [ ];
- }).overrideAttrs
- {
- # https://github.com/NixOS/nix/issues/10222
- # spurious test/add.sh failures
- enableParallelChecking = false;
- };
-
nix_2_24 = commonAutoconf {
version = "2.24.15";
hash = "sha256-GHqFHLxvRID2IEPUwIfRMp8epYQMFcvG9ogLzfWRbPc=";
@@ -229,23 +203,6 @@ lib.makeExtensible (
latest = self.nix_2_30;
- # The minimum Nix version supported by Nixpkgs
- # Note that some functionality *might* have been backported into this Nix version,
- # making this package an inaccurate representation of what features are available
- # in the actual lowest minver.nix *patch* version.
- minimum =
- let
- minver = import ../../../../lib/minver.nix;
- major = lib.versions.major minver;
- minor = lib.versions.minor minver;
- attribute = "nix_${major}_${minor}";
- nix = self.${attribute};
- in
- if !self ? ${attribute} then
- throw "The minimum supported Nix version is ${minver} (declared in lib/minver.nix), but pkgs.nixVersions.${attribute} does not exist."
- else
- nix;
-
# Read ./README.md before bumping a major release
stable = addFallbackPathsCheck self.nix_2_28;
}
@@ -265,6 +222,7 @@ lib.makeExtensible (
nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28.";
nix_2_25 = throw "nix_2_25 has been removed. use nix_2_28.";
+ minimum = throw "nixVersions.minimum has been removed. Use a specific version instead.";
unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake.";
}
)
diff --git a/pkgs/tools/package-management/nix/update-all.sh b/pkgs/tools/package-management/nix/update-all.sh
index a2b459e67e7f..d84b6f56a47f 100755
--- a/pkgs/tools/package-management/nix/update-all.sh
+++ b/pkgs/tools/package-management/nix/update-all.sh
@@ -11,9 +11,6 @@ nix_versions=$(nix eval --impure --json --expr "with import ./. { config.allowAl
for name in $nix_versions; do
minor_version=${name#nix_*_}
- if [[ "$name" = "nix_2_3" ]]; then # not maintained by the nix team
- continue
- fi
nix-update --override-filename "$SCRIPT_DIR/default.nix" --version-regex "(2\\.${minor_version}\..+)" --build --commit "nixVersions.$name"
done
@@ -25,9 +22,6 @@ stable_version_trimmed=${stable_version_full%.*}
for name in $nix_versions; do
minor_version=${name#nix_*_}
- if [[ "$name" = "nix_2_3" ]]; then # not maintained by the nix team
- continue
- fi
if [[ "$name" = "nix_${stable_version_trimmed//./_}" ]]; then
curl https://releases.nixos.org/nix/nix-$stable_version_full/fallback-paths.nix > "$NIXPKGS_DIR/nixos/modules/installer/tools/nix-fallback-paths.nix"
# nix-update will commit the file if it has changed
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bc616ce90640..d31ac7e68d93 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1435,7 +1435,7 @@ mapAliases {
nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17
nixStable = nixVersions.stable; # Added 2022-01-24
nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22
- nix_2_3 = nixVersions.nix_2_3;
+ nix_2_3 = throw "'nix_2_3' has been removed, because it was unmaintained and insecure."; # Converted to throw 2025-07-24
nixfmt-rfc-style =
if lib.oldestSupportedReleaseIsAtLeast 2511 then
lib.warnOnInstantiate
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79e50e499463..e87666ba948e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1760,9 +1760,9 @@ with pkgs;
lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { };
- plausible = callPackage ../servers/web-apps/plausible {
- elixir = elixir_1_17;
- beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; });
+ plausible = callPackage ../by-name/pl/plausible/package.nix {
+ elixir = elixir_1_18;
+ beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_18; });
};
reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };
@@ -1904,13 +1904,6 @@ with pkgs;
'';
});
- calamares = libsForQt5.callPackage ../tools/misc/calamares {
- boost = boost.override {
- enablePython = true;
- python = python3;
- };
- };
- calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });
candle = libsForQt5.callPackage ../applications/misc/candle { };
capstone = callPackage ../development/libraries/capstone { };
@@ -4256,10 +4249,6 @@ with pkgs;
ocamlPackages = ocaml-ng.ocamlPackages_4_12;
};
- slstatus = callPackage ../applications/misc/slstatus {
- conf = config.slstatus.conf or null;
- };
-
smpq = callPackage ../by-name/sm/smpq/package.nix {
stormlib = stormlib.overrideAttrs (old: {
version = "9.22";
@@ -15900,10 +15889,6 @@ with pkgs;
sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
- slock = callPackage ../misc/screensavers/slock {
- conf = config.slock.conf or null;
- };
-
snscrape = with python3Packages; toPythonApplication snscrape;
sourceAndTags = callPackage ../misc/source-and-tags {
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index b1ddef188d93..1b90e4bfdb66 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -3,13 +3,7 @@
officialRelease,
pkgs ? import nixpkgs.outPath { },
nix ? pkgs.nix,
- lib-tests ? import ../../lib/tests/release.nix {
- pkgs = import nixpkgs.outPath {
- config = {
- permittedInsecurePackages = [ "nix-2.3.18" ];
- };
- };
- },
+ lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; },
}:
pkgs.releaseTools.sourceTarball {
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 06f54b2c247c..67dd19a842ec 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -456,6 +456,7 @@ mapAliases ({
nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08
niko-home-control = throw "niko-home-control was removed because Home Assistant switched to nhc"; # added 2025-01-09
ninja-python = ninja; # add 2022-08-03
+ nixpkgs = throw "nixpkgs has been removed as its dependency pythonix was removed"; # added 2025-07-24
nose = throw "nose has been removed since it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12; please switch to pytest or another test runner/framework"; # added 2024-07-28
nose3 = throw "nose3 has been removed since it is unmaintained and does not work with Python 3.12"; # added 2024-07-28
nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21
@@ -589,6 +590,7 @@ mapAliases ({
python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07
python-picnic-api = throw "python-picnic-api was removed because Home Assistant switched to python-picnic-api2"; # added 2025-03-05
python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25
+ pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24
pytrends = throw "pytrends has been removed, as it no longer works and is abandoned upstream"; # added 2025-02-02
pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80fcbf3b192f..922161695787 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8089,6 +8089,8 @@ self: super: with self; {
(p: p.py)
];
+ libear = callPackage ../development/python-modules/libear { };
+
libevdev = callPackage ../development/python-modules/libevdev { };
libfdt = toPythonModule (
@@ -8224,6 +8226,8 @@ self: super: with self; {
}
);
+ libscanbuild = callPackage ../development/python-modules/libscanbuild { };
+
libselinux = lib.pipe pkgs.libselinux [
toPythonModule
(
@@ -10401,8 +10405,6 @@ self: super: with self; {
nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { };
- nixpkgs = callPackage ../development/python-modules/nixpkgs { };
-
nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { };
nixpkgs-updaters-library = callPackage ../development/python-modules/nixpkgs-updaters-library { };
@@ -14955,11 +14957,6 @@ self: super: with self; {
pythonfinder = callPackage ../development/python-modules/pythonfinder { };
- pythonix = callPackage ../development/python-modules/pythonix {
- nix = pkgs.nixVersions.nix_2_3;
- meson = pkgs.meson.override { python3 = self.python; };
- };
-
pythonkuma = callPackage ../development/python-modules/pythonkuma { };
pythonnet = callPackage ../development/python-modules/pythonnet { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 370f39cad304..f087876479c8 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -113,20 +113,7 @@ let
manual = pkgs.nixpkgs-manual.override { inherit nixpkgs; };
metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
- lib-tests = import ../../lib/tests/release.nix {
- pkgs = import nixpkgs (
- recursiveUpdate
- (recursiveUpdate {
- inherit system;
- config.allowUnsupportedSystem = true;
- } nixpkgsArgs)
- {
- config.permittedInsecurePackages = nixpkgsArgs.config.permittedInsecurePackages or [ ] ++ [
- "nix-2.3.18"
- ];
- }
- );
- };
+ lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
darwin-tested =