Merge master into staging-next (12065c80) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -9109,6 +9109,12 @@
		githubId = 7047019;
		name = "Florent Becker";
		};
		galabovaa = {
		name = "Ivet Galabova";
		email = "galabovaa@gmail.com";
		github = "galabovaa";
		githubId = 4016566;
		};
		galagora = {
		email = "lightningstrikeiv@gmail.com";
		github = "Galagora";

pkgs/by-name/br/brave/package.nix

+5 −5

Original line number	Diff line number	Diff line
		@@ -3,24 +3,24 @@

		let
		pname = "brave";
		version = "1.84.132";
		version = "1.84.135";

		allArchives = {
		aarch64-linux = {
		url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
		hash = "sha256-/3LF5T/Y7eyjrDZMJ6UtBmjqxSZTsBcJJ6LtDG3Xnvc=";
		hash = "sha256-DekkbvOpVn+NDSzltiafsS7cE2QbVn47mIaVvXUQUUM=";
		};
		x86_64-linux = {
		url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
		hash = "sha256-UPV4krI4jnXNNL6RjvhO/ftxS53eWernG1YVVI2AXbg=";
		hash = "sha256-mPZqszSPkMC77eUY+CpTzYbbDKMKt7LoM6lncgBqSFo=";
		};
		aarch64-darwin = {
		url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
		hash = "sha256-FzWiCVwscggFgjKLd4thp1j3A5xMn4AjCSE3PvaBYR0=";
		hash = "sha256-yC1XS1NdJ6kTd16kK/MlVV5KYoMVgRAr8/JLOdr+r74=";
		};
		x86_64-darwin = {
		url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
		hash = "sha256-CBjBfqy9n5/WH2NBc1GUz13n8KyqhryTx849gMUq+j8=";
		hash = "sha256-Au42zUX21ZFvfNyrNRb3sWH+c+DGqqGUulbK02Xjrsg=";
		};
		};

pkgs/by-name/ch/changedetection-io/package.nix

+36 −19

Original line number	Diff line number	Diff line
		@@ -2,18 +2,19 @@
		lib,
		fetchFromGitHub,
		python3,
		gitUpdater,
		}:

		python3.pkgs.buildPythonApplication rec {
		pname = "changedetection-io";
		version = "0.49.4";
		version = "0.50.14";
		format = "setuptools";

		src = fetchFromGitHub {
		owner = "dgtlmoon";
		repo = "changedetection.io";
		tag = version;
		hash = "sha256-EmtJ8XXPb75W4VPj4Si9fdzVLDKVfm+8P6UZZlMpMdI=";
		hash = "sha256-zxCb2mmCicjDxilj/l8HabJm2FsFQB0yLNaRiIDltwI=";
		};

		pythonRelaxDeps = true;
		@@ -22,14 +23,13 @@ python3.pkgs.buildPythonApplication rec {
		with python3.pkgs;
		[
		apprise
		babel
		beautifulsoup4
		blinker
		brotli
		babel
		chardet
		cryptography
		dnspython
		elementpath
		eventlet
		extruct
		feedgen
		flask
		@@ -39,45 +39,62 @@ python3.pkgs.buildPythonApplication rec {
		flask-login
		flask-paginate
		flask-restful
		flask-socketio
		flask-wtf
		gevent
		greenlet
		inscriptis
		janus
		jinja2
		jinja2-time
		jsonpath-ng
		jq
		jsonpath-ng
		jsonschema
		levenshtein
		loguru
		lxml
		openapi-core
		openpyxl
		paho-mqtt
		playwright
		pyee
		pyppeteer
		panzi-json-logic
		pluggy
		price-parser
		psutil
		pyppeteer-ng
		# pyppeteerstealth
		python-engineio
		python-magic
		python-socketio
		pytz
		referencing
		requests
		requests-file
		selenium
		setuptools
		timeago
		urllib3
		tzdata
		validators
		werkzeug
		wtforms
		]
		++ requests.optional-dependencies.socks;
		++ requests.optional-dependencies.socks
		++ openapi-core.optional-dependencies.flask;

		# tests can currently not be run in one pytest invocation and without docker
		doCheck = false;

		nativeCheckInputs = with python3.pkgs; [
		pytest-flask
		pytestCheckHook
		];
		pythonImportsCheck = [ "changedetectionio" ];

		passthru.updateScript = gitUpdater { };

		meta = with lib; {
		meta = {
		description = "Self-hosted free open source website change detection tracking, monitoring and notification service";
		homepage = "https://github.com/dgtlmoon/changedetection.io";
		changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${src.tag}";
		license = licenses.asl20;
		maintainers = with maintainers; [ mikaelfangel ];
		license = lib.licenses.asl20;
		maintainers = with lib.maintainers; [
		mikaelfangel
		thanegill
		];
		mainProgram = "changedetection.io";
		};
		}

pkgs/by-name/co/code-cursor/package.nix

+9 −9

Original line number	Diff line number	Diff line
		@@ -16,20 +16,20 @@ let

		sources = {
		x86_64-linux = fetchurl {
		url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/x64/Cursor-1.7.52-x86_64.AppImage";
		hash = "sha256-nhDDdXE5/m9uASiQUJ4GHfApkzkf9ju5b8s0h6BhpjQ=";
		url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/x64/Cursor-2.0.64-x86_64.AppImage";
		hash = "sha256-zT9GhdwGDWZJQl+WpV2txbmp3/tJRtL6ds1UZQoKNzA=";
		};
		aarch64-linux = fetchurl {
		url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/arm64/Cursor-1.7.52-aarch64.AppImage";
		hash = "sha256-96zL0pmcrEyDEy8oW2qWk6RM8XGE4Gd2Aa3Hhq0qvk0=";
		url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/arm64/Cursor-2.0.64-aarch64.AppImage";
		hash = "sha256-1pN9LfnplKyVUxlICQ2KsxcAn++dZY9hGR4XubHxLUY=";
		};
		x86_64-darwin = fetchurl {
		url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/x64/Cursor-darwin-x64.dmg";
		hash = "sha256-0//Sv57iEgRm/exnUnKVpdyk6fwxAnx0PDg2mVaB9J8=";
		url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/x64/Cursor-darwin-x64.dmg";
		hash = "sha256-lY5BJeauw5VtWuaAu8C9C2inmKFvv/OnCxOicE2Zs48=";
		};
		aarch64-darwin = fetchurl {
		url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/arm64/Cursor-darwin-arm64.dmg";
		hash = "sha256-g8Fk9+MDwzLTNitxJMApypfiLWEjze0PR2OIPC774j8=";
		url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/arm64/Cursor-darwin-arm64.dmg";
		hash = "sha256-IIJbuRdxTG7kSspspWk8GH9KZsKPyLJahz0iqSvP1B0=";
		};
		};

		@@ -39,7 +39,7 @@ in
		inherit useVSCodeRipgrep;
		commandLineArgs = finalCommandLineArgs;

		version = "1.7.52";
		version = "2.0.64";
		pname = "cursor";

		# You can find the current VSCode version in the About dialog:

pkgs/by-name/ge/geographiclib/package.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "geographiclib";
		version = "2.6";
		version = "2.7";

		src = fetchFromGitHub {
		owner = "geographiclib";
		repo = "geographiclib";
		tag = "v${version}";
		hash = "sha256-G0D44iP3ApYlxNxF+hrB20v3X+4gp2p94gQLygqgB3E=";
		hash = "sha256-xqrt7KeYyYB90kuvn2qmK8VI3RVQuIhNN8qCzV//yko=";
		};

		outputs = [