Unverified Commit 3316672a authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #306940 from avdv/bazel_6.5.0-aftermath 

bazel_6: Upgrade dependent packages after 6.4.0 -> 6.5.0
parents b5347a59 62406d31

pkgs/by-name/pe/perf_data_converter/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ buildBazelPackage rec { 
  ];



  fetchAttrs = {

    sha256 = "sha256-IauQ4zEn9YHppLgW+4XjPv4N5IZlEkp//tE/Dy7k28s=";

    sha256 = "sha256-Qm6Ng9cXvKx043P7qyNHyyMvdGK9aNarX1ZKeCp3mgY=";

  };



  nativeBuildInputs = [ jdk ];

pkgs/by-name/pr/protoc-gen-js/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ buildBazelPackage rec { 


  LIBTOOL = lib.optionalString stdenv.isDarwin "${darwin.cctools}/bin/libtool";



  fetchAttrs.sha256 = "sha256-H0zTMCMFct09WdR/mzcs9FcC2OU/ZhGye7GAkx4tGa8=";

  fetchAttrs.sha256 = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ=";



  buildAttrs.installPhase = ''

    mkdir -p $out/bin

pkgs/development/python-modules/jaxlib/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -364,10 +364,10 @@ let 
      ];



      sha256 = (if cudaSupport then {

        x86_64-linux = "sha256-IEKoHjCOtKZKvU/DUUjbvXldORFJuyO1R3F6CZZDXxM=";

        x86_64-linux = "sha256-8JilAoTbqOjOOJa/Zc/n/quaEDcpdcLXCNb34mfB+OM=";

      } else {

        x86_64-linux = "sha256-IE4+Tk4llo85u3NjakvY04tPw4R1bidyecPpQ4gknR8=";

        aarch64-linux = "sha256-NehnpA4m+Fynvh0S6WKy/v9ab81487NE9ahvbS70wjY=";

        x86_64-linux = "sha256-iqS+I1FQLNWXNMsA20cJp7YkyGUeshee5b2QfRBNZtk=";

        aarch64-linux = "sha256-qmJ0Fm/VGMTmko4PhKs1P8/GLEJmVxb8xg+ss/HsakY==";

      }).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}");

    };

pkgs/development/python-modules/tensorflow-probability/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ let 
    LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";



    fetchAttrs = {

      sha256 = "sha256-1iO/eXz1wvSIRTmGuGZDF9VeDVTiWYnjw0Cby4n/6HM=";

      sha256 = "sha256-TbWcWYidyXuAMgBnO2/k0NKCzc4wThf2uUeC3QxdBJY=";

    };



    buildAttrs = {
@@ -75,7 +75,8 @@ let 
      '';

    };

  };

in buildPythonPackage {

in

buildPythonPackage {

  inherit version pname;

  format = "wheel";

pkgs/servers/http/envoy/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ let 


  # these need to be updated for any changes to fetchAttrs

  depsHash = {

    x86_64-linux = "sha256-Pj176fQts/H+BlzsVkx+OlUF+4+GHutnNZ5f+eagMmk=";

    aarch64-linux = "sha256-5El0WOYTLiBKhYxRXKJFv1m2M8jZlN1cYrJDnRX2wYs=";

    x86_64-linux = "sha256-S2qfgaKyBSgCU6CkhLwezbgVqqqaFYAHQMCbYjwYRxY=";

    aarch64-linux = "sha256-Ge6qfzjwdh9078LE5k9hqFMKx7yc2buoYOpB9IIBS/s=";

  }.${stdenv.system} or (throw "unsupported system ${stdenv.system}");

in

buildBazelPackage {