diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 2aa8899e5b35..63abf88cab09 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -8,7 +8,7 @@ let * to a menuentry for use in grub. * * * defaults: {name, image, params, initrd} - * * options: [ option... ] + * * options: [ option... ] * * option: {name, params, class} */ menuBuilderGrub2 = diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index f7774e685f7e..a9cb396f13fd 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -344,7 +344,7 @@ let serviceConfig = commonServiceConfig // { Group = data.group; - # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. + # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. # This avoids eating them all up if something is misconfigured upon the first try. RestartSec = 15 * 60; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 8d58470c51f5..fcaca9244c76 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1020,7 +1020,7 @@ in { ''; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; - # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent + # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent # an automatic creation of the database user. environment.NC_setup_create_db_user = lib.mkIf (nextcloudGreaterOrEqualThan "26") "false"; }; diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index 46d671f8504b..62db479da3d4 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -406,7 +406,7 @@ in { # is unnecessary as it's part of the installPhase of pixelfed. # Install Horizon - # FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish + # FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish # Perform the first migration. [[ ! -f ${cfg.dataDir}/.initial-migration ]] && pixelfed-manage migrate --force && touch ${cfg.dataDir}/.initial-migration diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index ad516b6e8d2b..f35eaf9c8e78 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -154,7 +154,7 @@ in { with subtest("run_distributed_command"): # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes). - # The output must contain the 3 different names + # The output must contain the 3 different names submit.succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq") with subtest("check_slurm_dbd"): diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index 8eb6df45db9a..ee8e0a99a948 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -111,7 +111,7 @@ clangStdenv.mkDerivation (finalAttrs: { "-DSuil_INCLUDE_DIR=${suil}/include/suil-0" ]; - # Needed for libraries that get dlopen'd + # Needed for libraries that get dlopen'd env.NIX_LDFLAGS = toString [ "-lasound" "-llilv-0" diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/data/fonts/league-spartan/default.nix index 10691f10c8e0..022346c5abca 100644 --- a/pkgs/data/fonts/league-spartan/default.nix +++ b/pkgs/data/fonts/league-spartan/default.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { Taking a strong influence from ATF's classic Spartan family, we're starting our own family out with a single strong weight. We've put a few unique touches into a beautiful, historical typeface, and made sure to - include an extensive characterset – currently totaling over 300 glyphs. + include an extensive characterset – currently totaling over 300 glyphs. Over time, the open-source license will allow us expand League Spartan into a full family, with multiple weights and styles, and we're starting diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index e8caeadcd32d..2bc678e8b4af 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { # Disable any integration tests, which need to contact the internet. # Also disable the `storage_benchmark_*` tests. # With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON. - # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF + # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF ctest --label-exclude integration-test --exclude-regex storage_benchmarks_ runHook postInstallCheck diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 741755247223..8f6e77800b56 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # works locally on APFS, fails on hydra with AssertionError comparing timestamps # darwin hydra builder uses HFS+ and has only one second timestamp resolution - # this two tests however, assume nanosecond resolution + # this two tests however, assume nanosecond resolution "test_modified" "test_touch" # tries to access /home, ignores $HOME diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix index 6e3e795de0ab..4a6c983e75ab 100644 --- a/pkgs/development/python-modules/layoutparser/default.nix +++ b/pkgs/development/python-modules/layoutparser/default.nix @@ -40,7 +40,7 @@ let torchvision effdet ]; - # paddledetection = [ paddlepaddle ] + # paddledetection = [ paddlepaddle ] }; in buildPythonPackage { diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0b3da3f22f71..ee3862052135 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -562,7 +562,7 @@ let USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling - USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies) + USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies) # default to dual role mode USB_DWC2_DUAL_ROLE = yes; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 93690b573020..11e724146798 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1561,7 +1561,7 @@ mapAliases { invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = promscale; # Added 2020-09-29 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 - tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 + tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 56bfd093fdd4..6d2fb6f0484c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18770,7 +18770,7 @@ with self; { buildInputs = [ TestNoWarnings ]; perlPreHook = "export LD=$CC"; meta = { - description = "Internationalizing Domain Names in Applications (UTS #46)"; + description = "Internationalizing Domain Names in Applications (UTS #46)"; homepage = "https://metacpan.org/release/Net-IDN-Encode"; license = with lib.licenses; [ artistic1 gpl1Plus ]; };