Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-27 06:01:01 +00:00 committed by GitHub
commit 4fc4793298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 83 additions and 41 deletions

View file

@ -1,28 +1,18 @@
{ lib
, fetchFromGitHub
, fetchpatch
, buildPythonPackage
, astunparse
}:
buildPythonPackage rec {
pname = "gast";
version = "0.5.0";
# TODO: remove this patch on the next release, this fixes a bug with parsing
# assignment expressions e.g., `x := 1`.
patches = [
(fetchpatch {
url = "https://github.com/serge-sans-paille/gast/commit/3cc9b4d05a80e4bb42882de00df314aaa1e6e591.patch";
sha256 = "0ylpn0x0a4y6139vd048blsh77yd08npjcn4b5ydf89xnji5mlm1";
})
];
version = "0.5.1";
src = fetchFromGitHub {
owner = "serge-sans-paille";
repo = "gast";
rev = version;
sha256 = "0qsg36knv0k2ppzbr5m4w6spxxw7a77lw88y8vjx7m176bajnsbw";
sha256 = "1gph45frnj47lfr6idiyxrb3gk7vzc9rni9cijmcyz10dyx5kgwa";
};
checkInputs = [ astunparse ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE=";
sha256 = "sha256-eua+/bfKuIG1TuoC0tA4+O0H2D+u8AbcJIFLDIbzVYg=";
};
vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE=";
vendorSha256 = "sha256-+rr9TDRIYta0ejOE48O+nZDluvqvSTuGBpRBPZifazA=";
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.15";
version = "0.12.16";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-Ikt8kBkwI9AQrWp9j4Zaf+BqGVcyhyagBDjTGZm/dzQ=";
sha256 = "sha256-rDPjxr6gaaH55l72dMaZsGCxayM8Nodjn3fppydpjZk=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

View file

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.12";
version = "6.13";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "1a6fnxb4rci310m0wjcs9cnmpj88775q70qk7xi3k06z1qqbx4pv";
sha256 = "sha256-4DohoBHUXSrp8iIED7dpC5cVY3bnQx+GHyAHPq8k8oo=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
@ -65,11 +65,10 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "1mg5yrw5jk2nbdp9mcqc3iar01lr76lmm1py95wify9p2bqzavpp";
sha256 = "sha256-3IpO+eQ/+DiQZH6en5Q/p+j441LDvjn4i9Ex7PY8KCk=";
owner = "wine-staging";
repo = "wine-staging";
# Replace back on next release: rev = "v${version}";
rev = "v6.12.1";
rev = "v${version}";
disabledPatchsets = [ ];
};

View file

@ -1,5 +1,18 @@
{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq
, shellcheck, moreutils, racket-minimal, clojure-lsp
{ config
, lib
, buildEnv
, callPackage
, vscode-utils
, asciidoctor
, nodePackages
, jdk
, llvmPackages_8
, nixpkgs-fmt
, jq
, shellcheck
, moreutils
, racket-minimal
, clojure-lsp
}:
let
@ -172,12 +185,10 @@ let
version = "0.0.1";
sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";
};
nativeBuildInputs = [ jq ];
nativeBuildInputs = [ jq moreutils ];
postInstall = ''
cd "$out/$installPrefix"
tmp_package_json=$(mktemp)
jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json > "$tmp_package_json"
mv "$tmp_package_json" package.json
jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json
'';
meta = with lib; {
license = licenses.mit;
@ -533,14 +544,6 @@ let
};
eugleo.magic-racket = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
description = "The best coding experience for Racket in VS Code ";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
homepage = "https://github.com/Eugleo/magic-raket";
license = licenses.agpl3Only;
};
mktplcRef = {
name = "magic-racket";
publisher = "evzen-wybitul";
@ -552,6 +555,13 @@ let
cd "$out/$installPrefix"
jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json
'';
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
description = "The best coding experience for Racket in VS Code ";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
homepage = "https://github.com/Eugleo/magic-racket";
license = licenses.agpl3Only;
};
};
file-icons.file-icons = buildVscodeMarketplaceExtension {
@ -1330,12 +1340,10 @@ let
version = "0.14.4";
sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m";
};
nativeBuildInputs = [ jq ];
nativeBuildInputs = [ jq moreutils ];
postInstall = ''
cd "$out/$installPrefix"
tmp_package_json=$(mktemp)
jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json > "$tmp_package_json"
mv "$tmp_package_json" package.json
jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json
'';
meta = {
license = lib.licenses.mit;

View file

@ -21,7 +21,10 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
patches = [ ./pipelight.patch ];
patches = [
./pipelight.patch
./wine-6.13-new-args.patch
];
configurePhase = ''
patchShebangs .

View file

@ -0,0 +1,42 @@
diff --git a/src/windows/pluginloader/apihook.c b/src/windows/pluginloader/apihook.c
index 80bf726..6b80f70 100644
--- a/src/windows/pluginloader/apihook.c
+++ b/src/windows/pluginloader/apihook.c
@@ -42,7 +42,9 @@
#include "common/common.h"
#include "pluginloader.h"
+#define new cnew
#include <windows.h> // for PVOID and other types
+#undef new
#include <string.h> // for memset
void* patchDLLExport(PVOID ModuleBase, const char* functionName, void* newFunctionPtr){
diff --git a/src/windows/pluginloader/npnfunctions.c b/src/windows/pluginloader/npnfunctions.c
index e4e38aa..19f29d5 100644
--- a/src/windows/pluginloader/npnfunctions.c
+++ b/src/windows/pluginloader/npnfunctions.c
@@ -41,7 +41,9 @@
#include "common/common.h"
#include "pluginloader.h"
+#define new cnew
#include <windows.h>
+#undef new
/* Shockwave sometimes calls the function with a wrong instance? Is this a wine bug? */
NPP shockwaveInstanceBug = NULL;
diff --git a/src/windows/pluginloader/pluginloader.c b/src/windows/pluginloader/pluginloader.c
index 8f1170a..99dbceb 100644
--- a/src/windows/pluginloader/pluginloader.c
+++ b/src/windows/pluginloader/pluginloader.c
@@ -50,7 +50,9 @@
#include "pluginloader.h"
#include "apihook.h"
+#define new cnew
#include <windows.h>
+#undef new
#include <objbase.h> // for CoInitializeEx
#include <GL/gl.h>