Merge pull request #122578 from AndersonTorres/quick-patches
Quick patches
This commit is contained in:
Anderson Torres
GitHub
commit
9c0ca46a6d
|
|
@ -1,30 +1,42 @@
|
|||
{ lib, stdenv, fetchgit, emacs }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "sunrise-commander-6r435";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sunrise-commander";
|
||||
version = "0.0.0-unstable=2021-04-23";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/escherdragon/sunrise-commander.git";
|
||||
rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1";
|
||||
sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "db880fbea03d2db00db1398c91918c3c6f0392e3";
|
||||
hash = "sha256-IGHCKYQaGUapaA9vxq0xO58KCpBPOiQpHqrEaHK0usE=";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
buildInputs = [
|
||||
emacs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
runHook preBuild
|
||||
emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el* $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sunrise-commander/sunrise-commander/";
|
||||
description = "Two-pane file manager for Emacs based on Dired and inspired by MC";
|
||||
homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,41 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, libX11, libXext, libXaw
|
||||
, pkg-config, imlib2, libast }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, imlib2
|
||||
, libX11
|
||||
, libXaw
|
||||
, libXext
|
||||
, libast
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eterm";
|
||||
version = "0.9.6";
|
||||
srcName = "Eterm-${version}";
|
||||
version = "0.9.6-unstable=2020-03-03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.eterm.org/download/${srcName}.tar.gz";
|
||||
sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mej";
|
||||
repo = pname;
|
||||
rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c";
|
||||
sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libX11 libXext libXaw imlib2 ];
|
||||
propagatedBuildInputs = [ libast ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
imlib2
|
||||
libX11
|
||||
libXaw
|
||||
libXext
|
||||
libast
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal emulator";
|
||||
homepage = "http://www.eterm.org";
|
||||
description = "Terminal emulator";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icewm";
|
||||
version = "2.2.0";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbidulock";
|
||||
owner = "ice-wm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4=";
|
||||
hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,64 +1,75 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, guile
|
||||
, guile-reader
|
||||
, guile-lib
|
||||
, ploticus
|
||||
, imagemagick
|
||||
, ghostscript
|
||||
, transfig
|
||||
, enableEmacs ? false, emacs ? null
|
||||
, enableLout ? true, lout ? null
|
||||
, enableTex ? true, tex ? null
|
||||
, guile
|
||||
, guile-lib
|
||||
, guile-reader
|
||||
, imagemagick
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, ploticus
|
||||
, transfig
|
||||
, enableEmacs ? false, emacs
|
||||
, enableLout ? true, lout
|
||||
, enableTex ? true, tex
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optional;
|
||||
in stdenv.mkDerivation rec{
|
||||
pname = "skribilo";
|
||||
version = "0.9.5";
|
||||
inherit (lib) optional;
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ]
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
gettext
|
||||
ghostscript
|
||||
guile
|
||||
guile-lib
|
||||
guile-reader
|
||||
imagemagick
|
||||
ploticus
|
||||
transfig
|
||||
]
|
||||
++ optional enableEmacs emacs
|
||||
++ optional enableLout lout
|
||||
++ optional enableTex tex;
|
||||
|
||||
propagatedBuildInputs = [ guile-reader guile-lib ];
|
||||
postInstall =
|
||||
let
|
||||
guileVersion = lib.versions.majorMinor guile.version;
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/skribilo \
|
||||
--prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \
|
||||
--prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/skribilo \
|
||||
--prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \
|
||||
--prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site"
|
||||
'';
|
||||
|
||||
meta = with lib;{
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nongnu.org/skribilo/";
|
||||
description = "The Ultimate Document Programming Framework";
|
||||
longDescription = ''
|
||||
Skribilo is a free document production tool that takes a
|
||||
structured document representation as its input and renders that
|
||||
document in a variety of output formats: HTML and Info for
|
||||
on-line browsing, and Lout and LaTeX for high-quality hard
|
||||
copies.
|
||||
Skribilo is a free document production tool that takes a structured
|
||||
document representation as its input and renders that document in a
|
||||
variety of output formats: HTML and Info for on-line browsing, and Lout
|
||||
and LaTeX for high-quality hard copies.
|
||||
|
||||
The input document can use Skribilo's markup language to provide
|
||||
information about the document's structure, which is similar to
|
||||
HTML or LaTeX and does not require expertise. Alternatively, it
|
||||
can use a simpler, "markup-less" format that borrows from Emacs'
|
||||
outline mode and from other conventions used in emails, Usenet
|
||||
and text.
|
||||
information about the document's structure, which is similar to HTML or
|
||||
LaTeX and does not require expertise. Alternatively, it can use a simpler,
|
||||
"markup-less" format that borrows from Emacs' outline mode and from other
|
||||
conventions used in emails, Usenet and text.
|
||||
'';
|
||||
homepage = "https://www.nongnu.org/skribilo/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
Loading…
Reference in New Issue