Merge staging-next into staging (2463a63c) · Commits · nix / nixpkgs

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -12,18 +12,18 @@
		pango,
		}:

		rustPlatform.buildRustPackage rec {
		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "browsers";
		version = "0.7.0";
		version = "0.7.2";

		src = fetchFromGitHub {
		owner = "Browsers-software";
		repo = "browsers";
		tag = version;
		hash = "sha256-s03BEscaYdSitLtlqbX/tgGSLRHuXc9Ht+3RMCUIdY8=";
		tag = finalAttrs.version;
		hash = "sha256-1RWGAEiSJWDoScKuUB5LL1tQyTw5NRnld7Fi93vP0BA=";
		};

		cargoHash = "sha256-tz4ju0NwgG5yb1VndYqyf+g631izPl904KYDUvawO28=";
		cargoHash = "sha256-M1KAZPjNu4j5b5Ml2J9OHpD+/jeF8WRP6EzfmLnb0hY=";

		nativeBuildInputs = [
		pkg-config
		@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
		mv $out/share/applications/software.Browsers.template.desktop $out/share/applications/software.Browsers.desktop
		substituteInPlace \
		$out/share/applications/software.Browsers.desktop \
		--replace-fail 'Exec=€ExecCommand€' 'Exec=${pname} %u'
		--replace-fail 'Exec=€ExecCommand€' 'Exec=${finalAttrs.pname} %u'
		cp -r resources $out
		for size in 16 32 128 256 512; do
		install -m 444 \
		@@ -58,9 +58,9 @@ rustPlatform.buildRustPackage rec {
		meta = {
		description = "Open the right browser at the right time";
		homepage = "https://browsers.software";
		changelog = "https://github.com/Browsers-software/browsers/blob/${src.rev}/CHANGELOG.md";
		changelog = "https://github.com/Browsers-software/browsers/blob/${finalAttrs.version}/CHANGELOG.md";
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [ ravenz46 ];
		mainProgram = "browsers";
		};
		}
		})

pkgs/by-name/co/codeql/package.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "codeql";
		version = "2.23.0";
		version = "2.23.3";

		dontConfigure = true;
		dontBuild = true;
		@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

		src = fetchzip {
		url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
		hash = "sha256-8T1aOy2okhwj2rFz3jUpUm2JaJcrXdB6KpSD8btCEx4=";
		hash = "sha256-Y6E3itwm/BZuNAs4b1roynEEdpOArfKPh+vNQidu+y8=";
		};

		nativeBuildInputs = [

pkgs/by-name/da/davix/package.nix

+17 −12

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchurl,
		fetchpatch,
		fetchFromGitHub,
		cmake,
		pkg-config,
		openssl,
		libxml2,
		boost,
		python3,
		libuuid,
		curl,
		@@ -27,7 +27,7 @@ let
		boolToUpper = b: lib.toUpper (lib.boolToString b);
		in
		stdenv.mkDerivation rec {
		version = "0.8.7";
		version = "0.8.10";
		pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy";
		nativeBuildInputs = [
		cmake
		@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
		python3
		];
		buildInputs = [
		boost
		curl
		libxml2
		openssl
		@@ -44,14 +43,11 @@ stdenv.mkDerivation rec {
		++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid
		++ lib.optional enableThirdPartyCopy gsoap;

		# using the url below since the github release page states
		# "please ignore the GitHub-generated tarballs, as they are incomplete"
		# https://github.com/cern-fts/davix/releases/tag/R_0_8_0
		src = fetchurl {
		url = "https://github.com/cern-fts/davix/releases/download/R_${
		lib.replaceStrings [ "." ] [ "_" ] version
		}/davix-${version}.tar.gz";
		sha256 = "sha256-eMJOFO3X5OVgOS1nFH7IZYwqoNNkBBW99rxROvz2leY=";
		src = fetchFromGitHub {
		owner = "cern-fts";
		repo = "davix";
		rev = "refs/tags/R_${lib.replaceStrings [ "." ] [ "_" ] version}";
		hash = "sha256-n4NeHBgQwGwgHAFQzPc3oEP9k3F/sqrTmkI/zHW+Miw=";
		};

		preConfigure = ''
		@@ -61,6 +57,7 @@ stdenv.mkDerivation rec {
		'';

		cmakeFlags = [
		"-DDAVIX_TESTS=OFF"
		"-DENABLE_TOOLS=${boolToUpper enableTools}"
		"-DEMBEDDED_LIBCURL=OFF"
		"-DLIBCURL_BACKEND_BY_DEFAULT=${boolToUpper defaultToLibcurl}"
		@@ -69,6 +66,14 @@ stdenv.mkDerivation rec {
		"-DENABLE_THIRD_PARTY_COPY=${boolToUpper enableThirdPartyCopy}"
		];

		patches = [
		# Update CMake minimum requirement and supported versions, backport from unreleased davix 0.8.11
		(fetchpatch {
		url = "https://github.com/cern-fts/davix/commit/687d424c9f87888c94d96f3ea010de11ef70cd23.patch";
		hash = "sha256-FNXOQrY0gsMK+D4jwbJmYyEqD3lFui0giXUd+Rr0jLk=";
		})
		];

		meta = with lib; {
		description = "Toolkit for Http-based file management";

pkgs/by-name/gf/gfal2/package.nix

+30 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,36 @@ stdenv.mkDerivation (finalAttrs: {
		]
		);

		preConfigure =
		let
		cmakeFiles = [
		"CMakeLists.txt"
		"src/CMakeLists.txt"
		"src/core/CMakeLists.txt"
		"src/core/transfer/CMakeLists.txt"
		"src/plugins/CMakeLists.txt"
		"src/plugins/dcap/CMakeLists.txt"
		"src/plugins/file/CMakeLists.txt"
		"src/plugins/gridftp/CMakeLists.txt"
		"src/plugins/http/CMakeLists.txt"
		"src/plugins/lfc/CMakeLists.txt"
		"src/plugins/mock/CMakeLists.txt"
		"src/plugins/rfio/CMakeLists.txt"
		"src/plugins/sftp/CMakeLists.txt"
		"src/plugins/srm/CMakeLists.txt"
		"src/plugins/xrootd/CMakeLists.txt"
		"src/utils/CMakeLists.txt"
		"src/version/CMakeLists.txt"
		];
		in
		''
		for f in ${lib.escapeShellArgs cmakeFiles}; do
		substituteInPlace "$f" \
		--replace-fail 'cmake_minimum_required (VERSION 2.6)' \
		'cmake_minimum_required (VERSION 3.10)'
		done
		'';

		cmakeFlags =
		(map (
		pluginName:

pkgs/by-name/ha/harsh/package.nix

+3 −3

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

		buildGoModule (finalAttrs: {
		pname = "harsh";
		version = "0.10.22";
		version = "0.11.3";

		src = fetchFromGitHub {
		owner = "wakatara";
		repo = "harsh";
		tag = "v${finalAttrs.version}";
		hash = "sha256-TGhhiqFf6POR7x/Nc8m5/mBlj23EnjZlL5AL9IwXghk=";
		hash = "sha256-mQhBQFDint6ZlS5yQ9oGLJVxmol9p+st9X7wRCBuc/g=";
		};

		vendorHash = "sha256-m+5MSgzuRUZuP1GhEUCttLRLL63kphMi8N9tDUaTaOQ=";
		vendorHash = "sha256-+yHIpUttvrdiTt0IuMTT4iCN34hNOb3JjZTmi5qb8yI=";

		nativeCheckInputs = [ writableTmpDirAsHomeHook ];