summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2021-08-11 14:01:51 +0200
committerGitHub <noreply@github.com>2021-08-11 14:01:51 +0200
commit2da6605a52f5c78a75594819855a98e66ae7bd4e (patch)
tree161aa5a527ca9e9255b6b1a2f7ac916d7afa5293
parentMerge pull request #133390 from NixOS/backport-133388-to-release-21.05 (diff)
parentCONTRIBUTING.md: Move to repo root, where it is more visible. (diff)
downloadnixpkgs-2da6605a52f5c78a75594819855a98e66ae7bd4e.tar.gz
Merge pull request #133468 from rski/release-21.05
CONTRIBUTING.md: Move to repo root, where it is more visible.
-rw-r--r--CONTRIBUTING.md (renamed from .github/CONTRIBUTING.md)0
-rw-r--r--README.md2
-rw-r--r--doc/contributing/submitting-changes.chapter.md4
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/CONTRIBUTING.md b/CONTRIBUTING.md
index bc43f80a060a..bc43f80a060a 100644
--- a/.github/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
diff --git a/README.md b/README.md
index 8f52d9150053..c75570acde24 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Most contributions are based on and merged into these branches:
deemed of sufficiently high quality
For more information about contributing to the project, please visit
-the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
+the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
# Donations
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index e360dba5abd7..4b4b04118211 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -62,7 +62,7 @@
- Push your changes to your fork of nixpkgs.
- Create the pull request
-- Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes).
+- Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#submitting-changes).
## Submitting security fixes {#submitting-changes-submitting-security-fixes}
@@ -191,7 +191,7 @@ It’s important to test any executables generated by a build when you change or
### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards}
-The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request.
+The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request.
## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests}