Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32382
  • Loading branch information
urkud committed Feb 18, 2012
1 parent 14a5b49 commit 024c247
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 59 deletions.
4 changes: 2 additions & 2 deletions pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "man-pages-3.32";
name = "man-pages-3.35";

src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
sha256 = "1qr1k6kgx7i4gni9w2h610k2aa2bqdk7p08bmqslfwrzpmkkiawn";
sha256 = "186zn80k10jg1m4jp5x5x73f7cczydsjcw5zxc5d9lls5wvafp66";
};

preBuild =
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/kde-4.7/kde-runtime.nix
@@ -1,11 +1,11 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
, libcanberra, virtuoso, samba, ntrack
, libcanberra, virtuoso, samba, ntrack, libjpeg
}:

kde {
buildInputs =
[ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
samba (libcanberra.override { gtk = null; }) ntrack
samba (libcanberra.override { gtk = null; }) ntrack libjpeg
];

passthru.propagatedUserEnvPackages = [ virtuoso ];
Expand Down
9 changes: 9 additions & 0 deletions pkgs/development/interpreters/ruby/gem.nix
Expand Up @@ -40,6 +40,15 @@ let
runHook postInstall
'';

propagatedUserEnvPkgs = requiredGems;
postFixup = ''
if [ -n "$propagatedUserEnvPkgs" ]; then
mkdir -p "$out/nix-support"
echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
fi
'';

};
mb = stdenv.lib.maybeAttr;
patchedGem = a: stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults
Expand Down
47 changes: 2 additions & 45 deletions pkgs/development/interpreters/ruby/generated.nix
Expand Up @@ -17,11 +17,8 @@ g: # Get dependencies from patched gems
buildr = g.buildr_1_4_6;
bundler = g.bundler_1_0_22;
childprocess = g.childprocess_0_3_1;
coffee_script = g.coffee_script_2_2_0;
coffee_script_source = g.coffee_script_source_1_2_0;
diff_lcs = g.diff_lcs_1_1_3;
erubis = g.erubis_2_7_0;
execjs = g.execjs_1_3_0;
ffi = g.ffi_1_0_11;
highline = g.highline_1_5_1;
hike = g.hike_1_2_1;
Expand Down Expand Up @@ -63,7 +60,7 @@ g: # Get dependencies from patched gems
tzinfo = g.tzinfo_0_3_31;
xml_simple = g.xml_simple_1_0_12;
};
gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
gems = {
ZenTest_4_6_2 = {
basename = ''ZenTest'';
Expand Down Expand Up @@ -158,7 +155,7 @@ installed versions.'';
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
};
name = ''activesupport-3.2.1'';
requiredGems = [ g.i18n_0_6_0 ];
requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ];
sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v'';
};
arel_3_0_0 = {
Expand Down Expand Up @@ -278,34 +275,6 @@ for those one-off tasks, with a language that's a joy to use.
requiredGems = [ g.ffi_1_0_11 ];
sha256 = ''0phkpxvwz88kgbi4d2akiqbppf374kn2rwf64hfs99p1j1ksbw5l'';
};
coffee_script_2_2_0 = {
basename = ''coffee_script'';
meta = {
description = ''Ruby CoffeeScript Compiler'';
homepage = ''http://github.com/josh/ruby-coffee-script'';
longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler.
'';
};
name = ''coffee-script-2.2.0'';
requiredGems = [ g.coffee_script_source_1_2_0 g.execjs_1_3_0 ];
sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc'';
};
coffee_script_source_1_2_0 = {
basename = ''coffee_script_source'';
meta = {
description = ''The CoffeeScript Compiler'';
homepage = ''http://jashkenas.github.com/coffee-script/'';
longDescription = '' CoffeeScript is a little language that compiles into JavaScript.
Underneath all of those embarrassing braces and semicolons,
JavaScript has always had a gorgeous object model at its heart.
CoffeeScript is an attempt to expose the good parts of JavaScript
in a simple way.
'';
};
name = ''coffee-script-source-1.2.0'';
requiredGems = [ ];
sha256 = ''13cpmlj2m5lyxipdxmnajy12bzwmgc6g2n090gpa0wd5am7xvhkp'';
};
diff_lcs_1_1_2 = {
basename = ''diff_lcs'';
meta = {
Expand Down Expand Up @@ -365,18 +334,6 @@ is the MIT license.'';
requiredGems = [ ];
sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
};
execjs_1_3_0 = {
basename = ''execjs'';
meta = {
description = ''Run JavaScript code from Ruby'';
homepage = ''https://github.com/sstephenson/execjs'';
longDescription = '' ExecJS lets you run JavaScript code from Ruby.
'';
};
name = ''execjs-1.3.0'';
requiredGems = [ g.multi_json_1_0_4 ];
sha256 = ''1sski14wdzfljx2f9j7r09li3rxqwvink8n5v489ykw1sicg6l2s'';
};
ffi_1_0_11 = {
basename = ''ffi'';
meta = {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/ruby/ruby-19.nix
Expand Up @@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
name = "ruby-${version}";

src = fetchurl {
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
sha256 = "0km3ryc0cs578982x6c3y3n3xr920grnpncmznb447snwd10149v";
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
sha256 = "09jmxz3lqsi5097233hc1wjnzg6z5f4y7kmlkqhskdaj6125jyn6";
};

# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
Expand Down Expand Up @@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
passthru = rec {
majorVersion = "1.9";
minorVersion = "3";
patchLevel = "0";
patchLevel = "125";
libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}";
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/ruby/rubygems.nix
@@ -1,10 +1,10 @@
args : with args;
rec {

version = "1.8.15";
version = "1.8.17";
src = fetchurl {
url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
sha256 = "0crfdaxpcv13x40mb0ccm5n0r3dknw7w7xl87icj99kyqmfx8k51";
sha256 = "068sr55r8wiw55bpf93pp07871cbqhxk9cxma6arhd04j7n8ppph";
};

buildInputs = [ruby makeWrapper];
Expand Down
7 changes: 3 additions & 4 deletions pkgs/development/libraries/vigra/default.nix
Expand Up @@ -11,10 +11,9 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost
numpy hdf5 ];

cmakeFlags = if (stdenv.system == "x86_64-linux") then
"-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
else
"";
preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
cmakeFlags = stdenv.lib.optionals (stdenv.system == "x86_64-linux")
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];

meta = {
description = "Novel computer vision C++ library with customizable algorithms and data structures";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -2787,7 +2787,7 @@ let
rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
inherit ruby makeWrapper;
};
rubygems = rubygemsFun ruby;
rubygems = hiPrio (rubygemsFun ruby);

rq = callPackage ../applications/networking/cluster/rq { };

Expand Down

0 comments on commit 024c247

Please sign in to comment.