Merge staging-next into staging (5b1f925a) · Commits · nix / nixpkgs

nixos/modules/security/ipa.nix

+49 −44

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ in
		'';
		example = literalExpression ''
		pkgs.fetchurl {
		url = http://ipa.example.com/ipa/config/ca.crt;
		sha256 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
		url = "http://ipa.example.com/ipa/config/ca.crt";
		hash = lib.fakeHash;
		};
		'';
		};
		@@ -191,12 +191,12 @@ in
		'';

		"ldap.conf".source = ldapConf;
		};

		environment.etc."chromium/policies/managed/freeipa.json" = mkIf cfg.chromiumSupport {
		text = ''
		{ "AuthServerWhitelist": "*.${cfg.domain}" }
		'';
		"chromium/policies/managed/freeipa.json" = mkIf cfg.chromiumSupport {
		text = builtins.toJSON {
		AuthServerWhitelist = "*.${cfg.domain}";
		};
		};
		};

		systemd.services."ipa-activation" = {
		@@ -207,8 +207,10 @@ in
		];
		conflicts = [ "shutdown.target" ];
		unitConfig.DefaultDependencies = false;
		serviceConfig.Type = "oneshot";
		serviceConfig.RemainAfterExit = true;
		serviceConfig = {
		Type = "oneshot";
		RemainAfterExit = true;
		};
		script = ''
		# libcurl requires a hard copy of the certificate
		if ! ${pkgs.diffutils}/bin/diff ${cfg.certificate} /etc/ipa/ca.crt > /dev/null 2>&1; then
		@@ -226,11 +228,15 @@ in
		4. Restart sssd systemd service: sudo systemctl restart sssd

		EOF
		# let service fail, to raise awareness
		exit 1
		fi
		'';
		};

		services.sssd.config = ''
		services.sssd = {
		enable = true;
		config = ''
		[domain/${cfg.domain}]
		id_provider = ipa
		auth_provider = ipa
		@@ -274,10 +280,9 @@ in
		user_attributes = +mail, +telephoneNumber, +givenname, +sn, +lock
		allowed_uids = ${concatStringsSep ", " cfg.ifpAllowedUids}
		'';
		};

		services.ntp.servers = singleton cfg.server;
		services.sssd.enable = true;
		services.ntp.enable = true;
		networking.timeServers = singleton cfg.server;

		security.pki.certificateFiles = singleton cfg.certificate;
		};

nixos/modules/services/audio/mopidy.nix

+15 −8

Original line number	Diff line number	Diff line
		@@ -4,12 +4,14 @@
		pkgs,
		...
		}:

		let
		uid = config.ids.uids.mopidy;
		gid = config.ids.gids.mopidy;
		cfg = config.services.mopidy;
		settingsFormat = pkgs.formats.ini { };

		mopidyConf = pkgs.writeText "mopidy.conf" cfg.configuration;
		mopidyConf = settingsFormat.generate "mopidy.conf" cfg.settings;

		mopidyEnv = pkgs.buildEnv {
		name = "mopidy-with-extensions-${pkgs.mopidy.version}";
		@@ -24,11 +26,14 @@ let
		};
		in
		{
		imports = [
		(lib.mkRemovedOptionModule [ "services" "mopidy" "configuration" ] ''
		Use RFC42-style services.mopidy.settings instead.
		'')
		];

		options = {

		services.mopidy = {

		enable = lib.mkEnableOption "Mopidy, a music player daemon";

		dataDir = lib.mkOption {
		@@ -48,11 +53,15 @@ in
		'';
		};

		configuration = lib.mkOption {
		default = "";
		type = lib.types.lines;
		settings = lib.mkOption {
		inherit (settingsFormat) type;
		example.mpd = {
		enabled = true;
		hostname = "::";
		};
		description = ''
		The configuration that Mopidy should use.
		See the upstream documentation <https://docs.mopidy.com/stable/config/> for details.
		'';
		};

		@@ -67,8 +76,6 @@ in
		};
		};

		###### implementation

		config = lib.mkIf cfg.enable {

		systemd.tmpfiles.settings."10-mopidy".${cfg.dataDir}.d = {

pkgs/applications/editors/android-studio/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ let
		sha256Hash = "sha256-pet3uTmL4pQ/FxB2qKv+IZNx540gMC7hmfOaQ8iLQpQ=";
		};
		betaVersion = {
		version = "2025.1.3.6"; # "Android Studio Narwhal 3 Feature Drop \| 2025.1.3 RC 2"
		sha256Hash = "sha256-S8KK/EGev0v03fVywIkD6Ym3LrciGKXJVorzyZ1ljdQ=";
		version = "2025.1.4.7"; # "Android Studio Narwhal 4 Feature Drop \| 2025.1.4 RC 2"
		sha256Hash = "sha256-KrKUsA7wFeI7IBa9VOp+MERqWIiMnNzLFO8oF0rCiIw=";
		};
		latestVersion = {
		version = "2025.2.1.3"; # "Android Studio Otter \| 2025.2.1 Canary 3"

pkgs/applications/networking/cluster/terraform-providers/providers.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -940,11 +940,11 @@
		"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
		},
		"oci": {
		"hash": "sha256-xj7B4LQZalLA/APIe70JHmqPljRVDbDXfAUb3K2AtFg=",
		"hash": "sha256-fEvo5R7HutlOmZ6DMvYKQiE0amwk/YPi1T2a55w70hQ=",
		"homepage": "https://registry.terraform.io/providers/oracle/oci",
		"owner": "oracle",
		"repo": "terraform-provider-oci",
		"rev": "v7.19.0",
		"rev": "v7.21.0",
		"spdx": "MPL-2.0",
		"vendorHash": null
		},

pkgs/by-name/fl/flaresolverr/package.nix

+7 −13

Original line number	Diff line number	Diff line
		@@ -17,38 +17,32 @@ let
		python = python3.withPackages (
		ps: with ps; [
		bottle
		waitress
		selenium
		func-timeout
		prometheus-client
		selenium
		waitress
		xvfbwrapper

		# For `undetected_chromedriver`
		looseversion
		requests
		certifi
		websockets
		packaging
		xvfbwrapper
		]
		);
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "flaresolverr";
		version = "3.3.25";
		version = "3.4.1";

		src = fetchFromGitHub {
		owner = "FlareSolverr";
		repo = "FlareSolverr";
		rev = "v${finalAttrs.version}";
		hash = "sha256-AGRqJOIIePaJH0j0eyMFJ6Kddul3yXF6uw6dPMnskmY=";
		hash = "sha256-ySYH4Ty6Z1mZWPIhIIX0+78RiozEHJ++3C4kBj7MfU0=";
		};

		nativeBuildInputs = [ makeWrapper ];

		postPatch = ''
		substituteInPlace src/undetected_chromedriver/patcher.py \
		--replace-fail \
		"from distutils.version import LooseVersion" \
		"from looseversion import LooseVersion"

		substituteInPlace src/utils.py \
		--replace-fail \
		'CHROME_EXE_PATH = None' \