b12f/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-19 06:18:02 +00:00 committed by GitHub
parent 8c03075f07 6ffd2fe000
commit 6adae3d553
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 288 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View file

@ -4195,6 +4195,12 @@
githubId = 175537;
name = "Johannes Lötzsch";
};
jackgerrits = {
email = "jack@jackgerrits.com";
github = "jackgerrits";
githubId = 7558482;
name = "Jack Gerrits";
};
jagajaga = {
email = "ars.seroka@gmail.com";
github = "jagajaga";
@ -5548,6 +5554,12 @@
githubId = 7622248;
name = "Sebastian Zivota";
};
locallycompact = {
email = "dan.firth@homotopic.tech";
github = "locallycompact";
githubId = 1267527;
name = "Daniel Firth";
};
lopsided98 = {
email = "benwolsieffer@gmail.com";
github = "lopsided98";

87
pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
View file

@ -1,54 +1,73 @@
{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook
{ stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook
, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify
, wrapGAppsHook }:
let
version = "5.0.1";
in stdenv.mkDerivation {
pname = "vk-messenger";
inherit version;
version = "5.2.3";
src = {
i686-linux = fetchurl {
url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
sha256 = "1ji23x13lzbkiqfrrwx1pj6gmms0p58cjmjc0y4g16kqhlxl60v6";
sha256 = "09zi2rzsank6lhw1z9yar1rp634y6qskvr2i0rvqg2fij7cy6w19";
};
x86_64-linux = fetchurl {
url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm";
sha256 = "01vvmia2qrxvrvavk9hkkyvfg4pg15m01grwb28884vy4nqw400y";
sha256 = "1m6saanpv1k5wc5s58jpf0wsgjsj7haabx8nycm1fjyhky1chirb";
};
x86_64-darwin = fetchurl {
url = "https://web.archive.org/web/20210310071550/https://desktop.userapi.com/mac/master/vk.dmg";
sha256 = "0j5qsr0fyl55d0x46xm4h2ykwr4y9z1dsllhqx5lnc15nc051s9b";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ];
buildInputs = (with xorg; [
libXdamage libXtst libXScrnSaver libxkbfile
]) ++ [
gtk3 nss alsaLib
];
runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = ''
rpmextract $src
'';
buildPhase = ''
substituteInPlace usr/share/applications/vk.desktop \
--replace /usr/share/pixmaps/vk.png vk
'';
installPhase = ''
mkdir $out
cd usr
cp -r --parents bin $out
cp -r --parents share/vk $out
cp -r --parents share/applications $out
cp -r --parents share/pixmaps $out
'';
meta = with lib; {
description = "Simple and Convenient Messaging App for VK";
homepage = "https://vk.com/messenger";
license = licenses.unfree;
maintainers = [ maintainers.gnidorah ];
platforms = ["i686-linux" "x86_64-linux"];
platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
};
}
linux = stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ];
buildInputs = (with xorg; [
libXdamage libXtst libXScrnSaver libxkbfile
]) ++ [ gtk3 nss alsaLib ];
runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = ''
rpmextract $src
'';
buildPhase = ''
substituteInPlace usr/share/applications/vk.desktop \
--replace /usr/share/pixmaps/vk.png vk
'';
installPhase = ''
mkdir $out
cd usr
cp -r --parents bin $out
cp -r --parents share/vk $out
cp -r --parents share/applications $out
cp -r --parents share/pixmaps $out
'';
};
darwin = stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/Applications
cp -r *.app $out/Applications
'';
};
in if stdenv.isDarwin then darwin else linux

11
pkgs/applications/networking/irc/convos/default.nix
View file

@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
version = "5.11";
version = "6.06";
src = fetchFromGitHub {
owner = "Nordaaker";
owner = "convos-chat";
repo = pname;
rev = version;
sha256 = "08k8dqdgz2b3p8g1zfg9i74r5nm1w0sqdm759d1f3jcyp737r47x";
rev = "v${version}";
sha256 = "0b3c8hj9cjmpzy9k949vdv1y3v7b94nh0mq15rcv3ax0sj3gd0qr";
};
nativeBuildInputs = [ makeWrapper ]
@ -54,6 +54,9 @@ perlPackages.buildPerlPackage rec {
#
rm t/web-user.t
# Another web test fails, so we also remove this.
rm t/web-login.t
# Module::Install is a runtime dependency not covered by the tests, so we add
# a test for it.
#

46
pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost169, rapidjson, zlib }:
stdenv.mkDerivation rec {
pname = "vowpal-wabbit";
version = "8.9.2";
src = fetchFromGitHub {
owner = "VowpalWabbit";
repo = "vowpal_wabbit";
rev = version;
sha256 = "0ng1kip7sh3br85691xvszxd6lhv8nhfkgqkpwxd89wy85znzhmd";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
boost169
rapidjson
zlib
];
# -DBUILD_TESTS=OFF is set as both it saves time in the build and the default
# cmake flags appended by the builder include -DBUILD_TESTING=OFF for which
# this is the equivalent flag.
cmakeFlags = [
"-DVW_INSTALL=ON"
"-DBUILD_TESTS=OFF"
"-DBUILD_JAVA=OFF"
"-DBUILD_PYTHON=OFF"
"-DUSE_LATEST_STD=ON"
"-DRAPIDJSON_SYS_DEP=ON"
];
meta = with lib; {
broken = stdenv.isAarch32 || stdenv.isAarch64;
description = "Machine learning system focused on online reinforcement learning";
homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/";
license = licenses.bsd3;
longDescription = ''
Machine learning system which pushes the frontier of machine learning with techniques such as online,
hashing, allreduce, reductions, learning2search, active, and interactive and reinforcement learning
'';
maintainers = with maintainers; [ jackgerrits ];
platforms = platforms.unix;
};
}

35
pkgs/development/ocaml-modules/luv/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib, buildDunePackage, fetchurl
, ctypes, result
, alcotest
, file
}:
buildDunePackage rec {
pname = "luv";
version = "0.5.7";
useDune2 = true;
src = fetchurl {
url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
sha256 = "0wjnw5riydnzsk1xdzljlpzdnjwpa0j597y6x6ma4990mqj54260";
};
postConfigure = ''
for f in src/c/vendor/configure/{ltmain.sh,configure}; do
substituteInPlace "$f" --replace /usr/bin/file file
done
'';
nativeBuildInputs = [ file ];
propagatedBuildInputs = [ ctypes result ];
checkInputs = [ alcotest ];
doCheck = true;
meta = with lib; {
homepage = "https://github.com/aantron/luv";
description = "Binding to libuv: cross-platform asynchronous I/O";
# MIT-licensed, extra licenses apply partially to libuv vendor
license = with licenses; [ mit bsd2 bsd3 cc-by-sa-40 ];
maintainers = with maintainers; [ locallycompact sternenseemann ];
};
}

4
pkgs/servers/minio/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio";
version = "2021-03-12T00-00-47Z";
version = "2021-03-17T02-33-02Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-7KHEmnrTw6SBhsImMjcv+b1wvFEg8AXgsuZTGp5iVis=";
sha256 = "sha256-nCCU9hSt8VaLpZmqZFl3GczqDJXEQJ4rFn/9B0gV/5g=";
};
vendorSha256 = "sha256-tMt6XRj1dd+AHqWA6WGm5GBFGx+IsP1ijYCj8cmUXy0=";

45
pkgs/test/texlive/default.nix
View file

@ -1,4 +1,4 @@
{ runCommandNoCC, fetchurl, file, texlive }:
{ runCommandNoCC, fetchurl, file, texlive, writeShellScript }:
{
chktex = runCommandNoCC "texlive-test-chktex" {
@ -17,7 +17,7 @@
'';
# https://github.com/NixOS/nixpkgs/issues/75605
dvipng = runCommandNoCC "texlive-test-dvipng" {
dvipng.basic = runCommandNoCC "texlive-test-dvipng-basic" {
nativeBuildInputs = [ file texlive.combined.scheme-medium ];
input = fetchurl {
name = "test_dvipng.tex";
@ -38,6 +38,47 @@
mv document*.png "$out"/
'';
# test dvipng's limited capability to render postscript specials via GS
dvipng.ghostscript = runCommandNoCC "texlive-test-ghostscript" {
nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ];
input = builtins.toFile "postscript-sample.tex" ''
\documentclass{minimal}
\begin{document}
Ni
\special{ps:
newpath
0 0 moveto
7 7 rlineto
0 7 moveto
7 -7 rlineto
stroke
showpage
}
\end{document}
'';
gs_trap = writeShellScript "gs_trap.sh" ''
exit 1
'';
} ''
cp "$gs_trap" ./gs
export PATH=$PWD:$PATH
# check that the trap works
gs && exit 1
cp "$input" ./document.tex
latex document.tex
dvipng -T 1in,1in -strict -picky document.dvi
for f in document*.png; do
file "$f" | tee output
grep PNG output
done
mkdir "$out"
mv document*.png "$out"/
'';
# https://github.com/NixOS/nixpkgs/issues/75070
dvisvgm = runCommandNoCC "texlive-test-dvisvgm" {
nativeBuildInputs = [ file texlive.combined.scheme-medium ];

27
pkgs/tools/text/dfmt/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib
, python3
}:
let
inherit (python3.pkgs)
buildPythonApplication
fetchPypi
pythonOlder;
in
buildPythonApplication rec {
pname = "dfmt";
version = "1.2.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "7af6360ca8d556f1cfe82b97f03b8d1ea5a9d6de1fa3018290c844b6566d9d6e";
};
meta = with lib; {
description = "Format paragraphs, comments and doc strings";
homepage = "https://github.com/dmerejkowsky/dfmt";
license = licenses.bsd3;
maintainers = with maintainers; [ cole-h ];
};
}

7
pkgs/tools/typesetting/tex/texlive/bin.nix
View file

@ -281,12 +281,9 @@ dvipng = stdenv.mkDerivation {
configureFlags = common.configureFlags
++ [ "--with-system-kpathsea" "--with-gs=yes" "--disable-debug" ];
enableParallelBuilding = true;
GS="${ghostscript}/bin/gs";
# I didn't manage to hardcode gs location by configureFlags
postInstall = ''
wrapProgram "$out/bin/dvipng" --prefix PATH : '${ghostscript}/bin'
'';
enableParallelBuilding = true;
};

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

@ -1243,6 +1243,8 @@ in
detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { };
dfmt = callPackage ../tools/text/dfmt { };
diskonaut = callPackage ../tools/misc/diskonaut { };
diskus = callPackage ../tools/misc/diskus {
@ -3986,6 +3988,8 @@ in
vorta = libsForQt5.callPackage ../applications/backup/vorta { };
vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };
utahfs = callPackage ../applications/networking/utahfs { };
wakeonlan = callPackage ../tools/networking/wakeonlan { };

4
pkgs/top-level/ocaml-packages.nix
View file

@ -576,6 +576,10 @@ let
lua-ml = callPackage ../development/ocaml-modules/lua-ml { };
luv = callPackage ../development/ocaml-modules/luv {
inherit (pkgs) file;
};
lwt = callPackage ../development/ocaml-modules/lwt {
ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
};

82
pkgs/top-level/perl-packages.nix
View file

@ -10880,10 +10880,10 @@ let
JSONValidator = buildPerlPackage {
pname = "JSON-Validator";
version = "4.10";
version = "4.14";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.10.tar.gz";
sha256 = "15hgjldd85ada8anz5fdrlnixvwqahnvv3hprcvr9jgj3gvx0lww";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.14.tar.gz";
sha256 = "16zaaw7p94nz7yclz30b9xph0riy5ailqg5rjkvi1yps2hr9ba7z";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ];
@ -11257,10 +11257,10 @@ let
LinkEmbedder = buildPerlPackage {
pname = "LinkEmbedder";
version = "1.16";
version = "1.17";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.16.tar.gz";
sha256 = "0pm5h5rlfparfvsi3ygj53mwjg8lwhql5mj0macfvsvfnfvnnp6j";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.17.tar.gz";
sha256 = "10r1q2xfba59w818li5xaj6jlph9qla7vb99ir1ampq5n8g0s5i6";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ Mojolicious ];
@ -12911,10 +12911,10 @@ let
MinionBackendSQLite = buildPerlModule {
pname = "Minion-Backend-SQLite";
version = "5.0.3";
version = "5.0.4";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.3.tar.gz";
sha256 = "1ch92846cgr1s1y6nlicjxlq9r4qh1a3fig0jlr7ligzw05mxib4";
url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.4.tar.gz";
sha256 = "0xhcsxm3x5v9azmyy12wiwlbpiisq06hgj3yf9ggqx8fp9jqppb1";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ Minion MojoSQLite ];
@ -13522,10 +13522,10 @@ let
Mojolicious = buildPerlPackage {
pname = "Mojolicious";
version = "8.71";
version = "9.10";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.71.tar.gz";
sha256 = "03bfxzq11v6k47axdwqhp2d3p1z17nwyxj0yww5z3x293p6zsnqm";
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.10.tar.gz";
sha256 = "0y4ccy85vh7nily2y1c457f687qc8rwi4mnx13619hslkagw4rqw";
};
meta = {
homepage = "https://mojolicious.org";
@ -13537,10 +13537,10 @@ let
MojoliciousPluginAssetPack = buildPerlPackage {
pname = "Mojolicious-Plugin-AssetPack";
version = "2.10";
version = "2.13";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-AssetPack-2.10.tar.gz";
sha256 = "0jfspr0mrb8f9p89d01ri7ci0dazrg341sbyd1khppxxwviip378";
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-AssetPack-2.13.tar.gz";
sha256 = "1254yy70c7wv3p64pjyxc2h1p9czs65jm6lzl42qmn1x19i8fggj";
};
propagatedBuildInputs = [ FileWhich IPCRun3 Mojolicious ];
meta = {
@ -13584,10 +13584,10 @@ let
MojoliciousPluginOpenAPI = buildPerlPackage {
pname = "Mojolicious-Plugin-OpenAPI";
version = "3.40";
version = "4.00";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.40.tar.gz";
sha256 = "0pj2azis2xfqcy04j0734hsfq3v60wympzpvsgfhmj0w66mb238y";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-4.00.tar.gz";
sha256 = "1npnbygs12d683m5i6cgvdmw6glvppnv75f4qpp908fdz8lwcb2z";
};
propagatedBuildInputs = [ JSONValidator ];
meta = {
@ -13680,10 +13680,10 @@ let
MojoSQLite = buildPerlModule {
pname = "Mojo-SQLite";
version = "3.004";
version = "3.005";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.004.tar.gz";
sha256 = "d9ca9c1f3e8183611638e318b88ad3c0f8ab7e65f6ac72e48bffe51aea03b983";
url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.005.tar.gz";
sha256 = "0appzyhr5adzdfxns31lj568hz18bkmxmcv7fpafrx67b98cpza1";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstract URIdb ];
@ -13712,6 +13712,23 @@ let
};
};
MojoIOLoopDelay = buildPerlModule {
pname = "Mojo-IOLoop-Delay";
version = "8.76";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-Delay-8.76.tar.gz";
sha256 = "1vd9s1r82wfxh8y1g2ninsyvzkawx7n6ncll8lhdj89p91hw1jwf";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ Mojolicious ];
meta = {
homepage = "https://github.com/jberger/Mojo-IOLoop-Delay";
description = "(DISCOURAGED) Promises/A+ and flow-control helpers";
license = lib.licenses.artistic2;
maintainers = [ maintainers.zakame ];
};
};
MojoIOLoopForkCall = buildPerlModule {
pname = "Mojo-IOLoop-ForkCall";
version = "0.20";
@ -13719,10 +13736,17 @@ let
url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz";
sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6";
};
propagatedBuildInputs = [ IOPipely Mojolicious ];
propagatedBuildInputs = [ IOPipely Mojolicious MojoIOLoopDelay ];
preBuild = ''
# This module needs the deprecated Mojo::IOLoop::Delay
substituteInPlace lib/Mojo/IOLoop/ForkCall.pm \
--replace "use Mojo::IOLoop;" "use Mojo::IOLoop; use Mojo::IOLoop::Delay;"
'';
meta = {
description = "Run blocking functions asynchronously by forking";
homepage = "https://github.com/jberger/Mojo-IOLoop-ForkCall";
description = "Run blocking functions asynchronously by forking (deprecated)";
license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.zakame ];
};
};
@ -13762,10 +13786,10 @@ let
MojoUserAgentCached = buildPerlPackage {
pname = "Mojo-UserAgent-Cached";
version = "1.12";
version = "1.16";
src = fetchurl {
url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.12.tar.gz";
sha256 = "08pa3sz63sq2y3g3lbhy2msbnx0myb2igmmc28cm3kaznryvsgwm";
url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.16.tar.gz";
sha256 = "17gp1kn97s1wv973w0g92alx13lmcvdan794471sfq2is6s6v1qd";
};
buildInputs = [ ModuleInstall ];
propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ];
@ -15909,10 +15933,10 @@ let
OpenAPIClient = buildPerlPackage rec {
pname = "OpenAPI-Client";
version = "0.25";
version = "1.00";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.25.tar.gz";
sha256 = "bc6be443c9c44348899fd595e080abe53760ae7561d63615a2f9b9f0a943336c";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.00.tar.gz";
sha256 = "41bcf211c1123fbfb844413aa53f97061410b592591367b61273a206865991f7";
};
propagatedBuildInputs = [ MojoliciousPluginOpenAPI ];
meta = {