Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkgs/by-name/ae/aegisub/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
useBundledLuaJIT ? false,
}:

let
luajit' = luajit.override { enable52Compat = true; };
in

stdenv.mkDerivation (finalAttrs: {
pname = "aegisub";
version = "3.4.2";
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 6 additions & 4 deletions pkgs/by-name/da/darktable/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
libtiff,
libwebp,
libxml2,
lua,
lua5_4,
util-linux,
openexr,
openjpeg,
Expand All @@ -78,7 +78,9 @@
versionCheckHook,
gitUpdater,
}:

let
pugixml-shared = pugixml.override { shared = true; };
in
stdenv.mkDerivation rec {
version = "5.4.0";
pname = "darktable";
Expand Down Expand Up @@ -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 [
Expand Down
3 changes: 2 additions & 1 deletion pkgs/by-name/od/odin/package.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
lib,
llvmPackages,
llvmPackages_18,
fetchFromGitHub,
makeBinaryWrapper,
which,
nix-update-script,
}:

let
llvmPackages = llvmPackages_18;
inherit (llvmPackages) stdenv;
in
stdenv.mkDerivation (finalAttrs: {
Expand Down
5 changes: 4 additions & 1 deletion pkgs/by-name/re/renovate/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
makeWrapper,
nodejs,
nodejs_22,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
Expand All @@ -14,6 +14,9 @@
nix-update-script,
yq-go,
}:
let
nodejs = nodejs_22;
in
stdenv.mkDerivation (finalAttrs: {
pname = "renovate";
version = "42.83.1";
Expand Down
20 changes: 0 additions & 20 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down Expand Up @@ -7788,10 +7781,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;
};
Expand Down Expand Up @@ -9457,10 +9446,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
Expand Down Expand Up @@ -10059,11 +10044,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 { };
};
Expand Down
Loading