Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát
2020-10-31 14:30:44 +01:00
837 changed files with 11282 additions and 7038 deletions

View File

@@ -2,14 +2,14 @@
let
version = "1.3.0";
version = "1.4.0";
rev = "v${version}";
aptlySrc = fetchFromGitHub {
inherit rev;
owner = "aptly-dev";
repo = "aptly";
sha256 = "032gw8qkxcgc0jyrvzqh7jkbmk4k0gf7j74hyhclfnjmd9548f5l";
sha256 = "06cq761r3bxybb9xn58jii0ggp79mcp3810z1r2z3xcvplwhwnhy";
};
aptlyCompletionSrc = fetchFromGitHub {

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bdf2sfd";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "fcambus";
repo = pname;
rev = version;
sha256 = "0v1kkds35qfyv1h5kxc2m7f2gsprg9c7jzpsm3p4f71qn982wry6";
sha256 = "1lg3yabnf26lghlrmhpq7hbhydmw85q0k64246b8fwv1dnxc7afd";
};
nativeBuildInputs = [ cmake ];

View File

@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "birdfont";
version = "2.29.0";
version = "2.29.1";
src = fetchurl {
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
sha256 = "18z3qbrsbfpn00c4xq3ck1mnmvrnqgl9g1s7m4dgc1871fi6sv8w";
sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi";
};
nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ];

View File

@@ -1,22 +1,22 @@
{ stdenv, python2Packages, fetchFromGitHub }:
{ stdenv, python3Packages, fetchFromGitHub }:
python2Packages.buildPythonApplication {
python3Packages.buildPythonApplication {
pname = "broadlink-cli";
inherit (python2Packages.broadlink) version;
inherit (python3Packages.broadlink) version;
# the tools are available as part of the source distribution from GH but
# not pypi, so we have to fetch them here.
src = fetchFromGitHub {
owner = "mjg59";
repo = "python-broadlink";
# this rev is version 0.9
rev = "766b7b00fb1cec868e3d5fca66f1aada208959ce";
sha256 = "0j0idzxmpwkb1lbgvi9df2hbxafm5hxjc6mgg5481lq7z4z1r4nb";
# this rev is version 0.15.0
rev = "99add9e6feea6e47be4f3a58783556d7838b759c";
sha256 = "1q1q62brvfjcb18i0j4ca5cxqzjwv1iywdrdby0yjqa4wm6ywq6b";
};
format = "other";
propagatedBuildInputs = with python2Packages; [
propagatedBuildInputs = with python3Packages; [
broadlink
];
@@ -32,6 +32,6 @@ python2Packages.buildPythonApplication {
meta = with stdenv.lib; {
description = "Tools for interfacing with Broadlink RM2/3 (Pro) remote controls, A1 sensor platforms and SP2/3 smartplugs";
maintainers = with maintainers; [ peterhoeg ];
inherit (python2Packages.broadlink.meta) homepage license;
inherit (python3Packages.broadlink.meta) homepage license;
};
}

View File

@@ -11,14 +11,14 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.0.3";
version = "1.0.4";
src = fetchCrate {
inherit pname version;
sha256 = "046yg270hnwzhap2rraihywpqjq5s3qxmyfcvfgfayz25216jmvc";
sha256 = "06gq7xn9g5wk6d5p732998q7lxbw2g6qb8vsv95jcnybarf88n1v";
};
cargoSha256 = "02l6cdfx2sglygsdgnm474vmpbmpm2a1s6srd9cy66k6hjm1m0bn";
cargoSha256 = "1cbvi3jgj78gly3xkqbn8ai0ra5hpdphpdy7cphlrym0aj77ck4a";
nativeBuildInputs = [
makeWrapper

View File

@@ -1,20 +1,18 @@
{ stdenv, fetchurl }:
let version = "0.8"; in
stdenv.mkDerivation rec {
pname = "buildtorrent";
inherit version;
version = "0.8";
src = fetchurl {
url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
sha256 = "sha256-6OJ2R72ziHOsVw1GwalompKwG7Z/WQidHN0IeE9wUtA=";
};
meta = {
meta = with stdenv.lib; {
description = "A simple commandline torrent creator";
homepage = "http://mathr.co.uk/blog/torrent.html";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
homepage = "https://mathr.co.uk/blog/torrent.html";
license = licenses.gpl3Plus;
platforms = platforms.all;
};
}

View File

@@ -1,5 +1,11 @@
{ stdenv, fetchurl, python3, perl, textual-window-manager }:
{ stdenv, fetchurl, makeWrapper
, ncurses, python3, perl, textual-window-manager
, gettext, vim, bc, screen }:
let
inherit (stdenv) lib;
pythonEnv = python3.withPackages (ps: with ps; [ snack ]);
in
stdenv.mkDerivation rec {
version = "5.133";
name = "byobu-" + version;
@@ -11,26 +17,59 @@ stdenv.mkDerivation rec {
doCheck = true;
buildInputs = [ python3 perl ];
propagatedBuildInputs = [ textual-window-manager ];
buildInputs = [ perl makeWrapper gettext ];
propagatedBuildInputs = [ textual-window-manager screen ];
meta = {
postPatch = ''
substituteInPlace usr/bin/byobu-export.in \
--replace "gettext" "${gettext}/bin/gettext"
substituteInPlace usr/lib/byobu/menu \
--replace "gettext" "${gettext}/bin/gettext"
'';
postInstall = ''
# Byobu does not compile its po files for some reason
for po in po/*.po; do
lang=''${po#po/}
lang=''${lang%.po}
# Path where byobu looks for translations as observed in the source code and strace
mkdir -p $out/share/byobu/po/$lang/LC_MESSAGES/
msgfmt $po -o $out/share/byobu/po/$lang/LC_MESSAGES/byobu.mo
done
# Override the symlinks otherwise they mess with the wrapping
cp --remove-destination $out/bin/byobu $out/bin/byobu-screen
cp --remove-destination $out/bin/byobu $out/bin/byobu-tmux
for i in $out/bin/byobu*; do
# We don't use the usual ".$package-wrapped" because arg0 within the shebang scripts
# points to the filename and byobu matches against this to know which backend
# to start with
file=".$(basename $i)"
mv $i $out/bin/$file
makeWrapper "$out/bin/$file" "$out/bin/$(basename $i)" --argv0 $(basename $i) \
--set BYOBU_PATH ${lib.escapeShellArg (lib.makeBinPath [ vim bc ])} \
--set BYOBU_PYTHON "${pythonEnv}/bin/python"
done
'';
meta = with stdenv.lib; {
homepage = "https://launchpad.net/byobu/";
description = "Text-based window manager and terminal multiplexer";
longDescription =
''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
It was originally designed to provide elegant enhancements to the otherwise functional,
plain, practical GNU Screen, for the Ubuntu server distribution.
Byobu now includes an enhanced profiles, convenient keybindings,
configuration utilities, and toggle-able system status notifications for both
the GNU Screen window manager and the more modern Tmux terminal multiplexer,
''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
It was originally designed to provide elegant enhancements to the otherwise functional,
plain, practical GNU Screen, for the Ubuntu server distribution.
Byobu now includes an enhanced profiles, convenient keybindings,
configuration utilities, and toggle-able system status notifications for both
the GNU Screen window manager and the more modern Tmux terminal multiplexer,
and works on most Linux, BSD, and Mac distributions.
'';
license = stdenv.lib.licenses.gpl3;
license = licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.qknight ];
platforms = platforms.unix;
maintainers = with maintainers; [ qknight berbiche ];
};
}

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "debianutils";
version = "4.11.1";
version = "4.11.2";
src = fetchurl {
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz";
sha256 = "0g4qmzb2ff0rqszzpsal465hcslnpdl4nhghv59qvhamkkqnks4b";
sha256 = "1pjh2s5f8qp8jaky2x08yvf125np0s48zb2z6f3h6x4vf20hws1v";
};
meta = with stdenv.lib; {

View File

@@ -1,44 +1,26 @@
{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, qttools, qtsvg }:
{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }:
# To use `flameshot gui`, you will also need to put flameshot in `services.dbus.packages`
# in configuration.nix so that the daemon gets launched properly:
#
# services.dbus.packages = [ pkgs.flameshot ];
# environment.systemPackages = [ pkgs.flameshot ];
mkDerivation rec {
pname = "flameshot";
version = "0.6.0";
version = "0.8.4";
src = fetchFromGitHub {
owner = "lupoDharkael";
owner = "flameshot-org";
repo = "flameshot";
rev = "v${version}";
sha256 = "193szslh55v44jzxzx5g9kxhl8p8di7vbcnxlid4acfidhnvgazm";
sha256 = "0nr50ma8l612drl2br084kb3xac7jqkqr41b26d4p9y7ylwk05yq";
};
nativeBuildInputs = [ qmake qttools qtsvg ];
nativeBuildInputs = [ cmake qttools qtsvg ];
buildInputs = [ qtbase ];
qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
preConfigure = ''
# flameshot.pro assumes qmake is being run in a git checkout.
git() { echo ${version}; }
export -f git
'';
postFixup = ''
substituteInPlace $out/share/dbus-1/services/org.dharkael.Flameshot.service \
--replace "/usr/local" "$out"
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Powerful yet simple to use screenshot software";
homepage = "https://github.com/lupoDharkael/flameshot";
homepage = "https://flameshot.js.org";
maintainers = [ maintainers.scode ];
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
};
}

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fsmon";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "nowsecure";
repo = "fsmon";
rev = version;
sha256 = "0i7irqs4100j0g19jh64p2plbwipl6p3ld6w4sscc7n8lwkxmj03";
sha256 = "0y0gqb07girhz3r7gn9yrrysvhj5fapdafim0q8n7krk5y23hmh0";
};
installPhase = ''

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fzf";
version = "0.23.1";
version = "0.24.1";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
sha256 = "1x55y96i4b3gk9l2zlwb6ifsk8nxzfny3b73ly89g7kifwkb543k";
sha256 = "03f9fdqicw1a2hcjiasya0dq72jvdz6fqw7dfig4kv5l14pwf3v9";
};
vendorSha256 = "0bd4fk15i292377mv5w57gzxjp21f0rcf1py9gd6v99rx1pviq66";
vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
outputs = [ "out" "man" ];
@@ -19,6 +19,10 @@ buildGoModule rec {
buildInputs = [ ncurses ];
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${version} -X main.revision=${src.rev}"
];
# The vim plugin expects a relative path to the binary; patch it to abspath.
patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim

View File

@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, zlib, libjpeg }:
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }:
python3Packages.buildPythonApplication {
pname = "gif-for-cli";
version = "unstable-2018-08-14";
version = "1.1.2";
src = fetchFromGitHub {
owner = "google";
repo = "gif-for-cli";
rev = "9696f25fea2e38499b7c248a3151030c3c68bb00";
sha256 = "1rj8wjfsabn27k1ds7a5fdqgf2r28zpz4lvhbzssjfj1yf0mfh7s";
rev = "31f8aa2d617d6d6e941154f60e287c38dd9a74d5";
sha256 = "Bl5o492BUAn1KsscnlMIXCzJuy7xWUsdnxIKZKaRM3M=";
};
checkInputs = [ python3Packages.coverage ];
buildInputs = [ ffmpeg_3 zlib libjpeg ];
propagatedBuildInputs = with python3Packages; [ pillow requests x256 ];
buildInputs = [ zlib libjpeg ];
propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ];
meta = with stdenv.lib; {
description = "Render gifs as ASCII art in your cli";

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb }:
{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.4";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8";
};
patches = [
(fetchpatch {
url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch";
sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6";
})
];
configureFlags = [
"--enable-geoip=mmdb"
"--enable-utf8"

View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
version = "4.21";
version = "4.22";
pname = "hebcal";
src = fetchFromGitHub {
owner = "hebcal";
repo = "hebcal";
rev = "v${version}";
sha256 = "0gqjhl5i0hvnpvsg6cfc2z5ckrs66h3jlrdgim62azn3hh5bday2";
sha256 = "0bm29n51qi9q4vx4qsz3l9l1wvpvsk138zixfl5f5yz4kngzbx24";
};
nativeBuildInputs = [ autoreconfHook ];

View File

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
description = "A data pipeline that helps you process logs and other event data from a variety of systems";
homepage = "https://www.elastic.co/products/logstash";
license = if enableUnfree then licenses.elastic else licenses.asl20;
platforms = platforms.unix;

View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg
, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
, gnome2, gnome3, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
let
version = "1.22.1";
@@ -19,9 +19,9 @@ let
freetype
glib
gnome2.GConf
gnome2.gdk_pixbuf
gnome3.gtk
gnome2.pango
gdk-pixbuf
gtk3
pango
libnotify
libsecret
libuuid
@@ -60,7 +60,7 @@ in stdenv.mkDerivation {
inherit src;
buildInputs = [ dpkg wrapGAppsHook gnome3.gtk ];
buildInputs = [ dpkg wrapGAppsHook gtk3 ];
dontUnpack = true;
buildCommand = ''

View File

@@ -39,13 +39,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
version = "2020.5";
version = "2020.7";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb";
sha256 = "0clriq2ypz1fycd6mpjyrhzid44svzpzw0amnank593h69b216ax";
};
patches = [

View File

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "Shallot allows you to create customized .onion addresses for your hidden service";
description = "Allows you to create customized .onion addresses for your hidden service";
license = stdenv.lib.licenses.mit;
homepage = "https://github.com/katmagic/Shallot";

View File

@@ -1,27 +1,28 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
, cairo, wayland, wayland-protocols
{ stdenv, fetchFromGitHub, meson, ninja, pkg-config
, cairo, libxkbcommon, wayland, wayland-protocols
, buildDocs ? true, scdoc
}:
stdenv.mkDerivation rec {
pname = "slurp";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "emersion";
repo = "slurp";
rev = "v${version}";
sha256 = "0580m6kaiilgsrcj608r837r37sl6a25y7w21p7d6ij20fs3gvg1";
sha256 = "191yjn909dax8z66ks58wjadrycpbwryirkfjcy99dhq7dijg9fh";
};
nativeBuildInputs = [
meson
ninja
pkgconfig
pkg-config
] ++ stdenv.lib.optional buildDocs scdoc;
buildInputs = [
cairo
libxkbcommon
wayland
wayland-protocols
];

View File

@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
description = "Listen to SomaFM in your terminal via pure bash";
homepage = "https://github.com/rockymadden/somafm-cli";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View File

@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.45.2";
version = "0.46.2";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
sha256 = "0kxmgx4pnayp3jf6cgmka05x3aymxr79rim5nff6k3cg5zaqrz59";
sha256 = "092nqxl3vdk8k589bv3g05c598k77f4wsxcgymfb1h1fc0lfzqs4";
};
nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
@@ -31,14 +31,17 @@ rustPlatform.buildRustPackage rec {
done
'';
cargoSha256 = "0x9a322anwrgpxfqrvqb1ikavp8qffa93wdvj5kln1d2rgmxr2sy";
cargoSha256 = "1smz7084ppz79p8migpy0cqp6azf7sixv9ga65l2f3zfna7kbk78";
checkFlags = [
"--skip=directory_in_home"
"--skip=fish_directory_in_home"
"--skip=home_directory"
"--skip=truncated_directory_in_home"
"--skip=directory_in_root"
"--skip=truncation_symbol_not_truncated_home"
"--skip=truncation_symbol_truncated_home"
"--skip=folder_with_glide_yaml"
"--skip=shows_multiple_tfms"
"--skip=shows_pinned_in_project_below_root_with_global_json"
];
meta = with stdenv.lib; {

View File

@@ -1,6 +1,6 @@
{ stdenv, lib, makeWrapper, fetchurl,
alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib,
gnome2, gtk2-x11, nspr, nss,
gnome2, pango, gtk2-x11, nspr, nss,
libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes,
libXi, libXrandr, libXrender, libXScrnSaver, libXtst,
libudev0-shim
@@ -33,7 +33,7 @@
preFixup = let
libPath = lib.makeLibraryPath [
alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
gdk-pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib
gdk-pixbuf glib gnome2.GConf pango gtk2-x11 nspr nss stdenv.cc.cc.lib
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXScrnSaver libXtst
];

View File

@@ -13,15 +13,15 @@ let
bashCompletion = fetchFromGitHub {
owner = "imomaliev";
repo = "tmux-bash-completion";
rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d";
sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8";
rev = "f5d53239f7658f8e8fbaf02535cc369009c436d6";
sha256 = "0sq2g3w0h3mkfa6qwqdw93chb5f1hgkz5vdl8yw8mxwdqwhsdprr";
};
in
stdenv.mkDerivation rec {
pname = "tmux";
version = "3.1b";
version = "3.1c";
outputs = [ "out" "man" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "tmux";
repo = "tmux";
rev = version;
sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y";
sha256 = "1fqgpzfas85dn0sxlvvg6rj488jwgnxs8d3gqcm8lgs211m9qhcf";
};
nativeBuildInputs = [
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = "http://tmux.github.io/";
homepage = "https://tmux.github.io/";
description = "Terminal multiplexer";
longDescription =

View File

@@ -1,21 +1,25 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation }:
{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "5.7.0";
version = "5.8.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "0nxqi2rykfxhvn8jzprklsc47iilxp1pmm2f17ikfyf5dgi69whb";
sha256 = "0m3kqk0ghlpzysyql777jlk5c0nb36z44vabw6r0484fh5vncwrh";
};
cargoSha256 = "05afmz2n006331hc8yi2mq9kj574xi1iq6gr983jj75ix7n40rgg";
cargoSha256 = "1h5cyiyhpagdin9a8gfsccbl4jahw33nbkg5m74axyp4qrfc1mkz";
buildInputs = lib.optional stdenv.isDarwin Foundation;
# TODO: add manpage (topgrade.8) to postInstall on next update
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage topgrade.8
'';
meta = with lib; {
description = "Upgrade all the things";

View File

@@ -2,18 +2,16 @@
buildGoModule rec {
pname = "up";
version = "0.3.2";
patches = [ ./gomod.patch ];
version = "0.4";
src = fetchFromGitHub {
owner = "akavel";
repo = "up";
rev = "v${version}";
sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if";
sha256 = "1j8fi14fiwjscfzdfjqxgavjadwvcm5mqr8fb7hx3jmxs4kl58bp";
};
vendorSha256 = "1h3w4i7dyh6yagqmdclvflfq6fx0z880jdnpf28assv7fxd9rjsx";
vendorSha256 = "1q8wfsfl3rz698ck5q5s5z6iw9k134fxxvwipcp2b052n998rcrx";
doCheck = false;

View File

@@ -1,23 +0,0 @@
diff --git a/go.mod b/go.mod
index ecbfe90..56a1409 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,14 @@
module github.com/akavel/up
+go 1.14
+
require (
- github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635
+ github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect
github.com/gdamore/tcell v0.0.0-20180924055237-493f3b46b3c2
- github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856
+ github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 // indirect
github.com/mattn/go-isatty v0.0.3
- github.com/mattn/go-runewidth v0.0.2
+ github.com/mattn/go-runewidth v0.0.2 // indirect
github.com/spf13/pflag v1.0.3
- golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38
+ golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect
+ golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 // indirect
)

View File

@@ -0,0 +1,24 @@
{ stdenv, bash, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "vimv";
version = "unstable-2019-10-31";
src = fetchFromGitHub {
owner = "thameera";
repo = "vimv";
rev = "4152496c1946f68a13c648fb7e583ef23dac4eb8";
sha256 = "1fsrfx2gs6bqx7wk7pgcji2i2x4alqpsi66aif4kqvnpqfhcfzjd";
};
phases = [ "installPhase" ];
installPhase = ''
install -d $out/bin
install $src/vimv $out/bin/vimv
patchShebangs $out/bin/vimv
'';
meta = with stdenv.lib; {
homepage = "https://github.com/thameera/vimv";
description = "Batch-rename files using Vim";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.kmein ];
};
}

View File

@@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook, SDL }:
stdenv.mkDerivation {
pname = "vix";
version = "0.1.2";
src = fetchFromGitHub {
owner = "BatchDrake";
repo = "vix";
rev = "824b6755157a0f7430a0be0af454487d1492204d";
sha256 = "1y0a2sajkrsg36px21b8lgx1irf0pyj7hccyd6k806bm4zhgxw1z";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ SDL ];
meta = with stdenv.lib; {
description = "Visual Interface heXadecimal dump ";
homepage = "http://actinid.org/vix/";
license = licenses.gpl3;
maintainers = [ maintainers.ehmry ];
};
}

View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Web Offer One File - Command-line utility to easily exchange files over a local network";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ lschuermann ];
maintainers = with maintainers; [ matthiasbeyer ];
};
}

View File

@@ -35,7 +35,7 @@ appimageTools.wrapType2 rec {
meta = with lib; {
homepage = "https://wooting.io/wootility";
description = "Wootility is customization and management software for Wooting keyboards";
description = "A customization and management software for Wooting keyboards";
platforms = [ "x86_64-linux" ];
license = "unknown";
maintainers = with maintainers; [ davidtwco ];

View File

@@ -1,29 +1,29 @@
{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg_3 }:
{ stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "yle-dl";
version = "2.31";
version = "20201022";
src = fetchFromGitHub {
owner = "aajanki";
repo = "yle-dl";
rev = version;
sha256 = "0k93p9csyjm0w33diwl5s22kzs3g78jl3n9k8nxxpqrybfjl912f";
sha256 = "0p56pb3wxdzqgs4fsh4hn06xs0mgzgznqqr0bn2vkkkibnkr1asp";
};
propagatedBuildInputs = with pythonPackages; [
lxml pyamf pycrypto requests future ffmpeg_3 setuptools
propagatedBuildInputs = with python3Packages; [
attrs ConfigArgParse ffmpeg_3 future lxml requests
];
pythonPath = [ rtmpdump php ];
pythonPath = [ rtmpdump php wget ];
doCheck = false; # tests require network access
checkInputs = with pythonPackages; [ pytest pytestrunner ];
checkInputs = with python3Packages; [ ffmpeg_3 pytest pytestrunner ];
meta = with stdenv.lib; {
description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
homepage = "https://aajanki.github.io/yle-dl/";
license = licenses.gpl3;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dezgeg SuperSandro2000 ];
platforms = platforms.unix;
};
}

View File

@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "you-get";
version = "0.4.1456";
version = "0.4.1475";
# Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
sha256 = "14miw5gmj571584rmdzjxf88icmb1psrsfbwpabn8blz8l5aq6bv";
sha256 = "432c04170bb5f4881ca6af9c802b6c90e81759811487b8d7918762dcd674697f";
};
meta = with stdenv.lib; {

View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
cat <<SCRIPT > $out/bin/zsh-autoenv-share
#!${runtimeShell}
# Run this script to find the fzf shared folder where all the shell
# Run this script to find the zsh-autoenv shared folder where all the shell
# integration scripts are living.
echo $out/share/zsh-autoenv
SCRIPT