diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index b267dee36909..f27a57012366 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -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="; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index f90b7b31bbcd..5061dda5ac3d 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -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; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 5f698794abf3..05b915efb8f9 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -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="; }; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 7e4a8b4f6cce..641d051c1c32 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -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"; diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 6a6906cba33c..d81dee6f97f6 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -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; }; diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 6579b7e160de..b4e6db869a34 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -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 ]; }; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 09138dada763..f0bc89d466f5 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -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="; };