Unverified Commit 951fbc38 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'staging' into staging-next

parents 7609b09e e0d185ce

pkgs/development/interpreters/python/hooks/pip-install-hook.sh

+1 −3
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ pipInstallPhase() { 
    mkdir -p "$out/@pythonSitePackages@"

    export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"



    pushd dist || return 1

    @pythonInterpreter@ -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags

    popd || return 1

    @pythonInterpreter@ -m pip install $pname --find-links dist --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags



    runHook postInstall

    echo "Finished executing pipInstallPhase"

pkgs/development/interpreters/ruby/default.nix

+16 −3
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ let 
  config = import ./config.nix { inherit fetchFromSavannah; };

  rubygems = import ./rubygems { inherit stdenv lib fetchurl; };



  openssl3Gem = fetchFromGitHub {

    owner = "ruby";

    repo = "openssl";

    rev = "v3.0.2";

    hash = "sha256-KhuKRP1JkMJv7CagGRQ0KKGOd5Oh0FP0fbj0VZ4utGo=";

  };



  # Contains the ruby version heuristics

  rubyVersion = import ./ruby-version.nix { inherit lib; };
@@ -84,8 +91,8 @@ let 
          ++ (op fiddleSupport libffi)

          ++ (ops cursesSupport [ ncurses readline ])

          ++ (op zlibSupport zlib)

          ++ (op (!atLeast31 && opensslSupport) openssl_1_1)

          ++ (op (atLeast31 && opensslSupport) openssl)

          ++ (op (atLeast30 && opensslSupport) openssl)

          ++ (op (!atLeast30 && opensslSupport) openssl_1_1)

          ++ (op gdbmSupport gdbm)

          ++ (op yamlSupport libyaml)

          # Looks like ruby fails to build on darwin without readline even if curses
@@ -149,6 +156,12 @@ let 
          rm -rf $sourceRoot/{lib,test}/rubygems*

          cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib

          cp -r ${rubygems}/test/rubygems $sourceRoot/test

        '' + opString (ver.majMin == "3.0" && opensslSupport) ''

          # Replace the Gem by a OpenSSL3-compatible one.

          echo "Hotpatching the OpenSSL gem with a 3.x series for OpenSSL 3 support..."

          cp -vr ${openssl3Gem}/ext/openssl $sourceRoot/ext/

          cp -vr ${openssl3Gem}/lib/ $sourceRoot/ext/openssl/

          cp -vr ${openssl3Gem}/{History.md,openssl.gemspec} $sourceRoot/ext/openssl/

        '';



        postPatch = ''

pkgs/development/interpreters/ruby/rubygems/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


stdenv.mkDerivation rec {

  pname = "rubygems";

  version = "3.4.12";

  version = "3.4.13";



  src = fetchurl {

    url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";

    sha256 = "sha256-WFCnwvw4DN09pwShznuwSNQtSACTPfULiSAmW1hF4Vs=";

    sha256 = "sha256-s/7KCbf07zezuASA7E03t83UDY6W/fFw9bljOprXWls=";

  };



  patches = [

pkgs/development/libraries/grpc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


stdenv.mkDerivation rec {

  pname = "grpc";

  version = "1.54.0"; # N.B: if you change this, please update:

  version = "1.54.2"; # N.B: if you change this, please update:

    # pythonPackages.grpcio-tools

    # pythonPackages.grpcio-status
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec { 
    owner = "grpc";

    repo = "grpc";

    rev = "v${version}";

    hash = "sha256-WVH7rYyFx2LyAnctnNbX4KevoJ5KKZujN+SmL0Y6wvw=";

    hash = "sha256-OIRqH+h8Kjbw3X5slpdCfNN0f027WuvHG3q7KUuSWo8=";

    fetchSubmodules = true;

  };

pkgs/development/python-modules/grpcio-status/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ 


buildPythonPackage rec {

  pname = "grpcio-status";

  version = "1.54.0";

  version = "1.54.2";

  format = "setuptools";



  disabled = pythonOlder "3.6";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-tQMF1SwN9haUk8yl8uObm013Oz8w1Kemtt18GMuJAHw=";

    hash = "sha256-MlXL7Ft8cGyqPU3VhGBsCA5kFeFWMbsvYhXitwBVg20=";

  };



  postPatch = ''