From efb7d4f32774bad72e9f31e205cbf5efc9c4b28b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Jan 2025 02:10:33 +0100 Subject: [PATCH 1/2] util-linuxMinimal: build without pam and shadow These depend on python via audit preventing the use of libuuid from util-linux in python builds. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f2de6a7b18d..cdcabbf17d86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12502,6 +12502,8 @@ with pkgs; util-linuxMinimal = util-linux.override { nlsSupport = false; ncursesSupport = false; + pamSupport = false; + shadowSupport = false; systemdSupport = false; translateManpages = false; }; From 94e717e8ff1283e5120759ebab13f70939d895d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Jan 2025 02:11:22 +0100 Subject: [PATCH 2/2] cpython: provide libuuid for the _uuid module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relying on libuuid offers synchronization primitives, so that "no two processes can obtain the same UUID"ยน. [1] https://docs.python.org/3/library/uuid.html#module-uuid --- pkgs/development/interpreters/python/cpython/default.nix | 2 ++ pkgs/development/interpreters/python/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0cb05268d43..eb839b446c13 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -15,6 +15,7 @@ , bzip2 , expat , libffi +, libuuid , libxcrypt , mpdecimal , ncurses @@ -166,6 +167,7 @@ let bzip2 expat libffi + libuuid libxcrypt mpdecimal ncurses diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 582c37cd2c79..edc187ac2a16 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -117,6 +117,7 @@ in { gdbm = null; sqlite = null; tzdata = null; + libuuid = null; libffi = libffiBoot; # without test suite stripConfig = true; stripIdlelib = true;