From 291f0fddfab548f2045cbb2cf4bb045c69ff8f7d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 1 Mar 2026 12:03:03 -0500 Subject: [PATCH] openshadinglanguage: move override to package.nix This is a step towards https://redirect.github.com/NixOS/nixpkgs/pull/483820, which will help enable checking for additional by-name directories (e.g. Python) in nixpkgs-vet. For more information, please see https://redirect.github.com/NixOS/nixpkgs/pull/483859#issuecomment-3799768711. --- pkgs/by-name/op/openshadinglanguage/package.nix | 5 ++--- pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix index 7623cf177d698..8ed8c53190781 100644 --- a/pkgs/by-name/op/openshadinglanguage/package.nix +++ b/pkgs/by-name/op/openshadinglanguage/package.nix @@ -1,14 +1,12 @@ { bison, boost, - clang, cmake, fetchFromGitHub, flex, lib, - libclang, libxml2, - llvm, + llvmPackages_19, openexr, openimageio, partio, @@ -22,6 +20,7 @@ let boost_static = boost.override { enableStatic = true; }; + inherit (llvmPackages_19) clang libclang llvm; in stdenv.mkDerivation (finalAttrs: { pname = "openshadinglanguage"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87981ddfbf7be..53df1d8ed319a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3160,12 +3160,6 @@ with pkgs; update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; - openshadinglanguage = callPackage ../by-name/op/openshadinglanguage/package.nix { - libclang = llvmPackages_19.libclang; - clang = clang_19; - llvm = llvm_19; - }; - opentelemetry-collector = opentelemetry-collector-releases.otelcol; opentelemetry-collector-builder = callPackage ../tools/misc/opentelemetry-collector/builder.nix { }; opentelemetry-collector-contrib = opentelemetry-collector-releases.otelcol-contrib;