Unverified Commit 828ab020 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 54d6f5d7 d87f2208

doc/hooks/postgresql-test-hook.section.md

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ Bash-only variables: 
 - `postgresqlTestSetupCommands`: bash commands to run after database start, defaults to running `$postgresqlTestSetupSQL` as database administrator.

 - `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended.

 - `postgresqlStartCommands`: defaults to `pg_ctl start`.

 - `postgresqlExtraSettings`: Additional configuration to add to `postgresql.conf`



## Hooks {#sec-postgresqlTestHook-hooks}

pkgs/applications/misc/tuba/default.nix

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


stdenv.mkDerivation rec {

  pname = "tuba";

  version = "0.6.2";

  version = "0.6.3";

  src = fetchFromGitHub {

    owner = "GeopJr";

    repo = "Tuba";

    rev = "v${version}";

    hash = "sha256-SRK3I4sKJEaWBNs9VOs7Bhth/7gxybWpXJTn4DiQi6U=";

    hash = "sha256-AdUXKiTMC/0R4RI9I9Y/x0mNwhtUEIBke4Mm9lu9CX8=";

  };



  nativeBuildInputs = [

pkgs/applications/networking/cloudflared/default.nix

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


buildGoModule rec {

  pname = "cloudflared";

  version = "2023.10.0";

  version = "2024.1.5";



  src = fetchFromGitHub {

    owner = "cloudflare";

    repo = "cloudflared";

    rev = "refs/tags/${version}";

    hash = "sha256-T+hxNvsckL8PAVb4GjXhnkVi3rXMErTjRgGxCUypwVA=";

    hash = "sha256-g7FUwEs/wEcX1vRgfoQZw+uMzx6ng3j4vFwhlHs6WKg=";

  };



  vendorHash = null;

pkgs/applications/networking/cluster/temporal-cli/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -17,16 +17,16 @@ let 


  tctl-next = buildGoModule rec {

    pname = "tctl-next";

    version = "0.10.7";

    version = "0.11.0";



    src = fetchFromGitHub {

      owner = "temporalio";

      repo = "cli";

      rev = "v${version}";

      hash = "sha256-pFVCy6xB7Fhj4OatyNQdjkDpDGtod2nJsg2vdl5ED9s=";

      hash = "sha256-sOmXLqc1O96/50A08b9Rlk5xlmqg2S+5nWachC74IV8=";

    };



    vendorHash = "sha256-mauaavG3oeUzMrBEiK85Tws++6V1WViczRFhyovUpB4=";

    vendorHash = "sha256-tZvzCQzYIIqoSefm4ty+RI7fFKWWw2OopYGGX8zS6JM=";



    inherit overrideModAttrs;

pkgs/applications/science/math/mathematica/generic.nix

+8 −2
Original line number Diff line number Diff line
@@ -56,7 +56,9 @@ let cudaEnv = symlinkJoin { 
        cuda_cudart cuda_nvcc libcublas libcufft libcurand libcusparse

      ];

      postBuild = ''

        if [ ! -e $out/lib/libcuda.so ]; then

            ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib

        fi

        ln -s lib $out/lib64

      '';

    };
@@ -119,7 +121,11 @@ in stdenv.mkDerivation { 
  ]) ++ lib.optional cudaSupport cudaEnv;



  wrapProgramFlags = [

    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib zlib ]}"

    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [

      dbus

      gcc-unwrapped.lib

      zlib

    ]}"

    "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}"

    # Fix libQt errors - #96490

    "--set USE_WOLFRAM_LD_LIBRARY_PATH 1"