Updated system, fixes, culled lots of old config

This commit is contained in:
Emmet
2024-11-08 14:41:54 -06:00
parent 0408d049d2
commit 26162df66c
25 changed files with 122 additions and 5598 deletions

View File

@@ -1,23 +0,0 @@
diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index 3ff10ee86..56d03b6e6 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -25,7 +25,8 @@ in
libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
-{ buildInputs ? []
+{ version ? null
+, buildInputs ? []
, nativeBuildInputs ? []
, packageRequires ? []
, propagatedBuildInputs ? []
@@ -38,7 +39,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
}@args:
{
- name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}";
+ name = args.name or "emacs-${finalAttrs.pname}${lib.optionalString (version != null) "-${version}"}";
unpackCmd = args.unpackCmd or ''
case "$curSrc" in

View File

@@ -1,76 +0,0 @@
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
index 9f031347d354e..6356eeb9637f0 100644
--- a/pkgs/development/python-modules/pyqt/6.x.nix
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
@@ -25,17 +25,15 @@
buildPythonPackage rec {
pname = "pyqt6";
- version = "6.7.0.dev2404081550";
+ version = "6.8.0.dev2410141303";
format = "pyproject";
disabled = pythonOlder "3.6";
+ # This is dangerous, how can we get web archive to archive the URL?
src = fetchurl {
- urls = [
- "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"
- "http://web.archive.org/web/20240411124842if_/https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"
- ];
- hash = "sha256-H5qZ/rnruGh+UVSXLZyTSvjagmmli/iYq+7BaIzl1YQ=";
+ url = "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz";
+ hash = "sha256-eHYqj22us07uFkErJD2d0y0wueZxtQTwTFW9cI7yoK4=";
};
patches = [
@@ -55,8 +53,11 @@ buildPythonPackage rec {
verbose = true
EOF
+ # pythonRelaxDeps doesn't work and the wanted versions are not released AFAIK
substituteInPlace pyproject.toml \
- --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"'
+ --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' \
+ --replace-fail "sip >=6.9, <7" "sip >=6.8.6, <7" \
+ --replace-fail 'PyQt-builder >=1.17, <2' "PyQt-builder >=1.16, <2"
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 8a398654b08ce..8fd6240e4a512 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -4,6 +4,7 @@
fetchPypi,
pythonOlder,
setuptools,
+ setuptools-scm,
packaging,
tomli,
@@ -15,17 +16,20 @@
buildPythonPackage rec {
pname = "sip";
- version = "6.8.3";
+ version = "6.8.6";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw=";
+ hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
- propagatedBuildInputs = [
+ dependencies = [
packaging
setuptools
] ++ lib.optionals (pythonOlder "3.11") [ tomli ];

View File

@@ -0,0 +1,87 @@
From 13af81da96c4b706e3262f1424d1d26b3db315d1 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Wed, 6 Nov 2024 17:24:11 -0500
Subject: [PATCH 1/2] openvdb_11: init at 11.0.0
There are many breaking changes in v12, which some consumers are not
ready for and would require complex changes. This is expected to go away
once it becomes unused in nixpkgs.
---
pkgs/development/libraries/openvdb/11.nix | 19 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 1 +
2 files changed, 20 insertions(+)
create mode 100644 pkgs/development/libraries/openvdb/11.nix
diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix
new file mode 100644
index 0000000000000..a65bb286ae2e2
--- /dev/null
+++ b/pkgs/development/libraries/openvdb/11.nix
@@ -0,0 +1,19 @@
+{
+ lib,
+ fetchFromGitHub,
+ openvdb,
+}:
+
+openvdb.overrideAttrs (old: rec {
+ name = "${old.pname}-${version}";
+ version = "11.0.0";
+ src = fetchFromGitHub {
+ owner = "AcademySoftwareFoundation";
+ repo = "openvdb";
+ rev = "v${version}";
+ sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ=";
+ };
+ meta = old.meta // {
+ license = lib.licenses.mpl20;
+ };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55968eed13554..428a42210da40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22214,6 +22214,7 @@ with pkgs;
zunclient = with python311Packages; toPythonApplication python-zunclient;
openvdb = callPackage ../development/libraries/openvdb { };
+ openvdb_11 = callPackage ../development/libraries/openvdb/11.nix { };
openvr = callPackage ../by-name/op/openvr/package.nix {
inherit (darwin.apple_sdk.frameworks) Foundation AppKit;
From 33e09c6eea89ae1d1145f2f4527f98fd7b87865b Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Wed, 6 Nov 2024 17:25:29 -0500
Subject: [PATCH 2/2] blender: fix build by using openvdb_11
openvdb is now v12, and has many breaking API changes. Upstream has not
yet adapted to them yet, so there is no patch to backport. Further,
OpenVDB 12 is not currently part of the anticipated upstream library
updates for Blender 4.3 or 4.4.
---
pkgs/applications/misc/blender/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 7d89339da1026..e2af0b3f93384 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -64,7 +64,7 @@
openjpeg,
openpgl,
opensubdiv,
- openvdb,
+ openvdb_11,
openxr-loader,
pkg-config,
potrace,
@@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: {
openjpeg
openpgl
(opensubdiv.override { inherit cudaSupport; })
- openvdb
+ openvdb_11
potrace
pugixml
python3