···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 The101101- <link linkend="opt-services.avahi.openFirewall">services.avahi.openFirewall</link>102102- module option default value has been changed from103103- <literal>true</literal> to <literal>false</literal>. You will104104- need to explicitely set this option to105105- <literal>true</literal>, or configure your firewall.106106- </para>107107- </listitem>108108- <listitem>109109- <para>110110- The111101 <link linkend="opt-services.tmate-ssh-server.openFirewall">services.tmate-ssh-server.openFirewall</link>112102 module option default value has been changed from113103 <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 disks4343 pkgs.pciutils4444 pkgs.usbutils4545+ pkgs.nvme-cli45464647 # Tools to create / manipulate filesystems.4748 pkgs.ntfsprogs # for resizing NTFS partitions
···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 large117118 latencies with such links and opens a potential security hole by allowing mDNS access from Internet118119 connections.
+5-3
nixos/modules/services/torrent/transmission.nix
···174174 };175175 };176176177177+ package = mkPackageOption pkgs "transmission" {};178178+177179 downloadDirPermissions = mkOption {178180 type = with types; nullOr str;179181 default = null;···289287 install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \290288 '${cfg.home}/${settingsDir}/settings.json'291289 '')];292292- ExecStart="${pkgs.transmission}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}";290290+ ExecStart="${cfg.package}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}";293291 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";294292 User = cfg.user;295293 Group = cfg.group;···387385 };388386389387 # It's useful to have transmission in path, e.g. for remote control390390- environment.systemPackages = [ pkgs.transmission ];388388+ environment.systemPackages = [ cfg.package ];391389392390 users.users = optionalAttrs (cfg.user == "transmission") ({393391 transmission = {···459457 ];460458461459 security.apparmor.policies."bin.transmission-daemon".profile = ''462462- include "${pkgs.transmission.apparmor}/bin.transmission-daemon"460460+ include "${cfg.package.apparmor}/bin.transmission-daemon"463461 '';464462 security.apparmor.includes."local/bin.transmission-daemon" = ''465463 r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE},
···11+diff --git a/pkg/version/version.go b/pkg/version/version.go22+index 09c8efcf..b9ec798a 10064433+--- a/pkg/version/version.go44++++ b/pkg/version/version.go55+@@ -20,14 +20,12 @@ import (66+ "runtime/debug"77+ )88+99++var version string1010++1111+ // Version returns the version of the main module1212+ 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.Version1919++ _ = debug.ReadBuildInfo2020++ return version2121+ }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;
···2233buildGoModule rec {44 pname = "consul";55- version = "1.14.2";55+ version = "1.14.3";66 rev = "v${version}";7788 # Note: Currently only release tags are supported, because they have the Consul UI···1717 owner = "hashicorp";1818 repo = pname;1919 inherit rev;2020- sha256 = "sha256-fSEQZ+F3b8l1F/80A4hDPHE7kZMPARQXt/PJg/m4Srw=";2020+ sha256 = "sha256-zTsFLBd+7G+8HT8EGLSQaMhFfh/7s1tfu2gZtIMbkDs=";2121 };22222323 passthru.tests.consul = nixosTests.consul;···2626 # has a split module structure in one repo2727 subPackages = ["." "connect/certgen"];28282929- vendorSha256 = "sha256-4tidE6LKYhi8ilM08Rn3F5snhxebdgOOeSrIIkXZ384=";2929+ vendorSha256 = "sha256-tekrveDmUq6qYafRMm7knxp9+FevaDbu4DZusO6KDtA=";30303131 doCheck = false;3232