Skip to content

Commit 0f2dee4

Browse files
committed
Fix typos
1 parent c655bda commit 0f2dee4

18 files changed

+51
-51
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ graph TD
101101
NoShepherds[Closed - Lack of Interest]:::closed
102102
NoShepherds --> |Renewed Interest| Discuss
103103
104-
FCP[Final Coment Phase]
104+
FCP[Final Comment Phase]
105105
FCP --> |FCP Canceled| Discuss
106106
FCP --> |Accept| Merged
107107
FCP --> |Reject| Rejected

rfcs/0001-rfc-process.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ because they introduce new concepts, big changes or are controversial enough
2323
that not everybody will agree on the direction to take.
2424

2525
Therefore, the purpose of this RFC is to introduce a process that allows to
26-
bring the discussion upfront and avoid unnecesary implementations. It forces
26+
bring the discussion upfront and avoid unnecessary implementations. It forces
2727
developers to formulate their ideas without getting bogged down into
2828
implementation details. This RFC is used to bootstrap the process and further
2929
RFCs can be used to refine the process.
@@ -64,7 +64,7 @@ Pull requests that contain any of the afore mentioned 'substantial' changes may
6464
## Description of the process
6565

6666
In short, to get a major feature added to the Nix ecosystem, one should first
67-
go through the RFC process in order to improve the likelyhood of inclusion.
67+
go through the RFC process in order to improve the likelihood of inclusion.
6868
Here are roughly the steps that one would take:
6969

7070
* Fork the RFC repo https://github.com/NixOS/rfcs
@@ -79,12 +79,12 @@ that will help them bring the RFC to completion. The goal is to improve the
7979
chances that the RFC is both desired and likely to be implemented.
8080

8181
Once the author is happy with the state of the RFC, they should seek for
82-
wider community review by stating the readyness of the work. Advertisement on
82+
wider community review by stating the readiness of the work. Advertisement on
8383
the mailing-list and IRC is an acceptable way of doing that.
8484

8585
After a number of rounds of review the discussion should settle and a general
8686
consensus should emerge. This bit is left intentionally vague and should be
87-
refined in the future. We don't have a technical commitee so controversial
87+
refined in the future. We don't have a technical committee so controversial
8888
changes will be rejected by default.
8989

9090
If a RFC is accepted then authors may implement it and submit the feature as a

rfcs/0023-musl-libc.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ most popular libc implementation on Linux, and is used
6666
by a number of important projects you may be familiar with
6767
large userbases, including:
6868
* Alpine Linux - [#70 on Distrowatch](https://distrowatch.com/table.php?distribution=alpine) but very popular amongst docker users for producing slim container images.
69-
* [OpenWRT/LEDE](https://openwrt.org/) - #1 open-source Linux router firmware project; foundation of most other projects targetting routers.
69+
* [OpenWRT/LEDE](https://openwrt.org/) - #1 open-source Linux router firmware project; foundation of most other projects targeting routers.
7070
More projects and details of how they use musl can be found here:
7171

7272
https://wiki.musl-libc.org/projects-using-musl.html
@@ -86,7 +86,7 @@ The main arguments for inclusion are:
8686
* Software sometimes must be patched to compile or run with musl; in @dtzWill's experience,
8787
these changes are largely fixes improving compliance and correctness resulting in
8888
higher-quality programs. Recent versions of glibc have started taking stronger stances
89-
on enforcing compliance (look at patch fallout folllowing any glibc upgrade in last year or so)
89+
on enforcing compliance (look at patch fallout following any glibc upgrade in last year or so)
9090
resulting in overlapping work from both sides.
9191
(NOTE: use of glibc extensions or reliance on non-standard behavior is still common and unlikely to go away soon)
9292

@@ -107,7 +107,7 @@ do folks believe the costs are too high?
107107
* [projects using musl](https://wiki.musl-libc.org/projects-using-musl.html)
108108
* [Slides from a talk discussing various libcs, 2014](http://events17.linuxfoundation.org/sites/events/files/slides/libc-talk.pdf)
109109

110-
## Related Isssues
110+
## Related Issues
111111

112112
* [big musl PR](https://github.com/NixOS/nixpkgs/pull/34645)
113113
* [issues matching "musl", newest first](https://github.com/NixOS/nixpkgs/search?o=desc&q=musl&s=created&type=Issues&utf8=%E2%9C%93)
@@ -212,7 +212,7 @@ Unfortunately this is unrealistic due to capacity constraints and other reasons.
212212

213213
### Responsibility
214214

215-
"musl team" is reponsible, initially consisting of
215+
"musl team" is responsible, initially consisting of
216216

217217
* @dtzWill
218218
* @shlevy

rfcs/0026-staging-workflow.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ related-issues:
99
# Summary
1010
[summary]: #summary
1111

12-
Define a new workflow for the `staging` branch that can better accomodate the
12+
Define a new workflow for the `staging` branch that can better accommodate the
1313
current and future influx of changes in order to deliver mass-rebuilds faster to
1414
master. As part of this new workflow an additional branch, `staging-next`, shall
1515
be introduced.
@@ -20,14 +20,14 @@ be introduced.
2020

2121
The current workflow cannot handle the high amount of mass-rebuilds that are
2222
continuously delivered, resulting in long delays for these deliveries to reach
23-
`master`. When a certain delivery causes failures, attemps are typically made to
23+
`master`. When a certain delivery causes failures, attempts are typically made to
2424
fix these failures and stabilize `staging` so that the specific delivery can still
2525
reach `master`.
2626

2727
Often it happens that during this period of stabilization other mass-rebuilds
2828
are submitted, and it is not uncommon that these also introduce failures, thus
2929
again increasing the time it takes for a delivery to reach `master`. This is
30-
especially worrysome in case of security fixes that need to be delivered as soon
30+
especially worrisome in case of security fixes that need to be delivered as soon
3131
as possible.
3232

3333
# Detailed design

rfcs/0036-rfc-process-team-amendment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ This team should be people who are very familiar with the main components
6060
touched by the RFC. The author cannot be part of the Shepherd Team. In addition,
6161
at most half of the Shepherd Team can be part of the RFC Steering Committee.
6262

63-
The resposibility of the team is to guide the discussion as long as it is
63+
The responsibility of the team is to guide the discussion as long as it is
6464
constructive, new points are brought up and the RFC is iterated on and from time
6565
to time summarise the current state of discussion. If this is the case no longer,
6666
then the Shepherd Team shall step in with a motion for FCP.
6767

6868
##### Shepherd Leader
6969
The person in charge of the RFC process for a specific RFC, and responsible for
7070
ensuring the process is followed in a timely fashion. The Shepherd Leader has no
71-
special resposibility with regard to moving an undecided Shepherd Team to a
71+
special responsibility with regard to moving an undecided Shepherd Team to a
7272
certain decision.
7373

7474
##### Final Comment Period (FCP)

rfcs/0039-unprivileged-maintainer-teams.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ for requested reviews](https://github.com/pulls/review-requested).
178178
automation with credentials on an automated basis.
179179

180180
# Future Potential RFCs
181-
The following topics are explictly _not_ part of this RFC.
181+
The following topics are explicitly _not_ part of this RFC.
182182

183183
- Allowing maintainers to merge pull requests against their packages
184184
without having commit access.

rfcs/0042-config-option.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ The second part of this RFC aims to encourage people to write better NixOS modul
192192

193193
This RFC has to be thought of as a basis for *new* modules first and foremost. By using this approach we can provide a good basis for new modules, with great flexibility for future changes.
194194

195-
For existing modules, it is often not possible to use this `settings` style without breaking backwards compatibility. How this is handled is left up to the module authors. A workaround that could be employed is to define options `useLegacyConfig` or `declarative` which determin the modules behavior in regards to old options.
195+
For existing modules, it is often not possible to use this `settings` style without breaking backwards compatibility. How this is handled is left up to the module authors. A workaround that could be employed is to define options `useLegacyConfig` or `declarative` which determine the modules behavior in regards to old options.
196196

197197
# Drawbacks
198198
[drawbacks]: #drawbacks

rfcs/0044-disband-nix-core.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ evolution of the Nix ecosystem and community. It was originally slated
2020
as a year-long experiment.
2121

2222
It is now a little over a year since officially merging. In that time,
23-
the core team has not made signifcant progress on its initial goals.
23+
the core team has not made significant progress on its initial goals.
2424
We now have the RFC steering/shepherding process which serves similar
2525
goals (but for the whole ecosystem, not just Nix proper) and is
2626
operating well. The remaining functions of the core team *not* covered
@@ -46,7 +46,7 @@ announce on all relevant forums.
4646

4747
* Keep the core team around in its current form and responsibilities.
4848
Would require a fresh attempt to follow through on the relevant
49-
committments to be practical.
49+
commitments to be practical.
5050
* Reform the core team based on what we've learned, including possibly
5151
narrowing the scope.
5252

rfcs/0062-content-addressed-paths.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
feature: Simple content-adressed store paths
2+
feature: Simple content-addressed store paths
33
start-date: 2019-08-14
44
author: Théophane Hufschmitt
55
co-authors: (find a buddy later to help our with the RFC)
@@ -15,7 +15,7 @@ related-issues: (will contain links to implementation PRs)
1515
Add some experimental support for content-addressed store paths to Nix.
1616

1717
We plan here to give the possibility to mark certain store paths as
18-
content-adressed (ca), while keeping the other input-adressed as they are
18+
content-addressed (ca), while keeping the other input-addressed as they are
1919
now (modulo some mandatory drv rewriting before the build, see below).
2020

2121
By making this opt-in, we can impose arbitrary limitations to the paths that
@@ -37,17 +37,17 @@ the `ca-derivation` experimental flag.
3737

3838
[motivation]: #motivation
3939

40-
Having a content-adressed store with Nix (aka the "Intensional store") is a
40+
Having a content-addressed store with Nix (aka the "Intensional store") is a
4141
long-time dream of the community − a design for that was already taking a whole
4242
chapter in [Eelco's PHD thesis][nixphd].
4343

4444
This was never done because it represents quite a big change in Nix's model,
4545
with some non-trivial implications (regarding the trust model in
4646
particular).
4747
Even without going all the way down to a fully intensional model, we can
48-
make specific paths content-adressed, which can give some important benefits of
48+
make specific paths content-addressed, which can give some important benefits of
4949
the intensional store at a much lower price. In particular, setting some
50-
critical derivations as content-adressed can lead to some substantial build
50+
critical derivations as content-addressed can lead to some substantial build
5151
cutoffs.
5252

5353
# Detailed design
@@ -87,7 +87,7 @@ these derivations).
8787

8888
To fully support this content-addressed model, we need to extend the current
8989
build process, as well as the caching and remote building systems so that they
90-
are able to take into account the specificies of these new derivations.
90+
are able to take into account the specifics of these new derivations.
9191

9292
Fully supporting content-addressed derivations requires some deep changes to the Nix model.
9393
For the sake of readability, we’ll first present a simplistic model that support them in a very basic way, and then extend this model in several different ways to improve the support.
@@ -119,7 +119,7 @@ the output paths of a derivation before building it.
119119
This means that the Nix evaluator doesn’t know the output paths of the
120120
dependencies it manipulates (it _could_ know them if they are already built, but
121121
that would be a blatant purity hole), so these derivations can’t neither embed
122-
their own output path, nor explicitely refer to their dependencies by their
122+
their own output path, nor explicitly refer to their dependencies by their
123123
output path.
124124

125125
### Output mappings
@@ -214,7 +214,7 @@ A store path `/nix/store/abc-foo` is said to be **self-referential** if the
214214
content of the path mentions the path `/nix/store/abc-foo` itself (and this
215215
mention of the store path is called a **self-reference**).
216216

217-
A lot of store paths happen to be self-referential (for example a path that contains both an dynamic library and an executable using that library will likely have the `rpath` of the exectuable mention the absolute path to the library).
217+
A lot of store paths happen to be self-referential (for example a path that contains both an dynamic library and an executable using that library will likely have the `rpath` of the executable mention the absolute path to the library).
218218

219219
It happens that these are problematic with content-addressed derivations, because
220220

@@ -224,9 +224,9 @@ It happens that these are problematic with content-addressed derivations, becaus
224224
However, under the assumption that self-references only appear textually in the output (_i.e_ running strings on a file that contains self-references will print all the self-references out), we can:
225225

226226
- Build the derivation on a temporary directory (`/nix/store/someArbitraryHash-foo`, the path provided by the function `assignScratchOutputPaths` above)
227-
- Replace all the occurences of `someArbitraryHash` by a fixed magic value
227+
- Replace all the occurrences of `someArbitraryHash` by a fixed magic value
228228
- Compute the hash of the resulting path to determine the final path
229-
- Replace the occurences of the magic value by the final path hash
229+
- Replace the occurrences of the magic value by the final path hash
230230
- Move the result to the final path.
231231

232232
This is obviously a hack, however it seems to work very well in practice, due to the fact that:
@@ -311,7 +311,7 @@ work on store paths, but rather at the realisation level:
311311

312312
If the store knows about the given derivation output, it will return the associated realisation, otherwise it will return `None`.
313313

314-
- The substitution loop in Nix fist calls this method to ask the remote for the
314+
- The substitution loop in Nix first calls this method to ask the remote for the
315315
realisation of the current derivation output.
316316
If this first call succeeds, then it fetches the corresponding output path
317317
like before. Then, it registers the realisation in the database:
@@ -330,7 +330,7 @@ This folder contains a set of files of the form `{drvOutput}.doi`, each of them
330330

331331
#### The “two-glibc” issue
332332

333-
As stated in [Eelco’s thesis][nixphd], remote caching of content-addressed derivations can be problematic in conjonction with non-determinism:
333+
As stated in [Eelco’s thesis][nixphd], remote caching of content-addressed derivations can be problematic in conjunction with non-determinism:
334334

335335
A typical scenario where this can happen is:
336336

@@ -431,8 +431,8 @@ We also update `registerRealisation` for the local store to check these signatur
431431
same end-goal. The big difference between these two is in the scope they cover:
432432
RFC 0017 is about fundamentally changing the base model of Nix, while this
433433
proposal suggests to make only the minimal amount of changes to the current
434-
model to allow the content-adressed model to live in parallel (which would open
435-
the way to a fully content-adressed store as RFC0017, but in a much more
434+
model to allow the content-addressed model to live in parallel (which would open
435+
the way to a fully content-addressed store as RFC0017, but in a much more
436436
incremental way).
437437

438438
Eventually this RFC should be subsumed by RFC0017.
@@ -485,7 +485,7 @@ annoying since:
485485
- More annoyingly, these references become dangling and can cause runtime
486486
failures
487487

488-
We however have a way to dectect these: If we have leaking self-references then
488+
We however have a way to detect these: If we have leaking self-references then
489489
the output will change if we artificially change its output path. This could be
490490
integrated in the `--check` option of `nix-store`.
491491

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
feature: nixos-release-stablization
2+
feature: nixos-release-stabilization
33
start-date: 2021-01-17
44
author: Jonathan Ringer (@jonringer)
55
co-authors:
@@ -13,7 +13,7 @@ related-issues: "[NixOS release schedule](https://github.com/NixOS/rfcs/pull/80)
1313

1414
To bring more certainty to the release cycle, add short periods where
1515
breaking changes are partially restricted. A list of Release Critical
16-
Packages is defined. Also, move most release stablization work from
16+
Packages is defined. Also, move most release stabilization work from
1717
the `release` branch to the `master` branch to reduce backports.
1818

1919
# Motivation

0 commit comments

Comments
 (0)