various: use only finalAttrs everywhere where finalAttrs and rec was used at the same time (d55f87e3) · Commits · nix / nixpkgs

pkgs/by-name/bi/bisq2/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ let
		libv4l
		];
		in
		stdenv.mkDerivation (finalAttrs: rec {
		stdenv.mkDerivation (finalAttrs: {
		inherit version;

		pname = "bisq2";
		@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: rec {
		export GNUPGHOME=./gnupg
		mkdir -m 700 -p $GNUPGHOME
		ln -s $downloadedFile ./Bisq-${version}.deb
		ln -s ${signature} ./signature.asc
		ln -s ${finalAttrs.signature} ./signature.asc
		gpg --import ${publicKey."E222AA02"}
		gpg --import ${publicKey."387C8307"}
		gpg --batch --verify signature.asc Bisq-${version}.deb

+6 −6

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		useLLD ? stdenv.hostPlatform.isArmv7,
		}:

		buildGoModule (finalAttrs: rec {
		buildGoModule (finalAttrs: {
		pname = "grafana-alloy";
		version = "1.12.2";
		src = fetchFromGitHub {
		@@ -32,10 +32,10 @@ buildGoModule (finalAttrs: rec {

		frontend = buildNpmPackage {
		pname = "alloy-frontend";
		inherit version src;
		inherit (finalAttrs) version src;

		inherit npmDeps;
		sourceRoot = "${src.name}/internal/web/ui";
		inherit (finalAttrs) npmDeps;
		sourceRoot = "${finalAttrs.src.name}/internal/web/ui";

		installPhase = ''
		runHook preInstall
		@@ -88,7 +88,7 @@ buildGoModule (finalAttrs: rec {

		patchPhase = ''
		# Copy frontend build in
		cp -va "${frontend}/share" "internal/web/ui/dist"
		cp -va "${finalAttrs.frontend}/share" "internal/web/ui/dist"
		'';

		subPackages = [
		@@ -135,7 +135,7 @@ buildGoModule (finalAttrs: rec {
		];
		};
		# for nix-update to be able to find and update the hash
		inherit npmDeps;
		inherit (finalAttrs) npmDeps;
		};

		meta = {

+2 −2

Original line number	Diff line number	Diff line
		@@ -12,14 +12,14 @@
		cacert,
		}:

		rustPlatform.buildRustPackage (finalAttrs: rec {
		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "hydra-check";
		version = "2.0.5";

		src = fetchFromGitHub {
		owner = "nix-community";
		repo = "hydra-check";
		tag = "v${version}";
		tag = "v${finalAttrs.version}";
		hash = "sha256-rOqLAI0r11Tfi6crKAxnj/HHBgUKcCGb4MCdxqLv4uE=";
		};

+4 −4

Original line number	Diff line number	Diff line
		@@ -32,13 +32,13 @@
		libxcb,
		zlib,
		}:
		stdenv.mkDerivation (finalAttrs: rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "ida-free";
		version = "9.2";

		src = requireFile {
		name = "ida-free-pc_${lib.replaceStrings [ "." ] [ "" ] version}_x64linux.run";
		url = "https://my.hex-rays.com/dashboard/download-center/installers/release/${version}/ida-free";
		name = "ida-free-pc_${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}_x64linux.run";
		url = "https://my.hex-rays.com/dashboard/download-center/installers/release/${finalAttrs.version}/ida-free";
		hash = "sha256-CQm9phkqLXhht4UQxooKmhmiGuW3lV8RIJuDrm52aNw=";
		};

		@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: rec {
		libxcb-cursor
		zlib
		];
		buildInputs = runtimeDependencies;
		buildInputs = finalAttrs.runtimeDependencies;

		# IDA comes with its own Qt6, some dependencies are missing in the installer.
		autoPatchelfIgnoreMissingDeps = [

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,13 +66,13 @@ let
		platforms = lib.platforms.all;
		};
		});
		streamvbyte = stdenv.mkDerivation (finalAttrs: rec {
		streamvbyte = stdenv.mkDerivation (finalAttrs: {
		pname = "streamvbyte";
		version = "efdd9dace81a4a8f844267631879b500c6d913cf"; # see SVB_GITHUB in columnar's cmake/GetStreamvbyte.cmake
		src = fetchFromGitHub {
		owner = "manticoresoftware";
		repo = "streamvbyte";
		rev = version;
		rev = finalAttrs.version;
		hash = "sha256-a9E1aWBY/P7wI+kgHqhEiD3THctFfeFcy658RcNpHfQ=";
		};
		nativeBuildInputs = [