···53535454Package version upgrades usually allow for simpler commit messages, including attribute name, old and new version, as well as a reference to the relevant release notes/changelog. Every once in a while a package upgrade requires more extensive changes, and that subsequently warrants a more verbose message.
55555656-We prefer not to use the "squash merge" feature in nixpkgs: in order to keep as much information as possible in the commit history, we expect pull requests to consist of self-contained commits as described above.
5757-This means that, after addressing review comments and before the PR is merged, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`.
5858-Useful commands to be comfortable with are `git commit --amend`, `git commit --fixup` and `git rebase -i` (and don't forget that git lets you define aliases!).
5656+Pull requests should not be squash merged in order to keep complete commit messages and GPG signatures intact and must not be when the change doesn't make sense as a single commit.
5757+This means that, when addressing review comments in order to keep the pull request in an always mergeable status, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`.
5858+Useful git commands that can help a lot with this are `git commit --patch --amend` and `git rebase --interactive @~3`. For more details consult the git man pages.
59596060## Rebasing between branches (i.e. from master to staging)
6161
···9898 <listitem>
9999 <para>
100100 The
101101- <link linkend="opt-services.avahi.openFirewall">services.avahi.openFirewall</link>
102102- module option default value has been changed from
103103- <literal>true</literal> to <literal>false</literal>. You will
104104- need to explicitely set this option to
105105- <literal>true</literal>, or configure your firewall.
106106- </para>
107107- </listitem>
108108- <listitem>
109109- <para>
110110- The
111101 <link linkend="opt-services.tmate-ssh-server.openFirewall">services.tmate-ssh-server.openFirewall</link>
112102 module option default value has been changed from
113103 <literal>true</literal> to <literal>false</literal>. You will
-2
nixos/doc/manual/release-notes/rl-2305.section.md
···33333434- The [services.snapserver.openFirewall](#opt-services.snapserver.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
35353636-- The [services.avahi.openFirewall](#opt-services.avahi.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
3737-3836- The [services.tmate-ssh-server.openFirewall](#opt-services.tmate-ssh-server.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
39374038- The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
+1
nixos/modules/profiles/base.nix
···4242 pkgs.smartmontools # for diagnosing hard disks
4343 pkgs.pciutils
4444 pkgs.usbutils
4545+ pkgs.nvme-cli
45464647 # Tools to create / manipulate filesystems.
4748 pkgs.ntfsprogs # for resizing NTFS partitions
+1-1
nixos/modules/programs/vim.nix
···1919 type = types.package;
2020 default = pkgs.vim;
2121 defaultText = literalExpression "pkgs.vim";
2222- example = literalExpression "pkgs.vimHugeX";
2222+ example = literalExpression "pkgs.vim-full";
2323 description = lib.mdDoc ''
2424 vim package to use.
2525 '';
···3232 assertion = !config.services.pipewire.media-session.enable;
3333 message = "WirePlumber and pipewire-media-session can't be enabled at the same time.";
3434 }
3535+ {
3636+ assertion = !config.hardware.bluetooth.hsphfpd.enable;
3737+ message = "Using Wireplumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false";
3838+ }
3539 ];
36403741 environment.systemPackages = [ cfg.package ];
···103103104104 openFirewall = mkOption {
105105 type = types.bool;
106106- default = false;
106106+ default = true;
107107 description = lib.mdDoc ''
108108 Whether to open the firewall for UDP port 5353.
109109+ Disabling this setting also disables discovering of network devices.
109110 '';
110111 };
111112112113 allowPointToPoint = mkOption {
113114 type = types.bool;
114115 default = false;
115115- description= lib.mdDoc ''
116116+ description = lib.mdDoc ''
116117 Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large
117118 latencies with such links and opens a potential security hole by allowing mDNS access from Internet
118119 connections.
+2-2
nixos/modules/services/networking/unifi.nix
···24242525 services.unifi.jrePackage = mkOption {
2626 type = types.package;
2727- default = pkgs.jre8;
2828- defaultText = literalExpression "pkgs.jre8";
2727+ default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8;
2828+ defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8'';
2929 description = lib.mdDoc ''
3030 The JRE package to use. Check the release notes to ensure it is supported.
3131 '';
···384384 ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]
385385 ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet;
386386387387+ # Extra services for D-Bus activation
388388+ services.dbus.packages = [
389389+ plasma5.kactivitymanagerd
390390+ ];
391391+387392 environment.pathsToLink = [
388393 # FIXME: modules should link subdirs of `/share` rather than relying on this
389394 "/share"
···446451447452 xdg.portal.enable = true;
448453 xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ];
454454+ # xdg-desktop-portal-kde expects PipeWire to be running.
455455+ # This does not, by default, replace PulseAudio.
456456+ services.pipewire.enable = mkDefault true;
449457450458 # Update the start menu for each user that is currently logged in
451459 system.userActivationScripts.plasmaSetup = activationScript;
···11-WGET_ARGS=( https://download.kde.org/stable/release-service/22.08.3/src -A '*.tar.xz' )
11+WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.0/src -A '*.tar.xz' )
···11-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.100/ -A '*.tar.xz' )
11+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.101/ -A '*.tar.xz' )
···11+{ lib
22+, stdenv
33+, fetchFromGitHub
44+, autoreconfHook
55+, glib
66+, libev
77+, libevent
88+, pkg-config
99+, glibSupport ? true
1010+, libevSupport ? true
1111+, libeventSupport ? true
1212+}:
1313+1414+let
1515+ inherit (lib) optional;
1616+in
1717+stdenv.mkDerivation (finalAttrs: {
1818+ pname = "libverto";
1919+ version = "0.3.2";
2020+2121+ src = fetchFromGitHub {
2222+ owner = "latchset";
2323+ repo = "libverto";
2424+ rev = finalAttrs.version;
2525+ hash = "sha256-csoJ0WdKyrza8kBSMKoaItKvcbijI6Wl8nWCbywPScQ=";
2626+ };
2727+2828+ nativeBuildInputs = [
2929+ autoreconfHook
3030+ pkg-config
3131+ ];
3232+3333+ buildInputs =
3434+ optional glibSupport glib
3535+ ++ optional libevSupport libev
3636+ ++ optional libeventSupport libevent;
3737+3838+ meta = with lib; {
3939+ homepage = "https://github.com/latchset/libverto";
4040+ description = "Asynchronous event loop abstraction library";
4141+ longDescription = ''
4242+ Libverto exists to solve an important problem: many applications and
4343+ libraries are unable to write asynchronous code because they are unable to
4444+ pick an event loop. This is particularly true of libraries who want to be
4545+ useful to many applications who use loops that do not integrate with one
4646+ another or which use home-grown loops. libverto provides a loop-neutral
4747+ async api which allows the library to expose asynchronous interfaces and
4848+ offload the choice of the main loop to the application.
4949+ '';
5050+ license = licenses.mit;
5151+ maintainers = with maintainers; [ AndersonTorres ];
5252+ platforms = platforms.unix;
5353+ };
5454+})
+4-3
pkgs/development/libraries/libvirt/default.nix
···114114 # NOTE: You must also bump:
115115 # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
116116 # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
117117- version = "8.9.0";
117117+ version = "8.10.0";
118118119119 src = fetchFromGitLab {
120120 owner = pname;
121121 repo = pname;
122122 rev = "v${version}";
123123- sha256 = "sha256-79frEYItbf1weOkrcyI/Z/TjTg6kLMQbteaTi9LAt0g=";
123123+ sha256 = "sha256-MboJLQ0R3l9lUQDjNVACvmxISjypvfxxMHSKF0+k6WM=";
124124 fetchSubmodules = true;
125125 };
126126···372372 passthru.tests.libvirtd = nixosTests.libvirtd;
373373374374 meta = {
375375+ description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes";
375376 homepage = "https://libvirt.org/";
376376- description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes";
377377+ changelog = "https://gitlab.com/libvirt/libvirt/-/raw/v${version}/NEWS.rst";
377378 license = licenses.lgpl2Plus;
378379 platforms = platforms.unix;
379380 maintainers = with maintainers; [ fpletz globin lovesegfault ];
···11+diff --git a/pkg/version/version.go b/pkg/version/version.go
22+index 09c8efcf..b9ec798a 100644
33+--- a/pkg/version/version.go
44++++ b/pkg/version/version.go
55+@@ -20,14 +20,12 @@ import (
66+ "runtime/debug"
77+ )
88+99++var version string
1010++
1111+ // Version returns the version of the main module
1212+ func Version() string {
1313+- info, ok := debug.ReadBuildInfo()
1414+- if !ok || info == nil || info.Main.Version == "" {
1515+- // binary has not been built with module support or doesn't contain a version.
1616+- return "(unknown)"
1717+- }
1818+- return info.Main.Version
1919++ _ = debug.ReadBuildInfo
2020++ return version
2121+ }
2222+2323+ // Print prints the main module version on stdout.
···3333 );
34343535 meta = with lib; {
3636- broken = stdenv.isDarwin;
3736 description = "Docker and OCI Registry Client in Go and tooling using those libraries";
3837 homepage = "https://github.com/regclient/regclient";
3938 license = licenses.asl20;
···22# Do not edit!
3344{
55- version = "2022.12.2";
55+ version = "2022.12.6";
66 components = {
77 "3_day_blinds" = ps: with ps; [
88 ];
+2-2
pkgs/servers/home-assistant/default.nix
···188188 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
189189190190 # Don't forget to run parse-requirements.py after updating
191191- hassVersion = "2022.12.2";
191191+ hassVersion = "2022.12.6";
192192193193in python.pkgs.buildPythonApplication rec {
194194 pname = "homeassistant";
···206206 owner = "home-assistant";
207207 repo = "core";
208208 rev = version;
209209- hash = "sha256-O2gmj9anUy1uOuBpw33HAk2F/nA4OcWMZeaI1XOHUKg=";
209209+ hash = "sha256-9dukY04sh35kj5vUbNmqnN+MPGqJT/YUuHC64pHzWjw=";
210210 };
211211212212 # leave this in, so users don't have to constantly update their downstream patch handling
+2-2
pkgs/servers/home-assistant/frontend.nix
···44 # the frontend version corresponding to a specific home-assistant version can be found here
55 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
66 pname = "home-assistant-frontend";
77- version = "20221208.0";
77+ version = "20221213.0";
88 format = "wheel";
991010 src = fetchPypi {
···1212 pname = "home_assistant_frontend";
1313 dist = "py3";
1414 python = "py3";
1515- hash = "sha256-llMKmEkPSrb9j7chAVXGvqpLfpmlFlwqiusOH1p+rAQ=";
1515+ hash = "sha256-s/rVgsVyNyyW2wvv7IK4/0wy99ZtHn8iZ7tVjOBGozQ=";
1616 };
17171818 # there is nothing to strip in this package
···15581558 varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26
15591559 varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-09-15
15601560 varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17
15611561+ vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
15611562 varnish71 = throw "varnish71 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-11-08
15621563 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
15631564 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05
···1772177317731774 inherit (plasma5Packages)
17741775 akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk
17751775- breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa falkon
17761776+ breeze-icons breeze-plymouth breeze-qt5 colord-kde discover dolphin dragon elisa falkon
17761777 ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook
17771778 kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
17781779 kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config