diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-18 18:01:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-18 18:01:41 +0000 |
commit | dc7ebb016390d3e8debba854bf93d17a55d63c30 (patch) | |
tree | 9803897c0292ea5ab80e48e368aebebe0c714f2b /pkgs/build-support | |
parent | 0f6cf57d0af4f2e37d636801895696fabcbbad3e (diff) | |
parent | 5400210d8401123de23b92c6931301bb956829b0 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
7 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 48c780e2dbe45..3d51c03f97af2 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -879,7 +879,7 @@ rec { contentsList = if builtins.isList contents then contents else [ contents ]; # We store the customisation layer as a tarball, to make sure that - # things like permissions set on 'extraCommands' are not overriden + # things like permissions set on 'extraCommands' are not overridden # by Nix. Then we precompute the sha256 for performance. customisationLayer = symlinkJoin { name = "${baseName}-customisation-layer"; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 5e8d76defe76d..89d423c80d72a 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -111,7 +111,7 @@ let deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps; }; - # this contains all the nuget packages that are implictly referenced by the dotnet + # this contains all the nuget packages that are implicitly referenced by the dotnet # build system. having them as separate deps allows us to avoid having to regenerate # a packages dependencies when the dotnet-sdk version changes sdkDeps = mkNugetDeps { diff --git a/pkgs/build-support/fetchfirefoxaddon/tests.nix b/pkgs/build-support/fetchfirefoxaddon/tests.nix index fd70d0f82ac04..a29f65c542adb 100644 --- a/pkgs/build-support/fetchfirefoxaddon/tests.nix +++ b/pkgs/build-support/fetchfirefoxaddon/tests.nix @@ -7,7 +7,7 @@ url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi"; sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg="; }; - overidden-source = + overridden-source = let image-search-options = fetchurl { url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi"; diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index c7129ae83f928..742cce13b7bf1 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation ( - # First, attributes that can be overriden by the caller (via args): + # First, attributes that can be overridden by the caller (via args): { # By default, only configure and build a source distribution. # Some packages can only build a distribution after a general diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index a4536a1751c82..1ecef4c8e3270 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -576,7 +576,7 @@ let expectedFiles = [ "./bin/test_binary1" ] ++ lib.optionals stdenv.isDarwin [ - # On Darwin, the debug symbols are in a seperate directory. + # On Darwin, the debug symbols are in a separate directory. "./bin/test_binary1.dSYM/Contents/Info.plist" "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1" ]; diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index 0f97c9b724bd6..e15390c3ffa80 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -2931,7 +2931,7 @@ rec { /* Returns a crate which depends on successful test execution of crate given as the second argument. - testCrateFlags: list of flags to pass to the test exectuable + testCrateFlags: list of flags to pass to the test executable testInputs: list of packages that should be available during test execution */ crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }: diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 06e1deb478458..7b66aa3799f37 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1156,7 +1156,7 @@ rec { of the default image parameters can be given. In particular, `extraPackages' specifies the names of additional packages from the distribution that should be included in the image; `packages' - allows the entire set of packages to be overriden; and `size' + allows the entire set of packages to be overridden; and `size' sets the size of the disk in megabytes. E.g., `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"]; size = 8192; }' builds an 8 GiB image containing Firefox in |