diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-04-22 17:46:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 17:46:09 +0000 |
| commit | f442bfc02a2d428019db9cce57478b6ad9b83d5a (patch) | |
| tree | 64f9e5ad13bda902a81a76f8e50f93a70d23f74d /nixos/modules/rename.nix | |
| parent | a3a2ae65d7ee0ace9e316125b85422fd02937a3a (diff) | |
| parent | b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca (diff) | |
| download | nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.gz nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.bz2 nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.lz nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.xz nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.zst nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.zip | |
Merge pull request #39048 from oxij/nixos/fix-rename-bugs
nixos: fix rename.nix bugs
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 d8bea6267320..a1ead80cc215 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -189,22 +189,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" ]) |