Skip to content

Commit

Permalink
nixos: remove environment.noXlibs
Browse files Browse the repository at this point in the history
  • Loading branch information
mjm committed Sep 15, 2024
1 parent 04cc842 commit 768db40
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 106 deletions.
3 changes: 0 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,6 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange
/pkgs/build-support/node/fetch-npm-deps @winterqt
/doc/languages-frameworks/javascript.section.md @winterqt

# environment.noXlibs option aka NoX
/nixos/modules/config/no-x-libs.nix @SuperSandro2000

# OCaml
/pkgs/build-support/ocaml @ulrikstrid
/pkgs/development/compilers/ocaml @ulrikstrid
Expand Down
8 changes: 3 additions & 5 deletions nixos/doc/manual/configuration/profiles/minimal.section.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Minimal {#sec-profile-minimal}

This profile defines a small NixOS configuration. It does not contain any
graphical stuff. It's a very short file that enables
[noXlibs](#opt-environment.noXlibs), sets
[](#opt-i18n.supportedLocales) to
only support the user-selected locale,
and [disables packages' documentation](#opt-documentation.enable).
graphical stuff. It's a very short file that sets [](#opt-i18n.supportedLocales)
to only support the user-selected locale, and
[disables packages' documentation](#opt-documentation.enable).
3 changes: 3 additions & 0 deletions nixos/doc/manual/release-notes/rl-2411.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@

- `pkgs.nextcloud27` has been removed since it's EOL.

- The `environment.noXlibs` option has been removed. It was a common source of unexpected rebuilds and breakage that was often hard to diagnose.
If you need to disable certain libraries, you're encouraged to add your own overlay to your configuration that targets the packages you care about.

- `frigate` was updated past 0.14.0. This release includes various breaking changes, so please go read the [release notes](https://github.com/blakeblackshear/frigate/releases/tag/v0.14.0).
Most prominently access to the webinterface and API are now protected by authentication. Retrieve the auto-created
admin account from the `frigate.service` journal after upgrading.
Expand Down
91 changes: 0 additions & 91 deletions nixos/modules/config/no-x-libs.nix

This file was deleted.

1 change: 0 additions & 1 deletion nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
./config/nix-channel.nix
./config/nix-flakes.nix
./config/nix-remote-build.nix
./config/no-x-libs.nix
./config/nsswitch.nix
./config/power-management.nix
./config/pulseaudio.nix
Expand Down
4 changes: 4 additions & 0 deletions nixos/modules/rename.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ in

# Completely removed modules
(mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed")
(mkRemovedOptionModule [ "environment" "noXlibs" ] ''
The environment.noXlibs option was removed, as it often caused surprising breakages for new users.
If you need its functionality, you can apply similar overlays in your own config.
'')
(mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.")
(mkRemovedOptionModule [ "hardware" "brightnessctl" ] ''
The brightnessctl module was removed because newer versions of
Expand Down
6 changes: 0 additions & 6 deletions pkgs/by-name/he/hello/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ stdenv.mkDerivation (finalAttrs: {

passthru.tests = {
version = testers.testVersion { package = hello; };

invariant-under-noXlibs =
testers.testEqualDerivation
"hello must not be rebuilt when environment.noXlibs is set."
hello
(nixos { environment.noXlibs = true; }).pkgs.hello;
};

passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };
Expand Down

0 comments on commit 768db40

Please sign in to comment.