Merge pull request #329451 from eclairevoyant/pname-misuse-pt-1.2

treewide: fix uses of `finalAttrs.pname` in urls
This commit is contained in:
Aleksana 2024-07-24 10:37:47 +08:00 committed by GitHub
commit aea9ac7add
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 12 additions and 12 deletions

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "2.14.1";
src = fetchFromGitHub {
owner = finalAttrs.pname;
owner = "pjsip";
repo = "pjproject";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";

View File

@ -80,7 +80,7 @@ in stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}";
rev = "refs/tags/yosys-${finalAttrs.version}";
hash = "sha256-MJTtQvHsHvuo4aNNYSPxSMbeXCty66q83/sbp1Yiiv4=";
fetchSubmodules = true;
leaveDotGit = true;

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "libusb";
repo = "hidapi";
rev = "${finalAttrs.pname}-${finalAttrs.version}";
rev = "hidapi-${finalAttrs.version}";
sha256 = "sha256-p3uzBq5VxxQbVuy1lEHEEQdxXwnhQgJDIyAAWjVWNIg=";
};

View File

@ -214,10 +214,10 @@
src = fetchurl {
url = {
x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_amd64.deb";
aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb";
x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz";
aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz";
x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_amd64.deb";
aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_arm64.deb";
x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-amd64.tar.gz";
aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-arm64.tar.gz";
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
hash = {
x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52";

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "percona";
repo = "percona-xtrabackup";
rev = "${finalAttrs.pname}-${finalAttrs.version}";
rev = "percona-xtrabackup-${finalAttrs.version}";
inherit hash fetchSubmodules;
};

View File

@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "VK-GL-CTS";
rev = "${finalAttrs.pname}-${finalAttrs.version}";
rev = "vulkan-cts-${finalAttrs.version}";
hash = "sha256-JCepNBVHaN4KXRcLOZ2z7toBMri90tV7kjNWHRXRESE=";
};
@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Khronos Vulkan Conformance Tests";
homepage = "https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/vulkancts/README.md";
changelog = "https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/${finalAttrs.pname}-${finalAttrs.version}";
changelog = "https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-${finalAttrs.version}";
license = licenses.asl20;
maintainers = with maintainers; [ Flakebi ];
};

View File

@ -14,8 +14,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
urls = [
"https://astron.com/pub/file/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"
"https://distfiles.macports.org/file/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"
"https://astron.com/pub/file/file-${finalAttrs.version}.tar.gz"
"https://distfiles.macports.org/file/file-${finalAttrs.version}.tar.gz"
];
hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI=";
};