Merge branch 'staging-next' into staging

This commit is contained in:
Robert Schütz
2021-02-26 10:56:17 +01:00
580 changed files with 9820 additions and 3062 deletions
+37
View File
@@ -0,0 +1,37 @@
source 'https://rubygems.org'
gemspec
group :development, :test do
#gem 'anystyle-data', github: 'inukshuk/anystyle-data'
#gem 'wapiti', github: 'inukshuk/wapiti-ruby'
gem 'bibtex-ruby'
gem 'rake'
gem 'rspec', '~>3.0'
gem 'language_detector', github: 'feedbackmine/language_detector'
gem 'unicode-scripts'
gem 'edtf'
gem 'citeproc'
gem 'unicode_utils' if RUBY_VERSION < '2.4'
end
group :coverage do
gem 'simplecov', require: false
gem 'coveralls', require: false if ENV['CI']
end
group :debug do
gem 'byebug', require: false
end
group :profile do
gem 'ruby-prof', require: false
gem 'gnuplot', require: false
end
group :extra do
gem 'lmdb'
gem 'redis'
gem 'redis-namespace'
gem 'yard'
end
+99
View File
@@ -0,0 +1,99 @@
GIT
remote: https://github.com/feedbackmine/language_detector.git
revision: 89102790194150b3a8110ce691f9989b8ce70f8d
specs:
language_detector (0.1.2)
PATH
remote: .
specs:
anystyle (1.3.10)
anystyle-data (~> 1.2)
bibtex-ruby (~> 5.0)
gli (~> 2.17)
namae (~> 1.0)
wapiti (~> 1.0, >= 1.0.2)
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
anystyle-data (1.2.0)
bibtex-ruby (5.1.4)
latex-decode (~> 0.0)
builder (3.2.4)
byebug (11.1.3)
citeproc (1.0.10)
namae (~> 1.0)
concurrent-ruby (1.1.7)
diff-lcs (1.4.4)
docile (1.3.2)
edtf (3.0.5)
activesupport (>= 3.0, < 7.0)
gli (2.19.2)
gnuplot (2.6.2)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
latex-decode (0.3.1)
lmdb (0.5.3)
minitest (5.14.1)
namae (1.0.1)
rake (13.0.1)
redis (4.2.1)
redis-namespace (1.8.0)
redis (>= 3.0.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.3)
ruby-prof (1.4.1)
simplecov (0.19.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
thread_safe (0.3.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-scripts (1.6.0)
wapiti (1.0.7)
builder (~> 3.2)
yard (0.9.25)
zeitwerk (2.4.0)
PLATFORMS
ruby
DEPENDENCIES
anystyle!
bibtex-ruby
byebug
citeproc
edtf
gnuplot
language_detector!
lmdb
rake
redis
redis-namespace
rspec (~> 3.0)
ruby-prof
simplecov
unicode-scripts
yard
BUNDLED WITH
2.1.4
@@ -0,0 +1,52 @@
# -*- encoding: utf-8 -*-
lib = File.expand_path('../lib/', __FILE__)
$:.unshift lib unless $:.include?(lib)
require 'anystyle/version'
Gem::Specification.new do |s|
s.name = 'anystyle'
s.version = AnyStyle::VERSION.dup
s.platform = Gem::Platform::RUBY
s.authors = ['Sylvester Keil']
s.email = ['http://sylvester.keil.or.at']
s.homepage = 'http://anystyle.io'
s.summary = 'Smart and fast bibliography parser.'
s.description = 'A sophisticated parser for academic reference lists and bibliographies based on machine learning algorithms using conditional random fields.'
s.license = 'BSD-2-Clause'
s.executables = []
s.require_path = 'lib'
s.required_ruby_version = '>= 2.2'
s.add_runtime_dependency('bibtex-ruby', '~>5.0')
s.add_runtime_dependency('anystyle-data', '~>1.2')
s.add_runtime_dependency('gli', '~>2.17')
s.add_runtime_dependency('wapiti', '~>1.0', '>=1.0.2')
s.add_runtime_dependency('namae', '~>1.0')
s.files =
`git ls-files`.split("\n") - `git ls-files spec`.split("\n") - %w{
.coveralls.yml
.gitignore
.rspec
.simplecov
.travis.yml
Gemfile
Rakefile
appveyor.yml
anystyle.gemspec
res/core.xml
}
s.rdoc_options = %w{
--line-numbers
--inline-source
--title "AnyStyle"
--main README.md
}
s.extra_rdoc_files = %w{README.md LICENSE}
end
# vim: syntax=ruby
+43
View File
@@ -0,0 +1,43 @@
{ lib
, buildRubyGem
, bundlerEnv
, ruby
, poppler_utils
}:
let
deps = bundlerEnv rec {
name = "anystyle-cli-${version}";
source.sha256 = lib.fakeSha256;
version = "1.3.1";
inherit ruby;
gemdir = ./.;
gemset = lib.recursiveUpdate (import ./gemset.nix) {
anystyle.source = {
remotes = ["https://rubygems.org"];
sha256 = "1w79zcia60nnnyrmyvpd10pmxrpk5c7lj9gmmblhwi8x5mfq9k0n";
type = "gem";
};
};
};
in
buildRubyGem rec {
inherit ruby;
gemName = "anystyle-cli";
pname = gemName;
version = "1.3.1";
source.sha256 = "1a3ifwxwqkp5dnfk9r8qq8kgfb8k1pl7jjdghbb8ixbxz9ac7awy";
propagatedBuildInputs = [ deps ];
preFixup = ''
wrapProgram $out/bin/anystyle --prefix PATH ${poppler_utils}/bin
'';
meta = with lib; {
description = "Command line interface to the AnyStyle Parser and Finder";
homepage = "https://anystyle.io/";
license = licenses.bsd2;
maintainers = with maintainers; [ shamilton ];
platforms = platforms.unix;
};
}
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "1.9.4";
version = "1.9.5";
pname = "aspcud";
src = fetchzip {
url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz";
sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw";
sha256 = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bdf2sfd";
version = "1.1.5";
version = "1.1.6";
src = fetchFromGitHub {
owner = "fcambus";
repo = pname;
rev = version;
sha256 = "1bpadw25barzmmsz9bkrsj3iwbgf945zqfakbgq1yscfb85bfgsp";
sha256 = "sha256-f3IdTk1GEo1GlbiJMCpqwheNJrndm7aCojA+GuKMTao=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
version = "1.4.1";
version = "1.6.0";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4";
sha256 = "sha256-GaXVMM23U3M+qNJrWYR+DLiCmILcuX5EIkQqzwN/l1Y=";
};
nativeBuildInputs = [ autoconf
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }:
let version = "0.2.5"; in
let version = "0.2.6"; in
rustPlatform.buildRustPackage {
pname = "dijo";
inherit version;
@@ -8,9 +8,9 @@ rustPlatform.buildRustPackage {
owner = "NerdyPepper";
repo = "dijo";
rev = "v${version}";
sha256 = "sha256-DdK9qdF+rFtAhemPwMpiZrtUdgD0iFqjgiZ3Yp/vLAI=";
sha256 = "sha256-fdPl+3NjgVE2MRopzeN/bxbVP6HaTnyJTGFWsLhlRoQ=";
};
cargoSha256 = "sha256-bdSXyxiHwGtdyce2YyPKq+3RfZIL425RvwRfKi59RVI=";
cargoSha256 = "sha256-45YfZWncT7hNiOhlAatpdFdxgBaF83sih67B/DPNHcs=";
meta = with lib; {
description = "Scriptable, curses-based, digital habit tracker";
+3 -3
View File
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.11.0";
version = "2.11.1";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "sha256-c+3zB0bxohQQsOjcTLHgRQamJfm7iUdz79t8q8wAFL8=";
sha256 = "sha256-pjFApZQJqw0fJmJteO7VZWRLogV3rO5XDagZd1MliZg=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-ORkj6T9O/NKuaILm5NFGePYxKMaCAAydascelaEvYVw=";
cargoSha256 = "sha256-xsTScRAu0SF1xtjUwBtNJUNIItoR0jjEd2CuSmmeh9c=";
doCheck = false;
+6 -3
View File
@@ -2,18 +2,21 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
version = "1.6.8";
version = "1.7.1";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
sha256 = "1k8ghz8xwy7v4y4r4xc690ig7qmn0mkvynplwn66j44fgdpg0v1s";
sha256 = "1xzbsnij0xsgd5j11frkf35w8rkr55hq2yl7myaxrgzh686a8law";
};
nativeBuildInputs = [ cmake flex bison ];
patches = [ ./fix-luajit-darwin.patch ];
patches = lib.optionals stdenv.isDarwin [ ./fix-luajit-darwin.patch ];
# _FORTIFY_SOURCE requires compiling with optimization (-O)
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O";
postPatch = ''
substituteInPlace src/CMakeLists.txt \
+2 -2
View File
@@ -2,7 +2,7 @@
let
pname = "gammy";
version = "0.9.62";
version = "0.9.63";
in
stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "Fushko";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fyr+khLgaX5xbKCW3pqt6fFvZBHGEVs1BsMireZDxP0=";
sha256 = "sha256-KG9XoE8Ja+P/Z311D1Vfio7QVT8EPCylEbLTT4Ln+OU=";
};
nativeBuildInputs = [ qmake wrapQtAppsHook ];
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.155.2";
version = "0.157.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YbB5mJNfGei72brV1br1dvbxrbWkqnsbuA5/o+fD0Fc=";
sha256 = "sha256-wUlAllWBGJBZ98lbf2pOfW3a31r74py5Zh7uszkRYqA=";
};
vendorSha256 = "sha256-d6l+d59DZDVCMhdjwRz7BKcxGXl1L2kdFCk82NS2XmA=";
vendorSha256 = "sha256-8SOUFlbwGwRuOB50V9eXE9KQWGiSexTZct6Rux6Stuw=";
buildFlagsArray = [
"-ldflags="
+6 -4
View File
@@ -6,7 +6,7 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.14.2)
html-proofer (3.18.5)
html-proofer (3.18.6)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
@@ -15,13 +15,15 @@ GEM
typhoeus (~> 1.3)
yell (~> 2.0)
mercenary (0.4.0)
mini_portile2 (2.4.0)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
mini_portile2 (2.5.0)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.4)
nokogiri (~> 1.8, >= 1.8.4)
parallel (1.20.1)
public_suffix (4.0.6)
racc (1.5.2)
rainbow (3.0.0)
typhoeus (1.4.0)
ethon (>= 0.9.0)
+17 -7
View File
@@ -37,10 +37,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bz0041fizdmggc5k9an4s3qk6diyybn2agcia2wr96vymfb2qjh";
sha256 = "0x8yq7hiv5wd44a0d0xhrqkjgaz3i1zjr2p6c0i7fbhq1wi8zy07";
type = "gem";
};
version = "3.18.5";
version = "3.18.6";
};
mercenary = {
groups = ["default"];
@@ -57,21 +57,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
version = "2.4.0";
version = "2.5.0";
};
nokogiri = {
dependencies = ["mini_portile2"];
dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem";
};
version = "1.10.10";
version = "1.11.1";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -104,6 +104,16 @@
};
version = "4.0.6";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
type = "gem";
};
version = "1.5.2";
};
rainbow = {
groups = ["default"];
platforms = [];
+6 -2
View File
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "memtest86-efi";
version = "8.3";
version = "8.4";
src = fetchzip {
# TODO: We're using the previous version of memtest86 because the
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# binaries that we make sure to version, then we could probably keep up
# with the latest versions released by the company.
url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip";
sha256 = "0aldz7rvnfnzb4h447q10k9c9p5ghwzdyn7f6g5lrxiv5vxf3x96";
sha256 = "sha256-jh4FKCYZbOQhRv6B7N8Hmw6RQCQvbBGaGFTMLwM1nk8=";
stripRoot = false;
};
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
];
installPhase = ''
runHook preInstall
# memtest86 is distributed as a bootable USB image. It contains the actual
# memtest86 EFI app.
#
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
')
mkdir $out
mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/
runHook postInstall
'';
meta = with lib; {
+2 -2
View File
@@ -3,7 +3,7 @@
, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
let
version = "1.23.0";
version = "1.24.6";
rpath = lib.makeLibraryPath [
alsaLib
@@ -49,7 +49,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
sha256 = "1kmhki4kq28z8h249p4imcpb0nz2dx5bmpv8ldhhqh3rcq5vzxsv";
sha256 = "sha256-GTMJ3Mu0vym2u4uZcq5LnbOod1yanCWHbGLXjVq30Hc=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
+30
View File
@@ -0,0 +1,30 @@
{ stdenv
, lib
, fetchurl
}:
stdenv.mkDerivation rec {
pname = "mslink";
version = "1.3";
src = fetchurl {
url = "http://www.mamachine.org/mslink/mslink_v${version}.tar.gz";
sha256 = "1qiwqa6w2in6gk4sxiy37c2wwpakin6l2ad2cf5s7ij96z2ijgqg";
};
preBuild = ''
rm mslink # clean up shipped executable
'';
installPhase = ''
install -D mslink $out/bin/mslink
'';
meta = with lib; {
description = "Create Windows Shortcut Files (.LNK) without using Windows";
homepage = "http://www.mamachine.org/mslink/index.en.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ mkg20001 ];
platforms = platforms.unix;
};
}
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "parallel";
version = "20210122";
version = "20210222";
src = fetchurl {
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
sha256 = "1wxkqz6ld1bp0ilvc04vhq99qjay1nl6pbk3qzvp3sjavv9vdwdl";
sha256 = "sha256-TmmwCuti906i/cZXnTHStKTMCmT+dc9hkmMSQC8b5ys=";
};
outputs = [ "out" "man" "doc" ];
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
version = "4.0.1";
version = "4.2.1";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
sha256 = "sha256-YQrANrCd0nFdn98LfHH/Ishm+fDb12cUAkxlwtZ1ng8=";
sha256 = "sha256-r6qD7KyuBj67c+nhaRLHP5B46JV8VP9MKCloqYLua+Q=";
};
nativeBuildInputs = [ pkg-config ];
+8 -1
View File
@@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
"--enable-colors256"
];
patches = lib.optional stdenv.hostPlatform.isMusl
patches = [
(fetchpatch {
# Fixes denial of services in encoding.c, remove > 4.8.0
name = "CVE-2021-26937.patch";
url = "https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch";
sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0";
})
] ++ lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff";
sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p";
+2 -2
View File
@@ -8,13 +8,13 @@ let
in stdenv.mkDerivation rec {
pname = "svtplay-dl";
version = "2.8";
version = "3.0";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "1977xyxi9jfj7qra1sz7c9lk885cadpci66jvbzvnwm6d60m05lb";
sha256 = "1k7829sgvs2ihnf8d3zrqk99ifm9867wcn6f8zg628h8aqsif4fc";
};
pythonPaths = [ pycrypto pyyaml requests ];
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "6.5.2";
version = "6.6.0";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7tgYVxZ4E6qi/HLgfC0ZreHuXgtd3JMg4ENQL50YWr4=";
sha256 = "sha256-YMg5HWDvBsYJZCxYrQuQqU4xLY8DORKYkK319pryA5I=";
};
cargoSha256 = "sha256-xxJfNFegvtHJno7o54Rqai9DvvffrkxTFci673Yq/NI=";
cargoSha256 = "sha256-G6ToQzPxuKpe1YQ4nLDJLjb3qx8D3VpuigXfdf7RHCQ=";
buildInputs = lib.optional stdenv.isDarwin Foundation;
+4 -8
View File
@@ -2,21 +2,17 @@
buildGoModule rec {
pname = "vsh";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "fishi0x01";
repo = "vsh";
rev = "v${version}";
sha256 = "1f6szcdakfx3zap1zpkrcs134plv7vnyilzcxs5jbhrrbr6q1807";
sha256 = "16q0pkmdzhq0bqy4lnnlxrc29gszca6vwajj2bg6sylcvi94x80d";
};
vendorSha256 = "0a2kjql4ibglxkq5dgzr2sxxxm38nf83s4rsk2gd1cf7v0flr02j";
# vendor dir in vsh repo is incomplete
deleteVendor = true;
runVend = true;
# vendor directory is part of repository
vendorSha256 = null;
# make sure version gets set at compile time
buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ];
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z-lua";
version = "1.8.11";
version = "1.8.12";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "z.lua";
rev = version;
sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo=";
sha256 = "sha256-q4hJ6QAR8cXjXM2e5Et1/DzyEw9L0120sgpTtqGG5wQ=";
};
dontBuild = true;