Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt
2021-05-08 14:43:43 +02:00
657 changed files with 2572 additions and 1628 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://micans.org/apparix";
description = "Add directory bookmarks, distant listing, and distant editing to the command line";
maintainers = with maintainers; [ lethalman ];
maintainers = with maintainers; [ ];
license = licenses.gpl2;
platforms = platforms.all;
};
+1 -1
View File
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.all;
maintainers = [ maintainers.lethalman ];
maintainers = [ ];
};
}
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3
{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome
, gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2
, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-doc" ];
buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ];
buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ];
nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ];
preFixup = ''
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome3 }:
{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }:
stdenv.mkDerivation rec {
version="1.1.3";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ];
buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ];
buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ];
enableParallelBuilding = true;
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }:
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome }:
stdenv.mkDerivation rec {
pname = "kodi-cli";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp -a kodi-cli $out/bin
wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]}
cp -a playlist_to_kodi $out/bin
wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome.zenity jq youtube-dl ]}
'';
meta = with lib; {
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://launchpad.net/pastebinit";
description = "A software that lets you send anything you want directly to a pastebin from the command line";
maintainers = with maintainers; [ lethalman raboof ];
maintainers = with maintainers; [ raboof ];
license = licenses.gpl2;
platforms = platforms.linux;
};