openjdk: format

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>

lib/licenses.nix

@@ -1212,6 +1212,12 @@ lib.mapAttrs mkLicense ({
     fullName = "TCL/TK License";
   };
 
+  tost = {
+    shortName = "TSL";
+    fullName = "Tomorrow Open Source License";
+    url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt";
+  };
+
   ucd = {
     fullName = "Unicode Character Database License";
     url = "https://fedoraproject.org/wiki/Licensing:UCD";

pkgs/applications/video/kodi/addons/certifi/default.nix

@@ -16,7 +16,7 @@ buildKodiAddon rec {
 
   postPatch = ''
     # Use our system-wide ca-bundle instead of the bundled one
-    ln -snvf "${cacert}/etc/ssl/certs/ca-bundle.crt" "lib/certifi/cacert.pem"
+    ln -snvf "/etc/ssl/certs/ca-bundle.crt" "lib/certifi/cacert.pem"
   '';
 
   propagatedNativeBuildInputs = [

pkgs/applications/video/kodi/wrapper.nix

@@ -4,7 +4,7 @@ let
   kodiPackages = callPackage ../../../top-level/kodi-packages.nix { inherit kodi; };
 
   # linux distros are supposed to provide pillow and pycryptodome
-  requiredPythonPath = with kodi.pythonPackages; makePythonPath ([ pillow pycryptodome ]);
+  requiredPythonPath = with kodi.pythonPackages; makePythonPath ([ pillow pycryptodomex ]);
 
   # each kodi addon can potentially export a python module which should be included in PYTHONPATH
   # see any addon which supplies `passthru.pythonPath` and the corresponding entry in the addons `addon.xml`

pkgs/development/compilers/openjdk/generic.nix

@@ -12,6 +12,7 @@
   lndir,
   unzip,
   ensureNewerSourcesForZipFilesHook,
+  removeReferencesTo,
 
   cpio,
   file,
@@ -133,13 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "openjdk" + lib.optionalString headless "-headless";
   inherit version;
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals (!atLeast11) [
-      "jre"
-    ];
+  outputs = [ "out" ] ++ lib.optionals (!atLeast11) [ "jre" ];
 
   inherit (source) src;
 
@@ -244,19 +239,12 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs =
     [
       pkg-config
+      removeReferencesTo
     ]
-    ++ lib.optionals atLeast11 [
-      autoconf
-    ]
-    ++ lib.optionals (!atLeast11) [
-      lndir
-    ]
-    ++ [
-      unzip
-    ]
-    ++ lib.optionals atLeast21 [
-      ensureNewerSourcesForZipFilesHook
-    ];
+    ++ lib.optionals atLeast11 [ autoconf ]
+    ++ lib.optionals (!atLeast11) [ lndir ]
+    ++ [ unzip ]
+    ++ lib.optionals atLeast21 [ ensureNewerSourcesForZipFilesHook ];
 
   buildInputs =
     [
@@ -270,9 +258,7 @@ stdenv.mkDerivation (finalAttrs: {
       cups
       freetype
     ]
-    ++ lib.optionals (atLeast11 && !atLeast21) [
-      harfbuzz
-    ]
+    ++ lib.optionals (atLeast11 && !atLeast21) [ harfbuzz ]
     ++ [
       alsa-lib
       libjpeg
@@ -287,15 +273,9 @@ stdenv.mkDerivation (finalAttrs: {
       libX11
       libICE
     ]
-    ++ lib.optionals (!atLeast11) [
-      libXext
-    ]
-    ++ [
-      libXrender
-    ]
-    ++ lib.optionals atLeast11 [
-      libXext
-    ]
+    ++ lib.optionals (!atLeast11) [ libXext ]
+    ++ [ libXrender ]
+    ++ lib.optionals atLeast11 [ libXext ]
     ++ [
       libXtst
       libXt
@@ -314,9 +294,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = lib.optionals (!atLeast11) [ setJavaClassPath ];
 
-  nativeInstallCheckInputs = lib.optionals atLeast23 [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = lib.optionals atLeast23 [ versionCheckHook ];
 
   # JDK's build system attempts to specifically detect
   # and special-case WSL, and we don't want it to do that,
@@ -328,9 +306,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # https://openjdk.org/groups/build/doc/building.html
   configureFlags =
-    [
-      "--with-boot-jdk=${jdk-bootstrap'.home}"
-    ]
+    [ "--with-boot-jdk=${jdk-bootstrap'.home}" ]
     ++ (
       if atLeast23 then
         [
@@ -342,9 +318,7 @@ stdenv.mkDerivation (finalAttrs: {
           "--with-version-build=${versionBuild}"
           "--with-version-opt=nixos"
         ]
-        ++ [
-          "--with-version-pre="
-        ]
+        ++ [ "--with-version-pre=" ]
       else
         [
           "--with-update-version=${lib.removePrefix "${featureVersion}u" (lib.elemAt versionSplit 0)}"
@@ -363,9 +337,7 @@ stdenv.mkDerivation (finalAttrs: {
           "--with-harfbuzz=system"
         ]
       else
-        [
-          "--disable-freetype-bundling"
-        ]
+        [ "--disable-freetype-bundling" ]
     )
     ++ (
       if atLeast11 then
@@ -382,12 +354,8 @@ stdenv.mkDerivation (finalAttrs: {
           "--with-giflib=system"
         ]
     )
-    ++ [
-      "--with-stdc++lib=dynamic"
-    ]
-    ++ lib.optionals (featureVersion == "11") [
-      "--disable-warnings-as-errors"
-    ]
+    ++ [ "--with-stdc++lib=dynamic" ]
+    ++ lib.optionals (featureVersion == "11") [ "--disable-warnings-as-errors" ]
     # OpenJDK 11 cannot be built by recent versions of Clang, as far as I can tell (see
     # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to
     # compile with LLVM 12.
@@ -576,6 +544,8 @@ stdenv.mkDerivation (finalAttrs: {
           mkdir -p $out/nix-support
           #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
           echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
+          # remove references also in CA-derivations
+          find "$out" -type f -exec remove-references-to -t ${jdk-bootstrap'} '{}' +
         ''
       else
         ''
@@ -584,6 +554,8 @@ stdenv.mkDerivation (finalAttrs: {
           # properly.
           mkdir -p $jre/nix-support
           printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
+          # remove references also in CA-derivations
+          find "$out" -type f -exec remove-references-to -t ${jdk-bootstrap} '{}' +
         ''
     )
     + ''
@@ -617,9 +589,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # TODO: The OpenJDK 8 derivation got this wrong.
-  disallowedReferences = [
-    (if atLeast11 then jdk-bootstrap' else jdk-bootstrap)
-  ];
+  disallowedReferences = [ (if atLeast11 then jdk-bootstrap' else jdk-bootstrap) ];
 
   passthru =
     {
@@ -628,9 +598,7 @@ stdenv.mkDerivation (finalAttrs: {
       inherit (source) updateScript;
     }
     // (if atLeast11 then { inherit gtk3; } else { inherit gtk2; })
-    // lib.optionalAttrs (!atLeast23) {
-      inherit architecture;
-    };
+    // lib.optionalAttrs (!atLeast23) { inherit architecture; };
 
   meta = {
     description = "Open-source Java Development Kit";
@@ -652,9 +620,7 @@ stdenv.mkDerivation (finalAttrs: {
         "armv6l-linux"
         "powerpc64le-linux"
       ]
-      ++ lib.optionals atLeast17 [
-        "riscv64-linux"
-      ];
+      ++ lib.optionals atLeast17 [ "riscv64-linux" ];
     # OpenJDK 8 was broken for musl at 2024-01-17. Tracking issue:
     # https://github.com/NixOS/nixpkgs/issues/281618
     # error: ‘isnanf’ was not declared in this scope

pkgs/development/libraries/vte/default.nix

@@ -26,6 +26,7 @@
 , icu
 , systemd
 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
+, fast-float
 , nixosTests
 , blackbox-terminal
 }:
@@ -54,6 +55,38 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
       hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
     })
+    # build: Add missing includes
+    # https://gitlab.gnome.org/GNOME/vte/-/issues/2824
+    (fetchpatch {
+      name = "0002-build-Add-missing-includes.patch";
+      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/c90b078ecf4382458a9af44d765d710eb46b0453.patch";
+      hash = "sha256-S7SHYBq309DLDOBGTFmUTUpsICl3mgMDb2RpYxy+o64=";
+    })
+    # tests: Remove excessive constexpr
+    # https://gitlab.gnome.org/GNOME/vte/-/issues/2819
+    (fetchpatch {
+      name = "0004-tests-Remove-excessive-constrexpr.patch";
+      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/c8838779d5f8c0e03411cef9775cd8f5a10a6204.patch";
+      hash = "sha256-zF+tDAzllhbts5pO4Uo2DgzPxVunNmf42jWOgWJO3MI=";
+    })
+  ] ++ lib.optionals stdenv.cc.isClang [
+    # build: Add fast_float dependency
+    # https://gitlab.gnome.org/GNOME/vte/-/issues/2823
+    (fetchpatch {
+      name = "0003-build-Add-fast_float-dependency.patch";
+      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/f6095fca4d1baf950817e7010e6f1e7c313b9e2e.patch";
+      hash = "sha256-EL9PPiI5pDJOXf4Ck4nkRte/jHx/QWbxkjDFRSsp+so=";
+    })
+    (fetchpatch {
+      name = "0003-widget-termprops-Use-fast_float.patch";
+      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/6c2761f51a0400772f443f12ea23a75576e195d3.patch";
+      hash = "sha256-jjM9bhl8EhtylUIQ2nMSNX3ugnkZQP/2POvSUDW0LM0=";
+    })
+    (fetchpatch {
+      name = "0003-build-Use-correct-path-to-include-fast_float.h.patch";
+      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/d09330585e648b5c9991dffab4a06d1f127bf916.patch";
+      hash = "sha256-YGVXt2VojljYgTcmahQ2YEZGEysyUSwk+snQfoipJ+E=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -79,6 +112,8 @@ stdenv.mkDerivation (finalAttrs: {
     icu
   ] ++ lib.optionals systemdSupport [
     systemd
+  ] ++ lib.optionals stdenv.cc.isClang [
+    fast-float
   ];
 
   # Required by vte-2.91.pc.

pkgs/development/python-modules/materialx/default.nix

@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "materialx";
-  version = "1.39.1";
+  version = "1.38.10";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "MaterialX";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-WzzsY1hOWwJEqT/ZRLIoZDfKNvx1Yf6aFhA3ZcSPx+s=";
+    rev = "v${version}";
+    hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo=";
   };
 
   format = "other";

pkgs/development/python-modules/openusd/default.nix

@@ -52,6 +52,7 @@ in
 buildPythonPackage rec {
   pname = "openusd";
   version = "24.08";
+  pyproject = false;
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
@@ -65,13 +66,11 @@ buildPythonPackage rec {
 
   outputs = [ "out" ] ++ lib.optional withDocs "doc";
 
-  format = "other";
-
   patches = [
     (fetchpatch {
       name = "port-to-embree-4.patch";
-      url = "https://github.com/PixarAnimationStudios/OpenUSD/pull/2266/commits/4b6c23d459c602fdac5e0ebc9b7722cbd5475e86.patch";
-      hash = "sha256-yjqdGAVqfEsOX1W/tG6c+GgQLYya5U9xgUe/sNIuDbw=";
+      url = "https://github.com/PixarAnimationStudios/OpenUSD/pull/2266/commits/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch";
+      hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI=";
     })
   ];
 
@@ -175,7 +174,7 @@ buildPythonPackage rec {
       for interchange between graphics applications.
     '';
     homepage = "https://openusd.org/";
-    license = lib.licenses.asl20;
+    license = lib.licenses.tost;
     maintainers = with lib.maintainers; [ shaddydc ];
   };
 }

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -20,8 +20,8 @@
         "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp"
     },
     "6.6": {
-        "version": "6.6.59",
-        "hash": "sha256:0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93"
+        "version": "6.6.56",
+        "hash": "sha256:158snxmb2silss8bndpzp8fmafp175v11jrlci0jr6c8ivvi4j7p"
     },
     "6.11": {
         "version": "6.11.6",