From 3e46802cf57d51836fcd039c4987f0e5cd7f9065 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 8 May 2026 21:25:19 -0700 Subject: [PATCH] creduce: migrate to by-name --- .../misc => by-name/cr}/creduce/fix-gcc15.patch | 0 .../default.nix => by-name/cr/creduce/package.nix} | 12 +++++++----- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 7 insertions(+), 9 deletions(-) rename pkgs/{development/tools/misc => by-name/cr}/creduce/fix-gcc15.patch (100%) rename pkgs/{development/tools/misc/creduce/default.nix => by-name/cr/creduce/package.nix} (94%) diff --git a/pkgs/development/tools/misc/creduce/fix-gcc15.patch b/pkgs/by-name/cr/creduce/fix-gcc15.patch similarity index 100% rename from pkgs/development/tools/misc/creduce/fix-gcc15.patch rename to pkgs/by-name/cr/creduce/fix-gcc15.patch diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/by-name/cr/creduce/package.nix similarity index 94% rename from pkgs/development/tools/misc/creduce/default.nix rename to pkgs/by-name/cr/creduce/package.nix index 731e5b457099..03f135937da5 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/by-name/cr/creduce/package.nix @@ -4,13 +4,15 @@ fetchFromGitHub, cmake, makeWrapper, - llvm, - libclang, + llvmPackages_18, flex, zlib, perlPackages, util-linux, }: +let + llvmPackages = llvmPackages_18; +in stdenv.mkDerivation { pname = "creduce"; @@ -44,14 +46,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper - llvm.dev + llvmPackages.llvm.dev ]; buildInputs = [ # Ensure stdenv's CC is on PATH before clang-unwrapped stdenv.cc # Actual deps: - llvm - libclang + llvmPackages.llvm + llvmPackages.libclang flex zlib ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 001ee576682d..1a3c94cfb214 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5542,10 +5542,6 @@ with pkgs; credstash = with python3Packages; toPythonApplication credstash; - creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_18) llvm libclang; - }; - css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; cvise = python3Packages.callPackage ../development/tools/misc/cvise {