Merge master into staging-nixos (46731c7f) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -29653,6 +29653,13 @@
		githubId = 117323435;
		name = "Andrés Pico";
		};
		xeni = {
		name = "xeni";
		github = "Gernomaly";
		githubId = 71495036;
		email = "xeni@koeln.ccc.de";
		matrix = "@xeni:koeln.ccc.de";
		};
		xfnw = {
		email = "xfnw+nixos@riseup.net";
		github = "xfnw";

pkgs/by-name/am/amp-cli/package-lock.json

+4 −4

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		"packages": {
		"": {
		"dependencies": {
		"@sourcegraph/amp": "^0.0.1775463997-ga80857"
		"@sourcegraph/amp": "^0.0.1776125492-g5cb0c2"
		}
		},
		"node_modules/@napi-rs/keyring": {
		@@ -228,9 +228,9 @@
		}
		},
		"node_modules/@sourcegraph/amp": {
		"version": "0.0.1775463997-ga80857",
		"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1775463997-ga80857.tgz",
		"integrity": "sha512-tQuoo8sh6z6JHyySL9/z/WJbWIZ2PdOxvhB4XMbAVbxs2W32arrDRLY/5iAHbtqsNqz7SXRVrHoQ/yMGre/Trw==",
		"version": "0.0.1776125492-g5cb0c2",
		"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1776125492-g5cb0c2.tgz",
		"integrity": "sha512-LdicFMcgJLNrKAF5diTbOLykdb7znsFohcyGiZInpHl6xGyRyJdyqdeh7VdRSfP4vR5EQGIsi7+i1nQOs6ViDQ==",
		"license": "Amp Commercial License",
		"dependencies": {
		"@napi-rs/keyring": "1.1.10"

pkgs/by-name/am/amp-cli/package.nix

+3 −3

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

		buildNpmPackage (finalAttrs: {
		pname = "amp-cli";
		version = "0.0.1775463997-ga80857";
		version = "0.0.1776125492-g5cb0c2";

		src = fetchzip {
		url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
		hash = "sha256-H74L/t0gGjn6m3UeZo8Ln1CEgRYZcKXO+I7O8VO7bL4=";
		hash = "sha256-EXS32qGU+/SD5MqjXO10GRH0w8EvvP9OqCCfEQfV8Kg=";
		};

		postPatch = ''
		@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
		chmod +x bin/amp-wrapper.js
		'';

		npmDepsHash = "sha256-tC28yduzwyJrzJbttMW0XLNxiv5dfS5dMiVyfY8J85Q=";
		npmDepsHash = "sha256-YT92XzPl1fnJ2a7XdjAe1+01gTeWWJ20Ca5uiLVL+Q4=";

		propagatedBuildInputs = [
		ripgrep

pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings.patch

deleted100644 → 0

+0 −58

Original line number	Diff line number	Diff line
		diff --git a/Cargo.lock b/Cargo.lock
		index 7c10e63a..052a5852 100644
		--- a/Cargo.lock
		+++ b/Cargo.lock
		@@ -1658,7 +1658,7 @@ dependencies = [
		[[package]]
		name = "cosmic-settings-a11y-manager-subscription"
		version = "1.0.2"
		-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
		+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
		dependencies = [
		"cosmic-protocols",
		"iced_futures",
		@@ -1672,7 +1672,7 @@ dependencies = [
		[[package]]
		name = "cosmic-settings-accessibility-subscription"
		version = "1.0.2"
		-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
		+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
		dependencies = [
		"cosmic-dbus-a11y",
		"futures",
		@@ -1685,7 +1685,7 @@ dependencies = [
		[[package]]
		name = "cosmic-settings-airplane-mode-subscription"
		version = "1.0.2"
		-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
		+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
		dependencies = [
		"futures",
		"iced_futures",
		@@ -1718,7 +1718,7 @@ dependencies = [
		[[package]]
		name = "cosmic-settings-daemon-subscription"
		version = "1.0.2"
		-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
		+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
		dependencies = [
		"futures",
		"iced_futures",
		@@ -1731,7 +1731,7 @@ dependencies = [
		[[package]]
		name = "cosmic-settings-network-manager-subscription"
		version = "1.0.2"
		-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
		+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
		dependencies = [
		"bitflags 2.10.0",
		"cosmic-dbus-networkmanager",
		@@ -1765,7 +1765,7 @@ dependencies = [
		[[package]]
		name = "cosmic-settings-upower-subscription"
		version = "1.0.2"
		-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
		+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
		dependencies = [
		"futures",
		"iced_futures",

pkgs/by-name/co/cosmic-applets/package.nix

+3 −11

Original line number	Diff line number	Diff line
		@@ -20,25 +20,17 @@

		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "cosmic-applets";
		version = "1.0.8";
		version = "1.0.10";

		# nixpkgs-update: no auto update
		src = fetchFromGitHub {
		owner = "pop-os";
		repo = "cosmic-applets";
		tag = "epoch-${finalAttrs.version}";
		hash = "sha256-x2FHzgbxxHJEYlCK0bi5j7WdAqAlcocLYW20y2ionBc=";
		hash = "sha256-+E7d8I9xKaTzJzVlJhPb23ak8M9wgjnB6rwYFdpnjcs=";
		};

		cargoPatches = [
		# The lockfile references two different revisions of the same internal repository cosmic-settings,
		# which likely is unintentional and currently causing issues with fetchCargoVendor.
		# Upstream already resolved this because of a general dependency update, so this can be removed on the
		# next update.
		./dedup-cosmic-settings.patch
		];

		cargoHash = "sha256-R9d7slLid3x7NYXkMfcRRa4zY8/RxW+QLMZGsvHdfCw=";
		cargoHash = "sha256-uxz6kMuxhDTehHxDcA43iO+zVHBofbtO6HZoWEf3E30=";

		nativeBuildInputs = [
		just