public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
This commit is contained in:
Vladimír Čunát
2019-07-06 13:40:38 +02:00
parent 8e97d0be6b d567c486ca
commit 0746c4dbb4
337 changed files with 11109 additions and 8836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/audio/abcmidi/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "abcMIDI-${version}";
version = "2019.06.06";
version = "2019.06.14";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
sha256 = "1vmz2vj6asvy254y2ap89ah46lxr4pcw7bb827wrs3rzcysmcwjf";
sha256 = "1z503k2j6504h4p205q7wjrvh5x9jhkvsapfz322m3r905l2vc2b";
};
# There is also a file called "makefile" which seems to be preferred by the standard build phase

5
pkgs/tools/audio/google-music-scripts/default.nix
View File

@@ -9,13 +9,15 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d";
};
patches = [ ./loguru.patch ];
propagatedBuildInputs = with python3.pkgs; [
appdirs
audio-metadata
google-music
google-music-proto
google-music-utils
#loguru
loguru
pendulum
natsort
tomlkit
@@ -29,6 +31,5 @@ python3.pkgs.buildPythonApplication rec {
description = "A CLI utility for interacting with Google Music";
license = licenses.mit;
maintainers = with maintainers; [ jakewaksbaum ];
broken = true; # 2019-03-15, missing dependency loguru
};
}

22
pkgs/tools/audio/google-music-scripts/loguru.patch Normal file
View File

@@ -0,0 +1,22 @@
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ audio-metadata = "^0.4"
google-music = "^3.0"
google-music-proto = "^2.4"
google-music-utils = "^2.1"
-loguru = "^0.2"
+loguru = "^0.3"
pendulum = "^2.0"
natsort = ">=5.0,<7.0"
tomlkit = "^0.5"
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ install_requires = \
'google-music-proto>=2.4,<3.0',
'google-music-utils>=2.1,<3.0',
'google-music>=3.0,<4.0',
- 'loguru>=0.2,<0.3',
+ 'loguru>=0.3,<0.4',
'natsort>=5.0,<7.0',
'pendulum>=2.0,<3.0',
'tomlkit>=0.5,<0.6']

4
pkgs/tools/filesystems/fuse-overlayfs/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
version = "0.4";
version = "0.4.1";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "1hm1swgv9fi4kdwqssb6rh83i62qyfzv0yrh0z73kwrwdbqbg8m9";
sha256 = "1qjkzpxv7zy9i6lvcrn8yp8dfsqak6c7ffx8g0xfavdx7am458ns";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

2
pkgs/tools/graphics/scrot/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = http://linuxbrit.co.uk/scrot/;
description = "A command-line screen capture utility";
platforms = platforms.linux;
maintainers = with maintainers; [ garbas ];
maintainers = with maintainers; [ ];
license = licenses.mit;
};
}

2
pkgs/tools/misc/dbacl/default.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://dbacl.sourceforge.net/;
longDescription = "a digramic Bayesian classifier for text recognition.";
maintainers = [ stdenv.lib.maintainers.garbas ];
maintainers = [];
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
};

23
pkgs/tools/misc/dua/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.1.5";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "0xiprpk74l0q5w3j82lx1l3jy4mi015nvlixih9z1lam4qi1yq0p";
};
cargoSha256 = "1jg1ljm5h21shkyfrq0ivz9m0c25dxc0kd6cipf5i2dbnzcszmhh";
meta = with lib; {
description = "A tool to conveniently learn about the disk usage of directories, fast!";
homepage = "https://github.com/Byron/dua-cli";
license = with licenses; [ mit ];
maintainers = with maintainers; [ killercup ];
platforms = platforms.all;
};
}

6
pkgs/tools/misc/ffsend/default.nix
View File

@@ -16,16 +16,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
version = "0.2.48";
version = "0.2.49";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "0hs74z76yayv3hxcpcfb1bsyq6dclyri7q7siap98nxlv650896n";
sha256 = "08x0kakhn75yzajxpvpdp1ml9z77i2x2k02kqcx3ssr6mbc7xnpf";
};
cargoSha256 = "1hkdpzz2q2lqnq15gr1npipmbvdda637ylgkzn443bl09jd3j1q6";
cargoSha256 = "1dmkij25gj0ya1i6h5l7pkjnqvj02zvsx15hddbjn1q06pihcsjm";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]

2
pkgs/tools/misc/goaccess/default.nix
View File

@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = https://goaccess.io;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ ederoyd46 garbas ];
maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
};
}

24
pkgs/tools/misc/lazydocker/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "lazydocker";
version = "0.5";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
sha256 = "0f062xn58dbci22pg6y4ifcdfs8whzlv2jjprxxk2ygzixrrjwnc";
};
modSha256 = "02n0lg28icy11a2j2rrlmp70blby0kmjas5j48jwh9h9a0yplqic";
subPackages = [ "." ];
meta = with stdenv.lib; {
description = "A simple terminal UI for both docker and docker-compose";
homepage = https://github.com/jesseduffield/lazydocker;
license = licenses.mit;
maintainers = with maintainers; [ das-g ];
};
}

4
pkgs/tools/misc/parallel/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
name = "parallel-20190522";
name = "parallel-20190622";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "0y3z9wybs3gak3zwgsby8r5gg6dwd3qlrkch0q4fn0i1j1jhmijv";
sha256 = "1v5fbrxw9l1navmvxapb1raa2jr19vfjw3i28h7fgdqd8n6gs79z";
};
nativeBuildInputs = [ makeWrapper ];

15
pkgs/tools/misc/powerline-go/default.nix
View File

@@ -1,21 +1,18 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "powerline-go";
version = "1.12.1";
version = "1.13.0";
name = "${pname}-${version}";
rev = "v${version}";
goPackagePath = "github.com/justjanne/powerline-go";
src = fetchFromGitHub {
owner = "justjanne";
repo = pname;
inherit rev;
sha256 = "0r2n3hjgr7c7nwwcph7i2lv3709z9cyc8gmsinlzjwny998akyf4";
rev = "v${version}";
sha256 = "0hgc0ji9jcsq5qnvx54dvpq8qx80mgdbvkllzavnvqr7md638zk9";
};
goDeps = ./deps.nix;
modSha256 = "0800r08rawv4fz08d332z0fy6pd16l1dyflz3h91ba00g59wc2ah";
meta = with stdenv.lib; {
description = "A Powerline like prompt for Bash, ZSH and Fish";

57
pkgs/tools/misc/powerline-go/deps.nix generated
View File

@@ -1,57 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
};
}
{
goPackagePath = "github.com/shirou/gopsutil";
fetch = {
type = "git";
url = "https://github.com/shirou/gopsutil";
rev = "2cbc9195c892b304060269ef280375236d2fcac9";
sha256 = "1m66hhh37lxn525y2gnmh4ipc88c3wfiixr5ydywa9v1z90wxw5r";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f";
sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "4b34438f7a67ee5f45cc6132e2bad873a20324e9";
sha256 = "1xnsiaikz62wqjpaly1j4nqwp504gih5mgw9wdj1pp1d4bmx0vl0";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "f4905fbd45b6790792202848439271c74074bbfd";
sha256 = "184d6ap2g92jvx0532lymdqbnx9vi9ips4dq5lnqbby0caccc6r1";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]

4
pkgs/tools/misc/slurp/default.nix
View File

@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "slurp";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "emersion";
repo = "slurp";
rev = "v${version}";
sha256 = "15fqspg3cjl830l95ibibprxf9p13mc2rpyf9bdwsdx2f4qrkq62";
sha256 = "0580m6kaiilgsrcj608r837r37sl6a25y7w21p7d6ij20fs3gvg1";
};
nativeBuildInputs = [

2
pkgs/tools/misc/venus/default.nix
View File

@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = http://intertwingly.net/code/venus/docs/index.html;
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.garbas ];
maintainers = [];
};
}

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.06.27";
version = "2019.07.02";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1kxqiyhhgv0n85jc02kai5i6wdjs1696k88q1phq7ik2y6ky3c7y";
sha256 = "1ci09m2fg23vk92sk3wkg0b2jkph8d06spyn2s3fgr1rwzwazgir";
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/tools/networking/aircrack-ng/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Wireless encryption cracking tools";
homepage = http://www.aircrack-ng.org/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ domenkozar garbas ];
maintainers = with maintainers; [ domenkozar ];
platforms = platforms.linux;
};
}

2
pkgs/tools/networking/haproxy/default.nix
View File

@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
hardware.
'';
homepage = http://haproxy.1wt.eu;
maintainers = with stdenv.lib.maintainers; [ fuzzy-id garbas ];
maintainers = with stdenv.lib.maintainers; [ fuzzy-id ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
license = stdenv.lib.licenses.gpl2;
};

4
pkgs/tools/networking/iperf/3.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, fetchpatch }:
stdenv.mkDerivation rec {
name = "iperf-3.6";
name = "iperf-3.7";
src = fetchurl {
url = "https://downloads.es.net/pub/iperf/${name}.tar.gz";
sha256 = "0vllfmyqiy6nxgbagsx1zrs4pmfawyalzm5l1xcwqq64dpj52pfy";
sha256 = "033is7b5grfbiil98jxlz4ixp9shm44x6hy8flpsyz1i4h108inq";
};
buildInputs = [ openssl ];

4
pkgs/tools/networking/miniupnpc/default.nix
View File

@@ -28,8 +28,8 @@ let
};
in {
miniupnpc_2 = generic {
version = "2.1.20190408";
sha256 = "1v0l2m8j7r6jiy871d6v11ls243xqn6s3856iwd3bmk5c37npi50";
version = "2.1.20190625";
sha256 = "1yqp0d8x5ldjfma5x2vhpg1aaafdg0470ismccixww3rzpbza8w7";
};
miniupnpc_1 = generic {
version = "1.9.20160209";

2
pkgs/tools/networking/offlineimap/default.nix
View File

@@ -35,6 +35,6 @@ python2Packages.buildPythonApplication rec {
description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
homepage = http://offlineimap.org;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.garbas ];
maintainers = [];
};
}

34
pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch Normal file
View File

@@ -0,0 +1,34 @@
From 1c9cc97e9d47d73763810dcb4a36b6cdf31a2254 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 30 Jun 2019 11:54:35 -0400
Subject: [PATCH] dirmngr: Only use SKS pool CA for SKS pool
* dirmngr/http.c (http_session_new): when checking whether the
keyserver is the HKPS pool, check specifically against the pool name,
as ./configure might have been used to select a different default
keyserver. It makes no sense to apply Kristian's certificate
authority to anything other than the literal host
hkps.pool.sks-keyservers.net.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
GnuPG-Bug-Id: 4593
---
dirmngr/http.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 384f2569d..8e5d53939 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -767,7 +767,7 @@ http_session_new (http_session_t *r_session,
is_hkps_pool = (intended_hostname
&& !ascii_strcasecmp (intended_hostname,
- get_default_keyserver (1)));
+ "hkps.pool.sks-keyservers.net"));
/* If the user has not specified a CA list, and they are looking
* for the hkps pool from sks-keyservers.net, then default to
--
2.22.0

5
pkgs/tools/security/gnupg/22.nix
View File

@@ -32,10 +32,7 @@ stdenv.mkDerivation rec {
patches = [
./fix-libusb-include-path.patch
(fetchpatch {
url = https://files.gnupg.net/file/data/qmxjhc6kuja3orybj7st/PHID-FILE-vvzlnw36427pdnug2amc/file;
sha256 = "13snxkmlgmvn0rgxh5k2sgxkp5mbxqiznzm45sw649nvs3ccghq8";
})
./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch
];
postPatch = ''
sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \

12
pkgs/tools/security/keybase/default.nix
View File

@@ -1,20 +1,22 @@
{ stdenv, lib, buildGoPackage, fetchurl, cf-private
{ stdenv, lib, buildGoPackage, fetchFromGitHub, cf-private
, AVFoundation, AudioToolbox, ImageIO, CoreMedia
, Foundation, CoreGraphics, MediaToolbox
}:
buildGoPackage rec {
name = "keybase-${version}";
version = "4.0.0";
version = "4.1.0";
goPackagePath = "github.com/keybase/client";
subPackages = [ "go/keybase" ];
dontRenameImports = true;
src = fetchurl {
url = "https://github.com/keybase/client/archive/v${version}.tar.gz";
sha256 = "14c0876mxz3xa2k4d665kf8j6k3hc6qybkj0gr4pr9c9gs70cgjh";
src = fetchFromGitHub {
owner = "keybase";
repo = "client";
rev = "v${version}";
sha256 = "00mxyy4jhdbcvbwabf4yvq4h5mpnlfp2z93gy2266kz6gkd5myzk";
};
buildInputs = lib.optionals stdenv.isDarwin [

6
pkgs/tools/security/keybase/gui.nix
View File

@@ -4,16 +4,16 @@
, runtimeShell, gsettings-desktop-schemas }:
let
versionSuffix = "20190508150240.6614a49937";
versionSuffix = "20190612201656.952fee6c59";
in
stdenv.mkDerivation rec {
name = "keybase-gui-${version}";
version = "4.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
version = "4.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
sha256 = "1fj92gxwfd6909r79prsq760b9s50js1iip5c01621hz9y39jd6m";
sha256 = "0jwxw75yz7sbvfqw2aksa3p7jlcv817743fl59qk6rq1x9ag6qpx";
};
nativeBuildInputs = [

2
pkgs/tools/security/pass/rofi-pass.nix
View File

@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A script to make rofi work with password-store";
homepage = https://github.com/carnager/rofi-pass;
maintainers = with stdenv.lib.maintainers; [ the-kenny garbas ];
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
license = stdenv.lib.licenses.gpl3;
platforms = with stdenv.lib.platforms; linux;
};

4
pkgs/tools/security/sshguard/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, autoreconfHook, yacc, flex}:
stdenv.mkDerivation rec {
version = "2.3.1";
version = "2.4.0";
name = "sshguard-${version}";
src = fetchurl {
url = "mirror://sourceforge/sshguard/${name}.tar.gz";
sha256 = "18i0kmjvym9xym3ysg5kap0298nzcprar9y96k54p3zpdpi5b43n";
sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06";
};
doCheck = true;

4
pkgs/tools/system/di/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "di-${version}";
version = "4.47";
version = "4.47.1";
src = fetchurl {
url = "http://gentoo.com/di/${name}.tar.gz";
sha256 = "0zlapxlzjizwzwa8xwrwibhcbkh0wx7n74gvjpp6wlwq7cgiq0xm";
sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f";
};
makeFlags = [ "INSTALL_DIR=$(out)" ];

37
pkgs/tools/system/netdata/default.nix
View File

@@ -1,6 +1,17 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit, lm_sensors }:
{ stdenv, fetchurl, autoreconfHook, pkgconfig
, CoreFoundation, IOKit, libossp_uuid
, curl, libcap, libuuid, lm_sensors, zlib
, withCups ? false, cups
, withDBengine ? true, libuv, lz4, judy
, withIpmi ? (!stdenv.isDarwin), freeipmi
, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct
, withSsl ? true, openssl
, withDebug ? false
}:
stdenv.mkDerivation rec{
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.15.0";
name = "netdata-${version}";
@@ -10,20 +21,32 @@ stdenv.mkDerivation rec{
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ zlib ]
++ (if stdenv.isDarwin then [ libossp_uuid CoreFoundation IOKit ] else [ libuuid ]);
buildInputs = [ curl.dev zlib.dev ]
++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]
++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ]
++ optionals withCups [ cups ]
++ optionals withDBengine [ libuv lz4.dev judy ]
++ optionals withIpmi [ freeipmi ]
++ optionals withNetfilter [ libmnl libnetfilter_acct ]
++ optionals withSsl [ openssl.dev ];
patches = [
./no-files-in-etc-and-var.patch
];
postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''
NIX_CFLAGS_COMPILE = optional withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
postInstall = optionalString (!stdenv.isDarwin) ''
# rename this plugin so netdata will look for setuid wrapper
mv $out/libexec/netdata/plugins.d/apps.plugin \
$out/libexec/netdata/plugins.d/apps.plugin.org
${optionalString withIpmi ''
mv $out/libexec/netdata/plugins.d/freeipmi.plugin \
$out/libexec/netdata/plugins.d/freeipmi.plugin.org
''}
'';
preConfigure = ''
preConfigure = optionalString (!stdenv.isDarwin) ''
substituteInPlace collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \
--replace 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
@@ -37,7 +60,7 @@ stdenv.mkDerivation rec{
rm -r $out/sbin
'';
meta = with stdenv.lib; {
meta = {
description = "Real-time performance monitoring tool";
homepage = https://my-netdata.io/;
license = licenses.gpl3;

4
pkgs/tools/text/link-grammar/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "5.6.1";
version = "5.6.2";
pname = "link-grammar";
outputs = [ "bin" "out" "dev" "man" ];
src = fetchurl {
url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
sha256 = "1y0zydcr501nlw3r1vh68z6fqj1kjgrc2l8d1hmdv3ipynadqwm2";
sha256 = "1jc6j5kxdv3y4mm82q0rrjvlak8p26fqh92dzw5bkwxnvjmjjg1k";
};
nativeBuildInputs = [ pkgconfig python3 ];

1
pkgs/tools/typesetting/asciidoctor/Gemfile
View File

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
gem 'asciidoctor'
gem 'asciidoctor-diagram'
gem 'asciidoctor-pdf'
gem 'asciidoctor-epub3'
gem 'asciidoctor-mathematical'
gem 'coderay'
gem 'pygments.rb'

13
pkgs/tools/typesetting/asciidoctor/Gemfile.lock
View File

@@ -8,6 +8,11 @@ GEM
asciidoctor (2.0.10)
asciidoctor-diagram (1.5.18)
asciidoctor (>= 1.5.0, < 3.x)
asciidoctor-epub3 (1.5.0.alpha.9)
asciidoctor (>= 1.5.0, < 3.0.0)
concurrent-ruby (~> 1.1.5)
gepub (~> 1.0.2)
thread_safe (~> 0.3.6)
asciidoctor-mathematical (0.3.0)
asciidoctor (~> 2.0, >= 2.0.0)
mathematical (~> 1.5, >= 1.5.8)
@@ -27,12 +32,18 @@ GEM
concurrent-ruby (1.1.5)
css_parser (1.7.0)
addressable
gepub (1.0.4)
nokogiri (>= 1.8.2, < 1.11)
rubyzip (>= 1.1.1)
hashery (2.1.2)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
mathematical (1.6.12)
ruby-enum (~> 0.4)
mini_portile2 (2.4.0)
multi_json (1.13.1)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
pdf-core (0.7.0)
pdf-reader (2.2.0)
Ascii85 (~> 1.0.0)
@@ -61,6 +72,7 @@ GEM
ruby-enum (0.7.2)
i18n
ruby-rc4 (0.1.5)
rubyzip (1.2.3)
safe_yaml (1.0.5)
thread_safe (0.3.6)
treetop (1.5.3)
@@ -73,6 +85,7 @@ PLATFORMS
DEPENDENCIES
asciidoctor
asciidoctor-diagram
asciidoctor-epub3
asciidoctor-mathematical
asciidoctor-pdf
coderay

85
pkgs/tools/typesetting/asciidoctor/default.nix
View File

@@ -1,59 +1,46 @@
{ stdenv, lib, bundlerApp, ruby, bundix, mkShell
# Dependencies of the 'mathematical' package
, cmake, bison, flex, glib, pkgconfig, cairo
, pango, gdk_pixbuf, libxml2, python3, patchelf
{ lib, bundlerApp, makeWrapper,
# Optional dependencies, can be null
epubcheck, kindlegen,
# For the update shell
mkShell, bundix
}:
bundlerApp rec {
inherit ruby;
pname = "asciidoctor";
gemdir = ./.;
let
app = bundlerApp {
pname = "asciidoctor";
gemdir = ./.;
exes = [
"asciidoctor"
"asciidoctor-pdf"
"asciidoctor-safe"
];
exes = [
"asciidoctor"
"asciidoctor-pdf"
"asciidoctor-safe"
"asciidoctor-epub3"
];
gemConfig = {
mathematical = attrs: {
buildInputs = [
cmake
bison
flex
glib
pkgconfig
cairo
pango
gdk_pixbuf
libxml2
python3
];
buildInputs = [ makeWrapper ];
# The ruby build script takes care of this
dontUseCmakeConfigure = true;
# For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here
postFixup = lib.optionalString stdenv.isLinux ''
soPath="$out/${ruby.gemPath}/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so"
${patchelf}/bin/patchelf \
--set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(${patchelf}/bin/patchelf --print-rpath "$soPath")" \
"$soPath"
postBuild = ''
wrapProgram "$out/bin/asciidoctor-epub3" \
${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} \
${lib.optionalString (kindlegen != null) "--set KINDLEGEN ${kindlegen}/bin/kindlegen"}
'';
passthru = {
inherit updateShell;
};
meta = with lib; {
description = "A faster Asciidoc processor written in Ruby";
homepage = https://asciidoctor.org/;
license = licenses.mit;
maintainers = with maintainers; [ gpyh ];
platforms = platforms.unix;
};
};
passthru.updateShell = mkShell {
buildInputs = (gemConfig.mathematical {}).buildInputs ++ [
bundix
];
updateShell = mkShell {
inputsFrom = lib.attrValues app.gems;
buildInputs = [ bundix ];
};
meta = with lib; {
description = "A faster Asciidoc processor written in Ruby";
homepage = https://asciidoctor.org/;
license = licenses.mit;
maintainers = with maintainers; [ gpyh ];
platforms = platforms.unix;
};
}
in
app

53
pkgs/tools/typesetting/asciidoctor/gemset.nix
View File

@@ -51,6 +51,17 @@
};
version = "1.5.18";
};
asciidoctor-epub3 = {
dependencies = ["asciidoctor" "concurrent-ruby" "gepub" "thread_safe"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "056yp0z64b1fhhkzz2kaiqsd11gpbgx2d1yjgq7cqma9c70bbxa5";
type = "gem";
};
version = "1.5.0.alpha.9";
};
asciidoctor-mathematical = {
dependencies = ["asciidoctor" "mathematical" "ruby-enum"];
groups = ["default"];
@@ -104,6 +115,17 @@
};
version = "1.7.0";
};
gepub = {
dependencies = ["nokogiri" "rubyzip"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kg2h0mscb2hq6l3wjzq5fp5vw4552nglq8n9pawm7bzacf1gzyf";
type = "gem";
};
version = "1.0.4";
};
hashery = {
groups = ["default"];
platforms = [];
@@ -136,6 +158,16 @@
};
version = "1.6.12";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
version = "2.4.0";
};
multi_json = {
groups = ["default"];
platforms = [];
@@ -146,6 +178,17 @@
};
version = "1.13.1";
};
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
version = "1.10.3";
};
pdf-core = {
groups = ["default"];
platforms = [];
@@ -284,6 +327,16 @@
};
version = "0.1.5";
};
rubyzip = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
type = "gem";
};
version = "1.2.3";
};
safe_yaml = {
groups = ["default"];
platforms = [];

4
pkgs/tools/typesetting/asciidoctor/update.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
rm gemset.nix Gemfile.lock
nix-shell ../../../.. -A asciidoctor.updateShell --run '
rm gemset.nix Gemfile.lock
bundix -m --bundle-pack-path $TMPDIR/asciidoctor-ruby-bundle
rm -r .bundle
'
rm -r .bundle