mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

revrting my accident only keeping rubygem updates and ruby libs

Browse source 
This partially reverts commit -r 16100

svn path=/nixpkgs/trunk/; revision=16107
This commit is contained in:
Marc Weber 2009-06-30 15:58:02 +00:00
parent d4fb6f3a53
commit 349de9bafe
5 changed files with 4 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/editors/eclipse/default.nix
View file

@ -28,12 +28,10 @@ let eclipseFun =
bindist =
if (stdenv.system == "x86_64-linux") then fetchurl {
url = http://download.eclipse.org/eclipse/downloads/drops/N20090621-2000/eclipse-SDK-N20090621-2000-linux-gtk-x86_64.tar.gz;
sha256 = "1nzrc7dplf7xzmq3282ysgar0a2jbm2y0vz8yf707da84n60yvg7";
url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz;
sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi";
} else fetchurl {
url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz;
sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah";
};
}
#/nix/store/rzmaas0m5q5gr1343gx2abs4lg832ml4-eclipse-SDK-N20090621-2000-linux-gtk-x86_64.tar.gz

2
pkgs/applications/graphics/cinepaint/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation {
cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
module = "cinepaint-project";
date = "2004-03-01";
sha256 = "b0abefc16b4db4256e9e8dcbc5d2eff93fa3f425b8ad3a4e53345efee9f1a9dd";
sha256 = "bf6dc04f3ea2094b7ef6f87f40f2c90d75a557e40a773f8eb76e8a71f14362cf";
};
buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff

36
pkgs/applications/graphics/gimp/plugins/default.nix
View file

@ -145,44 +145,8 @@ rec {
};
};
# this is more than a gimp plugin !
# either load the raw image with gimp (and the import dialog will popup)
# or use the binary
ufraw = pluginDerivation {
name = "ufraw-0.15";
buildInputs = [pkgs.lcms gimp] ++ gimp.buildInputs;
# --enable-mime - install mime files, see README for more information
# --enable-extras - build extra (dcraw, nikon-curve) executables
# --enable-dst-correction - enable DST correction for file timestamps.
# --enable-contrast - enable the contrast setting option.
# --enable-interp-none: enable 'None' interpolation (mostly for debugging).
# --with-lensfun: use the lensfun library - experimental feature, read this before using it.
# --with-prefix=PREFIX - use also PREFIX as an input prefix for the build
# --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window
configureFlags = "--enable-extras --enable-dst-correction --enable-contrast";
src = fetchurl {
url = mirror://sourceforge/ufraw/ufraw-0.15.tar.gz;
sha256 = "0cf3csksjkyl91zxhjnn74vc31l14nm6n1i02s76xdvvkk9ics8k";
};
installPhase = "
installPlugins ufraw-gimp
ensureDir $out/bin
cp ufraw $out/bin
";
};
/* =============== simple script files ==================== */
# also have a look at enblendenfuse in all-packages.nix
exposureBlend = scriptDerivation {
name = "exposure-blend";
src = fetchurl {
url = http://tir.astro.utoledo.edu/jdsmith/code/eb/exposure-blend.scm;
sha256 = "1b6c9wzpklqras4wwsyw3y3jp6fjmhnnskqiwm5sabs8djknfxla";
};
};
lightning = scriptDerivation {
name = "Lightning";
src = fetchurl {

13
pkgs/build-support/buildenv/builder.pl
View file

@ -21,9 +21,7 @@ sub isInPathsToLink {
my $path = shift;
$path = "/" if $path eq "";
foreach my $elem (@pathsToLink) {
print "isInPathsToLink elem, path $elem , $path\n";
return 1 if substr($path, 0, length($elem)) eq $elem;
print "no\n";
}
return 0;
}
@ -49,14 +47,12 @@ sub createLinks {
my $ignoreCollisions = shift;
my @srcFiles = glob("$srcDir/*");
print "in createLinks $relName, $srcDir, $dstDir, $ignoreCollisions, @srcFiles\n";
foreach my $srcFile (@srcFiles) {
my $baseName = $srcFile;
$baseName =~ s/^.*\///g; # strip directory
my $dstFile = "$dstDir/$baseName";
my $relName2 = "$relName/$baseName";
print "foreach source file $srcFile ...\n";
# Urgh, hacky...
if ($srcFile =~ /\/propagated-build-inputs$/ ||
@ -65,15 +61,12 @@ sub createLinks {
$srcFile =~ /\/info\/dir$/ ||
$srcFile =~ /\/log$/)
{
print "do nothing\n";
# Do nothing.
}
elsif (-d $srcFile) {
print "-d !\n";
if (!isInPathsToLink($relName2)) {
print "not isInPathsToLink, recurse\n";
# This path is not in the list of paths to link, but
# some of its children may be.
createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
@ -83,13 +76,11 @@ sub createLinks {
lstat $dstFile;
if (-d _) {
print "-d _\n";
createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
}
elsif (-l _) {
my $target = readlink $dstFile or die;
print "-l $target\n";
if (!-d $target) {
die "collission between directory `$srcFile' and non-directory `$target'";
}
@ -100,7 +91,6 @@ sub createLinks {
}
else {
print "symLinkMkdir \n";
symLinkMkdir $srcFile, $dstFile;
}
}
@ -113,9 +103,7 @@ sub createLinks {
}
else {
print "next unless relName2 $relName2 \n";
next unless isInPathsToLink($relName2);
print "passed \n";
symLinkMkdir $srcFile, $dstFile;
}
}
@ -129,7 +117,6 @@ sub addPkg;
sub addPkg {
my $pkgDir = shift;
my $ignoreCollisions = shift;
print "adding $pkgDir\n";
return if (defined $done{$pkgDir});
$done{$pkgDir} = 1;

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

@ -2309,11 +2309,6 @@ let
inherit pkgs stdenv;
});
rubyDebug = import ../development/interpreters/ruby/ruby-debug.nix {
inherit fetchurl stdenv;
ruby = ruby18;
};
rake = import ../development/ruby-modules/rake {
inherit fetchurl stdenv ruby ;
};
@ -2328,10 +2323,9 @@ let
withBioconductor = getConfig ["rLang" "withBioconductor"] false;
};
rubygemsFun = ruby : builderDefsPackage (import ../development/interpreters/ruby/gems.nix) {
rubygems = builderDefsPackage (import ../development/interpreters/ruby/gems.nix) {
inherit ruby makeWrapper;
};
rubygems = rubygemsFun ruby;
rq = import ../applications/networking/cluster/rq {
inherit fetchurl stdenv sqlite ruby ;