Merge master into staging-next (4b05cc6f) · Commits · nix / nixpkgs

nixos/lib/systemd-unit-options.nix

+14 −14

Original line number	Diff line number	Diff line
		@@ -68,10 +68,9 @@ in rec {
		default = [];
		type = types.listOf unitNameType;
		description = lib.mdDoc ''
		Units that require (i.e. depend on and need to go down with)
		this unit. The discussion under `wantedBy`
		applies here as well: inverse `.requires`
		symlinks are established.
		Units that require (i.e. depend on and need to go down with) this unit.
		As discussed in the `wantedBy` option description this also creates
		`.requires` symlinks automatically.
		'';
		};

		@@ -79,16 +78,17 @@ in rec {
		default = [];
		type = types.listOf unitNameType;
		description = lib.mdDoc ''
		Units that want (i.e. depend on) this unit. The standard way
		to make a unit start by default at boot is to set this option
		to `[ "multi-user.target" ]`. That's despite
		the fact that the systemd.unit(5) manpage says this option
		goes in the `[Install]` section that controls
		the behaviour of `systemctl enable`. Since
		such a process is stateful and thus contrary to the design of
		NixOS, setting this option instead causes the equivalent
		inverse `.wants` symlink to be present,
		establishing the same desired relationship in a stateless way.
		Units that want (i.e. depend on) this unit. The default method for
		starting a unit by default at boot time is to set this option to
		'["multi-user.target"]' for system services. Likewise for user units
		(`systemd.user.<name>.*`) set it to `["default.target"]` to make a unit
		start by default when the user `<name>` logs on.

		This option creates a `.wants` symlink in the given target that exists
		statelessly without the need for running `systemctl enable`.
		The in systemd.unit(5) manpage described `[Install]` section however is
		not supported because it is a stateful process that does not fit well
		into the NixOS design.
		'';
		};

pkgs/applications/misc/synergy/default.nix

+6 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		, avahi-compat

		# MacOS / darwin
		, darwin
		, ApplicationServices
		, Carbon
		, Cocoa
		@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
		patches = [
		# Without this OpenSSL from nixpkgs is not detected
		./darwin-non-static-openssl.patch
		] ++ lib.optionals (stdenv.isDarwin && !(darwin.apple_sdk.frameworks ? UserNotifications)) [
		# We cannot include UserNotifications because of a build failure in the Apple SDK.
		# The functions used from it are already implicitly included anyways.
		./darwin-no-UserNotifications-includes.patch
		@@ -76,6 +78,8 @@ stdenv.mkDerivation rec {
		Cocoa
		CoreServices
		ScreenSaver
		] ++ lib.optionals (stdenv.isDarwin && darwin.apple_sdk.frameworks ? UserNotifications) [
		darwin.apple_sdk.frameworks.UserNotifications
		] ++ lib.optionals stdenv.isLinux [
		util-linux
		libselinux
		@@ -97,7 +101,8 @@ stdenv.mkDerivation rec {
		NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override";

		cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"
		++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}";
		# NSFilenamesPboardType is deprecated in 10.14+
		++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.targetPlatform.darwinSdkVersion}";

		doCheck = true;

pkgs/applications/networking/browsers/librewolf/src.json

+5 −5

Original line number	Diff line number	Diff line
		{
		"packageVersion": "106.0.1-1",
		"packageVersion": "106.0.3-1",
		"source": {
		"rev": "106.0.1-1",
		"sha256": "0dg4dvpa4fqhaikqnyqvxmi84g4gw535rdxmax724d0m6ksjm5yh"
		"rev": "106.0.3-1",
		"sha256": "0f0nz7fbp9k1pz7i8lh3fq3218crwqw2fdy9ia9hi9nlnybh114f"
		},
		"firefox": {
		"version": "106.0.1",
		"sha512": "15f5a65a69e11dd0c463b358cafb5ad0f31db93619b9ec3f89e8c5e14d4d319d9423fe4dcd0dbbcbedc1ad444dcbd8e5e30e483220277f5b550bff6124b66519"
		"version": "106.0.3",
		"sha512": "226bde9082330abe134d1726cec59b473d4d6839ea55ca20faddb901f032d89eb9d2bd5d887ccd4ba515c6b1a44817420cfee2e9f4f8a79ed46a38287083d28d"
		}
		}

pkgs/applications/version-management/sourcehut/builds.nix

+4 −14

Original line number	Diff line number	Diff line
		{ lib
		, fetchFromSourcehut
		, fetchpatch
		, buildGoModule
		, buildPythonPackage
		, srht
		@@ -13,36 +12,27 @@
		, unzip
		}:
		let
		version = "0.82.8";
		version = "0.83.0";

		src = fetchFromSourcehut {
		owner = "~sircmpwn";
		repo = "builds.sr.ht";
		rev = version;
		hash = "sha256-M94zkEUJU8EwksN34sd5IkASDCQ0hHb98G5wzZsCrpg=";
		hash = "sha256-u/y+sYu/09LypWI/ngghbge5SvkuLQpray10j0SjlOo=";
		};

		buildsrht-api = buildGoModule ({
		inherit src version;
		pname = "buildsrht-api";
		modRoot = "api";
		vendorHash = "sha256-8z5m4bMwLeYg4i91MMjLMqbciWvqS0icCHFUJTUHBgk=";
		} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
		vendorHash = "sha256-DfVWr/4J4ZrhHpy9CXPaAQcbag/9FmDgiexcNo0lEsk=";
		} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.20"; });

		buildsrht-worker = buildGoModule {
		inherit src version;
		sourceRoot = "source/worker";
		pname = "buildsrht-worker";
		vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek=";

		patches = [
		(fetchpatch {
		name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch";
		url = "https://git.sr.ht/~sircmpwn/builds.sr.ht/commit/f58bbde6bfed7d2321a3b17e991c91fc83d4c230.patch";
		stripLen = 1;
		hash = "sha256-vQR/T5G5Gz5tY+SEZZabsbnFKW44b+Bs+GDdydyeCDs=";
		})
		];
		};
		in
		buildPythonPackage rec {

pkgs/desktops/cinnamon/cinnamon-control-center/default.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,10 @@ stdenv.mkDerivation rec {
		./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */

		postPatch = ''
		find . -type f -exec sed -i \
		-e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
		{} +

		sed 's\|TZ_DIR "/usr/share/zoneinfo/"\|TZ_DIR "${tzdata}/share/zoneinfo/"\|g' -i ./panels/datetime/test-timezone.c
		sed 's\|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"\|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"\|g' -i ./panels/datetime/tz.h
		sed 's\|"/usr/share/i18n/locales/"\|"${glibc}/share/i18n/locales/"\|g' -i panels/datetime/test-endianess.c

Admin message