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

Merge #232237: staging-next 2023-05-16

parents 9c826022 6a414c5a

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/libraries/libcamera/default.nix

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


stdenv.mkDerivation rec {

  pname = "libcamera";

  version = "0.0.3";

  version = "0.0.5";



  src = fetchgit {

    url = "https://git.libcamera.org/libcamera/libcamera.git";

    rev = "v${version}";

    hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE=";

    hash = "sha256-rd1YIEosg4+H/FJBYCoxdQlV9F0evU5fckHJrSdVPOE=";

  };



  outputs = [ "out" "dev" "doc" ];

pkgs/development/libraries/pipewire/0060-libjack-path.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
diff --git a/src/modules/meson.build b/src/modules/meson.build

index 5d2dc9984..35f5773aa 100644

--- a/src/modules/meson.build

+++ b/src/modules/meson.build

@@ -169,6 +169,7 @@ if build_module_jack_tunnel

     install_dir : modules_install_dir,

     install_rpath: modules_install_dir,

     dependencies : [mathlib, dl_lib, pipewire_dep],

+    c_args: '-DNIXPKGS_LIBJACK_PATH="@0@"'.format(jack_dep.get_variable('libdir'))

   )

   build_module_jackdbus_detect = dbus_dep.found()

   if build_module_jackdbus_detect

diff --git a/src/modules/module-jack-tunnel/weakjack.h b/src/modules/module-jack-tunnel/weakjack.h

index 42580f798..e7aadd3cc 100644

--- a/src/modules/module-jack-tunnel/weakjack.h

+++ b/src/modules/module-jack-tunnel/weakjack.h

@@ -164,8 +164,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)

 

 		search_dirs = getenv("LIBJACK_PATH");

 		if (!search_dirs)

-			search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"

-				"/usr/lib64/:/usr/lib/:" LIBDIR;

+			search_dirs = NIXPKGS_LIBJACK_PATH;

 

 		while ((p = pw_split_walk(search_dirs, ":", &len, &state))) {

 			int pathlen;