public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

guile-modules: rename top level attributes to be consistent

Browse Source
This commit is contained in:
xd1le 2017-09-24 20:19:44 +10:00
parent f069ee7af6
commit d7d33bd17c
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/guile-modules/guile-cairo/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, guile, pkgconfig, cairo, expat, guile_lib }: { fetchurl, stdenv, guile, pkgconfig, cairo, expat, guile-lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "guile-cairo-1.4.1"; name = "guile-cairo-1.4.1";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ guile pkgconfig cairo expat ] buildInputs = [ guile pkgconfig cairo expat ]
++ stdenv.lib.optional doCheck guile_lib; ++ stdenv.lib.optional doCheck guile-lib;
doCheck = true; doCheck = true;

8
pkgs/development/guile-modules/guile-gnome/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, guile, guile_lib, gwrap { fetchurl, stdenv, guile, guile-lib, gwrap
, pkgconfig, gconf, glib, gnome_vfs, gtk2 , pkgconfig, gconf, glib, gnome_vfs, gtk2
, libglade, libgnome, libgnomecanvas, libgnomeui , libglade, libgnome, libgnomecanvas, libgnomeui
, pango, guileCairo, autoconf, automake, texinfo }: , pango, guile-cairo, autoconf, automake, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "guile-gnome-platform-2.16.4"; name = "guile-gnome-platform-2.16.4";
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
libgnomecanvas libgnomecanvas
libgnomeui libgnomeui
pango pango
guileCairo guile-cairo
] ++ stdenv.lib.optional doCheck guile_lib; ] ++ stdenv.lib.optional doCheck guile-lib;
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh

4
pkgs/development/tools/guile/g-wrap/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile_lib }: { fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile-lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "g-wrap-1.9.15"; name = "g-wrap-1.9.15";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
# Note: Glib support is optional, but it's quite useful (e.g., it's # Note: Glib support is optional, but it's quite useful (e.g., it's
# used by Guile-GNOME). # used by Guile-GNOME).
buildInputs = [ guile pkgconfig glib guile_lib ]; buildInputs = [ guile pkgconfig glib guile-lib ];
propagatedBuildInputs = [ libffi ]; propagatedBuildInputs = [ libffi ];

8
pkgs/top-level/all-packages.nix
View File

@ -6708,18 +6708,18 @@ with pkgs;
jython = callPackage ../development/interpreters/jython {}; jython = callPackage ../development/interpreters/jython {};
guileCairo = callPackage ../development/guile-modules/guile-cairo { }; guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
guileGnome = callPackage ../development/guile-modules/guile-gnome { guile-gnome = callPackage ../development/guile-modules/guile-gnome {
gconf = gnome2.GConf; gconf = gnome2.GConf;
inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui;
}; };
guile_lib = callPackage ../development/guile-modules/guile-lib { }; guile-lib = callPackage ../development/guile-modules/guile-lib { };
guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { };
guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; guile-opengl = callPackage ../development/guile-modules/guile-opengl { };