Remove repeating words from doc

authored by Florian Engel and committed by Frederik Rietdijk 3329093c a58bd74a

+11 -11
+1 -1
doc/builders/fetchers.chapter.md
··· 18 19 The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball. 20 21 - `fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time. 22 23 24 Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`.
··· 18 19 The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball. 20 21 + `fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time. 22 23 24 Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`.
+1 -1
doc/builders/images/snaptools.xml
··· 16 </para> 17 18 <para> 19 - The <parameter>base</parameter> should not be be specified, as <function>makeSnap</function> will force set it. 20 </para> 21 22 <para>
··· 16 </para> 17 18 <para> 19 + The <parameter>base</parameter> should not be specified, as <function>makeSnap</function> will force set it. 20 </para> 21 22 <para>
+1 -1
doc/languages-frameworks/android.section.md
··· 80 81 You can specify license names: 82 83 - * `extraLicenses` is a list of of license names. 84 You can get these names from repo.json or `querypackages.sh licenses`. The SDK 85 license (`android-sdk-license`) is accepted for you if you set accept_license 86 to true. If you are doing something like working with preview SDKs, you will
··· 80 81 You can specify license names: 82 83 + * `extraLicenses` is a list of license names. 84 You can get these names from repo.json or `querypackages.sh licenses`. The SDK 85 license (`android-sdk-license`) is accepted for you if you set accept_license 86 to true. If you are doing something like working with preview SDKs, you will
+1 -1
doc/languages-frameworks/dotnet.section.md
··· 64 65 The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project. 66 67 - ## dotnetCorePackages.sdk vs vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore 68 69 The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version. 70
··· 64 65 The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project. 66 67 + ## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore 68 69 The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version. 70
+2 -2
doc/languages-frameworks/lua.section.md
··· 50 ```shell 51 nix-env -iA nixpkgs.myLuaEnv 52 ``` 53 - The environment is is installed by referring to the attribute, and considering 54 the `nixpkgs` channel was used. 55 56 #### Lua environment defined in `/etc/nixos/configuration.nix` ··· 129 [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). 130 The automation only goes so far though and some packages need to be customized. 131 These customizations go in `pkgs/development/lua-modules/overrides.nix`. 132 - For instance if the rockspec defines `external_dependencies`, these need to be manually added in in its rockspec file then it won't work. 133 134 You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`. 135 Nix rely on luarocks to install lua packages, basically it runs:
··· 50 ```shell 51 nix-env -iA nixpkgs.myLuaEnv 52 ``` 53 + The environment is installed by referring to the attribute, and considering 54 the `nixpkgs` channel was used. 55 56 #### Lua environment defined in `/etc/nixos/configuration.nix` ··· 129 [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). 130 The automation only goes so far though and some packages need to be customized. 131 These customizations go in `pkgs/development/lua-modules/overrides.nix`. 132 + For instance if the rockspec defines `external_dependencies`, these need to be manually added in its rockspec file then it won't work. 133 134 You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`. 135 Nix rely on luarocks to install lua packages, basically it runs:
+2 -2
doc/languages-frameworks/python.section.md
··· 334 creating working Python environments in nix. 335 336 Now that you know the basics to be up and running, it is time to take a step 337 - back and take a deeper look at at how Python packages are packaged on Nix. Then, 338 we will look at how you can use development mode with your code. 339 340 #### Python library packages in Nixpkgs ··· 918 919 * `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables 920 as well as the items listed in `setup_requires`. 921 - * `buildInputs ? []`: Build and/or run-time dependencies that need to be be 922 compiled for the host machine. Typically non-Python libraries which are being 923 linked. 924 * `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These
··· 334 creating working Python environments in nix. 335 336 Now that you know the basics to be up and running, it is time to take a step 337 + back and take a deeper look at how Python packages are packaged on Nix. Then, 338 we will look at how you can use development mode with your code. 339 340 #### Python library packages in Nixpkgs ··· 918 919 * `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables 920 as well as the items listed in `setup_requires`. 921 + * `buildInputs ? []`: Build and/or run-time dependencies that need to be 922 compiled for the host machine. Typically non-Python libraries which are being 923 linked. 924 * `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These
+1 -1
doc/languages-frameworks/ruby.section.md
··· 229 230 If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again. 231 232 - Now you can also also make a `default.nix` that looks like this: 233 234 ```nix 235 { bundlerApp }:
··· 229 230 If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again. 231 232 + Now you can also make a `default.nix` that looks like this: 233 234 ```nix 235 { bundlerApp }:
+1 -1
doc/languages-frameworks/rust.section.md
··· 737 stdenv.mkDerivation { 738 name = "rust-env"; 739 buildInputs = [ 740 - # Note: to use use stable, just replace `nightly` with `stable` 741 latest.rustChannels.nightly.rust 742 743 # Add some extra dependencies from `pkgs`
··· 737 stdenv.mkDerivation { 738 name = "rust-env"; 739 buildInputs = [ 740 + # Note: to use stable, just replace `nightly` with `stable` 741 latest.rustChannels.nightly.rust 742 743 # Add some extra dependencies from `pkgs`
+1 -1
doc/using/overlays.xml
··· 230 </para> 231 232 <para> 233 - For BLAS/LAPACK switching to work correctly, all packages must depend on <literal>blas</literal> or <literal>lapack</literal>. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions versions of BLAS/LAPACK currently in the wild, <literal>LP64</literal> (integer size = 32 bits) and <literal>ILP64</literal> (integer size = 64 bits). Some software needs special flags or patches to work with <literal>ILP64</literal>. You can check if <literal>ILP64</literal> is used in Nixpkgs with <varname>blas.isILP64</varname> and <varname>lapack.isILP64</varname>. Some software does NOT work with <literal>ILP64</literal>, and derivations need to specify an assertion to prevent this. You can prevent <literal>ILP64</literal> from being used with the following: 234 </para> 235 236 <programlisting>
··· 230 </para> 231 232 <para> 233 + For BLAS/LAPACK switching to work correctly, all packages must depend on <literal>blas</literal> or <literal>lapack</literal>. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, <literal>LP64</literal> (integer size = 32 bits) and <literal>ILP64</literal> (integer size = 64 bits). Some software needs special flags or patches to work with <literal>ILP64</literal>. You can check if <literal>ILP64</literal> is used in Nixpkgs with <varname>blas.isILP64</varname> and <varname>lapack.isILP64</varname>. Some software does NOT work with <literal>ILP64</literal>, and derivations need to specify an assertion to prevent this. You can prevent <literal>ILP64</literal> from being used with the following: 234 </para> 235 236 <programlisting>