Skip to content

Commit

Permalink
xlibsWrapper: remove deprecated and now unused wrapper package
Browse files Browse the repository at this point in the history
There should be no reason to use this package as it's a remnant of
non-modular X. Chances are you do not want every single library it
used to pull in:

      freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt
      xorg.libXft xorg.libXext xorg.libSM xorg.libICE

Just pick the ones you really need instead.

`nixpkgs` does not have any users of `xlibsWrapper`.

Closes: #194054
  • Loading branch information
trofi committed Dec 28, 2022
1 parent 5d101d5 commit 3c478e4
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 29 deletions.
8 changes: 8 additions & 0 deletions nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,14 @@
that it configures the NixOS boot process, not the Nix daemon.
</para>
</listitem>
<listitem>
<para>
Deprecated <literal>xlibsWrapper</literal> transitional
package has been removed in favour of direct use of its
constitutents: <literal>xorg.libX11</literal>,
<literal>freetype</literal> and others.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-23.05-notable-changes">
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2305.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ In addition to numerous new and upgraded packages, this release has the followin

- The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon.

- Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constitutents: `xorg.libX11`, `freetype` and others.

## Other Notable Changes {#sec-release-23.05-notable-changes}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
Expand Down
21 changes: 0 additions & 21 deletions pkgs/development/libraries/xlibs-wrapper/default.nix

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1627,6 +1627,7 @@ mapAliases ({
xfceUnstable = throw "xfceUnstable has been removed, use xfce instead"; # added 2022-12-25
xineLib = xine-lib; # Added 2021-04-27
xineUI = xine-ui; # Added 2021-04-27
xlibsWrapper = throw "'xlibsWrapper' has been replaced by its constituents"; # Converted to throw 2022-12-27
xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22
xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
Expand Down
8 changes: 0 additions & 8 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23434,14 +23434,6 @@ with pkgs;

xgeometry-select = callPackage ../tools/X11/xgeometry-select { };

# Avoid using this. It isn't really a wrapper anymore, but we keep the name.
xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
packages = [
freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt
xorg.libXft xorg.libXext xorg.libSM xorg.libICE
];
};

xmlada = callPackage ../development/libraries/ada/xmlada { };

xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
Expand Down

0 comments on commit 3c478e4

Please sign in to comment.