Merge master into staging-next (7054a80f) · Commits · nix / nixpkgs

pkgs/applications/editors/helix/default.nix

+3 −10

Original line number	Diff line number	Diff line
		@@ -2,24 +2,17 @@

		rustPlatform.buildRustPackage rec {
		pname = "helix";
		version = "23.05";
		version = "23.10";

		# This release tarball includes source code for the tree-sitter grammars,
		# which is not ordinarily part of the repository.
		src = fetchzip {
		url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
		hash = "sha256-3ZEToXwW569P7IFLqz6Un8rClnWrW5RiYKmRVFt7My8=";
		hash = "sha256-PH4n+zm5ShwOrzzQm0Sn8b8JzAW/CF8UzzKZYE3e2WA=";
		stripRoot = false;
		};

		cargoHash = "sha256-/LCtfyDAA2JuioBD/CDMv6OOxM0B9A3PpuVP/YY5oF0=";

		patches = [
		(fetchpatch {
		url = "https://patch-diff.githubusercontent.com/raw/helix-editor/helix/pull/7227.patch";
		hash = "sha256-dObMKHNJfc5TODUjZ28TVxuTen02rl8HzcXpFWnhB1k=";
		})
		];
		cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs=";

		nativeBuildInputs = [ git installShellFiles makeWrapper ];

pkgs/applications/gis/grass/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,13 +34,13 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "grass";
		version = "8.3.0";
		version = "8.3.1";

		src = fetchFromGitHub {
		owner = "OSGeo";
		repo = "grass";
		rev = finalAttrs.version;
		hash = "sha256-YHQtvp/AYMWme46yIc4lE/izjqVePnPxn3GY5RRfPq4=";
		hash = "sha256-SoJq4SuDYImfkM2e991s47vYusrmnrQaXn7p3xwyOOQ=";
		};

		nativeBuildInputs = [

pkgs/applications/misc/1password-gui/default.nix

+5 −5

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		let

		pname = "1password";
		version = if channel == "stable" then "8.10.18" else "8.10.18-19.BETA";
		version = if channel == "stable" then "8.10.18" else "8.10.20-1.BETA";

		sources = {
		stable = {
		@@ -33,19 +33,19 @@ let
		beta = {
		x86_64-linux = {
		url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
		hash = "sha256-siQ6w1byDkfNrbkvjLWmQRbJ5nVZZv24vg0RFWaRHmE=";
		hash = "sha256-+wHxtlE0zeVEObzdpcIP75LKbbjsG8LMqdIPFkY0BoU=";
		};
		aarch64-linux = {
		url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
		hash = "sha256-WX6NzBXBSBf/hIl1kTIuUvCnEZ1+B0NBHfKvMeIZOw4=";
		hash = "sha256-BRsp/hhBwgQFU+5Tt1M9V5Lx8oRLN3uaqLrzrPo/xpo=";
		};
		x86_64-darwin = {
		url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
		hash = "sha256-HQRw1OGIT/cVjDk4PGa8x4QdYHQxtqMePsUh+cpyysM=";
		hash = "sha256-WVP5a007cU1GR/lnL7C6QiJpTTsjzaiS69H2LJzYm70=";
		};
		aarch64-darwin = {
		url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
		hash = "sha256-1KcTgmxDhbvB6gzTqF3bhu5toCSjskGjCflrBSNYzk4=";
		hash = "sha256-BBSUSSnot1ktC0ik7yMhqsgLdkeQBrJUpHBvwu0w9m0=";
		};
		};
		};

pkgs/applications/misc/pot/Cargo.lock

+1 −74

Original line number	Diff line number	Diff line
		@@ -4176,21 +4176,6 @@ dependencies = [
		"windows 0.37.0",
		]

		[[package]]
		name = "ring"
		version = "0.16.20"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
		dependencies = [
		"cc",
		"libc",
		"once_cell",
		"spin 0.5.2",
		"untrusted",
		"web-sys",
		"winapi",
		]

		[[package]]
		name = "rsa"
		version = "0.9.2"
		@@ -4255,36 +4240,6 @@ dependencies = [
		"windows-sys 0.48.0",
		]

		[[package]]
		name = "rustls"
		version = "0.21.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
		dependencies = [
		"ring",
		"rustls-webpki",
		"sct",
		]

		[[package]]
		name = "rustls-pemfile"
		version = "1.0.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
		dependencies = [
		"base64 0.21.4",
		]

		[[package]]
		name = "rustls-webpki"
		version = "0.101.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
		dependencies = [
		"ring",
		"untrusted",
		]

		[[package]]
		name = "rustversion"
		version = "1.0.14"
		@@ -4351,16 +4306,6 @@ dependencies = [
		"xcb",
		]

		[[package]]
		name = "sct"
		version = "0.7.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
		dependencies = [
		"ring",
		"untrusted",
		]

		[[package]]
		name = "security-framework"
		version = "2.9.2"
		@@ -4785,8 +4730,6 @@ dependencies = [
		"once_cell",
		"paste",
		"percent-encoding",
		"rustls",
		"rustls-pemfile",
		"serde",
		"serde_json",
		"sha2",
		@@ -4798,7 +4741,6 @@ dependencies = [
		"tokio-stream",
		"tracing",
		"url",
		"webpki-roots",
		]

		[[package]]
		@@ -5377,7 +5319,7 @@ dependencies = [
		[[package]]
		name = "tauri-plugin-sql"
		version = "0.0.0"
		source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90"
		source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#77b81af36cc6c03b07c59a2988b0f6d20960f1b0"
		dependencies = [
		"futures-core",
		"log",
		@@ -5905,12 +5847,6 @@ version = "0.1.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"

		[[package]]
		name = "untrusted"
		version = "0.7.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"

		[[package]]
		name = "url"
		version = "2.4.1"
		@@ -6232,15 +6168,6 @@ dependencies = [
		"system-deps 6.1.2",
		]

		[[package]]
		name = "webpki-roots"
		version = "0.24.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
		dependencies = [
		"rustls-webpki",
		]

		[[package]]
		name = "webview2-com"
		version = "0.19.1"

pkgs/applications/misc/pot/default.nix

+3 −2

Original line number	Diff line number	Diff line
		@@ -23,13 +23,13 @@

		stdenv.mkDerivation rec {
		pname = "pot";
		version = "2.6.3";
		version = "2.6.6";

		src = fetchFromGitHub {
		owner = "pot-app";
		repo = "pot-desktop";
		rev = version;
		hash = "sha256-ag54ns4lqIGjjHj6n8mDJTalQfBjqLxqSudjyeRRSs4=";
		hash = "sha256-ZpN+SgBq2vA2p4MjrT07j22VB67FdiXIIl9puGiGJA4=";
		};

		sourceRoot = "${src.name}/src-tauri";
		@@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
		outputHashes = {
		# All other crates in the same workspace reuse this hash.
		"tauri-plugin-autostart-0.0.0" = "sha256-wgVsF3H9BT8lBew7tQ308eIQ6cLZT93hD/4eYCDEq98=";
		"tauri-plugin-sql-0.0.0" = "sha256-e9iwcHwW8MaRzkaAbewrq6b9+n3ZofMTBnvA23ZF2ro=";
		};
		};

Admin message