gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/python-modules/bundlewrap/default.nix
	pkgs/development/python-modules/coverage/default.nix
	pkgs/development/python-modules/h5netcdf/default.nix
	pkgs/development/python-modules/hypothesis/default.nix
	pkgs/development/python-modules/numba/default.nix
	pkgs/development/python-modules/optype/default.nix
	pkgs/development/python-modules/setuptools-git-versioning/default.nix
	pkgs/development/python-modules/sphinx/default.nix
This commit is contained in:
Martin Weinelt
2026-02-15 16:17:41 +01:00
parent c5e5f9e5fc b406523052
commit b79da2786f
376 changed files with 256 additions and 1699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/languages-frameworks/python.section.md
+5 -6
View File
@@ -50,7 +50,6 @@ sets are
* `pkgs.python27Packages`
* `pkgs.python3Packages`
* `pkgs.python310Packages`
* `pkgs.python311Packages`
* `pkgs.python312Packages`
* `pkgs.python313Packages`
@@ -897,7 +896,7 @@ on NixOS.
# ...
environment.systemPackages = with pkgs; [
(python310.withPackages (
(python314.withPackages (
ps: with ps; [
numpy
toolz
@@ -1683,7 +1682,7 @@ with import <nixpkgs> { };
});
};
in
pkgs.python310.override { inherit packageOverrides; };
pkgs.python313.override { inherit packageOverrides; };
in
python.withPackages (ps: [ ps.pandas ])
@@ -1707,7 +1706,7 @@ with import <nixpkgs> { };
let
packageOverrides = self: super: { scipy = super.scipy_0_17; };
in
(pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
(pkgs.python313.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
).env
```
@@ -1723,13 +1722,13 @@ let
newpkgs = import pkgs.path {
overlays = [
(self: super: {
python310 =
python313 =
let
packageOverrides = python-self: python-super: {
numpy = python-super.numpy_1_18;
};
in
super.python310.override { inherit packageOverrides; };
super.python313.override { inherit packageOverrides; };
})
];
};
nixos/modules/services/security/pass-secret-service.nix
+1 -1
View File
@@ -12,7 +12,7 @@ in
enable = lib.mkEnableOption "pass secret service";
package = lib.mkPackageOption pkgs "pass-secret-service" {
example = "pass-secret-service.override { python3 = pkgs.python310 }";
example = "pass-secret-service.override { python3 = pkgs.python315 }";
};
};
pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+20 -24
View File
@@ -8,30 +8,26 @@
let
version = "3.2.2";
dependencies =
with python3.pkgs;
[
pyembroidery
inkex
wxpython
networkx
platformdirs
shapely
lxml
appdirs
numpy
jinja2
requests
colormath2
flask
fonttools
trimesh
scipy
diskcache
flask-cors
]
# Inkstitch uses the builtin tomllib instead when Python >=3.11
++ lib.optional (pythonOlder "3.11") tomli;
dependencies = with python3.pkgs; [
pyembroidery
inkex
wxpython
networkx
platformdirs
shapely
lxml
appdirs
numpy
jinja2
requests
colormath2
flask
fonttools
trimesh
scipy
diskcache
flask-cors
];
pyEnv = python3.withPackages (_: dependencies);
in
python3.pkgs.buildPythonApplication {
pkgs/applications/science/math/caffe/default.nix
+1 -2
View File
@@ -175,8 +175,7 @@ stdenv.mkDerivation rec {
homepage = "http://caffe.berkeleyvision.org/";
maintainers = [ ];
broken =
(pythonSupport && (python.isPy310))
|| !(leveldbSupport -> (leveldb != null && snappy != null))
!(leveldbSupport -> (leveldb != null && snappy != null))
|| !(pythonSupport -> (python != null && numpy != null));
license = lib.licenses.bsd2;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
pkgs/applications/video/obs-studio/plugins/default.nix
+1 -1
View File
@@ -52,7 +52,7 @@
obs-markdown = callPackage ./obs-markdown.nix { };
obs-media-controls = qt6Packages.callPackage ./obs-media-controls.nix { };
obs-media-controls = qt6Packages.callPackage ./obs-media-controls { };
obs-move-transition = callPackage ./obs-move-transition.nix { };
pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix → pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix
+6
View File
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-CElK9e+wpnMiup6DwdQpQfVMm6atXvz+JYHsGnv3lFo=";
};
patches = [
# Fix cmake build with qt 6.10
# Submitted upstream: https://github.com/exeldro/obs-media-controls/pull/28
./fix-cmake.patch
];
nativeBuildInputs = [ cmake ];
buildInputs = [
obs-studio
pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch
+25
View File
@@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95172a0..3be0ec3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ else()
target_link_libraries(${PROJECT_NAME} PRIVATE OBS::frontend-api)
endif()
-find_package(Qt6 COMPONENTS Widgets Core)
+find_package(Qt6 REQUIRED COMPONENTS Widgets Core)
if(BUILD_OUT_OF_TREE)
if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
find_package(Qt6 REQUIRED Gui)
@@ -33,8 +33,9 @@ if(BUILD_OUT_OF_TREE)
endif()
target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
-if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt_VERSION VERSION_LESS "6.9.0")
- target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
+if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt6_VERSION VERSION_LESS "6.9.0")
+ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
+ target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
endif()
target_compile_options(
pkgs/by-name/au/autosuspend/package.nix
-2
View File
@@ -10,8 +10,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
version = "9.0.1";
pyproject = true;
disabled = python3.pythonOlder "3.11";
src = fetchFromGitHub {
owner = "languitar";
repo = "autosuspend";
pkgs/by-name/ch/cheat/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "cheat";
version = "4.4.2";
version = "4.5.0";
src = fetchFromGitHub {
owner = "cheat";
repo = "cheat";
tag = finalAttrs.version;
sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE=";
sha256 = "sha256-RDfOdyQL9QICXZmgYCmz532iTuPdCW8GixajvEXmaUQ=";
};
subPackages = [ "cmd/cheat" ];
pkgs/by-name/cr/cruft/package.nix
+6 -9
View File
@@ -28,15 +28,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
pytest7CheckHook
];
dependencies =
with python3Packages;
[
click
cookiecutter
gitpython
typer
]
++ lib.optional (pythonOlder "3.11") python3Packages.toml;
dependencies = with python3Packages; [
click
cookiecutter
gitpython
typer
];
pythonImportsCheck = "cruft";
pkgs/by-name/cu/cursor-cli/package.nix
+9 -9
View File
@@ -9,26 +9,26 @@ let
inherit (stdenv) hostPlatform;
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-Nj6q11iaa++b5stsEu1eBRAYUFRPft84XcHuTCZL5D0=";
url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-mJPEmBNbmsTfgt0b7abrSHJLI52WfLny5Es4uGyDwew=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-6oajVZw599vzy2c1olEzoIlqbmfZRK1atb85fiR72y0=";
url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-ncXdGxOYlwud4Z3w5DMOmXUZ2hEcI/q4stm0yACuvy4=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-G23LC7Sl1GjfaECndSuyCxHK4drkJKG3B1U2k5SAHJA=";
url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-KcmGT6WCEc97qKqtZknFsUo9RX2SOuyjv6Jyfnrv3Os=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-R5kEfd84IaUXuN+PIzpGD1NGPzD6xxM9NAXAAt6d0N8=";
url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-ib0ZsXVc2YqAkPuMie4kwWIFrmNcD+1vX3tcvyA/PJw=";
};
};
in
stdenv.mkDerivation {
pname = "cursor-cli";
version = "0-unstable-2026-01-28";
version = "0-unstable-2026-02-13";
src = sources.${hostPlatform.system};
pkgs/by-name/fu/furtherance/package.nix
+3 -3
View File
@@ -16,16 +16,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "furtherance";
version = "26.1.1";
version = "26.7.0";
src = fetchFromGitHub {
owner = "unobserved-io";
repo = "Furtherance";
rev = finalAttrs.version;
hash = "sha256-VG1Ghhi74tkPU9bgauV98Gp5kVoZJ1cJUqWLWnrUAOU=";
hash = "sha256-UMkFEbLdwZsSJviO29FNmLYLL5/HofhriMptpjSAYuY=";
};
cargoHash = "sha256-6S0L8FHI5eCTzhxlew35pK7TewMplKKJDaqJdtoYRnM=";
cargoHash = "sha256-fdslQutVEGq1EG+Q8QAYKf9XfoostvHKWZrr4YwEowQ=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/gc/gcovr/package.nix
+6 -11
View File
@@ -35,17 +35,12 @@ python3Packages.buildPythonPackage (finalAttrs: {
--replace-fail "hatch-vcs==0.4.0" "hatch-vcs>=0.4.0"
'';
dependencies =
with python3Packages;
(
[
colorlog
jinja2
lxml
pygments
]
++ lib.optionals (pythonOlder "3.11") [ tomli ]
);
dependencies = with python3Packages; [
colorlog
jinja2
lxml
pygments
];
pythonImportsCheck = [
"gcovr"
pkgs/by-name/ha/halo/package.nix
+2 -2
View File
@@ -8,10 +8,10 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "halo";
version = "2.22.13";
version = "2.22.14";
src = fetchurl {
url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar";
hash = "sha256-SYpO+A7si9k/zTyNXpZpxuHbbOv3JofBQv0fISfDRaQ=";
hash = "sha256-8AAiR8EVG/3mHpRr85O6zRcrxu5/P+VK2+QaV9ARAJ8=";
};
nativeBuildInputs = [
pkgs/by-name/lg/lgpio/package.nix
+2
View File
@@ -36,6 +36,8 @@ mkDerivation rec {
swig
];
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
preConfigure = lib.optionalString (pyProject != "") ''
cd ${pyProject}
'';
pkgs/by-name/ma/maven/build-maven-package.nix
+2 -2
View File
@@ -52,7 +52,7 @@ let
]
++ args.nativeBuildInputs or [ ];
JAVA_HOME = mvnJdk;
env.JAVA_HOME = mvnJdk;
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
@@ -131,7 +131,7 @@ stdenv.mkDerivation (
maven
];
JAVA_HOME = mvnJdk;
env.JAVA_HOME = mvnJdk;
buildPhase = ''
runHook preBuild
pkgs/by-name/nu/numbat/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "numbat";
version = "1.20.0";
version = "1.23.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "numbat";
tag = "v${finalAttrs.version}";
hash = "sha256-Wh7HmE9UPu7+/aguaqON2/pmEHulYw69O0YjoKeDuRg=";
hash = "sha256-xezYRtIzP3MHme/7DwaM0hMgGTcio6iABuNREOOh6HU=";
};
cargoHash = "sha256-F8fjrkQVWmDKGXNYG1e1Fvu9z1EgHC/2zuqN3O/2exE=";
cargoHash = "sha256-oNGq00Znh5WLc+y2NEWZL7Bl17gIaSY7PXYLel9Ucjg=";
env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";
pkgs/by-name/nv/nvme-cli/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nvme-cli";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "linux-nvme";
repo = "nvme-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-zXzNjEpxioqYoSHDzimCnP/tKbi0H+GTH4xZ0g1+XnU=";
hash = "sha256-gW95iJF9RnPC1mcoLjS3r+4tZhX+TP4BSOMU0uB256A=";
};
mesonFlags = [
pkgs/by-name/or/orthanc/package.nix
+2 -2
View File
@@ -28,12 +28,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "orthanc";
version = "1.12.9";
version = "1.12.10";
src = fetchhg {
url = "https://orthanc.uclouvain.be/hg/orthanc/";
rev = "Orthanc-${finalAttrs.version}";
hash = "sha256-IBULO03og+aXmpYAXZdsesTFkc7HkeXol+A7yzDzcfQ=";
hash = "sha256-+y+99NKyAWoQmvgCfubNuGiJ68uUwUvE2O64gZ/3uNA=";
};
outputs = [
pkgs/by-name/pg/pgsrip/package.nix
-2
View File
@@ -9,8 +9,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
version = "0.1.12";
pyproject = true;
disabled = python3Packages.pythonOlder "3.11";
src = fetchFromGitHub {
owner = "ratoaq2";
repo = "pgsrip";
pkgs/by-name/po/poetry/unwrapped.nix
-5
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
findpython,
installShellFiles,
@@ -26,7 +25,6 @@
trove-classifiers,
virtualenv,
xattr,
tomli,
deepdiff,
pytestCheckHook,
httpretty,
@@ -86,9 +84,6 @@ buildPythonPackage rec {
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
xattr
]
++ lib.optionals (pythonOlder "3.11") [
tomli
]
++ cachecontrol.optional-dependencies.filecache
++ pbs-installer.optional-dependencies.download
++ pbs-installer.optional-dependencies.install;
pkgs/by-name/pr/prefect/package.nix
+1 -2
View File
@@ -94,8 +94,7 @@ python3Packages.buildPythonApplication rec {
semver
]
++ sqlalchemy.optional-dependencies.asyncio
++ httpx.optional-dependencies.http2
++ python-socks.optional-dependencies.asyncio;
++ httpx.optional-dependencies.http2;
optional-dependencies = with python3Packages; {
aws = [
pkgs/by-name/py/pyrosimple/package.nix
-3
View File
@@ -46,9 +46,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
python-box
tomli-w
]
++ lib.optionals (pythonOlder "3.11") [
tomli
]
++ lib.optional withInotify inotify;
nativeCheckInputs = with python3.pkgs; [
pkgs/by-name/sc/scriv/package.nix
+8 -13
View File
@@ -29,19 +29,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
build-system = with python3.pkgs; [ setuptools ];
dependencies =
with python3.pkgs;
[
attrs
click
click-log
jinja2
markdown-it-py
requests
]
++ lib.optionals (python3.pythonOlder "3.11") [
tomli
];
dependencies = with python3.pkgs; [
attrs
click
click-log
jinja2
markdown-it-py
requests
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
pkgs/by-name/sn/snakefmt/package.nix
-2
View File
@@ -11,8 +11,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
version = "0.11.4";
pyproject = true;
disabled = python3.pythonOlder "3.11";
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-LfJVYdViI88L/DtfUD1znBHUiLQb7MKhyJ2jhFCW4+Y=";
pkgs/by-name/sq/sqlite3-to-mysql/package.nix
+16 -19
View File
@@ -24,25 +24,22 @@ python3Packages.buildPythonApplication (finalAttrs: {
hatchling
];
dependencies =
with python3Packages;
[
click
mysql-connector
pytimeparse2
pymysql
pymysqlsa
simplejson
sqlalchemy
sqlalchemy-utils
tqdm
tabulate
unidecode
packaging
mysql80
python-dateutil
]
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
dependencies = with python3Packages; [
click
mysql-connector
pytimeparse2
pymysql
pymysqlsa
simplejson
sqlalchemy
sqlalchemy-utils
tqdm
tabulate
unidecode
packaging
mysql80
python-dateutil
];
pythonRelaxDeps = [
"mysql-connector-python"
pkgs/by-name/ui/uiua/stable.nix
+3 -3
View File
@@ -1,7 +1,7 @@
rec {
version = "0.18.0";
version = "0.18.1";
tag = version;
hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M=";
cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo=";
hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw=";
cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E=";
updateScript = ./update-stable.sh;
}
pkgs/by-name/ui/uiua/unstable.nix
+3 -3
View File
@@ -1,7 +1,7 @@
rec {
version = "0.18.0";
version = "0.18.1";
tag = version;
hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M=";
cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo=";
hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw=";
cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E=";
updateScript = ./update-unstable.sh;
}
pkgs/by-name/zi/zipline/package.nix
+2 -2
View File
@@ -36,13 +36,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "zipline";
version = "4.4.1";
version = "4.4.2";
src = fetchFromGitHub {
owner = "diced";
repo = "zipline";
tag = "v${finalAttrs.version}";
hash = "sha256-9+r3padIhpmLNfiL68eut7e+VemhsqhvRcJhyOdA7+k=";
hash = "sha256-RFajEXewnOCkp4xz/fhugVEt+BPNrrQY4Oeqt6Gg6p0=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git_head
pkgs/development/compilers/llvm/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ let
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
"20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
"22.1.0-rc2".officialRelease.sha256 = "sha256-j0KSuTANrwLh/siEcztSqCYQQDYHmdBCgVCsPsDCQ+I=";
"22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU=";
"23.0.0-git".gitRelease = {
rev = "dc152f0d2d085dcfb7542d0e71e19ebfa1aa3794";
rev-version = "23.0.0-unstable-2026-02-01";
pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch
-52
View File
@@ -1,52 +0,0 @@
From 084c6dd6352077e64f10cf7aa168f95d800f3819 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 9 Nov 2020 10:24:35 -0800
Subject: [PATCH] CPython: Don't use ldconfig
---
Lib/ctypes/util.py | 77 ++--------------------------------------------
1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 0c2510e..7fb98af 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -268,34 +222,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
- machine = os.uname().machine + '-32'
- else:
- machine = os.uname().machine + '-64'
- mach_map = {
- 'x86_64-64': 'libc6,x86-64',
- 'ppc64-64': 'libc6,64bit',
- 'sparc64-64': 'libc6,64bit',
- 's390x-64': 'libc6,64bit',
- 'ia64-64': 'libc6,IA-64',
- }
- abi_type = mach_map.get(machine, 'libc6')
-
- # XXX assuming GLIBC's ldconfig (with option -p)
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
- regex = os.fsencode(regex % (re.escape(name), abi_type))
- try:
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
- stdin=subprocess.DEVNULL,
- stderr=subprocess.DEVNULL,
- stdout=subprocess.PIPE,
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
- res = re.search(regex, p.stdout.read())
- if res:
- return os.fsdecode(res.group(1))
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.28.0
pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch
-248
View File
@@ -1,248 +0,0 @@
--- a/Lib/_osx_support.py
+++ b/Lib/_osx_support.py
@@ -14,13 +14,13 @@ __all__ = [
# configuration variables that may contain universal build flags,
# like "-arch" or "-isdkroot", that may need customization for
# the user environment
-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
- 'PY_CORE_CFLAGS', 'PY_CORE_LDFLAGS')
+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
+ 'PY_CPPFLAGS', 'PY_CORE_LDFLAGS', 'PY_CORE_CFLAGS')
# configuration variables that may contain compiler calls
-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
# prefix added to original configuration variable names
_INITPRE = '_OSX_SUPPORT_INITIAL_'
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
# dllwrap 2.10.90 is buggy
if self.ld_version >= "2.10.90":
self.linker_dll = "gcc"
+ self.linker_dll_cxx = "g++"
else:
self.linker_dll = "dllwrap"
+ self.linker_dll_cxx = "dllwrap"
# ld_version >= "2.13" support -shared so use it instead of
# -mdll -static
@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
self.set_executables(compiler='gcc -mcygwin -O -Wall',
compiler_so='gcc -mcygwin -mdll -O -Wall',
compiler_cxx='g++ -mcygwin -O -Wall',
+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
linker_exe='gcc -mcygwin',
linker_so=('%s -mcygwin %s' %
- (self.linker_dll, shared_option)))
+ (self.linker_dll, shared_option)),
+ linker_exe_cxx='g++ -mcygwin',
+ linker_so_cxx=('%s -mcygwin %s' %
+ (self.linker_dll_cxx, shared_option)))
# cygwin and mingw32 need different sets of libraries
if self.gcc_version == "2.91.57":
@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
raise CompileError(msg)
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError as msg:
raise CompileError(msg)
@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
self.set_executables(compiler='gcc -O -Wall',
compiler_so='gcc -mdll -O -Wall',
compiler_cxx='g++ -O -Wall',
+ compiler_so_cxx='g++ -mdll -O -Wall',
linker_exe='gcc',
linker_so='%s %s %s'
% (self.linker_dll, shared_option,
+ entry_point),
+ linker_exe_cxx='g++',
+ linker_so_cxx='%s %s %s'
+ % (self.linker_dll_cxx, shared_option,
entry_point))
# Maybe we should also append -mthreads, but then the finished
# dlls need another dll (mingwm10.dll see Mingw32 docs)
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -170,9 +170,11 @@ def customize_compiler(compiler):
_osx_support.customize_compiler(_config_vars)
_config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
+ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
+ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
+
+ cxxflags = cflags
if 'CC' in os.environ:
newcc = os.environ['CC']
@@ -187,19 +189,27 @@ def customize_compiler(compiler):
cxx = os.environ['CXX']
if 'LDSHARED' in os.environ:
ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
if 'CPP' in os.environ:
cpp = os.environ['CPP']
else:
cpp = cc + " -E" # not always
if 'LDFLAGS' in os.environ:
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ:
- cflags = cflags + ' ' + os.environ['CFLAGS']
+ cflags = os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
if 'CPPFLAGS' in os.environ:
cpp = cpp + ' ' + os.environ['CPPFLAGS']
cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
if 'AR' in os.environ:
ar = os.environ['AR']
if 'ARFLAGS' in os.environ:
@@ -208,13 +218,17 @@ def customize_compiler(compiler):
archiver = ar + ' ' + ar_flags
cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
compiler.set_executables(
preprocessor=cpp,
compiler=cc_cmd,
compiler_so=cc_cmd + ' ' + ccshared,
- compiler_cxx=cxx,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
linker_so=ldshared,
linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx,
archiver=archiver)
compiler.shared_lib_extension = shlib_suffix
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
# are pretty generic; they will probably have to be set by an outsider
# (eg. using information discovered by the sysconfig about building
# Python extensions).
- executables = {'preprocessor' : None,
- 'compiler' : ["cc"],
- 'compiler_so' : ["cc"],
- 'compiler_cxx' : ["cc"],
- 'linker_so' : ["cc", "-shared"],
- 'linker_exe' : ["cc"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : None,
+ executables = {'preprocessor' : None,
+ 'compiler' : ["cc"],
+ 'compiler_so' : ["cc"],
+ 'compiler_cxx' : ["c++"],
+ 'compiler_so_cxx' : ["c++"],
+ 'linker_so' : ["cc", "-shared"],
+ 'linker_exe' : ["cc"],
+ 'linker_so_cxx' : ["c++", "-shared"],
+ 'linker_exe_cxx' : ["c++"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : None,
}
if sys.platform[:6] == "darwin":
@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler):
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
compiler_so = self.compiler_so
+ compiler_so_cxx = self.compiler_so_cxx
if sys.platform == 'darwin':
compiler_so = _osx_support.compiler_fixup(compiler_so,
cc_args + extra_postargs)
+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
+ cc_args + extra_postargs)
try:
- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError as msg:
raise CompileError(msg)
@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler):
ld_args.extend(extra_postargs)
self.mkpath(os.path.dirname(output_filename))
try:
- if target_desc == CCompiler.EXECUTABLE:
- linker = self.linker_exe[:]
+ if target_lang == "c++":
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe_cxx[:]
+ else:
+ linker = self.linker_so_cxx[:]
else:
- linker = self.linker_so[:]
- if target_lang == "c++" and self.compiler_cxx:
- # skip over environment variable settings if /usr/bin/env
- # is used to set up the linker's environment.
- # This is needed on OSX. Note: this assumes that the
- # normal and C++ compiler have the same environment
- # settings.
- i = 0
- if os.path.basename(linker[0]) == "env":
- i = 1
- while '=' in linker[i]:
- i += 1
-
- if os.path.basename(linker[i]) == 'ld_so_aix':
- # AIX platforms prefix the compiler with the ld_so_aix
- # script, so we need to adjust our linker index
- offset = 1
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe[:]
else:
- offset = 0
-
- linker[i+offset] = self.compiler_cxx[i]
+ linker = self.linker_so[:]
if sys.platform == 'darwin':
linker = _osx_support.compiler_fixup(linker, ld_args)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -584,10 +584,10 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
*\ -s*|s*) quiet="-q";; \
*) quiet="";; \
esac; \
- echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
-106
View File
@@ -1,106 +0,0 @@
From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Wed, 9 Dec 2020 17:59:24 +1100
Subject: [PATCH] Don't use ldconfig
---
Lib/ctypes/util.py | 77 ++--------------------------------------------
1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 0c2510e161..7fb98af308 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -100,53 +100,7 @@ elif os.name == "posix":
return thefile.read(4) == elf_header
def _findLib_gcc(name):
- # Run GCC's linker with the -t (aka --trace) option and examine the
- # library name it prints out. The GCC command will fail because we
- # haven't supplied a proper program with main(), but that does not
- # matter.
- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
-
- c_compiler = shutil.which('gcc')
- if not c_compiler:
- c_compiler = shutil.which('cc')
- if not c_compiler:
- # No C compiler available, give up
- return None
-
- temp = tempfile.NamedTemporaryFile()
- try:
- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
-
- env = dict(os.environ)
- env['LC_ALL'] = 'C'
- env['LANG'] = 'C'
- try:
- proc = subprocess.Popen(args,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT,
- env=env)
- except OSError: # E.g. bad executable
- return None
- with proc:
- trace = proc.stdout.read()
- finally:
- try:
- temp.close()
- except FileNotFoundError:
- # Raised if the file was already removed, which is the normal
- # behaviour of GCC if linking fails
- pass
- res = re.findall(expr, trace)
- if not res:
- return None
-
- for file in res:
- # Check if the given file is an elf file: gcc can report
- # some files that are linker scripts and not actual
- # shared objects. See bpo-41976 for more details
- if not _is_elf(file):
- continue
- return os.fsdecode(file)
+ return None
if sys.platform == "sunos5":
@@ -268,34 +222,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
- machine = os.uname().machine + '-32'
- else:
- machine = os.uname().machine + '-64'
- mach_map = {
- 'x86_64-64': 'libc6,x86-64',
- 'ppc64-64': 'libc6,64bit',
- 'sparc64-64': 'libc6,64bit',
- 's390x-64': 'libc6,64bit',
- 'ia64-64': 'libc6,IA-64',
- }
- abi_type = mach_map.get(machine, 'libc6')
-
- # XXX assuming GLIBC's ldconfig (with option -p)
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
- regex = os.fsencode(regex % (re.escape(name), abi_type))
- try:
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
- stdin=subprocess.DEVNULL,
- stderr=subprocess.DEVNULL,
- stdout=subprocess.PIPE,
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
- res = re.search(regex, p.stdout.read())
- if res:
- return os.fsdecode(res.group(1))
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.24.3 (Apple Git-128)
pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch
-15
View File
@@ -1,15 +0,0 @@
diff --git a/setup.py b/setup.py
index 04eb6b2..2e1160d 100644
--- a/setup.py
+++ b/setup.py
@@ -1981,8 +1981,8 @@ class PyBuildExt(build_ext):
# Rather than complicate the code below, detecting and building
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
- if (MACOS and self.detect_tkinter_darwin()):
- return True
+ # if (MACOS and self.detect_tkinter_darwin()):
+ # return True
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
-51
View File
@@ -1,51 +0,0 @@
From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Wed, 9 Dec 2020 17:59:24 +1100
Subject: [PATCH] Don't use ldconfig
---
Lib/ctypes/util.py | 77 ++--------------------------------------------
1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 0c2510e161..7fb98af308 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -268,34 +222,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
- machine = os.uname().machine + '-32'
- else:
- machine = os.uname().machine + '-64'
- mach_map = {
- 'x86_64-64': 'libc6,x86-64',
- 'ppc64-64': 'libc6,64bit',
- 'sparc64-64': 'libc6,64bit',
- 's390x-64': 'libc6,64bit',
- 'ia64-64': 'libc6,IA-64',
- }
- abi_type = mach_map.get(machine, 'libc6')
-
- # XXX assuming GLIBC's ldconfig (with option -p)
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
- regex = os.fsencode(regex % (re.escape(name), abi_type))
- try:
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
- stdin=subprocess.DEVNULL,
- stderr=subprocess.DEVNULL,
- stdout=subprocess.PIPE,
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
- res = re.search(regex, p.stdout.read())
- if res:
- return os.fsdecode(res.group(1))
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.24.3 (Apple Git-128)
pkgs/development/interpreters/python/cpython/default.nix
+1 -12
View File
@@ -362,19 +362,13 @@ stdenv.mkDerivation (finalAttrs: {
# Make the mimetypes module refer to the right file
./mimetypes.patch
]
++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
# Stop checking for TCL/TK in global macOS locations
./3.9/darwin-tcl-tk.patch
]
++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
# Fix for http://bugs.python.org/issue1222585
# Upstream distutils is calling C compiler to compile C++ code, which
# only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed.
(
if pythonAtLeast "3.7" && pythonOlder "3.11" then
./3.7/python-3.x-distutils-C++.patch
else if pythonAtLeast "3.11" then
if pythonAtLeast "3.11" then
./3.11/python-3.x-distutils-C++.patch
else
fetchpatch {
@@ -794,11 +788,6 @@ stdenv.mkDerivation (finalAttrs: {
inherit src;
name = "python${pythonVersion}-${version}-doc";
postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") ''
substituteInPlace Doc/tools/extensions/pyspecific.py \
--replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator"
'';
dontConfigure = true;
dontBuild = true;
pkgs/development/interpreters/python/default.nix
-12
View File
@@ -42,18 +42,6 @@
inherit passthruFun;
};
python310 = callPackage ./cpython {
self = __splicedPackages.python310;
sourceVersion = {
major = "3";
minor = "10";
patch = "19";
suffix = "";
};
hash = "sha256-yPSlllciAdgd19+R9w4XfhmnDx1ImWi1S1+78pqXwHY=";
inherit passthruFun;
};
python311 = callPackage ./cpython {
self = __splicedPackages.python311;
sourceVersion = {
pkgs/development/interpreters/python/mk-python-derivation.nix
+6 -11
View File
@@ -82,17 +82,12 @@ let
"installer"
];
isBootstrapPackage' = flip elem (
[
"build"
"packaging"
"pyproject-hooks"
"wheel"
]
++ optionals (python.pythonOlder "3.11") [
"tomli"
]
);
isBootstrapPackage' = flip elem [
"build"
"packaging"
"pyproject-hooks"
"wheel"
];
isSetuptoolsDependency' = flip elem [
"setuptools"
pkgs/development/interpreters/python/passthrufun.nix
-4
View File
@@ -110,10 +110,6 @@ let
in
rec {
isPy27 = pythonVersion == "2.7";
isPy37 = pythonVersion == "3.7";
isPy38 = pythonVersion == "3.8";
isPy39 = pythonVersion == "3.9";
isPy310 = pythonVersion == "3.10";
isPy311 = pythonVersion == "3.11";
isPy312 = pythonVersion == "3.12";
isPy313 = pythonVersion == "3.13";
pkgs/development/interpreters/python/pypy/default.nix
-7
View File
@@ -353,13 +353,6 @@ stdenv.mkDerivation rec {
"test_inspect"
"test_pydoc"
"test_warnings"
]
++ lib.optionals isPy310 [
"test_contextlib_async"
"test_future"
"test_lzma"
"test_module"
"test_typing"
];
in
''
pkgs/development/interpreters/python/python-packages-base.nix
-4
View File
@@ -168,10 +168,6 @@ in
inherit lib pkgs stdenv;
inherit (python.passthru)
isPy27
isPy37
isPy38
isPy39
isPy310
isPy311
isPy312
isPy313
pkgs/development/interpreters/ruby/default.nix
+11 -9
View File
@@ -129,9 +129,6 @@ let
inherit hash;
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = if docSupport then "${groff}/bin/nroff" else null;
outputs = [ "out" ] ++ lib.optional docSupport "devdoc";
strictDeps = true;
@@ -174,12 +171,17 @@ let
];
propagatedBuildInputs = op jemallocSupport jemalloc;
env = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {
# The ruby build system will use a bare `rust` command by default for its rust.
# We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds
# for cross-compilation output for the build target by default.
NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}";
};
env =
lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {
# The ruby build system will use a bare `rust` command by default for its rust.
# We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds
# for cross-compilation output for the build target by default.
NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}";
}
// lib.optionalAttrs docSupport {
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff";
};
enableParallelBuilding = true;
# /build/ruby-2.7.7/lib/fileutils.rb:882:in `chmod':
pkgs/development/python-modules/aemet-opendata/default.nix
-3
View File
@@ -4,7 +4,6 @@
buildPythonPackage,
fetchFromGitHub,
geopy,
pythonOlder,
setuptools,
}:
@@ -13,8 +12,6 @@ buildPythonPackage rec {
version = "0.6.4";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "Noltari";
repo = "AEMET-OpenData";
pkgs/development/python-modules/agate/default.nix
-1
View File
@@ -13,7 +13,6 @@
pyicu,
pytestCheckHook,
python-slugify,
pythonOlder,
pytimeparse,
setuptools,
}:
pkgs/development/python-modules/ailment/default.nix
-3
View File
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pyvex,
setuptools,
typing-extensions,
@@ -13,8 +12,6 @@ buildPythonPackage rec {
version = "9.2.158";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "angr";
repo = "ailment";
pkgs/development/python-modules/aioairzone-cloud/default.nix
-3
View File
@@ -3,7 +3,6 @@
aiohttp,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
}:
@@ -12,8 +11,6 @@ buildPythonPackage rec {
version = "0.7.2";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "Noltari";
repo = "aioairzone-cloud";
pkgs/development/python-modules/aioambient/default.nix
-3
View File
@@ -11,7 +11,6 @@
pytestCheckHook,
python-engineio,
python-socketio,
pythonOlder,
websockets,
yarl,
}:
@@ -21,8 +20,6 @@ buildPythonPackage rec {
version = "2025.02.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "bachya";
repo = "aioambient";
pkgs/development/python-modules/aiobtclientrpc/default.nix
+1 -2
View File
@@ -45,8 +45,7 @@ buildPythonPackage (finalAttrs: {
httpx-socks
python-socks
rencode
]
++ python-socks.optional-dependencies.asyncio;
];
nativeCheckInputs = [
proxy-py
pkgs/development/python-modules/aioconsole/default.nix
-1
View File
@@ -6,7 +6,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
setuptools,
}:
pkgs/development/python-modules/aiodiscover/default.nix
-5
View File
@@ -1,7 +1,6 @@
{
lib,
aiodns,
async-timeout,
buildPythonPackage,
cached-ipaddress,
fetchFromGitHub,
@@ -12,7 +11,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
@@ -35,9 +33,6 @@ buildPythonPackage rec {
ifaddr
netifaces
pyroute2
]
++ lib.optionals (pythonOlder "3.11") [
async-timeout
];
nativeCheckInputs = [
pkgs/development/python-modules/aioelectricitymaps/default.nix
-3
View File
@@ -10,7 +10,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
}:
@@ -19,8 +18,6 @@ buildPythonPackage rec {
version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "jpbede";
repo = "aioelectricitymaps";
pkgs/development/python-modules/aioguardian/default.nix
-3
View File
@@ -10,7 +10,6 @@
pytest-aiohttp,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
voluptuous,
typing-extensions,
yarl,
@@ -21,8 +20,6 @@ buildPythonPackage (finalAttrs: {
version = "2026.01.1";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "bachya";
repo = "aioguardian";
pkgs/development/python-modules/aiohttp-socks/default.nix
+1 -2
View File
@@ -23,8 +23,7 @@ buildPythonPackage rec {
dependencies = [
aiohttp
python-socks
]
++ python-socks.optional-dependencies.asyncio;
];
# Checks needs internet access
doCheck = false;
pkgs/development/python-modules/aiohttp/default.nix
-9
View File
@@ -4,7 +4,6 @@
buildPythonPackage,
fetchFromGitHub,
replaceVars,
isPy310,
isPyPy,
pythonOlder,
@@ -96,9 +95,6 @@ buildPythonPackage rec {
propcache
yarl
]
++ lib.optionals (pythonOlder "3.11") [
async-timeout
]
++ optional-dependencies.speedups;
optional-dependencies.speedups = [
@@ -141,11 +137,6 @@ buildPythonPackage rec {
# Cannot connect to host example.com:443 ssl:default [Could not contact DNS servers]
"test_tcp_connector_ssl_shutdown_timeout_passed_to_create_connection"
]
# these tests fail with python310 but succeeds with 11+
++ lib.optionals isPy310 [
"test_https_proxy_unsupported_tls_in_tls"
"test_tcp_connector_raise_connector_ssl_error"
]
++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0
pkgs/development/python-modules/aiojobs/default.nix
-4
View File
@@ -1,13 +1,11 @@
{
lib,
aiohttp,
async-timeout,
buildPythonPackage,
fetchFromGitHub,
pytest-aiohttp,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
setuptools,
}:
@@ -25,8 +23,6 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ];
optional-dependencies = {
aiohttp = [ aiohttp ];
};
pkgs/development/python-modules/aiolyric/default.nix
-3
View File
@@ -5,7 +5,6 @@
buildPythonPackage,
fetchFromGitHub,
incremental,
pythonOlder,
pytest-asyncio,
pytestCheckHook,
setuptools,
@@ -16,8 +15,6 @@ buildPythonPackage rec {
version = "2.0.2";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "timmo001";
repo = "aiolyric";
pkgs/development/python-modules/aiomcache/default.nix
+1 -3
View File
@@ -2,14 +2,12 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
# build-system
setuptools,
# dependencies
python-memcached,
typing-extensions,
}:
buildPythonPackage rec {
@@ -26,7 +24,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [ python-memcached ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
dependencies = [ python-memcached ];
doCheck = false; # executes memcached in docker
pkgs/development/python-modules/aionut/default.nix
-3
View File
@@ -6,7 +6,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "4.3.4";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "bdraco";
repo = "aionut";
pkgs/development/python-modules/aiooncue/default.nix
-3
View File
@@ -3,7 +3,6 @@
aiohttp,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
}:
@@ -12,8 +11,6 @@ buildPythonPackage rec {
version = "0.3.9";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "bdraco";
repo = "aiooncue";
pkgs/development/python-modules/aioopenexchangerates/default.nix
-3
View File
@@ -9,7 +9,6 @@
pytest-aiohttp,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
@@ -17,8 +16,6 @@ buildPythonPackage rec {
version = "0.6.21";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "MartinHjelmare";
repo = "aioopenexchangerates";
pkgs/development/python-modules/aioslimproto/default.nix
-3
View File
@@ -5,7 +5,6 @@
buildPythonPackage,
fetchFromGitHub,
pillow,
pythonOlder,
setuptools,
}:
@@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "3.1.5";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "aioslimproto";
pkgs/development/python-modules/aiosonos/default.nix
-3
View File
@@ -7,7 +7,6 @@
brotli,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
}:
@@ -16,8 +15,6 @@ buildPythonPackage rec {
version = "0.1.9";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "music-assistant";
repo = "aiosonos";
pkgs/development/python-modules/aiosql/default.nix
-1
View File
@@ -8,7 +8,6 @@
pytest-asyncio,
pytest-postgresql,
pytestCheckHook,
pythonOlder,
setuptools,
setuptools-scm,
sphinx-rtd-theme,
pkgs/development/python-modules/aiotankerkoenig/default.nix
-3
View File
@@ -10,7 +10,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
yarl,
}:
@@ -20,8 +19,6 @@ buildPythonPackage rec {
version = "0.5.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "jpbede";
repo = "aiotankerkoenig";
pkgs/development/python-modules/aiovlc/default.nix
-3
View File
@@ -7,7 +7,6 @@
pytest-cov-stub,
pytest-timeout,
pytestCheckHook,
pythonOlder,
typer,
}:
@@ -16,8 +15,6 @@ buildPythonPackage rec {
version = "0.6.6";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "MartinHjelmare";
repo = "aiovlc";
pkgs/development/python-modules/aiowaqi/default.nix
-3
View File
@@ -8,7 +8,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
yarl,
}:
@@ -18,8 +17,6 @@ buildPythonPackage rec {
version = "3.1.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "joostlek";
repo = "python-waqi";
pkgs/development/python-modules/aiowebostv/default.nix
-3
View File
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
aiohttp,
}:
@@ -12,8 +11,6 @@ buildPythonPackage rec {
version = "0.7.5";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "aiowebostv";
pkgs/development/python-modules/aiowithings/default.nix
-3
View File
@@ -8,7 +8,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
yarl,
}:
@@ -18,8 +17,6 @@ buildPythonPackage rec {
version = "3.1.6";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "joostlek";
repo = "python-withings";
pkgs/development/python-modules/airgradient/default.nix
-3
View File
@@ -10,7 +10,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
yarl,
}:
@@ -20,8 +19,6 @@ buildPythonPackage rec {
version = "0.9.2";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "airgradienthq";
repo = "python-airgradient";
pkgs/development/python-modules/alarmdecoder/default.nix
-1
View File
@@ -7,7 +7,6 @@
pyopenssl,
pyserial,
pytestCheckHook,
pythonOlder,
pyusb,
setuptools-scm,
}:
pkgs/development/python-modules/allantools/default.nix
-1
View File
@@ -8,7 +8,6 @@
numpydoc,
pytest,
scipy,
pythonOlder,
pytestCheckHook,
}:
pkgs/development/python-modules/allure-python-commons/default.nix
-1
View File
@@ -2,7 +2,6 @@
lib,
fetchPypi,
buildPythonPackage,
pythonOlder,
attrs,
pluggy,
six,
pkgs/development/python-modules/angr/default.nix
-3
View File
@@ -24,7 +24,6 @@
pycparser,
pyformlang,
pydemumble,
pythonOlder,
pyvex,
rich,
rpyc,
@@ -41,8 +40,6 @@ buildPythonPackage rec {
version = "9.2.193";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "angr";
repo = "angr";
pkgs/development/python-modules/anyio/default.nix
-3
View File
@@ -48,9 +48,6 @@ buildPythonPackage rec {
]
++ lib.optionals (pythonOlder "3.13") [
typing-extensions
]
++ lib.optionals (pythonOlder "3.11") [
exceptiongroup
];
optional-dependencies = {
pkgs/development/python-modules/apple-weatherkit/default.nix
-3
View File
@@ -5,7 +5,6 @@
poetry-core,
aiohttp,
aiohttp-retry,
pythonOlder,
pyjwt,
}:
@@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "1.1.3";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "tjhorner";
repo = "python-weatherkit";
pkgs/development/python-modules/arcam-fmj/default.nix
-3
View File
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
pythonAtLeast,
pythonOlder,
fetchFromGitHub,
setuptools,
aiohttp,
@@ -19,8 +18,6 @@ buildPythonPackage rec {
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "elupus";
repo = "arcam_fmj";
pkgs/development/python-modules/argparse-manpage/default.nix
+1 -6
View File
@@ -2,10 +2,8 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
packaging,
tomli,
pytestCheckHook,
pip,
}:
@@ -25,10 +23,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
setuptools
packaging
]
++ lib.optionals (pythonOlder "3.11") [ tomli ];
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ tomli ];
];
nativeCheckInputs = [
pytestCheckHook
pkgs/development/python-modules/array-record/default.nix
+1 -2
View File
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
pythonAtLeast,
python,
fetchPypi,
@@ -14,7 +13,7 @@ buildPythonPackage rec {
version = "0.8.3";
format = "wheel";
disabled = pythonOlder "3.11" || pythonAtLeast "3.15";
disabled = pythonAtLeast "3.15";
src =
let
pkgs/development/python-modules/astroid/default.nix
-4
View File
@@ -2,9 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
typing-extensions,
pip,
pylint,
pytestCheckHook,
@@ -24,8 +22,6 @@ buildPythonPackage (finalAttrs: {
build-system = [ setuptools ];
dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
nativeCheckInputs = [
pip
pytestCheckHook
pkgs/development/python-modules/astropy/default.nix
-3
View File
@@ -2,7 +2,6 @@
lib,
fetchFromGitHub,
buildPythonPackage,
pythonOlder,
# build time
stdenv,
@@ -58,8 +57,6 @@ buildPythonPackage rec {
version = "7.2.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "astropy";
repo = "astropy";
pkgs/development/python-modules/async-lru/default.nix
-4
View File
@@ -1,10 +1,8 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools,
typing-extensions,
pytestCheckHook,
pytest-asyncio,
pytest-cov-stub,
@@ -25,8 +23,6 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
pkgs/development/python-modules/async-stagger/default.nix
-3
View File
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
pytestCheckHook,
pytest-asyncio,
@@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "0.4.1";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "twisteroidambassador";
repo = "async_stagger";
pkgs/development/python-modules/asyncpg/default.nix
-6
View File
@@ -2,12 +2,10 @@
lib,
fetchPypi,
buildPythonPackage,
async-timeout,
cython,
libpq,
uvloop,
postgresql,
pythonOlder,
pytest-xdist,
pytest8_3CheckHook,
setuptools,
@@ -29,10 +27,6 @@ buildPythonPackage rec {
setuptools
];
# required for compatibility with Python versions older than 3.11
# see https://github.com/MagicStack/asyncpg/blob/v0.29.0/asyncpg/_asyncio_compat.py#L13
dependencies = lib.optionals (pythonOlder "3.11") [ async-timeout ];
nativeCheckInputs = [
libpq.pg_config
uvloop
pkgs/development/python-modules/asyncwhois/default.nix
+1 -2
View File
@@ -31,8 +31,7 @@ buildPythonPackage rec {
python-socks
tldextract
whodap
]
++ python-socks.optional-dependencies.asyncio;
];
nativeCheckInputs = [
pytest-asyncio
pkgs/development/python-modules/atproto/default.nix
-1
View File
@@ -2,7 +2,6 @@
lib,
fetchFromGitHub,
buildPythonPackage,
pythonOlder,
nix-update-script,
# build-system
pkgs/development/python-modules/autoflake/default.nix
+1 -3
View File
@@ -5,8 +5,6 @@
hatchling,
pyflakes,
pytestCheckHook,
pythonOlder,
tomli,
}:
buildPythonPackage rec {
pname = "autoflake";
@@ -20,7 +18,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [ pyflakes ] ++ lib.optional (pythonOlder "3.11") tomli;
propagatedBuildInputs = [ pyflakes ];
nativeCheckInputs = [ pytestCheckHook ];
pkgs/development/python-modules/autopep8/default.nix
+1 -3
View File
@@ -5,9 +5,7 @@
glibcLocales,
pycodestyle,
pytestCheckHook,
pythonOlder,
setuptools,
tomli,
}:
buildPythonPackage rec {
@@ -24,7 +22,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];
propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
propagatedBuildInputs = [ pycodestyle ];
nativeCheckInputs = [
glibcLocales
pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
-3
View File
@@ -6,7 +6,6 @@
azure-common,
azure-mgmt-core,
setuptools,
pythonOlder,
}:
buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "4.1.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
pname = "azure_mgmt_applicationinsights";
inherit version;
pkgs/development/python-modules/azure-mgmt-iothub/default.nix
-3
View File
@@ -5,7 +5,6 @@
buildPythonPackage,
fetchPypi,
isodate,
pythonOlder,
setuptools,
}:
@@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "4.0.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
pname = "azure_mgmt_iothub";
inherit version;
pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
-3
View File
@@ -5,7 +5,6 @@
buildPythonPackage,
fetchPypi,
isodate,
pythonOlder,
setuptools,
}:
@@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "4.0.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
pname = "azure_mgmt_recoveryservices";
inherit version;
pkgs/development/python-modules/bellows/default.nix
-1
View File
@@ -7,7 +7,6 @@
pytest-asyncio,
pytest-timeout,
pytestCheckHook,
pythonOlder,
setuptools,
voluptuous,
zigpy,
pkgs/development/python-modules/bentoml/default.nix
+1 -4
View File
@@ -53,7 +53,6 @@
python-dateutil,
python-json-logger,
python-multipart,
pythonOlder,
pyyaml,
questionary,
rich,
@@ -62,7 +61,6 @@
simple-di,
starlette,
tomli-w,
tomli,
tritonclient,
uv,
uvicorn,
@@ -205,8 +203,7 @@ buildPythonPackage {
uv
uvicorn
watchfiles
]
++ lib.optionals (pythonOlder "3.11") [ tomli ];
];
inherit optional-dependencies;
pkgs/development/python-modules/black/default.nix
-7
View File
@@ -4,7 +4,6 @@
buildPythonPackage,
fetchPypi,
fetchpatch,
pythonOlder,
pytestCheckHook,
aiohttp,
click,
@@ -19,8 +18,6 @@
parameterized,
platformdirs,
tokenize-rt,
tomli,
typing-extensions,
uvloop,
}:
@@ -64,10 +61,6 @@ buildPythonPackage rec {
packaging
pathspec
platformdirs
]
++ lib.optionals (pythonOlder "3.11") [
tomli
typing-extensions
];
optional-dependencies = {
pkgs/development/python-modules/bleak-retry-connector/default.nix
-1
View File
@@ -9,7 +9,6 @@
pytestCheckHook,
pytest-asyncio,
pytest-cov-stub,
pythonOlder,
stdenv,
}:
pkgs/development/python-modules/bleak/default.nix
-4
View File
@@ -16,7 +16,6 @@
pyobjc-framework-CoreBluetooth,
pyobjc-framework-libdispatch,
typing-extensions,
async-timeout,
pytest-asyncio,
pytest-cov-stub,
@@ -61,9 +60,6 @@ buildPythonPackage rec {
]
++ lib.optionals (pythonOlder "3.12") [
typing-extensions
]
++ lib.optionals (pythonOlder "3.11") [
async-timeout
];
nativeCheckInputs = [
pkgs/development/python-modules/bluecurrent-api/default.nix
-3
View File
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools,
pytz,
@@ -16,8 +15,6 @@ buildPythonPackage rec {
version = "1.3.3";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "bluecurrent";
repo = "HomeAssistantAPI";
pkgs/development/python-modules/bluemaestro-ble/default.nix
-3
View File
@@ -7,7 +7,6 @@
poetry-core,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
sensor-state-data,
}:
@@ -16,8 +15,6 @@ buildPythonPackage rec {
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = "bluemaestro-ble";
pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
-5
View File
@@ -1,6 +1,5 @@
{
lib,
async-timeout,
bluetooth-adapters,
btsocket,
buildPythonPackage,
@@ -10,7 +9,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
usb-devices,
}:
@@ -33,9 +31,6 @@ buildPythonPackage rec {
btsocket
pyric
usb-devices
]
++ lib.optionals (pythonOlder "3.11") [
async-timeout
];
nativeCheckInputs = [
pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix
-3
View File
@@ -6,7 +6,6 @@
poetry-core,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
sensor-state-data,
}:
@@ -15,8 +14,6 @@ buildPythonPackage rec {
version = "1.9.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = "bluetooth-sensor-state-data";
pkgs/development/python-modules/bork/default.nix
+1 -4
View File
@@ -4,14 +4,12 @@
callPackage,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
setuptools,
build,
coloredlogs,
packaging,
pip,
toml,
urllib3,
}:
@@ -43,8 +41,7 @@ buildPythonPackage rec {
packaging
pip
urllib3
]
++ lib.optionals (pythonOlder "3.11") [ toml ];
];
pythonImportsCheck = [
"bork"

Some files were not shown because too many files have changed in this diff Show More