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

Merge #233944: staging-next 2023-05-25

parents 9c1fd072 b21becc7

nixos/tests/nginx-http3.nix

+6 −6
Original line number Diff line number Diff line
@@ -76,19 +76,19 @@ in 
    server.wait_for_open_port(443)



    # Check http connections

    client.succeed("curl --verbose --http3 https://acme.test | grep 'Hello World!'")

    client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")



    # Check downloadings

    client.succeed("curl --verbose --http3 https://acme.test/example.txt --output /tmp/example.txt")

    client.succeed("curl --verbose --http3-only https://acme.test/example.txt --output /tmp/example.txt")

    client.succeed("cat /tmp/example.txt | grep 'Check http3 protocol.'")



    # Check header reading

    client.succeed("curl --verbose --http3 --head https://acme.test | grep 'content-type'")

    client.succeed("curl --verbose --http3 --head https://acme.test | grep 'HTTP/3 200'")

    client.succeed("curl --verbose --http3 --head https://acme.test/error | grep 'HTTP/3 404'")

    client.succeed("curl --verbose --http3-only --head https://acme.test | grep 'content-type'")

    client.succeed("curl --verbose --http3-only --head https://acme.test | grep 'HTTP/3 200'")

    client.succeed("curl --verbose --http3-only --head https://acme.test/error | grep 'HTTP/3 404'")



    # Check change User-Agent

    client.succeed("curl --verbose --http3 --user-agent 'Curl test 3.0' https://acme.test")

    client.succeed("curl --verbose --http3-only --user-agent 'Curl test 3.0' https://acme.test")

    server.succeed("cat /var/log/nginx/access.log | grep 'Curl test 3.0'")



    server.shutdown()

pkgs/applications/editors/vim/common.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub }:

rec {

  version = "9.0.1441";

  version = "9.0.1562";



  src = fetchFromGitHub {

    owner = "vim";

    repo = "vim";

    rev = "v${version}";

    hash = "sha256-tGWOIXx4gNMg0CB4ytUrj9bQLXw+4pl2lfgGR81+EJk=";

    hash = "sha256-+QKh3CxSjwcJ+Rj9RHYHRKSZixkfA1ZCAPDIyV/Npt8=";

  };



  enableParallelBuilding = true;

pkgs/applications/terminal-emulators/xterm/default.nix

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


stdenv.mkDerivation rec {

  pname = "xterm";

  version = "379";

  version = "380";



  src = fetchurl {

    urls = [

      "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"

      "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"

    ];

    hash = "sha256-p93ydO6EuX+xKDZ1AJ1Tyi0CoP/VzlpRGNr8NiPrsxA=";

    hash = "sha256-DB3B+oAPpktcWNFt25BecAsnylOKZb6MA7K6V2EQbDg=";

  };



  strictDeps = true;

pkgs/build-support/remove-references-to/remove-references-to.sh

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ done 


for region in "${regions[@]}"; do

    for hook in "${fixupHooks[@]}"; do

        eval "$hook" "$i"

        eval "$hook" "$region"

    done

done

pkgs/development/compilers/gcc/common/pre-configure.nix

+6 −2
Original line number Diff line number Diff line
@@ -77,8 +77,12 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' 
#  - If GCC allowed implicit declaration of symbols, it would not fail during

#    compilation even if the configure scripts did not check header presence.

#

+ lib.optionalString (hostPlatform.isDarwin) ''

  export ac_cv_func_aligned_alloc=no

+ lib.optionalString (buildPlatform.isDarwin) ''

    export build_configargs=ac_cv_func_aligned_alloc=no

'' + lib.optionalString (hostPlatform.isDarwin) ''

    export host_configargs=ac_cv_func_aligned_alloc=no

'' + lib.optionalString (targetPlatform.isDarwin) ''

    export target_configargs=ac_cv_func_aligned_alloc=no

''



# In order to properly install libgccjit on macOS Catalina, strip(1)