From 73d9a1c6ec12965be0fdfae4d160ea6cdb88add9 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 26 Jan 2026 16:39:03 +0100 Subject: [PATCH] various: remove last remaining references to pkgs.xorg --- pkgs/README.md | 4 ---- pkgs/by-name/zo/zoom/package.nix | 2 -- pkgs/development/haskell-modules/make-package-set.nix | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/README.md b/pkgs/README.md index ea8468f57fb2..18fcbb2cd558 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -305,10 +305,6 @@ For example, the `libxml2` package builds both a library and some tools; but it - `servers/http` (e.g. `apache-httpd`) -- **If it’s an implementation of the X Windowing System:** - - - `servers/x11` (e.g. `xorg` — this includes the client libraries and programs) - - **Else:** - `servers/misc` diff --git a/pkgs/by-name/zo/zoom/package.nix b/pkgs/by-name/zo/zoom/package.nix index c3cd88e01545..a3c85db2ded2 100644 --- a/pkgs/by-name/zo/zoom/package.nix +++ b/pkgs/by-name/zo/zoom/package.nix @@ -13,8 +13,6 @@ libice, }: -# !!! assert freetype == xorg.freetype - stdenv.mkDerivation (finalAttrs: { pname = "zoom"; version = "1.1.5"; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 4b66ccb6314f..9842c79a6741 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -161,7 +161,7 @@ let inherit (scope) ghc buildHaskellPackages; }; in - ps // ps.xorg // ps.gnome2 // { inherit stdenv; } // scopeSpliced; + ps // ps.gnome2 // { inherit stdenv; } // scopeSpliced; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args;