Unverified Commit 92c07c87 authored by maralorn's avatar maralorn Committed by GitHub
Browse files

Merge pull request #214923 from Jayman2000/backwards-smart-apostrophes 

treewide: fix backwards smart apostrophes
parents 3371560d b1bb9bb6

doc/languages-frameworks/haskell.section.md

+2 −2
Original line number Diff line number Diff line
@@ -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

nixos/maintainers/scripts/lxd/lxd-image-inner.nix

+1 −1
Original line number Diff line number Diff line
@@ -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).

nixos/modules/installer/tools/tools.nix

+1 −1
Original line number Diff line number Diff line
@@ -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).

nixos/modules/misc/version.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.

pkgs/development/haskell-modules/configuration-common.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;