diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-04-06 02:12:49 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-04-17 09:05:21 +0000 |
| commit | b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca (patch) | |
| tree | bcb1c9967d68f306a14b93ae1de4f4b5ed2fde45 /nixos/modules/rename.nix | |
| parent | 4018d44641afb0312348c0a6c846331ec5224943 (diff) | |
| download | nixlib-b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca.tar nixlib-b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca.tar.gz nixlib-b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca.tar.bz2 nixlib-b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca.tar.lz nixlib-b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca.tar.xz nixlib-b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca.tar.zst nixlib-b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca.zip | |
nixos: rename.nix: fix bugs
Introduced in 286b007bd327a1e8d6d1fe66702b951f2fd6e29a and then in 2e6b796761672e0e3ed685487007bb0d99126d91. This a proper fix for what 70c6f6572dda0f2516bad812857ef814ec710a12 tried to do. Removing the "config" prefix triggers the bug on pure nixos too, not only on nixops.
Diffstat (limited to 'nixos/modules/rename.nix')
| -rw-r--r-- | nixos/modules/rename.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index ff90547b8a31..02ed2752cfa1 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -187,22 +187,20 @@ with lib; (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ]) # Fontconfig - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "config" "fonts" "fontconfig" "allowBitmaps" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowType1" ] [ "config" "fonts" "fontconfig" "allowType1" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "config" "fonts" "fontconfig" "useEmbeddedBitmaps" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) # Profile splitting (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) # misc/version.nix - (mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ]) - (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ]) - (mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ]) - (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ]) - (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ]) - (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ]) + (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) + (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ]) + (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ]) + (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) # Users (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) |