jolheiser/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=32792
This commit is contained in:
Yury G. Kudryashov 2012-03-05 10:00:23 +00:00
commit 57fd764a39
42 changed files with 622 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/display-managers/slim/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
stdenv.mkDerivation rec {
name = "slim-1.3.2";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
./pam2.patch
];
buildInputs = [x11 libjpeg libpng libXmu freetype pam];
buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";

32
pkgs/applications/graphics/fbida/default.nix
View File

@ -1,32 +1,30 @@
{ stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng
, pkgconfig, freetype, fontconfig
{ stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp
, pkgconfig, freetype, fontconfig, which, imagemagick, curl, saneBackends
}:
stdenv.mkDerivation rec {
name = "fbida-2.07";
name = "fbida-2.09";
src = fetchurl {
url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435";
sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x";
};
preBuild =
''
# Fetch a segfault in exiftran (http://bugs.gentoo.org/284753).
# `fbida' contains a copy of some internal libjpeg source files.
# If these do not match with the actual libjpeg, exiftran may
# fail.
tar xvf ${libjpeg.src}
for i in jpegint.h jpeglib.h jinclude.h transupp.c transupp.h; do
cp jpeg-*/$i jpeg/
done
'';
buildNativeInputs = [ pkgconfig which ];
buildInputs =
[ pkgconfig libexif libjpeg giflib libpng giflib freetype fontconfig ];
[ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
imagemagick curl saneBackends
];
makeFlags = [ "prefix=$(out)" "verbose=yes" ];
patchPhase =
''
sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
'';
configurePhase = "make config $makeFlags";
crossAttrs = {
makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
};

6
pkgs/applications/networking/browsers/firefox/10.0.nix
View File

@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "10.0.1";
firefoxVersion = "10.0.2";
xulVersion = "10.0.1"; # this attribute is used by other packages
xulVersion = "10.0.2"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "8613957db84e6722ccf1ebf74fab927139614bfc";
sha1 = "d9b459d915d4638a48b3e249fcbaf7cafc27e834";
};
commonConfigureFlags =

4
pkgs/applications/video/xine-ui/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl
{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl
, lirc, shared_mime_info }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ pkgconfig shared_mime_info ];
buildInputs =
[ xineLib libpng readline ncurses curl lirc
[ xineLib libpng12 readline ncurses curl lirc
xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
xlibs.libXinerama xlibs.libXi xlibs.libXft
];

12
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
, libXcursor, libXmu, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
, python, which, alsaLib, curl, gawk
, xorriso, makeself, perl, jdk, pkgconfig
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation {
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
pkgconfig which libXmu
];
@ -49,12 +49,16 @@ stdenv.mkDerivation {
echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk
'';
buildPhase = ''
enableParallelBuilding = true;
preBuild = ''
source env.sh
kmk
cd out/linux.*/release/bin/src
export KERN_DIR=${kernel}/lib/modules/*/build
make
'';
postBuild = ''
cd ../../../../..
'';

7
pkgs/desktops/kde-3/kdelibs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
, pkgconfig, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, cups, attr, acl
}:
@ -22,10 +22,8 @@ stdenv.mkDerivation {
./kdelibs-3.5.10-openssl_1.0.0.patch
];
passthru = {inherit openssl libjpeg qt3; inherit (xlibs) libX11;};
buildInputs = [
zlib perl qt3 openssl pcre pkgconfig libjpeg libpng libtiff libxml2
zlib perl qt3 openssl pcre pkgconfig libtiff libxml2
libxslt expat libtool freetype bzip2 cups
xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
];
@ -45,7 +43,6 @@ stdenv.mkDerivation {
configureFlags = ''
--without-arts
--with-ssl-dir=${openssl}
--with-extra-includes=${libjpeg}/include
--x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib
'';

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

@ -4,13 +4,13 @@ g: # Get dependencies from patched gems
{
aliases = {
ZenTest = g.ZenTest_4_6_2;
actionmailer = g.actionmailer_3_2_1;
actionpack = g.actionpack_3_2_1;
activemodel = g.activemodel_3_2_1;
activerecord = g.activerecord_3_2_1;
activeresource = g.activeresource_3_2_1;
activesupport = g.activesupport_3_2_1;
arel = g.arel_3_0_0;
actionmailer = g.actionmailer_3_2_2;
actionpack = g.actionpack_3_2_2;
activemodel = g.activemodel_3_2_2;
activerecord = g.activerecord_3_2_2;
activeresource = g.activeresource_3_2_2;
activesupport = g.activesupport_3_2_2;
arel = g.arel_3_0_2;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_1;
autotest_rails = g.autotest_rails_4_1_2;
builder = g.builder_3_0_0;
@ -24,13 +24,13 @@ g: # Get dependencies from patched gems
hike = g.hike_1_2_1;
hoe = g.hoe_2_3_3;
i18n = g.i18n_0_6_0;
journey = g.journey_1_0_1;
journey = g.journey_1_0_3;
json = g.json_1_6_5;
json_pure = g.json_pure_1_6_5;
mail = g.mail_2_4_1;
mime_types = g.mime_types_1_17_2;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_0_4;
multi_json = g.multi_json_1_1_0;
net_sftp = g.net_sftp_2_0_4;
net_ssh = g.net_ssh_2_3_0;
nix = g.nix_0_1_1;
@ -39,8 +39,8 @@ g: # Get dependencies from patched gems
rack_cache = g.rack_cache_1_1;
rack_ssl = g.rack_ssl_1_3_2;
rack_test = g.rack_test_0_6_1;
rails = g.rails_3_2_1;
railties = g.railties_3_2_1;
rails = g.rails_3_2_2;
railties = g.railties_3_2_2;
rake = g.rake_0_9_2_2;
rb_fsevent = g.rb_fsevent_0_9_0;
rdoc = g.rdoc_3_12;
@ -52,7 +52,7 @@ g: # Get dependencies from patched gems
rubyforge = g.rubyforge_2_0_4;
rubyzip = g.rubyzip_0_9_6_1;
sass = g.sass_3_1_15;
selenium_webdriver = g.selenium_webdriver_2_19_0;
selenium_webdriver = g.selenium_webdriver_2_20_0;
sprockets = g.sprockets_2_1_2;
thor = g.thor_0_14_6;
tilt = g.tilt_1_3_3;
@ -92,73 +92,73 @@ installed versions.'';
requiredGems = [ ];
sha256 = ''0knbim1lvp7q7k529if3h78584x845h9xyz08vykrdqa97x4lkh0'';
};
actionmailer_3_2_1 = {
actionmailer_3_2_2 = {
basename = ''actionmailer'';
meta = {
description = ''Email composition, delivery, and receiving framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
};
name = ''actionmailer-3.2.1'';
name = ''actionmailer-3.2.2'';
requiredGems = [ g.mail_2_4_1 ];
sha256 = ''02xxyz3r3cfhiynx73y2ybabdhf9x9vxfqj215p8477w6cm2sh47'';
sha256 = ''0x4308y786100146m2fx7bygp77cwzsds3cgwjjlkw9hgyapcxz0'';
};
actionpack_3_2_1 = {
actionpack_3_2_2 = {
basename = ''actionpack'';
meta = {
description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
};
name = ''actionpack-3.2.1'';
requiredGems = [ g.activemodel_3_2_1 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_1 g.sprockets_2_1_2 g.erubis_2_7_0 ];
sha256 = ''0yz5h8c4m1a8590kdsx2akg3jmbrsjf9wbd950lv19c3sm3sahzx'';
name = ''actionpack-3.2.2'';
requiredGems = [ g.activemodel_3_2_2 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_3 g.sprockets_2_1_2 g.erubis_2_7_0 ];
sha256 = ''0371q3xr81r07ch3y0ziil9481smv7rv03xdlhp78b5wgqq2d8zs'';
};
activemodel_3_2_1 = {
activemodel_3_2_2 = {
basename = ''activemodel'';
meta = {
description = ''A toolkit for building modeling frameworks (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
};
name = ''activemodel-3.2.1'';
name = ''activemodel-3.2.2'';
requiredGems = [ g.builder_3_0_0 ];
sha256 = ''1m639mdhkjwxw7szl3r7ay4s8yjwbh2sfjyv2d4wrkiq4wpz694m'';
sha256 = ''0qsgan79g0mq5dc0w4jng0847db6354ds9nxb627cc0ijxzny4zi'';
};
activerecord_3_2_1 = {
activerecord_3_2_2 = {
basename = ''activerecord'';
meta = {
description = ''Object-relational mapper framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
};
name = ''activerecord-3.2.1'';
requiredGems = [ g.arel_3_0_0 g.tzinfo_0_3_31 ];
sha256 = ''0xch76nqfgyx750z89lsxkvgshci1y49f4h7xmgiq9nmr4gfxxmv'';
name = ''activerecord-3.2.2'';
requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_31 ];
sha256 = ''08hgn2hwg2vjxcq8k656n4xhh0xyi09w5ailgqgqhkksa51m2i5b'';
};
activeresource_3_2_1 = {
activeresource_3_2_2 = {
basename = ''activeresource'';
meta = {
description = ''REST modeling framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
};
name = ''activeresource-3.2.1'';
name = ''activeresource-3.2.2'';
requiredGems = [ ];
sha256 = ''0fvsi8kikmp287dym3s4y1np9s0sxm0q65kx0idgsp9bi89wpl0d'';
sha256 = ''0fagf0mp895axy5j21yrshgqlssi949rp0a3qgaqz5bcl1b0ck8b'';
};
activesupport_3_2_1 = {
activesupport_3_2_2 = {
basename = ''activesupport'';
meta = {
description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
homepage = ''http://www.rubyonrails.org'';
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 g.multi_json_1_0_4 ];
sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v'';
name = ''activesupport-3.2.2'';
requiredGems = [ g.i18n_0_6_0 g.multi_json_1_1_0 ];
sha256 = ''0d7rzjd2rv5qjs1mgfyhdmj08hx8lz0f1vnjq6lhz2k776qiiaxh'';
};
arel_3_0_0 = {
arel_3_0_2 = {
basename = ''arel'';
meta = {
description = ''Arel is a SQL AST manager for Ruby'';
@ -172,9 +172,9 @@ It is intended to be a framework framework; that is, you can build your own ORM
with it, focusing on innovative object and collection modeling as opposed to
database compatibility and query generation.'';
};
name = ''arel-3.0.0'';
name = ''arel-3.0.2'';
requiredGems = [ ];
sha256 = ''0ci86z4h8bw2rzx9wf1kdkyz19cdrawmkvjfavdm06bpjrhrpykl'';
sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx'';
};
atoulme_Antwrap_0_7_1 = {
basename = ''atoulme_Antwrap'';
@ -412,16 +412,16 @@ See class rdoc for help. Hint: ri Hoe'';
requiredGems = [ ];
sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
};
journey_1_0_1 = {
journey_1_0_3 = {
basename = ''journey'';
meta = {
description = ''Journey is a router'';
homepage = ''http://github.com/tenderlove/journey'';
homepage = ''http://github.com/rails/journey'';
longDescription = ''Journey is a router. It routes requests.'';
};
name = ''journey-1.0.1'';
name = ''journey-1.0.3'';
requiredGems = [ ];
sha256 = ''1fccxnc9ji6j2p1avfph701b0lf2rzsksyipfavhv8kjwlzvsglx'';
sha256 = ''15bxq7dqhk88n7cjvmx0ipizc22mzf5mnb58r1nq2sq5mcpag6gb'';
};
json_1_6_5 = {
basename = ''json'';
@ -503,16 +503,16 @@ Copyright:: 2002 - 2011, Austin Ziegler
requiredGems = [ ];
sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
};
multi_json_1_0_4 = {
multi_json_1_1_0 = {
basename = ''multi_json'';
meta = {
description = ''A gem to provide swappable JSON backends.'';
homepage = ''http://github.com/intridea/multi_json'';
longDescription = ''A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.'';
};
name = ''multi_json-1.0.4'';
name = ''multi_json-1.1.0'';
requiredGems = [ ];
sha256 = ''0f2yrlxcdhdskkm4q11p2didwl26wikxycysb7i49ndp94rklvcr'';
sha256 = ''0dsqx39l6zwfw9l9zyl4l9rr83617a6i1rznw218jskxhi7jsqxr'';
};
net_sftp_2_0_4 = {
basename = ''net_sftp'';
@ -627,27 +627,27 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0'';
};
rails_3_2_1 = {
rails_3_2_2 = {
basename = ''rails'';
meta = {
description = ''Full-stack web application framework.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
name = ''rails-3.2.1'';
requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_22 ];
sha256 = ''0fx5pmywvh0s263dd6qv34rbc4qxnla5qzh8r30zrip24j6w0nr5'';
name = ''rails-3.2.2'';
requiredGems = [ g.activesupport_3_2_2 g.actionpack_3_2_2 g.activerecord_3_2_2 g.activeresource_3_2_2 g.actionmailer_3_2_2 g.railties_3_2_2 g.bundler_1_0_22 ];
sha256 = ''0kwh8142zxyvrva09m5g85cmwhby714q87j1mb8s6wikv4gvfmy9'';
};
railties_3_2_1 = {
railties_3_2_2 = {
basename = ''railties'';
meta = {
description = ''Tools for creating, working with, and running Rails applications.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
};
name = ''railties-3.2.1'';
name = ''railties-3.2.2'';
requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ];
sha256 = ''13ya1jryzz8s1j1vh1qw44y282vjjk72nf3a6dzsna9z8yx4278h'';
sha256 = ''1px41w2jrzjn7h8pm427dhliqn06yyj5md5iq5s3zmx1dps35cvf'';
};
rake_0_8_7 = {
basename = ''rake'';
@ -836,16 +836,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1lsmqm84w03w8s54i53cf3mplklpasakff2ng6zqf75digg27fzs'';
};
selenium_webdriver_2_19_0 = {
selenium_webdriver_2_20_0 = {
basename = ''selenium_webdriver'';
meta = {
description = ''The next generation developer focused tool for automated testing of webapps'';
homepage = ''http://selenium.googlecode.com'';
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
};
name = ''selenium-webdriver-2.19.0'';
name = ''selenium-webdriver-2.20.0'';
requiredGems = [ g.rubyzip_0_9_6_1 g.childprocess_0_3_1 ];
sha256 = ''1phhb8ivv203r4qs2nwxnkd6qmx02lj1xgsc5wkkm0gxl2lgz0ll'';
sha256 = ''1d37vmb7gry82bidmpnkq2nx20abi1dk55rydl9hyj94907jvc73'';
};
sprockets_2_1_2 = {
basename = ''sprockets'';

20
pkgs/development/libraries/SDL_image/default.nix
View File

@ -1,18 +1,28 @@
{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
{ stdenv, fetchhg, SDL, libpng, libjpeg, libtiff, libungif, libXpm, automake,
autoconf, pkgconfig }:
stdenv.mkDerivation rec {
pname = "SDL_image";
version = "1.2.10";
version = "1.2.10-20110925";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz";
sha256 = "0xhqw56xgc0rn3ziccirib8ai2whbbidjmvig527n9znjlg5vq3m";
src = fetchhg {
url = http://hg.libsdl.org/SDL_image;
tag = "bb611e7cb1e5";
sha256 = "0003inlvvmlc2fyrzy01lwhhfb90ppsar2skaa7x6rhmpc71dakz";
};
buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
buildNativeInputs = [ automake autoconf pkgconfig ];
patches = [ ./jpeg-linux.diff ];
preConfigure = ''
./autogen.sh
'';
postInstall = ''
sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
-e 's,"SDL_version.h",<SDL/SDL_version.h>,' \

21
pkgs/development/libraries/SDL_image/jpeg-linux.diff Normal file
View File

@ -0,0 +1,21 @@
# HG changeset patch
# User Yury G. Kudryashov <urkud@ya.ru>
# Date 1316994786 -14400
# Node ID 4c3cd9a4b0602c45c11ec62bcc1f5562ea071d70
# Parent bb611e7cb1e58cc37a6773a22a15c74b55e3d267
Fix compilation on Linux
Submitted upstream, see http://bugzilla.libsdl.org/show_bug.cgi?id=1179
diff -r bb611e7cb1e5 -r 4c3cd9a4b060 IMG_jpg.c
--- a/IMG_jpg.c Thu Aug 25 02:24:35 2011 -0400
+++ b/IMG_jpg.c Mon Sep 26 03:53:06 2011 +0400
@@ -34,7 +34,7 @@
#include <jpeglib.h>
-#if JPEG_LIB_VERSION >= 80
+#ifdef JPEG_TRUE /* MinGW version of jpeg-8.x renamed TRUE to JPEG_TRUE etc. */
typedef JPEG_boolean boolean;
#define TRUE JPEG_TRUE
#define FALSE JPEG_FALSE

42
pkgs/development/libraries/ftgl/2.1.2.nix Normal file
View File

@ -0,0 +1,42 @@
{stdenv, fetchurl, freetype, mesa}:
let
name = "ftgl-2.1.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/ftgl/${name}.tar.gz";
sha256 = "0xa00fnn6wd3rnkrkcs1wpv21lxdsb83r4hjn3l33dn0zbawnn97";
};
buildInputs = [freetype mesa];
patches = [ ./gcc.patch ];
configureFlags = "--enable-shared";
preConfigure = ''
cd unix
cd docs
tar vxf ../../docs/html.tar.gz
cd ..
'';
meta = {
homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";
description = "font rendering library for OpenGL applications";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
FTGL is a free cross-platform Open Source C++ library that uses
Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
and extruded polygon rendering modes.
'';
platforms = stdenv.lib.platforms.gnu;
maintainers = [];
};
}

13
pkgs/development/libraries/ftgl/gcc.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h
index c263f72..8959cb3 100755
--- a/include/FTTextureGlyph.h
+++ b/include/FTTextureGlyph.h
@@ -52,7 +52,7 @@ class FTGL_EXPORT FTTextureGlyph : public FTGlyph
* Reset the currently active texture to zero to get into a known state before
* drawing a string. This is to get round possible threading issues.
*/
- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
+ static void ResetActiveTexture(){ activeTextureID = 0;}
private:
/**

4
pkgs/development/libraries/haskell/math-functions/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "math-functions";
version = "0.1.1.0";
sha256 = "0qb0hbfzd1g8cz3dkm8cs2wknz08b63vn7nljmynk794y64b1klp";
version = "0.1.1.1";
sha256 = "1256fyd80z6yf61a5a90b3lad7hj0n59cyn741nkdh8p6hqrsi7z";
buildDepends = [ erf vector ];
meta = {
homepage = "https://github.com/bos/math-functions";

4
pkgs/development/libraries/haskell/persistent-template/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "0.8.1.1";
sha256 = "1wl669h8az9wviaq04pwg7w3g5cc90hafn2f1p3jybbif0hpqhks";
version = "0.8.1.2";
sha256 = "1zrd7v953avmkq40nb7jlsmy45r7dphym3fa6jfqy7d1big1mkzf";
buildDepends = [ aeson monadControl persistent text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";

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

@ -2,11 +2,11 @@
, libuuid, lzo, pkgconfig, guile }:
stdenv.mkDerivation rec {
name = "libchop-0.5.1";
name = "libchop-0.5.2";
src = fetchurl {
url = "mirror://savannah/libchop/${name}.tar.gz";
sha256 = "1sfq4ibzc9fjmq7ga96k05lr77cyizxnipa3bzm5d22jwal1x3ib";
sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
};
buildNativeInputs = [ pkgconfig gperf ];

22
pkgs/development/libraries/libharu/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, libpng }:
{ stdenv, fetchurl, zlib, libpng, patchutils }:
stdenv.mkDerivation {
name = "libharu-2.2.1";
@ -12,6 +12,26 @@ stdenv.mkDerivation {
buildInputs = [ zlib libpng ];
patches =
[ (stdenv.mkDerivation {
name = "linpng15.patch";
src = fetchurl {
url = https://github.com/tony2001/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
sha256 = "1993vskpycyr43rwdp8f688fc5zvllrqq935r7rhsgbqbipkk73h";
};
buildNativeInputs = [ patchutils ];
buildCommand = "filterdiff -x '*/CHANGES' $src > $out";
})
(fetchurl {
url = https://github.com/tony2001/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
name = "endless-loop.patch";
sha256 = "1c95mn6a5wddznqgrsaf3xsh27lz8q0pzc0a7ampxpscq0w6c9fq";
})
];
meta = {
description = "Cross platform, open source library for generating PDF files";
homepage = http://libharu.org/wiki/Main_Page;

24
pkgs/development/libraries/libpng/12.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, zlib, xz }:
assert zlib != null;
stdenv.mkDerivation rec {
name = "libpng-1.2.47";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
};
propagatedBuildInputs = [ zlib ];
buildNativeInputs = [ xz ];
passthru = { inherit zlib; };
meta = {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
};
}

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

@ -2,19 +2,18 @@
assert zlib != null;
# If you want to upgrade libpng, look at libpng15 branch
stdenv.mkDerivation rec {
name = "libpng-1.2.47";
name = "libpng-1.5.9";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
sha256 = "0rd0kn7bpdhbv4gw6475plc51a4p5kzk26kag0d08wfvb7ip8wxq";
};
propagatedBuildInputs = [ zlib ];
passthru = { inherit zlib; };
meta = {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;

21
pkgs/development/libraries/opencascade/default.nix
View File

@ -1,18 +1,25 @@
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu}:
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4,
ftgl, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-6.3.0";
name = "opencascade-6.5.2";
src = fetchurl {
url = http://files.opencascade.com/OCC_6.3_release/OpenCASCADE_src.tgz;
md5 = "52778127974cb3141c2827f9d40d1f11";
url = http://files.opencascade.com/OCCT/OCC_6.5.2_release/OpenCASCADE652.tar.gz;
sha256 = "0nsfjhd6rv1fmq8jbyzcs0f13h4xfld487vqs9bwd4lbwcfqxwcy";
};
buildInputs = [ mesa tcl tk file libXmu ];
buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
preUnpack = ''
sourceRoot=`pwd`/ros
'';
preConfigure = ''
cd ros
sh ./build_configure
'';
NIX_CFLAGS_COMPILE = "-I${ftgl}/include/FTGL -I${freetype}/include/freetype2";
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ];
postInstall = ''
@ -21,6 +28,8 @@ stdenv.mkDerivation rec {
cp -R ../doc $out/share/doc/${name}
'';
enableParallelBuilding = true;
meta = {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = http://www.opencascade.org/;

7
pkgs/development/libraries/qt-3/default.nix
View File

@ -7,9 +7,11 @@
, threadSupport ? true
, mysqlSupport ? false, mysql ? null
, openglSupport ? false, mesa ? null, libXmu ? null
, x11, xextproto, zlib, libjpeg, libpng, which
, x11, xextproto, zlib, libjpeg, libpng12, which
}:
let libpng = libpng12; in
assert xftSupport -> libXft != null;
assert xrenderSupport -> xftSupport && libXrender != null;
assert xrandrSupport -> libXrandr != null && randrproto != null;
@ -29,7 +31,8 @@ stdenv.mkDerivation {
sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
};
buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
buildNativeInputs = [ which ];
propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng];
configureFlags = "
-v

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

@ -2,11 +2,11 @@
, pkgconfig }:
stdenv.mkDerivation rec {
name = "soprano-2.7.4";
name = "soprano-2.7.5";
src = fetchurl {
url = "mirror://sourceforge/soprano/${name}.tar.bz2";
sha256 = "0f6kg39bi4h4iblfs9ny88cs951sigm50yr6w50afc3f1nqzdmhp";
sha256 = "0g9vi4z82dwz0hkg3b9gvi11akji1mzphjxwz3fw55213c0f0a3c";
};
patches = [ ./find-virtuoso.patch ];

4
pkgs/development/tools/analysis/lcov/default.nix
View File

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
};
patches =
[ ./find-source.patch
];
[ ./find-source.patch ]
++ (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch);
preBuild = ''
makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man)

13
pkgs/development/tools/analysis/lcov/freebsd-install.patch Normal file
View File

@ -0,0 +1,13 @@
FreeBSD's `install' doesn't support `-D'. Thus, use GNU install instead,
since `stdenv-native' assumes that `ginstall' is available.
--- lcov-1.9/bin/install.sh 2012-03-02 16:53:28.000000000 +0100
+++ lcov-1.9/bin/install.sh 2010-08-06 13:05:17.000000000 +0200
@@ -34,7 +34,7 @@ do_install()
local TARGET=$2
local PARAMS=$3
- ginstall -p -D $PARAMS $SOURCE $TARGET
+ install -p -D $PARAMS $SOURCE $TARGET
}

12
pkgs/development/tools/profiling/oprofile/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib
, qt3 ? null, libX11 ? null, libXext ? null, libpng ? null }:
, pkgconfig
, withGUI ? false , qt4 ? null}:
# libX11 is needed because the Qt build stuff automatically adds `-lX11'.
assert (qt3 != null) -> ((libX11 != null) && (libXext != null)
&& (libpng != null));
assert withGUI -> qt4 != null;
stdenv.mkDerivation rec {
name = "oprofile-0.9.7";
@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
s|^PATH=.*$||g"
'';
buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep ]
++ stdenv.lib.optionals (qt3 != null) [ qt3 libX11 libXext libpng ];
buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep pkgconfig ]
++ stdenv.lib.optionals withGUI [ qt4 ];
configureFlags =
[ "--with-kernel-support"
"--disable-shared" # needed because only the static libbfd is available
]
++ stdenv.lib.optional (qt3 != null) "--with-qt-dir=${qt3}";
++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
postInstall = ''
wrapProgram "$out/bin/opcontrol" \

4
pkgs/development/web/nodejs/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }:
stdenv.mkDerivation rec {
version = "0.6.10";
version = "0.6.11";
name = "nodejs-${version}";
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "1mbbb3dy0hh5qahx7aqaj8cny0wm42d00c1m804r81y6afmn1l6i";
sha256 = "1lfb2f8b6j0wszvsmarzs17h1gwaqvz1rr4nbfnx4pv4c8nxpfwl";
};
configureFlags = [

6
pkgs/games/spring/default.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "spring-${version}";
version = "0.83.0";
version = "0.86.0";
src = fetchurl {
url = "mirror://sourceforge/springrts/spring_83.0_src.tar.lzma";
sha256 = "073x1mlzil588r8xgzc323293xmi0xbw6w0k6psxl5cs0gqrvfqa";
url = "mirror://sourceforge/springrts/spring_86.0_src.tar.lzma";
sha256 = "728bc95ac551d2199539f9ec9a79254ebd4414e6aa81e03a6c4534cec61f7bca";
};
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL

2
pkgs/misc/emulators/VisualBoyAdvance/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation {
url = mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz;
sha256 = "1dr9w5i296dyq2gbx7sijk6p375aqnwld2n6rwnbzm2g3a94y4gl";
};
patches = [ ./fix.diff ]; # patch to shut up lost of precision errors
patches = [ ./libpng15.patch ./fix.diff ]; # patch to shut up lost of precision errors
preConfigure = ''
# Fix errors with invalid conversion from 'const char*' to 'char*'
sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/GBA.cpp

13
pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch Normal file
View File

@ -0,0 +1,13 @@
From Gentoo. Fixes compilation with libpng-1.5
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -79,7 +79,7 @@
return false;
}
- if(setjmp(png_ptr->jmpbuf)) {
+ if(setjmp(png_jmpbuf(png_ptr))) {
png_destroy_write_struct(&png_ptr,NULL);
fclose(fp);
return false;

198
pkgs/misc/ghostscript/libpng-1.5.patch Normal file
View File

@ -0,0 +1,198 @@
$NetBSD: patch-ak,v 1.5 2011/01/15 14:08:10 wiz Exp $
Fix build with png-1.5. From John Bowler.
See also http://bugs.ghostscript.com/show_bug.cgi?id=692060
--- a/base/gdevpng.c.orig 2008-07-17 02:34:01.000000000 +0000
+++ b/base/gdevpng.c
@@ -36,12 +36,14 @@
#include "gdevpccm.h"
#include "gscdefs.h"
-#define PNG_INTERNAL
/*
* libpng versions 1.0.3 and later allow disabling access to the stdxxx
* files while retaining support for FILE * I/O.
+ *
+ * This is a misunderstanding - this is a build time option for libpng,
+ * it has no effect on a user of libpng.
*/
-#define PNG_NO_CONSOLE_IO
+/*#define PNG_NO_CONSOLE_IO*/
/*
* Earlier libpng versions require disabling FILE * I/O altogether.
* This produces a compiler warning about no prototype for png_init_io.
@@ -280,7 +282,7 @@ png_print_page(gx_device_printer * pdev,
goto done;
}
/* set error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* If we get here, we had a problem reading the file */
code = gs_note_error(gs_error_VMerror);
goto done;
@@ -290,19 +292,12 @@ png_print_page(gx_device_printer * pdev,
png_init_io(png_ptr, file);
/* set the file information here */
- info_ptr->width = pdev->width;
- info_ptr->height = pdev->height;
- /* resolution is in pixels per meter vs. dpi */
- info_ptr->x_pixels_per_unit =
- (png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54));
- info_ptr->y_pixels_per_unit =
- (png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54));
- info_ptr->phys_unit_type = PNG_RESOLUTION_METER;
- info_ptr->valid |= PNG_INFO_pHYs;
switch (depth) {
case 32:
- info_ptr->bit_depth = 8;
- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
+ 8, PNG_COLOR_TYPE_RGB_ALPHA,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+ PNG_FILTER_TYPE_DEFAULT);
png_set_invert_alpha(png_ptr);
{ gx_device_pngalpha *ppdev = (gx_device_pngalpha *)pdev;
png_color_16 background;
@@ -315,57 +310,69 @@ png_print_page(gx_device_printer * pdev,
}
break;
case 48:
- info_ptr->bit_depth = 16;
- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
+ 16, PNG_COLOR_TYPE_RGB,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+ PNG_FILTER_TYPE_DEFAULT);
#if defined(ARCH_IS_BIG_ENDIAN) && (!ARCH_IS_BIG_ENDIAN)
png_set_swap(png_ptr);
#endif
break;
case 24:
- info_ptr->bit_depth = 8;
- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
+ 8, PNG_COLOR_TYPE_RGB,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+ PNG_FILTER_TYPE_DEFAULT);
break;
case 8:
- info_ptr->bit_depth = 8;
- if (gx_device_has_color(pdev))
- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
- else
- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
+ 8, gx_device_has_color(pdev) ?
+ PNG_COLOR_TYPE_PALETTE : PNG_COLOR_TYPE_GRAY,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+ PNG_FILTER_TYPE_DEFAULT);
break;
case 4:
- info_ptr->bit_depth = 4;
- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
+ 4, PNG_COLOR_TYPE_PALETTE,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+ PNG_FILTER_TYPE_DEFAULT);
break;
case 1:
- info_ptr->bit_depth = 1;
- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
+ 1, PNG_COLOR_TYPE_GRAY,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+ PNG_FILTER_TYPE_DEFAULT);
/* invert monocrome pixels */
png_set_invert_mono(png_ptr);
break;
+ default:
+ png_error(png_ptr, "invalid bit depth");
}
+ /* resolution is in pixels per meter vs. dpi */
+ png_set_pHYs(png_ptr, info_ptr,
+ (png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54)),
+ (png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54)),
+ PNG_RESOLUTION_METER);
+
/* set the palette if there is one */
- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) {
int i;
int num_colors = 1 << depth;
gx_color_value rgb[3];
+ png_color palette[256];
+
+ if (num_colors > 256)
+ num_colors = 256;
- info_ptr->palette =
- (void *)gs_alloc_bytes(mem, 256 * sizeof(png_color),
- "png palette");
- if (info_ptr->palette == 0) {
- code = gs_note_error(gs_error_VMerror);
- goto done;
- }
- info_ptr->num_palette = num_colors;
- info_ptr->valid |= PNG_INFO_PLTE;
for (i = 0; i < num_colors; i++) {
(*dev_proc(pdev, map_color_rgb)) ((gx_device *) pdev,
(gx_color_index) i, rgb);
- info_ptr->palette[i].red = gx_color_value_to_byte(rgb[0]);
- info_ptr->palette[i].green = gx_color_value_to_byte(rgb[1]);
- info_ptr->palette[i].blue = gx_color_value_to_byte(rgb[2]);
+ palette[i].red = gx_color_value_to_byte(rgb[0]);
+ palette[i].green = gx_color_value_to_byte(rgb[1]);
+ palette[i].blue = gx_color_value_to_byte(rgb[2]);
}
+ png_set_PLTE(png_ptr, info_ptr, palette, num_colors);
}
/* add comment */
strncpy(software_key, "Software", sizeof(software_key));
@@ -375,15 +382,14 @@ png_print_page(gx_device_printer * pdev,
text_png.key = software_key;
text_png.text = software_text;
text_png.text_length = strlen(software_text);
- info_ptr->text = &text_png;
- info_ptr->num_text = 1;
+ png_set_text(png_ptr, info_ptr, &text_png, 1);
/* write the file information */
png_write_info(png_ptr, info_ptr);
/* don't write the comments twice */
- info_ptr->num_text = 0;
- info_ptr->text = NULL;
+ /*info_ptr->num_text = 0;*/
+ /*info_ptr->text = NULL;*/
/* Write the contents of the image. */
for (y = 0; y < height; y++) {
@@ -395,7 +401,7 @@ png_print_page(gx_device_printer * pdev,
png_write_end(png_ptr, info_ptr);
/* if you alloced the palette, free it here */
- gs_free_object(mem, info_ptr->palette, "png palette");
+ /*gs_free_object(mem, info_ptr->palette, "png palette");*/
done:
/* free the structures */
@@ -405,6 +411,7 @@ png_print_page(gx_device_printer * pdev,
return code;
}
+#if 0 /* not required in 1.5 */
/*
* Patch around a static reference to a never-used procedure.
* This could be avoided if we were willing to edit pngconf.h to
@@ -422,6 +429,7 @@ png_push_fill_buffer(png_structp png_ptr
{
}
#endif
+#endif
static int
pngalpha_open(gx_device * pdev)

5
pkgs/os-specific/gnu/smbfs/default.nix
View File

@ -2,6 +2,9 @@
let
date = "2011-11-14";
samba_patched = stdenv.lib.overrideDerivation samba (attrs: {
patches = attrs.patches ++ [ ./samba-without-byte-range-locks.patch ];
});
in
stdenv.mkDerivation rec {
name = "smbfs-${date}";
@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
s|^LDFLAGS=\(.*\)$|LDFLAGS=\1 -pthread|g'
'';
buildInputs = [ hurd machHeaders samba ];
buildInputs = [ hurd machHeaders samba_patched ];
installPhase =
'' mkdir -p "$out/hurd"

14
pkgs/os-specific/gnu/smbfs/samba-without-byte-range-locks.patch Normal file
View File

@ -0,0 +1,14 @@
Since GNU/Hurd doesn't support byte-range file locks, shamelessly
disable them to allow the SMB client library to work (it uses TDB
to access /etc/samba/private/secrets.tdb, for instance.)
--- samba/lib/tdb/common/lock.c 2010-02-08 16:12:57.000000000 +0100
+++ samba/lib/tdb/common/lock.c 2012-03-01 23:39:02.000000000 +0100
@@ -48,7 +48,7 @@ int tdb_brlock(struct tdb_context *tdb,
struct flock fl;
int ret;
- if (tdb->flags & TDB_NOLOCK) {
+ if (1) {
return 0;
}

8
pkgs/os-specific/linux/upstart/default.nix
View File

@ -1,11 +1,13 @@
{ stdenv, fetchurl, pkgconfig, dbus, libnih }:
let version = "1.4"; in
stdenv.mkDerivation rec {
name = "upstart-1.3";
name = "upstart-${version}";
src = fetchurl {
url = "http://upstart.ubuntu.com/download/1.3/${name}.tar.gz";
md5 = "7820797b64878c27115fff6a7398a6a9";
url = "http://upstart.ubuntu.com/download/${version}/${name}.tar.gz";
md5 = "3aa9ddf8459b56547a6238aa77c61815";
};
buildInputs = [ pkgconfig dbus libnih ];

33
pkgs/servers/unfs3/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ fetchurl, stdenv, flex, bison }:
stdenv.mkDerivation rec {
name = "unfs3-0.9.22";
src = fetchurl {
url = "mirror://sourceforge/unfs3/${name}.tar.gz";
sha256 = "076zkyqkn56q0a8n3h65n1a68fknk4hrrp6mbhajq5s1wp5248j8";
};
buildNativeInputs = [ flex bison ];
configureFlags = [ "--disable-shared" ];
doCheck = false; # no test suite
meta = {
description = "User-space NFSv3 file system server";
longDescription =
'' UNFS3 is a user-space implementation of the NFSv3 server
specification. It provides a daemon for the MOUNT and NFS
protocols, which are used by NFS clients for accessing files on the
server.
'';
homepage = http://unfs3.sourceforge.net/;
license = "BSD"; # 3-clause BSD
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

4
pkgs/tools/archivers/gnutar/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "gnutar-1.26";
@ -32,4 +32,4 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
}
}

6
pkgs/tools/compression/lzop/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, lzo}:
stdenv.mkDerivation {
name = "lzop-1.02rc1";
name = "lzop-1.03";
src = fetchurl {
url = http://www.lzop.org/download/lzop-1.02rc1.tar.gz;
sha256 = "1dc32bfd82b130727bcec1de3b8a7cf090b78b3f14981d375ceb862b1e0e6873";
url = http://www.lzop.org/download/lzop-1.03.tar.gz;
sha256 = "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1";
};
buildInputs = [ lzo ];

16
pkgs/tools/graphics/enblend-enfuse/default.nix
View File

@ -13,6 +13,22 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ perl pkgconfig ];
patches =
let
prefix = "http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/raw-diff";
in map fetchurl [
{
url = "${prefix}/9d9b5f3a97cd/src/vigra_impex/png.cxx";
name = "ftbfs-libpng15.patch";
sha256 = "1nqhbbgphwi087qpazngg04c1whc1p4fwq19fx36jrir96xywgzg";
}
{
url = "${prefix}/101796703d73/src/vigra_impex/png.cxx";
name = "ftbfs-libpng15.patch";
sha256 = "14frqg4hab9ab6pdypkrmji43fmxjj918j7565rdwmifbm9i3005";
}
];
meta = {
homepage = http://enblend.sourceforge.net/;
description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";

14
pkgs/tools/graphics/plotutils/debian-patches.nix Normal file
View File

@ -0,0 +1,14 @@
# Generated by debian-patches.sh from debian-patches.txt
let
prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-2";
in
[
{
url = "${prefix}/10_repair_postscript";
sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p";
}
{
url = "${prefix}/25_libpng15";
sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0";
}
]

3
pkgs/tools/graphics/plotutils/debian-patches.txt Normal file
View File

@ -0,0 +1,3 @@
plotutils/2.6-2
10_repair_postscript
25_libpng15

2
pkgs/tools/graphics/plotutils/default.nix
View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [libpng];
patches = map fetchurl (import ./debian-patches.nix);
configureFlags = "--enable-libplotter"; # required for pstoedit
doCheck = true;

4
pkgs/tools/graphics/pngcrush/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
name = "pngcrush-1.7.17";
name = "pngcrush-1.7.22";
src = fetchurl {
url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
sha256 = "0lh6wl0ci2y9b690n2zggc1mk21xj6iv378gvxk6gksgjkdw2rj2";
sha256 = "1sngz34cssni4j7hvqhq5ms6h4ydb3b0s5y7fidv3kjms9g1xcsp";
};
configurePhase = ''

28
pkgs/tools/text/gnused/4.2.nix
View File

@ -1,28 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "gnused-4.2.1";
src = fetchurl {
url = "mirror://gnu/sed/sed-4.2.1.tar.bz2";
sha256 = "13wlsb4sf5d5a82xjhxqmdvrrn36rmw5f0pl9qyb9zkvldnb7hra";
};
doCheck = true;
meta = {
homepage = http://www.gnu.org/software/sed/;
description = "GNU sed, a batch stream editor";
longDescription = ''
Sed (stream editor) isn't really a true text editor or text
processor. Instead, it is used to filter text, i.e., it takes
text input and performs some operation (or set of operations) on
it and outputs the modified text. Sed is typically used for
extracting part of a file using pattern matching or substituting
multiple occurrences of a string within a file.
'';
license = "GPLv3+";
};
}

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

@ -698,6 +698,8 @@ let
ftgl = callPackage ../development/libraries/ftgl { };
ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { };
fuppes = callPackage ../tools/networking/fuppes {
ffmpeg = ffmpeg_0_6_90;
};
@ -770,8 +772,6 @@ let
gnused = callPackage ../tools/text/gnused { };
gnused_4_2 = callPackage ../tools/text/gnused/4.2.nix { };
gnutar = callPackage ../tools/archivers/gnutar { };
gnuvd = callPackage ../tools/misc/gnuvd { };
@ -1218,7 +1218,9 @@ let
pngnq = callPackage ../tools/graphics/pngnq { };
pngtoico = callPackage ../tools/graphics/pngtoico { };
pngtoico = callPackage ../tools/graphics/pngtoico {
libpng = libpng12;
};
polipo = callPackage ../servers/polipo { };
@ -1448,6 +1450,8 @@ let
unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
unfs3 = callPackage ../servers/unfs3 { };
upx = callPackage ../tools/compression/upx { };
usbmuxd = callPackage ../tools/misc/usbmuxd {};
@ -1510,7 +1514,9 @@ let
ts = callPackage ../tools/system/ts { };
transfig = callPackage ../tools/graphics/transfig { };
transfig = callPackage ../tools/graphics/transfig {
libpng = libpng12;
};
truecrypt = callPackage ../applications/misc/truecrypt {
wxGUI = getConfig [ "truecrypt" "wxGUI" ] true;
@ -3083,9 +3089,7 @@ let
openocd = callPackage ../development/tools/misc/openocd { };
oprofile = callPackage ../development/tools/profiling/oprofile {
qt3 = null;
};
oprofile = callPackage ../development/tools/profiling/oprofile { };
patchelf = callPackage ../development/tools/misc/patchelf { };
@ -3796,7 +3800,9 @@ let
ilmbase = callPackage ../development/libraries/ilmbase { };
imlib = callPackage ../development/libraries/imlib { };
imlib = callPackage ../development/libraries/imlib {
libpng = libpng12;
};
imlib2 = callPackage ../development/libraries/imlib2 { };
@ -3992,6 +3998,7 @@ let
libgcrypt = callPackage ../development/libraries/libgcrypt { };
libgdiplus = callPackage ../development/libraries/libgdiplus {
libpng = pkgs.libpng12;
};
libgpgerror = callPackage ../development/libraries/libgpg-error { };
@ -4146,6 +4153,7 @@ let
libpng = callPackage ../development/libraries/libpng { };
libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { };
libpng12 = callPackage ../development/libraries/libpng/12.nix { };
libproxy = callPackage ../development/libraries/libproxy { };
@ -4411,7 +4419,9 @@ let
openbabel = callPackage ../development/libraries/openbabel { };
opencascade = callPackage ../development/libraries/opencascade { };
opencascade = callPackage ../development/libraries/opencascade {
ftgl = ftgl212;
};
opencsg = callPackage ../development/libraries/opencsg { };
@ -4424,6 +4434,7 @@ let
opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
ffmpeg = ffmpeg_0_6_90;
libpng = libpng12;
inherit (gst_all) gstreamer;
};
@ -4730,13 +4741,14 @@ let
inherit (gnome) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
libjpeg libtiff libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (xlibs) libXt renderproto libXrender;
libpng = libpng12;
};
webkitSVN =
@ -4744,13 +4756,14 @@ let
inherit (gnome) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
libjpeg libtiff libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (xlibs) libXt renderproto libXrender;
libpng = libpng12;
};
wvstreams = callPackage ../development/libraries/wvstreams { };
@ -6329,6 +6342,7 @@ let
chrome = lowPrio (callPackage ../applications/networking/browsers/chromium {
inherit (gnome) GConf;
libpng = libpng12;
});
chromeWrapper = wrapFirefox
@ -6770,7 +6784,7 @@ let
};
qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
inherit libpng;
libpng = libpng12;
opencv = opencv_2_1;
};
@ -7702,6 +7716,7 @@ let
exult = callPackage ../games/exult {
stdenv = overrideGCC stdenv gcc42;
libpng = libpng12;
};
/*
@ -7889,7 +7904,9 @@ let
warzone2100 = callPackage ../games/warzone2100 { };
widelands = callPackage ../games/widelands {};
widelands = callPackage ../games/widelands {
libpng = libpng12;
};
xboard = builderDefsPackage (import ../games/xboard) {
inherit (xlibs) libX11 xproto libXt libXaw libSM
@ -8486,7 +8503,7 @@ let
splix = callPackage ../misc/cups/drivers/splix { };
tetex = callPackage ../tools/typesetting/tex/tetex { };
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };

1
pkgs/top-level/release.nix
View File

@ -123,6 +123,7 @@ with (import ./release-lib.nix);
gnused = all;
gnutar = all;
gnutls = linux;
gogoclient = linux;
gphoto2 = linux;
gpm = linux;
gprolog = linux;