Merge master into staging-next (6dd046bf) · Commits · nix / nixpkgs

doc/build-helpers/fetchers.chapter.md

+8 −1

Original line number	Diff line number	Diff line
		@@ -860,7 +860,14 @@ A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are m

		To use a different GitHub instance, use `githubBase` (defaults to `"github.com"`).

		`fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options.
		By default, `fetchFromGitHub` uses `fetchzip` to download GitHub's source archive for the specified revision.
		However, `fetchFromGitHub` will automatically switch to using `fetchgit` in any of these cases:

		- `forceFetchGit`, `leaveDotGit`, `deepClone`, `fetchLFS`, or `fetchSubmodules` are set to `true`
		- `sparseCheckout` contains any entries (is a non-empty list)
		- `rootDir` is set to a non-empty string

		When `fetchgit` is used, refer to the `fetchgit` section for documentation of its available options.

		## `fetchFromGitLab` {#fetchfromgitlab}

+14 −6

Original line number	Diff line number	Diff line
		@@ -11082,12 +11082,6 @@
		githubId = 7348004;
		name = "Benjamin Levy";
		};
		iogamaster = {
		email = "iogamastercode+nixpkgs@gmail.com";
		name = "IogaMaster";
		github = "IogaMaster";
		githubId = 67164465;
		};
		ionutnechita = {
		email = "ionut_n2001@yahoo.com";
		github = "ionutnechita";
		@@ -13840,6 +13834,13 @@
		githubId = 1903418;
		name = "Kovacsics Robert";
		};
		kozm9000 = {
		email = "ubermailbox@protonmail.ch";
		github = "kozm9000";
		githubId = 80588292;
		name = "Roman Balashov";
		keys = [ { fingerprint = "E5A5 700D 96ED 42F2 13D4 D16B 2E79 1278 5DDB 96B5"; } ];
		};
		kpbaks = {
		email = "kristoffer.pbs@gmail.com";
		github = "kpbaks";
		@@ -14876,6 +14877,13 @@
		name = "legendofmiracles";
		keys = [ { fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; } ];
		};
		lomenzel = {
		name = "Leonard-Orlando Menzel";
		email = "leonard.menzel@tutanota.com";
		matrix = "@leonard:menzel.lol";
		github = "lomenzel";
		githubId = 79226837;
		};
		lonerOrz = {
		email = "2788892716@qq.com";
		name = "lonerOrz";

+9 −0

Original line number	Diff line number	Diff line
		@@ -1175,6 +1175,15 @@ with lib.maintainers;
		enableFeatureFreezePing = true;
		};

		secshell = {
		members = [
		felbinger
		juli0604
		];
		scope = "Maintain packages and modules created by members of Secure Shell Networks.";
		shortName = "secshell";
		};

		serokell = {
		# Verify additions by approval of an already existing member of the team.
		members = [ balsoft ];

+3 −25

Original line number	Diff line number	Diff line
		@@ -1366,6 +1366,8 @@ let
		};
		};

		docker.docker = callPackage ./docker.docker { };

		donjayamanne.githistory = buildVscodeMarketplaceExtension {
		mktplcRef = {
		name = "githistory";
		@@ -1429,31 +1431,7 @@ let
		};
		};

		eamodio.gitlens = buildVscodeMarketplaceExtension {
		mktplcRef = {
		name = "gitlens";
		publisher = "eamodio";
		# Stable versions are listed on the GitHub releases page and use a
		# semver scheme, contrary to preview versions which are listed on
		# the VSCode Marketplace and use a calver scheme. We should avoid
		# using preview versions, because they expire after two weeks.
		version = "17.4.1";
		hash = "sha256-H14LJ1diURp6dtZE5djSmvI7aJFBnwVAj7Qi7VFf5oo=";
		};
		meta = {
		changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
		description = "Visual Studio Code extension that improves its built-in Git capabilities";
		longDescription = ''
		Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git
		blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via
		powerful comparison commands, and so much more
		'';
		downloadPage = "https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens";
		homepage = "https://gitlens.amod.io/";
		license = lib.licenses.mit;
		maintainers = [ lib.maintainers.ratsclub ];
		};
		};
		eamodio.gitlens = callPackage ./eamodio.gitlens { };

		earthly.earthfile-syntax-highlighting = buildVscodeMarketplaceExtension {
		mktplcRef = {

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		{
		stdenv,
		lib,
		vscode-utils,
		}:

		let
		supported = {
		x86_64-linux = {
		hash = "sha256-2m1hVQ497zQs2pmk+F+5thO4cz7dP4dDEPznPBqKfX0=";
		arch = "linux-x64";
		};
		x86_64-darwin = {
		hash = "sha256-U2BcDUiper4chL8rF4ZUSos7erfXaq1LNqYYsRe2GDk=";
		arch = "darwin-x64";
		};
		aarch64-linux = {
		hash = "sha256-qYdYmPZPlf++cJWLbhvqeO0uePbAJE4hL2bVYlKbk0c=";
		arch = "linux-arm64";
		};
		aarch64-darwin = {
		hash = "sha256-oN3CWc/OLbeuyKfdPoh26yUQzH3d6YfpxacByWM43qk=";
		arch = "darwin-arm64";
		};
		};

		base =
		supported.${stdenv.hostPlatform.system}
		or (throw "unsupported platform ${stdenv.hostPlatform.system}");

		in
		vscode-utils.buildVscodeMarketplaceExtension {
		mktplcRef = base // {
		publisher = "docker";
		name = "docker";
		version = "0.17.0";
		};

		meta = {
		description = "Official Docker DX (Developer Experience) extension. Edit smarter, ship faster with an enhanced Docker-development experience.";
		downloadPage = "https://marketplace.visualstudio.com/items?itemName=docker.docker";
		homepage = "https://github.com/docker/vscode-extension#readme";
		changelog = "https://marketplace.visualstudio.com/items/docker.docker/changelog";
		license = lib.licenses.asl20;
		platforms = builtins.attrNames supported;
		maintainers = [ lib.maintainers.kozm9000 ];
		};
		}