···

       
20
       
20
       
 
       
        git checkout -b 'fix/pkg-name-update'

     

       
21
       
21
       
 
       
        ```

     

       
22
       
22
       
 
       
  * Please avoid working directly on the `master` branch.

     

       
23
       
23
       
-
       
* Make commits of logical units. 

     

       
23
       
23
       
+
       
* Make commits of logical units.

     

       
24
       
24
       
 
       
  * If you removed pkgs, made some major NixOS changes etc., write about them in `nixos/doc/manual/release-notes/rl-unstable.xml`.

     

       
25
       
25
       
 
       
* Check for unnecessary whitespace with `git diff --check` before committing.

     

       
26
       
26
       
 
       
* Format the commit in a following way:

     
···

       
37
       
37
       
 
       
    * `nginx service: refactor config generation`

     

       
38
       
38
       
 
       
* Test your changes. If you work with

     

       
39
       
39
       
 
       
  * nixpkgs:

     

       
40
       
40
       
-
       
    * update pkg -> 

     

       
40
       
40
       
+
       
    * update pkg ->

     

       
41
       
41
       
 
       
      * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`

     

       
42
       
42
       
-
       
    * add pkg -> 

     

       
42
       
42
       
+
       
    * add pkg ->

     

       
43
       
43
       
 
       
      * Make sure it's in `pkgs/top-level/all-packages.nix`

     

       
44
       
44
       
 
       
      * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`

     

       
45
       
45
       
-
       
    * _If you don't want to install pkg in you profile_. 

     

       
45
       
45
       
+
       
    * _If you don't want to install pkg in you profile_.

     

       
46
       
46
       
 
       
      * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.

     

       
47
       
47
       
 
       
    * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.

     

       
48
       
48
       
 
       
  * NixOS and its modules:

     
···

       
70
       
70
       
 
       


     

       
71
       
71
       
 
       
## Commit policy

     

       
72
       
72
       
 
       


     

       
73
       
73
       
-
       
* Commits must be sufficiently tested before being merged, both the master and staging branches.

     

       
74
       
74
       
-
       
* Hydra builds for master and stagingshould not be used as testing platform, it's a build farm for changes that have been already tested.

     

       
73
       
73
       
+
       
* Commits must be sufficiently tested before being merged, both for the master and staging branches.

     

       
74
       
74
       
+
       
* Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.

     

       
75
       
75
       
 
       
* Master should only see non-breaking commits that do not cause mass rebuilds.

     

       
76
       
76
       
-
       
* Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, changes must have been well tested already. [Read policy here](http://comments.gmane.org/gmane.linux.distributions.nixos/13447).

     

       
76
       
76
       
+
       
* Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. [Read policy here](http://comments.gmane.org/gmane.linux.distributions.nixos/13447).

     

       
77
       
77
       
 
       
* If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. [Keep an eye on the staging evaluations here](http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations).

     

       
78
       
78
       
-
       
* When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people installation forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.

     

       
79
       
79
       
-
       


     

       
78
       
78
       
+
       
* When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.