Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-01-12 12:34:36 +00:00 committed by GitHub
commit f1bb6c74f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 22 deletions

View file

@ -37,7 +37,7 @@ buildGoPackage rec {
preBuild = let
tags = optional pamSupport "pam"
++ optional sqliteSupport "sqlite";
++ optional sqliteSupport "sqlite sqlite_unlock_notify";
tagsString = concatStringsSep " " tags;
in ''
export buildFlagsArray=(

View file

@ -76,7 +76,7 @@ let result = stdenv.mkDerivation rec {
i686-linux = "linux-i586";
x86_64-linux = "linux-x64";
armv7l-linux = "linux-arm32-vfp-hflt";
aarch64-linux = "linux-arm64-vfp-hflt";
aarch64-linux = "linux-aarch64";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
in requireFile {
name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";

View file

@ -1,10 +1,10 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "261";
sha256.i686-linux = "1bl12hd5i53m8d4j8rwkk3bavmzw0ndr88ch5lf5syi7vs5pfjpm";
sha256.x86_64-linux = "0d7a92csz8ws5h0pzqmrxq3sz286s57vw0dqq3ciwsqz14df012s";
sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9";
sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n";
patchVersion = "271";
sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0=";
sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg=";
sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM=";
sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I=";
jceName = "jce_policy-8.zip";
sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w";
}

View file

@ -1,9 +1,8 @@
{ stdenv, fetchurl, xercesc }:
let
fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "xsd";
version = "4.0.0";
@ -14,20 +13,22 @@ stdenv.mkDerivation {
patches = [ ./xsdcxx.patch ];
configurePhase = ''
postPatch = ''
patchShebangs .
'';
buildPhase = ''
make ${fixed_paths}
'';
enableParallelBuilding = true;
buildFlags = [
"LDFLAGS=-L${xercesc}/lib"
"CPPFLAGS=-I${xercesc}/include"
];
installFlags = buildFlags ++ [
"install_prefix=${placeholder "out"}"
];
buildInputs = [ xercesc ];
installPhase = ''
make ${fixed_paths} install_prefix="$out" install
'';
meta = {
homepage = "http://www.codesynthesis.com/products/xsd";
description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler";

View file

@ -4,7 +4,7 @@ buildDunePackage rec {
pname = "ppx_gen_rec";
version = "1.1.0";
minimumOCamlVersion = "4.01";
useDune2 = true;
src = fetchurl {
url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";

View file

@ -85,7 +85,6 @@ in buildPythonPackage rec {
doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
pytestFlagsArray = [
"$out/${python.sitePackages}/pandas"
"--skip-slow"
"--skip-network"
];
@ -120,7 +119,10 @@ in buildPythonPackage rec {
"test_clipboard"
];
# tests have relative paths, and need to reference compiled C extensions
# so change directory where `import .test` is able to be resolved
preCheck = ''
cd $out/${python.sitePackages}/pandas
export LC_ALL="en_US.UTF-8"
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
''

View file

@ -5,14 +5,14 @@
}:
buildPythonPackage rec {
version = "1.3.1";
version = "1.4.1";
pname = "xmlschema";
src = fetchFromGitHub {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
sha256 = "08p6fm15600h40r5h7f3gfv34cys481f89pf57dv3y8gf6y2if56";
sha256 = "1yd7whf74z8bw99gldxlnrs8bjnjzald29b5cf2ka0i144sxbvad";
};
propagatedBuildInputs = [ elementpath ];

View file

@ -61,6 +61,12 @@ sub runConfig {
# Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)").
if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) {
$choices{$2} = $1;
} else {
# The list of choices has ended without us being
# asked. This happens for options where only one value
# is valid, for instance. The results can foul up
# later options, so forget about it.
%choices = ();
}
$line = "";

View file

@ -25469,7 +25469,9 @@ in
xrgears = callPackage ../applications/graphics/xrgears { };
xsd = callPackage ../development/libraries/xsd { };
xsd = callPackage ../development/libraries/xsd {
stdenv = gcc9Stdenv;
};
xscope = callPackage ../applications/misc/xscope { };