Unverified Commit 39338c0b authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents d856e747 29998907

pkgs/by-name/go/goreleaser/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,16 +10,16 @@ 
}:

buildGo125Module rec {

  pname = "goreleaser";

  version = "2.12.1";

  version = "2.12.5";



  src = fetchFromGitHub {

    owner = "goreleaser";

    repo = "goreleaser";

    rev = "v${version}";

    hash = "sha256-OqtLj/SzzWiafTQCJWbisAscORnXfXJIkXhs8d7Cjgo=";

    hash = "sha256-EHJ1ARzk6BD5D121u+1UTe90oLOovKKD+LQWLIj81Jk=";

  };



  vendorHash = "sha256-o1DiFHrZhgRoKXKO/SOtaYeTkqmOYgJ8EJTJvOSwS1k=";

  vendorHash = "sha256-J/OwvPxC8wz/91sWWUBNkW5E71m8EPjTq3h/MOxT/3k=";



  ldflags = [

    "-s"

pkgs/development/libraries/qt-5/5.15/default.nix

+10 −0
Original line number Diff line number Diff line
@@ -65,6 +65,16 @@ let 
      ./qtdeclarative-default-disable-qmlcache.patch

      # add version specific QML import path

      ./qtdeclarative-qml-paths.patch

    ]

    # FIXME: Make unconditional on next staging cycle

    ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [

      # Fix an undefined behavior, and fix random-seeming build error with Clang. See:

      # - https://codereview.qt-project.org/c/qt/qtdeclarative/+/354847

      # - https://github.com/llvm/llvm-project/issues/74070

      (fetchpatch {

        url = "https://github.com/qt/qtdeclarative/commit/636481a31110f1819efaf6500b25fbc395854311.patch";

        hash = "sha256-ACOG3IjR0SIlLYioODGdhkNTGNvnKu6iOihsVdzyvgo=";

      })

    ];

    qtlocation = lib.optionals stdenv.cc.isClang [

      # Fix build with Clang 16

pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix

+2 −0
Original line number Diff line number Diff line 
# FIXME: Changed to arm64-apple-darwin in release.nix stdenvBootstrapTools, please handle when refreshing



# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:

# $ ./refresh-tarballs.bash --targets=aarch64-apple-darwin

#

pkgs/stdenv/darwin/test-bootstrap-tools.nix

+3 −2
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ derivation { 
    # The stdenv bootstrap builds the SDK in the bootstrap. Use an existing SDK to test the tools.

    export SDKROOT='${apple-sdk.sdkroot}'



    export flags="-idirafter $SDKROOT/usr/include --sysroot=$SDKROOT -L$SDKROOT/usr/lib -L$tools/lib -DTARGET_OS_IPHONE=0"

    export resource_dir="$(echo "$tools"/lib/clang/*)" # Expand wildcard

    export flags="-resource-dir=$resource_dir -idirafter $SDKROOT/usr/include --sysroot=$SDKROOT -L$SDKROOT/usr/lib -L$tools/lib -DTARGET_OS_IPHONE=0"



    export CPP="clang -E $flags"

    export CC="clang $flags"
@@ -77,7 +78,7 @@ derivation { 
    # using -Wl,-flat_namespace is required to generate an error

    mkdir libtest/

    ln -s $tools/lib/libc++.dylib libtest/

    clang++ -Wl,-flat_namespace -idirafter $SDKROOT/usr/include -isystem$tools/include/c++/v1 \

    clang++ -Wl,-flat_namespace -resource-dir=$resource_dir -idirafter $SDKROOT/usr/include -isystem$tools/include/c++/v1 \

      --sysroot=$SDKROOT -L$SDKROOT/usr/lib  -L./libtest -L$PWD/libSystem-boot hello3.cc



    tar xvf ${hello.src}

pkgs/top-level/release.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
  supportedSystems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),

  # The platform triples for which we build bootstrap tools.

  bootstrapConfigs ? [

    "aarch64-apple-darwin"

    "arm64-apple-darwin"

    "aarch64-unknown-linux-gnu"

    "aarch64-unknown-linux-musl"

    "i686-unknown-linux-gnu"