git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122578 from AndersonTorres/quick-patches

Quick patches

commit9c0ca46a6d23883d883fedb9bfd51f286b0a0789 authorAnderson Torres <torres.anderson.85@protonmail.com> dateWed 12 May 2021, 23:04 (6 years ago) parentd95006512d5b76
4 files changed+103−63
pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix+26−14 pkgs/applications/terminal-emulators/eterm/default.nix+29−12 pkgs/applications/window-managers/icewm/default.nix+3−3 pkgs/tools/typesetting/skribilo/default.nix+45−34
pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix+26−14
@@ -1,30 +1,42 @@
1−{ lib, stdenv, fetchgit, emacs }:
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, emacs
5+}:
26
3−stdenv.mkDerivation {
4− name = "sunrise-commander-6r435";
7+stdenv.mkDerivation rec {
8+ pname = "sunrise-commander";
9+ version = "0.0.0-unstable=2021-04-23";
510
6− src = fetchgit {
7− url = "https://github.com/escherdragon/sunrise-commander.git";
8− rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1";
9− sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b";
11+ src = fetchFromGitHub {
12+ owner = pname;
13+ repo = pname;
14+ rev = "db880fbea03d2db00db1398c91918c3c6f0392e3";
15+ hash = "sha256-IGHCKYQaGUapaA9vxq0xO58KCpBPOiQpHqrEaHK0usE=";
1016 };
1117
12− buildInputs = [ emacs ];
18+ buildInputs = [
19+ emacs
20+ ];
1321
1422 buildPhase = ''
15− emacs -L . --batch -f batch-byte-compile *.el
23+ runHook preBuild
24+ emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el
25+ runHook postBuild
1626 '';
1727
1828 installPhase = ''
29+ runHook preInstall
1930 mkdir -p $out/share/emacs/site-lisp
2031 install *.el* $out/share/emacs/site-lisp
32+ runHook postInstall
2133 '';
2234
23− meta = {
35+ meta = with lib; {
36+ homepage = "https://github.com/sunrise-commander/sunrise-commander/";
2437 description = "Two-pane file manager for Emacs based on Dired and inspired by MC";
25− homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander";
26− license = lib.licenses.gpl3Plus;
27−
28− platforms = lib.platforms.all;
38+ license = licenses.gpl3Plus;
39+ maintainers = [ maintainers.AndersonTorres ];
40+ platforms = platforms.all;
2941 };
3042}
pkgs/applications/terminal-emulators/eterm/default.nix+29−12
@@ -1,24 +1,41 @@
1−{ lib, stdenv, fetchurl
2−, libX11, libXext, libXaw
3−, pkg-config, imlib2, libast }:
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, autoreconfHook
5+, imlib2
6+, libX11
7+, libXaw
8+, libXext
9+, libast
10+, pkg-config
11+}:
412
513stdenv.mkDerivation rec {
614 pname = "eterm";
7− version = "0.9.6";
8− srcName = "Eterm-${version}";
15+ version = "0.9.6-unstable=2020-03-03";
916
10− src = fetchurl {
11− url = "http://www.eterm.org/download/${srcName}.tar.gz";
12− sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj";
17+ src = fetchFromGitHub {
18+ owner = "mej";
19+ repo = pname;
20+ rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c";
21+ sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE=";
1322 };
1423
15− nativeBuildInputs = [ pkg-config ];
16− buildInputs = [ libX11 libXext libXaw imlib2 ];
17− propagatedBuildInputs = [ libast ];
24+ nativeBuildInputs = [
25+ autoreconfHook
26+ pkg-config
27+ ];
28+ buildInputs = [
29+ imlib2
30+ libX11
31+ libXaw
32+ libXext
33+ libast
34+ ];
1835
1936 meta = with lib; {
20− description = "Terminal emulator";
2137 homepage = "http://www.eterm.org";
38+ description = "Terminal emulator";
2239 license = licenses.bsd2;
2340 maintainers = [ maintainers.AndersonTorres ];
2441 platforms = platforms.linux;
pkgs/applications/window-managers/icewm/default.nix+3−3
@@ -39,13 +39,13 @@
3939
4040stdenv.mkDerivation rec {
4141 pname = "icewm";
42− version = "2.2.0";
42+ version = "2.3.4";
4343
4444 src = fetchFromGitHub {
45− owner = "bbidulock";
45+ owner = "ice-wm";
4646 repo = pname;
4747 rev = version;
48− hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4=";
48+ hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A=";
4949 };
5050
5151 nativeBuildInputs = [
pkgs/tools/typesetting/skribilo/default.nix+45−34
@@ -1,64 +1,75 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
3−, pkg-config
44, gettext
5+, ghostscript
56, guile
6−, guile-reader
77, guile-lib
8−, ploticus
8+, guile-reader
99, imagemagick
10−, ghostscript
11−, transfig
12−, enableEmacs ? false, emacs ? null
13−, enableLout ? true, lout ? null
14−, enableTex ? true, tex ? null
1510, makeWrapper
11+, pkg-config
12+, ploticus
13+, transfig
14+, enableEmacs ? false, emacs
15+, enableLout ? true, lout
16+, enableTex ? true, tex
1617}:
1718
1819let
20+ inherit (lib) optional;
21+in stdenv.mkDerivation rec{
1922 pname = "skribilo";
2023 version = "0.9.5";
21− inherit (lib) optional;
22−in stdenv.mkDerivation {
23− inherit pname version;
2424
2525 src = fetchurl {
2626 url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz";
2727 sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk=";
2828 };
2929
30− nativeBuildInputs = [ pkg-config makeWrapper ];
31−
32− buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ]
30+ nativeBuildInputs = [
31+ pkg-config
32+ makeWrapper
33+ ];
34+ buildInputs = [
35+ gettext
36+ ghostscript
37+ guile
38+ guile-lib
39+ guile-reader
40+ imagemagick
41+ ploticus
42+ transfig
43+ ]
3344 ++ optional enableEmacs emacs
3445 ++ optional enableLout lout
3546 ++ optional enableTex tex;
3647
37− propagatedBuildInputs = [ guile-reader guile-lib ];
38−
39− postInstall = ''
40− wrapProgram $out/bin/skribilo \
41− --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \
42− --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site"
43− '';
48+ postInstall =
49+ let
50+ guileVersion = lib.versions.majorMinor guile.version;
51+ in
52+ ''
53+ wrapProgram $out/bin/skribilo \
54+ --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \
55+ --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH"
56+ '';
4457
45− meta = with lib;{
58+ meta = with lib; {
59+ homepage = "https://www.nongnu.org/skribilo/";
4660 description = "The Ultimate Document Programming Framework";
4761 longDescription = ''
48− Skribilo is a free document production tool that takes a
49− structured document representation as its input and renders that
50− document in a variety of output formats: HTML and Info for
51− on-line browsing, and Lout and LaTeX for high-quality hard
52− copies.
62+ Skribilo is a free document production tool that takes a structured
63+ document representation as its input and renders that document in a
64+ variety of output formats: HTML and Info for on-line browsing, and Lout
65+ and LaTeX for high-quality hard copies.
5366
5467 The input document can use Skribilo's markup language to provide
55− information about the document's structure, which is similar to
56− HTML or LaTeX and does not require expertise. Alternatively, it
57− can use a simpler, "markup-less" format that borrows from Emacs'
58− outline mode and from other conventions used in emails, Usenet
59− and text.
68+ information about the document's structure, which is similar to HTML or
69+ LaTeX and does not require expertise. Alternatively, it can use a simpler,
70+ "markup-less" format that borrows from Emacs' outline mode and from other
71+ conventions used in emails, Usenet and text.
6072 '';
61− homepage = "https://www.nongnu.org/skribilo/";
6273 license = licenses.gpl3Plus;
6374 maintainers = with maintainers; [ AndersonTorres ];
6475 platforms = platforms.unix;