From 4cf29404142fece676ee9b25c9da394ff823702c Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 26 Dec 2025 23:46:57 +0200 Subject: [PATCH 1/4] darktable: remove top-level override --- pkgs/by-name/da/darktable/package.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index ec270b04428b6..ce87ec77391a8 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -53,7 +53,7 @@ libtiff, libwebp, libxml2, - lua, + lua5_4, util-linux, openexr, openjpeg, @@ -78,7 +78,9 @@ versionCheckHook, gitUpdater, }: - +let + pugixml-shared = pugixml.override { shared = true; }; +in stdenv.mkDerivation rec { version = "5.4.0"; pname = "darktable"; @@ -138,13 +140,13 @@ stdenv.mkDerivation rec { libtiff libwebp libxml2 - lua + lua5_4 openexr openjpeg osm-gps-map pcre2 portmidi - pugixml + pugixml-shared sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01921036db846..d7c4f6d954755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10059,11 +10059,6 @@ with pkgs; haskell.lib.compose.justStaticExecutables haskellPackages.darcs ); - darktable = callPackage ../by-name/da/darktable/package.nix { - lua = lua5_4; - pugixml = pugixml.override { shared = true; }; - }; - datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix { pythonPackages = datadog-integrations-core { }; }; From 7a9d2219bb3ef2d5c98b9727201b447a088115e4 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 00:24:23 +0200 Subject: [PATCH 2/4] odin: remove top-level override --- pkgs/by-name/od/odin/package.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index 92885da46bb29..062bf82a0b5ca 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -1,6 +1,6 @@ { lib, - llvmPackages, + llvmPackages_18, fetchFromGitHub, makeBinaryWrapper, which, @@ -8,6 +8,7 @@ }: let + llvmPackages = llvmPackages_18; inherit (llvmPackages) stdenv; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7c4f6d954755..f126d97613f4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9457,10 +9457,6 @@ with pkgs; open-vm-tools-headless = open-vm-tools.override { withX = false; }; - odin = callPackage ../by-name/od/odin/package.nix { - llvmPackages = llvmPackages_18; - }; - pam = if stdenv.hostPlatform.isLinux then linux-pam From 0849763b7784aba00ba7bf7bec79c49acc857b53 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 00:28:59 +0200 Subject: [PATCH 3/4] renovate: remove top-level override --- pkgs/by-name/re/renovate/package.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 5975d14d314fe..aa6d3cdbc1925 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, makeWrapper, - nodejs, + nodejs_22, pnpm_10, fetchPnpmDeps, pnpmConfigHook, @@ -14,6 +14,9 @@ nix-update-script, yq-go, }: +let + nodejs = nodejs_22; +in stdenv.mkDerivation (finalAttrs: { pname = "renovate"; version = "42.83.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f126d97613f4c..1630324bfd238 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7788,10 +7788,6 @@ with pkgs; librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; redland = librdf_redland; # added 2018-04-25 - renovate = callPackage ../by-name/re/renovate/package.nix { - nodejs = nodejs_22; - }; - qadwaitadecorations-qt6 = callPackage ../by-name/qa/qadwaitadecorations/package.nix { useQt6 = true; }; From 65bafefd5c14ba2206cf0fcf154e248fa2b576fe Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 20 Oct 2025 15:41:25 +0200 Subject: [PATCH 4/4] aegisub: remove overrides from all-package.nix The config option was introduced in 9361acfff13586840a41e16496c28dc27848671d, this should just be done via overlays today. --- pkgs/by-name/ae/aegisub/package.nix | 6 +++++- pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 5571e80516911..2f6110a33b192 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -39,6 +39,10 @@ useBundledLuaJIT ? false, }: +let + luajit' = luajit.override { enable52Compat = true; }; +in + stdenv.mkDerivation (finalAttrs: { pname = "aegisub"; version = "3.4.2"; @@ -82,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals portaudioSupport [ portaudio ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals spellcheckSupport [ hunspell ] - ++ lib.optionals (!useBundledLuaJIT) [ luajit ]; + ++ lib.optionals (!useBundledLuaJIT) [ luajit' ]; mesonFlags = [ (lib.mesonEnable "alsa" alsaSupport) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1630324bfd238..39c828445c6dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -956,13 +956,6 @@ with pkgs; opnplug = adlplug.override { type = "OPN"; }; - aegisub = callPackage ../by-name/ae/aegisub/package.nix ( - { - luajit = luajit.override { enable52Compat = true; }; - } - // (config.aegisub or { }) - ); - acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; };