Merge master into staging-next (079dc4c2) · Commits · nix / nixpkgs

doc/languages-frameworks/cuda.section.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ package set to make it the default. This guarantees you get a consistent package
		set.
		```nix
		mypkg = let
		cudaPackages = cudaPackages_11_5.overrideScope' (final: prev {
		cudaPackages = cudaPackages_11_5.overrideScope' (final: prev: {
		cudnn = prev.cudnn_8_3_2;
		}});
		in callPackage { inherit cudaPackages; };

doc/languages-frameworks/perl.section.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ ImageExifTool = buildPerlPackage {
		hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg=";
		};

		buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
		nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
		postInstall = lib.optionalString stdenv.isDarwin ''
		shortenPerlShebang $out/bin/exiftool
		'';

maintainers/maintainer-list.nix

+41 −7

Original line number	Diff line number	Diff line
		@@ -3766,13 +3766,6 @@
		githubId = 62989;
		name = "Demyan Rogozhin";
		};
		dennajort = {
		email = "gosselinjb@gmail.com";
		matrix = "@dennajort:matrix.org";
		github = "dennajort";
		githubId = 1536838;
		name = "Jean-Baptiste Gosselin";
		};
		derchris = {
		email = "derchris@me.com";
		github = "derchrisuk";
		@@ -6222,6 +6215,12 @@
		githubId = 982322;
		name = "Henrik Olsson";
		};
		henrirosten = {
		email = "henri.rosten@unikie.com";
		github = "henrirosten";
		githubId = 49935860;
		name = "Henri Rosten";
		};
		henrytill = {
		email = "henrytill@gmail.com";
		github = "henrytill";
		@@ -7102,6 +7101,13 @@
		githubId = 221929;
		name = "Jean-Baptiste Giraudeau";
		};
		jbgosselin = {
		email = "gosselinjb@gmail.com";
		matrix = "@dennajort:matrix.org";
		github = "jbgosselin";
		githubId = 1536838;
		name = "Jean-Baptiste Gosselin";
		};
		jboy = {
		email = "jboy+nixos@bius.moe";
		githubId = 2187261;
		@@ -8100,6 +8106,13 @@
		githubId = 524492;
		name = "Sergey Kazenyuk";
		};
		kbdharun = {
		email = "kbdharunkrishna@gmail.com";
		matrix = "@kbdk:matrix.org";
		github = "kbdharun";
		githubId = 26346867;
		name = "K.B.Dharun Krishna";
		};
		kcalvinalvin = {
		email = "calvin@kcalvinalvin.info";
		github = "kcalvinalvin";
		@@ -10217,6 +10230,15 @@
		github = "michaelgrahamevans";
		githubId = 5932424;
		};
		michaelpachec0 = {
		email = "michaelpacheco@protonmail.com";
		name = "Michael Pacheco";
		github = "MichaelPachec0";
		githubId = 48970112;
		keys = [ {
		fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64";
		}];
		};
		michaelpj = {
		email = "michaelpj@gmail.com";
		github = "michaelpj";
		@@ -12977,6 +12999,12 @@
		githubId = 903072;
		name = "Raghav Sood";
		};
		ragingpastry = {
		email = "senior.crepe@gmail.com";
		github = "ragingpastry";
		githubId = 6778250;
		name = "Nick Wilburn";
		};
		raitobezarius = {
		email = "ryan@lahfa.xyz";
		matrix = "@raitobezarius:matrix.org";
		@@ -14334,6 +14362,12 @@
		githubId = 487050;
		name = "Shea Levy";
		};
		shlok = {
		email = "sd-nix-maintainer@quant.is";
		github = "shlok";
		githubId = 3000933;
		name = "Shlok Datye";
		};
		shmish111 = {
		email = "shmish111@gmail.com";
		github = "shmish111";

maintainers/scripts/haskell/merge-and-open-pr.sh

+2 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,8 @@ echo "Updating Stackage..."
		echo "Updating Hackage hashes..."
		./maintainers/scripts/haskell/update-hackage.sh --do-commit
		echo "Regenerating Hackage packages..."
		./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit
		# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check.
		./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit

		# Push these new commits to the haskell-updates branch
		echo "Pushing commits just created to the remote haskell-updates branch..."

maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

+13 −2

Original line number	Diff line number	Diff line
		#! /usr/bin/env nix-shell
		#! nix-shell -i bash -p coreutils jq nix -I nixpkgs=.

		set -euo pipefail

		TMP_TEMPLATE=transitive-broken.XXXXXXX
		readonly TMP_TEMPLATE

		tmpfile=$(mktemp "$TMP_TEMPLATE")

		trap 'rm -f "${tmpfile}"' 0

		config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

		cat > $config_file << EOF
		cat > $tmpfile << EOF
		# This file is automatically generated by
		# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
		# It is supposed to list all haskellPackages that cannot evaluate because they
		@@ -11,4 +20,6 @@ cat > $config_file << EOF
		dont-distribute-packages:
		EOF

		nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix \| jq -r . \| LC_ALL=C.UTF-8 sort -i >> $config_file
		nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix \| jq -r . \| LC_ALL=C.UTF-8 sort -i >> $tmpfile

		mv $tmpfile $config_file

Admin message