diff options
author | xd1le <elisp.vim@gmail.com> | 2017-09-24 20:19:44 +1000 |
---|---|---|
committer | xd1le <elisp.vim@gmail.com> | 2017-09-24 22:24:49 +1000 |
commit | d7d33bd17c252b3831f597450eeeeca27d370ff8 (patch) | |
tree | 517ca035761b6e42be08a5eb58883871c92b9c67 /pkgs | |
parent | f069ee7af68ecb6aea4ac9c3cdbd234e714b726e (diff) | |
download | nixpkgs-d7d33bd17c252b3831f597450eeeeca27d370ff8.tar nixpkgs-d7d33bd17c252b3831f597450eeeeca27d370ff8.tar.gz nixpkgs-d7d33bd17c252b3831f597450eeeeca27d370ff8.tar.bz2 nixpkgs-d7d33bd17c252b3831f597450eeeeca27d370ff8.tar.lz nixpkgs-d7d33bd17c252b3831f597450eeeeca27d370ff8.tar.xz nixpkgs-d7d33bd17c252b3831f597450eeeeca27d370ff8.tar.zst nixpkgs-d7d33bd17c252b3831f597450eeeeca27d370ff8.zip |
guile-modules: rename top level attributes to be consistent
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/guile-modules/guile-cairo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/guile-modules/guile-gnome/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/guile/g-wrap/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 6ba1a59d545..ab89fff14af 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, pkgconfig, cairo, expat, guile_lib }: +{ fetchurl, stdenv, guile, pkgconfig, cairo, expat, guile-lib }: stdenv.mkDerivation rec { name = "guile-cairo-1.4.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ guile pkgconfig cairo expat ] - ++ stdenv.lib.optional doCheck guile_lib; + ++ stdenv.lib.optional doCheck guile-lib; doCheck = true; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index ec7723f5b7e..aae44e2f6d8 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, stdenv, guile, guile_lib, gwrap +{ fetchurl, stdenv, guile, guile-lib, gwrap , pkgconfig, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui -, pango, guileCairo, autoconf, automake, texinfo }: +, pango, guile-cairo, autoconf, automake, texinfo }: stdenv.mkDerivation rec { name = "guile-gnome-platform-2.16.4"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { libgnomecanvas libgnomeui pango - guileCairo - ] ++ stdenv.lib.optional doCheck guile_lib; + guile-cairo + ] ++ stdenv.lib.optional doCheck guile-lib; preConfigure = '' ./autogen.sh diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 030693714f0..da664093d8a 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile_lib }: +{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile-lib }: stdenv.mkDerivation rec { 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 # used by Guile-GNOME). - buildInputs = [ guile pkgconfig glib guile_lib ]; + buildInputs = [ guile pkgconfig glib guile-lib ]; propagatedBuildInputs = [ libffi ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d406141c41d..8050fe6a4c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6708,18 +6708,18 @@ with pkgs; 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 { }; - guileGnome = callPackage ../development/guile-modules/guile-gnome { + guile-gnome = callPackage ../development/guile-modules/guile-gnome { gconf = gnome2.GConf; 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 { }; |