Merge master into staging-next (0a1690dd) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+13 −0

Original line number	Diff line number	Diff line
		@@ -10889,6 +10889,12 @@
		githubId = 613740;
		name = "Martin Baillie";
		};
		mbalatsko = {
		email = "mbalatsko@gmail.com";
		github = "mbalatsko";
		githubId = 15967073;
		name = "Maksym Balatsko";
		};
		mbbx6spp = {
		email = "me@susanpotter.net";
		github = "mbbx6spp";
		@@ -13844,6 +13850,13 @@
		fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18";
		}];
		};
		p-rintz = {
		email = "nix@rintz.net";
		github = "p-rintz";
		githubId = 13933258;
		name = "Philipp Rintz";
		matrix = "@philipp:srv.icu";
		};
		ProducerMatt = {
		name = "Matthew Pherigo";
		email = "ProducerMatt42@gmail.com";

+2 −2

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

		let
		pname = "ledger-live-desktop";
		version = "2.64.2";
		version = "2.66.0";

		src = fetchurl {
		url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
		hash = "sha256-8cb5FA/Ogd6GI0AclxHicZGV3K5bVsZuIl/3A03r5qQ=";
		hash = "sha256-Du2bvtlNjxtkJ31RCKZmGtWxOEIjohbmEC5o3VvFGlY=";
		};

+965 −573

File changed.

Preview size limit exceeded, changes collapsed.

+4 −4

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

		rustPlatform.buildRustPackage rec {
		pname = "habitat";
		version = "1.6.652";
		version = "1.6.848";

		src = fetchFromGitHub {
		owner = "habitat-sh";
		repo = "habitat";
		rev = version;
		hash = "sha256-aWQ4A8NxTOauwad1q58Q4IFDUImX/L/4YTCeVLaq8gw=";
		hash = "sha256-oK9ZzENwpEq6W1qnhSgkr7Rhy7Fxt/BS4U5nxecyPu8=";
		};

		cargoLock = {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"clap-2.33.1" = "sha256-ixyNr91VNB2ce2cIr0CdPmvKYRlckhKLeaSbqxouIAY=";
		"configopt-0.1.0" = "sha256-DvpC4WDIzknN5A6+68H7p8bG5lwZ2f+kc9yYhTl16ZM=";
		"configopt-0.1.0" = "sha256-76MeSoRD796ZzBqX3CoDJnunekVo2XfctpxrpspxmAU=";
		"rants-0.6.0" = "sha256-B8uDoiqddCki3j7aC8kilEcmJjvB4ICjZjjTun2UEkY=";
		"retry-1.0.0" = "sha256-ZaHnzOCelV4V0+MTIbH3DXxdz8QZVgcMq2YeV0S6X6o=";
		"structopt-0.3.15" = "sha256-0vIX7J7VktKytT3ZnOm45qPRMHDkdJg20eU6pZBIH+Q=";
		@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
		homepage = "https://www.habitat.sh";
		changelog = "https://github.com/habitat-sh/habitat/blob/${src.rev}/CHANGELOG.md";
		license = licenses.asl20;
		maintainers = with maintainers; [ rushmorem ];
		maintainers = with maintainers; [ rushmorem qjoly ];
		mainProgram = "hab";
		platforms = [ "x86_64-linux" ];
		};

+3 −3

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

		buildGoModule rec {
		pname = "k8sgpt";
		version = "0.3.13";
		version = "0.3.14";

		src = fetchFromGitHub {
		owner = "k8sgpt-ai";
		repo = "k8sgpt";
		rev = "v${version}";
		hash = "sha256-JXKM39tODHg5jRE5p0u5xETPFDZrQgFri3FrYJFVUZU=";
		hash = "sha256-n1bWAx3BQxgiuhDdTb2HU1DSEBQqOP/ek9bJBZlbWEM=";
		};

		vendorHash = "sha256-L8/GLhjCI93R9S1fE+wgXyPObIXRMkj5MF71iWAZVQk=";
		vendorHash = "sha256-FUgIziVI99kL3dLJLqVFPEmQqLKXxAMie2q46sp0PeU=";

		CGO_ENABLED = 0;