Unverified Commit 741df4d6 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

various: switch buildRustPackage packages to finalAttrs pattern (#492928)

parents 1a0fccf8 3f9a09b8
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@
  nix-update-script,
}:

rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "amdgpu_top";
  version = "0.11.2";

  src = fetchFromGitHub {
    owner = "Umio-Yasuno";
    repo = "amdgpu_top";
    tag = "v${version}";
    tag = "v${finalAttrs.version}";
    hash = "sha256-yw73bKO91O05WBQNwjcQ+AqxYgGXXC7XJzUnMx5/IWc=";
  };

@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
  '';

  postFixup = ''
    patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/${pname}
    patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.meta.mainProgram}
  '';

  passthru.updateScript = nix-update-script { };
@@ -62,4 +62,4 @@ rustPlatform.buildRustPackage rec {
    platforms = lib.platforms.linux;
    mainProgram = "amdgpu_top";
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@
  rustPlatform,
}:

rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ansi-escape-sequences-cli";
  version = "0.2.2";

  src = fetchCrate {
    inherit pname version;
    inherit (finalAttrs) pname version;
    hash = "sha256-55CdEw1bVgabWRbZIRe9jytwDf70Y92nITwDRQaTXaQ=";
  };

@@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec {
    maintainers = with lib.maintainers; [ phip1611 ];
    mainProgram = "ansi";
  };
}
})
+4 −4
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@
  pkg-config,
}:

rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "apkeep";
  version = "0.18.0";

  src = fetchCrate {
    inherit pname version;
    inherit (finalAttrs) pname version;
    hash = "sha256-Sk8CQaMXtPPJh2nGgGthyzuvkVViQ0jtqPjAqo2dtpg=";
  };

@@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec {
  meta = {
    description = "Command-line tool for downloading APK files from various sources";
    homepage = "https://github.com/EFForg/apkeep";
    changelog = "https://github.com/EFForg/apkeep/blob/${version}/CHANGELOG.md";
    changelog = "https://github.com/EFForg/apkeep/blob/${finalAttrs.version}/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = [ ];
    mainProgram = "apkeep";
  };
}
})
+4 −4
Original line number Diff line number Diff line
@@ -4,17 +4,17 @@
  rustPlatform,
}:

rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "asahi-bless";
  version = "0.4.1";

  src = fetchCrate {
    inherit pname version;
    inherit (finalAttrs) pname version;
    hash = "sha256-SNaA+CEuCBwo4c54qWGs5AdkBYb9IWY1cQ0dRd/noe8=";
  };

  cargoHash = "sha256-nfSJ9RkzFAWlxlfoUKk8ZmIXDJXoSyHCGgRgMy9FDkw=";
  cargoDepsName = pname;
  cargoDepsName = finalAttrs.pname;

  meta = {
    description = "Tool to select active boot partition on ARM Macs";
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
    mainProgram = "asahi-bless";
    platforms = lib.platforms.linux;
  };
}
})
+4 −4
Original line number Diff line number Diff line
@@ -4,17 +4,17 @@
  rustPlatform,
}:

rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "asahi-btsync";
  version = "0.2.0";

  src = fetchCrate {
    inherit pname version;
    inherit (finalAttrs) pname version;
    hash = "sha256-jp05WcwY1cWh4mBQj+3jRCZoG32OhDvTB84hOAGemX8=";
  };

  cargoHash = "sha256-gGWhi0T7xDIsbzfw/KL3TSneLvQaiz/2xbpHeZt1i3I=";
  cargoDepsName = pname;
  cargoDepsName = finalAttrs.pname;

  meta = {
    description = "Tool to sync Bluetooth pairing keys with macos on ARM Macs";
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
    mainProgram = "asahi-btsync";
    platforms = lib.platforms.linux;
  };
}
})
Loading