From c9ce275aa4e7176d8e480e4b8bafe76f9c837162 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Sep 2021 18:45:33 +0000 Subject: [PATCH] treewide: "does not exists" -> "does not exist" I noticed this minor grammar mistake when running update.nix, and then while grepping to find the source I noticed we had it a few times in Nixpkgs. Just as easy to fix treewide as it was to fix the one occurrence I noticed. --- maintainers/scripts/update.nix | 4 ++-- nixos/modules/services/backup/znapzend.nix | 2 +- nixos/modules/services/monitoring/nagios.nix | 2 +- nixos/modules/services/networking/firefox/sync-server.nix | 2 +- pkgs/development/mobile/androidenv/emulate-app.nix | 2 +- pkgs/misc/vscode-extensions/updateSettings.nix | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 7435cf64425c..d881d68301ba 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -103,7 +103,7 @@ let pathContent = lib.attrByPath prefix null pkgs; in if pathContent == null then - builtins.throw "Attribute path `${path}` does not exists." + builtins.throw "Attribute path `${path}` does not exist." else packagesWithPath prefix (path: pkg: builtins.hasAttr "updateScript" pkg) pathContent; @@ -115,7 +115,7 @@ let package = lib.attrByPath (lib.splitString "." path) null pkgs; in if package == null then - builtins.throw "Package with an attribute name `${path}` does not exists." + builtins.throw "Package with an attribute name `${path}` does not exist." else if ! builtins.hasAttr "updateScript" package then builtins.throw "Package with an attribute name `${path}` does not have a `passthru.updateScript` attribute defined." else diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index debb2a397050..1fccc7cd6076 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -324,7 +324,7 @@ in autoCreation = mkOption { type = bool; default = false; - description = "Automatically create the destination dataset if it does not exists."; + description = "Automatically create the destination dataset if it does not exist."; }; zetup = mkOption { diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 0afaefe04e18..280a9a001b5b 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -41,7 +41,7 @@ let validated = pkgs.runCommand "nagios-checked.cfg" {preferLocalBuild=true;} '' cp ${file} nagios.cfg # nagios checks the existence of /var/lib/nagios, but - # it does not exists in the build sandbox, so we fake it + # it does not exist in the build sandbox, so we fake it mkdir lib lib=$(readlink -f lib) sed -i s@=${nagiosState}@=$lib@ nagios.cfg diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 24f768649530..1ad573abfca3 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -119,7 +119,7 @@ in password, and the setting is used by the server to generate cryptographically-signed authentication tokens. - If this file does not exists, then it is created with a generated + If this file does not exist, then it is created with a generated settings. ''; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 83be06a31419..ef803779ad64 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" - # Create a virtual android device for testing if it does not exists + # Create a virtual android device for testing if it does not exist ${sdk}/libexec/android-sdk/tools/bin/avdmanager list target if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/misc/vscode-extensions/updateSettings.nix index c7fecf080720..443b40930279 100644 --- a/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/pkgs/misc/vscode-extensions/updateSettings.nix @@ -6,7 +6,7 @@ }: ##User Input { settings ? {} -# if marked as true will create an empty json file if does not exists +# if marked as true will create an empty json file if does not exist , createIfDoesNotExists ? true , vscodeSettingsFile ? ".vscode/settings.json" , userSettingsFolder ? ""