Merge pull request #114895 from AndersonTorres/updates
This commit is contained in:
commit
58927de449
|
@ -1,37 +1,50 @@
|
||||||
{ lib, fetchFromGitHub, asciidoc-full, gettext
|
{ lib
|
||||||
, gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg
|
, fetchFromGitHub
|
||||||
, udisks2, wrapGAppsHook
|
, asciidoc-full
|
||||||
, python3Packages
|
, buildPythonApplication
|
||||||
|
, docopt
|
||||||
|
, gettext
|
||||||
|
, gobject-introspection
|
||||||
|
, gtk3
|
||||||
|
, keyutils
|
||||||
|
, libappindicator-gtk3
|
||||||
|
, libnotify
|
||||||
|
, librsvg
|
||||||
|
, nose
|
||||||
|
, pygobject3
|
||||||
|
, pyyaml
|
||||||
|
, udisks2
|
||||||
|
, wrapGAppsHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "udiskie";
|
pname = "udiskie";
|
||||||
version = "2.2.0";
|
version = "2.3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "coldfix";
|
owner = "coldfix";
|
||||||
repo = "udiskie";
|
repo = "udiskie";
|
||||||
rev = version;
|
rev = "v${version}";
|
||||||
sha256 = "0kn5w6bm3rmbszphzbxpjfnkawb2naa230svzkpmh3n6dcdvk4qa";
|
hash = "sha256-eucAFMzLf2RfMfVgFTfPAgVNpDADddvTUZQO/XbBhGo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
asciidoc-full # Man page
|
||||||
gettext
|
gettext
|
||||||
asciidoc-full # For building man page.
|
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
librsvg # required for loading svg icons (udiskie uses svg icons)
|
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
libnotify
|
|
||||||
gtk3
|
gtk3
|
||||||
udisks2
|
|
||||||
libappindicator-gtk3
|
libappindicator-gtk3
|
||||||
|
libnotify
|
||||||
|
librsvg # Because it uses SVG icons
|
||||||
|
udisks2
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = [
|
||||||
docopt
|
docopt
|
||||||
pygobject3
|
pygobject3
|
||||||
pyyaml
|
pyyaml
|
||||||
|
@ -44,7 +57,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
cp -v doc/udiskie.8 $out/share/man/man8/
|
cp -v doc/udiskie.8 $out/share/man/man8/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkInputs = with python3Packages; [
|
checkInputs = [
|
||||||
nose
|
nose
|
||||||
keyutils
|
keyutils
|
||||||
];
|
];
|
||||||
|
@ -54,9 +67,23 @@ python3Packages.buildPythonApplication rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Removable disk automounter for udisks";
|
|
||||||
license = licenses.mit;
|
|
||||||
homepage = "https://github.com/coldfix/udiskie";
|
homepage = "https://github.com/coldfix/udiskie";
|
||||||
|
description = "Removable disk automounter for udisks";
|
||||||
|
longDescription = ''
|
||||||
|
udiskie is a udisks2 front-end that allows to manage removeable media such
|
||||||
|
as CDs or flash drives from userspace.
|
||||||
|
|
||||||
|
Its features include:
|
||||||
|
- automount removable media
|
||||||
|
- notifications
|
||||||
|
- tray icon
|
||||||
|
- command line tools for manual un-/mounting
|
||||||
|
- LUKS encrypted devices
|
||||||
|
- unlocking with keyfiles (requires udisks 2.6.4)
|
||||||
|
- loop devices (mounting iso archives)
|
||||||
|
- password caching (requires python keyutils 0.3)
|
||||||
|
'';
|
||||||
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ AndersonTorres ];
|
maintainers = with maintainers; [ AndersonTorres ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "stella";
|
pname = "stella";
|
||||||
version = "6.5.1";
|
version = "6.5.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stella-emu";
|
owner = "stella-emu";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "2O7pN0xByEbWVL32VZw9191tG+kCMOuivJZRpXssQIw=";
|
hash = "sha256-CDLMOqSgRx75tjBoLycis/cckCNwgdlb9TRBlD3Dd04=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
As of its 3.5 release, Stella is officially donationware.
|
As of its 3.5 release, Stella is officially donationware.
|
||||||
'';
|
'';
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
maintainers = with maintainers; [ AndersonTorres ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
{ lib, fetchFromGitHub, python3Packages }:
|
{ lib, fetchFromGitHub, buildPythonApplication }:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "grc";
|
pname = "grc";
|
||||||
version = "1.11.3";
|
version = "1.12";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "garabik";
|
owner = "garabik";
|
||||||
repo = "grc";
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35";
|
sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -21,23 +21,20 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
./install.sh "$out" "$out"
|
./install.sh "$out" "$out"
|
||||||
install -Dm444 -t $out/share/zsh/vendor-completions _grc
|
install -Dm444 -t $out/share/zsh/vendor-completions _grc
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Yet another colouriser for beautifying your logfiles or output of commands";
|
|
||||||
homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html";
|
homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html";
|
||||||
license = licenses.gpl2;
|
description = "A generic text colouriser";
|
||||||
maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ];
|
|
||||||
platforms = platforms.unix;
|
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Generic Colouriser is yet another colouriser (written in Python) for
|
Generic Colouriser is yet another colouriser (written in Python) for
|
||||||
beautifying your logfiles or output of commands.
|
beautifying your logfiles or output of commands.
|
||||||
'';
|
'';
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ];
|
||||||
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1344,7 +1344,7 @@ in
|
||||||
|
|
||||||
gucci = callPackage ../tools/text/gucci { };
|
gucci = callPackage ../tools/text/gucci { };
|
||||||
|
|
||||||
grc = callPackage ../tools/misc/grc { };
|
grc = python3Packages.callPackage ../tools/misc/grc { };
|
||||||
|
|
||||||
green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {
|
green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {
|
||||||
SDL = SDL_sixel;
|
SDL = SDL_sixel;
|
||||||
|
@ -24908,7 +24908,7 @@ in
|
||||||
|
|
||||||
udevil = callPackage ../applications/misc/udevil {};
|
udevil = callPackage ../applications/misc/udevil {};
|
||||||
|
|
||||||
udiskie = callPackage ../applications/misc/udiskie { };
|
udiskie = python3Packages.callPackage ../applications/misc/udiskie { };
|
||||||
|
|
||||||
sacc = callPackage ../applications/networking/gopher/sacc { };
|
sacc = callPackage ../applications/networking/gopher/sacc { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue