Merge branch 'master' into ckb-update-and-cleanup

This commit is contained in:
Kier Davis
2018-11-06 00:46:39 +00:00
1098 changed files with 28726 additions and 18393 deletions

View File

@@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
# https://github.com/NixOS/nixpkgs/issues/49642
doCheck = !stdenv.isDarwin;
postInstall = ''
install -m 444 -Dt $out/share/man/man1 doc/bat.1

View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "cloud-sql-proxy-${version}";
version = "1.11";
version = "1.13";
goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
@@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchgit {
rev = version;
url = "https://${goPackagePath}";
sha256 = "13g68i51f03xdh7a1qjmj8j5ljn4drd3n44fn348xfdxqclnx90l";
sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532";
};
goDeps = ./deps.nix;
@@ -20,7 +20,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
homepage = https://github.com/GoogleCloudPlatform/cloudsql-proxy;
homepage = "https://${goPackagePath}";
license = licenses.asl20;
maintainers = [ maintainers.nicknovitski ];
platforms = platforms.all;

View File

@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://code.googlesource.com/gocloud";
rev = "e9284bade4f43071dac5ec56c73a03a3c9fa7772";
sha256 = "0qm0s97bj21m04a07yni09hdh0aycgmklm5mg6flx17lrp2av9j8";
rev = "dba8c2c195294739180b3e6865f8893eb808676e";
sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy";
};
}
{
@@ -23,8 +23,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "3a7846fea0afe8cc88deb31d8cfb1fa15a3615ef";
sha256 = "1dxvliqc79bl0waczzy8ajm7jpbnn2bszwfcd71zjjxph8jz75kg";
rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344";
sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych";
};
}
{
@@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269";
sha256 = "182is558nfvk4x1cm8sqzaym8kfcaaxaga9ggqhvzqrs8mncbj22";
rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8";
sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i";
};
}
{
@@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://code.googlesource.com/google-api-go-client";
rev = "20530fd5d65ad2caee87891f9896d7547cb400c9";
sha256 = "06fsnml2kfzifxp2d5anb6vxjlgpkwl82xcddf0cg0v1bnx5mnrd";
rev = "39567f0042a03aeb2691599961ed4454e43d5063";
sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d";
};
}
]

View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "fd-${version}";
version = "7.1.0";
version = "7.2.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
sha256 = "11x9zqhahgyf0icfnl8xzdb2mn35jrmvxmnz5xzh581mmhs355m2";
sha256 = "1h7ar1m7w3vmakg9rp1nfmz7q5pqwvd8yyxwj335ixb49gph1zi5";
};
cargoSha256 = "02r0lvfh37y1bij0fqmgyh8rywap714zvxrk0l108y8cqkq2ghnd";
cargoSha256 = "0y6xp7fdjfmjfqf9avbq9bdvzvwkf3v1dv7a4k03w5279vxafzi4";
preFixup = ''
mkdir -p "$out/man/man1"

View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "fzf-${version}";
version = "0.17.4";
version = "0.17.5";
rev = "${version}";
goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "junegunn";
repo = "fzf";
sha256 = "10k21v9x82imly36lgra8a7rlvz5a1jd49db16g9xc11wx7cdg8g";
sha256 = "04kalm25sn5k24nrdmbkafp4zvxpm2l3rxchvccl0kz0j3szh62z";
};
outputs = [ "bin" "out" "man" ];

View File

@@ -25,10 +25,10 @@ in {
aggregates = glPlugin rec {
name = "graylog-aggregates-${version}";
pluginName = "graylog-plugin-aggregates";
version = "2.0.0";
version = "2.3.0";
src = fetchurl {
url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "0crgb49msjkvfpksbfhq2hlkc904j184wm1wp6q0x6lzhn07hm8y";
sha256 = "0yy455wyr01ci3nqvbhzxs6r4bb3xgac0xcmqaim1wsm1fdfi2ws";
};
meta = {
homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates;
@@ -38,10 +38,10 @@ in {
auth_sso = glPlugin rec {
name = "graylog-auth-sso-${version}";
pluginName = "graylog-plugin-auth-sso";
version = "2.3.0";
version = "2.4.2";
src = fetchurl {
url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l";
sha256 = "0nwzw7ddq2psnvj8jwaxp9i080l7y2daxy198wzb62m7i1srzcp8";
};
meta = {
homepage = https://github.com/Graylog2/graylog-plugin-auth-sso;
@@ -51,10 +51,10 @@ in {
dnsresolver = glPlugin rec {
name = "graylog-dnsresolver-${version}";
pluginName = "graylog-plugin-dnsresolver";
version = "1.1.2";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "01s7wm6bwcpmdrl35gjp6rrqxixs2s9km2bdgzhv8pn25j5qnw28";
sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1";
};
meta = {
homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver;
@@ -77,10 +77,10 @@ in {
internal-logs = glPlugin rec {
name = "graylog-internal-logs-${version}";
pluginName = "graylog-plugin-internal-logs";
version = "2.3.0";
version = "2.4.0";
src = fetchurl {
url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "05r4m2gf1hj1b889rmpb6b5a6q2xd0qkl1rpj107yd219j2grzf4";
sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc";
};
meta = {
homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs;
@@ -103,10 +103,10 @@ in {
jabber = glPlugin rec {
name = "graylog-jabber-${version}";
pluginName = "graylog-plugin-jabber";
version = "2.0.0";
version = "2.4.0";
src = fetchurl {
url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h";
sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5";
};
meta = {
homepage = https://github.com/graylog-labs/graylog-plugin-jabber;
@@ -168,10 +168,10 @@ in {
slack = glPlugin rec {
name = "graylog-slack-${version}";
pluginName = "graylog-plugin-slack";
version = "2.4.0";
version = "3.1.0";
src = fetchurl {
url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "0v8ilfhs8bnx87pjxg1i3p2vxw61rwpg4k3zhga7slavx70y986p";
sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k";
};
meta = {
homepage = https://github.com/graylog-labs/graylog-plugin-slack;

View File

@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala, python3, gnome3, gtk3, granite, gobjectIntrospection, wrapGAppsHook }:
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobjectIntrospection, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "hashit";
version = "0.2.0";
version = "1.0.0";
name = "${pname}-${version}";
@@ -10,30 +10,37 @@ stdenv.mkDerivation rec {
owner = "artemanufrij";
repo = pname;
rev = version;
sha256 = "1d2g7cm7hhs354waidak9xkhhcvqlwnsl9d0bar9p82gfnpjdg7v";
sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv";
};
nativeBuildInputs = [
desktop-file-utils
gobjectIntrospection
meson
ninja
pkgconfig
python3
vala
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook
];
buildInputs = [
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
gnome3.libgee
granite
gtk3
gnome3.libgee
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
meta = with stdenv.lib; {
description = "A simple app for checking usual checksums";
homepage = https://github.com/artemanufrij/hashit;
license = licenses.gpl2Plus;
homepage = https://github.com/artemanufrij/hashit;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ worldofpeace ];
platforms = platforms.linux;
platforms = platforms.linux;
};
}

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "jdupes-${version}";
version = "1.10.4";
version = "1.11";
src = fetchFromGitHub {
owner = "jbruchon";
repo = "jdupes";
rev = "v${version}";
sha256 = "03a2jxv634xy5qwjrk784k3y3pd8f94pndf5m84yg2y7i8dvppnk";
sha256 = "124n9vgnqqhnwgnms7dqmndp25xrcjaykxrzbi4v4as98kxxi3j1";
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The testdir
# directories have such files and will be removed.

View File

@@ -1,48 +0,0 @@
{ stdenv, fetchurl, python }:
let
pythonEnv = python.withPackages(ps: [ps.Pyro]);
in stdenv.mkDerivation rec {
name = "openopc-${version}";
version = "1.2.0";
src = fetchurl {
url = "mirror://sourceforge/project/openopc/openopc/${version}/OpenOPC-${version}.source.tar.bz2";
sha256 = "0mm77fiipz5zy82l6pr3wk18bfril81milv2rdxr954c4gw5smyd";
};
# There is no setup.py or any other "build system" file in the source archive.
installPhase = ''
mkdir -p "$out/bin"
mkdir -p "$out/share/doc/openopc"
mkdir -p "$out/${pythonEnv.python.sitePackages}"
mkdir -p "$out/libexec/opc"
cp src/OpenOPC.py "$out/${pythonEnv.python.sitePackages}"
cp src/opc.py "$out/libexec/opc/"
cat > "$out/bin/opc" << __EOF__
#!${stdenv.shell}
export PYTHONPATH="$out/${pythonEnv.python.sitePackages}"
exec ${pythonEnv}/bin/${pythonEnv.python.executable} "$out/libexec/opc/opc.py" "\$@"
__EOF__
chmod a+x "$out/bin/opc"
cp -R *.txt doc/* "$out/share/doc/openopc/"
# Copy these MS Windows tools, for reference.
cp src/OpenOPCService.py src/SystemHealth.py "$out/libexec/opc/"
'';
meta = with stdenv.lib; {
description = "OPC (OLE for Process Control) toolkit designed for use with Python";
homepage = http://openopc.sourceforge.net/;
# """OpenOPC for Python is freely available under the terms of the GNU GPL.
# However, the OpenOPC library module is licensed under the "GPL + linking
# exception" license, which generally means that programs written using the
# OpenOPC library may be licensed under any terms."""
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2018.11";
version = "1.2018.12";
name = "plantuml-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
sha256 = "006bpxz6zsjypxscxbnz3b7icg47bfwcq1v7rvijflchw12hq9nm";
sha256 = "1ydi4zwzwf9q6hldzd9pcvsbrwy8r52vqxm74j2wq8yivh2p85s4";
};
nativeBuildInputs = [ makeWrapper ];

View File

@@ -1,25 +1,29 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
rustPlatform.buildRustPackage rec {
pname = "powerline-rs";
name = "${pname}-${version}";
version = "0.1.8";
version = "0.1.9";
src = fetchFromGitHub {
src = fetchFromGitLab {
owner = "jD91mZM2";
repo = "powerline-rs";
rev = version;
#rev = version;
sha256 = "018i9qq98afbgv0nxs1n83zb09lqhqxpdrd95f2maic3rr5ngnj5";
# Support for $COMPLETION_OUT:
rev = "44679385a95dd9f3ebd9b093f9ef8925610e9a23";
sha256 = "1mxkw6ydnqjyplbki2j9pbnlhxmkw9qqw54443a3cjmn2g08jyzp";
};
cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
cargoSha256 = "1sr9vbfk5bb3n0lv93y19in1clyvbj0w3p1gmp4sbw8lx84zwxhc";
nativeBuildInputs = [ pkgconfig file perl cmake curl ];
buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
COMPLETION_OUT = "out";
postInstall = ''
install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"
install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/etc/bash_completion.d/${pname}"
install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
'';
meta = with lib; {

View File

@@ -2,23 +2,21 @@
rustPlatform.buildRustPackage rec {
name = "skim-${version}";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "lotabout";
repo = "skim";
rev = "v${version}";
sha256 = "1k7l93kvf5ad07yn69vjfv6znwb9v38d53xa1ij195x4img9f34j";
sha256 = "1b3l0h69cm70669apsgzp7qw1k5fi2gbk9176hjr9iypbdiwjyir";
};
outputs = [ "out" "vim" ];
cargoSha256 = "18lgjh1b1wfm9xsd6y6slfj1i3dwrvzkzszdzk3lmqx1f8515gx7";
cargoSha256 = "0ksxyivdrrs3z5laxkqzq4lql6w0hqf92daazanxkw8vfcksbzsm";
patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
# fix Cargo.lock version
sed -i -e '168s|0.4.0|0.5.1|' Cargo.lock
'';
postInstall = ''
@@ -36,7 +34,7 @@ rustPlatform.buildRustPackage rec {
'';
meta = with stdenv.lib; {
description = "Fuzzy Finder in rust!";
description = "Command-line fuzzy finder written in Rust";
homepage = https://github.com/lotabout/skim;
license = licenses.mit;
maintainers = with maintainers; [ dywedir ];

View File

@@ -5,23 +5,15 @@
stdenv.mkDerivation rec {
name = "snapper-${version}";
version = "0.5.0";
version = "0.7.2";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm";
sha256 = "1dm1kf4wrbcaaagxgbc8q0f5j9dq3bmp6ycl7zx8p70s4nv3xnbc";
};
patches = [
# Fix build with new Boost
(fetchpatch {
url = "https://github.com/openSUSE/snapper/commit/2e3812d2c1d1f54861fb79f5c2b0197de96a00a3.patch";
sha256 = "0yrzss1v7lmcvkajmchz917yqsvlsdfz871szzw790v6pql1322s";
})
];
nativeBuildInputs = [
autoreconfHook pkgconfig
docbook_xsl libxslt docbook_xml_dtd_45

View File

@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip
, rtmpdump }:
, rtmpdump, gitMinimal }:
let
inherit (python3Packages) python nose pycrypto requests mock;
inherit (python3Packages) python nose pycrypto pyyaml requests mock;
in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}";
version = "1.9.11";
version = "2.1";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "14p2362rzyblma9321z4zrcbzfs9m269ry6sz44ly0bv5fik7gdy";
sha256 = "1cnc32gbhs955391hs1x1jpjsl3b6pqy7ysdydmp9q1i2rw105ln";
};
pythonPaths = [ pycrypto requests ];
pythonPaths = [ pycrypto pyyaml requests ];
buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths;
nativeBuildInputs = [ zip ];
nativeBuildInputs = [ gitMinimal zip ];
postPatch = ''
substituteInPlace lib/svtplay_dl/fetcher/rtmp.py \

View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "tealdeer-${version}";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "dbrgn";
repo = "tealdeer";
rev = "v${version}";
sha256 = "0mkcja9agkbj2i93hx01r77w66ca805v4wvivcnrqmzid001717v";
sha256 = "055pjxgiy31j69spq66w80ig469yi075dk8ad38z6rlvjmf74k71";
};
cargoSha256 = "1qrvic7b6g3f3gjzx7x97ipp7ppa79c0aawn0lsav0c9xxzl44jq";
cargoSha256 = "1jxwz2b6p82byvfjx77ba265j6sjr7bjqi2yik8x2i7lrz8v8z1g";
buildInputs = [ openssl cacert curl ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
meta = with stdenv.lib; {
description = "An implementation of tldr in Rust";
description = "A very fast implementation of tldr in Rust";
homepage = "https://github.com/dbrgn/tealdeer";
maintainers = with maintainers; [ davidak ];
license = with licenses; [ asl20 mit ];

View File

@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "tmux";
repo = "tmux";
rev = version;
sha256 = "0n8sjddy00xgh1rvvw968hh72pyslg1gahmzajfc4b3xax87drpi";
rev = "01918cb0170e07288d3aec624516e6470bf5b7fc";
sha256 = "1fy87wvxn7r7jzqapvjisc1iizic3kxqk2lv83giqmw1y4g3s7rl";
};
postPatch = ''

View File

@@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
name = "ttyplot-${version}";
version = "1.0";
src = fetchFromGitHub {
owner = "tenox7";
repo = "ttyplot";
rev = version;
sha256 = "1i54hw7fad42gdlrlqg7s0vhsq01yxzdi2s0r3svwbb1sr7ynzn1";
};
buildInputs = [ ncurses ];
buildPhase = ''
${stdenv.cc}/bin/cc ./ttyplot.c -lncurses -o ttyplot
'';
installPhase = ''
mkdir -p $out/bin
cp ttyplot $out/bin/
'';
meta = with stdenv.lib; {
description = "a simple general purpose plotting utility for tty with data input from stdin.";
homepage = https://github.com/tenox7/ttyplot;
license = licenses.unlicense;
maintainers = with maintainers; [ lassulus ];
};
}

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "units-${version}";
version = "2.17";
version = "2.18";
src = fetchurl {
url = "mirror://gnu/units/${name}.tar.gz";
sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz";
sha256 = "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4";
};
buildInputs = [ readline ];

View File

@@ -16,11 +16,14 @@
buildPythonPackage rec {
pname = "youtube-dl";
version = "2018.10.05";
# 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 = "2018.10.29";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw";
sha256 = "1ndkkpnmjdyz5gjjmvaf18761lxa2c0kypicm9bpqpaj7sdr9s27";
};
nativeBuildInputs = [ makeWrapper ];