treewide: remove all-packages.nix overrides of packages defined in by-name (H) (#469776)

This commit is contained in:
Austin Horstman
2025-12-14 23:23:49 +00:00
committed by GitHub
17 changed files with 35 additions and 99 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
cmake,
pkg-config,
@@ -12,7 +12,7 @@
tomlplusplus,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprcursor";
version = "0.1.13";
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
nix-update-script,
cmake,
@@ -17,7 +17,7 @@
pixman,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprgraphics";
version = "0.4.0";
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
pkg-config,
cmake,
@@ -16,7 +16,7 @@
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hypridle";
version = "0.1.7";
@@ -1,11 +1,11 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
meson,
ninja,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprland-protocols";
version = "0.7.0";
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
cmake,
ninja,
@@ -8,7 +8,7 @@
pkg-config,
hyprlang,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprland-qt-support";
version = "0.1.0";
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
@@ -13,7 +13,7 @@
let
inherit (lib.strings) makeBinPath;
in
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprland-qtutils";
version = "0.1.5";
+4 -4
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
stdenvAdapters,
fetchFromGitHub,
pkg-config,
@@ -42,7 +42,7 @@
xwayland,
debug ? false,
enableXWayland ? true,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
withSystemd ? lib.meta.availableOn gcc15Stdenv.hostPlatform systemd,
wrapRuntimeDeps ? true,
# deprecated flags
nvidiaPatches ? false,
@@ -75,11 +75,11 @@ let
# which would be controlled by the `debug` flag
# Condition on darwin to avoid breaking eval for darwin in CI,
# even though darwin is not supported anyway.
adapters = lib.optionals (!stdenv.targetPlatform.isDarwin) [
adapters = lib.optionals (!gcc15Stdenv.targetPlatform.isDarwin) [
stdenvAdapters.useMoldLinker
];
customStdenv = foldl' (acc: adapter: adapter acc) stdenv adapters;
customStdenv = foldl' (acc: adapter: adapter acc) gcc15Stdenv adapters;
in
assert assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
assert assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
+2 -2
View File
@@ -1,13 +1,13 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
cmake,
pkg-config,
hyprutils,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprlang";
version = "0.6.7";
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
cmake,
pkg-config,
@@ -26,7 +26,7 @@
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprlock";
version = "0.9.2";
+3 -3
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
cmake,
cairo,
@@ -31,7 +31,7 @@
hyprgraphics,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprpaper";
version = "0.7.6";
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd3;
teams = [ lib.teams.hyprland ];
inherit (wayland.meta) platforms;
broken = stdenv.hostPlatform.isDarwin;
broken = gcc15Stdenv.hostPlatform.isDarwin;
mainProgram = "hyprpaper";
};
})
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
@@ -18,7 +18,7 @@
libXdmcp,
debug ? false,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprpicker" + lib.optionalString debug "-debug";
version = "0.4.5";
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
cmake,
pkg-config,
fetchFromGitHub,
@@ -10,7 +10,7 @@
polkit,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprpolkitagent";
version = "0.1.3";
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
cmake,
fetchFromGitHub,
pkg-config,
@@ -13,7 +13,7 @@
wayland-scanner,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprsunset";
version = "0.3.3";
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
@@ -13,7 +13,7 @@
let
inherit (lib.strings) makeBinPath;
in
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprsysteminfo";
version = "0.1.3";
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
cmake,
pkg-config,
pixman,
@@ -8,7 +8,7 @@
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprutils";
version = "0.11.0";
@@ -1,13 +1,13 @@
{
lib,
stdenv,
gcc15Stdenv,
fetchFromGitHub,
cmake,
pkg-config,
pugixml,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprwayland-scanner";
version = "0.4.5";
-64
View File
@@ -1974,70 +1974,6 @@ with pkgs;
stdenv = gcc15Stdenv;
};
hyprcursor = callPackage ../by-name/hy/hyprcursor/package.nix {
stdenv = gcc15Stdenv;
};
hyprgraphics = callPackage ../by-name/hy/hyprgraphics/package.nix {
stdenv = gcc15Stdenv;
};
hypridle = callPackage ../by-name/hy/hypridle/package.nix {
stdenv = gcc15Stdenv;
};
hyprland = callPackage ../by-name/hy/hyprland/package.nix {
stdenv = gcc15Stdenv;
};
hyprland-protocols = callPackage ../by-name/hy/hyprland-protocols/package.nix {
stdenv = gcc15Stdenv;
};
hyprland-qt-support = callPackage ../by-name/hy/hyprland-qt-support/package.nix {
stdenv = gcc15Stdenv;
};
hyprland-qtutils = callPackage ../by-name/hy/hyprland-qtutils/package.nix {
stdenv = gcc15Stdenv;
};
hyprlang = callPackage ../by-name/hy/hyprlang/package.nix {
stdenv = gcc15Stdenv;
};
hyprlock = callPackage ../by-name/hy/hyprlock/package.nix {
stdenv = gcc15Stdenv;
};
hyprpaper = callPackage ../by-name/hy/hyprpaper/package.nix {
stdenv = gcc15Stdenv;
};
hyprpicker = callPackage ../by-name/hy/hyprpicker/package.nix {
stdenv = gcc15Stdenv;
};
hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix {
stdenv = gcc15Stdenv;
};
hyprsunset = callPackage ../by-name/hy/hyprsunset/package.nix {
stdenv = gcc15Stdenv;
};
hyprsysteminfo = callPackage ../by-name/hy/hyprsysteminfo/package.nix {
stdenv = gcc15Stdenv;
};
hyprutils = callPackage ../by-name/hy/hyprutils/package.nix {
stdenv = gcc15Stdenv;
};
hyprwayland-scanner = callPackage ../by-name/hy/hyprwayland-scanner/package.nix {
stdenv = gcc15Stdenv;
};
hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
hyprlandPlugins = recurseIntoAttrs (