Merge remote-tracking branch 'origin/master' into staging-next (e0b2b6b1) · Commits · nix / nixpkgs

doc/languages-frameworks/python.section.md

+8 −0

Original line number	Diff line number	Diff line
		@@ -2102,6 +2102,14 @@ Note this method is preferred over adding parameters to builders, as that can
		result in packages depending on different variants and thereby causing
		collisions.

		::: {.note}
		The `optional-dependencies` attribute should only be used for dependency groups
		as defined in package metadata. If a package gracefully handles missing
		dependencies in runtime but doesn't advertise it through package metadata, then
		these dependencies should not be listed at all. (One may still have to list
		them in `nativeCheckInputs` to pass test suite.)
		:::

		### How to contribute a Python package to nixpkgs? {#tools}

		Packages inside nixpkgs must use the [`buildPythonPackage`](#buildpythonpackage-function) or [`buildPythonApplication`](#buildpythonapplication-function) function directly,

+16 −4

Original line number	Diff line number	Diff line
		@@ -8,7 +8,10 @@ let
		cfg = config.programs.nh;
		in
		{
		meta.maintainers = [ lib.maintainers.viperML ];
		meta.maintainers = with lib.maintainers; [
		NotAShelf
		viperML
		];

		options.programs.nh = {
		enable = lib.mkEnableOption "nh, yet another Nix CLI helper";
		@@ -19,9 +22,18 @@ in
		type = lib.types.nullOr lib.types.path;
		default = null;
		description = ''
		The path that will be used for the `FLAKE` environment variable.
		The path that will be used for the `NH_FLAKE` environment variable.

		`NH_FLAKE` is used by nh as the default flake for performing actions, such as
		`nh os switch`. This behaviour can be overriden per-command with environment
		variables that will take priority.

		- `NH_OS_FLAKE`: will take priority for `nh os` commands.
		- `NH_HOME_FLAKE`: will take priority for `nh home` commands.
		- `NH_DARWIN_FLAKE`: will take priority for `nh darwin` commands.

		`FLAKE` is used by nh as the default flake for performing actions, like `nh os switch`.
		The formerly valid `FLAKE` is now deprecated by nh, and will cause hard errors
		in future releases if `NH_FLAKE` is not set.
		'';
		};

		@@ -77,7 +89,7 @@ in
		environment = lib.mkIf cfg.enable {
		systemPackages = [ cfg.package ];
		variables = lib.mkIf (cfg.flake != null) {
		FLAKE = cfg.flake;
		NH_FLAKE = cfg.flake;
		};
		};

+5 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ let
		filter
		filterAttrsRecursive
		flatten
		getAttr
		hasAttrByPath
		isAttrs
		isDerivation
		@@ -111,7 +112,9 @@ let
		hasAttrByPath (splitString "." component) cfg.config
		\|\| useComponentPlatform component
		\|\| useExplicitComponent component
		\|\| builtins.elem component (cfg.extraComponents ++ cfg.defaultIntegrations);
		\|\| builtins.elem component (
		cfg.extraComponents ++ cfg.defaultIntegrations ++ map (getAttr "domain") cfg.customComponents
		);

		# Final list of components passed into the package to include required dependencies
		extraComponents = filter useComponent availableComponents;
		@@ -842,6 +845,7 @@ in

		# Custom components, maintained manually.
		"amshan"
		"benqprojector"
		];
		in
		{

+3 −12

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		lib,
		stdenv,
		fetchurl,
		fetchpatch2,
		autoreconfHook,
		pkg-config,
		util-linux,
		@@ -26,21 +25,13 @@

		stdenv.mkDerivation rec {
		pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
		version = "26.1.knots20240325";
		version = "28.1.knots20250305";

		src = fetchurl {
		url = "https://bitcoinknots.org/files/26.x/${version}/bitcoin-${version}.tar.gz";
		hash = "sha256-PqpePDna2gpCzF2K43N4h6cV5Y9w/e5ZcUvaNEaFaIk=";
		url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz";
		hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A=";
		};

		patches = [
		# upnp: add compatibility for miniupnpc 2.2.8
		(fetchpatch2 {
		url = "https://github.com/bitcoinknots/bitcoin/commit/643014424359a4783cf9c73bee3346ac2f04e713.patch?full_index=1";
		hash = "sha256-FdLoNH3+ZZTbqrwRvhbAeJuGz4SgnIvoWUBzRxjfzs8=";
		})
		];

		nativeBuildInputs =
		[
		autoreconfHook

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,13 +18,13 @@ let
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "gpxsee";
		version = "13.38";
		version = "13.40";

		src = fetchFromGitHub {
		owner = "tumic0";
		repo = "GPXSee";
		tag = finalAttrs.version;
		hash = "sha256-ftVuFuoseXtpeXzOMZA66O2Z6wxKd7G6l3Kx8WOgor0=";
		hash = "sha256-xxMnqUsYfmTD1ZNAm+lFMLvXvo6qRrq88m234ZtYiuA=";
		};

		buildInputs =