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

Merge master into staging-next

parents 1bb28556 f03d4e0e

nixos/lib/make-squashfs.nix

+3 −1
Original line number Diff line number Diff line 
{ stdenv, squashfsTools, closureInfo

{ lib, stdenv, squashfsTools, closureInfo



, # The root directory of the squashfs filesystem is filled with the

  # closures of the Nix store paths listed here.
@@ -22,11 +22,13 @@ stdenv.mkDerivation { 
      # for nix-store --load-db.

      cp $closureInfo/registration nix-path-registration



    '' + lib.optionalString stdenv.buildPlatform.is32bit ''

      # 64 cores on i686 does not work

      # fails with FATAL ERROR: mangle2:: xz compress failed with error code 5

      if ((NIX_BUILD_CORES > 48)); then

        NIX_BUILD_CORES=48

      fi

    '' + ''



      # Generate the squashfs image.

      mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \

pkgs/applications/audio/faust/faust2alqt.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
, alsa-lib

, qtbase

, writeText

, makeWrapper

, buildPackages

}:

let

  # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH

  wrapBinary = writeText "wrapBinary" ''

    source ${makeWrapper}/nix-support/setup-hook

    source ${buildPackages.makeWrapper}/nix-support/setup-hook

    for p in $FILES; do

      workpath=$PWD

      cd -- "$(dirname "$p")"

pkgs/applications/audio/faust/faust2jaqt.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 
, libsndfile

, alsa-lib

, writeText

, makeWrapper

, buildPackages

, which

}:

let

  # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH

  wrapBinary = writeText "wrapBinary" ''

    source ${makeWrapper}/nix-support/setup-hook

    source ${buildPackages.makeWrapper}/nix-support/setup-hook

    for p in $FILES; do

      workpath=$PWD

      cd -- "$(dirname "$p")"

pkgs/applications/audio/furnace/default.nix

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


stdenv.mkDerivation rec {

  pname = "furnace";

  version = "0.6pre7";

  version = "0.6pre8";



  src = fetchFromGitHub {

    owner = "tildearrow";

    repo = "furnace";

    rev = "v${version}";

    fetchSubmodules = true;

    sha256 = "sha256-Gr4XDfYaRUFdtnCJ6i0oRDszwAZYVW6Mbj4Sp7El5+8=";

    sha256 = "sha256-kV3XlZAVkb+SfGqBi7I7Br58zjSAfh4kiUk2KCcXnFA=";

  };



  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ 
let

  gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";

in

vscode-utils.buildVscodeMarketplaceExtension rec {

vscode-utils.buildVscodeMarketplaceExtension {

  mktplcRef = {

    name = "cpptools";

    publisher = "ms-vscode";

    version = "1.11.0";

    sha256 = "c0725d3914aeb2515627691727455cc27e7a75031fa02ca957be02cc210bd64d";

    version = "1.17.3";

    sha256 = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg=";

    arch = "linux-x64";

  };