From 3247e757416496ef6a19fb53ffdc4c92c969f39a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 7 Oct 2021 00:31:03 +0200 Subject: [PATCH 1/9] emacs: resolve wrapper load-path at build time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the included package set is determined at build time we can also generate the `subdirs.el` file at build time. This improves startup time somewhat since we don't have to traverse the directory to add to `load-path`. For example, ``` sh-session $ bench './emacs-old -Q --batch --kill' './emacs-new -Q --batch --kill' benchmarking bench/./emacs-old -Q --batch --kill time 72.77 ms (71.66 ms .. 73.65 ms) 1.000 R² (0.999 R² .. 1.000 R²) mean 72.49 ms (72.06 ms .. 72.92 ms) std dev 746.5 μs (582.4 μs .. 1.008 ms) benchmarking bench/./emacs-new -Q --batch --kill time 40.56 ms (40.24 ms .. 40.86 ms) 1.000 R² (0.999 R² .. 1.000 R²) mean 40.30 ms (40.12 ms .. 40.51 ms) std dev 401.9 μs (311.1 μs .. 555.8 μs) ``` The change does not actually affect the content of `load-path`: ``` sh-session $ diff -s <(./emacs-old --batch --eval '(prin1 load-path)' | sed -E 's!/nix/store/[[:alnum:]]{32}-!!g') \ <(./emacs-new --batch --eval '(prin1 load-path)' | sed -E 's!/nix/store/[[:alnum:]]{32}-!!g') Files /dev/fd/63 and /dev/fd/62 are identical ``` So in principle the only observable effect should be the improved startup time. --- pkgs/build-support/emacs/mk-wrapper-subdirs.el | 6 ++++++ pkgs/build-support/emacs/wrapper.nix | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/emacs/mk-wrapper-subdirs.el diff --git a/pkgs/build-support/emacs/mk-wrapper-subdirs.el b/pkgs/build-support/emacs/mk-wrapper-subdirs.el new file mode 100644 index 000000000000..7d30400a5c65 --- /dev/null +++ b/pkgs/build-support/emacs/mk-wrapper-subdirs.el @@ -0,0 +1,6 @@ +(defmacro mk-subdirs-expr (path) + `(setq load-path + (delete-dups (append '(,path) + ',(let ((default-directory path)) + (normal-top-level-add-subdirs-to-load-path)) + load-path)))) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index ccbd58485ea8..2aa61d6d2f62 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -165,8 +165,13 @@ runCommand (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/") ''} EOF - # Link subdirs.el from the emacs distribution - ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs + + # Generate a subdirs.el that statically adds all subdirectories to load-path. + $emacs/bin/emacs \ + --batch \ + --load ${./mk-wrapper-subdirs.el} \ + --eval "(prin1 (macroexpand-1 '(mk-subdirs-expr \"$out/share/emacs/site-lisp\")))" \ + > "$subdirs" # Byte-compiling improves start-up time only slightly, but costs nothing. $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs" From 9c7406a10fbd5da521ceb357a53a2d9e169abb72 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 Nov 2021 16:01:23 -0500 Subject: [PATCH 2/9] vimPlugins.vim-clap: fix cargoSha256 --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 497c64c7c2c8..768b58e850e7 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -744,7 +744,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-DiCQpgyz0iNEm6gjaJU5IGdsQISHhPqlDQBzZafngjY="; + cargoSha256 = "sha256-XFo3FLaeLnXVQAEZol9PipqYYZ9C1z23S/qijxf0uIE="; }; in '' From 04a499cdde91c75ccaac3724827b2636c5e4460e Mon Sep 17 00:00:00 2001 From: Artturi Date: Mon, 29 Nov 2021 23:26:46 +0200 Subject: [PATCH 3/9] Revert "nixos/hidpi: add xserver dpi" --- nixos/modules/hardware/video/hidpi.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/hardware/video/hidpi.nix b/nixos/modules/hardware/video/hidpi.nix index c480cc481dfc..ac72b652504e 100644 --- a/nixos/modules/hardware/video/hidpi.nix +++ b/nixos/modules/hardware/video/hidpi.nix @@ -12,6 +12,5 @@ with lib; boot.loader.systemd-boot.consoleMode = mkDefault "1"; # TODO Find reasonable defaults X11 & wayland - services.xserver.dpi = lib.mkDefault 192; }; } From f30f9c8aa8b4f1a128d08692fe9edbf81079b884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 29 Nov 2021 23:02:40 +0100 Subject: [PATCH 4/9] frogatto-data: 2020-12-17 -> 2021-11-29 Updating the engine required updating the data. Otherwise a crash would happen at the 2nd level (out of the main house). --- pkgs/games/frogatto/data.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index d31826ad2959..3ca955a09c39 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; - # master branch as of 2020-12-17 - rev = "8b0f2bc8f9f172f6225b8e0d806552cb94f35e2a"; - sha256 = "09nrna9l1zj2ma2bazdhdvphwy570kfz4br4xgpwq21rsjrvrqiy"; + # master branch as of 2021-11-29 + rev = "82d3dafa0cfeaad016a427bdbc729eb9509748f1"; + sha256 = "0fmwn584xl0vafcsh72b4xnryfqyjxk5zhmymg5i8rzp6h03n8xq"; }; installPhase = '' From 34fa1ffbe4140d501bb8d8bfdee5afdf55d50d10 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 30 Nov 2021 10:36:50 +1000 Subject: [PATCH 5/9] Revert ".github/workflows/editorconfig.yml: Don't use GitHub API for PR diff." This reverts commit 4db84ed126a16e226c5f1a3f13c7bee92fa0a3a4. Causing CI errors. --- .github/workflows/editorconfig.yml | 33 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 7433d03eea7d..4cd3a1dfa8e8 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -13,30 +13,33 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: + - name: Get list of changed files from PR + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + echo 'PR_DIFF<> $GITHUB_ENV + gh api \ + repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ + | jq '.[] | select(.status != "removed") | .filename' \ + >> $GITHUB_ENV + echo 'EOF' >> $GITHUB_ENV - uses: actions/checkout@v2 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge + if: env.PR_DIFF - uses: cachix/install-nix-action@v16 + if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz - name: install editorconfig-checker run: nix-env -iA editorconfig-checker -f '' - - name: Get list of changed files from PR - run: | - git fetch origin --depth 1 ${{ github.event.pull_request.head.sha }} - git checkout ${{ github.event.pull_request.head.sha }} - - git fetch origin --depth 1 ${{ github.event.pull_request.base.sha }} - git checkout ${{ github.event.pull_request.base.sha }} - - git fetch origin --depth 1 pull/${{ github.event.pull_request.number }}/merge - # check this out last as editorconfig should check this commit - git checkout FETCH_HEAD - - # everything except --diff-filter=D (deleted) - git diff --diff-filter=ACMRTUXB --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > $HOME/changed_files + if: env.PR_DIFF - name: Checking EditorConfig + if: env.PR_DIFF run: | - cat $HOME/changed_files | xargs -r editorconfig-checker -disable-indent-size + echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." From af92f1c0cc2d83361771f7b3f6612219ffca5b3c Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Mon, 29 Nov 2021 03:27:50 -0500 Subject: [PATCH 6/9] [21.11] update README.md [21.11] update upgrading [21.11] update release date run generation --- README.md | 4 ++-- .../from_md/installation/upgrading.chapter.xml | 16 ++++++++-------- .../from_md/release-notes/rl-2111.section.xml | 18 +++++++++--------- .../manual/installation/upgrading.chapter.md | 16 ++++++++-------- .../manual/release-notes/rl-2111.section.md | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index a09b7d92e3e5..e0970f85ff23 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05) +* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents) +* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are diff --git a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml index c0c5a2190fb2..e3b77d4c3650 100644 --- a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml +++ b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml @@ -12,7 +12,7 @@ Stable channels, such as - nixos-21.05. + nixos-21.11. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), @@ -33,7 +33,7 @@ Small channels, such as - nixos-21.05-small + nixos-21.11-small or nixos-unstable-small. These are identical to the stable and unstable channels @@ -60,8 +60,8 @@ When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For - instance, if you installed from a 21.05 ISO, you will be subscribed - to the nixos-21.05 channel. To see which NixOS + instance, if you installed from a 21.11 ISO, you will be subscribed + to the nixos-21.11 channel. To see which NixOS channel you’re subscribed to, run the following as root: @@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable (Be sure to include the nixos parameter at the - end.) For instance, to use the NixOS 21.05 stable channel: + end.) For instance, to use the NixOS 21.11 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos If you have a server, you may want to use the small channel instead: -# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos And if you want to live on the bleeding edge: @@ -146,7 +146,7 @@ system.autoUpgrade.allowReboot = true; also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f0e39471ecee..1e430b94ae7e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1,5 +1,5 @@
- Release 21.11 (“Porcupine”, 2021.11/??) + Release 21.11 (“Porcupine”, 2021/11/30) In addition to numerous new and upgraded packages, this release has the following highlights: @@ -37,7 +37,7 @@ - kOps now defaults to 1.21.1, which uses containerd as the + kops now defaults to 1.21.1, which uses containerd as the default runtime. @@ -84,13 +84,13 @@ - Activation scripts can now opt int to be run when running - nixos-rebuild dry-activate and detect the - dry activation by reading $NIXOS_ACTION. - This allows activation scripts to output what they would - change if the activation was really run. The users/modules - activation script supports this and outputs some of is - actions. + Activation scripts can now, optionally, be run during a + nixos-rebuild dry-activate and can detect + the dry activation by reading + $NIXOS_ACTION. This allows activation + scripts to output what they would change if the activation was + really run. The users/modules activation script supports this + and outputs some of is actions. diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index b7903b9d3cbb..faeefc4451dc 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated automatically from NixOS's Git repository after certain tests have passed and all packages have been built. These channels are: -- *Stable channels*, such as [`nixos-21.05`](https://nixos.org/channels/nixos-21.05). +- *Stable channels*, such as [`nixos-21.11`](https://nixos.org/channels/nixos-21.11). These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not @@ -19,7 +19,7 @@ passed and all packages have been built. These channels are: radical changes between channel updates. It's not recommended for production systems. -- *Small channels*, such as [`nixos-21.05-small`](https://nixos.org/channels/nixos-21.05-small) +- *Small channels*, such as [`nixos-21.11-small`](https://nixos.org/channels/nixos-21.11-small) or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small). These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated @@ -38,8 +38,8 @@ newest supported stable release. When you first install NixOS, you're automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 21.05 ISO, you will be subscribed to -the `nixos-21.05` channel. To see which NixOS channel you're subscribed +instance, if you installed from a 21.11 ISO, you will be subscribed to +the `nixos-21.11` channel. To see which NixOS channel you're subscribed to, run the following as root: ```ShellSession @@ -54,16 +54,16 @@ To switch to a different NixOS channel, do ``` (Be sure to include the `nixos` parameter at the end.) For instance, to -use the NixOS 21.05 stable channel: +use the NixOS 21.11 stable channel: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos ``` If you have a server, you may want to use the "small" channel instead: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos ``` And if you want to live on the bleeding edge: @@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. ```nix -system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11; ``` diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 3bdda82c026f..71e7669a02a3 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -1,4 +1,4 @@ -# Release 21.11 (“Porcupine”, 2021.11/??) {#sec-release-21.11} +# Release 21.11 (“Porcupine”, 2021.11/29) {#sec-release-21.11} In addition to numerous new and upgraded packages, this release has the following highlights: From b1faa37cdf91a5c06b3eccd2611dc8faa7e6e6ec Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Mon, 29 Nov 2021 10:51:59 -0700 Subject: [PATCH 7/9] 21.11 Release Notes: fix typos --- nixos/doc/manual/release-notes/rl-2111.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 71e7669a02a3..e66b2aee2072 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -1,4 +1,4 @@ -# Release 21.11 (“Porcupine”, 2021.11/29) {#sec-release-21.11} +# Release 21.11 (“Porcupine”, 2021/11/30) {#sec-release-21.11} In addition to numerous new and upgraded packages, this release has the following highlights: @@ -12,7 +12,7 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.0, updated from 7.4. -- kOps now defaults to 1.21.1, which uses containerd as the default runtime. +- kops now defaults to 1.21.1, which uses containerd as the default runtime. - `python3` now defaults to Python 3.9, updated from Python 3.8. @@ -25,7 +25,7 @@ In addition to numerous new and upgraded packages, this release has the followin - Hadoop now defaults to Hadoop 3, updated from 2. - JournalNode, ZKFS and HTTPFS services have been added. -- Activation scripts can now opt int to be run when running `nixos-rebuild dry-activate` and detect the dry activation by reading `$NIXOS_ACTION`. +- Activation scripts can now, optionally, be run during a `nixos-rebuild dry-activate` and can detect the dry activation by reading `$NIXOS_ACTION`. This allows activation scripts to output what they would change if the activation was really run. The users/modules activation script supports this and outputs some of is actions. From c19234d0dff963a1d49628f648db3d618e8a9c29 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 30 Nov 2021 03:53:14 +0200 Subject: [PATCH 8/9] nixos/tests/installer: increase /boot sizes to 100MB --- nixos/tests/installer.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 513d2506e941..bc41b6efc2e7 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -354,8 +354,8 @@ let createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50M 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" + " mkpart primary 1024M -1s", # LUKS "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -456,9 +456,9 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel gpt" - + " mkpart ESP fat32 1M 50MiB" # /boot + + " mkpart ESP fat32 1M 100MiB" # /boot + " set 1 boot on" - + " mkpart primary linux-swap 50MiB 1024MiB" + + " mkpart primary linux-swap 100MiB 1024MiB" + " mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -483,8 +483,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50MB 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100MB 1024M" + " mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -503,8 +503,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50MB 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100MB 1024M" + " mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -599,8 +599,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50M 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" + " mkpart primary 1024M 1280M" # LUKS with keyfile + " mkpart primary 1280M -1s", "udevadm settle", @@ -674,8 +674,8 @@ in { machine.succeed( "flock /dev/vda parted --script /dev/vda --" + " mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary 50MB 512MB " # swap + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary 100MB 512MB " # swap + " mkpart primary 512MB 1024MB" # Cache (typically SSD) + " mkpart primary 1024MB -1s ", # Backing device (typically HDD) "modprobe bcache", From af21d41260846fb9c9840a75e310e56dfe97d6a3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 30 Nov 2021 13:20:21 +0800 Subject: [PATCH 9/9] .github/PULL_REQUEST_TEMPLATE.md, CONTRIBUTING.md: 21.11 -> 22.05 (#147977) * .github/PULL_REQUEST_TEMPLATE.md: 21.11 -> 22.05 * CONTRIBUTING.md: 21.11 -> 22.05 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CONTRIBUTING.md | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 35c70da769f1..268b1594de71 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,7 +28,7 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) +- [22.05 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2205-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0219aec7f528..e3a18c6e7eb4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,10 +53,10 @@ For package version upgrades and such a one-line commit message is usually suffi Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). 1. Take note of the commits in which the change was introduced into `master` branch. -2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like `nixos-20.09` or `nixpkgs-20.09`. +2. Check out the target _release branch_, e.g. `release-21.11`. Do not use a _channel branch_ like `nixos-21.11` or `nixpkgs-21.11-darwin`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-21.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[21.11]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Criteria for Backporting changes @@ -68,17 +68,17 @@ Anything that does not cause user or downstream dependency regressions can be ba - Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) - Security critical applications (E.g. `firefox`) -## Generating 21.11 Release Notes +## Generating 22.05 Release Notes -(This section also applies to backporting 21.05 release notes: substitute "rl-2111" for "rl-2105".) +(This section also applies to backporting 21.11 release notes: substitute "rl-2205" for "rl-2111".) Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. -Steps for updating 21.11 Release notes: +Steps for updating 22.05 Release notes: -1. Edit `nixos/doc/manual/release-notes/rl-2111.section.md` with the desired changes -2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2111.section.xml` -3. Include changes to `rl-2111.section.md` and `rl-2111.section.xml` in the same commit. +1. Edit `nixos/doc/manual/release-notes/rl-2205.section.md` with the desired changes +2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2205.section.xml` +3. Include changes to `rl-2205.section.md` and `rl-2205.section.xml` in the same commit. ## Reviewing contributions