Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Clean up deprecated lib functions (#4068)

Browse source 
`isCoercibleToString` and `defaultPriority` will start raising warnings
in 23.05.
This commit is contained in:
Naïm Favier 2023-06-09 11:57:20 +02:00 committed by GitHub
parent 2bbfc3a78a
commit 9b8ba302ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/misc/nix.nix
View file

@ -30,7 +30,7 @@ let
toString v toString v
else if isString v then else if isString v then
v v
else if isCoercibleToString v then else if isConvertibleWithToString v then
toString v toString v
else else
abort "The nix conf value: ${toPretty { } v} can not be encoded"; abort "The nix conf value: ${toPretty { } v} can not be encoded";

4
modules/misc/nixpkgs.nix
View file

@ -129,7 +129,9 @@ in {
config = { config = {
_module.args = { _module.args = {
pkgs = mkOverride modules.defaultPriority _pkgs; # We use a no-op override to make sure that the option can be merged without evaluating
# `_pkgs`, see https://github.com/nix-community/home-manager/pull/993
pkgs = mkOverride modules.defaultOverridePriority _pkgs;
pkgs_i686 = pkgs_i686 =
if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86 then if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86 then
_pkgs.pkgsi686Linux _pkgs.pkgsi686Linux