diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-19 00:12:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 00:12:05 +0000 |
| commit | 259fe227c872212a3ba6906182d53880c910b8c9 (patch) | |
| tree | d0c8a38ebf6ae0ac8f8fe01dee16602fb4bb6e68 /pkgs/development/compilers | |
| parent | 5d40eaa66fec25b00acb333215a1d2991bc0f0da (diff) | |
| parent | e388728ddf131e4442906f90fd365b11fe999aac (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/compilers')
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 8f59e58ff5a5..84bf37c3c8c1 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -91,7 +91,7 @@ aspnetcore_packages () { # would fail due to missing dependencies. # # Moving them to a separate list stored alongside the SDK package definitions, - # and implictly including them along in buildDotnetModule allows us + # and implicitly including them along in buildDotnetModule allows us # to make updating .NET SDK packages a lot easier - we now just update # the versions of these packages in one place, and all packages that # use buildDotnetModule continue building with the new .NET version without changes. @@ -141,7 +141,7 @@ sdk_packages () { # would fail due to missing dependencies. # # Moving them to a separate list stored alongside the SDK package definitions, - # and implictly including them along in buildDotnetModule allows us + # and implicitly including them along in buildDotnetModule allows us # to make updating .NET SDK packages a lot easier - we now just update # the versions of these packages in one place, and all packages that # use buildDotnetModule continue building with the new .NET version without changes. diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index be2e65485134..e5ccffc7e76a 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -2,7 +2,7 @@ let - # To controll nodejs version we pass down + # To control nodejs version we pass down nodejs = pkgs.nodejs-14_x; fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 516cdee708d3..c28ef88ce933 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" "pie" ]; - # When targetting darwin, libgcc_ext.10.{4,5}.dylib are created as + # When targeting darwin, libgcc_ext.10.{4,5}.dylib are created as # MH_DYLIB_STUB files, which install_name_tool can't change, so we # get a cycle between $out and $lib. outputs = if langJava || langGo || targetPlatform.isDarwin then ["out" "man" "info"] diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index 86de8aae2ef0..a06cb310e108 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -16,7 +16,7 @@ # }; # } config - # GraalVM version that will be used unless overriden by `config.<platform>.version` + # GraalVM version that will be used unless overridden by `config.<platform>.version` , defaultVersion # Java version used by GraalVM , javaVersion |