Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-17 12:05:01 +00:00 committed by GitHub
commit b859981601
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 197 additions and 81 deletions

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
sha256 = "1m1ic69aj2vlnjlp4ckan8n67r01nfysvq4w6nny32wjkr0zvphr";
sha256 = "0npn45qbbsbzj5qy9kwx662hml1y610ysmfl89sda02l6wf1sp3y";
};
propagatedBuildInputs = with python3Packages; [

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "1.2.1";
version = "2.2.6";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HASFaPqm/A1QQ4nkd2hgeyqWplwE1RTrWA937rJA5Oo=";
sha256 = "sha256-9g6rkSDjE7x/YprPX0dkzqgpjgED5qBpUUQoVv6fGkk=";
};
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";

View file

@ -1,17 +1,26 @@
{ buildPythonApplication
{ stdenv
, lib
, buildPythonApplication
, fetchFromGitHub
, dateutil
, pyyaml
, pandas
, requests
, lxml
, openpyxl
, xlrd
, h5py
, fonttools
, lxml
, pandas
, psycopg2
, pyshp
, fonttools
, pyyaml
, pdfminer
, vobject
, tabulate
, wcwidth
, zstandard
, setuptools
, withPcap ? true, dpkt ? null, dnslib ? null
, git
, withPcap ? true, dpkt, dnslib
}:
buildPythonApplication rec {
pname = "visidata";
@ -25,19 +34,62 @@ buildPythonApplication rec {
};
propagatedBuildInputs = [
# from visidata/requirements.txt
# packages not (yet) present in nixpkgs are commented
dateutil
pyyaml
pandas
requests
lxml
openpyxl
xlrd
h5py
fonttools
lxml
pandas
psycopg2
pyshp
#mapbox-vector-tile
#pypng
fonttools
#sas7bdat
#xport
#savReaderWriter
pyyaml
#namestand
#datapackage
pdfminer
#tabula
vobject
tabulate
wcwidth
zstandard
setuptools
] ++ lib.optionals withPcap [ dpkt dnslib ];
doCheck = false;
checkInputs = [
git
];
# check phase uses the output bin, which is not possible when cross-compiling
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
checkPhase = ''
# disable some tests which require access to the network
rm tests/load-http.vd # http
rm tests/graph-cursor-nosave.vd # http
rm tests/messenger-nosave.vd # dns
# disable some tests which expect Python == 3.6 (not our current version)
# see https://github.com/saulpw/visidata/issues/1014
rm tests/describe.vd
rm tests/describe-error.vd
rm tests/edit-type.vd
# tests use git to compare outputs to references
git init -b "test-reference"
git config user.name "nobody"; git config user.email "no@where"
git add .; git commit -m "test reference"
substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd"
bash dev/test.sh
'';
meta = {
inherit version;

View file

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "92.0.4515.51",
"sha256": "0x9c5fy95wnri9z0s8pbwyq1lw684n7d70l1s2rp5yxh0snannxg",
"sha256bin64": "036km5dp7asq5n86qx7c9119mdch7sl89lhq1ffss0f4mzcq42yd",
"version": "92.0.4515.59",
"sha256": "0lpmd4sybr9qxqj7ab25xjliaw2dk9njnik51gdffrrwphv9qdxb",
"sha256bin64": "0qq9a3pzyn5d6bagx3py86ksl8n488lmlrmadgam2gb7421jq71a",
"deps": {
"gn": {
"version": "2021-05-07",

View file

@ -1,23 +1,19 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
version = "0.13.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lx+yp0ybgZfmxvPM2BY2yq39qA6XebcKGrFd0AJa4yg=";
sha256 = "sha256-Jm0ySxn4GFW4iAH3tOIvclcDGJMKzH7m7fhWnAf4+gs=";
};
vendorSha256 = "sha256-qoZUgSSr7jsDVVPBUyfN5Uw4CnH9EnD/4tX+TCSNV0Q=";
vendorSha256 = "sha256-IzmAlthE6SVvGHj72wrY1/KLehOv8Ck9VaTv5jMpt48=";
subPackages = [ "." ];
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.version=${version}")
'';
meta = with lib; {
description = "A utility to generate documentation from Terraform modules in various output formats";
homepage = "https://github.com/terraform-docs/terraform-docs/";

View file

@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.1.1";
version = "3.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "00f1rq80vya464dkvf3mzs9zpvkz15ki8srwg08snsm5kb7amwlm";
sha256 = "1bssk0jqspmsvr8kha9l5cslyhjvc50y30wdgavbca256lv75gh8";
};
nativeBuildInputs = [ installShellFiles pbr ];

View file

@ -4,13 +4,13 @@
with lib;
stdenv.mkDerivation rec {
pname = "ccextractor";
version = "0.88";
version = "0.89";
src = fetchFromGitHub {
owner = "CCExtractor";
repo = pname;
rev = "v${version}";
sha256 = "1sya45hvv4d46bk7541yimmafgvgyhkpsvwfz9kv6pm4yi1lz6nb";
sha256 = "sha256-847yt6pUTsDnVbrMQQPJ0pqu6UnKmYmr8UtR8+TP11A=";
};
sourceRoot = "source/src";

View file

@ -39,6 +39,7 @@ let
./read-truststore-from-env-jdk10.patch
./currency-date-range-jdk10.patch
./increase-javadoc-heap.patch
./fix-library-path-jdk11.patch
] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk10.patch
];

View file

@ -0,0 +1,37 @@
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 0dbe03349e..847d56778d 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -326,13 +326,13 @@ void os::init_system_properties_values() {
// ...
// 7: The default directories, normally /lib and /usr/lib.
#if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390)
- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
+ #define DEFAULT_LIBPATH ""
#else
- #define DEFAULT_LIBPATH "/lib:/usr/lib"
+ #define DEFAULT_LIBPATH ""
#endif
// Base path of extensions installed on the system.
-#define SYS_EXT_DIR "/usr/java/packages"
+#define SYS_EXT_DIR ""
#define EXTENSIONS_DIR "/lib/ext"
// Buffer that fits several sprintfs.
@@ -392,13 +392,13 @@ void os::init_system_properties_values() {
strlen(v) + 1 +
sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
mtInternal);
- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon);
+ sprintf(ld_library_path, "%s", v);
Arguments::set_library_path(ld_library_path);
FREE_C_HEAP_ARRAY(char, ld_library_path);
}
// Extensions directories.
- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home());
+ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home());
Arguments::set_ext_dirs(buf);
FREE_C_HEAP_ARRAY(char, buf);

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cgal";
version = "5.2.1";
version = "5.2.2";
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
sha256 = "sha256-sJyeehgt84rLX8ZBYIbFgHLG2aJDDHEj5GeVnQhjiOQ=";
sha256 = "sha256-DeTJAAY3OEu+pVazt5es1v3l1nGAfjvE0wQmYISRYoo=";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;

View file

@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "libslirp";
version = "4.5.0";
version = "4.6.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "slirp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UdKBED7xR0gDf3aj3+6I62CnAwGP7XxskaFzWeUUkkk=";
sha256 = "sha256-1Zp1+PW0WtNzRYIA87X42CJeSzVFhi5sGi9/rlUP4Vo=";
};
nativeBuildInputs = [ meson ninja pkg-config ];

View file

@ -1,26 +0,0 @@
diff --git a/meson.build b/meson.build
index 8b8ae8bb..e58c436c 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
# project definition
#
project('spice', 'c',
- version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(),
+ version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(),
license : 'LGPLv2.1',
meson_version : '>= 0.48')
diff --git a/server/meson.build b/server/meson.build
index 34d8eef1..988ccab2 100644
--- a/server/meson.build
+++ b/server/meson.build
@@ -7,7 +7,7 @@ version_info = meson.project_version().split('.')
major = '@0@'.format(version_info[0])
minor = '@0@'.format(version_info[1])
micro = version_info[2].to_int()
-if not version_info[3].contains('git')
+if not version_info.contains('git')
micro += 1
endif
micro = '@0@'.format(micro)

View file

@ -26,18 +26,13 @@
stdenv.mkDerivation rec {
pname = "spice";
version = "0.14.2";
version = "0.15.0";
src = fetchurl {
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2";
sha256 = "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj";
url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2";
sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k";
};
patches = [
# submitted https://gitlab.freedesktop.org/spice/spice/merge_requests/4
./correct-meson.patch
];
postPatch = ''
patchShebangs build-aux
'';

View file

@ -0,0 +1,11 @@
{ lib, buildDunePackage, cstruct, async_unix }:
buildDunePackage rec {
pname = "cstruct-async";
inherit (cstruct) src version meta useDune2;
propagatedBuildInputs = [
async_unix
cstruct
];
}

View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, isPy27
, fetchPypi
, aiohttp
, click
}:
buildPythonPackage rec {
pname = "aioazuredevops";
version = "1.3.5";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "4c98a995d0516f502ba191fa3ac973ee72b93425e7eab3cdf770516c6e93c780";
};
propagatedBuildInputs = [
aiohttp
click
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [
"aioazuredevops.builds"
"aioazuredevops.client"
"aioazuredevops.core"
];
meta = with lib; {
description = "Get data from the Azure DevOps API";
homepage = "https://github.com/timmo001/aioazuredevops";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -7,15 +7,20 @@
}:
buildPythonPackage rec {
version = "1.3.2";
version = "1.4.2";
pname = "strictyaml";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "637399fd80dccc95f5287b2606b74098b23c08031b7ec33c5afb314ccbf10948";
sha256 = "sha256-3bTk6AfdUQybx/xQ/I0Tae1pbtXMktSUtedSuoJ2paI=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "ruamel.yaml==0.17.4" "ruamel.yaml"
'';
propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
# Library tested with external tool

View file

@ -5,14 +5,14 @@
}:
buildPythonPackage rec {
version = "1.6.2";
version = "1.6.4";
pname = "xmlschema";
src = fetchFromGitHub {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
sha256 = "sha256-GL2PlHxKDSEsZwHPBAy+tjBSbKyvlbXUWwXakKPmzSs=";
sha256 = "sha256-0KVGu163t3stCgx7aWW/Ggf6CUW2ZhOOnPU6FfGHfKA=";
};
propagatedBuildInputs = [ elementpath ];

View file

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "yamllint";
version = "1.26.0";
version = "1.26.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "11qhs1jk9pwvyk5k3q5blh9sq42dh1ywdf1f3i2zixf7hncwir5h";
sha256 = "sha256-h9lGKz7X6d+hnKoXf3p3zZiIs9xARER9auCrIzvNEyQ=";
};
propagatedBuildInputs = [

View file

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.12.10";
version = "5.12.11";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@ -12,7 +12,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-DxWkknL8kgFmdI+jb5chVnWCz6oDKOw6iuT69zDaDNs=";
sha256 = "sha256-EQ52Leg7i1Xb2b29JbaKFKRE/jKXB48GXhbM/Ay5QTY=";
};
extraMeta = {

View file

@ -68,7 +68,7 @@
"awair" = ps: with ps; [ python-awair ];
"aws" = ps: with ps; [ aiobotocore ];
"axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ];
"azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops
"azure_devops" = ps: with ps; [ aioazuredevops ];
"azure_event_hub" = ps: with ps; [ azure-eventhub ];
"azure_service_bus" = ps: with ps; [ azure-servicebus ];
"baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip

View file

@ -301,6 +301,7 @@ in with py.pkgs; buildPythonApplication rec {
"awair"
"aws"
"axis"
"azure_devops"
"azure_event_hub"
"bayesian"
"binary_sensor"

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "amidst";
version = "4.6";
version = "4.7";
src = fetchurl { # TODO: Compile from src
url = "https://github.com/toolbox4minecraft/amidst/releases/download/v${version}/amidst-v${lib.replaceStrings [ "." ] [ "-" ] version}.jar";
sha256 = "0nz6xfhshy36j8k81kqdfbbxih96l7f3s9156f9lmw0mi1qlyzqk";
sha256 = "sha256-oecRjD7JUuvFym8N/hSE5cbAFQojS6yxOuxpwWRlW9M=";
};
dontUnpack = true;

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "slirp4netns";
version = "1.1.10";
version = "1.1.11";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "slirp4netns";
rev = "v${version}";
sha256 = "sha256-Qk5a8h9IkLwYRmPL8pFlyVsQ/xMZ2/wkq8zZ7yfrLEQ=";
sha256 = "sha256-Gxcu9XlLPLcFUoCDrMeWJ6SGUSHU9ZKPHq1oBvmNoJ8=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View file

@ -217,6 +217,8 @@ let
cstruct = callPackage ../development/ocaml-modules/cstruct {};
cstruct-async = callPackage ../development/ocaml-modules/cstruct/async.nix { };
cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { };
cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {};

View file

@ -245,6 +245,8 @@ in {
aioasuswrt = callPackage ../development/python-modules/aioasuswrt { };
aioazuredevops = callPackage ../development/python-modules/aioazuredevops { };
aiocache = callPackage ../development/python-modules/aiocache { };
aiocoap = callPackage ../development/python-modules/aiocoap { };

View file

@ -151,7 +151,7 @@ let
otherPackageSets = self: super: {
# This maps each entry in lib.systems.examples to its own package
# set. Each of these will contain all packages cross compiled for
# that target system. For instance, pkgsCross.rasberryPi.hello,
# that target system. For instance, pkgsCross.raspberryPi.hello,
# will refer to the "hello" package built for the ARM6-based
# Raspberry Pi.
pkgsCross = lib.mapAttrs (n: crossSystem: