Merge branch 'master' into staging-next (b544cd98) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+0 −6

Original line number	Diff line number	Diff line
		@@ -16176,12 +16176,6 @@
		github = "wegank";
		githubId = 9713184;
		};
		weihua = {
		email = "luwh364@gmail.com";
		github = "weihua-lu";
		githubId = 9002575;
		name = "Weihua Lu";
		};
		welteki = {
		email = "welteki@pm.me";
		github = "welteki";

maintainers/team-list.nix

+5 −2

Original line number	Diff line number	Diff line
		@@ -424,11 +424,14 @@ with lib.maintainers; {

		llvm = {
		members = [
		dtzWill
		ericson2314
		sternenseemann
		lovek323
		dtzWill
		primeos
		qyliss
		raitobezarius
		rrbutani
		sternenseemann
		];
		scope = "Maintain LLVM package sets and related packages";
		shortName = "LLVM";

nixos/modules/hardware/opengl.nix

+33 −8

Original line number	Diff line number	Diff line
		@@ -69,19 +69,48 @@ in
		package = mkOption {
		type = types.package;
		internal = true;
		default = cfg.mesaPackage;
		description = lib.mdDoc ''
		The package that provides the OpenGL implementation.

		The default is Mesa's drivers which should cover all OpenGL-capable
		hardware. If you want to use another Mesa version, adjust
		{option}`mesaPackage`.
		'';
		};

		package32 = mkOption {
		type = types.package;
		internal = true;
		default = cfg.mesaPackage32;
		description = lib.mdDoc ''
		Same as {option}`package` but for the 32-bit OpenGL implementation on
		64-bit systems. Used when {option}`driSupport32Bit` is set.
		'';
		};

		mesaPackage = mkOption {
		type = types.package;
		default = pkgs.mesa_23;
		defaultText = literalExpression "pkgs.mesa_23";
		example = literalExpression "pkgs.mesa_22";
		description = lib.mdDoc ''
		The package that provides the 32-bit OpenGL implementation on
		64-bit systems. Used when {option}`driSupport32Bit` is
		set.
		The Mesa driver package used for rendering support on the system.

		You should only need to adjust this if you require a newer Mesa
		version for your hardware or because you need to patch a bug.
		'';
		apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output.";
		};
		mesaPackage32 = mkOption {
		type = types.package;
		default = pkgs.pkgsi686Linux.mesa_23;
		defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_23";
		example = literalExpression "pkgs.pkgsi686Linux.mesa_22";
		description = lib.mdDoc ''
		Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit
		systems. Used when {option}`driSupport32Bit` is set.
		'';
		apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output.";
		};

		extraPackages = mkOption {
		@@ -97,7 +126,6 @@ in
		:::
		'';
		};

		extraPackages32 = mkOption {
		type = types.listOf types.package;
		default = [];
		@@ -153,9 +181,6 @@ in
		environment.sessionVariables.LD_LIBRARY_PATH = mkIf cfg.setLdLibraryPath
		([ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib");

		hardware.opengl.package = mkDefault pkgs.mesa.drivers;
		hardware.opengl.package32 = mkDefault pkgs.pkgsi686Linux.mesa.drivers;

		boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
		};
		}

pkgs/applications/audio/ebumeter/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,11 +4,11 @@

		stdenv.mkDerivation rec {
		pname = "ebumeter";
		version = "0.4.2";
		version = "0.5.1";

		src = fetchurl {
		url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
		sha256 = "1wm9j1phmpicrp7jdsvdbc3mghdd92l61yl9qbps0brq2ljjyd5s";
		url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.xz";
		hash = "sha256-U2ZpNfvy+X1RdA9Q4gvFYzAxlgc6kYjJpQ/0sEX0A4I=";
		};

		buildInputs = [

pkgs/applications/finance/odoo/default.nix

+36 −59

Original line number	Diff line number	Diff line
		{ stdenv
		, lib
		, fetchFromGitHub
		, fetchurl
		, python39
		, python310
		, nodePackages
		, wkhtmltopdf
		, nixosTests
		}:

		let
		python = python39.override {
		python = python310.override {
		packageOverrides = self: super: {
		click = super.click.overridePythonAttrs (old: rec {
		version = "7.1.2";
		src = old.src.override {
		inherit version;
		sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
		pypdf2 = super.pypdf2.overridePythonAttrs (old: rec {
		version = "1.28.6";
		format = "setuptools";

		src = fetchFromGitHub {
		owner = "py-pdf";
		repo = "pypdf";
		rev = version;
		fetchSubmodules = true;
		hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4=";
		};

		nativeBuildInputs = [];

		nativeCheckInputs = with self; [ pytestCheckHook pillow ];
		});
		flask = super.flask.overridePythonAttrs (old: rec {
		version = "1.1.4";
		src = old.src.override {
		inherit version;
		sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196";
		};
		});
		itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec {
		version = "1.1.0";
		src = old.src.override {
		inherit version;
		sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
		};
		});
		jinja2 = super.jinja2.overridePythonAttrs (old: rec {
		version = "2.11.3";
		src = old.src.override {
		inherit version;
		sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6";
		};
		});
		markupsafe = super.markupsafe.overridePythonAttrs (old: rec {
		version = "2.0.1";
		version = "2.1.3";
		src = old.src.override {
		inherit version;
		sha256 = "594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a";
		hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
		};
		});
		werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
		version = "1.0.1";
		version = "2.1.2";
		src = old.src.override {
		inherit version;
		sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
		hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY=";
		};
		nativeCheckInputs = old.nativeCheckInputs ++ (with self; [
		requests
		]);
		disabledTests = old.disabledTests ++ [
		# ResourceWarning: unclosed file
		"test_basic"
		"test_date_to_unix"
		"test_easteregg"
		"test_file_rfc2231_filename_continuations"
		"test_find_terminator"
		"test_save_to_pathlib_dst"
		];
		disabledTestPaths = old.disabledTestPaths ++ [
		# ResourceWarning: unclosed file
		"tests/test_http.py"
		];
		});
		};
		};
		in python.pkgs.buildPythonApplication rec {
		pname = "odoo";

		odoo_version = "15.0";
		odoo_release = "20220506";

		odoo_release = "20230317";
		in python.pkgs.buildPythonApplication rec {
		pname = "odoo";
		version = "${odoo_version}.${odoo_release}";

		format = "setuptools";
		@@ -84,13 +56,20 @@ in python.pkgs.buildPythonApplication rec {
		src = fetchurl {
		url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz";
		name = "${pname}-${version}";
		sha256 = "0mwlmfz5nhvg483ldrmlrjhwaf284c0c0pxf0fb0sfx2dnjjj3ib"; # odoo
		hash = "sha256-nJEFPtZhq7DLLDCL9xt0RV75d/a45o6hBKsUlQAWh1U="; # odoo
		};

		unpackPhase = ''
		tar xfz $src
		cd odoo*
		'';

		# needs some investigation
		doCheck = false;

		makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ];
		makeWrapperArgs = [
		"--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}"
		];

		propagatedBuildInputs = with python.pkgs; [
		babel
		@@ -101,7 +80,6 @@ in python.pkgs.buildPythonApplication rec {
		freezegun
		gevent
		greenlet
		html2text
		idna
		jinja2
		libsass
		@@ -127,6 +105,7 @@ in python.pkgs.buildPythonApplication rec {
		qrcode
		reportlab
		requests
		setuptools
		vobject
		werkzeug
		xlrd
		@@ -135,10 +114,8 @@ in python.pkgs.buildPythonApplication rec {
		zeep
		];

		unpackPhase = ''
		tar xfz $src
		cd odoo*
		'';
		# takes 5+ minutes and there are not files to strip
		dontStrip = true;

		passthru = {
		updateScript = ./update.sh;

Admin message