Unverified Commit 5c826b83 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

various: remove by-name overrides (part 4) (#483859)

parents 611de3e8 65bafefd

pkgs/by-name/ae/aegisub/package.nix

+5 −1
Original line number Diff line number Diff line
@@ -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)

pkgs/by-name/da/darktable/package.nix

+6 −4
Original line number Diff line number Diff line
@@ -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 [

pkgs/by-name/od/odin/package.nix

+2 −1
Original line number Diff line number Diff line 
{

  lib,

  llvmPackages,

  llvmPackages_18,

  fetchFromGitHub,

  makeBinaryWrapper,

  which,
@@ -8,6 +8,7 @@ 
}:



let

  llvmPackages = llvmPackages_18;

  inherit (llvmPackages) stdenv;

in

stdenv.mkDerivation (finalAttrs: {

pkgs/by-name/re/renovate/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/all-packages.nix

+0 −20
Original line number Diff line number Diff line
@@ -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;

  };
@@ -7784,10 +7777,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;

  };
@@ -9453,10 +9442,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
@@ -10055,11 +10040,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 { };

  };