Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/modules: stdenv.lib -> lib #109665

Merged
merged 1 commit into from Jan 19, 2021
Merged

nixos/modules: stdenv.lib -> lib #109665

merged 1 commit into from Jan 19, 2021

Conversation

prusnak
Copy link
Member

@prusnak prusnak commented Jan 17, 2021

Motivation for this change

Part of #108938

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

rnhmjoj
rnhmjoj reviewed Jan 17, 2021
View reviewed changes
nixos/tests/searx.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :

{
name = "searx";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also do pkgs.lib -> lib in NixOS modules?

Copy link
Member Author

@prusnak prusnak Jan 17, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, but I prefer not to do this in this commit anyway.

Most of other modules use pkgs.lib at the moment.

rnhmjoj
rnhmjoj approved these changes Jan 19, 2021
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff looks good and it evaluates.

roberth
roberth approved these changes Jan 19, 2021
View reviewed changes
nixos/modules/config/gnu.nix
@@ -1,11 +1,9 @@
{ config, lib, pkgs, ... }:

with lib;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good riddance!
❤️

@roberth roberth merged commit d51d15e into NixOS:master Jan 19, 2021
@prusnak prusnak deleted the stdenv-lib-nixos branch January 19, 2021 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth approved these changes

@rnhmjoj rnhmjoj rnhmjoj approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@prusnak @roberth @rnhmjoj