public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-11-11 12:09:26 +01:00
parent 539e94030c cf27abf534
commit 73b88e17dd
442 changed files with 23507 additions and 19144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/io/default.nix
+1 -1
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [
raskin
z77z
maggesi
vrthra
];
platforms = [ "x86_64-linux" ];
pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch → pkgs/development/interpreters/lua-5/CVE-2014-5461.patch
View File
pkgs/development/interpreters/lua-5/default.nix
+1 -1
View File
@@ -49,7 +49,7 @@ in rec {
sourceVersion = { major = "5"; minor = "1"; patch = "5"; };
hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch51 ])
++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
++ [ ./CVE-2014-5461.patch ];
};
luajit_2_0 = import ../luajit/2.0.nix {
pkgs/development/interpreters/renpy/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@ with pythonPackages;
stdenv.mkDerivation rec {
pname = "renpy";
version = "7.3.3";
version = "7.3.5";
meta = with stdenv.lib; {
description = "Ren'Py Visual Novel Engine";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
sha256 = "0wwsm0vg6zd07xmkqrqprymahdl4ifg7bc1lpbrh0qlfs1pvjlss";
sha256 = "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4";
};
patches = [
pkgs/development/interpreters/wasmtime/cargo-lock.patch
+1229 -656
View File
File diff suppressed because it is too large Load Diff
pkgs/development/interpreters/wasmtime/default.nix
+7 -7
View File
@@ -1,24 +1,24 @@
{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }:
{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }:
rustPlatform.buildRustPackage {
pname = "wasmtime";
version = "20190521";
version = "20191018";
src = fetchFromGitHub {
owner = "CraneStation";
repo = "wasmtime";
rev = "e530a582afe6a2b5735fd7cdf5e2e88391e58669";
sha256 = "13lqf9dp1cnw7ms7hcgirmlfkr0v7nrn3p5g7yacfasrqgnwsyl8";
rev = "ebef2c6b5720fce164af9ded8b7ff3dd5d7e041c";
sha256 = "15wa0by7lb90qd6fg8i2v1hw7hgbkrh1rqhrf7z850c9ydah6n13";
fetchSubmodules = true;
};
cargoSha256 = "1jbpq09czm295316gdv3y0pfapqs0ynj3qbarwlnrv7valq5ak13";
cargoSha256 = "07qz6wl32j6gzc9nxv0dr7y6ixmzbzv5j1flkrysdrfidxlldn9k";
cargoPatches = [ ./cargo-lock.patch ];
nativeBuildInputs = [ python cmake clang ];
buildInputs = [ llvmPackages.libclang ];
buildInputs = [ llvmPackages.libclang ] ++
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
meta = with lib; {