Merge master into staging-next (8c14a2c2) · Commits · nix / nixpkgs

doc/languages-frameworks/python.section.md

+30 −29

Original line number	Diff line number	Diff line
		@@ -99,13 +99,14 @@ The following is an example:
		hypothesis,
		}:

		buildPythonPackage rec {
		buildPythonPackage (finalAttrs: {
		pname = "pytest";
		version = "3.3.1";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		inherit (finalAttrs) pname version;

		hash = "sha256-z4Q23FnYaVNG/NOrKW3kZCXsqwDWQJbOvnn7Ueyy65M=";
		};

		@@ -130,7 +131,7 @@ buildPythonPackage rec {
		nativeCheckInputs = [ hypothesis ];

		meta = {
		changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
		changelog = "https://github.com/pytest-dev/pytest/releases/tag/${finalAttrs.version}";
		description = "Framework for writing tests";
		homepage = "https://github.com/pytest-dev/pytest";
		license = lib.licenses.mit;
		@@ -140,7 +141,7 @@ buildPythonPackage rec {
		lsix
		];
		};
		}
		})
		```

		The `buildPythonPackage` mainly does four things:
		@@ -304,13 +305,13 @@ specifying an interpreter version), like this:
		fetchPypi,
		}:

		python3Packages.buildPythonApplication rec {
		python3Packages.buildPythonApplication (finalAttrs: {
		pname = "luigi";
		version = "2.7.9";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		inherit (finalAttrs) pname version;
		hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw=";
		};

		@@ -324,7 +325,7 @@ python3Packages.buildPythonApplication rec {
		meta = {
		# ...
		};
		}
		})
		```

		This is then added to `pkgs/by-name` just as any other application would be.
		@@ -928,13 +929,13 @@ building Python libraries is [`buildPythonPackage`](#buildpythonpackage-function
		setuptools,
		}:

		buildPythonPackage rec {
		buildPythonPackage (finalAttrs: {
		pname = "toolz";
		version = "0.10.0";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		inherit (finalAttrs) pname version;
		hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
		};

		@@ -950,12 +951,12 @@ buildPythonPackage rec {
		];

		meta = {
		changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}";
		changelog = "https://github.com/pytoolz/toolz/releases/tag/${finalAttrs.version}";
		homepage = "https://github.com/pytoolz/toolz";
		description = "List processing tools and functional utilities";
		license = lib.licenses.bsd3;
		};
		}
		})
		```

		What happens here? The function [`buildPythonPackage`](#buildpythonpackage-function) is called and as argument
		@@ -985,13 +986,13 @@ with import <nixpkgs> { };

		(
		let
		my_toolz = python313.pkgs.buildPythonPackage rec {
		my_toolz = python313.pkgs.buildPythonPackage (finalAttrs: {
		pname = "toolz";
		version = "0.10.0";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		inherit (finalAttrs) pname version;
		hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
		};

		@@ -1005,7 +1006,7 @@ with import <nixpkgs> { };
		description = "List processing tools and functional utilities";
		# [...]
		};
		};
		});

		in
		python313.withPackages (
		@@ -1062,13 +1063,13 @@ order to build [`datashape`](https://github.com/blaze/datashape).
		pytestCheckHook,
		}:

		buildPythonPackage rec {
		buildPythonPackage (finalAttrs: {
		pname = "datashape";
		version = "0.4.7";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		inherit (finalAttrs) pname version;
		hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong=";
		};

		@@ -1083,12 +1084,12 @@ buildPythonPackage rec {
		nativeCheckInputs = [ pytestCheckHook ];

		meta = {
		changelog = "https://github.com/blaze/datashape/releases/tag/${version}";
		changelog = "https://github.com/blaze/datashape/releases/tag/${finalAttrs.version}";
		homepage = "https://github.com/ContinuumIO/datashape";
		description = "Data description language";
		license = lib.licenses.bsd2;
		};
		}
		})
		```

		We can see several runtime dependencies, `numpy`, `multipledispatch`, and
		@@ -1111,13 +1112,13 @@ when building the bindings and are therefore added as [`buildInputs`](#var-stden
		libxslt,
		}:

		buildPythonPackage rec {
		buildPythonPackage (finalAttrs: {
		pname = "lxml";
		version = "3.4.4";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		inherit (finalAttrs) pname version;
		hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk=";
		};

		@@ -1137,13 +1138,13 @@ buildPythonPackage rec {
		];

		meta = {
		changelog = "https://github.com/lxml/lxml/releases/tag/lxml-${version}";
		changelog = "https://github.com/lxml/lxml/releases/tag/lxml-${finalAttrs.version}";
		description = "Pythonic binding for the libxml2 and libxslt libraries";
		homepage = "https://lxml.de";
		license = lib.licenses.bsd3;
		maintainers = with lib.maintainers; [ sjourdois ];
		};
		}
		})
		```

		In this example `lxml` and Nix are able to work out exactly where the relevant
		@@ -1173,13 +1174,13 @@ therefore we have to set `LDFLAGS` and `CFLAGS`.
		scipy,
		}:

		buildPythonPackage rec {
		buildPythonPackage (finalAttrs: {
		pname = "pyfftw";
		version = "0.9.2";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		inherit (finalAttrs) pname version;
		hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ=";
		};

		@@ -1207,7 +1208,7 @@ buildPythonPackage rec {
		pythonImportsCheck = [ "pyfftw" ];

		meta = {
		changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}";
		changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${finalAttrs.version}";
		description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
		homepage = "http://hgomersall.github.com/pyFFTW";
		license = with lib.licenses; [
		@@ -1215,7 +1216,7 @@ buildPythonPackage rec {
		bsd3
		];
		};
		}
		})
		```

		Note also the line [`doCheck = false;`](#var-stdenv-doCheck), we explicitly disabled running the test-suite.
		@@ -1609,13 +1610,13 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix`
		setuptools,
		}:

		buildPythonPackage rec {
		buildPythonPackage (finalAttrs: {
		pname = "toolz";
		version = "0.10.0";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		inherit (finalAttrs) pname version;
		hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
		};

		@@ -1627,7 +1628,7 @@ buildPythonPackage rec {
		description = "List processing tools and functional utilities";
		license = lib.licenses.bsd3;
		};
		}
		})
		```

		It takes an argument [`buildPythonPackage`](#buildpythonpackage-function). We now call this function using

pkgs/applications/editors/vscode/vscode.nix

+8 −8

Original line number	Diff line number	Diff line
		@@ -36,20 +36,20 @@ let

		hash =
		{
		x86_64-linux = "sha256-20ydDfHFhy3BNxC9bHG1JTgybFY9zxxc81EApOVh3wk=";
		x86_64-darwin = "sha256-iGa94habd8rVLP0XQ3LZguTAmIk0odjfMD7LlU+0uBY=";
		aarch64-linux = "sha256-3ma0m+uBuQlGTidRFbI0AcwGcvW8ebnJnnrhAuS6dEc=";
		aarch64-darwin = "sha256-MWowHy95l8IA+XcAFg2FZJoal8ig2aZpWjzFRHnHbIk=";
		armv7l-linux = "sha256-KiAnrpb0ShOalIB4+vKEPe5AHr3rU4sgbeZRUTEZaZs=";
		x86_64-linux = "sha256-qYthiZlioD6fWCyDPfg7Yfo5PqCHzcenk8NjgobLW7c=";
		x86_64-darwin = "sha256-zwvdrstg6UtoG8EE87VXjDORT3zEbbKCFdAP0wPsD9s=";
		aarch64-linux = "sha256-7DBRwwdQm06nyxRMR3wOH+4DqlnPvXGL/rMdq7jpxTw=";
		aarch64-darwin = "sha256-YXmTzpsRSwdtbmoQLDRcJ5hcDURZnrkh5p8e8rYnA0Y=";
		armv7l-linux = "sha256-VQ4/Ae4qeZYCFAJcTh8h8BWM15u8QEAfyJpkFx+1Xc8=";
		}
		.${system} or throwSystem;

		# Please backport all compatible updates to the stable release.
		# This is important for the extension ecosystem.
		version = "1.108.0";
		version = "1.108.1";

		# This is used for VS Code - Remote SSH test
		rev = "94e8ae2b28cb5cc932b86e1070569c4463565c37";
		rev = "585eba7c0c34fd6b30faac7c62a42050bfbc0086";
		in
		callPackage ./generic.nix {
		pname = "vscode" + lib.optionalString isInsiders "-insiders";
		@@ -82,7 +82,7 @@ callPackage ./generic.nix {
		src = fetchurl {
		name = "vscode-server-${rev}.tar.gz";
		url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
		hash = "sha256-VvwZaE1T5FTh/KJdLj9Br51VBMcYcyh4SgZILLS5hwQ=";
		hash = "sha256-YilQLV1vQ1vHLa9pztvDIsaRz1CKzxcjT/INETrJy1I=";
		};
		stdenv = stdenvNoCC;
		};

pkgs/applications/networking/browsers/chromium/info.json

+12 −12

Original line number	Diff line number	Diff line
		{
		"chromium": {
		"version": "144.0.7559.59",
		"version": "144.0.7559.96",
		"chromedriver": {
		"version": "144.0.7559.60",
		"hash_darwin": "sha256-t7iNI8tGDo5BMUGtgqIQ/9uk7LYxp5IdWrP/8KMe2YY=",
		"hash_darwin_aarch64": "sha256-g5dieRsXshJ//Nta/dOkO87JsIgV8DW1SAVlc/Sxxz0="
		"version": "144.0.7559.97",
		"hash_darwin": "sha256-0jenwhaxPdE7oDC/nNnByObDRwpeMr7kfTE5WDvtjGc=",
		"hash_darwin_aarch64": "sha256-iXERqm2wo/J930n/0zsZp7UgJxsgGoJgNn7Bbc2lBPc="
		},
		"deps": {
		"depot_tools": {
		@@ -21,8 +21,8 @@
		"DEPS": {
		"src": {
		"url": "https://chromium.googlesource.com/chromium/src.git",
		"rev": "cd1d73dd77daadf4581dc29ca73482fc241e079d",
		"hash": "sha256-K/dmiy5u+XJIpS6AOTaXDLVYp5qAtfUbfSbGCpt9Cv8=",
		"rev": "d7b80622cfab91c265741194e7942eefd2d21811",
		"hash": "sha256-Cz3iDS0raJHRh+byrs7GYp6sck54mJq7yzsjLUWDWqA=",
		"recompress": true
		},
		"src/third_party/clang-format/script": {
		@@ -132,8 +132,8 @@
		},
		"src/third_party/dawn": {
		"url": "https://dawn.googlesource.com/dawn.git",
		"rev": "a8d1e554a9bd35b0418ba7fd6b0bc005250a7703",
		"hash": "sha256-GJuT3rqNxvKkRTMvoMi8/QYda0y0RTkZLhb5v9QkwGA="
		"rev": "9e0e116de6735ab113349675d31a23c121254fe0",
		"hash": "sha256-MsUmRx5fQYWbkPJ/JvaoT//qjPYy5xxZXIa3t5LDxSY="
		},
		"src/third_party/dawn/third_party/glfw": {
		"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
		@@ -257,8 +257,8 @@
		},
		"src/third_party/devtools-frontend/src": {
		"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
		"rev": "d5efa4236f8676254c9f39ccfef18bd633de5fd3",
		"hash": "sha256-BmwsvTjgYQayFnyT9EfFzpCfbgdTt9xZlsUba0uJelg="
		"rev": "a3064782146fc247c488d44c1ad3496b29d55ec4",
		"hash": "sha256-vLkWH/EiDHxl/dz4soKybQF1hgud/7MlnDhVPicYJGY="
		},
		"src/third_party/dom_distiller_js/dist": {
		"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
		@@ -807,8 +807,8 @@
		},
		"src/v8": {
		"url": "https://chromium.googlesource.com/v8/v8.git",
		"rev": "ad25f9ae50a53bee50f459bfee25fb1e6f64adc3",
		"hash": "sha256-vyOtnPA3tAeorNOGTDuAnwJ/UtpjeO8z+RSjx9RIFFc="
		"rev": "6c2c296f23a5487ccb2536cf7c90d01f35d03077",
		"hash": "sha256-gBzwGvl/tqj4Z6acdLN326I80kBLEk+Nn8oN6D193o4="
		}
		}
		},

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1400,13 +1400,13 @@
		"vendorHash": null
		},
		"ubiquiti-community_unifi": {
		"hash": "sha256-IqsQRVgAB1PUqYJ0JPig6oq7FKJuS/a2NCgTCxX9+cg=",
		"hash": "sha256-G1f33xKPhM2tj/FRZ7thRkwkh5rIDYZHCfjoUu50Cr0=",
		"homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi",
		"owner": "ubiquiti-community",
		"repo": "terraform-provider-unifi",
		"rev": "v0.41.3",
		"rev": "v0.41.8",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-iqwdSzyVZE5CitzXc8rWn2zO3v+VvuDNeS0ll0V6MtU="
		"vendorHash": "sha256-Hoj204a7ZxZJM+L0l2WqR3kUhht+4qEWFqH3BjC/Qkk="
		},
		"ucloud_ucloud": {
		"hash": "sha256-mPTejWXREIBjEZVb660bUUnyj3z7hgfKPrUsSVvMx7A=",

pkgs/by-name/ca/cargo-tarpaulin/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -12,16 +12,16 @@

		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "cargo-tarpaulin";
		version = "0.35.0";
		version = "0.35.1";

		src = fetchFromGitHub {
		owner = "xd009642";
		repo = "tarpaulin";
		tag = finalAttrs.version;
		hash = "sha256-GwIrJksPACw9yIa9apLDxtC/70VhQBRUmfy88OK+0jA=";
		hash = "sha256-l4Sn9EkIphBSEUfuRPhCRPtNENiGyP7lQcN4lx2Osks=";
		};

		cargoHash = "sha256-iI2GfNNPxs1lKtjxNsKCVlXbrATlrnbJr7iHXZJ65rE=";
		cargoHash = "sha256-lHYYDdlm+axyuGY2ulPmuLhVu6p5u6JAf2x6Xcpo8Dc=";

		nativeBuildInputs = [
		pkg-config

Admin message