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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
This commit is contained in:
Yury G. Kudryashov 2012-02-19 11:16:24 +00:00
commit 313a029f16
45 changed files with 227 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/inkscape/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
, gsl, python, pyxml, lxml, poppler }:
, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
stdenv.mkDerivation rec {
name = "inkscape-0.48.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2";
};
patches = [ ./configure-python-libs.patch ];
patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ];
propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
makeWrapper intltool gsl poppler
makeWrapper intltool gsl poppler imagemagick libwpg
];
configureFlags = "--with-python";

47
pkgs/applications/graphics/inkscape/libpng-1.5.patch Normal file
View File

@ -0,0 +1,47 @@
Source: upstream revisions 10061 and 10707
--- a/src/sp-image.cpp 2011-02-21 07:59:34 +0000
+++ b/src/sp-image.cpp 2011-02-21 08:57:28 +0000
@@ -387,9 +387,13 @@
#if defined(PNG_iCCP_SUPPORTED)
{
- char* name = 0;
+ png_charp name = 0;
int compression_type = 0;
- char* profile = 0;
+#if (PNG_LIBPNG_VER < 10500)
+ png_charp profile = 0;
+#else
+ png_bytep profile = 0;
+#endif
png_uint_32 proflen = 0;
if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
// g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
--- a/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-27 04:55:51 +0000
+++ b/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-29 20:34:00 +0000
@@ -1481,7 +1481,7 @@
return NULL;
}
// Set error handler
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_write_struct(&png_ptr, &info_ptr);
return NULL;
}
--- a/src/helper/png-write.cpp 2011-08-07 10:53:12 +0000
+++ b/src/helper/png-write.cpp 2011-10-29 20:34:00 +0000
@@ -166,8 +166,8 @@
/* Set error handling. REQUIRED if you aren't supplying your own
* error hadnling functions in the png_create_write_struct() call.
*/
- if (setjmp(png_ptr->jmpbuf)) {
- /* If we get here, we had a problem reading the file */
+ if (setjmp(png_jmpbuf(png_ptr))) {
+ // If we get here, we had a problem reading the file
fclose(fp);
png_destroy_write_struct(&png_ptr, &info_ptr);
return false;

6
pkgs/applications/networking/irc/chatzilla/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
stdenv.mkDerivation rec {
name = "chatzilla-0.9.87";
name = "chatzilla-0.9.88";
src = fetchurl {
# Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.87-xr.zip;
sha256 = "1qwbqngrxyip3k2b71adg271sifvrrxcixkyrsy4vmgl5bwdsl4d";
url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}-xr.zip";
sha256 = "041jpjl7wnbhqm2f8bf2pwp6igjapmy74swac94h54n644wl5nz0";
};
buildInputs = [ unzip makeWrapper ];

11
pkgs/applications/office/gnucash/default.nix
View File

@ -8,15 +8,12 @@
* for a possible solution.
*/
let
name = "gnucash-2.4.8";
in
stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
name = "gnucash-2.4.10";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa";
sha256 = "1k76b6hnsmljggxsq5l9w94krfmhx58ij8jcxf72p0ddnlimdrjj";
};
buildInputs = [
@ -44,7 +41,7 @@ stdenv.mkDerivation {
'';
# The following settings fix failures in the test suite. It's not required otherwise.
NIX_LDFLAGS = "-rpath=${guile}/lib";
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib";
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
doCheck = true;

24
pkgs/applications/science/astronomy/xplanet/default.nix
View File

@ -1,27 +1,21 @@
{stdenv, fetchurl, lib, pkgconfig, freetype, pango, libpng, libtiff, giflib, libjpeg}:
{stdenv, fetchurl, pkgconfig, freetype, pango, libpng, libtiff, giflib
, libjpeg, netpbm}:
stdenv.mkDerivation {
name = "xplanet-1.2.1";
stdenv.mkDerivation rec {
name = "xplanet-1.2.2";
src = fetchurl {
url = mirror://sourceforge/xplanet/xplanet-1.2.1.tar.gz;
sha256 = "1pp55a1rgjkfcrwc00y3l48fhpqcp3qagd1zbym6zg27fzi5fbgm";
url = "mirror://sourceforge/xplanet/${name}.tar.gz";
sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg";
};
patches =
[ # Build on GCC 4.4.
(fetchurl {
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/x11-misc/xplanet/files/xplanet-1.2.1-gentoo.patch?rev=1.1";
sha256 = "0mmagjizj4hj057qmpi45w95zlrqda32x96xy44f6126xzj02yd5";
})
];
buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg ];
buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
meta = {
description = "Renders an image of the earth or other planets into the X root window";
homepage = http://xplanet.sourceforge.net;
license = "GPL";
maintainers = [ lib.maintainers.sander ];
maintainers = [ stdenv.lib.maintainers.sander stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.all;
};
}

4
pkgs/data/documentation/man-pages/default.nix
View File

@ -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 =

9
pkgs/desktops/kde-4.7/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, callPackageOrig, stdenv, qt47 }:
{ callPackage, callPackageOrig, stdenv, qt48 }:
let
release = "4.7.4";
@ -44,7 +44,7 @@ kde.modules // kde.individual //
akonadi = callPackage ./support/akonadi { };
qt4 = qt47;
qt4 = qt48;
kdebase_workspace = kde.modules.kde_workspace;
@ -52,5 +52,8 @@ kde.modules // kde.individual //
full = stdenv.lib.attrValues kde.modules;
l10n = callPackage ./l10n { inherit release; };
l10n = callPackage ./l10n {
inherit release;
inherit (kde.manifest) stable;
};
}

17
pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d3e247..f78db67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,10 @@
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
+project(kde-wallpapers NONE)
+if( WALLPAPER_INSTALL_DIR )
+ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
+else()
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+endif()
install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)

4
pkgs/desktops/kde-4.7/kde-runtime.nix
View File

@ -1,11 +1,11 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
, libcanberra, virtuoso, samba, ntrack
, libcanberra, virtuoso, samba, ntrack, libjpeg
}:
kde {
buildInputs =
[ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
samba (libcanberra.override { gtk = null; }) ntrack
samba (libcanberra.override { gtk = null; }) ntrack libjpeg
];
passthru.propagatedUserEnvPackages = [ virtuoso ];

7
pkgs/desktops/kde-4.7/kde-wallpapers.nix
View File

@ -1,8 +1,11 @@
{ kde, kdelibs }:
{ kde, cmake }:
kde {
buildNativeInputs = [ cmake ];
buildInputs = [ kdelibs ];
patches = [ ./files/kde-wallpapers-buildsystem.patch ];
cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
outputHashAlgo = "sha256";
outputHashMode = "recursive";

6
pkgs/desktops/kde-4.7/kde-workspace.nix
View File

@ -1,13 +1,13 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies
, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate
, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
, pykde4
, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc
}:
kde {
buildInputs =
[ kdelibs qimageblitz libdbusmenu_qt pykde4
[ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc
xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
@ -15,6 +15,8 @@ kde {
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
];
buildNativeInputs = [ pkgconfig ];
preConfigure =
''
# Fix incorrect path to kde4-config.

6
pkgs/desktops/kde-4.7/kdegames.nix
View File

@ -1,12 +1,14 @@
{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
openal, libsndfile, qhull }:
openal, libsndfile, qhull, sqlite, pkgconfig }:
kde rec {
buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
openal libsndfile qhull ] ++ pythonPath;
openal libsndfile qhull sqlite ] ++ pythonPath;
pythonPath = [ pythonPackages.twisted pykde4 ];
buildNativeInputs = [ pkgconfig ];
# TODO: ggz
postInstall = "wrapPythonPrograms";

2
pkgs/desktops/kde-4.7/kdelibs.nix
View File

@ -10,7 +10,7 @@ kde {
buildInputs =
[ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
shared_desktop_ontologies udev libxml2 libjpeg
shared_desktop_ontologies udev libxml2 libjpeg kerberos
];
propagatedBuildInputs = [ qt4 soprano strigi phonon ];

5
pkgs/desktops/kde-4.7/kdemultimedia.nix
View File

@ -1,5 +1,5 @@
{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg,
libmusicbrainz3, libtunepimp }:
libmusicbrainz3, libtunepimp, pulseaudio }:
kde {
@ -7,7 +7,8 @@ kde {
# Note: kdemultimedia can use xine-lib, but it doesn't seem useful
# without the Phonon Xine backend.
[ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg
flac lame ];
flac lame pulseaudio
];
meta = {
description = "KDE multimedia programs such as a movie player and volume utility";

6
pkgs/desktops/kde-4.7/kdenetwork/kget.nix
View File

@ -1,10 +1,10 @@
{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs,
shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
kde {
buildInputs =
[ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs
kde_baseapps gpgme boost libmms qca2
kde_baseapps gpgme boost libmms qca2 sqlite
];
KDEDIRS = libktorrent;

4
pkgs/desktops/kde-4.7/kdenetwork/kopete.nix
View File

@ -1,11 +1,11 @@
{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
libgadu, boost, qca2, gpgme }:
libgadu, boost, qca2, gpgme, sqlite }:
kde {
buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent
jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2
gpgme ];
gpgme sqlite ];
buildNativeInputs = [ pkgconfig ];

4
pkgs/desktops/kde-4.7/kdenetwork/krdc.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, libvncserver }:
{ kde, kdelibs, libvncserver, libjpeg }:
kde {
buildInputs = [ kdelibs libvncserver ];
buildInputs = [ kdelibs libvncserver libjpeg ];
patches = [ ./kdenetwork.patch ];
}

4
pkgs/desktops/kde-4.7/l10n/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, kdelibs, gettext, release }:
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
let
@ -11,7 +11,7 @@ let
name = "kde-l10n-${saneName}-${release}";
src = fetchurl {
url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
name = "${name}.tar.bz2";
inherit sha256;
};

9
pkgs/development/interpreters/ruby/gem.nix
View File

@ -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

47
pkgs/development/interpreters/ruby/generated.nix
View File

@ -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;
@ -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'';
@ -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 = {
@ -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 = {
@ -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 = {

6
pkgs/development/interpreters/ruby/ruby-19.nix
View File

@ -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.
@ -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}";
};

4
pkgs/development/interpreters/ruby/rubygems.nix
View File

@ -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];

24
pkgs/development/libraries/bullet/default.nix Normal file
View File

@ -0,0 +1,24 @@
{stdenv, fetchurl, unzip, cmake}:
stdenv.mkDerivation {
name = "bullet-2.78";
src = fetchurl {
url = "http://bullet.googlecode.com/files/bullet-2.78.zip";
sha256 = "10l2dclvv0di9mi9qp6xfy9vybx182xp2dyygabacrpr3p75s77k";
};
buildInputs = [ unzip cmake ];
configurePhase = ''
cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF .
'';
meta = {
description = "A professional free 3D Game Multiphysics Library";
longDescription = ''
Bullet 3D Game Multiphysics Library provides state of the art collision
detection, soft body and rigid body dynamics.
'';
homepage = http://code.google.com/p/bullet/;
license = stdenv.lib.licenses.zlib;
maintainers = [ "Alexander Foremny <alexanderforemny@googlemail.com>" ];
};
}

4
pkgs/development/libraries/haskell/http-date/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-date";
version = "0.0.1";
sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd";
version = "0.0.2";
sha256 = "18nijf3hswbvcd5amhbccqmgnanmslsmqpd2iixlvwz5hqb3ncvj";
buildDepends = [ attoparsec ];
meta = {
description = "HTTP Date parser/formatter";

4
pkgs/development/libraries/liblastfm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which }:
let version = "0.3.3"; in
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
prefixKey = "--prefix ";
propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
buildNativeInputs = [ ruby pkgconfig ];
buildNativeInputs = [ ruby pkgconfig which ];
configureFlags = "--release";

4
pkgs/development/libraries/libpng/default.nix
View File

@ -4,11 +4,11 @@ assert zlib != null;
# If you want to upgrade libpng, look at libpng15 branch
stdenv.mkDerivation rec {
name = "libpng-1.2.46";
name = "libpng-1.2.47";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn";
sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
};
propagatedBuildInputs = [ zlib ];

7
pkgs/development/libraries/vigra/default.nix
View File

@ -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";

2
pkgs/development/tools/profiling/systemtap/default.nix
View File

@ -3,7 +3,7 @@
, gtkmm, libglademm, boost, perl, sqlite }:
stdenv.mkDerivation rec {
name = "systemtap-1.2";
name = "systemtap-1.2-${linux.version}";
src = fetchurl {
url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz";

15
pkgs/os-specific/linux/acpi-call/default.nix
View File

@ -1,13 +1,14 @@
{stdenv, fetchgit, kernel, ...}:
{ stdenv, fetchgit, kernel }:
stdenv.mkDerivation {
src = fetchgit {
url="git://github.com/mkottman/acpi_call.git";
rev="4f71ce83392bc52b3497";
sha256="1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3";
};
name = "acpi-call";
name = "acpi-call-${kernel.version}";
src = fetchgit {
url = "git://github.com/mkottman/acpi_call.git";
rev = "4f71ce83392bc52b3497";
sha256 = "1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3";
};
preBuild = ''
kernelVersion=$(cd ${kernel}/lib/modules && ls)
sed -e 's/break/true/' -i test_off.sh

2
pkgs/os-specific/linux/atheros/0.9.4.nix
View File

@ -17,7 +17,7 @@ postInstall = fullDepEntry (''
'') [minInit doMakeInstall];
in
stdenv.mkDerivation rec {
name = "atheros-0.9.4";
name = "atheros-0.9.4-${kernel.version}";
builder = writeScript (name + "-builder")
(textClosure localDefs [doMakeInstall
postInstall doForceShare doPropagate]);

25
pkgs/os-specific/linux/ati-drivers/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl , kernel, xlibs, which, imake
{ stdenv, fetchurl, kernel, xlibs, which, imake
, mesa # for fgl_glxgears
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
, xorg, makeWrapper, glibc, patchelf
@ -14,33 +14,32 @@
# The gentoo ebuild contains much more magic..
let lib = stdenv.lib;
inherit (lib) concatStringsSep;
in
# http://wiki.cchtml.com/index.php/Main_Page
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "ati-drivers-${version}";
name = "ati-drivers-${version}-${kernel.version}";
version = "10-11-x86";
builder = ./builder.sh;
inherit libXxf86vm xf86vidmodeproto;
src =
assert stdenv.system == "x86_64-linux";
fetchurl {
src = fetchurl {
url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run;
sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr";
};
buildInputs = [xlibs.libXext xlibs.libX11
xlibs.libXrandr which imake makeWrapper
patchelf
];
buildInputs =
[ xlibs.libXext xlibs.libX11
xlibs.libXrandr which imake makeWrapper
patchelf
];
inherit kernel glibc /* glibc only used for setting interpreter */;
LD_LIBRARY_PATH = concatStringsSep ":"
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
[ "${xorg.libXrandr}/lib"
"${xorg.libXrender}/lib"
"${xorg.libXext}/lib"

6
pkgs/os-specific/linux/bbswitch/default.nix
View File

@ -3,9 +3,11 @@
let
version = "0.4.1";
name = "bbswitch-${version}";
name = "bbswitch-${version}-${kernel.version}";
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {

3
pkgs/os-specific/linux/broadcom-sta/default.nix
View File

@ -6,7 +6,8 @@ let version = "5_100_82_112";
in
stdenv.mkDerivation {
name = "broadcom-sta-${version}";
name = "broadcom-sta-${version}-${kernel.version}";
src = fetchurl {
url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz";
sha256 = if bits == "32"

2
pkgs/os-specific/linux/e1000e/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel }:
stdenv.mkDerivation {
name = "e1000e-1.5.1";
name = "e1000e-1.5.1-${kernel.version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz";

2
pkgs/os-specific/linux/exmap/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, kernel, pkgconfig, gtkmm, boost, pcre }:
stdenv.mkDerivation rec {
name = "exmap-0.10";
name = "exmap-0.10-${kernel.version}";
src = fetchurl {
url = "http://www.berthels.co.uk/exmap/download/${name}.tgz";

4
pkgs/os-specific/linux/frandom/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel }:
stdenv.mkDerivation rec {
name = "frandom-1.1";
name = "frandom-1.1-${kernel.version}";
src = fetchurl {
url = "http://sourceforge.net/projects/frandom/files/${name}.tar.gz";
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [];
meta = {
description = "A very fast random number generator kernel module.";
description = "A very fast random number generator kernel module";
homepage = http://frandom.sourceforge.net/;
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];

10
pkgs/os-specific/linux/iscsitarget/default.nix
View File

@ -1,14 +1,16 @@
{ stdenv, fetchurl, kernel, module_init_tools}:
stdenv.mkDerivation rec {
name = "iscsitarget-1.4.20.2";
name = "iscsitarget-1.4.20.2-${kernel.version}";
src = fetchurl {
url = "mirror://sourceforge/iscsitarget/iscsitarget/1.4.20.2/${name}.tar.gz";
sha256 = "126kp0yc7vmvdbaw2xfav89340b0h91dvvyib5qbvyrq40n8wg0g";
};
KSRC = "${kernel}/lib/modules/*/build";
DESTDIR="$(out)";
DESTDIR = "$(out)";
preConfigure = ''
export PATH=$PATH:${module_init_tools}/sbin
@ -18,8 +20,8 @@ stdenv.mkDerivation rec {
buildInputs = [ module_init_tools ];
meta = {
description = "iSCSI Enterprise Target (IET) software is for building an iSCSI storage system on Linux.";
description = "iSCSI Enterprise Target (IET), software for building an iSCSI storage system on Linux";
license = "GPLv2+";
homepage = http://iscsitarget.sourceforge.net ;
homepage = http://iscsitarget.sourceforge.net;
};
}

13
pkgs/os-specific/linux/klibc/default.nix
View File

@ -1,13 +1,4 @@
{
stdenv,
fetchurl,
perl,
bison,
mktemp,
linuxHeaders,
linuxHeadersCross,
kernel ? null
}:
{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernel ? null }:
assert stdenv.isLinux;
@ -17,7 +8,7 @@ let
in
stdenv.mkDerivation {
name = "klibc-${version}";
name = "klibc-${version}${stdenv.lib.optionalString (kernel != null) "-${kernel.version}"}";
src = fetchurl {
url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2";

38
pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
View File

@ -1,38 +0,0 @@
args : with args;
rec {
name = "kqemu-"+version;
src = fetchurl {
url = http://www.nongnu.org/qemu/kqemu-1.3.0pre11.tar.gz;
sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl";
};
buildInputs = [];
configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
debugStep = fullDepEntry (''
cat config-host.mak
'') ["minInit"];
preConfigure = fullDepEntry (''
sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh
cat install.sh
sed -e '/linux\/ioctl.h/a#include <linux\/sched.h>' -i kqemu-linux.c
'') ["minInit" "doUnpack"];
fixInc = {
text = ''
sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
'';
deps = ["minInit" "doUnpack"];
};
fixMemFunc = {
text=''
sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
'';
deps = ["minInit" "doUnpack"];
};
phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
meta = {
description = "Kernel module for Qemu acceleration";
};
}

16
pkgs/os-specific/linux/kqemu/1.4.0pre1.nix → pkgs/os-specific/linux/kqemu/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, kernel, perl, fullDepEntry, ... }:
{ stdenv, fetchurl, kernel, perl }:
stdenv.mkDerivation rec {
name = "kqemu-1.4.0pre1";
name = "kqemu-1.4.0pre1-${kernel.version}";
src = fetchurl {
url = "http://www.nongnu.org/qemu/${name}.tar.gz";
sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs";
};
buildInputs = [perl];
buildInputs = [ perl ];
configureFlags = [''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'' ];
preConfigure = fullDepEntry (''
preConfigure = ''
sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
@ -20,11 +20,9 @@ stdenv.mkDerivation rec {
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh
cat install.sh
'') ["minInit" "doUnpack"];
'';
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
meta = {
description = "Kernel module for Qemu acceleration";
description = "Kernel module for QEMU acceleration";
};
}

2
pkgs/os-specific/linux/ndiswrapper/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel, perl }:
stdenv.mkDerivation {
name = "ndiswrapper-1.56-stable";
name = "ndiswrapper-1.56-${kernel.version}";
# need at least .config and include
inherit kernel;

9
pkgs/os-specific/linux/open-iscsi/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, fetchurl, kernel}:
stdenv.mkDerivation rec {
name = "open-iscsi-2.0-871";
name = "open-iscsi-2.0-871-${kernel.version}";
src = fetchurl {
url = "http://www.open-iscsi.org/bits/${name}.tar.gz";
sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw";
};
KSRC = "${kernel}/lib/modules/*/build";
DESTDIR="$(out)";
DESTDIR = "$(out)";
preConfigure = ''
sed -i 's|/usr/|/|' Makefile
@ -17,8 +18,8 @@ stdenv.mkDerivation rec {
patches = [./kernel.patch];
meta = {
description = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720.";
description = "A high performance, transport independent, multi-platform implementation of RFC3720";
license = "GPLv2+";
homepage = http://www.open-iscsi.org ;
homepage = http://www.open-iscsi.org;
};
}

2
pkgs/os-specific/linux/v86d/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
stdenv.mkDerivation rec {
name = "v86d-0.1.10";
name = "v86d-0.1.10-${kernel.version}";
src = fetchurl {
url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2";

1
pkgs/tools/networking/telnet/default.nix
View File

@ -14,5 +14,6 @@ stdenv.mkDerivation {
description = "A client and daemon for the Telnet protocol";
homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/;
license = "BSD";
platforms = stdenv.lib.platforms.gnu;
};
}

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

@ -2766,7 +2766,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 { };
@ -5744,9 +5744,7 @@ let
wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
kqemu = builderDefsPackage ../os-specific/linux/kqemu/1.4.0pre1.nix {
inherit kernel perl;
};
kqemu = callPackage ../os-specific/linux/kqemu { };
klibc = callPackage ../os-specific/linux/klibc {
linuxHeaders = glibc.kernelHeaders;
@ -8620,4 +8618,6 @@ let
misc = import ../misc/misc.nix { inherit pkgs stdenv; };
bullet = callPackage ../development/libraries/bullet {};
}; in pkgs