Merge master into staging-next (13bff293) · Commits · nix / nixpkgs

pkgs/applications/blockchains/ergo/default.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "ergo";
		version = "5.0.18";
		version = "5.0.19";

		src = fetchurl {
		url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
		sha256 = "sha256-WwchK7qyy+J7TiWj4exBMLGkLmbPFDA7yNQVZ779nmk=";
		sha256 = "sha256-ogr2tdXVQcUOE26PGsYeAGi8+5zbM5m/BVuHxemVNGM=";
		};

		nativeBuildInputs = [ makeWrapper ];

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,13 +58,13 @@ let
		in
		stdenv.mkDerivation rec {
		pname = "bambu-studio";
		version = "01.08.02.56";
		version = "01.08.04.51";

		src = fetchFromGitHub {
		owner = "bambulab";
		repo = "BambuStudio";
		rev = "v${version}";
		hash = "sha256-9AUHS7dXqWx8LPkTP7/scxu3Cc/mxuK+v+5PrCvUPf0=";
		hash = "sha256-rqD1+3Q4ZUBgS57iCItuLX6ZMP7VQuedaJmgKB1szgs=";
		};

		nativeBuildInputs = [

+8 −2

Original line number	Diff line number	Diff line
		@@ -10,11 +10,13 @@
		, python3
		, udisks2
		, wrapGAppsHook
		, testers
		, udiskie
		}:

		python3.pkgs.buildPythonApplication rec {
		pname = "udiskie";
		version = "2.5.1";
		version = "2.5.2";

		pyproject = true;

		@@ -22,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
		owner = "coldfix";
		repo = "udiskie";
		rev = "v${version}";
		hash = "sha256-bmpofyW5IBRmVlzHP9YRlI/JNnnamKfF9jCG85G0wBc=";
		hash = "sha256-r9ppuWYY3e2thsfFh4ooOgfqNvmCVw7fS0SpJCJcysQ=";
		};

		patches = [
		@@ -78,6 +80,10 @@ python3.pkgs.buildPythonApplication rec {
		pytestCheckHook
		];

		passthru.tests.version = testers.testVersion {
		package = udiskie;
		};

		meta = with lib; {
		homepage = "https://github.com/coldfix/udiskie";
		changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst";

+3 −5

Original line number	Diff line number	Diff line
		@@ -320,11 +320,9 @@ buildStdenv.mkDerivation {
		unset 'configureFlagsArray[i]'
		fi
		done
		configureFlagsArray+=(
		"--enable-profile-use=cross"
		"--with-pgo-profile-path="$TMPDIR/merged.profdata""
		"--with-pgo-jarlog="$TMPDIR/jarlog""
		)
		appendToVar configureFlags --enable-profile-use=cross
		appendToVar configureFlags --with-pgo-profile-path=$TMPDIR/merged.profdata
		appendToVar configureFlags --with-pgo-jarlog=$TMPDIR/jarlog
		${lib.optionalString stdenv.hostPlatform.isMusl ''
		LDFLAGS="$OLD_LDFLAGS"
		unset OLD_LDFLAGS

+2 −2

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

		stdenvNoCC.mkDerivation rec {
		pname = "kubectl-node-shell";
		version = "1.8.1";
		version = "1.10.1";

		src = fetchFromGitHub {
		owner = "kvaps";
		repo = "kubectl-node-shell";
		rev = "v${version}";
		sha256 = "sha256-ZVLL++QTc4fvOTsFfaWVad/jj4EqPiZUpL7HsMb2AdE=";
		hash = "sha256-QG1YQH2qd4TBkH42z9htni4llL13sEoBXlih4yc8r4w=";
		};

		strictDeps = true;