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

svn merge trunk (automatic)

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=29601
This commit is contained in:
Yury G. Kudryashov 2011-10-03 16:19:06 +00:00
commit 695de4ed64
87 changed files with 3198 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release-notes.xml
View File

@ -80,7 +80,7 @@ worth listing:
<listitem><para>Support for building derivations in a virtual
machine, including RPM and Debian builds in automatically generated
VM images. See
<filename>pkgs/build-support/vm.default.nix</filename> for
<filename>pkgs/build-support/vm/default.nix</filename> for
details.</para></listitem>
<listitem><para>Improved support for building Haskell

1
pkgs/applications/editors/kile/default.nix
View File

@ -17,5 +17,6 @@ stdenv.mkDerivation {
description = "An integrated LaTeX editor for KDE";
homepage = http://kile.sourceforge.net;
license = "GPLv2";
platforms = stdenv.lib.platforms.linux;
};
}

1
pkgs/applications/misc/k3b/1.0.nix
View File

@ -15,5 +15,6 @@ stdenv.mkDerivation {
meta = {
description = "A CD and DVD authoring application for KDE";
homepage = http://www.k3b.org/;
platforms = stdenv.lib.platforms.linux;
};
}

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

@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "7.0b1";
firefoxVersion = "7.0";
xulVersion = "7.0"; # this attribute is used by other packages
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
sha256 = "0s8lv07nggdf8ad2yx7sgq1mfy1dvzir0f6x4km911yc9qyhwmwk";
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha256 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42";
};
commonConfigureFlags =

180
pkgs/applications/networking/browsers/firefox/8.0.nix Normal file
View File

@ -0,0 +1,180 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "8.0b1";
xulVersion = "8.0"; # this attribute is used by other packages
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
sha256 = "1sdahpawgngvjh4cap2vdg00ngiwji5nkb40dh5kd393wa6c8mpm";
};
commonConfigureFlags =
[ "--enable-optimize"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
# "--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
"--enable-system-cairo"
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
];
xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto
xlibs.libXext xlibs.xextproto sqlite unzip
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = true;
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
'';
# !!! Temporary hack.
preBuild =
''
export NIX_ENFORCE_PURITY=
'';
installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix some references to /bin paths in the Xulrunner shell script.
substituteInPlace $out/bin/xulrunner \
--replace /bin/pwd "$(type -tP pwd)" \
--replace /bin/ls "$(type -tP ls)"
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
mv xulrunner ../lib/$libDir/
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done;
for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
done;
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
xlibs.pixman yasm mesa sqlite file unzip
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
"--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
'';
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
for j in $out/bin/*; do
i="$(readlink "$j")";
file $i;
if file $i | grep executable &>/dev/null; then
rm "$out/bin/$(basename "$i")"
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
chmod a+x "$out/bin/$(basename "$i")"
fi;
done;
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

39
pkgs/applications/networking/browsers/opera/builder.sh
View File

@ -1,39 +0,0 @@
source $stdenv/setup
buildPhase() {
true
}
installPhase() {
substituteInPlace install --replace /bin/pwd pwd
substituteInPlace install --replace /usr/local "$out"
# Note: the "no" is because the install scripts asks whether we
# want to install icons in some system-wide directories.
ensureDir "$out"
./install --text --system
[ -z ${system##*64*} ] && suf=64
find $out -type f | while read f; do
echo testing "$f"
# patch all executables
if readelf -h "$f" | grep 'EXEC (Executable file)' &> /dev/null; then
echo "patching $f <<"
patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$libPath" \
"$f"
fi
done
# Substitute pwd as late as possible so that the md5 checksum check of opera passes.
substituteInPlace $out/bin/opera --replace /bin/pwd pwd
ensureDir $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications
}
genericBuild

85
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -1,46 +1,81 @@
{ stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libXt, glibc
, makeDesktopItem, freetype, fontconfig, libXft, libXrender
{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, cups, xz
, gstreamer, gstPluginsBase, libxml2
, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk
, kdeSupport ? false, qt4, kdelibs
}:
assert stdenv.isLinux && stdenv.gcc.gcc != null;
assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null;
let
mirror = ftp://ftp.ussg.iu.edu/pub/opera;
in
stdenv.mkDerivation rec {
name = "opera-10.63";
name = "opera-11.51-1087";
builder = ./builder.sh;
buildNativeInputs = [ xz ];
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.i386.linux.tar.bz2";
sha256 = "dd105d602a4b8897749a4cb9610f8bfe2d07d4f4cc9bf3905930c65592737259";
url = "${mirror}/linux/1151/${name}.i386.linux.tar.bz2";
sha256 = "1baaim404g8nwd7knbl1p1ardpx36ib5159nkvqfnnavfyhkinp2";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.x86_64.linux.tar.bz2";
sha256 = "da8ae14cf317364ab0295102220246b205bf30c59c00cadb571395c90dda7c74";
url = "${mirror}/linux/1151/${name}.x86_64.linux.tar.xz";
sha256 = "1bciqyfhhdywaasj717by1a975ywf672r3pv9cw9bn0b90pgp933";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
dontStrip = 1;
# `operapluginwrapper' requires libXt. Adding it makes startup faster
# and omits error messages (on x86).
libPath =
let list = [ stdenv.gcc.gcc glibc qt zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig
libXrender];
in stdenv.lib.makeLibraryPath list
+ ":" + (if stdenv.system == "x86_64-linux" then stdenv.lib.makeSearchPath "lib64" list else "");
phases = "unpackPhase installPhase fixupPhase";
desktopItem = makeDesktopItem {
name = "Opera";
exec = "opera";
icon = "opera";
comment = "Opera Web Browser";
desktopName = "Opera";
genericName = "Web Browser";
categories = "Application;Network;";
};
installPhase = ''
./install --unattended --prefix $out
'';
buildInputs =
[ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE
libXft freetype fontconfig libXrender libuuid expat
gstreamer libxml2 gstPluginsBase
]
++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ]
++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ];
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
(":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
preFixup =
''
find $out/lib/opera -type f | while read f; do
type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
if [ -z "$type" ]; then
:
elif [ $type == "EXEC" ]; then
echo "patching $f executable <<"
patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \
"$f"
elif [ $type == "DYN" ]; then
echo "patching $f library <<"
patchelf --set-rpath "${libPath}" "$f"
else
echo "Unknown type $type"
exit 1
fi
done
'';
postFixup = ''
oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
'';
meta = {
homepage = http://www.opera.com;

10
pkgs/applications/networking/remote/freerdp/unstable.nix
View File

@ -17,7 +17,7 @@
assert printerSupport -> cups != null;
let rev = "42fb9f84e82268073a3838e6082783ba956ecc99"; in
let rev = "498b88a1da748a4a2b4dbd12c795ca87fee24bab"; in
stdenv.mkDerivation rec {
name = "freerdp-1.0pre${rev}";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = git://github.com/FreeRDP/FreeRDP.git;
inherit rev;
sha256 = "5e77163e2a728802fc426860b3f5ff88cb2f2f3b0bbf0912e9e44c3d8fa060e5";
sha256 = "91ef562e96db483ada28236e524326a75b6942becce4fd2a65ace386186eccf7";
};
buildInputs = [
@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
cunit
] ++ stdenv.lib.optional printerSupport cups;
postUnpack = ''
sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c
'';
doCheck = false;
checkPhase = ''LD_LIBRARY_PATH="libfreerdp-cache:libfreerdp-chanman:libfreerdp-common:libfreerdp-core:libfreerdp-gdi:libfreerdp-kbd:libfreerdp-rail:libfreerdp-rfx:libfreerdp-utils" cunit/test_freerdp'';
cmakeFlags = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ];

1
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -98,6 +98,7 @@ rec {
http://www.eu.kernel.org/pub/
http://www.de.kernel.org/pub/
http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
http://linux-kernel.uio.no/pub/
];
# Mirrors of ftp://ftp.kde.org/pub/kde/.

3
pkgs/build-support/kernel/modules-closure.sh
View File

@ -18,7 +18,10 @@ for module in $rootModules; do
| sed 's/^insmod //') \
|| if test -z "$allowMissing"; then exit 1; fi
#for i in $deps; do echo $i; done
if [[ "$deps" != builtin* ]]
then
closure="$closure $deps"
fi
done
echo "closure:"

4
pkgs/data/misc/themes/theme-gnu.nix
View File

@ -1,5 +1,5 @@
{fetchurl, ...}:
fetchurl {
url = http://mirrors.kernel.org/gentoo/distfiles/Theme-GNU.tar.bz2;
md5 = "61969309d23c631e57b0a311102ef034";
url = http://dev.gentoo.org/~spock/repos/bootsplash/Theme-GNU.tar.bz2;
sha256 = "1pj91nxvwjphc8r6idl4ih3ldyk34j1w9c4p8gzmwnwg3w34xha0";
}

39
pkgs/desktops/e17/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ callPackage, pkgs }:
rec {
#### CORE EFL
eina = callPackage ./eina { };
eet = callPackage ./eet { };
evas = callPackage ./evas { };
ecore = callPackage ./ecore { };
embryo = callPackage ./embryo { };
edje = callPackage ./edje { lua = pkgs.lua5; };
efreet = callPackage ./efreet { };
e_dbus = callPackage ./e_dbus { };
eeze = callPackage ./eeze { };
#### WINDOW MANAGER
enlightenment = callPackage ./enlightenment { };
#### APPLICATIONS
#### ART
}

28
pkgs/desktops/e17/e_dbus/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, pkgconfig, ecore, eina, evas, dbus_libs }:
stdenv.mkDerivation rec {
name = "e_dbus-${version}";
version = "1.0.1";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "1ifkijy4ap2mlqw2nd1dlvzlppyi7bnp15bxiy40nhdly8vhpbdl";
};
buildInputs = [ pkgconfig ecore eina evas ];
propagatedBuildInputs = [ dbus_libs ];
configureFlags = ''
--disable-edbus-test
--disable-edbus-test-client
--disable-edbus-notify-send
--disable-edbus-notify-test
'';
meta = {
description = "Enlightenment's D-Bus wrapping and glue layer library";
longDescription = ''
Enlightenment's E_Dbus is a set of wrappers around DBus APIs by
third party, so they can be easily used by EFL applications,
automatically providing Ecore/main loop integration, as well as
Eina data types.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

18
pkgs/desktops/e17/ecore/d.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, xproto, libX11, libXext }:
stdenv.mkDerivation rec {
name = "ecore-${version}";
version = "1.0.1";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0";
};
buildInputs = [ pkgconfig eina evas xproto ];
propagatedBuildInputs = [ libX11 libXext ];
meta = {
description = "";
longDescription = ''
'';
homepage = http://enlightenment.org/;
license = "BSD-style???";
};
}

30
pkgs/desktops/e17/ecore/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }:
stdenv.mkDerivation rec {
name = "ecore-${version}";
version = "1.0.1";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0";
};
buildInputs = [ pkgconfig eina evas ];
propagatedBuildInputs = [ libX11 libXext ];
meta = {
description = "Enlightenment's core mainloop, display abstraction and utility library";
longDescription = ''
Enlightenment's Ecore is a clean and tiny event loop library
with many modules to do lots of convenient things for a
programmer, to save time and effort.
It's small and lean, designed to work on embedded systems all
the way to large and powerful multi-cpu workstations. It
serialises all system signals, events etc. into a single event
queue, that is easily processed without needing to worry about
concurrency. A properly written, event-driven program using this
kind of programming doesn't need threads, nor has to worry about
concurrency. It turns a program into a state machine, and makes
it very robust and easy to follow.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

24
pkgs/desktops/e17/edje/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, lua, eina, eet, evas, ecore, embryo }:
stdenv.mkDerivation rec {
name = "edje-${version}";
version = "1.0.1";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "0z7gjj4ccjr36ba763ijmjkya58fc173vpdw1m298zwhy8n4164j";
};
buildInputs = [ pkgconfig lua eina eet evas ecore embryo ];
meta = {
description = "Enlightenment's abstract GUI layout and animation object library";
longDescription = ''
Enlightenment's Edje is a complex graphical design & layout
library based on Evas that provides an abstraction layer between
the application code and the interface, while allowing extremely
flexible dynamic layouts and animations.
In more popular terms, Edje makes every application that uses it
"skinable".
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

29
pkgs/desktops/e17/eet/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }:
stdenv.mkDerivation rec {
name = "eet-${version}";
version = "1.4.1";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "1hlznlmgkgzxnkmc3qgqjrc62bmwqj5af8lsh59vac2gf4jnymnc";
};
buildInputs = [ pkgconfig eina zlib libjpeg ];
meta = {
description = "Enlightenment's data encode/decode and storage library";
longDescription = ''
Enlightenment's EET is a tiny library designed to write an
arbitary set of chunks of data to a file and optionally compress
each chunk (very much like a zip file) and allow fast
random-access reading of the file later on. EET files are
perfect for storing data that is written once (or rarely) and
read many times, especially when the program does not want to
have to read all the data in at once.
Use this library when you need to pack C structure and you want
to retrieve it quickly with as few as possible memory use. You
can also use it to serialize data quickly and exchange them
between two program over ipc or network link.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

23
pkgs/desktops/e17/eeze/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, eina, ecore, udev }:
stdenv.mkDerivation rec {
name = "eeze-${version}";
version = "1.0.2";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "0g6afhnl862clj1rfh0s4nzdnhdikylbalfp8zmsw56dj0zncynq";
};
buildInputs = [ pkgconfig eina ecore ];
propagatedBuildInputs = [ udev ];
meta = {
description = "Enlightenment's device abstraction library";
longDescription = ''
Enlightenment's Eeze is a library for manipulating devices
through udev with a simple and fast api. It interfaces directly
with libudev, avoiding such middleman daemons as udisks/upower
or hal, to immediately gather device information the instant it
becomes known to the system.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

29
pkgs/desktops/e17/efreet/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, ecore }:
stdenv.mkDerivation rec {
name = "efreet-${version}";
version = "1.0.1";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "0fakczsrr1idyvrp04mxw51ww017kn65xa77vq8wka4js8y0nagi";
};
buildInputs = [ pkgconfig eina eet ecore ];
meta = {
description = "Enlightenment's standards handling for freedesktop.org standards";
longDescription = ''
Enlightenment's Efreet is a library designed to help apps work
several of the Freedesktop.org standards regarding Icons,
Desktop files and Menus. To that end it implements the following
specifications:
* XDG Base Directory Specification
* Icon Theme Specification
* Desktop Entry Specification
* Desktop Menu Specification
* FDO URI Specification
* Shared Mime Info Specification
* Trash Specification
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

18
pkgs/desktops/e17/eina/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "eina-${version}";
version = "1.0.1";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "1v2z1l6nqr7hnp5gki3972kprlvylpalp5wq9xdppm250z91kaas";
};
meta = {
description = "Enlightenment's core data structure library";
longDescription = ''
Enlightenment's Eina is a core data structure and common utility
library.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

21
pkgs/desktops/e17/embryo/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "embryo-${version}";
version = "1.0.0";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "0ch9vps83s892vda1ss1cf1fbgzff9p51df2fip7fqlj8y1shvvx";
};
meta = {
description = "Enlightenment's small Pawn based virtual machine and compiler";
longDescription = ''
Enlightenment's Embryo is a tiny library designed to interpret
limited Small programs compiled by the included compiler,
embryo_cc. It is mostly a cleaned up and smaller version of the
original Small abstract machine. The compiler is mostly
untouched.
'';
homepage = http://enlightenment.org/;
license = with stdenv.lib.licenses; [ bsd2 bsd3 ]; # not sure
};
}

29
pkgs/desktops/e17/enlightenment/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }:
stdenv.mkDerivation rec {
name = "enlightenment-0.16.999.55225";
src = fetchurl {
url = "http://download.enlightenment.org/snapshots/2010-12-03/${name}.tar.gz";
sha256 = "1cv701fidp9mx3g5m9klmzsp0fj149rb133v1w76rzms3a0wljl1";
};
buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ];
configureFlags = ''
--with-profile=FAST_PC
--disable-illume
--disable-illume2
'';
meta = {
description = "Enlightenment, the window manager";
longDescription = ''
The Enlightenment Desktop shell provides an efficient yet
breathtaking window manager based on the Enlightenment
Foundation Libraries along with other essential desktop
components like a file manager, desktop icons and widgets.
It boasts a un-precedented level of theme-ability while still
being capable of performing on older hardware or embedded
devices.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

25
pkgs/desktops/e17/evas/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pkgconfig, freetype, fontconfig, libpng, libjpeg
, libX11, libXext, eina, eet }:
stdenv.mkDerivation rec {
name = "evas-${version}";
version = "1.0.1";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "0xkwyvxy32dwja0i3j8r8bzlybjwlrgmrhcri1bscp3aaj75x2rx";
};
buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
libX11 libXext eina eet
];
meta = {
description = "Enlightenment's canvas and scenegraph rendering library";
longDescription = ''
Enlightenment's Evas is a clean display canvas API that
implements a scene graph, not an immediate-mode rendering
target, is cross-platform, for several target display systems
that can draw anti-aliased text, smooth super and sub-sampled
scaled images, alpha-blend objects and much more.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

2
pkgs/desktops/kde-3/kdebase/default.nix
View File

@ -52,4 +52,6 @@ stdenv.mkDerivation {
# Work around some inexplicable build failure starting in kdebase 3.5.9.
LDFLAGS = "-L${kdelibs}/lib";
meta.platforms = stdenv.lib.platforms.linux;
}

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

@ -49,4 +49,6 @@ stdenv.mkDerivation {
--x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib
'';
meta.platforms = stdenv.lib.platforms.linux;
}

2
pkgs/desktops/kde-4.5/default.nix
View File

@ -37,8 +37,6 @@ rec {
polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
soprano = callPackage ./support/soprano { };
### LIBS
kdelibs = callPackage ./libs { };

21
pkgs/desktops/kde-4.5/support/soprano/default.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }:
stdenv.mkDerivation rec {
name = "soprano-2.7.0";
src = fetchurl {
url = "mirror://sourceforge/soprano/${name}.tar.bz2";
sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
};
# We disable the Java backend, since we do not need them and they make the closure size much bigger
buildInputs = [ cmake qt4 clucene_core redland libiodbc ];
meta = {
homepage = http://soprano.sourceforge.net/;
description = "An object-oriented C++/Qt4 framework for RDF data";
license = "LGPL";
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
inherit (qt4.meta) platforms;
};
}

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

@ -43,7 +43,6 @@ kde.modules // kde.individual //
inherit (kde) manifest modules individual splittedModuleList;
akonadi = callPackage ./support/akonadi { };
soprano = callPackage ./support/soprano { };
qt4 = qt47;

8
pkgs/desktops/kde-4.7/support/akonadi/default.nix
View File

@ -1,14 +1,16 @@
{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }:
stdenv.mkDerivation rec {
name = "akonadi-1.6.0";
name = "akonadi-1.6.1";
src = fetchurl {
url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
sha256 = "0bzr6476yyinvdhrn9z8ynmi0py9zs3dfhwk3dvqxysk87svk71f";
sha256 = "0r8sw7m1pwqc7qkaczm0r8adqi1wvlhdp32gy3q5p5plq50xhgra";
};
buildInputs = [ cmake qt4 soprano automoc4 shared_mime_info libxslt boost ];
buildInputs = [ qt4 soprano libxslt boost ];
buildNativeInputs = [ cmake automoc4 shared_mime_info ];
enableParallelBuilding = true;

53
pkgs/development/interpreters/ruby/default.nix
View File

@ -1,52 +1 @@
{ stdenv, fetchurl
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
, ncurses, readline, cursesSupport ? false
, groff, docSupport ? false
}:
let
op = stdenv.lib.optional;
ops = stdenv.lib.optionals;
in
stdenv.mkDerivation rec {
version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
name = "ruby-${version}";
src = fetchurl {
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc";
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff";
buildInputs = (ops cursesSupport [ ncurses readline ] )
++ (op docSupport groff )
++ (op zlibSupport zlib)
++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm);
configureFlags = ["--enable-shared" "--enable-pthread"];
installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory
postInstall = "mkdir -pv $out/${passthru.gemPath}";
meta = {
license = "Ruby";
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
};
passthru = rec {
majorVersion = "1.8";
minorVersion = "7";
patchLevel = "330";
libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}";
};
}
import ./ruby-19.nix

52
pkgs/development/interpreters/ruby/ruby-18.nix Normal file
View File

@ -0,0 +1,52 @@
{ stdenv, fetchurl
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
, ncurses, readline, cursesSupport ? false
, groff, docSupport ? false
}:
let
op = stdenv.lib.optional;
ops = stdenv.lib.optionals;
in
stdenv.mkDerivation rec {
version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
name = "ruby-${version}";
src = fetchurl {
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc";
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff";
buildInputs = (ops cursesSupport [ ncurses readline ] )
++ (op docSupport groff )
++ (op zlibSupport zlib)
++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm);
configureFlags = ["--enable-shared" "--enable-pthread"];
installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory
postInstall = "mkdir -pv $out/${passthru.gemPath}";
meta = {
license = "Ruby";
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
};
passthru = rec {
majorVersion = "1.8";
minorVersion = "7";
patchLevel = "330";
libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}";
};
}

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

@ -1,16 +1,12 @@
args : with args;
rec {
# some packages (eg ruby-debug) still require 1.8. So let's stick to that for
# now if nobody has different requirements
version = "1.8.10";
src = fetchurl {
url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
sha256 = "0ll5swf4mi4nbgnr5jcyzmnlwb1zr2md9kvsgy3d1f485bb1n59q";
};
buildInputs = [ruby makeWrapper];
configureFlags = [];

2
pkgs/development/libraries/dbus/1.5.6.nix
View File

@ -49,7 +49,7 @@ in rec {
preConfigure =
''
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
sed -i 's@$(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
'';

14
pkgs/development/libraries/google-perftools/default.nix Normal file
View File

@ -0,0 +1,14 @@
{stdenv, fetchurl, libunwind}:
stdenv.mkDerivation rec {
name = "google-perftools-1.8.3";
src = fetchurl {
url = "http://google-perftools.googlecode.com/files/${name}.tar.gz";
sha256 = "0ncx3a8jl6n38q9bjnaz5sq96yb6yh99j3bl64k3295v9arl9mva";
};
buildInputs = [libunwind];
meta = {
description = "Fast, multi-threaded malloc() and nifty performance analysis tools.";
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/haskell/X11-xft/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "X11-xft";
version = "0.3";
sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
version = "0.3.1";
sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf";
buildDepends = [ utf8String X11 ];
extraLibraries = [ fontconfig freetype pkgconfig ];
pkgconfigDepends = [ libXft ];

4
pkgs/development/libraries/haskell/blaze-html/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.4.1.6";
sha256 = "084phxxdy12vi2q084k8w693m94v0pjf29zx2fk1y0n80k05ii4z";
version = "0.4.2.0";
sha256 = "098y9mzq6jr73lavv7ky58bl3aajvdg72y12varpf3v3rr4l0lb2";
buildDepends = [ blazeBuilder text ];
meta = {
homepage = "http://jaspervdj.be/blaze";

20
pkgs/development/libraries/haskell/convertible-text/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ cabal, attempt, text, time }:
cabal.mkDerivation (self: {
pname = "convertible-text";
version = "0.3.0.10";
sha256 = "1hi7rqijay37b5msyzqqgvkvrsdpj9p96ajxmyk4vm7nnk5dfhbp";
isLibrary = true;
isExecutable = true;
buildDepends = [ attempt text time ];
meta = {
homepage = "http://github.com/snoyberg/convertible/tree/text";
description = "Typeclasses and instances for converting between types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

10
pkgs/development/libraries/haskell/criterion/default.nix
View File

@ -1,13 +1,13 @@
{ cabal, deepseq, mtl, mwcRandom, parsec, statistics, time, vector
, vectorAlgorithms
{ cabal, aeson, deepseq, mtl, mwcRandom, parsec, statistics, time
, vector, vectorAlgorithms
}:
cabal.mkDerivation (self: {
pname = "criterion";
version = "0.5.0.10";
sha256 = "0sd289s7wnyg0p37j327hv55aw4a18bdv56z26v4qi3j8p2fbpbj";
version = "0.5.1.0";
sha256 = "0v43dm1d84zvn32q89dq0nh4dvqr4r6fjdzwcjac0mjics3iy29d";
buildDepends = [
deepseq mtl mwcRandom parsec statistics time vector
aeson deepseq mtl mwcRandom parsec statistics time vector
vectorAlgorithms
];
meta = {

25
pkgs/development/libraries/haskell/data-object-yaml/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ cabal, convertibleText, dataObject, enumerator, failure, text
, transformers, yaml
}:
cabal.mkDerivation (self: {
pname = "data-object-yaml";
version = "0.3.3.5";
sha256 = "0ag0rac9j4ipfg9haa63s73sn7zckrpwybcfk2nbg84ix56nv36w";
isLibrary = true;
isExecutable = true;
buildDepends = [
convertibleText dataObject enumerator failure text transformers
yaml
];
meta = {
homepage = "http://github.com/snoyberg/data-object-yaml";
description = "Serialize data to and from Yaml files";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

18
pkgs/development/libraries/haskell/data-object/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, failure, text, time }:
cabal.mkDerivation (self: {
pname = "data-object";
version = "0.3.1.7";
sha256 = "0b4jai09nx3h2vfj5f2q1wp0wldvkjygyzkgrrc6hnsfx2qv8qf7";
buildDepends = [ failure text time ];
meta = {
homepage = "http://github.com/snoyberg/data-object/tree/master";
description = "Represent hierachichal structures, called objects in JSON";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "3.2.0.7";
sha256 = "1p06596yfsa0lk5ipdxm1b8j81aph2k30pm2g6ghw6k7fglklyl5";
version = "3.2.0.8";
sha256 = "1yp01g7wzr9qkx3vz7v791gglmr0pg5c6jj076rv118kw0l8n61l";
buildDepends = [
binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
regexPcre snapCore snapServer tagsoup time

4
pkgs/development/libraries/haskell/happstack/happstack-util.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "happstack-util";
version = "6.0.0";
sha256 = "06qla74kb58q0rvlfa9k16s4crnylq99hm80xx4phlddyzn0cy4z";
version = "6.0.2";
sha256 = "03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/hledger-chart/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hledger-chart";
version = "0.15.2";
sha256 = "1cs4m6lhpqib2rhpvyrw5319mjqw8cwlin7734m7yndjj8li8rcx";
version = "0.16";
sha256 = "05njn30xxnjxigvz6sjhm1ks595f9y7ndw3il1grh09rhvgp42f7";
isLibrary = false;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/hledger-lib/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hledger-lib";
version = "0.15.2";
sha256 = "1if20197nyg1as6v1c4a0js694zg213nf7rhfhv2a46af58n0bgq";
version = "0.16";
sha256 = "095hghg7b6x355yfd3xcp8cngl94k8qbl5x7qm12ncin9dsmz8h8";
buildDepends = [
cmdargs HUnit mtl parsec regexpr safe split time utf8String
];

4
pkgs/development/libraries/haskell/hledger-vty/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-vty";
version = "0.15.2";
sha256 = "0sii9psh1mm5f8w782bv2m5rxn29q23v17avhw0x5ssm9zy9yxqd";
version = "0.16";
sha256 = "161ziq4vwg6wsxijq065g1dpfnvcpxzzbarsj7znbqq4gs02mxx2";
isLibrary = false;
isExecutable = true;
buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ];

22
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@ -1,19 +1,23 @@
{ cabal, aeson, cmdargs, failure, fileEmbed, hamlet, hledger
, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe, text, time
, transformers, wai, waiExtra, warp, yesodCore, yesodForm
, yesodJson, yesodStatic
{ cabal, aesonNative, blazeHtml, clientsession, cmdargs, dataObject
, dataObjectYaml, failure, fileEmbed, hamlet, hledger, hledgerLib
, HUnit, ioStorage, parsec, regexpr, safe, shakespeareCss
, shakespeareJs, shakespeareText, text, time, transformers, wai
, waiExtra, warp, yesod, yesodCore, yesodForm, yesodJson
, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "hledger-web";
version = "0.15.3";
sha256 = "1z2pimxz2ykfb89qwp6cil4nljn8pcz8n7pjhvk948zsd96n2i6f";
version = "0.16";
sha256 = "1564w1619s08q5c1zx8i8z488zis13a8d6n4cnyha9ci95p1c89j";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson cmdargs failure fileEmbed hamlet hledger hledgerLib HUnit
ioStorage parsec regexpr safe text time transformers wai waiExtra
warp yesodCore yesodForm yesodJson yesodStatic
aesonNative blazeHtml clientsession cmdargs dataObject
dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
ioStorage parsec regexpr safe shakespeareCss shakespeareJs
shakespeareText text time transformers wai waiExtra warp yesod
yesodCore yesodForm yesodJson yesodStatic
];
meta = {
homepage = "http://hledger.org";

4
pkgs/development/libraries/haskell/hledger/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hledger";
version = "0.15.2";
sha256 = "0gja0jvr8v9s1608w45rg1dwhj48yls59shqcs4z936xdg69l42w";
version = "0.16";
sha256 = "0wz4g67ilxj741j8d7amssa6dr0xrdfghwmhzwlcp1fj4a5a44c8";
isLibrary = true;
isExecutable = true;
buildDepends = [

18
pkgs/development/libraries/haskell/network/2.3.0.6.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, parsec }:
cabal.mkDerivation (self: {
pname = "network";
version = "2.3.0.6";
sha256 = "0xdqcf7zfxpa7qmvwzxf11y61b6xn4v2jjrqpibr2pfqqr0p3gkw";
buildDepends = [ parsec ];
meta = {
homepage = "http://github.com/haskell/network";
description = "Low-level networking interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/web-routes/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "web-routes";
version = "0.25.2";
sha256 = "0gspjvk5859zwg55q8fjyz4a0d2p6lf2qwa41b8s6kcqi38nnp08";
version = "0.25.3";
sha256 = "09bqz7vn2050jr67m3rrqi0krfxa9n1fxm9rgi3c837g522nb4kk";
buildDepends = [ mtl network parsec utf8String ];
meta = {
description = "Library for maintaining correctness and composability of URLs within an application";

20
pkgs/development/libraries/haskell/yaml/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ cabal, enumerator, transformers }:
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.4.1.1";
sha256 = "0qm7kfvi99m80m2lsmn98ssr2sfsw1rbbmzyjlg7bmvbaxsyw0b9";
isLibrary = true;
isExecutable = true;
buildDepends = [ enumerator transformers ];
meta = {
homepage = "http://github.com/snoyberg/yaml/";
description = "Low-level binding to the libyaml C library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

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

@ -2,7 +2,7 @@
let
pname = "icu4c";
version = "4.6";
version = "4.8.1";
in
stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
+ (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
sha256 = "1z6zklqdf6pq7fckk8ar4vmfrnw79bih6yc8gwc7k2vx2alav8dm";
sha256 = "13zq190gl54zr84f0k48w9knarjsb966jkailyy06yhqjipcv90r";
};
postUnpack = "

6
pkgs/development/libraries/libcaca/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, ncurses}:
stdenv.mkDerivation rec {
name = "libcaca-0.99.beta16";
name = "libcaca-0.99.beta17";
src = fetchurl {
url = "http://caca.zoy.org/raw-attachment/wiki/libcaca/${name}.tar.gz";
sha256 = "1k2anqc9jxvlyar6ximf9l55xzzhgwdbjbclpj64vg6lpqf96k6a";
url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz";
sha256 = "1mpicj3xf4d0mf8papb1zbks5yzi4lnj6yh5cvpq7sb176gawmb3";
};
configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";

1
pkgs/development/libraries/policykit/default.nix
View File

@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes (obsolete)";
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/qt-4.x/4.7/default.nix
View File

@ -9,7 +9,7 @@
}:
let
v = "4.7.3";
v = "4.7.4";
in
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
sha256 = "0zlk0lcrkhi8wdb5j2lqz3nclk07blbiial7lzs03708kpb6yayh";
sha256 = "07i283si8rckdsg3h9a4sp213l16hgjrl7cpzclrjvx4x2y5w6cp";
};
preConfigure =

6
pkgs/desktops/kde-4.7/support/soprano/default.nix → pkgs/development/libraries/soprano/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
patches =
[ (fetchurl {
[ (fetchurl { # Applied upstream, remove if upgrading
url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
name = "soprano-virtuoso-restart.patch";
sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
];
# We disable the Java backend, since we do not need them and they make the closure size much bigger
buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ];
buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
buildNativeInputs = [ cmake ];
meta = {
homepage = http://soprano.sourceforge.net/;

23
pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch → pkgs/development/libraries/soprano/find-virtuoso.patch
View File

@ -2,15 +2,23 @@ From: Yury G. Kudryashov <urkud.urkud@gmail.com>
Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH
---
backends/virtuoso/virtuosobackend.cpp | 29 ++++++++++++++++++++---------
backends/virtuoso/virtuosobackend.cpp | 31 ++++++++++++++++++++++---------
backends/virtuoso/virtuosobackend.h | 2 +-
2 files changed, 21 insertions(+), 10 deletions(-)
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp
index c83605d..c24854e 100644
index c83605d..8c30c81 100644
--- a/backends/virtuoso/virtuosobackend.cpp
+++ b/backends/virtuoso/virtuosobackend.cpp
@@ -188,19 +188,19 @@ namespace {
@@ -27,6 +27,7 @@
#include "odbcconnectionpool.h"
#include "sopranodirs.h"
+#include "soprano-config.h"
#include <QtCore/QDebug>
#include <QtCore/QtPlugin>
@@ -188,19 +189,19 @@ namespace {
bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
{
@ -37,7 +45,7 @@ index c83605d..c24854e 100644
QString vs = determineVirtuosoVersion( virtuosoBin );
if ( vs.isEmpty() ) {
qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin;
@@ -217,9 +217,20 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
@@ -217,9 +218,21 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
#ifndef Q_OS_WIN
@ -53,7 +61,8 @@ index c83605d..c24854e 100644
+
+ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir();
+ return Soprano::findLibraryPath( "virtodbc_r",
+ QStringList() << virtuosoBinDir.absolutePath()
+ QStringList()
+ << virtuosoBinDir.absoluteFilePath("../lib"SOPRANO_LIB_SUFFIX)
+ << virtuosoBinDir.absoluteFilePath("../lib"),
+ QStringList() << QLatin1String( "virtuoso/plugins/" ) <<
+ QLatin1String( "odbc/" ) );
@ -74,4 +83,4 @@ index 3971b83..0807e5d 100644
};
}
--
tg: (432b73f..) t/find-virtuoso (depends on: master)
tg: (da390be..) t/find-virtuoso (depends on: master)

3
pkgs/development/tools/documentation/haddock/2.4.2.nix
View File

@ -1,4 +1,4 @@
{ cabal, ghcPaths }:
{ cabal, alex, ghcPaths, happy }:
cabal.mkDerivation (self: {
pname = "haddock";
@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [ ghcPaths ];
buildTools = [ alex happy ];
meta = {
homepage = "http://www.haskell.org/haddock/";
description = "A documentation-generation tool for Haskell libraries";

21
pkgs/development/tools/documentation/haddock/2.9.3.nix Normal file
View File

@ -0,0 +1,21 @@
{ cabal, alex, ghcPaths, happy, xhtml }:
cabal.mkDerivation (self: {
pname = "haddock";
version = "2.9.3";
sha256 = "0r3yp5s7qv9hmwwfz8rxbwj39qpysgyg53ka4alaxnfma0a96iyj";
isLibrary = true;
isExecutable = true;
buildDepends = [ ghcPaths xhtml ];
buildTools = [ alex happy ];
meta = {
homepage = "http://www.haskell.org/haddock/";
description = "A documentation-generation tool for Haskell libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/tools/haskell/cabal-ghci/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal-ghci";
version = "0.1.1";
sha256 = "09r66fv8ncsdj90zrhg4srxhmbhmf7q61kvfc39x4jbyskgciqms";
version = "0.2.0";
sha256 = "0920q103g626f8syvn73bwqnix8x6q58xyazys6yinhr7dgi2x6m";
isLibrary = true;
isExecutable = true;
meta = {

4
pkgs/development/tools/haskell/hlint/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.15";
sha256 = "1hi2qapi8lb7cawjzvpknp8qvsnfw3glxyyd5m2lbp3rvkx0d6kr";
version = "1.8.17";
sha256 = "0p2sd24zi4a9fynib03dll8jbcc7izbmknfxv80v9j3lb2p8qj5h";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/tools/misc/cpphs/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cpphs";
version = "1.12";
sha256 = "18c8yx8y54b2q086sqlp4vhslkb7mm1gry1f13mki43x93kd1vdj";
version = "1.13.1";
sha256 = "0k5p9gqnalll3w1962dwydnygk25h777bic2gvdh8i8hhyz5fsx2";
isLibrary = true;
isExecutable = true;
meta = {

39
pkgs/os-specific/linux/aufs3-util/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ stdenv, fetchgit, kernel, aufs3 }:
stdenv.mkDerivation {
name = "aufs3-util-${aufs3.patch.version}";
src = fetchgit {
url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git;
rev = aufs3.patch.utilRev;
sha256 = aufs3.patch.utilHash;
};
buildInputs = [ aufs3 ];
makeFlags =
[ "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"
"Install=install"
"DESTDIR=$(out)"
];
postInstall =
''
mv $out/usr/* $out
rmdir $out/usr
cp aufs.shlib $out/lib/
substituteInPlace $out/bin/aubrsync \
--replace /sbin/mount $out/sbin/mount \
--replace /usr/lib/aufs.shlib $out/lib/aufs.shlib
'';
meta = {
description = "Utilities for AUFS3";
homepage = http://aufs.sourceforge.net/;
maintainers = [ stdenv.lib.maintainers.eelco
stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};
}

42
pkgs/os-specific/linux/aufs3/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ stdenv, kernel, perl }:
let
aufsPredicate = x:
if x ? features then
(if x.features ? aufs3 then x.features.aufs3 else false)
else false;
featureAbort = abort "This kernel does not have aufs 3 support";
patch = stdenv.lib.findFirst aufsPredicate featureAbort kernel.kernelPatches;
in
stdenv.mkDerivation {
name = "aufs3-${patch.version}";
src = patch.patch.src;
buildInputs = [ perl ];
makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
installPhase =
''
ensureDir $out/lib/modules/${kernel.modDirVersion}/misc
cp -v aufs.ko $out/lib/modules/${kernel.modDirVersion}/misc
# Install the headers because aufs3-util requires them.
ensureDir $out/include/linux
cp -v usr/include/linux/aufs_type.h $out/include/linux
'';
passthru = { inherit patch; };
meta = {
description = "Another Unionfs implementation for Linux (third generation)";
homepage = http://aufs.sourceforge.net/;
maintainers = [ stdenv.lib.maintainers.eelco
stdenv.lib.maintainers.raskin
stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};
}

1778
pkgs/os-specific/linux/kernel/efi-stub.patch Normal file
View File

File diff suppressed because it is too large Load Diff

14
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -38,7 +38,6 @@
, extraMeta ? {}
, ubootChooser ? null
, postInstall ? ""
, setModuleDir ? true
, # After the builder did a 'make all' (kernel + modules)
# we force building the target asked: bzImage/zImage/uImage/...
@ -69,7 +68,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
passthru = {
inherit version modDirVersion;
inherit version modDirVersion kernelPatches;
# Combine the `features' attribute sets of all the kernel patches.
features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
};
@ -78,16 +77,7 @@ stdenv.mkDerivation {
generateConfig = ./generate-config.pl;
inherit preConfigure src module_init_tools localVersion postInstall;
#Currently, the builder sets $MODULE_DIR during installPhase. This causes
#problems with at least linux 3.0, so we need to conditionally avoid
#setting $MODULE_DIR. This prepend to postBuild accomplishes this with a
#sed/eval trick thanks to MarcWeber
postBuild = (if setModuleDir then "" else ''
eval "$(type installPhase | sed -e '1d' -e '/export MODULE_DIR/d')";
'') + postBuild;
inherit preConfigure src module_init_tools localVersion postInstall postBuild;
patches = map (p: p.patch) kernelPatches;

6
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@ -202,6 +202,10 @@ import ./generic.nix (
rec {
version = "3.0.4";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
sha256 = "1vypjcdii75h5f4zsw9lm8wzxd5ix0mk5p94c96hxv828mqqkmhk";
@ -210,8 +214,6 @@ import ./generic.nix (
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
setModuleDir = false;
features.iwlwifi = true;
}

12
pkgs/os-specific/linux/kernel/linux-3.1.nix
View File

@ -200,21 +200,23 @@ in
import ./generic.nix (
rec {
version = "3.1-rc7";
version = "3.1-rc8";
modDirVersion = "3.1.0-rc7";
modDirVersion = "3.1.0-rc8";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "https://github.com/torvalds/linux/tarball/v${version}";
sha256 = "05zlg522svyym6cab7lrqpihzrk8j356dyahyc321nd8yw0qfv2x";
sha256 = "1sz6snv2wavzasrswaprkjpzpll4247v4br0x2i6sndl2nqa6jz7";
name = "v${version}.tar.gz";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
setModuleDir = false;
features.iwlwifi = true;
}

47
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, fetchgit }:
let
@ -36,6 +36,24 @@ let
};
};
makeAufs3StandalonePatch = {version, rev, sha256}:
stdenv.mkDerivation {
name = "aufs3-standalone-${version}.patch";
src = fetchgit {
url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git;
inherit sha256 rev;
};
phases = [ "unpackPhase" "installPhase" ];
#Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4
installPhase = ''
cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out
'';
};
in
rec {
@ -193,6 +211,7 @@ rec {
name = "aufs2";
patch = ./aufs2.patch;
features.aufsBase = true;
features.aufs2 = true;
};
aufs2_2_6_33 =
@ -202,6 +221,7 @@ rec {
name = "aufs2";
patch = ./aufs2-33.patch;
features.aufsBase = true;
features.aufs2 = true;
};
aufs2_2_6_34 =
@ -211,6 +231,7 @@ rec {
name = "aufs2";
patch = ./aufs2-34.patch;
features.aufsBase = true;
features.aufs2 = true;
};
aufs2_2_6_35 =
@ -220,6 +241,7 @@ rec {
name = "aufs2";
patch = ./aufs2-35.patch;
features.aufsBase = true;
features.aufs2 = true;
};
aufs2_2_6_36 =
@ -272,6 +294,20 @@ rec {
features.aufs2_1 = true;
};
aufs3_0 = rec {
name = "aufs3.0";
version = "3.0";
utilRev = "a08d17d433567c7c2586c5fc2625a714b20fe155";
utilHash = "4772c1c6a36da7bbd448057c227a9cd1856ccf72748765cf85421ab0c4e34535";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";
};
features.aufsBase = true;
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_15 =
@ -379,4 +415,13 @@ rec {
name = "glibc-getline";
patch = ./getline.patch;
};
efi_stub =
{
# Patch to enable making the kernel a bootable efi image to avoid
# needing a bootloader on efi systems
# From the x86/efi-stub branch of git://github.com/mfleming/linux-2.6.git
name = "efi-stub";
patch = ./efi-stub.patch;
};
}

25
pkgs/os-specific/linux/module-init-tools/default.nix
View File

@ -1,23 +1,16 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, docbook2x}:
stdenv.mkDerivation {
name = "module-init-tools-3.4";
stdenv.mkDerivation rec {
name = "module-init-tools-3.16";
src = [
(fetchurl {
url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.4.tar.bz2;
sha256 = "11rxcdr915skc1m6dcavavw8dhcsy24wpi56sw1m4akj2frs3iwn";
})
src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/module-init-tools/${name}.tar.bz2";
sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1";
};
# Upstream forgot to include the generated manpages. Thankfully
# the Gentoo people fixed this for us :-)
(fetchurl {
url = mirror://gentoo/distfiles/module-init-tools-3.4-manpages.tar.bz2;
sha256 = "0jid24girjhr30mrdckylkcz11v4in46nshhrqv18yaxm6506v6j";
})
];
buildInputs = [ docbook2x ];
patches = [./module-dir.patch];
patches = [ ./module-dir.patch ./docbook2man.patch ];
postInstall = "rm $out/sbin/insmod.static"; # don't need it

12
pkgs/os-specific/linux/module-init-tools/docbook2man.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur module-init-tools-3.16-orig/Makefile.in module-init-tools-3.16/Makefile.in
--- module-init-tools-3.16-orig/Makefile.in 2011-06-02 13:56:45.000000000 -0400
+++ module-init-tools-3.16/Makefile.in 2011-10-01 23:59:30.584443193 -0400
@@ -174,7 +174,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOCBOOKTOMAN = @DOCBOOKTOMAN@
+DOCBOOKTOMAN = @DOCBOOKTOMAN@ --sgml
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@

253
pkgs/os-specific/linux/module-init-tools/module-dir.patch
View File

@ -1,152 +1,153 @@
diff -rc module-init-tools-3.4-orig/depmod.c module-init-tools-3.4/depmod.c
*** module-init-tools-3.4-orig/depmod.c 2007-10-07 23:51:46.000000000 +0200
--- module-init-tools-3.4/depmod.c 2008-08-11 12:03:14.000000000 +0200
***************
*** 1066,1071 ****
--- 1066,1072 ----
*system_map = NULL;
struct module *list = NULL;
diff -Naur module-init-tools-3.16-orig/depmod.c module-init-tools-3.16/depmod.c
--- module-init-tools-3.16-orig/depmod.c 2011-06-02 13:55:01.000000000 -0400
+++ module-init-tools-3.16/depmod.c 2011-10-01 23:30:14.947293695 -0400
@@ -48,10 +48,6 @@
#include "testing.h"
-#ifndef MODULE_DIR
-#define MODULE_DIR "/lib/modules/"
-#endif
-
#ifndef MODULE_BUILTIN_KEY
#define MODULE_BUILTIN_KEY "built-in"
#endif
@@ -1514,6 +1510,7 @@
struct module_overrides **overrides)
{
char *line;
+ char *module_dir;
unsigned int linenum = 0;
FILE *cfile;
@@ -1536,6 +1533,9 @@
continue;
}
+ if((module_dir = getenv("MODULE_DIR")) == NULL)
+ module_dir = "/lib/modules/";
+
if (streq(cmd, "search")) {
char *search_path;
@@ -1550,7 +1550,7 @@
continue;
}
nofail_asprintf(&dirname, "%s%s%s/%s", basedir,
- MODULE_DIR, kernelversion, search_path);
+ module_dir, kernelversion, search_path);
len = strlen(dirname);
*search = add_search(dirname, len, *search);
free(dirname);
@@ -1565,7 +1565,7 @@
continue;
nofail_asprintf(&pathname, "%s%s%s/%s/%s.ko", basedir,
- MODULE_DIR, kernelversion, subdir, modname);
+ module_dir, kernelversion, subdir, modname);
*overrides = add_override(pathname, *overrides);
free(pathname);
@@ -1737,6 +1737,7 @@
char *basedir = "", *dirname, *version;
char *system_map = NULL, *module_symvers = NULL;
int i;
+ char *module_dir;
const char *config = NULL;
struct module_search *search = NULL;
struct module_overrides *overrides = NULL;
***************
*** 1148,1157 ****
if (native_endianness() == 0)
@@ -1832,7 +1833,10 @@
if (optind == argc)
all = 1;
dirname = NOFAIL(malloc(strlen(basedir)
! + strlen(MODULE_DIR)
+ strlen(version) + 1));
! sprintf(dirname, "%s%s%s", basedir, MODULE_DIR, version);
if (maybe_all) {
if (!doing_stdout && !depfile_out_of_date(dirname))
--- 1149,1162 ----
if (optind == argc)
all = 1;
+ if((module_dir = getenv("MODULE_DIR")) == NULL) {
- nofail_asprintf(&dirname, "%s%s%s", basedir, MODULE_DIR, version);
+ if((module_dir = getenv("MODULE_DIR")) == NULL)
+ module_dir = "/lib/modules/";
+ }
+
dirname = NOFAIL(malloc(strlen(basedir)
! + strlen(module_dir)
+ strlen(version) + 1));
! sprintf(dirname, "%s%s%s", basedir, module_dir, version);
+ nofail_asprintf(&dirname, "%s%s%s", basedir, module_dir, version);
if (maybe_all) {
if (!doing_stdout && !depfile_out_of_date(dirname))
Only in module-init-tools-3.4/: depmod.c~
Only in module-init-tools-3.4/: depmod.c.rej
diff -rc module-init-tools-3.4-orig/modinfo.c module-init-tools-3.4/modinfo.c
*** module-init-tools-3.4-orig/modinfo.c 2007-10-07 23:51:46.000000000 +0200
--- module-init-tools-3.4/modinfo.c 2008-08-11 12:07:55.000000000 +0200
***************
*** 18,27 ****
#define streq(a,b) (strcmp((a),(b)) == 0)
#define strstarts(a,start) (strncmp((a),(start), strlen(start)) == 0)
@@ -1850,7 +1854,7 @@
size_t len;
- #ifndef MODULE_DIR
- #define MODULE_DIR "/lib/modules"
- #endif
nofail_asprintf(&dirname, "%s%s%s/updates", basedir,
- MODULE_DIR, version);
+ module_dir, version);
len = strlen(dirname);
search = add_search(dirname, len, search);
}
diff -Naur module-init-tools-3.16-orig/modinfo.c module-init-tools-3.16/modinfo.c
--- module-init-tools-3.16-orig/modinfo.c 2011-06-02 13:55:01.000000000 -0400
+++ module-init-tools-3.16/modinfo.c 2011-10-01 23:32:15.335093548 -0400
@@ -19,10 +19,6 @@
#include "zlibsupport.h"
#include "testing.h"
-#ifndef MODULE_DIR
-#define MODULE_DIR "/lib/modules"
-#endif
-
static int elf_endian;
static int my_endian;
--- 18,23 ----
***************
*** 278,283 ****
--- 274,280 ----
char *data;
struct param
{
struct param *next;
@@ -192,6 +188,7 @@
unsigned long size;
struct utsname buf;
char *depname, *p;
char *depname, *p, *moddir;
+ char *module_dir;
struct elf_file *module;
data = grab_file(name, size);
if (data) {
***************
*** 290,301 ****
return NULL;
}
/* Search for it in modules.dep. */
if (kernel) {
! asprintf(&depname, "%s/%s/modules.dep", MODULE_DIR, kernel);
} else {
if (strchr(name, '.') || strchr(name, '/')) {
@@ -206,10 +203,14 @@
uname(&buf);
! asprintf(&depname, "%s/%s/modules.dep", MODULE_DIR,
buf.release);
kernel = buf.release;
}
data = grab_file(depname, size);
--- 287,302 ----
return NULL;
}
+ if((module_dir = getenv("MODULE_DIR")) == NULL) {
+ module_dir = "/lib/modules";
+ }
+
+ if((module_dir = getenv("MODULE_DIR")) == NULL)
+ module_dir = "/lib/modules/";
+
if (strlen(basedir))
- nofail_asprintf(&moddir, "%s/%s/%s", basedir, MODULE_DIR, kernel);
+ nofail_asprintf(&moddir, "%s/%s/%s", basedir, module_dir, kernel);
else
- nofail_asprintf(&moddir, "%s/%s", MODULE_DIR, kernel);
+ nofail_asprintf(&moddir, "%s/%s", module_dir, kernel);
/* Search for it in modules.dep. */
if (kernel) {
! asprintf(&depname, "%s/%s/modules.dep", module_dir, kernel);
} else {
uname(&buf);
! asprintf(&depname, "%s/%s/modules.dep", module_dir,
buf.release);
}
data = grab_file(depname, size);
Only in module-init-tools-3.4/: modinfo.c~
Only in module-init-tools-3.4/: modinfo.c.rej
diff -rc module-init-tools-3.4-orig/modprobe.c module-init-tools-3.4/modprobe.c
*** module-init-tools-3.4-orig/modprobe.c 2007-10-07 23:57:23.000000000 +0200
--- module-init-tools-3.4/modprobe.c 2008-08-11 12:06:54.000000000 +0200
***************
*** 55,64 ****
char filename[0];
};
nofail_asprintf(&depname, "%s/%s", moddir, "modules.dep");
diff -Naur module-init-tools-3.16-orig/modprobe.c module-init-tools-3.16/modprobe.c
--- module-init-tools-3.16-orig/modprobe.c 2011-06-02 13:55:01.000000000 -0400
+++ module-init-tools-3.16/modprobe.c 2011-10-01 23:34:04.111913368 -0400
@@ -86,10 +86,6 @@
- #ifndef MODULE_DIR
- #define MODULE_DIR "/lib/modules"
- #endif
} modprobe_flags_t;
-#ifndef MODULE_DIR
-#define MODULE_DIR "/lib/modules"
-#endif
-
typedef void (*errfn_t)(const char *fmt, ...);
/* Do we use syslog or stderr for messages? */
--- 55,60 ----
***************
*** 1433,1438 ****
--- 1429,1435 ----
char *newname = NULL;
char *aliasfilename, *symfilename;
/**
* print_usage - output the prefered program usage
*
@@ -2131,6 +2127,7 @@
char *cmdline_opts = NULL;
char *dirname;
errfn_t error = fatal;
+ char *module_dir = NULL;
int flags = O_NONBLOCK|O_EXCL;
/* Prepend options from environment. */
***************
*** 1559,1566 ****
if (argc < optind + 1 && !dump_only && !list_only && !remove)
+ char *module_dir;
int failed = 0;
modprobe_flags_t flags = 0;
struct modprobe_conf conf = {};
@@ -2233,7 +2230,10 @@
if (argc < optind + 1 && !dump_config && !list_only)
print_usage(argv[0]);
! dirname = NOFAIL(malloc(strlen(buf.release) + sizeof(MODULE_DIR) + 1));
! sprintf(dirname, "%s/%s", MODULE_DIR, buf.release);
aliasfilename = NOFAIL(malloc(strlen(dirname)
+ sizeof("/modules.alias")));
sprintf(aliasfilename, "%s/modules.alias", dirname);
--- 1556,1567 ----
if (argc < optind + 1 && !dump_only && !list_only && !remove)
print_usage(argv[0]);
- nofail_asprintf(&dirname, "%s%s/%s", basedir, MODULE_DIR, buf.release);
+ if((module_dir = getenv("MODULE_DIR")) == NULL)
+ module_dir = "/lib/modules/";
+
+ nofail_asprintf(&dirname, "%s%s/%s", basedir, module_dir, buf.release);
/* Old-style -t xxx wildcard? Only with -l. */
if (list_only) {
! if((module_dir = getenv("MODULE_DIR")) == NULL) {
! module_dir = "/lib/modules";
! }
!
! dirname = NOFAIL(malloc(strlen(buf.release) + strlen(module_dir) + 2));
! sprintf(dirname, "%s/%s", module_dir, buf.release);
aliasfilename = NOFAIL(malloc(strlen(dirname)
+ sizeof("/modules.alias")));
sprintf(aliasfilename, "%s/modules.alias", dirname);
Only in module-init-tools-3.4/: modprobe.c~
Only in module-init-tools-3.4/: modprobe.c.rej

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
, libjpeg, libpng, ncurses, python, glib }:
assert stdenv.isLinux;
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs =
[ zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
[ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
ncurses python glib
];

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

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "shadow-4.1.4.2";
src = fetchurl {
url = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/${name}.tar.bz2";
url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2";
sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p";
};

13
pkgs/servers/sql/virtuoso/default.nix
View File

@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 openssl readline gawk ];
patchFlags = "-p0";
patches =
[ (fetchurl {
url = "http://bugsfiles.kde.org/attachment.cgi?id=63510";
name = "virtuoso-charset-fix.diff";
sha256 = "09kxjhsy3rbys0bcxpmgga4sa6qjyy79dyl4n8b0gp1hnzjskvkz";
})
];
CPP = "${stdenv.gcc}/bin/gcc -E";
configureFlags = "
@ -19,13 +29,14 @@ stdenv.mkDerivation rec {
";
postInstall=''
echo Move documentation
echo Moving documentation
mkdir -pv $out/share/doc
mv -v $out/share/virtuoso/doc $out/share/doc/${name}
find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete
'';
meta = with stdenv.lib; {
description = "SQL/RDF database used by, e.g., KDE-nepomuk";
homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
platforms = platforms.all;
maintainers = [ maintainers.urkud ];

1
pkgs/servers/x11/xorg/overrides.nix
View File

@ -103,6 +103,7 @@ in
libXext = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.libXau];
propagatedBuildInputs = [ xorg.xproto ];
preConfigure = setMalloc0ReturnsNullCrossCompiling;
};

2
pkgs/shells/bash/default.nix → pkgs/shells/bash/4.1.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
in
import ./bash-patches.nix patch;
import ./bash-4.1-patches.nix patch;
crossAttrs = {
configureFlags = baseConfigureFlags +

81
pkgs/shells/bash/4.2.nix Normal file
View File

@ -0,0 +1,81 @@
{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }:
assert interactive -> readline != null;
let
realName = "bash-4.2";
baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
in
stdenv.mkDerivation rec {
name = "${realName}-p${toString (builtins.length patches)}";
src = fetchurl {
url = "mirror://gnu/bash/${realName}.tar.gz";
sha256 = "a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8";
};
NIX_CFLAGS_COMPILE = ''
-DSYS_BASHRC="/etc/bashrc"
-DSYS_BASH_LOGOUT="/etc/bash_logout"
-DDEFAULT_PATH_VALUE="/no-such-path"
-DSTANDARD_UTILS_PATH="/no-such-path"
-DNON_INTERACTIVE_LOGIN_SHELLS
-DSSH_SOURCE_BASHRC
'';
patchFlags = "-p0";
patches =
let
patch = nr: sha256:
fetchurl {
url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}";
inherit sha256;
};
in
import ./bash-4.2-patches.nix patch;
crossAttrs = {
configureFlags = baseConfigureFlags +
" bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing";
};
configureFlags = baseConfigureFlags;
# Note: Bison is needed because the patches above modify parse.y.
buildNativeInputs = [bison]
++ stdenv.lib.optional (texinfo != null) texinfo
++ stdenv.lib.optional interactive readline;
postInstall = ''
# Add an `sh' -> `bash' symlink.
ln -s bash "$out/bin/sh"
'';
meta = {
homepage = http://www.gnu.org/software/bash/;
description =
"GNU Bourne-Again Shell, the de facto standard shell on Linux" +
(if interactive then " (for interactive use)" else "");
longDescription = ''
Bash is the shell, or command language interpreter, that will
appear in the GNU operating system. Bash is an sh-compatible
shell that incorporates useful features from the Korn shell
(ksh) and C shell (csh). It is intended to conform to the IEEE
POSIX P1003.2/ISO 9945.2 Shell and Tools standard. It offers
functional improvements over sh for both programming and
interactive use. In addition, most sh scripts can be run by
Bash without modification.
'';
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
};
passthru = {
shellPath = "/bin/bash";
};
}

0
pkgs/shells/bash/bash-patches.nix → pkgs/shells/bash/bash-4.1-patches.nix
View File

14
pkgs/shells/bash/bash-4.2-patches.nix Normal file
View File

@ -0,0 +1,14 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "0yml2b6yarrr0dzv7h45lz4126i228hvqbqacqzg4jkcawla0v4d")
(patch "002" "1yffzfxryvqns513yv3r46slkysa3nbqv40442xfxb4rw4kwkfpy")
(patch "003" "1kdl9hcpf1m7gz0ja3mvin3syprl2kmbxc3wm27391wc04apq2js")
(patch "004" "1ha0453cjqdgkns2xkdgpd2izj5b6xlsc9a2w5b3sn6j63wb0d2f")
(patch "005" "182r2iyk27l28b8kyppfavvzxhax6vn5n1zyy3yirf0463klj5x8")
(patch "006" "1labcciavnfmn0alncz1x92ydrsriikcimw24rwzmnidbaa4h4f9")
(patch "007" "15byzdqvavc3zg2lbzzdwpdy43kzdnvmr89nya211pa3yjn2cn20")
(patch "008" "0dr4p83m2xpxhvd61yny0gdlasq6r9mpyiz220998y0alq8hs213")
(patch "009" "086b9jkyjgf2zhwln72d7s5x759iskgg3r4hdrw6b5y1ni059vg7")
(patch "010" "1p23m9kssdmpnjfp96bjmmshzf25cdzlyjygdw8j6sayqa159z5c")
]

2
pkgs/shells/bash/update-patch-set.sh
View File

@ -16,7 +16,7 @@ VERSION="$2"
VERSION_CONDENSED="$(echo $VERSION | sed -es/\\.//g)"
GPG="$(if $(type -P gpg2 > /dev/null); then echo gpg2; else echo gpg; fi)"
PATCH_LIST="$PROJECT-patches.nix"
PATCH_LIST="$PROJECT-$VERSION-patches.nix"
set -e

60
pkgs/tools/networking/jwhois/connect.patch Normal file
View File

@ -0,0 +1,60 @@
https://bugzilla.redhat.com/attachment.cgi?id=265091
This fixes somewhat reversed logic of trying to connect to WHOIS server.
Tue Nov 20 2007, Lubomir Kundrak <lkundrak@redhat.com>
--- jwhois-4.0/src/utils.c.connect 2007-06-26 09:00:20.000000000 +0200
+++ jwhois-4.0/src/utils.c 2007-11-20 17:05:33.000000000 +0100
@@ -247,7 +247,7 @@ make_connect(const char *host, int port)
{
return -1;
}
- while (res)
+ for (; res; res = res->ai_next)
{
sa = res->ai_addr;
sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
@@ -266,15 +266,15 @@ make_connect(const char *host, int port)
flags = fcntl(sockfd, F_GETFL, 0);
if (fcntl(sockfd, F_SETFL, flags|O_NONBLOCK) == -1)
{
+ close (sockfd);
return -1;
}
-
error = connect(sockfd, res->ai_addr, res->ai_addrlen);
-
if (error < 0 && errno != EINPROGRESS)
{
- break;
+ close (sockfd);
+ continue;
}
FD_ZERO(&fdset);
@@ -283,18 +283,20 @@ make_connect(const char *host, int port)
error = select(FD_SETSIZE, NULL, &fdset, NULL, &timeout);
if (error == 0)
{
- break;
+ close (sockfd);
+ return -1;
}
retlen = sizeof(retval);
error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen);
if (error < 0 || retval)
{
- break;
+ close (sockfd);
+ return -1;
}
- res = res->ai_next;
+
+ break;
}
- if (error < 0 || retval) return -1;
#endif
return sockfd;

2
pkgs/tools/networking/jwhois/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation {
postInstall = "ln -s jwhois $out/bin/whois";
patches = [ ./connect.patch ];
meta = {
description = "A client for the WHOIS protocol allowing you to query the owner of a domain name";
homepage = http://www.gnu.org/software/jwhois/;

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

@ -1474,9 +1474,8 @@ let
unshield = callPackage ../tools/archivers/unshield { };
unzip = unzip552;
unzip = unzip60;
# TODO: remove in the next stdenv update.
unzip552 = callPackage ../tools/archivers/unzip/5.52.nix { };
unzip60 = callPackage ../tools/archivers/unzip/6.0.nix { };
@ -1596,11 +1595,11 @@ let
### SHELLS
bash = lowPrio (callPackage ../shells/bash {
bash = lowPrio (callPackage ../shells/bash/4.1.nix {
texinfo = null;
});
bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.2.nix {
interactive = true;
});
@ -2601,9 +2600,9 @@ let
regina = callPackage ../development/interpreters/regina {};
ruby18 = callPackage ../development/interpreters/ruby { };
ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
ruby = ruby18;
ruby = callPackage ../development/interpreters/ruby { };
rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
@ -3475,6 +3474,8 @@ let
inherit (gnome) gtk glib;
};
google_perftools = callPackage ../development/libraries/google-perftools { };
#GMP ex-satellite, so better keep it near gmp
mpfr = callPackage ../development/libraries/mpfr { };
@ -4442,6 +4443,8 @@ let
# optional
};
soprano = callPackage ../development/libraries/soprano { };
soqt = callPackage ../development/libraries/soqt { };
speechd = callPackage ../development/libraries/speechd { };
@ -4993,7 +4996,7 @@ let
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa
xkeyboard_config dbus hal libuuid openssl gperf m4
xkeyboard_config dbus libuuid openssl gperf m4
autoconf libtool xmlto asciidoc udev flex bison python;
automake = automake110x;
});
@ -5546,7 +5549,8 @@ let
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs2_1_3_0
kernelPatches.aufs3_0
#kernelPatches.aufs2_1_3_0
#kernelPatches.mips_restart_2_6_36
];
};
@ -5556,6 +5560,7 @@ let
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.efi_stub
#kernelPatches.aufs2_1_2_6_38
#kernelPatches.mips_restart_2_6_36
];
@ -5577,17 +5582,29 @@ let
aufs = callPackage ../os-specific/linux/aufs { };
aufs2 = callPackage ../os-specific/linux/aufs2 { };
aufs2 = if kernel.features ? aufs2 then
callPackage ../os-specific/linux/aufs2 { }
else null;
aufs2_1 = if kernel.features ? aufs2_1 then
callPackage ../os-specific/linux/aufs2.1 { }
else null;
aufs3 = if kernel.features ? aufs3 then
callPackage ../os-specific/linux/aufs3 { }
else null;
aufs2_util = if kernel.features ? aufs2 then
callPackage ../os-specific/linux/aufs2-util { }
else null;
aufs2_1_util = if kernel.features ? aufs2_1 then
callPackage ../os-specific/linux/aufs2.1-util { }
else null;
aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
aufs3_util = if kernel.features ? aufs3 then
callPackage ../os-specific/linux/aufs3-util { }
else null;
blcr = callPackage ../os-specific/linux/blcr {
#libtool = libtool_1_5; # libtool 2 causes a fork bomb
@ -6559,12 +6576,17 @@ let
firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" "";
firefox70b1Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
firefox70b1Wrapper = lowPrio (wrapFirefox firefox70b1Pkgs.firefox "firefox" "");
firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" "");
firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
flac = callPackage ../applications/audio/flac { };
@ -7055,7 +7077,9 @@ let
};
opera = callPackage ../applications/networking/browsers/opera {
qt = qt3;
inherit (pkgs.gtkLibs) gdk_pixbuf atk;
inherit (pkgs.kde4) kdelibs;
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
};
pan = callPackage ../applications/networking/newsreaders/pan {
@ -7832,6 +7856,11 @@ let
enlightenment = callPackage ../desktops/enlightenment { };
# e17 = recurseIntoAttrs (
# let callPackage = newScope pkgs.e17; in
# import ../desktops/e17 { inherit callPackage pkgs; }
# );
gnome28 = recurseIntoAttrs (import ../desktops/gnome-2.28 pkgs);
gnome = gnome28;

12
pkgs/top-level/haskell-packages.nix
View File

@ -474,6 +474,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
time = self.time_1_1_3;
};
convertibleText = callPackage ../development/libraries/haskell/convertible-text {};
continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {};
converge = callPackage ../development/libraries/haskell/converge {};
@ -504,6 +506,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
dataenc = callPackage ../development/libraries/haskell/dataenc {};
dataObject = callPackage ../development/libraries/haskell/data-object {};
dataObjectYaml = callPackage ../development/libraries/haskell/data-object-yaml {};
dataReify = callPackage ../development/libraries/haskell/data-reify {};
datetime = callPackage ../development/libraries/haskell/datetime {};
@ -878,7 +884,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
network = self.network_2_2_1_4;
network_2_3_0_6 = callPackage ../development/libraries/haskell/network/2.3.0.6.nix {};
network = self.network_2_3_0_6;
nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};
@ -1292,6 +1299,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
yaml = callPackage ../development/libraries/haskell/yaml {};
yap = callPackage ../development/libraries/haskell/yap {};
yesod = callPackage ../development/libraries/haskell/yesod {};
@ -1369,6 +1378,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {};
haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
haddock_2_9_3 = callPackage ../development/tools/documentation/haddock/2.9.3.nix {};
haddock = self.haddock_2_7_2;
happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};

25
pkgs/top-level/perl-packages.nix
View File

@ -2809,6 +2809,31 @@ rec {
];
};
StatisticsDescriptive = buildPerlPackage rec {
name = "Statistics-Descriptive-3.0202";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz";
sha256 = "0y8l3dkhfc2gqwfigrg363ac7pxcyshdna66afpdvs8r1gd53a1i";
};
};
StatisticsDistributions = buildPerlPackage rec {
name = "Statistics-Distributions-1.02";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz";
sha256 = "1j1kswl98f4i9dn176f9aa3y9bissx2sscga5jm3gjl4pxm3k7zr";
};
};
StatisticsTTest = buildPerlPackage rec {
name = "Statistics-TTest-1.1.0";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz";
sha256 = "0rkifgzm4rappiy669dyi6lyxn2sdqaf0bl6gndlfa67b395kndj";
};
propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ];
};
StringFormat = buildPerlPackage rec {
name = "String-Format-1.16";
src = fetchurl {

10
pkgs/top-level/python-packages.nix
View File

@ -614,11 +614,11 @@ let pythonPackages = python.modules // rec {
jinja2 = buildPythonPackage {
name = "jinja2-2.2.1";
name = "jinja2-2.6";
src = fetchurl {
url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.2.1.tar.gz";
md5 = "fea849d68891218eb0b21c170f1c32d5";
url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz";
md5 = "1c49a8825c993bfdcf55bb36897d28a2";
};
meta = {
@ -765,11 +765,13 @@ let pythonPackages = python.modules // rec {
doCheck = false;
buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ];
propagatedBuildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ];
meta = {
description = "python plotting library, making publication quality plots";
homepage = "http://matplotlib.sourceforge.net/";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
});

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

@ -240,7 +240,6 @@ with (import ./release-lib.nix);
pkgconfig = all;
pltScheme = linux;
pmccabe = linux;
policykit = linux;
portmap = linux;
postgresql = all;
postfix = linux;
@ -387,6 +386,7 @@ with (import ./release-lib.nix);
firefox36Pkgs.firefox = linux;
firefox50Pkgs.firefox = linux;
firefox60Pkgs.firefox = linux;
firefox70Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;
@ -436,13 +436,6 @@ with (import ./release-lib.nix);
};
*/
kde3 = {
kdebase = linux;
kdelibs = linux;
k3b = linux;
kile = linux;
};
linuxPackages_2_6_25 = {
aufs = linux;
kernel = linux;