git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119542 from AndersonTorres/new-haunt

guile-commonmark: init at 0.1.2; haunt: init at 0.2.4

commit818dcc84921c321f60fa62bd2a77595b2dc77dd0 authorAnderson Torres <torres.anderson.85@protonmail.com> dateFri 16 Apr 2021, 18:34 (6 years ago) parentab16ad8e3733c8
13 files changed+354−118
pkgs/applications/misc/haunt/default.nix+59 pkgs/development/guile-modules/guile-cairo/default.nix+20−6 pkgs/development/guile-modules/guile-commonmark/default.nix+42 pkgs/development/guile-modules/guile-fibers/default.nix+20−9 pkgs/development/guile-modules/guile-gnome/default.nix+39−9 pkgs/development/guile-modules/guile-lib/default.nix+19−10 pkgs/development/guile-modules/guile-ncurses/default.nix+21−10 pkgs/development/guile-modules/guile-opengl/default.nix+15−9 pkgs/development/guile-modules/guile-reader/default.nix+28−15 pkgs/development/guile-modules/guile-sdl/default.nix+27−11 pkgs/development/guile-modules/guile-sdl2/default.nix+28−14 pkgs/development/guile-modules/guile-xcb/default.nix+23−16 pkgs/top-level/all-packages.nix+13−9
pkgs/applications/misc/haunt/default.nixnew file+59
@@ -0,0 +1,59 @@
1+{ lib
2+, stdenv
3+, fetchurl
4+, guile
5+, guile-commonmark
6+, guile-reader
7+, makeWrapper
8+, pkg-config
9+}:
10+
11+stdenv.mkDerivation rec {
12+ pname = "haunt";
13+ version = "0.2.4";
14+
15+ src = fetchurl {
16+ url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz";
17+ hash = "sha256-zOkICg7KmJJhPWPtJRT3C9sYB1Oig1xLtgPNGe0n3xQ=";
18+ };
19+
20+ nativeBuildInputs = [
21+ makeWrapper
22+ pkg-config
23+ ];
24+ buildInputs = [
25+ guile
26+ guile-commonmark
27+ guile-reader
28+ ];
29+
30+ postInstall = ''
31+ wrapProgram $out/bin/haunt \
32+ --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" \
33+ --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site"
34+ '';
35+
36+ meta = with lib; {
37+ homepage = "https://dthompson.us/projects/haunt.html";
38+ description = "Guile-based static site generator";
39+ longDescription = ''
40+ Haunt is a simple, functional, hackable static site generator that gives
41+ authors the ability to treat websites as Scheme programs.
42+
43+ By giving authors the full expressive power of Scheme, they are able to
44+ control every aspect of the site generation process. Haunt provides a
45+ simple, functional build system that can be easily extended for this
46+ purpose.
47+
48+ Haunt has no opinion about what markup language authors should use to
49+ write posts, though it comes with support for the popular Markdown
50+ format. Likewise, Haunt has no opinion about how authors structure their
51+ sites. Though it comes with support for building simple blogs or Atom
52+ feeds, authors should feel empowered to tweak, replace, or create builders
53+ to do things that aren't provided out-of-the-box.
54+ '';
55+ license = licenses.gpl3Plus;
56+ maintainers = with maintainers; [ AndersonTorres ];
57+ platforms = guile.meta.platforms;
58+ };
59+}
pkgs/development/guile-modules/guile-cairo/default.nix+20−6
@@ -1,23 +1,38 @@
1−{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, cairo
5+, expat
6+, guile
7+, guile-lib
8+, pkg-config
9+}:
210
311stdenv.mkDerivation rec {
412 pname = "guile-cairo";
513 version = "1.11.2";
614
715 src = fetchurl {
8− url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz";
9− sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2";
16+ url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
17+ hash = "sha256-YjLU3Cxb2dMxE5s7AfQ0PD4fucp4mDYaaZIGcwlBoHs=";
1018 };
1119
12− nativeBuildInputs = [ pkg-config ];
20+ nativeBuildInputs = [
21+ pkg-config
22+ ];
23+ buildInputs = [
24+ cairo
25+ expat
26+ guile
27+ ];
1328
14− buildInputs = [ guile cairo expat ];
1529 enableParallelBuilding = true;
1630
1731 doCheck = false; # Cannot find unit-test module from guile-lib
1832 checkInputs = [ guile-lib ];
1933
2034 meta = with lib; {
35+ homepage = "https://www.nongnu.org/guile-cairo/";
2136 description = "Cairo bindings for GNU Guile";
2237 longDescription = ''
2338 Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
@@ -28,7 +43,6 @@ stdenv.mkDerivation rec {
2843 maintained graphics library with all of the benefits of Scheme: memory
2944 management, exceptions, macros, and a dynamic programming environment.
3045 '';
31− homepage = "https://www.nongnu.org/guile-cairo/";
3246 license = licenses.lgpl3Plus;
3347 maintainers = with maintainers; [ vyp ];
3448 platforms = platforms.linux;
pkgs/development/guile-modules/guile-commonmark/default.nixnew file+42
@@ -0,0 +1,42 @@
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, autoreconfHook
5+, guile
6+, pkg-config
7+}:
8+
9+stdenv.mkDerivation rec {
10+ pname = "guile-commonmark";
11+ version = "0.1.2";
12+
13+ src = fetchFromGitHub {
14+ owner = "OrangeShark";
15+ repo = pname;
16+ rev = "v${version}";
17+ hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo=";
18+ };
19+
20+ nativeBuildInputs = [
21+ autoreconfHook
22+ pkg-config
23+ ];
24+ buildInputs = [
25+ guile
26+ ];
27+
28+ # https://github.com/OrangeShark/guile-commonmark/issues/20
29+ doCheck = false;
30+
31+ makeFlags = [
32+ "GUILE_AUTO_COMPILE=0"
33+ ];
34+
35+ meta = with lib; {
36+ homepage = "https://github.com/OrangeShark/guile-commonmark";
37+ description = "Implementation of CommonMark for Guile";
38+ license = licenses.lgpl3Plus;
39+ maintainers = with maintainers; [ AndersonTorres ];
40+ platforms = guile.meta.platforms;
41+ };
42+}
pkgs/development/guile-modules/guile-fibers/default.nix+20−9
@@ -1,26 +1,37 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }:
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, autoreconfHook
5+, guile
6+, pkg-config
7+, texinfo
8+}:
29
3−let
10+stdenv.mkDerivation rec {
11+ pname = "guile-fibers";
412 version = "1.0.0";
5− name = "guile-fibers-${version}";
6−in stdenv.mkDerivation {
7− inherit name;
813
914 src = fetchFromGitHub {
1015 owner = "wingo";
1116 repo = "fibers";
1217 rev = "v${version}";
13− sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi";
18+ hash = "sha256-kU/ty/XRNfv3ubIwH40wZmo8MXApeduHcH2KEGqoh+Q=";
1419 };
1520
16− nativeBuildInputs = [ autoreconfHook pkg-config ];
17− buildInputs = [ guile texinfo ];
21+ nativeBuildInputs = [
22+ autoreconfHook
23+ pkg-config
24+ ];
25+ buildInputs = [
26+ guile
27+ texinfo
28+ ];
1829
1930 autoreconfPhase = "./autogen.sh";
2031
2132 meta = with lib; {
22− description = "Concurrent ML-like concurrency for Guile";
2333 homepage = "https://github.com/wingo/fibers";
34+ description = "Concurrent ML-like concurrency for Guile";
2435 license = licenses.lgpl3Plus;
2536 maintainers = with maintainers; [ vyp ];
2637 platforms = platforms.linux;
pkgs/development/guile-modules/guile-gnome/default.nix+39−9
@@ -1,7 +1,21 @@
1−{ fetchurl, lib, stdenv, guile, guile-lib, gwrap
2−, pkg-config, gconf, glib, gnome_vfs, gtk2
3−, libglade, libgnome, libgnomecanvas, libgnomeui
4−, pango, guile-cairo, texinfo
1+{ lib
2+, stdenv
3+, fetchurl
4+, gconf
5+, glib
6+, gnome_vfs
7+, gtk2
8+, guile
9+, guile-cairo
10+, guile-lib
11+, gwrap
12+, libglade
13+, libgnome
14+, libgnomecanvas
15+, libgnomeui
16+, pango
17+, pkg-config
18+, texinfo
519}:
620
721stdenv.mkDerivation rec {
@@ -10,20 +24,37 @@ stdenv.mkDerivation rec {
1024
1125 src = fetchurl {
1226 url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz";
13− sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3";
27+ hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM=";
1428 };
1529
30+ nativeBuildInputs = [
31+ pkg-config
32+ texinfo
33+ ];
1634 buildInputs = [
17− texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2
18− libglade libgnome libgnomecanvas libgnomeui pango guile-cairo
35+ gconf
36+ glib
37+ gnome_vfs
38+ gtk2
39+ guile
40+ guile-cairo
41+ gwrap
42+ libglade
43+ libgnome
44+ libgnomecanvas
45+ libgnomeui
46+ pango
1947 ] ++ lib.optional doCheck guile-lib;
2048
2149 # The test suite tries to open an X display, which fails.
2250 doCheck = false;
2351
24− GUILE_AUTO_COMPILE = 0;
52+ makeFlags = [
53+ "GUILE_AUTO_COMPILE=0"
54+ ];
2555
2656 meta = with lib; {
57+ homepage = "https://www.gnu.org/software/guile-gnome/";
2758 description = "GNOME bindings for GNU Guile";
2859 longDescription = ''
2960 GNU guile-gnome brings the power of Scheme to your graphical application.
@@ -32,7 +63,6 @@ stdenv.mkDerivation rec {
3263 guile-gnome a comprehensive environment for developing modern
3364 applications.
3465 '';
35− homepage = "https://www.gnu.org/software/guile-gnome/";
3666 license = licenses.gpl2Plus;
3767 maintainers = with maintainers; [ vyp ];
3868 platforms = platforms.linux;
pkgs/development/guile-modules/guile-lib/default.nix+19−10
@@ -1,20 +1,29 @@
1−{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, guile
5+, pkg-config
6+, texinfo
7+}:
28
39assert stdenv ? cc && stdenv.cc.isGNU;
410
5−let
6− name = "guile-lib-${version}";
11+stdenv.mkDerivation rec {
12+ pname = "guile-lib";
713 version = "0.2.6.1";
8−in stdenv.mkDerivation {
9− inherit name;
1014
1115 src = fetchurl {
12− url = "mirror://savannah/guile-lib/${name}.tar.gz";
13− sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd";
16+ url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
17+ hash = "sha256-bR09DxTbnSgLjUJ9bh3sRBfd0Cv/I71Zguy24mLrPyo=";
1418 };
1519
16− nativeBuildInputs = [ pkg-config ];
17− buildInputs = [ guile texinfo ];
20+ nativeBuildInputs = [
21+ pkg-config
22+ ];
23+ buildInputs = [
24+ guile
25+ texinfo
26+ ];
1827
1928 doCheck = true;
2029
@@ -25,6 +34,7 @@ in stdenv.mkDerivation {
2534 '';
2635
2736 meta = with lib; {
37+ homepage = "https://www.nongnu.org/guile-lib/";
2838 description = "A collection of useful Guile Scheme modules";
2939 longDescription = ''
3040 guile-lib is intended as an accumulation place for pure-scheme Guile
@@ -32,7 +42,6 @@ in stdenv.mkDerivation {
3242 modules into a coherent library. Think "a down-scaled, limited-scope CPAN
3343 for Guile".
3444 '';
35− homepage = "https://www.nongnu.org/guile-lib/";
3645 license = licenses.gpl3Plus;
3746 maintainers = with maintainers; [ vyp ];
3847 platforms = platforms.gnu ++ platforms.linux;
pkgs/development/guile-modules/guile-ncurses/default.nix+21−10
@@ -1,18 +1,29 @@
1−{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, guile
6+, libffi
7+, ncurses
8+}:
29
3−let
4− name = "guile-ncurses-${version}";
10+stdenv.mkDerivation rec {
11+ pname = "guile-ncurses";
512 version = "1.7";
6−in stdenv.mkDerivation {
7− inherit name;
813
914 src = fetchurl {
10− url = "mirror://gnu/guile-ncurses/${name}.tar.gz";
11− sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5";
15+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
16+ hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q=";
1217 };
1318
14− nativeBuildInputs = [ pkg-config ];
15− buildInputs = [ guile ncurses libffi ];
19+ nativeBuildInputs = [
20+ pkg-config
21+ ];
22+ buildInputs = [
23+ guile
24+ libffi
25+ ncurses
26+ ];
1627
1728 preConfigure = ''
1829 configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site"
@@ -29,6 +40,7 @@ in stdenv.mkDerivation {
2940 doCheck = false;
3041
3142 meta = with lib; {
43+ homepage = "https://www.gnu.org/software/guile-ncurses/";
3244 description = "Scheme interface to the NCurses libraries";
3345 longDescription = ''
3446 GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
@@ -36,7 +48,6 @@ in stdenv.mkDerivation {
3648 interface functionality is built on the ncurses libraries: curses, form,
3749 panel, and menu.
3850 '';
39− homepage = "https://www.gnu.org/software/guile-ncurses/";
4051 license = licenses.lgpl3Plus;
4152 maintainers = with maintainers; [ vyp ];
4253 platforms = platforms.gnu ++ platforms.linux;
pkgs/development/guile-modules/guile-opengl/default.nix+15−9
@@ -1,21 +1,27 @@
1−{ lib, stdenv, fetchurl, pkg-config, guile }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, guile
5+, pkg-config
6+}:
27
3−let
4− name = "guile-opengl-${version}";
8+stdenv.mkDerivation rec {
9+ pname = "guile-opengl";
510 version = "0.1.0";
6−in stdenv.mkDerivation {
7− inherit name;
811
912 src = fetchurl {
10− url = "mirror://gnu/guile-opengl/${name}.tar.gz";
11− sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim";
13+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
14+ hash = "sha256-NdK5UwUszX5B0kKbynG8oD2PCKIGpZ1x91ktBDvpDo8=";
1215 };
1316
14− nativeBuildInputs = [ pkg-config guile ];
17+ nativeBuildInputs = [
18+ pkg-config
19+ guile
20+ ];
1521
1622 meta = with lib; {
17− description = "Guile bindings for the OpenGL graphics API";
1823 homepage = "https://www.gnu.org/software/guile-opengl/";
24+ description = "Guile bindings for the OpenGL graphics API";
1925 license = licenses.gpl3Plus;
2026 maintainers = with maintainers; [ vyp ];
2127 platforms = platforms.unix;
pkgs/development/guile-modules/guile-reader/default.nix+28−15
@@ -1,36 +1,49 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pkg-config
2−, gperf, guile, guile-lib, libffi }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, fetchpatch
5+, gperf
6+, guile
7+, guile-lib
8+, libffi
9+, pkg-config
10+}:
311
412stdenv.mkDerivation rec {
5−
613 pname = "guile-reader";
714 version = "0.6.3";
815
916 src = fetchurl {
10− url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz";
11− sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
17+ url = "http://download.savannah.nongnu.org/releases/${pname}/${pname}-${version}.tar.gz";
18+ hash = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
1219 };
1320
14− nativeBuildInputs = [ pkg-config ];
15− buildInputs = [ gperf guile guile-lib libffi ];
21+ nativeBuildInputs = [
22+ pkg-config
23+ ];
24+ buildInputs = [
25+ gperf
26+ guile
27+ guile-lib
28+ libffi
29+ ];
1630
1731 GUILE_SITE="${guile-lib}/share/guile/site";
1832
1933 configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ];
2034
2135 meta = with lib; {
36+ homepage = "https://www.nongnu.org/guile-reader/";
2237 description = "A simple framework for building readers for GNU Guile";
2338 longDescription = ''
24− Guile-Reader is a simple framework for building readers for GNU
25− Guile.
39+ Guile-Reader is a simple framework for building readers for GNU Guile.
2640
27− The idea is to make it easy to build procedures that extend
28− Guile's read procedure. Readers supporting various syntax
29− variants can easily be written, possibly by re-using existing
30− "token readers" of a standard Scheme readers. For example, it
31− is used to implement Skribilo's R5RS-derived document syntax.
41+ The idea is to make it easy to build procedures that extend Guile's read
42+ procedure. Readers supporting various syntax variants can easily be
43+ written, possibly by re-using existing "token readers" of a standard
44+ Scheme readers. For example, it is used to implement Skribilo's
45+ R5RS-derived document syntax.
3246 '';
33− homepage = "https://www.nongnu.org/guile-reader/";
3447 license = licenses.lgpl3Plus;
3548 maintainers = with maintainers; [ AndersonTorres ];
3649 platforms = platforms.gnu;
pkgs/development/guile-modules/guile-sdl/default.nix+27−11
@@ -1,5 +1,13 @@
1−{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv
2−, SDL, SDL_image, SDL_ttf, SDL_mixer
1+{ lib
2+, stdenv
3+, fetchurl
4+, SDL
5+, SDL_image
6+, SDL_mixer
7+, SDL_ttf
8+, buildEnv
9+, guile
10+, pkg-config
311}:
412
513stdenv.mkDerivation rec {
@@ -8,25 +16,33 @@ stdenv.mkDerivation rec {
816
917 src = fetchurl {
1018 url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
11− sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01";
19+ hash = "sha256-ATx1bnnDlj69h6ZUy7wd2lVsuDGS424sFCIlJQLQTzI=";
1220 };
1321
14− nativeBuildInputs = [ pkg-config guile ];
15−
16− buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ];
17−
18− GUILE_AUTO_COMPILE = 0;
22+ nativeBuildInputs = [
23+ guile
24+ pkg-config
25+ ];
26+ buildInputs = [
27+ SDL.dev
28+ SDL_image
29+ SDL_mixer
30+ SDL_ttf
31+ ];
1932
2033 makeFlags = let
21− sdl = buildEnv {
34+ sdl-env = buildEnv {
2235 name = "sdl-env";
2336 paths = buildInputs;
2437 };
25− in [ "SDLMINUSI=-I${sdl}/include/SDL" ];
38+ in [
39+ "GUILE_AUTO_COMPILE=0"
40+ "SDLMINUSI=-I${sdl-env}/include/SDL"
41+ ];
2642
2743 meta = with lib; {
28− description = "Guile bindings for SDL";
2944 homepage = "https://www.gnu.org/software/guile-sdl/";
45+ description = "Guile bindings for SDL";
3046 license = licenses.gpl3Plus;
3147 maintainers = with maintainers; [ vyp ];
3248 platforms = platforms.linux;
pkgs/development/guile-modules/guile-sdl2/default.nix+28−14
@@ -1,36 +1,50 @@
1−{ lib, stdenv, fetchurl, guile, libtool, pkg-config
2−, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer
1+{ lib
2+, stdenv
3+, fetchurl
4+, SDL2
5+, SDL2_image
6+, SDL2_mixer
7+, SDL2_ttf
8+, guile
9+, libtool
10+, pkg-config
311}:
412
5−let
6− name = "${pname}-${version}";
13+stdenv.mkDerivation rec {
714 pname = "guile-sdl2";
815 version = "0.5.0";
9−in stdenv.mkDerivation {
10− inherit name;
1116
1217 src = fetchurl {
13− url = "https://files.dthompson.us/${pname}/${name}.tar.gz";
14− sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m";
18+ url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz";
19+ hash = "sha256-lWTLctPUDqvN/Y95oOL7LF3czlLJFQ9d9np9dx4DHYU=";
1520 };
1621
17− nativeBuildInputs = [ libtool pkg-config ];
22+ nativeBuildInputs = [
23+ pkg-config
24+ libtool
25+ ];
1826 buildInputs = [
19− guile SDL2 SDL2_image SDL2_ttf SDL2_mixer
27+ SDL2
28+ SDL2_image
29+ SDL2_mixer
30+ SDL2_ttf
31+ guile
2032 ];
2133
2234 configureFlags = [
23− "--with-libsdl2-prefix=${SDL2}"
2435 "--with-libsdl2-image-prefix=${SDL2_image}"
25− "--with-libsdl2-ttf-prefix=${SDL2_ttf}"
2636 "--with-libsdl2-mixer-prefix=${SDL2_mixer}"
37+ "--with-libsdl2-prefix=${SDL2}"
38+ "--with-libsdl2-ttf-prefix=${SDL2_ttf}"
2739 ];
2840
29− makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
41+ makeFlags = [
42+ "GUILE_AUTO_COMPILE=0"
43+ ];
3044
3145 meta = with lib; {
32− description = "Bindings to SDL2 for GNU Guile";
3346 homepage = "https://dthompson.us/projects/guile-sdl2.html";
47+ description = "Bindings to SDL2 for GNU Guile";
3448 license = licenses.lgpl3Plus;
3549 maintainers = with maintainers; [ seppeljordan vyp ];
3650 platforms = platforms.all;
pkgs/development/guile-modules/guile-xcb/default.nix+23−16
@@ -1,29 +1,36 @@
1−{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, guile
5+, pkg-config
6+, texinfo
7+}:
28
3−let
4− name = "guile-xcb-${version}";
9+stdenv.mkDerivation rec {
10+ pname = "guile-xcb";
511 version = "1.3";
6−in stdenv.mkDerivation {
7− inherit name;
812
913 src = fetchurl {
10− url = "http://www.markwitmer.com/dist/${name}.tar.gz";
11− sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149";
14+ url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz";
15+ hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE=";
1216 };
1317
14− nativeBuildInputs = [ pkg-config ];
15− buildInputs = [ guile texinfo ];
18+ nativeBuildInputs = [
19+ pkg-config
20+ ];
21+ buildInputs = [
22+ guile
23+ texinfo
24+ ];
1625
17− preConfigure = ''
18− configureFlags="
19− --with-guile-site-dir=$out/share/guile/site
20− --with-guile-site-ccache-dir=$out/share/guile/site
21− ";
22− '';
26+ configureFlags = [
27+ "--with-guile-site-dir=$out/share/guile/site"
28+ "--with-guile-site-ccache-dir=$out/share/guile/site"
29+ ];
2330
2431 meta = with lib; {
25− description = "XCB bindings for Guile";
2632 homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
33+ description = "XCB bindings for Guile";
2734 license = licenses.gpl3Plus;
2835 maintainers = with maintainers; [ vyp ];
2936 platforms = platforms.linux;
pkgs/top-level/all-packages.nix+13−9
@@ -11658,15 +11658,6 @@ in
1165811658
1165911659 groovy = callPackage ../development/interpreters/groovy { };
1166011660
11661− guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
11662−
11663− # Needed for autogen
11664− guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };
11665−
11666− guile_2_2 = callPackage ../development/interpreters/guile { };
11667−
11668− guile = guile_2_2;
11669−
1167011661 inherit (callPackages ../applications/networking/cluster/hadoop {
1167111662 jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
1167211663 })
@@ -12088,8 +12079,19 @@ in
1208812079
1208912080 gImageReader = callPackage ../applications/misc/gImageReader { };
1209012081
12082+ guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
12083+
12084+ # Needed for autogen
12085+ guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };
12086+
12087+ guile_2_2 = callPackage ../development/interpreters/guile { };
12088+
12089+ guile = guile_2_2;
12090+
1209112091 guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
1209212092
12093+ guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { };
12094+
1209312095 guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
1209412096
1209512097 guile-gnome = callPackage ../development/guile-modules/guile-gnome {
@@ -23521,6 +23523,8 @@ in
2352123523 wxGTK = wxGTK30;
2352223524 };
2352323525
23526+ haunt = callPackage ../applications/misc/haunt { };
23527+
2352423528 hugo = callPackage ../applications/misc/hugo { };
2352523529
2352623530 go-org = callPackage ../applications/misc/go-org { };