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:
github-actions[bot] 2021-03-20 06:21:50 +00:00 committed by GitHub
commit 11187b30ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 180 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/batik/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "batik"; pname = "batik";
version = "1.13"; version = "1.14";
src = fetchurl { src = fetchurl {
url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw"; sha256 = "sha256-D06qgb5wdS5AahnznDnAGISPCZY/CPqJdGQFRwUsRhg=";
}; };
meta = with lib; { meta = with lib; {

6
pkgs/applications/misc/tickrs/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tickrs"; pname = "tickrs";
version = "0.14.3"; version = "0.14.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tarkah"; owner = "tarkah";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mHMBhYI9pJkuK/6tCg1fXPjTfGFe0gkMzplesuFvl5M="; sha256 = "sha256-OOsBo+NCfn++2XyfQVoeEPcbSv645Ng7g9s4W7X2xg4=";
}; };
cargoSha256 = "sha256-XmLobbVTYO8dA8YVtI/ntlD1RB9sO3poP6NBdDOPIlE="; cargoSha256 = "sha256-PW8f4PZGctHd8YBBRvmueR8UgtyDQZpqf2lTU1t68iM=";
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];

43
pkgs/development/interpreters/yabasic/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchurl
, libSM
, libX11
, libXt
, libffi
, ncurses
}:
stdenv.mkDerivation rec {
pname = "yabasic";
version = "2.89.1";
src = fetchurl {
url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz";
hash = "sha256-k8QmQCpszLyotEiWDrG878RM2wqSq7I4W9j6Z2Ub3Yg=";
};
buildInputs = [
libSM
libX11
libXt
libffi
ncurses
];
meta = with lib; {
homepage = "http://www.yabasic.de/";
description = "Yet another BASIC";
longDescription = ''
Yabasic is a traditional basic-interpreter. It comes with goto and various
loops and allows to define subroutines and libraries. It does simple
graphics and printing. Yabasic can call out to libraries written in C and
allows to create standalone programs. Yabasic runs under Unix and Windows
and has a comprehensive documentation; it is small, simple, open-source
and free.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
};
}

4
pkgs/development/libraries/apache-activemq/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apache-activemq"; pname = "apache-activemq";
version = "5.16.0"; version = "5.16.1";
src = fetchurl { src = fetchurl {
sha256 = "0x68l4n0v2jqmbawdgpghmhnchpg1jsvxzskj6s4hjll6hdgb6fk"; sha256 = "sha256-Q9PzqJC/+uhcbxAC6c+VD8wf0X8/XlXcO4XTnQni4yM=";
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
}; };

43
pkgs/development/libraries/inchi/default.nix
View File

@ -1,17 +1,27 @@
{ pkgs { fetchurl
, fetchurl
, lib , lib
, stdenv , stdenv
, unzip , unzip
, fixDarwinDylibNames , fixDarwinDylibNames
}: }:
stdenv.mkDerivation { let
versionMajor = "1";
versionMinor = "0.6";
version = versionMajor + "." + versionMinor;
removeDots = lib.replaceStrings [ "." ] [ "" ];
src-doc = fetchurl {
url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-DOC.zip";
sha256 = "1kyda09i9p89xfq90ninwi7w13k1w3ljpl4gqdhpfhi5g8fgxx7f";
};
in
stdenv.mkDerivation rec {
pname = "inchi"; pname = "inchi";
version = "1.05"; inherit version;
src = fetchurl { src = fetchurl {
url = "http://www.inchi-trust.org/download/105/INCHI-1-SRC.zip"; url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-SRC.zip";
sha1 = "e3872a46d58cb321a98f4fd4b93a989fb6920b9c"; sha256 = "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28";
}; };
nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
@ -28,7 +38,9 @@ stdenv.mkDerivation {
--replace "-soname" "-install_name" \ --replace "-soname" "-install_name" \
--replace "gcc" $CC --replace "gcc" $CC
''; '';
installPhase = '' installPhase = let
versionOneDot = versionMajor + "." + removeDots versionMinor;
in ''
runHook preInstall runHook preInstall
cd ../../.. cd ../../..
@ -36,9 +48,9 @@ stdenv.mkDerivation {
mkdir -p $out/include/inchi mkdir -p $out/include/inchi
mkdir -p $doc/share/ mkdir -p $doc/share/
install -m 755 INCHI_API/bin/Linux/libinchi.so.1.05.00 $out/lib install -m 755 INCHI_API/bin/Linux/libinchi.so.${versionOneDot}.00 $out/lib
ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so.1 ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so.1
ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so
install -m 644 INCHI_BASE/src/*.h $out/include/inchi install -m 644 INCHI_BASE/src/*.h $out/include/inchi
runHook postInstall runHook postInstall
@ -48,14 +60,7 @@ stdenv.mkDerivation {
fixDarwinDylibNames $(find "$out" -name "*.so.*") fixDarwinDylibNames $(find "$out" -name "*.so.*")
''; '';
postInstall = postInstall = ''
let
src-doc = fetchurl {
url = "http://www.inchi-trust.org/download/105/INCHI-1-DOC.zip";
sha1 = "2f54y0san34v01c215kk0cigzsn76js5";
};
in
''
unzip '${src-doc}' unzip '${src-doc}'
install -m 644 INCHI-1-DOC/*.pdf $doc/share install -m 644 INCHI-1-DOC/*.pdf $doc/share
''; '';
@ -66,4 +71,4 @@ stdenv.mkDerivation {
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ rmcgibbo ]; maintainers = with maintainers; [ rmcgibbo ];
}; };
} }

23
pkgs/development/python-modules/imbalanced-learn/default.nix
View File

@ -1,5 +1,7 @@
{ lib, buildPythonPackage, fetchPypi, isPy27 { lib
, fetchpatch , buildPythonPackage
, fetchPypi
, isPy27
, pandas , pandas
, pytestCheckHook , pytestCheckHook
, scikitlearn , scikitlearn
@ -7,24 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "imbalanced-learn"; pname = "imbalanced-learn";
version = "0.7.0"; version = "0.8.0";
disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "da59de0d1c0fa66f62054dd9a0a295a182563aa1abbb3bf9224a3678fcfe8fa4"; sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w";
}; };
patches = [
# Fix compatibility with scikit-learn 0.24. This patch will be included in releases of
# imbalanced-learn after 0.7.0
(fetchpatch {
url = "https://github.com/scikit-learn-contrib/imbalanced-learn/commit/dc4051fe0011c68d900be05971b71016d4ad9e90.patch";
sha256 = "1rv61k9wv4q37a0v943clr8fflcg9ly530smgndgkjlxkyzw6swh";
excludes = ["doc/conf.py" "build_tools/*" "azure-pipelines.yml"];
})
];
propagatedBuildInputs = [ scikitlearn ]; propagatedBuildInputs = [ scikitlearn ];
checkInputs = [ pytestCheckHook pandas ]; checkInputs = [ pytestCheckHook pandas ];
preCheck = '' preCheck = ''
@ -37,6 +29,9 @@ buildPythonPackage rec {
"show_versions" "show_versions"
"test_make_imbalanced_iris" "test_make_imbalanced_iris"
"test_rusboost[SAMME.R]" "test_rusboost[SAMME.R]"
# https://github.com/scikit-learn-contrib/imbalanced-learn/issues/824
"ValueDifferenceMetric"
]; ];
meta = with lib; { meta = with lib; {

6
pkgs/development/python-modules/rdkit/default.nix
View File

@ -40,8 +40,8 @@ let
}; };
in in
buildPythonPackage rec { buildPythonPackage rec {
version = "2020.09.3";
pname = "rdkit"; pname = "rdkit";
version = "2020.09.5";
src = src =
let let
@ -51,7 +51,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "Release_${versionTag}"; rev = "Release_${versionTag}";
sha256 = "1k1wvzcd1yfx4nhz3iq2aaadzdk5w6sfcb4imhvm7pkbzij0nicx"; sha256 = "1ycbjia223d0w9xiwk36x2vkdidsx198rzkfyxz48cbax9vvklzq";
}; };
unpackPhase = '' unpackPhase = ''
@ -89,7 +89,7 @@ buildPythonPackage rec {
]; ];
hardeningDisable = [ "format" ]; # required by yaehmop hardeningDisable = [ "format" ]; # required by yaehmop
# doCheck = false;
dontUseSetuptoolsBuild = true; dontUseSetuptoolsBuild = true;
dontUsePipInstall = true; dontUsePipInstall = true;
dontUseSetuptoolsCheck = true; dontUseSetuptoolsCheck = true;

16
pkgs/development/python-modules/starlette/default.nix
View File

@ -10,7 +10,6 @@
, python-multipart , python-multipart
, pyyaml , pyyaml
, requests , requests
, ujson
, aiosqlite , aiosqlite
, databases , databases
, pytestCheckHook , pytestCheckHook
@ -21,16 +20,21 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "starlette"; pname = "starlette";
version = "0.13.8"; version = "0.14.2";
disabled = isPy27; disabled = isPy27;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "encode"; owner = "encode";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "11i0yd8cqwscixajl734g11vf8pghki11c81chzfh8ifmj6mf9jk"; sha256 = "0fz28czvwiww693ig9vwdja59xxs7m0yp1df32ms1hzr99666bia";
}; };
postPatch = ''
# remove coverage arguments to pytest
sed -i '/--cov/d' setup.cfg
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
aiofiles aiofiles
graphene graphene
@ -39,7 +43,6 @@ buildPythonPackage rec {
python-multipart python-multipart
pyyaml pyyaml
requests requests
ujson
] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ];
checkInputs = [ checkInputs = [
@ -50,9 +53,10 @@ buildPythonPackage rec {
typing-extensions typing-extensions
]; ];
# fails to import graphql, but integrated graphql support is about to
# be removed in 0.15, see https://github.com/encode/starlette/pull/1135.
disabledTestPaths = [ "tests/test_graphql.py" ]; disabledTestPaths = [ "tests/test_graphql.py" ];
# https://github.com/encode/starlette/issues/1131
disabledTests = [ "test_debug_html" ];
pythonImportsCheck = [ "starlette" ]; pythonImportsCheck = [ "starlette" ];
meta = with lib; { meta = with lib; {

4
pkgs/development/tools/analysis/tfsec/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "tfsec"; pname = "tfsec";
version = "0.39.8"; version = "0.39.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tfsec"; owner = "tfsec";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7LC7QT92Ecva/uQPwYEfbLQUpIesxa8pXrauMxIwZ98="; sha256 = "sha256-T2soogk5KcNSeluNyJ4b2GjLkvauvvznaLSMQVgVZgI=";
}; };
goPackagePath = "github.com/tfsec/tfsec"; goPackagePath = "github.com/tfsec/tfsec";

4
pkgs/development/tools/build-managers/shards/default.nix
View File

@ -44,8 +44,8 @@ rec {
}; };
shards_0_14 = generic { shards_0_14 = generic {
version = "0.14.0"; version = "0.14.1";
sha256 = "sha256-HEyGXoGkQvLrk672/ekmBxnR1eRM//GwRPd/19LM8Wo="; sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU=";
crystal = crystal_0_36; crystal = crystal_0_36;
}; };

6
pkgs/development/tools/misc/terracognita/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "terracognita"; pname = "terracognita";
version = "0.6.0"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cycloidio"; owner = "cycloidio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1f0wi5mlb9r7ncvyvgmcdfngxrzgbdv7hm2ckb8bwmzcki2h2255"; sha256 = "sha256-RX2L9EwxfZ+utptTDR3+W9ACVPALF/hiE40SJTmZuLs=";
}; };
vendorSha256 = "015r7zvah7lk5rbkaqhh2abbv19ky1in3ngzzrdvhbcqfns25iqr"; vendorSha256 = "sha256-sN9GTcG5cZxvMaLqNjY2jfLkf8a3lugM2aV3bBdT5Ww=";
doCheck = false; doCheck = false;

6
pkgs/development/tools/yq-go/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "yq-go"; pname = "yq-go";
version = "4.6.1"; version = "4.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mikefarah"; owner = "mikefarah";
rev = "v${version}"; rev = "v${version}";
repo = "yq"; repo = "yq";
sha256 = "sha256-pP00y9auYeuz0NSA+QrnGybW5T7TfGFFw/FMPu/JXjM="; sha256 = "sha256-Hv1o1MzkpapmeIsZJ4peyG5kSHt0EXjTA+gE0iq1XF8=";
}; };
vendorSha256 = "sha256-66ccHSKpl6yB/NVhZ1X0dv4wnGCJAMvZhpKu2vF+QT4="; vendorSha256 = "sha256-vpvIl1lfaziuoHs+oDEIztufH1somphiBAn6qTaQaZw=";
doCheck = false; doCheck = false;

6
pkgs/servers/monitoring/telegraf/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "telegraf"; pname = "telegraf";
version = "1.17.3"; version = "1.18.0";
excludedPackages = "test"; excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata"; owner = "influxdata";
repo = "telegraf"; repo = "telegraf";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-DJvXGjh1FN6SHcfVUlbfoKgBD1ThaJMvKUqvIKCyzeI="; sha256 = "sha256-1sFl+F3g2anssW59eKbjPdVCIyGq8JuoJGXVQZys854=";
}; };
vendorSha256 = "sha256-UTdJT4cwRCqkn01YXB1KYc7hp1smpZFke9aAODd/2x0="; vendorSha256 = "sha256-m53S/L71nyioCBbIDDAWEnqStBdqTFGq16y5ozsXq1c=";
preBuild = '' preBuild = ''
buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}")

2
pkgs/servers/sql/mariadb/connector-c/default.nix
View File

@ -56,7 +56,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Client library that can be used to connect to MySQL or MariaDB"; description = "Client library that can be used to connect to MySQL or MariaDB";
license = licenses.lgpl21; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ globin ]; maintainers = with maintainers; [ globin ];
platforms = platforms.all; platforms = platforms.all;
}; };

6
pkgs/servers/swego/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "swego"; pname = "swego";
version = "0.92"; version = "0.93";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nodauf"; owner = "nodauf";
repo = "Swego"; repo = "Swego";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SiB0Z6Eqbn/6VGDTt5bQtgcT4V4AjRIIYYk98EW7ss4="; sha256 = "sha256-oTeSh7OzjzbgKbSQSNhnCUZw5FdUkN+Y9LkIbWFhn5c=";
}; };
vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI="; vendorSha256 = "sha256-TK1LN9EmVH95jPO6K7gtCwdnW4WOKH3K7Q0FhgNMVUQ=";
postInstall = '' postInstall = ''
mv $out/bin/src $out/bin/$pname mv $out/bin/src $out/bin/$pname

25
pkgs/tools/misc/boltbrowser/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "boltbrowser";
version = "2.0";
src = fetchFromGitHub {
owner = "br0xen";
repo = pname;
rev = version;
sha256 = "17v3pv80dxs285d0b6x772h5cb4f0xg9n5p9jwlir5hjbfn1635i";
};
vendorSha256 = "1x28m72626cchnsasyxips8jaqs0l2p9jhjrdcgws144zm6fz3hv";
meta = with lib; {
description = "CLI Browser for BoltDB files";
homepage = "https://github.com/br0xen/boltbrowser";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/tools/networking/wormhole-william/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "wormhole-william"; pname = "wormhole-william";
version = "1.0.4"; version = "1.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psanford"; owner = "psanford";
repo = "wormhole-william"; repo = "wormhole-william";
rev = "v${version}"; rev = "v${version}";
sha256 = "1v6kw10gqhyd1adj0wwrr5bmpjqbshdnywsrjpqgg9bl61m5j3wr"; sha256 = "sha256-75pSFMzaZW+rtikO0khuxXIgb3Wj8ieSE4sB6quKgo4=";
}; };
vendorSha256 = "1niky252gcxai6vz0cx7pvflg530bc1lmcd2wm2hqg6446r1yxsq"; vendorSha256 = "sha256-8GZ4h+DFQaCizOCxsMzAllXyaQgzQQBsbCnVi5MWbFg=";
doCheck = false; doCheck = false;

6
pkgs/tools/networking/yggdrasil/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "yggdrasil"; pname = "yggdrasil";
version = "0.3.15"; version = "0.3.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yggdrasil-network"; owner = "yggdrasil-network";
repo = "yggdrasil-go"; repo = "yggdrasil-go";
rev = "v${version}"; rev = "v${version}";
sha256 = "1nf00ygp55l01c0gdkw15f08p3hmn6s2r99lgf2xpq8jn75qra4i"; sha256 = "sha256-uUF0zkgtzdMZB/GKOtawjn7AQBkRoiAEj9nUUmpQSVQ=";
}; };
vendorSha256 = "1zk6h1isxyml9asyb7g4scbhnfwghqwnv40a5f5j7z0s0s4nybdp"; vendorSha256 = "sha256-619PSqd7pl3Akj/kzLQhDIp1adumBGhLrzQsZvMzC7w=";
doCheck = false; doCheck = false;

4
pkgs/top-level/all-packages.nix
View File

@ -3142,6 +3142,8 @@ in
bash_unit = callPackage ../tools/misc/bash_unit { }; bash_unit = callPackage ../tools/misc/bash_unit { };
boltbrowser = callPackage ../tools/misc/boltbrowser { };
bsc = callPackage ../tools/compression/bsc { bsc = callPackage ../tools/compression/bsc {
inherit (llvmPackages) openmp; inherit (llvmPackages) openmp;
}; };
@ -29915,6 +29917,8 @@ in
wasmer = callPackage ../development/interpreters/wasmer { }; wasmer = callPackage ../development/interpreters/wasmer { };
yabasic = callPackage ../development/interpreters/yabasic { };
wasm-pack = callPackage ../development/tools/wasm-pack { wasm-pack = callPackage ../development/tools/wasm-pack {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };