Author: urkud
Date: Fri Jan 21 08:25:02 2011
New Revision: 25656
URL: https://svn.nixos.org/websvn/nix/?rev=25656&sc=1
Log:
Move various functions to separate files.
Also allow overwriting the 'generated' file.
Added:
nixpkgs/trunk/pkgs/development/interpreters/ruby/gem.nix
nixpkgs/trunk/pkgs/development/interpreters/ruby/generated.nix
- copied, changed from r25655,
nixpkgs/trunk/pkgs/development/interpreters/ruby/gems-generated.nix
nixpkgs/trunk/pkgs/development/interpreters/ruby/overwrites.nix
nixpkgs/trunk/pkgs/development/interpreters/ruby/patches.nix
Deleted:
nixpkgs/trunk/pkgs/development/interpreters/ruby/gems-generated.nix
Modified:
nixpkgs/trunk/pkgs/development/interpreters/ruby/libs.nix
Added: nixpkgs/trunk/pkgs/development/interpreters/ruby/gem.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/gem.nix Fri Jan 21
08:25:02 2011 (r25656)
@@ -0,0 +1,51 @@
+{stdenv, fetchurl, ruby, rubygems, makeWrapper, patches, overwrites}:
+
+let
+ gemDefaults = { name, basename, requiredGems, sha256, meta }:
+ {
+ buildInputs = [rubygems ruby makeWrapper];
+ unpackPhase = ":";
+ configurePhase=":";
+ bulidPhase=":";
+
+ src = fetchurl {
+ url = "http://rubygems.org/downloads/${name}.gem";;
+ inherit sha256;
+ };
+
+ name = "ruby-${name}";
+
+ propagatedBuildInputs = requiredGems;
+ inherit meta;
+
+ installPhase = ''
+ export HOME=$TMP/home; mkdir -pv "$HOME"
+
+ gem install -V --ignore-dependencies \
+ -i "$out/${ruby.gemPath}" -n "$out/bin" "$src" $gemFlags -- $buildFlags
+ rm -frv $out/${ruby.gemPath}/cache # don't keep the .gem file here
+
+ addToSearchPath GEM_PATH $out/${ruby.gemPath}
+
+ for prog in $out/bin/*; do
+ wrapProgram "$prog" \
+ --prefix GEM_PATH : "$GEM_PATH" \
+ --prefix RUBYLIB : "${rubygems}/lib" \
+ --set RUBYOPT 'rubygems'
+ done
+
+ for prog in $out/gems/*/bin/*; do
+ [[ -e "$out/bin/$(basename $prog)" ]]
+ done
+
+ runHook postInstall
+ '';
+ };
+ mb = stdenv.lib.maybeAttr;
+in
+aName: a@{ name, basename, requiredGems, sha256, meta }:
+ mb name (mb basename (
+ stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults
+ [ (gemDefaults a) (mb name {} patches) (mb basename {} patches) ]
+ ) ["mergeAttrBy"])
+ ) overwrites) overwrites
Copied and modified:
nixpkgs/trunk/pkgs/development/interpreters/ruby/generated.nix (from r25655,
nixpkgs/trunk/pkgs/development/interpreters/ruby/gems-generated.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/development/interpreters/ruby/libs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/ruby/libs.nix Fri Jan 21
08:24:57 2011 (r25655)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/libs.nix Fri Jan 21
08:25:02 2011 (r25656)
@@ -1,107 +1,12 @@
-{stdenv, fetchurl, writeScript, makeWrapper, rubygems, ruby,
-ncurses, xapianBindings, sqlite, libxml2, libxslt, libffi, zlib, libuuid}:
+{stdenv, config, fetchurl, callPackage}:
let
- gemsGenerated = (import ./gems-generated.nix) gemsWithVersions;
- patchUsrBinEnv = writeScript "path-usr-bin-env" ''
- #!/bin/sh
- set -x
- echo "==================="
- find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p
env)@g"
- find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p
env)@g"
- '';
- patches = {
- sup = {
- buildInputs = [ ncurses xapianBindings gems.ncursesw ];
- };
- sqlite3_ruby = { propagatedBuildInputs = [ sqlite ]; };
- rails = {
- gemFlags = "--no-ri --no-rdoc";
- propagatedBuildInputs = [ gems.mime_types gems.rake ];
- };
- ncurses = { buildInputs = [ ncurses ]; };
- ncursesw = { buildInputs = [ ncurses ]; };
- nokogiri = {
- buildFlags=["--with-xml2-dir=${libxml2}
--with-xml2-include=${libxml2}/include/libxml2"
- "--with-xslt-dir=${libxslt}" ];
- };
-
- ffi = {
- postUnpack = "onetuh";
- propagatedBuildInputs = [ gems.rake ];
- buildFlags=["--with-ffi-dir=${libffi}"];
- NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
- };
-
- xrefresh_server =
- let patch = fetchurl {
- url = "http://mawercer.de/~nix/xrefresh.diff.gz";;
- sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
- };
- in {
- propagatedBuildInputs = [ gems.rb_inotify ];
-
- # monitor implementation for Linux
- postInstall = ''
- cd $out/${ruby.gemPath}/gems/*
- zcat ${patch} | patch -p 1
- '';
- };
-
- xapian_full = {
- buildInputs = [ gems.rake zlib libuuid ];
- gemFlags = "--no-rdoc --no-ri";
- };
- };
- gemDefaults = { name, basename, requiredGems, sha256, meta }:
- {
- buildInputs = [rubygems ruby makeWrapper];
- unpackPhase = ":";
- configurePhase=":";
- bulidPhase=":";
-
- src = fetchurl {
- url = "http://rubygems.org/downloads/${name}.gem";;
- inherit sha256;
- };
-
- name = "ruby-${name}";
-
- propagatedBuildInputs = requiredGems;
- inherit meta;
-
- installPhase = ''
- export HOME=$TMP/home; mkdir -pv "$HOME"
-
- gem install -V --ignore-dependencies \
- -i "$out/${ruby.gemPath}" -n "$out/bin" "$src" $gemFlags -- $buildFlags
- rm -frv $out/${ruby.gemPath}/cache # don't keep the .gem file here
-
- addToSearchPath GEM_PATH $out/${ruby.gemPath}
-
- for prog in $out/bin/*; do
- wrapProgram "$prog" \
- --prefix GEM_PATH : "$GEM_PATH" \
- --prefix RUBYLIB : "${rubygems}/lib" \
- --set RUBYOPT 'rubygems'
- done
-
- for prog in $out/gems/*/bin/*; do
- [[ -e "$out/bin/$(basename $prog)" ]]
- done
-
- runHook postInstall
- '';
- };
- gem = aName: a@{ name, basename, requiredGems, sha256, meta }:
- stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults
- [
- (gemDefaults a)
- (stdenv.lib.maybeAttr name {} patches)
- (stdenv.lib.maybeAttr basename {} patches)
- ]
- ) ["mergeAttrBy"]);
- gemsWithVersions = stdenv.lib.mapAttrs gem gemsGenerated.gems;
- gems = gemsWithVersions // gemsGenerated.aliases;
+ generated = stdenv.lib.attrByPath [ "gems" "generated" ] (import
./generated.nix) config;
+ auto = generated merged;
+ patches = callPackage ./patches.nix { } gems;
+ overwrites = callPackage ./overwrites.nix { } gems;
+ merged = stdenv.lib.mapAttrs gem auto.gems;
+ gem = callPackage ./gem.nix { inherit patches overwrites; };
+ gems = merged // auto.aliases;
in
gems
Added: nixpkgs/trunk/pkgs/development/interpreters/ruby/overwrites.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/overwrites.nix Fri Jan
21 08:25:02 2011 (r25656)
@@ -0,0 +1,6 @@
+{ xapianBindings }:
+gems:
+
+{
+ xapian_full = xapianBindings.merge { cfg = { rubySupport = true; }; };
+}
Added: nixpkgs/trunk/pkgs/development/interpreters/ruby/patches.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/patches.nix Fri Jan
21 08:25:02 2011 (r25656)
@@ -0,0 +1,50 @@
+{fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi, zlib,
+ libuuid}:
+gems:
+
+let
+ patchUsrBinEnv = writeScript "path-usr-bin-env" ''
+ #!/bin/sh
+ set -x
+ echo "==================="
+ find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p
env)@g"
+ find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p
env)@g"
+ '';
+in
+{
+ sup = { buildInputs = [ gems.ncursesw ]; };
+ sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
+ rails = { gemFlags = "--no-ri --no-rdoc"; };
+ ncurses = { propagatedBuildInputs = [ ncurses ]; };
+ ncursesw = { propagatedBuildInputs = [ ncurses ]; };
+ nokogiri = {
+ buildFlags=["--with-xml2-dir=${libxml2}
--with-xml2-include=${libxml2}/include/libxml2"
+ "--with-xslt-dir=${libxslt}" ];
+ };
+
+ ffi = {
+ postUnpack = "onetuh";
+ buildFlags=["--with-ffi-dir=${libffi}"];
+ NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
+ };
+
+ xrefresh_server =
+ let patch = fetchurl {
+ url = "http://mawercer.de/~nix/xrefresh.diff.gz";;
+ sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
+ };
+ in {
+ propagatedBuildInputs = [ gems.rb_inotify ];
+
+ # monitor implementation for Linux
+ postInstall = ''
+ cd $out/${ruby.gemPath}/gems/*
+ zcat ${patch} | patch -p 1
+ '';
+ };
+
+ xapian_full = {
+ buildInputs = [ gems.rake zlib libuuid ];
+ gemFlags = "--no-rdoc --no-ri";
+ };
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
