From b1bb9bb6c8a378dec6317c20281fd04b060016f2 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Wed, 1 Feb 2023 15:53:47 -0500 Subject: [PATCH] treewide: fix backwards smart apostrophes According to the Unicode Standard, you should use U+2019 RIGHT SINGLE QUOTATION MARK for apostrophes [1]. Before this change, some of the text in this repo would use U+2018 LEFT SINGLE QUOTATION MARKs instead. [1]: https://www.unicode.org/versions/Unicode15.0.0/ch06.pdf#G12411 --- doc/languages-frameworks/haskell.section.md | 4 ++-- nixos/maintainers/scripts/lxd/lxd-image-inner.nix | 2 +- nixos/modules/installer/tools/tools.nix | 2 +- nixos/modules/misc/version.nix | 2 +- pkgs/development/haskell-modules/configuration-common.nix | 2 +- .../haskell-modules/configuration-ghc-8.10.x.nix | 4 ++-- .../development/haskell-modules/configuration-ghc-8.6.x.nix | 4 ++-- .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 +++--- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 +- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index f0b302bbc356..f21ba295dc8d 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -195,7 +195,7 @@ maintenance work for `haskellPackages` is required. Besides that, it is not possible to get the dependencies of a legacy project from nixpkgs or to use a specific stack solver for compiling a project. -Even though we couldn‘t use them directly in nixpkgs, it would be desirable +Even though we couldn’t use them directly in nixpkgs, it would be desirable to have tooling to generate working Nix package sets from build plans generated by `cabal-install` or a specific Stackage snapshot via import-from-derivation. Sadly we currently don’t have tooling for this. For this you might be @@ -538,7 +538,7 @@ via [`shellFor`](#haskell-shellFor). When using `cabal-install` for dependency resolution you need to be a bit careful to achieve build purity. `cabal-install` will find and use all dependencies installed from the packages `env` via Nix, but it will also -consult Hackage to potentially download and compile dependencies if it can‘t +consult Hackage to potentially download and compile dependencies if it can’t find a valid build plan locally. To prevent this you can either never run `cabal update`, remove the cabal database from your `~/.cabal` folder or run `cabal` with `--offline`. Note though, that for some usecases `cabal2nix` needs diff --git a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index c8cf2a04fb10..ee55da1e9ce2 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix @@ -89,7 +89,7 @@ with lib; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave + # on your system were taken. It’s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index caf97f66ef31..d1b16d042d86 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -217,7 +217,7 @@ in # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave + # on your system were taken. It’s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 30d11913c533..447f8193855f 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -130,7 +130,7 @@ in to be compatible. The effect is that NixOS will use defaults corresponding to the specified release (such as using an older version of PostgreSQL). - It‘s perfectly fine and recommended to leave this value at the + It’s perfectly fine and recommended to leave this value at the release version of the first install of this system. Changing this option will not upgrade your system. In fact it is meant to stay constant exactly when you upgrade your system. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 548110cafc11..303a6ff40091 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1139,7 +1139,7 @@ self: super: { # 2021-12-26: Too strict bounds on doctest polysemy-plugin = doJailbreak super.polysemy-plugin; - # hasn‘t bumped upper bounds + # hasn’t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index baa8752e1e8f..7604a1c507a2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -69,7 +69,7 @@ self: super: { # Pick right versions for GHC-specific packages ghc-api-compat = doDistribute (unmarkBroken self.ghc-api-compat_8_10_7); - # ghc versions which don‘t match the ghc-lib-parser-ex version need the + # ghc versions which don’t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; @@ -77,7 +77,7 @@ self: super: { base-noprelude = doJailbreak super.base-noprelude; unliftio-core = doJailbreak super.unliftio-core; - # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10. + # Jailbreaking because monoidal-containers hasn’t bumped it's base dependency for 8.10. monoidal-containers = doJailbreak super.monoidal-containers; # Jailbreak to fix the build. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ddd41bc57e72..92278ebb0e21 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,13 +94,13 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; - # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. + # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_4; # Older compilers need the latest ghc-lib to build this package. hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin; - # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + # vector 0.12.2 indroduced doctest checks that don’t work on older compilers vector = dontCheck super.vector; mmorph = super.mmorph_1_1_3; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 941f95c07fac..903b177efaff 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -125,12 +125,12 @@ self: super: { liquid-vector = markBroken super.liquid-vector; liquidhaskell = markBroken super.liquidhaskell; - # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. + # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_7; ormolu = super.ormolu_0_2_0_0; - # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + # vector 0.12.2 indroduced doctest checks that don’t work on older compilers vector = dontCheck super.vector; ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6); @@ -143,7 +143,7 @@ self: super: { ghc-lib-parser = self.ghc-lib-parser_8_10_7_20220219; - # ghc versions which don‘t match the ghc-lib-parser-ex version need the + # ghc versions which don’t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser self.ghc-lib-parser-ex_8_10_0_24; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d61ab5200ceb..961178a06d4a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -667,7 +667,7 @@ dont-distribute-packages: - yices-easy - yices-painless - # These packages don‘t build because they use deprecated webkit versions. + # These packages don’t build because they use deprecated webkit versions. - diagrams-hsqml - dialog - ghcjs-dom-webkit diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 26d2e2aef4be..4105a01945e8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1115,7 +1115,7 @@ self: super: builtins.intersectAttrs super { hls-splice-plugin hls-refactor-plugin hls-cabal-plugin; - # Tests have file permissions expections that don‘t work with the nix store. + # Tests have file permissions expections that don’t work with the nix store. hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; hls-gadt-plugin = dontCheck super.hls-gadt-plugin;