summary refs log tree commit diff
path: root/CONTRIBUTING-new.md
diff options
context:
space:
mode:
authorSilvan Mosberger <silvan.mosberger@tweag.io>2023-07-25 17:20:41 +0200
committerSilvan Mosberger <silvan.mosberger@tweag.io>2023-08-13 21:54:50 +0200
commitb98abe51adcbde4a643a10845a2ace3cc57da4aa (patch)
tree854efa936b451cdd5667c1c9453e5f73ff8174bd /CONTRIBUTING-new.md
parentd70091c3ad51b3fa25cd495e0f5e286d1ee5bac9 (diff)
downloadnixpkgs-b98abe51adcbde4a643a10845a2ace3cc57da4aa.tar
nixpkgs-b98abe51adcbde4a643a10845a2ace3cc57da4aa.tar.gz
nixpkgs-b98abe51adcbde4a643a10845a2ace3cc57da4aa.tar.bz2
nixpkgs-b98abe51adcbde4a643a10845a2ace3cc57da4aa.tar.lz
nixpkgs-b98abe51adcbde4a643a10845a2ace3cc57da4aa.tar.xz
nixpkgs-b98abe51adcbde4a643a10845a2ace3cc57da4aa.tar.zst
nixpkgs-b98abe51adcbde4a643a10845a2ace3cc57da4aa.zip
README.md: Rough move to new contribution doc files
No content was changed, new titles are wrapped with () to signal that
they will need to be decided on in a future commit.
Diffstat (limited to 'CONTRIBUTING-new.md')
-rw-r--r--CONTRIBUTING-new.md23
1 files changed, 23 insertions, 0 deletions
diff --git a/CONTRIBUTING-new.md b/CONTRIBUTING-new.md
index cbcab9ee1db..41b3e73cb1f 100644
--- a/CONTRIBUTING-new.md
+++ b/CONTRIBUTING-new.md
@@ -1 +1,24 @@
 # Contributing to Nixpkgs
+
+## (Proposing a change)
+
+When pull requests are made, our tooling automation bot,
+[OfBorg](https://github.com/NixOS/ofborg) will perform various checks
+to help ensure expression quality.
+
+## (Merging a pull request)
+
+The *Nixpkgs committers* are people who have been given
+permission to merge.
+
+## (Flow of changes)
+
+Most contributions are based on and merged into these branches:
+
+* `master` is the main branch where all small contributions go
+* `staging` is branched from master, changes that have a big impact on
+  Hydra builds go to this branch
+* `staging-next` is branched from staging and only fixes to stabilize
+  and security fixes with a big impact on Hydra builds should be
+  contributed to this branch. This branch is merged into master when
+  deemed of sufficiently high quality