Merge master into staging-next

This commit is contained in:
github-actions[bot] 2020-12-08 12:19:44 +00:00 committed by GitHub
commit 4549c836e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 93 additions and 77 deletions

View File

@ -55,6 +55,7 @@ rustPlatform.buildRustPackage rec {
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-good
];
# use Meson/Ninja phases

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mg";
version = "6.7";
version = "6.8.1";
src = fetchFromGitHub {
owner = "ibara";
repo = "mg";
rev = "mg-6.7";
sha256 = "15adwibq6xrfxbrxzk765g9250iyfn4wbcxd7kcsabiwn6apm0ai";
rev = "mg-6.8.1";
sha256 = "0fyqyi5sag13jx8bc22bvkgybddvsr0wdili9ikxnpnqg2w84fx7";
};
enableParallelBuilding = true;

View File

@ -15,13 +15,13 @@
}:
buildPythonApplication rec {
pname = "visidata";
version = "2.0.1";
version = "2.1";
src = fetchFromGitHub {
owner = "saulpw";
repo = "visidata";
rev = "v${version}";
sha256 = "sha256-AkGU9p00y+psBS/fL2YLyQYRSMOp1aPs21E9bpN9z0M=";
sha256 = "1psb3ycrb7k00b5blg9zr52bzdxs1mkdc7rpjn4m9kh09yfs3sx4";
};
propagatedBuildInputs = [

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "seaweedfs";
version = "2.13";
version = "2.14";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
sha256 = "0w41p2fm26ml5dvdg2cnxcw0xzsbjq26chpa3bkn1adpazlpivp4";
sha256 = "1sfchh5qiylxxmph0hgjfaj80mv5pnrm1s34g5lx0vj64jxr5nzb";
};
vendorSha256 = "0g344dj325d35i0myrzhg5chspqnly40qp910ml6zrmp7iszc1mw";

View File

@ -1,26 +1,44 @@
{ stdenv
, fetchurl
, cmake
, singlePrec ? true
, mpiEnabled ? false
, hwloc
, fftw
, openmpi
, perl
, singlePrec ? true
, mpiEnabled ? false
, cpuAcceleration ? null
}:
stdenv.mkDerivation {
name = "gromacs-2020.4";
let
# Select reasonable defaults for all major platforms
# The possible values are defined in CMakeLists.txt:
# AUTO None SSE2 SSE4.1 AVX_128_FMA AVX_256 AVX2_256
# AVX2_128 AVX_512 AVX_512_KNL MIC ARM_NEON ARM_NEON_ASIMD
SIMD = x: if (cpuAcceleration != null) then x else
if stdenv.hostPlatform.system == "i686-linux" then "SSE2" else
if stdenv.hostPlatform.system == "x86_64-linux" then "SSE4.1" else
if stdenv.hostPlatform.system == "x86_64-darwin" then "SSE4.1" else
if stdenv.hostPlatform.system == "aarch64-linux" then "ARM_NEON" else
"None";
in stdenv.mkDerivation rec {
pname = "gromacs";
version = "2020.4";
src = fetchurl {
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.4.tar.gz";
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz";
sha256 = "1rplvgna60nqyb8nspaz3bfkwb044kv3zxdaa5whql5m441nj6am";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ fftw perl ]
buildInputs = [ fftw perl hwloc ]
++ (stdenv.lib.optionals mpiEnabled [ openmpi ]);
cmakeFlags = (
cmakeFlags = [
"-DGMX_SIMD:STRING=${SIMD cpuAcceleration}"
"-DGMX_OPENMP:BOOL=TRUE"
] ++ (
if singlePrec then [
"-DGMX_DOUBLE=OFF"
] else [
@ -30,8 +48,6 @@ stdenv.mkDerivation {
) ++ (
if mpiEnabled then [
"-DGMX_MPI:BOOL=TRUE"
"-DGMX_CPU_ACCELERATION:STRING=SSE4.1"
"-DGMX_OPENMP:BOOL=TRUE"
"-DGMX_THREAD_MPI:BOOL=FALSE"
] else [
"-DGMX_MPI:BOOL=FALSE"

View File

@ -10,7 +10,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
version = "4.0.0";
version = "4.0.2";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

View File

@ -1,24 +1,24 @@
# This file was autogenerated. DO NOT EDIT!
{
iosevka = "05wlap8r7kfg5zyj8gf7i1cypgs6lwpkh51g4cyj01zjkkv9g7k8";
iosevka-aile = "18qa6q1djjr34aj340ab47ajkkcq4wfv7m36f303kabgwfif247r";
iosevka-curly = "138hl95n3c2cfblzgh8adi1aljwn1xljjbffd0nrb12hipmgddql";
iosevka-curly-slab = "0x18zzphri1fx4lql51n8bam0pq2xb61p1gx50km3wlvkrbmbj23";
iosevka-etoile = "0byv8x3nqjka4ivpa8h6hq2k18cjnf69qmcc06dy4ym45a34qqsw";
iosevka-slab = "0a2h1g69r9nmp5cskgciywsiq07rxn0cskhvwbwaq64rsqbr1l58";
iosevka-sparkle = "13kwdgziylicwkl9s9v9bx9zbbrsrys6n7gx2jzgkdlsj8wkd73i";
iosevka-ss01 = "0achcgfcya6sl15wknlyyghpz3d7q62wa0fikl74wr5xyl7h7f1f";
iosevka-ss02 = "09gsawl61acykpd2429g1mz0l7i4gl0j1fl0lzc1giy6kbvrkggb";
iosevka-ss03 = "07fdxmlpqv6z5hbly8l344x96m80jbz8rq5h9qkfz63xlq0376sj";
iosevka-ss04 = "0q3v6spylhaxsf6spv6q5kh87mxbkh9x04s3h1g3rjv6gdlxi9n4";
iosevka-ss05 = "1zzdx4d6zrc1qbhsp0bfg91v63h1y943pylfxns09bzk9wjppvba";
iosevka-ss06 = "1a3ar8xhn9rf5isxvwqvifczl20ddgs4dw9ypjflmdbyhr3n0yw5";
iosevka-ss07 = "01x33sx5d54mdph7csnk6mhkhyc879rwp9spxwyrajghzd0ql8w6";
iosevka-ss08 = "0a1kmyr5q2w7qky0ya0gaqmg0lhdafyag8c8idacl7gnra944hi0";
iosevka-ss09 = "0m7cm8c3795a8kfy19d9wjmii6ycimcclg5pn9g91kg49q8y9gi2";
iosevka-ss10 = "1gfdjz6yifbyb9gl19q3q69as3fnmih17ghhrzzhc7qll68r6k6z";
iosevka-ss11 = "119ivw6kcqvzbj46xv8avpg56w3nqdkhhl176gj3bpk1jbjip1wh";
iosevka-ss12 = "1vx8rc328whsjjj87fa29kpp9ibk6x52r1brjp37cywjd5ix6l78";
iosevka-ss13 = "1gmmm2jlvrl6pzcsc2bhy3qvmzmsns8hlc52ddrwdbw0wi28zhs3";
iosevka-ss14 = "0mwg2bvkpxzpsdhky9k6fn81061pk0f23whj1hj4mn191xpw41fy";
iosevka = "1p85mrgz63h4q09xy9gchf93fpzwxjnmr5acrfdp9ybrqzpv6gza";
iosevka-aile = "01kaawf0slhgj21shlvnlq5has4iz0prq89c4xg3k3dhnxdyfkaz";
iosevka-curly = "1rbmnxwkihfah5y9vi1zz2qvdx2f3a5lrkgwn46wcxmn0y3hk0ii";
iosevka-curly-slab = "0svvqs8ybimaq7rad1vh1b6jxkszaan407zm7j66576pf3djkg2f";
iosevka-etoile = "1aiwrjk5590l7hwiis448bwfjhz5shbc3cq74lbvk56130nv0d96";
iosevka-slab = "0rsx8sr2f446jax5dk42r19kgpja8cvb8d0hwfv1aqqs3xp7k4zr";
iosevka-sparkle = "0nfg9ibzz1dqr4bw5gnslvx7b7zdd8mfvjyriwkvpkxycwsaa60k";
iosevka-ss01 = "044y1drbdv5xcxxg9vgxms95b97zi6bgy4im2mvhhxphx6sa8zdr";
iosevka-ss02 = "0ndp38fsswz5fcdvh3577q4pxmfss7czyvsnswyka5rz2q40dyrd";
iosevka-ss03 = "1ypdlsirkgcnakbgd585jqxiafsjdrwmgdd5h9ppf4giaiclsv5w";
iosevka-ss04 = "0l7xbv7mcdsqw50lb7ldrwrswc0gb02l19ccv073xinpf3lh1d91";
iosevka-ss05 = "0qd2dvfrv9wjynaqbhzr2bsrbsgp4db5s32jmxnf3y92qinr91sc";
iosevka-ss06 = "0vkvs772lmzcqyg7wrjqjjkk7ij0rrqbr2i8y63f3hsgwm9g6chw";
iosevka-ss07 = "1s0dpxfzy5sk82cv5ipp1c5813rl98izbzr06w44ss1bma3zr5af";
iosevka-ss08 = "12fhw8fw264pybavpdpqywaqvrinap6bp9gspsd788im1fqzm5mw";
iosevka-ss09 = "1h2i82h9lj3lncc0im8v53jk31jpiaxxydwlrrks9sii56705ddf";
iosevka-ss10 = "0km8yj5p1g03ykpx1v2zrflw6ixbk31ps6qknacc06n6xxmlqj09";
iosevka-ss11 = "0kcgp4pbqrlcggv2774zygiw2klx9340sxxk708y4yjd9ha6gznn";
iosevka-ss12 = "0fbp9lxc6qw8ahgvyjf52qy5p4c5qyqcyfbqy3qlaj0iasprp9fi";
iosevka-ss13 = "1jpgvhsxzshdx6ww4zyznzybc5q1ss8l07v9011grmxil7lr0hya";
iosevka-ss14 = "1ssz9m3b7ls34y8rgi185xzx8avzkzjs9jkn79ir240gmi77s161";
}

View File

@ -42,13 +42,13 @@
let self = stdenv.mkDerivation rec {
pname = "mutter";
version = "3.38.1";
version = "3.38.2";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0cvs47h7xhalkh8xcchllaws212ml3d23aj0pmfq0qyzkw65f8g9";
sha256 = "03a612m0c7v6y72bs3ghmpyk49177fzq6gdy1jrz4608vnalx5yr";
};
patches = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pugixml";
version = "1.11";
version = "1.11.1";
src = fetchFromGitHub {
owner = "zeux";
repo = "pugixml";
rev = "v${version}";
sha256 = "0q620bfd9lnph68jhqn7iv9bqmks7qk90riq6f6nr4kqc4xnravd";
sha256 = "0iwn627wynrqrwb2ddm38p6y6cpgcavgbkrrxwxa0d26m9v2avpr";
};
outputs = if shared then [ "out" "dev" ] else [ "out" ];

View File

@ -1,13 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
buildPythonPackage rec {
version = "4.24.0";
version = "4.24.1";
pname = "breathe";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "cd959f259361473896857d5720386963800f8401d29b696705ebb01711d96e35";
sha256 = "d8e47ba4b975f3228a13daf481762f784f87d1e6e87a01619360d59e558d2fc0";
};
propagatedBuildInputs = [ docutils six sphinx ];

View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "bugsnag";
version = "4.0.1";
version = "4.0.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "01c2186f6c2a6f801b66d8fc73b8986bd2d4931a6ab40b720e5fd0b66757facc";
sha256 = "7a49dacf055a8c6dda4ce714acd91fabe9546f1ad826276918a26603a8b5489a";
};
propagatedBuildInputs = [ six webob ];

View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "click-help-colors";
version = "0.8";
version = "0.9";
src = fetchPypi {
inherit pname version;
sha256 = "EZ5fr2nPyRnJlcWWIyasj9h/EeVqNxr1lOPf2EWPTG4=";
sha256 = "eb037a2dd95a9e20b3897c2b3ca57e7f6797f76a8d93f7eeedda7fcdcbc9b635";
};
propagatedBuildInputs = [ click ];

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "svls";
version = "0.1.17";
version = "0.1.18";
src = fetchFromGitHub {
owner = "dalance";
repo = "svls";
rev = "v${version}";
sha256 = "0qcd9pkshk94c6skzld8cyzppl05hk4vcmmaya8r9l6kdi1f4b5m";
sha256 = "08n2sp0yj7ql5aagxw94dn8bx2jkigs9zlylf5zkg673bh54829x";
};
cargoSha256 = "0dqa7iw0sffzh07qysznh7ma3d3vl5fhd0i2qmz7a3dvw8mvyvsm";
cargoSha256 = "0k8x6kgxc2w7ldi456s4kg4v80b064drfa26zg5chcmcrr5zgmyv";
meta = with lib; {
description = "SystemVerilog language server";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "postsrsd";
version = "1.8";
version = "1.9";
src = fetchFromGitHub {
owner = "roehling";
repo = "postsrsd";
rev = version;
sha256 = "1f10ac7bkphvjjh2xzzz5c0x97njx20yd8wvl99isqfsyyc2lhm7";
sha256 = "0kmdm8nwb40cs4wvxv2kapjbiy4h6924zmx8h1kk7j3j9yjshl1p";
};
cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ];

View File

@ -4,13 +4,13 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
version = "0.23.4";
version = "0.23.5";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
sha256 = "05pkg0id9w8brjw7fdqh3qg1q920cdz9dizprim54dhx70kav27x";
sha256 = "03wxrf9iyaianlnlcx8ks04r0snpg32a3qbq36cykcq2x55qnczq";
};
dontBuild = true;

View File

@ -122,10 +122,10 @@ let
]);
sitePackages = ceph-python-env.python.sitePackages;
version = "15.2.6";
version = "15.2.7";
src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
sha256 = "093pphgqrkrbv3484ayl0vac6a6s53zxa01yad0cbvnx0kyj55hh";
sha256 = "082lpx1rsifjh636zypxy6ccs6nfkcm9azxp5ghvr5mvx9chmyrj";
};
in rec {
ceph = stdenv.mkDerivation {

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "resvg";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
sha256 = "1qaca8wqwi2wqqx1yladjb4clgqdzsm8b7qsiaw0qascddjw1mcc";
sha256 = "0iqlg0wmx9y81ncbw4ihd6pr7ddpfsvk35zmhzsq4plwzbxgp0w1";
};
cargoSha256 = "1y10xzdf5kxbi9930qfsmryrbrkx1wmc5b216l9wcxq6cd77hxy2";
cargoSha256 = "0jgczhvm5rsv4vwd5wx6gshy6322im4c3wi79klk249czr6vlwsg";
doCheck = false;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pgmetrics";
version = "1.10.2";
version = "1.10.3";
src = fetchFromGitHub {
owner = "rapidloop";
repo = pname;
rev = "v${version}";
sha256 = "0mhdw985gs9gh44iz78a588nnnapirpnd7s0zh35jyripx8pgw47";
sha256 = "1acdak3m9782hr5bn26ck3dnnv1jxwz5yrkyv8kivavjww88m9h2";
};
vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5";

View File

@ -3,22 +3,22 @@
}:
let
version = "4.32.1";
version = "4.33.0";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
sha256 = "1mlrl5fz1v3bcb83pczqp859d8w9mi7jj600a2yw7xm372w2irk8";
sha256 = "05w714i56nipp7m985g6zqq6ljz0w5ihxrgs93j10llfdd089iig";
};
vendorSha256 = "1mz1acdj8ailgyqrr1v47n36qc24ggzw5rmj4p2awfwz3gp2yz6z";
vendorSha256 = "0ix5kxldgbcb10jh0l64lrh8qzla4qvsxi6vanb73y7lbsix120w";
assets = {
# MIT licensed
"geoip.dat" = let
geoipRev = "202011050012";
geoipSha256 = "1d2n3hskgdmcfk1nl7a8lxxz325p84i7gz44cs77z1m9r7c2vsjy";
geoipRev = "202012030015";
geoipSha256 = "1qy9h0721y5kjcp0s859lhj253jfi3d3i658gpc4kmij2l5dxm5w";
in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
@ -26,8 +26,8 @@ let
# MIT licensed
"geosite.dat" = let
geositeRev = "20201102141726";
geositeSha256 = "0sn2f5vd6w94ryh845mnbfyjzycg7cvb66rkzh37pg9l7fvgs4jh";
geositeRev = "20201207123222";
geositeSha256 = "03xckk39rrda42cam2awbsh0gib6rhmz28asc8vx29lsp9g2bj6n";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;
@ -61,11 +61,9 @@ let
'';
meta = {
homepage = "https://www.v2ray.com/en/index.html";
homepage = "https://www.v2fly.org/en_US/";
description = "A platform for building proxies to bypass network restrictions";
# The license of the dependency `https://github.com/XTLS/Go` doesn't allowed user to modify its source code,
# which made it unfree.
license = with lib.licenses; [ mit unfree ];
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ servalcatty ];
};
};
@ -77,6 +75,7 @@ in runCommand "v2ray-${version}" {
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit core;
updateScript = ./update.sh;
tests = {
simple-vmess-proxy-test = nixosTests.v2ray;

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
version = "3.0.5";
version = "3.0.6";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
sha256 = "17yrlgn18kkx7m03dr0hamv0jny6z4x6sk6an41l807i1xaqjyg6";
sha256 = "1s8glpk7li45rcf2xi21qv65dldl8sd3mmalf54pbzfcjri5fwz6";
};
buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
version = "2.6.4";
version = "2.6.5";
subPackages = [ "." ];
outputs = [ "out" "data" ];
@ -11,7 +11,7 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
sha256 = "192w98ghfldxamkx717wqa4v3lsr2imlf8xd6ygjpgx78b5zvvcx";
sha256 = "0rvcxlw8xd7sjcsvr6di04l8ml990im2c8yl3hn8054wkp51yb4l";
};
vendorSha256 = null;