Unverified Commit aea9ac7a authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

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

treewide: fix uses of `finalAttrs.pname` in urls
parents ff0610c7 96031e8d

pkgs/applications/networking/pjsip/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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=";

pkgs/development/compilers/yosys/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/development/libraries/hidapi/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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=";

  };

pkgs/development/libraries/unixODBCDrivers/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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";

pkgs/tools/backup/percona-xtrabackup/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

  };