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

Merge branch 'master' into x-updates

Browse Source
This commit is contained in:
Vladimír Čunát 2013-08-28 10:37:41 +02:00
commit 2fda1165da
103 changed files with 1971 additions and 889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/id3v2/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, id3lib, groff}:
{stdenv, fetchurl, id3lib, groff, zlib}:
stdenv.mkDerivation rec {
name = "id3v2-0.1.11";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
nativeBuildInputs = [ groff ];
buildInputs = [ id3lib ];
buildInputs = [ id3lib zlib ];
configurePhase = ''
export makeFlags=PREFIX=$out

17
pkgs/applications/editors/emacs-24/default.nix
View File

@ -2,9 +2,9 @@
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib
, withX ? true
}:
assert (gtk != null) -> (pkgconfig != null);
assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
@ -19,14 +19,15 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib
]
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
++ stdenv.lib.optional stdenv.isLinux dbus;
[ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]
++ stdenv.lib.optional stdenv.isLinux dbus
++ stdenv.lib.optionals withX [
x11 libXaw Xaw3d libXpm libpng libjpeg libungif
libtiff librsvg libXft imagemagick gtk
];
configureFlags =
(if gtk != null then
(if withX then
[ "--with-x-toolkit=gtk" "--with-xft"]
else
[ "--with-x-toolkit=no" ])
@ -69,7 +70,7 @@ EOF
homepage = "http://www.gnu.org/software/emacs/";
license = "GPLv3+";
maintainers = with maintainers; [ chaoflow lovek323 simons ];
maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ];
platforms = platforms.all;
};
}

16
pkgs/applications/misc/calibre/default.nix
View File

@ -4,24 +4,32 @@
}:
stdenv.mkDerivation rec {
name = "calibre-0.9.11";
name = "calibre-1.0.0";
# 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8";
sha256 = "0qz369n46ijk8jbbgwnvj3v0byp5npn2zdb4lvc6mwa143mr6d62";
};
inherit python;
nativeBuildInputs = [ makeWrapper pkgconfig ];
patchPhase = ''
tar xf ${qt48.src}
qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src))
sed -i setup/build_environment.py \
-e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s\'%(m) for m in ('QtGui', 'QtCore')]|"
'';
buildInputs =
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
fontconfig podofo qt48 pil chmlib icu
fontconfig podofo qt48 pil chmlib icu sqlite libusb1 libmtp
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp
pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw
pythonPackages.cssselect
];
installPhase = ''

6
pkgs/applications/networking/bittorrentsync/default.nix
View File

@ -14,9 +14,9 @@ let
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
version = "1.1.42";
sha256 = if stdenv.system == "x86_64-linux" then "07gcjzhhr8simkjjxhyzkvh3748ll81d742fz7j31nwdi34my8ri"
else if stdenv.system == "i686-linux" then "0awf5bfhb4dp4aydzrgdp3wqv1mz6ys1z45i0r1hbqszvf44xj7c"
version = "1.1.70";
sha256 = if stdenv.system == "x86_64-linux" then "1hnyncq5439fxn1q8dkzcg2alxjkanr4q4pgqqf3nngz4cdar5vi"
else if stdenv.system == "i686-linux" then "1ijdmzl8bnb4k99vrjn5gd31hy64p9wiyxw5wc5gbpgap191h5i5"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
in stdenv.mkDerivation {

21
pkgs/applications/office/calligra/default.nix
View File

@ -1,24 +1,33 @@
{ stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2
, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4
, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }:
, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular
, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase
}:
stdenv.mkDerivation rec {
name = "calligra-2.5.5";
name = "calligra-2.7.2";
src = fetchurl {
url = "mirror://kde/stable/${name}/${name}.tar.bz2";
sha256 = "0h9idadrcyjvd0mkwri4lg310mzpna6s0pvc7b7r3267wzjbn9kw";
url = "mirror://kde/stable/${name}/${name}.tar.xz";
sha256 = "1awnvv62fp5bjhi6fys37s6lpzxaig4v15m1zjlgxq82ig61w6sq";
};
nativeBuildInputs = [ cmake perl pkgconfig ];
patches = [ ./fix-kde4.10-build.patch ];
# patches = [ ./fix-kde4.10-build.patch ];
# TODO: package Vc, libWPS, OCIO, OpenShiva, QtShiva, Spnav, m2mml
# TODO: not found popplerQt4
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl
shared_desktop_ontologies okular ];
shared_desktop_ontologies okular
libvisio kactivities mysql postgresql freetds xbase openexr
];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
meta = {
description = "A Qt/KDE office suite, formely known as koffice";

1
pkgs/applications/office/libreoffice/default.nix
View File

@ -115,6 +115,7 @@ stdenv.mkDerivation rec {
for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
done
ln -s $out/bin/soffice $out/bin/libreoffice
'';
configureFlags = [

8
pkgs/applications/science/electronics/eagle/default.nix
View File

@ -13,15 +13,15 @@ in
stdenv.mkDerivation rec {
name = "eagle-${version}";
version = "6.4.0";
version = "6.5.0";
src = fetchurl {
url = "ftp://ftp.cadsoft.de/eagle/program/6.4/eagle-lin-${version}.run";
sha256 = "0jb44dsq4cl9rx5nam6rxsw9fsmm6fsksv9s544p2zrwnad2x2i8";
url = "ftp://ftp.cadsoft.de/eagle/program/6.5/eagle-lin-${version}.run";
sha256 = "17plwx2p8q2ylk0nzj5crfbdm7jc35pw7v3j8f4j81yl37l7bj22";
};
desktopItem = makeDesktopItem {
name = "Eagle";
name = "eagle";
exec = "eagle";
icon = "eagle";
comment = "Schematic capture and PCB layout";

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -71,7 +71,7 @@ rec {
hub = import ./hub {
inherit (rubyLibs) rake;
inherit stdenv fetchgit groff makeWrapper;
inherit stdenv fetchurl groff makeWrapper;
};
gitFastExport = import ./fast-export {

11
pkgs/applications/version-management/git-and-tools/hub/default.nix
View File

@ -1,13 +1,12 @@
{ stdenv, fetchgit, groff, rake, makeWrapper }:
{ stdenv, fetchurl, groff, rake, makeWrapper }:
stdenv.mkDerivation rec {
name = "hub-${version}";
version = "1.10.3";
version = "1.10.6";
src = fetchgit {
url = "git://github.com/defunkt/hub.git";
rev = "refs/tags/v${version}";
sha256 = "0j0krmf0sf09hhw3nsn0w1y97d67762g4qrc8080bwcx38lbyvbg";
src = fetchurl {
url = "https://github.com/github/hub/archive/v${version}.tar.gz";
sha256 = "0vfl1iq1927in81vd7zvp7yqqzay7pciyj87s83qfxrqyjpxn609";
};
buildInputs = [ rake makeWrapper ];

23
pkgs/applications/window-managers/i3/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "i3-${version}";
version = "4.5.1";
version = "4.6";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2";
sha256 = "1qand44hjqz84f2xzd0mmyk9vpsm7iwz6446s4ivdj6f86213lpm";
};
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
@ -20,12 +20,21 @@ stdenv.mkDerivation rec {
configurePhase = "makeFlags=PREFIX=$out";
meta = {
description = "i3 is a tiling window manager";
meta = with stdenv.lib; {
description = "A tiling window manager";
homepage = "http://i3wm.org";
maintainers = [ stdenv.lib.maintainers.garbas ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
maintainers = with maintainers; [ garbas modulistic ];
license = licenses.bsd3;
platforms = platforms.all;
longDescription = ''
A tiling window manager primarily targeted at advanced users and
developers. Based on a tree as data structure, supports tiling,
stacking, and tabbing layouts, handled dynamically, as well as
floating windows. Configured via plain text file. Multi-monitor.
UTF-8 clean.
'';
};
}

50
pkgs/desktops/gnome-2/desktop/vte/alt.patch Normal file
View File

@ -0,0 +1,50 @@
From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Sat, 12 May 2012 18:48:05 +0200
Subject: [PATCH] keymap: Treat ALT as META
https://bugzilla.gnome.org/show_bug.cgi?id=663779
---
src/vte.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/vte.c b/src/vte.c
index dd27e9a..0657921 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -5170,19 +5170,24 @@ static void
vte_terminal_read_modifiers (VteTerminal *terminal,
GdkEvent *event)
{
+ GdkKeymap *keymap;
GdkModifierType modifiers;
/* Read the modifiers. */
- if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
- GdkKeymap *keymap;
-#if GTK_CHECK_VERSION (2, 90, 8)
- keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
-#else
- keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
+ if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
+ return;
+
+ keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
+
+ gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
+
+#if 1
+ /* HACK! Treat ALT as META; see bug #663779. */
+ if (modifiers & GDK_MOD1_MASK)
+ modifiers |= VTE_META_MASK;
#endif
- gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
- terminal->pvt->modifiers = modifiers;
- }
+
+ terminal->pvt->modifiers = modifiers;
}
/* Read and handle a keypress event. */
--
1.7.5.1.217.g4e3aa.dirty

6
pkgs/desktops/gnome-2/desktop/vte/default.nix
View File

@ -2,13 +2,15 @@
, pythonSupport ? false, python, pygtk}:
stdenv.mkDerivation rec {
name = "vte-0.28.0";
name = "vte-0.28.2";
src = fetchurl {
url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql";
sha256 = "00zrip28issgmz2cqk5k824cbqpbixi5x7k88zxksdqpnq1f414d";
};
patches = [ ./alt.patch ];
buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk];

3
pkgs/desktops/kde-4.10/kde-package/default.nix
View File

@ -19,7 +19,8 @@ rec {
# Default meta attribute
defMeta = {
homepage = http://www.kde.org;
inherit (qt4.meta) platforms maintainers;
platforms = stdenv.lib.platforms.linux;
inherit (qt4.meta) maintainers;
};
# KDE package built from the whole tarball

3
pkgs/desktops/kde-4.10/l10n/default.nix
View File

@ -23,7 +23,8 @@ let
meta = {
description = "KDE translation for ${lang}";
license = "GPL";
inherit (kdelibs.meta) maintainers platforms homepage;
platforms = stdenv.lib.platforms.linux;
inherit (kdelibs.meta) maintainers homepage;
};
};

3
pkgs/desktops/kde-4.11/kde-package/default.nix
View File

@ -19,7 +19,8 @@ rec {
# Default meta attribute
defMeta = {
homepage = http://www.kde.org;
inherit (qt4.meta) platforms maintainers;
platforms = stdenv.lib.platforms.linux;
inherit (qt4.meta) maintainers;
};
# KDE package built from the whole tarball

3
pkgs/desktops/kde-4.11/l10n/default.nix
View File

@ -23,7 +23,8 @@ let
meta = {
description = "KDE translation for ${lang}";
license = "GPL";
inherit (kdelibs.meta) maintainers platforms homepage;
platforms = stdenv.lib.platforms.linux;
inherit (kdelibs.meta) maintainers homepage;
};
};

3
pkgs/desktops/kde-4.8/kde-package/default.nix
View File

@ -19,7 +19,8 @@ rec {
# Default meta attribute
defMeta = {
homepage = http://www.kde.org;
inherit (qt4.meta) platforms maintainers;
platforms = stdenv.lib.platforms.linux;
inherit (qt4.meta) maintainers;
};
# KDE package built from the whole tarball

3
pkgs/desktops/kde-4.8/l10n/default.nix
View File

@ -23,7 +23,8 @@ let
meta = {
description = "KDE translation for ${lang}";
license = "GPL";
inherit (kdelibs.meta) maintainers platforms homepage;
platforms = stdenv.lib.platforms.linux;
inherit (kdelibs.meta) maintainers homepage;
};
};

14
pkgs/development/compilers/cudatoolkit/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, fontconfig, freetype, unixODBC, alsaLib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
} :
stdenv.mkDerivation rec {
name = "cudatoolkit-4.2.9";
name = "cudatoolkit-5.5.22";
dontPatchELF = true;
dontStrip = true;
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_64_suse11.2.run;
sha256 = "1inngzwq520bhpdfrh5bm4cxfyf3hxj94jialjxgviri5bj9hz60";
url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run;
sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
}
else throw "cudatoolkit does not support platform ${stdenv.system}";
@ -21,13 +21,15 @@ stdenv.mkDerivation rec {
runtimeDependencies = [
ncurses expat python zlib
xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
fontconfig freetype unixODBC alsaLib
gtk2 glib fontconfig freetype unixODBC alsaLib
];
rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64";
unpackPhase = ''
sh $src --keep --noexec
cd pkg/run_files
sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
cd pkg
'';
@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
'{}' \; || true
find . -type f -exec patchelf \
--set-rpath $rpath:$out/lib:$out/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
--set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
--force-rpath \
'{}' \; || true
'';

23
pkgs/development/compilers/gprolog/default.nix
View File

@ -1,25 +1,28 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "gprolog-1.4.1";
name = "gprolog-1.4.4";
src = fetchurl {
urls = [
"mirror://gnu/gprolog/${name}.tar.gz"
"http://www.gprolog.org/${name}.tar.gz"
];
sha256 = "e2819ed9c426138d3191e4d97ae5121cf97e132eecf102400f87f1e372a05b72";
sha256 = "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q";
};
configurePhase = "cd src ;"
+ "./configure --prefix=$out "
+ "--with-install-dir=$out/share/${name} "
+ "--with-examples-dir=$out/share/doc/${name}/examples "
+ "--with-doc-dir=$out/share/doc/${name}";
preConfigure = ''
cd src
configureFlagsArray=(
"--with-install-dir=$out"
"--without-links-dir"
"--with-examples-dir=$out/share/${name}/examples"
"--with-doc-dir=$out/share/${name}/doc"
)
'';
postInstall = ''
ln -vs "$out/share/${name}/include" "$out/include"
ln -vs "$out/share/${name}/lib" "$out/lib"
mv -v $out/[A-Z]* $out/gprolog.ico $out/share/${name}/
'';
doCheck = true;
@ -27,7 +30,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.gnu.org/software/gprolog/";
description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
license = "GPLv2+";
license = stdenv.lib.licenses.lgpl3Plus;
longDescription = ''
GNU Prolog is a free Prolog compiler with constraint solving

15
pkgs/development/interpreters/elixir/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, erlang, rebar }:
{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
stdenv.mkDerivation {
name = "elixir-0.10.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0gfr2bz3mw7ag9z2wb2g22n2vlyrp8dwy78fj9zi52kzl5w3vc3w";
};
buildInputs = [ erlang rebar ];
buildInputs = [ erlang rebar makeWrapper ];
preBuild = ''
substituteInPlace rebar \
@ -18,6 +18,17 @@ stdenv.mkDerivation {
--replace "/usr/local" $out
'';
postFixup = ''
# Elixirs binaries are shell scripts which run erl. This adds some
# stuff to PATH so the scripts run without problems.
for f in $out/bin/*
do
wrapProgram $f \
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin"
done
'';
meta = {
homepage = "http://elixir-lang.org/";
description = "Elixir is a functional, meta-programming aware language built on top of the Erlang VM.";

11
pkgs/development/interpreters/erlang/R14B04.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
, makeWrapper, gnused, gawk }:
let version = "14B04"; in
@ -10,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
};
buildInputs = [ perl gnum4 ncurses openssl ];
buildInputs = [ perl gnum4 ncurses openssl makeWrapper ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
@ -21,6 +22,12 @@ stdenv.mkDerivation {
configureFlags = "--with-ssl=${openssl}";
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
'';
meta = {
homepage = "http://www.erlang.org/";
description = "Programming language used for massively scalable soft real-time systems";

8
pkgs/development/interpreters/erlang/R15B03.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
, makeWrapper, gnused, gawk
, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
@ -15,6 +16,7 @@ stdenv.mkDerivation {
buildInputs =
[ perl gnum4 ncurses openssl
makeWrapper
] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
@ -26,6 +28,12 @@ stdenv.mkDerivation {
configureFlags = "--with-ssl=${openssl}";
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
'';
meta = {
homepage = "http://www.erlang.org/";
description = "Programming language used for massively scalable soft real-time systems";

9
pkgs/development/interpreters/erlang/R16B01.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper
, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
@ -14,7 +15,7 @@ stdenv.mkDerivation {
};
buildInputs =
[ perl gnum4 ncurses openssl
[ perl gnum4 ncurses openssl makeWrapper
] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
@ -26,6 +27,12 @@ stdenv.mkDerivation {
configureFlags = "--with-ssl=${openssl}";
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
'';
meta = {
homepage = "http://www.erlang.org/";
description = "Programming language used for massively scalable soft real-time systems";

7
pkgs/development/interpreters/pypy/2.0/default.nix → pkgs/development/interpreters/pypy/2.1/default.nix
View File

@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null;
let
majorVersion = "2.0";
version = "${majorVersion}.2";
majorVersion = "2.1";
version = "${majorVersion}";
pythonVersion = "2.7";
libPrefix = "pypy${majorVersion}";
@ -17,7 +17,7 @@ let
src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r";
sha256 = "05vz7ya6jh5pw5yl607cf1rvdhwxj5d4ip0vpgb1gc9rjxn0dcri";
};
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
@ -47,6 +47,7 @@ let
--replace "libraries=['curses']" "libraries=['ncurses']"
'';
setupHook = ./setup-hook.sh;
doCheck = true;
checkPhase = ''

15
pkgs/development/interpreters/pypy/2.1/setup-hook.sh Normal file
View File

@ -0,0 +1,15 @@
addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/site-packages
}
toPythonPath() {
local paths="$1"
local result=
for i in $paths; do
p="$i/lib/pypy2.1/site-packages"
result="${result}${result:+:}$p"
done
echo $result
}
envHooks=(${envHooks[@]} addPythonPath)

18
pkgs/development/libraries/haskell/Graphalyze/default.nix
View File

@ -1,18 +0,0 @@
{ cabal, bktrees, fgl, filepath, graphviz, pandoc, random, text
, time
}:
cabal.mkDerivation (self: {
pname = "Graphalyze";
version = "0.14.0.1";
sha256 = "1prgszkrnb22x9xkwmxbvb9w1h78ffig9268f3q3y65knggmwp1x";
buildDepends = [
bktrees fgl filepath graphviz pandoc random text time
];
meta = {
description = "Graph-Theoretic Analysis library";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "MissingH";
version = "1.2.0.1";
sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m";
version = "1.2.0.2";
sha256 = "1wrrfa8dy0h0c53f1zjzwdkj8wkwsbi6qhv35wwlaz39dk32c4nn";
buildDepends = [
filepath hslogger HUnit mtl network parsec random regexCompat time
];

4
pkgs/development/libraries/haskell/comonad-transformers/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "comonad-transformers";
version = "3.0.4";
sha256 = "1jvg08vmi47p8ji1llci02lk675q93pm6dd8imqj6xjrq34g4x9a";
version = "3.1";
sha256 = "024l437xfi0bkbn3121xi8slwsh9jby9a92qg1m5y0nmxzs9lxda";
buildDepends = [
comonad contravariant distributive semigroupoids semigroups
transformers

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "contravariant";
version = "0.4.3";
sha256 = "1hhcsy5bshi2yx8618wxa40gax5wfapnbgdmv1acgjyxb6vbmsp6";
version = "0.4.4";
sha256 = "1b4422wpcyvrf4r7rr8c8wa008f5ykaxs17vr4plp91rcczr87s4";
buildDepends = [ tagged transformers transformersCompat ];
meta = {
homepage = "http://github.com/ekmett/contravariant/";

4
pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "crypto-cipher-tests";
version = "0.0.2";
sha256 = "1jzci2a6827jgiklj8sh7pjl7g4igk2j6mim20619i4rk6x0lhgz";
version = "0.0.4";
sha256 = "1c725zj94d6n33wldyzlm1qd32a0ais0w221ykpgs49rrd6hrpbh";
buildDepends = [
byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
testFramework testFrameworkHunit testFrameworkQuickcheck2

4
pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "crypto-cipher-types";
version = "0.0.2";
sha256 = "1vjf9g1w7ja8x42k6hq6pcw7jvviw9rq512ncdqd7j20411zjbf4";
version = "0.0.4";
sha256 = "0ipwplw1mn6amjxk2i5sksxvfsnf2fv8rnrgyncl21mp1gbnq7h0";
buildDepends = [ byteable securemem ];
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-cipher";

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "cryptocipher";
version = "0.5.1";
sha256 = "118sabi90qjyqbvfincn737c4mi9mvjij1dzx7k9rsgad47p0753";
version = "0.5.2";
sha256 = "0ffd3w2hvi1zbhgk0xvgbnlfzzwijbrs5b9b4g2vc5p69wkv24zr";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "derive";
version = "2.5.11";
sha256 = "0934k49kpp32wffpvpk2sia7frd9ik56k6ghy6d6j31cabxf9m8r";
version = "2.5.12";
sha256 = "17agsdarxm22z4g911layb5g11gg8r1p2ar86pg1ch1q0jnhfqxr";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/diagrams/diagrams.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "diagrams";
version = "0.7";
sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c";
version = "0.7.1";
sha256 = "0rdpp26zvimdhdw0jpw6w606jkzkqdx0pq4051fkyk2mldwk9ipj";
buildDepends = [
diagramsContrib diagramsCore diagramsLib diagramsSvg
];

23
pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
View File

@ -1,23 +0,0 @@
{ cabal, binary, dataAccessor, distributedProcess, network
, networkMulticast, networkTransport, networkTransportTcp
, transformers
}:
cabal.mkDerivation (self: {
pname = "distributed-process-simplelocalnet";
version = "0.2.0.9";
sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary dataAccessor distributedProcess network networkMulticast
networkTransport networkTransportTcp transformers
];
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";
description = "Simple zero-configuration backend for Cloud Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

32
pkgs/development/libraries/haskell/distributed-process/default.nix
View File

@ -1,32 +0,0 @@
{ cabal, ansiTerminal, binary, dataAccessor, distributedStatic
, HUnit, mtl, network, networkTransport, networkTransportTcp
, random, rank1dynamic, stm, syb, testFramework, testFrameworkHunit
, time, transformers
}:
cabal.mkDerivation (self: {
pname = "distributed-process";
version = "0.4.2";
sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary dataAccessor distributedStatic mtl networkTransport random
rank1dynamic stm syb time transformers
];
testDepends = [
ansiTerminal binary distributedStatic HUnit network
networkTransport networkTransportTcp random stm testFramework
testFrameworkHunit
];
noHaddock = true;
jailbreak = true;
doCheck = false;
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";
description = "Cloud Haskell: Erlang-style concurrency in Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

13
pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix → pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix
View File

@ -1,14 +1,19 @@
{ cabal, cpphs, happy }:
{ cabal, cpphs, filepath, happy, smallcheck, tasty, tastyHunit
, tastySmallcheck
}:
cabal.mkDerivation (self: {
pname = "haskell-src-exts";
version = "1.11.1";
sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6";
version = "1.14.0";
sha256 = "070khsw56xwyrclamv5wckj9na2xbzibv702xx52ik2wbs21dr0d";
buildDepends = [ cpphs ];
testDepends = [
filepath smallcheck tasty tastyHunit tastySmallcheck
];
buildTools = [ happy ];
doCheck = false;
meta = {
homepage = "http://code.haskell.org/haskell-src-exts";
homepage = "https://github.com/haskell-suite/haskell-src-exts";
description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

22
pkgs/development/libraries/haskell/hoogle/default.nix
View File

@ -1,19 +1,25 @@
{ cabal, binary, blazeBuilder, Cabal, caseInsensitive, cmdargs
, conduit, filepath, haskellSrcExts, httpTypes, parsec, random
, safe, tagsoup, time, transformers, uniplate, wai, warp
{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
, cmdargs, conduit, deepseq, filepath, haskellSrcExts, hspec
, hspecExpectations, httpTypes, HUnit, parsec, random, safe
, systemFileio, tagsoup, text, time, transformers, uniplate, wai
, warp
}:
cabal.mkDerivation (self: {
pname = "hoogle";
version = "4.2.16";
sha256 = "1hamwqhndrkajm4xvxxfhr2rnlmf3z2ysyfxx3y6d24jawjyqf8a";
version = "4.2.20";
sha256 = "0sff230qc9lk3kqr9azg399fsaybwqpic9pj52jyw61ffasnl2dd";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary blazeBuilder Cabal caseInsensitive cmdargs conduit filepath
haskellSrcExts httpTypes parsec random safe tagsoup time
transformers uniplate wai warp
aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
deepseq filepath haskellSrcExts httpTypes parsec random safe
tagsoup text time transformers uniplate wai warp
];
testDepends = [
conduit hspec hspecExpectations HUnit systemFileio transformers
];
doCheck = false;
meta = {
homepage = "http://www.haskell.org/hoogle/";
description = "Haskell API Search";

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

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.9.4.2";
sha256 = "13qjf3c3qkaqdi7qp1iqywvsbsiqq8brbzwh8idaj1bhl9jizwhx";
version = "1.9.4.3";
sha256 = "0lmshqv1ybim4201nb9wskyhg4fnslbm4ymvlmhn5zx0nwd777p9";
buildDepends = [
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit cookie cprngAes dataDefault

14
pkgs/development/libraries/haskell/lens-datetime/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, lens, time }:
cabal.mkDerivation (self: {
pname = "lens-datetime";
version = "0.1.1";
sha256 = "0p93211ibq1rkh4aj69xdwan0338k35vb5qyf7zp761nghnk3d47";
buildDepends = [ lens time ];
meta = {
homepage = "http://github.com/klao/lens-datetime";
description = "Lenses for Data.Time.* types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

1
pkgs/development/libraries/haskell/modular-arithmetic/default.nix
View File

@ -4,6 +4,7 @@ cabal.mkDerivation (self: {
pname = "modular-arithmetic";
version = "1.0.1.1";
sha256 = "14n83kjmz8mqjivjhwxk1zckms5z3gn77yq2hsw2yybzff2vkdkd";
noHaddock = true;
meta = {
description = "A type for integers modulo some constant";
license = self.stdenv.lib.licenses.bsd3;

8
pkgs/development/libraries/haskell/monoid-extras/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, semigroups }:
{ cabal, semigroupoids, semigroups }:
cabal.mkDerivation (self: {
pname = "monoid-extras";
version = "0.3.0.0";
sha256 = "1bb8yq2vja80177h3wfadkjkwvcrszx0nq6m5n10f4lh9spvr087";
buildDepends = [ semigroups ];
version = "0.3.1.0";
sha256 = "0nxdkx0j67nb41ingp1yl0appfx64ikf5709f48469qbaf3pgax3";
buildDepends = [ semigroupoids semigroups ];
meta = {
description = "Various extra monoid-related definitions and utilities";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/network-multicast/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "network-multicast";
version = "0.0.7";
sha256 = "18qlg4cg7ci1z3mbqh5z16mxkjir0079a0rgm4qk6jbmsnvfsq43";
version = "0.0.8";
sha256 = "0jsbp8z2a69x5h6dc3b16wdxs0shv6438mnf5mg0jxq7xddbhph8";
buildDepends = [ network ];
meta = {
description = "Simple multicast library";

4
pkgs/development/libraries/haskell/postgresql-simple/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "postgresql-simple";
version = "0.3.5.0";
sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi";
version = "0.3.6.0";
sha256 = "1qszr3k7cihizbaq3naj134gavkpamk8q3g02rsilzvn0ivq8wb8";
buildDepends = [
attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
transformers vector

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "securemem";
version = "0.1.2";
sha256 = "1szb530jw7666cnrfa8988p2b5scl2bfafi8kgslf7xi5yv7grqh";
version = "0.1.3";
sha256 = "1kycpk73vh8wwxzn35hmv36vwsc9r4g53f2fy6bn21q9gfm2r90j";
buildDepends = [ byteable ];
meta = {
homepage = "http://github.com/vincenthz/hs-securemem";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "stylish-haskell";
version = "0.5.7.0";
sha256 = "12ka5lyp28fy8gablhymxdldl792ycr8d51lsknhldb54pmklf73";
version = "0.5.8.0";
sha256 = "1wjrn4cq47jjmqkb2zv02x90l2mv6n7zh4mvcav25s9bwvvca10r";
isLibrary = true;
isExecutable = true;
buildDepends = [

15
pkgs/development/libraries/haskell/syb/0.4.1.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, HUnit, mtl }:
cabal.mkDerivation (self: {
pname = "syb";
version = "0.4.1";
sha256 = "1lkh4rrqdzvb8kyry07x2z88v478hrw5cp8wmhjgpg0ck8ywncma";
testDepends = [ HUnit mtl ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
description = "Scrap Your Boilerplate";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

13
pkgs/development/libraries/haskell/tasty-hunit/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, HUnit, mtl, tasty }:
cabal.mkDerivation (self: {
pname = "tasty-hunit";
version = "0.2";
sha256 = "1476ac3rsaag9rfgglzs65wqlkzm09xzdz47ksyj3a4c6ajba1kw";
buildDepends = [ HUnit mtl tasty ];
meta = {
description = "HUnit support for the Tasty test framework";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

14
pkgs/development/libraries/haskell/tasty-smallcheck/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, async, smallcheck, tagged, tasty }:
cabal.mkDerivation (self: {
pname = "tasty-smallcheck";
version = "0.2";
sha256 = "1xw0l1bikwavyq7s8q71a92x87mg7z65mk32nn5qx0zxwqsfb5l4";
buildDepends = [ async smallcheck tagged tasty ];
meta = {
homepage = "https://github.com/feuerbach/tasty";
description = "SmallCheck support for the Tasty test framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

17
pkgs/development/libraries/haskell/tasty/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ cabal, ansiTerminal, mtl, optparseApplicative, regexPosix, stm
, tagged
}:
cabal.mkDerivation (self: {
pname = "tasty";
version = "0.2";
sha256 = "1shd4bl0wb67abs7vv3cagvpinkz2348fh7fdh3rq8l5g1jflp8q";
buildDepends = [
ansiTerminal mtl optparseApplicative regexPosix stm tagged
];
meta = {
description = "Modern and extensible testing framework";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

8
pkgs/development/libraries/haskell/texmath/default.nix
View File

@ -1,12 +1,12 @@
{ cabal, parsec, syb, xml }:
{ cabal, pandocTypes, parsec, syb, xml }:
cabal.mkDerivation (self: {
pname = "texmath";
version = "0.6.3";
sha256 = "1ajza3p4rj318l03rffscqs6rbk635drmdciv7hhl4nljc4qmnpz";
version = "0.6.4";
sha256 = "090xqs14ap3c6pljqzyva46phxb1lhqayi4g098f6d77d1ygvshf";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];
buildDepends = [ pandocTypes parsec syb xml ];
meta = {
homepage = "http://github.com/jgm/texmath";
description = "Conversion of LaTeX math formulas to MathML or OMML";

4
pkgs/development/libraries/haskell/xml-conduit/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "xml-conduit";
version = "1.1.0.6";
sha256 = "08kz982c95hcni6zbrflv8kqvy7wccb19plsmwczhzcsifam5a9k";
version = "1.1.0.7";
sha256 = "04yg2mif9s3hsm5c18mf6rmw22j8prs8a1272fz25vzxzljfs2r9";
buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
blazeHtml blazeMarkup conduit dataDefault deepseq failure

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

@ -1,10 +1,12 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, zlib}:
stdenv.mkDerivation {
name = "id3lib-3.8.3";
patches = [ ./id3lib-3.8.3-gcc43-1.patch ];
buildInputs = [ zlib ];
src = fetchurl {
url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz;
md5 = "19f27ddd2dda4b2d26a559a4f0f402a7";

120
pkgs/development/libraries/libav/default.nix
View File

@ -1,59 +1,91 @@
{ stdenv, fetchurl, pkgconfig, yasm, xz
{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, vpxSupport ? true, libvpx ? null
, x264Support ? false, x264 ? null
, xvidSupport ? true, xvidcore ? null
, faacSupport ? false, faac ? null
, vaapiSupport ? false, libva ? null # ToDo: it has huge closure
, vdpauSupport ? true, libvdpau ? null
, freetypeSupport ? true, freetype ? null # it's small and almost everywhere
, SDL # only for avplay in $tools, adds nontrivial closure to it
, enableGPL ? true # ToDo: some additional default stuff may need GPL
, enableUnfree ? faacSupport
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert faacSupport -> enableUnfree;
stdenv.mkDerivation rec {
name = "libav-0.7";
with { inherit (stdenv.lib) optional optionals; };
/* ToDo:
- more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools
- maybe do some more splitting into outputs
*/
let
result = {
libav_9 = libavFun "9.8" "0r7hg9wg3cxjsmwzpa6f2p1a092g2iazyjjy23604ccskzbnirg3";
libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79";
};
libavFun = version : sha256 : stdenv.mkDerivation rec {
name = "libav-${version}";
src = fetchurl {
url = "http://libav.org/releases/${name}.tar.xz";
sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz";
inherit sha256;
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
configureFlags = [
"--enable-gpl"
"--enable-postproc"
"--enable-swscale"
"--disable-ffserver"
"--disable-ffplay"
configureFlags =
assert stdenv.lib.all (x: x!=null) buildInputs;
[
#"--enable-postproc" # it's now a separate package in upstream
"--disable-avserver" # upstream says it's in a bad state
"--enable-avplay"
"--enable-shared"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
++ optionals enableGPL [ "--enable-gpl" "--enable-swscale" ]
++ optional mp3Support "--enable-libmp3lame"
++ optional speexSupport "--enable-libspeex"
++ optional theoraSupport "--enable-libtheora"
++ optional vorbisSupport "--enable-libvorbis"
++ optional vpxSupport "--enable-libvpx"
++ optional x264Support "--enable-libx264"
++ optional xvidSupport "--enable-libxvid"
++ optional faacSupport "--enable-libfaac --enable-nonfree"
++ optional vaapiSupport "--enable-vaapi"
++ optional vdpauSupport "--enable-vdpau"
++ optional freetypeSupport "--enable-libfreetype"
;
buildInputs = [ pkgconfig lame yasm ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional faacSupport faac;
buildInputs = [ pkgconfig lame yasm zlib bzip2 SDL ]
++ optional mp3Support lame
++ optional speexSupport speex
++ optional theoraSupport libtheora
++ optional vorbisSupport libvorbis
++ optional vpxSupport libvpx
++ optional x264Support x264
++ optional xvidSupport xvidcore
++ optional faacSupport faac
++ optional vaapiSupport libva
++ optional vdpauSupport libvdpau
++ optional freetypeSupport freetype
;
enableParallelBuilding = true;
outputs = [ "out" "tools" ];
postInstall = ''
mkdir -p "$tools/bin"
mv "$out/bin/avplay" "$tools/bin"
cp -s "$out"/bin/* "$tools/bin/"
'';
doInstallCheck = true;
installCheckTarget = "check"; # tests need to be run *after* installation
crossAttrs = {
dontSetConfigureCross = true;
@ -65,8 +97,16 @@ stdenv.mkDerivation rec {
];
};
meta = {
passthru = { inherit vdpauSupport; };
meta = with stdenv.lib; {
homepage = http://libav.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
else if enableGPL then gpl2Plus else lgpl21Plus;
platforms = platforms.all;
};
}
}; # libavFun
in result

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

@ -3,14 +3,14 @@
, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils
}:
let version = "1.1.0"; in
let version = "1.1.1"; in
stdenv.mkDerivation {
name = "libvirt-${version}";
src = fetchurl {
url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
sha256 = "0a39cwvzwf79gv3zw5mwp9q9n792rr1m0rl9ji39bdgcjxb7d7nf";
sha256 = "1hi27d5pld925g1azx8jq0wv557wpkd6xrq6lzm91cdr2lg1wvyw";
};
buildInputs =

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

@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "spice-0.12.3";
name = "spice-0.12.4";
src = fetchurl {
url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
sha256 = "0il50hcw87mzs3dw80a9gkidmhgf9s8691xmki3gj9358qf5xmmz";
sha256 = "11xkdz26b39syynxm3iyjsr8q7x0v09zdli9an1ilcrfyiykw1ng";
};
buildInputs = [ pixman celt alsaLib openssl libjpeg zlib

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

@ -53,4 +53,10 @@ stdenv.mkDerivation {
install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8
install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
'' else null;
meta = with stdenv.lib; {
description = "V8 is Google's open source JavaScript engine";
platforms = platforms.unix;
license = licenses.bsd3;
};
}

29
pkgs/development/libraries/xmlrpc-c/default.nix
View File

@ -1,16 +1,27 @@
{ stdenv, fetchsvn, curl }:
{ stdenv, fetchurl, curl }:
let rev = "2262"; in
stdenv.mkDerivation {
name = "xmlrpc-c-r${rev}";
stdenv.mkDerivation rec {
name = "xmlrpc-c-1.25.25";
src = fetchurl {
url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
sha256 = "1sk33q4c6liza920rp4w803cfq0a79saq7fg1yjsp8hks7q011ml";
};
buildInputs = [ curl ];
preInstall = "export datarootdir=$out/share";
# Build and install the "xmlrpc" tool (like the Debian package)
postInstall = ''
(cd tools/xmlrpc && make && make install)
'';
src = fetchsvn {
url = http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced;
rev = "2262";
sha256 = "1grwnczp5dq3w20rbz8bgpwl6jmw0w7cm7nbinlasf3ap5sc5ahb";
meta = with stdenv.lib; {
description = "A lightweight RPC library based on XML and HTTP";
homepage = http://xmlrpc-c.sourceforge.net/;
# <xmlrpc-c>/doc/COPYING also lists "Expat license",
# "ABYSS Web Server License" and "Python 1.5.2 License"
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

21
pkgs/development/python-modules/buildout-nix/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ fetchurl, stdenv, buildPythonPackage }:
buildPythonPackage {
name = "zc.buildout-nix-2.2.0";
src = fetchurl {
url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.0.tar.gz";
md5 = "771dd9807da7d5ef5bb998991c5fdae1";
};
patches = [ ./nix.patch ];
postInstall = "mv $out/bin/buildout{,-nix}";
meta = {
homepage = "http://www.buildout.org";
description = "A software build and configuration system";
license = stdenv.lib.licenses.zpt21;
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
}

23
pkgs/development/python-modules/buildout-nix/nix.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/src/zc/buildout/easy_install.py 2013-08-27 22:28:40.233718116 +0200
+++ b/src/zc/buildout/easy_install.py 2013-08-27 22:31:07.967871186 +0200
@@ -508,16 +508,15 @@
self._dest, os.path.basename(dist.location))
if os.path.isdir(dist.location):
- # we got a directory. It must have been
- # obtained locally. Just copy it.
- shutil.copytree(dist.location, newloc)
+ # Symlink to dists in /nix/store
+ if not os.path.exists(newloc):
+ os.symlink(dist.location, newloc)
else:
setuptools.archive_util.unpack_archive(
dist.location, newloc)
-
- redo_pyc(newloc)
+ redo_pyc(newloc)
# Getting the dist from the environment causes the
# distribution meta data to be read. Cloning isn't

1
pkgs/development/python-modules/setuptools/default.nix
View File

@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
wrapPythonPrograms
'';
# tests fail on darwin, see http://bitbucket.org/pypa/setuptools/issue/55/1-failure-lc_all-c-python33m-setuppy-test
doCheck = (!stdenv.isDarwin);
checkPhase = ''

60
pkgs/development/tools/boomerang/default.nix
View File

@ -1,29 +1,49 @@
{ stdenv, fetchgit, cmake, boehmgc, expat, cppunit }:
{ stdenv, fetchgit, cmake, expat }:
stdenv.mkDerivation {
name = "boomerang-1.0pre";
buildInputs = [ cmake boehmgc expat cppunit ];
installPhase = ''
for loaderfile in loader/*.so
do
install -vD "$loaderfile" "$out/lib/$(basename "$loaderfile")"
done
install -vD boomerang "$out/bin/boomerang"
'';
patches = [ ./dlopen_path.patch ];
stdenv.mkDerivation rec {
name = "boomerang-${version}";
version = "0.3.2alpha";
src = fetchgit {
url = "git://github.com/aszlig/boomerang.git";
rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22";
sha256 = "6cfd95a3539ff45c18b17de76407568b0d0c17fde4e45dda54486c7eac113969";
url = "https://github.com/nemerle/boomerang.git";
rev = "78c6b9dd33790be43dcb07edc549161398904006";
sha256 = "1hh8v0kcnipwrfz4d45d6pm5bzbm9wgbrdgg0ir2l7wyshbkff6i";
};
buildInputs = [ cmake expat ];
postPatch = ''
sed -i -e 's/-std=c++0x/-std=c++11 -fpermissive/' CMakeLists.txt
# Hardcode library base path ("lib/" is appended elsewhere)
sed -i -e 's|::m_base_path = "|&'"$out"'/|' loader/BinaryFileFactory.cpp
# Deactivate setting base path at runtime
sed -i -e 's/m_base_path *=[^}]*//' include/BinaryFile.h
# Fix up shared directory locations
shared="$out/share/boomerang/"
find frontend -name '*.cpp' -print | xargs sed -i -e \
's|Boomerang::get()->getProgPath()|std::string("'"$shared"'")|'
cat >> loader/CMakeLists.txt <<CMAKE
INSTALL(TARGETS bffDump BinaryFile
ElfBinaryFile Win32BinaryFile ExeBinaryFile HpSomBinaryFile
PalmBinaryFile DOS4GWBinaryFile MachOBinaryFile
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib)
CMAKE
cat >> CMakeLists.txt <<CMAKE
INSTALL(TARGETS boomerang DESTINATION bin)
INSTALL(DIRECTORY signatures DESTINATION share/boomerang)
INSTALL(DIRECTORY frontend/machine DESTINATION share/boomerang/frontend)
CMAKE
'';
enableParallelBuilding = true;
meta = {
homepage = http://boomerang.sourceforge.net/;
homepage = "http://boomerang.sourceforge.net/";
license = stdenv.lib.licenses.bsd3;
description = "A general, open source, retargetable decompiler";
};

21
pkgs/development/tools/haskell/SourceGraph/default.nix
View File

@ -1,21 +0,0 @@
{ cabal, Cabal, fgl, filepath, Graphalyze, graphviz, haskellSrcExts
, mtl, multiset, random
}:
cabal.mkDerivation (self: {
pname = "SourceGraph";
version = "0.7.0.5";
sha256 = "0lbgs5a0ivn44bmc242hynsvczvxq2snz1fyjf13mrpfx8j5n8gk";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal fgl filepath Graphalyze graphviz haskellSrcExts mtl multiset
random
];
meta = {
description = "Static code analysis using graph-theoretic techniques";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cabal2ghci";
version = "0.0.1.0";
sha256 = "0l5225gwm6j25694cp94d4z31i1p68pq6js3psbr7m204q409dr5";
version = "0.0.1.1";
sha256 = "1fg3pr25f78a6b8nqxvxki4z3fvgx4i6zkmpl992a0iarycqdrsg";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.53";
sha256 = "1xhvxx5maj03rc6zd8bcqwzyn3b9yqxsbzgdh4d9ss4myn8x2zp3";
version = "1.54";
sha256 = "169syf99gs0gj44hcnpgx0xvrmz5mq70hb6bq6ydma9ivjvz2jg4";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.50";
sha256 = "02gbqlyi1c82jjzy9ipmrvxcyizvs86af7z35x9wz3imlnzx1l6c";
version = "1.8.51";
sha256 = "0cm78921ksysiz81x3m7kjq343fr46fpm61cw367aljd86lhivv1";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hslogger";
version = "1.2.1";
sha256 = "1vfdf7i6fd4mb3rn57z3wn7bhw4z5g47f4vggb4sms5rg4zqqly5";
version = "1.2.2";
sha256 = "0j15nma6yf3cxb9j232kif1a836zmncfyklz9wp1mx064nblr5jf";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl network time ];

9
pkgs/games/wesnoth/default.nix
View File

@ -4,20 +4,21 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.10.5";
version = "1.10.7";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
sha256 = "1rvlr8c3vzhgd33vzc1hfhiil6d7hc3px8r8p79vmp3kwi3d49zn";
sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa";
};
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
cmake freetype libpng pkgconfig lua dbus fontconfig libtool ];
# Make the package build with the gcc currently available in Nixpkgs.
NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers";
cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";

1
pkgs/lib/maintainers.nix
View File

@ -31,6 +31,7 @@
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
ludo = "Ludovic Courtès <ludo@gnu.org>";
marcweber = "Marc Weber <marco-oweber@gmx.de>";
modulistic = "Pablo Costa <modulistic@gmail.com>";
mornfall = "Petr Ročkai <me@mornfall.net>";
offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
orbitz = "Malcolm Matalka <mmatalka@gmail.com>";

10
pkgs/lib/options.nix
View File

@ -11,10 +11,10 @@ with import ./properties.nix;
rec {
inherit (lib) typeOf;
inherit (lib) isType;
isOption = attrs: (typeOf attrs) == "option";
isOption = isType "option";
mkOption = attrs: attrs // {
_type = "option";
# name (this is the name of the attributem it is automatically generated by the traversal)
@ -66,7 +66,7 @@ rec {
if all opt.check list then
opt.merge list
else
throw "One of option ${name} values is of a bad type.";
throw "One of option ${name} values has a bad type.";
}
else opt;
@ -77,7 +77,7 @@ rec {
if opt.check opt.default then
opt.default
else
throw "The default value of option ${name} is of a bad type.";
throw "The default value of option ${name} has a bad type.";
}
else opt;
@ -190,7 +190,7 @@ rec {
defValue = builtins.getAttr defName defs;
optValue = builtins.getAttr defName opts;
in
if typeOf defValue == "option"
if isOption defValue
then
# `defValue' is an option.
if hasAttr defName opts

16
pkgs/lib/properties.nix
View File

@ -11,13 +11,13 @@ with import ./attrsets.nix;
rec {
inherit (lib) typeOf;
inherit (lib) isType;
# Tell that nothing is defined. When properties are evaluated, this type
# is used to remove an entry. Thus if your property evaluation semantic
# implies that you have to mute the content of an attribute, then your
# property should produce this value.
isNotdef = attrs: (typeOf attrs) == "notdef";
isNotdef = isType "notdef";
mkNotdef = {_type = "notdef";};
# General property type, it has a property attribute and a content
@ -32,7 +32,7 @@ rec {
# - onGlobalDelay: run on all copied properties.
# - onEval: run on an evaluated property.
# - onGlobalEval: run on a list of property stack on top of their values.
isProperty = attrs: (typeOf attrs) == "property";
isProperty = isType "property";
mkProperty = p@{property, content, ...}: p // {
_type = "property";
};
@ -187,7 +187,7 @@ rec {
# and interpreted by the underlying system using properties (modules).
# Create a "Merge" property which only contains a condition.
isMerge = attrs: (typeOf attrs) == "merge";
isMerge = isType "merge";
mkMerge = content: mkProperty {
property = {
_type = "merge";
@ -204,7 +204,7 @@ rec {
# is ignore.
# Create a "If" property which only contains a condition.
isIf = attrs: (typeOf attrs) == "if";
isIf = isType "if";
mkIf = condition: content: mkProperty {
property = {
_type = "if";
@ -271,7 +271,7 @@ rec {
# priorities between values. The default priority is 100. The lowest
# priorities are kept. The template argument must reproduce the same
# attribute set hierarchy to override leaves of the hierarchy.
isOverride = attrs: (typeOf attrs) == "override";
isOverride = isType "override";
mkOverrideTemplate = priority: template: content: mkProperty {
property = {
_type = "override";
@ -371,7 +371,7 @@ rec {
# of the list used by the merge function. And the highest ranked
# definition would be the last. Definitions which does not have any rank
# value have the default rank of 100.
isOrder = attrs: (typeOf attrs) == "order";
isOrder = isType "order";
mkOrder = rank: content: mkProperty {
property = {
_type = "order";
@ -434,7 +434,7 @@ rec {
# properties on top of the option definition is nice for user manipulation
# but require to check if the content of the property is not another
# property. Such testing implies to verify if this is an attribute set
# and if it possess the type 'property'. (see isProperty & typeOf)
# and if it possess the type 'property'. (see isProperty & typeOf/isType)
#
# To avoid strict evaluation of option definitions, 'mkFixStrictness' is
# introduced. This property protects an option definition by replacing

8
pkgs/lib/systems.nix
View File

@ -15,7 +15,7 @@ in
rec {
isSignificantByte = x: typeOf x == "significant-byte";
isSignificantByte = isType "significant-byte";
significantBytes = setTypes "significant-byte" {
bigEndian = {};
littleEndian = {};
@ -37,7 +37,7 @@ rec {
};
isExecFormat = x: typeOf x == "exec-format";
isExecFormat = isType "exec-format";
execFormats = setTypes "exec-format" {
aout = {}; # a.out
elf = {};
@ -47,7 +47,7 @@ rec {
};
isKernel = x: typeOf x == "kernel";
isKernel = isType "kernel";
kernels = with execFormats;
setTypes "kernel" {
cygwin = { execFormat = pe; };
@ -61,7 +61,7 @@ rec {
};
isArchitecture = x: typeOf x == "architecture";
isArchitecture = isType "architecture";
architectures = setTypes "architecture" {
apple = {};
pc = {};

3
pkgs/lib/types.nix
View File

@ -10,6 +10,7 @@ with import ./trivial.nix;
rec {
isType = type: x: (x._type or "") == type;
hasType = x: isAttrs x && x ? _type;
typeOf = x: x._type or "";
@ -26,7 +27,7 @@ rec {
# hasOptions (boolean: whatever this option contains an option set)
# delayOnGlobalEval (boolean: should properties go through the evaluation of this option)
# docPath (path concatenated to the option name contained in the option set)
isOptionType = attrs: typeOf attrs == "option-type";
isOptionType = isType "option-type";
mkOptionType =
{ name
, check ? (x: true)

18
pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
stdenv.mkDerivation {
name = "gtk-engine-murrine-0.98.2";
src = fetchurl {
url = "mirror://gnome/sources/murrine/0.98/murrine-0.98.2.tar.xz";
sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
};
buildInputs = [ pkgconfig intltool gtk2 ];
meta = {
description = "A very flexible theme engine";
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
};
}

20
pkgs/misc/themes/mate-icon-theme/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }:
stdenv.mkDerivation {
name = "mate-icon-theme-1.6.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz";
sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x";
};
buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ];
meta = {
description = "Icon themes from MATE";
homepage = "http://mate-desktop.org";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
}

20
pkgs/misc/themes/mate-themes/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation {
name = "mate-themes-1.6.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz";
sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp";
};
buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
meta = {
description = "A set of themes from MATE";
homepage = "http://mate-desktop.org";
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
}

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

@ -2,7 +2,7 @@
let
baseName = "bbswitch";
version = "0.6";
version = "0.7";
name = "${baseName}-${version}-${kernelDev.version}";
in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz";
sha256 = "1y1wggfrlpxybz5cvrbvvpqa2hh6ncazzdlg9c94sx40n6p5dcf4";
sha256 = "0na6gfnvmp5fjbm430ms342hmrsbr6cf78n6hldqb8js2ry3f8dw";
};
preBuild = ''

12
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@ -1,11 +1,15 @@
{stdenv, fetchurl }:
stdenv.mkDerivation {
name = "raspberrypi-firmware-20160106";
let
rev = "3ab17ac25e";
in stdenv.mkDerivation {
name = "raspberrypi-firmware-${rev}";
src = fetchurl {
url = "https://github.com/raspberrypi/firmware/archive/4ade27942e.tar.gz";
sha256 = "0f4p920vr7dcj4hprgil8baqqbnsjx1jykz0pkdx29mqy0n0xanl";
url = "https://github.com/raspberrypi/firmware/archive/${rev}.tar.gz";
sha256 = "080va4zz858bwwgxam8zy58gpwjpxfg7v5h1q5b4cpbzjihsxcx9";
};
installPhase = ''

4
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.4.58";
version = "3.4.59";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "11kcxlchiz7ks61yqj29dy2mnncfxcc7qr563wby1k58rvwf8g74";
sha256 = "19ylh9k9qykr8x29jcqv1q6agmyvzx7q5md2yxph4sykjsccqzj7";
};
features.iwlwifi = true;

8
pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
View File

@ -1,14 +1,16 @@
{ stdenv, fetchurl, ... } @ args:
let rev = "91a3be5b2b"; in
let
import ./generic.nix (args // rec {
rev = "7849605f5a";
in import ./generic.nix (args // rec {
version = "3.6.y-${rev}";
src = fetchurl {
url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
name = "linux-raspberrypi-${version}.tar.gz";
sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
sha256 = "1diwc5p6az6ipcldwmkq7hb5f15nvdgwzmypixc2vmzmc4ylarxl";
};
features.iwlwifi = true;

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

@ -10,12 +10,7 @@ with stdenv.lib;
let
versionNumber = "319.32";
kernel310patch = fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8";
name = "nvidia-linux-3.10.patch";
sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
};
versionNumber = "319.49";
in
@ -26,18 +21,18 @@ stdenv.mkDerivation {
patches =
[ ./version-test.patch ]
++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch;
;
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "02rjiizgb9mgal0qrklzjvfzybv139yv6za8xp045k7qdyqvsqzf";
sha256 = "1ngss9zw109a5xfr3vvhf1ajqjvvqc7j3dzw9h56vddck6kpbc22";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "18268q3pa6v4ygfnlm888jmp84dmg1w9c323cr51pn5jg54vygcm";
sha256 = "1i68jfms8033p2x0r3z4fdjcmkkhbi6yizzc0ck9ydagdgg3liwp";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";

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

@ -1,10 +1,10 @@
{ stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }:
stdenv.mkDerivation {
name = "spl-0.6.1-${kernelDev.version}";
name = "spl-0.6.2-${kernelDev.version}";
src = fetchurl {
url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz";
sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb";
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz;
sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw";
};
patches = [ ./install_prefix.patch ];
@ -27,6 +27,8 @@ stdenv.mkDerivation {
--with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
'';
enableParallelBuilding = true;
meta = {
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
stdenv.mkDerivation {
name = "zfs-0.6.1-${kernelDev.version}";
name = "zfs-0.6.2-${kernelDev.version}";
src = fetchurl {
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz;
sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0";
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz;
sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b";
};
patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ];
@ -33,6 +33,8 @@ stdenv.mkDerivation {
--with-spl=${spl}/libexec/spl
'';
enableParallelBuilding = true;
meta = {
description = "ZFS Filesystem Linux Kernel module";
longDescription = ''

2
pkgs/servers/samba/default.nix
View File

@ -68,6 +68,8 @@ stdenv.mkDerivation rec {
ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
mkdir -pv $out/etc/openldap/schema
cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
cp -v ../nsswitch/libnss_wins.so "$out/lib"
cp -v ../nsswitch/libnss_winbind.so "$out/lib"
'' # */
+ stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";

2
pkgs/tools/backup/duply/default.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation {
homepage = http://duply.net/;
license = licenses.gpl2;
maintainers = [ maintainers.bjornfor ];
platforms = platforms.unix;
platforms = platforms.linux;
};
}

22
pkgs/tools/misc/lbdb/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, perl, finger_bsd }:
let
version = "0.38";
in
stdenv.mkDerivation {
name = "lbdb-${version}";
src = fetchurl {
url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz";
md5 = "a8e65f1400c90818ff324dc4fd67eba2";
};
buildInputs = [ perl finger_bsd ];
meta = {
homepage = "http://www.spinnaker.de/lbdb/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
description = "The Little Brother's Database (lbdb)";
};
}

6
pkgs/tools/networking/getmail/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
name = "getmail-4.20.0";
name = "getmail-4.42.0";
namePrefix = "";
src = fetchurl {
url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn";
sha256 = "0n6sxp8vwa19ffr7bagzwp0hvxfjiy43xpz9sa1qmsyjs7c3xdqj";
};
doCheck = false;
@ -15,7 +15,7 @@ buildPythonPackage rec {
meta = {
description = "A program for retrieving mail";
maintainers = [ stdenv.lib.maintainers.raskin ];
maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ];
platforms = stdenv.lib.platforms.linux;
};
}

18
pkgs/tools/system/fcron/default.nix
View File

@ -2,27 +2,28 @@
# restart using 'killall -TERM fcron; fcron -b
# use convert-fcrontab to update fcrontab files
{ stdenv, fetchurl, perl }:
{ stdenv, fetchurl, perl, busybox, vim }:
stdenv.mkDerivation {
name = "fcron-3.0.4";
stdenv.mkDerivation rec {
name = "fcron-3.1.2";
src = fetchurl {
url = http://fcron.free.fr/archives/fcron-3.0.4.src.tar.gz;
sha256 = "15kgphsfa0nqgjd8yxyz947x2xyljj4iyh298kw4c8bz6iznqxn8";
url = "http://fcron.free.fr/archives/${name}.src.tar.gz";
sha256 = "0p8sn4m3frh2x2llafq2gbcm46rfrn6ck4qi0d0v3ql6mfx9k4hw";
};
buildInputs = [ perl ];
configureFlags =
[ "--with-sendmail=/var/setuid-wrappers/sendmail"
"--with-editor=/var/run/current-system/sw/bin/vi"
[ "--with-sendmail=${busybox}/sbin/sendmail"
"--with-editor=${vim}/bin/vi" # TODO customizable
"--with-bootinstall=no"
"--sysconfdir=/etc"
# fcron would have been default user/grp
"--with-username=root"
"--with-groupname=root"
# fcron must not try to verify that sendmail has already been installed int /var/setuid-wrappers/sendmail
"--with-rootname=root"
"--with-rootgroup=root"
"--disable-checks"
];
@ -52,5 +53,6 @@ stdenv.mkDerivation {
description="A command scheduler with extended capabilities over cron and anacron";
homepage = http://fcron.free.fr;
license = "GPLv2";
platforms = stdenv.lib.platforms.all;
};
}

19
pkgs/tools/text/xml/jing/default.nix
View File

@ -1,13 +1,22 @@
{stdenv, fetchurl, unzip} :
{ stdenv, fetchurl, unzip, jre }:
stdenv.mkDerivation {
name = "jing-20030619";
name = "jing-20091111";
builder = ./unzip-builder.sh;
src = fetchurl {
url = http://www.thaiopensource.com/download/jing-20030619.zip;
md5 = "f9b0775d8740f16ab3df82ad3707a093";
url = https://jing-trang.googlecode.com/files/jing-20091111.zip;
sha256 = "134h2r22r64v5yk4v8mhl6r893dlw5vzx9daf2sj2mbbma004sap";
};
inherit unzip;
inherit unzip jre;
meta = with stdenv.lib; {
description = "A RELAX NG validator in Java";
# The homepage is www.thaiopensource.com, but it links to googlecode.com
# for downloads and call it the "project site".
homepage = http://www.thaiopensource.com/relaxng/jing.html;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

12
pkgs/tools/text/xml/jing/jing-script.nix
View File

@ -1,12 +0,0 @@
{stdenv, fetchurl, jre, unzip} :
stdenv.mkDerivation {
name = "jing-tools-20030619";
builder = ./script-builder.sh;
jing = (import ./default.nix) {
inherit stdenv fetchurl unzip;
};
inherit jre;
}

14
pkgs/tools/text/xml/jing/script-builder.sh
View File

@ -1,14 +0,0 @@
source $stdenv/setup
mkdir -p $out/bin
cat >> $out/bin/jing <<EOF
#! $SHELL
export JAVA_HOME=$jre
export LANG="en_US"
exec $jre/bin/java -jar $jing/bin/jing.jar "\$@"
EOF
chmod a+x $out/bin/jing

8
pkgs/tools/text/xml/jing/unzip-builder.sh
View File

@ -4,3 +4,11 @@ source $stdenv/setup
$unzip/bin/unzip $src
mkdir -p $out
mv $name/* $out
cat > "$out/bin/jing" <<EOF
#! $SHELL
export JAVA_HOME="$jre"
exec "$jre/bin/java" -jar "$out/bin/jing.jar" "\$@"
EOF
chmod a+x "$out/bin/jing"

19
pkgs/tools/text/xml/trang/default.nix
View File

@ -1,15 +1,24 @@
{stdenv, fetchurl, jre, unzip}:
{ stdenv, fetchurl, unzip, jre }:
stdenv.mkDerivation {
name = "trang-20030619";
name = "trang-20091111";
builder = ./builder.sh;
src = fetchurl {
url = http://www.thaiopensource.com/download/trang-20030619.zip;
md5 = "9611ea59fda0f62fecc4a5017a72984e";
url = https://jing-trang.googlecode.com/files/trang-20091111.zip;
sha256 = "16551j63n2y3w9lc7krjazddsab7xvdymbss4rdvx3liz4sg18yq";
};
inherit jre;
buildInputs = [ unzip ];
inherit jre;
meta = with stdenv.lib; {
description = "Multi-format schema converter based on RELAX NG";
# The homepage is www.thaiopensource.com, but it links to googlecode.com
# for downloads and call it the "project site".
homepage = http://www.thaiopensource.com/relaxng/trang.html;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

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

@ -515,7 +515,9 @@ let
bmon = callPackage ../tools/misc/bmon { };
boomerang = callPackage ../development/tools/boomerang { };
boomerang = callPackage ../development/tools/boomerang {
stdenv = overrideGCC stdenv gcc47;
};
bootchart = callPackage ../tools/system/bootchart { };
@ -1112,8 +1114,6 @@ let
jing = callPackage ../tools/text/xml/jing { };
jing_tools = callPackage ../tools/text/xml/jing/jing-script.nix { };
jnettop = callPackage ../tools/networking/jnettop { };
jq = callPackage ../development/tools/jq {};
@ -3153,7 +3153,7 @@ let
libX11 = xlibs.libX11;
};
pypy = callPackage ../development/interpreters/pypy/2.0 { };
pypy = callPackage ../development/interpreters/pypy/2.1 { };
pythonFull = python27Full;
python26Full = callPackage ../development/interpreters/python/wrapper.nix {
@ -4487,7 +4487,9 @@ let
libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { };
libav = callPackage ../development/libraries/libav { };
libav = libav_9;
libav_all = callPackage ../development/libraries/libav { };
inherit (libav_all) libav_9 libav_0_8;
libavc1394 = callPackage ../development/libraries/libavc1394 { };
@ -7382,6 +7384,10 @@ let
else stdenv;
};
emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
withX = false;
}));
emacsPackages = emacs: self: let callPackage = newScope self; in rec {
inherit emacs;
@ -7926,6 +7932,8 @@ let
lastwatch = callPackage ../applications/audio/lastwatch { };
lbdb = callPackage ../tools/misc/lbdb { };
lci = callPackage ../applications/science/logic/lci {};
ldcpp = callPackage ../applications/networking/p2p/ldcpp {
@ -9326,8 +9334,14 @@ let
gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };
gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { };
mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { };
mate-themes = callPackage ../misc/themes/mate-themes { };
xfce = xfce4_10;
xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; });

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

@ -164,7 +164,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regexPosix = self.regexPosix_0_95_2;
split = self.split_0_2_2;
stm = self.stm_2_4_2;
syb = self.syb_0_4_0;
syb = self.syb_0_4_1;
text = self.text_0_11_3_1;
transformers = self.transformers_0_3_0_0;
unorderedContainers = self.unorderedContainers_0_2_3_0;
@ -830,7 +830,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};
derive = callPackage ../development/libraries/haskell/derive {};
derive = callPackage ../development/libraries/haskell/derive {
haskellSrcExts = self.haskellSrcExts_1_14_0;
};
dependentMap = callPackage ../development/libraries/haskell/dependent-map {};
@ -867,10 +869,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};
distributedProcessSimplelocalnet = callPackage ../development/libraries/haskell/distributed-process-simplelocalnet {};
distributedStatic = callPackage ../development/libraries/haskell/distributed-static {};
distributive = callPackage ../development/libraries/haskell/distributive {};
@ -1077,8 +1075,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
libc = pkgs.stdenv.gcc.libc;
};
Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
graphviz = callPackage ../development/libraries/haskell/graphviz {};
groupoids = callPackage ../development/libraries/haskell/groupoids {};
@ -1116,8 +1112,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
haskellSrc = self.haskellSrc_1_0_1_5;
haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {};
haskellSrcExts_1_14_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.14.0.nix {};
haskellSrcExts = self.haskellSrcExts_1_13_5;
haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
@ -1191,7 +1187,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
hoauth = callPackage ../development/libraries/haskell/hoauth {};
hoogle = callPackage ../development/libraries/haskell/hoogle {};
hoogle = callPackage ../development/libraries/haskell/hoogle {
haskellSrcExts = self.haskellSrcExts_1_14_0;
};
hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
@ -1336,6 +1334,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
lens = callPackage ../development/libraries/haskell/lens {};
lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
lenses = callPackage ../development/libraries/haskell/lenses {};
libffi = callPackage ../development/libraries/haskell/libffi {
@ -1831,7 +1831,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
strptime = callPackage ../development/libraries/haskell/strptime {};
stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {};
stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {
haskellSrcExts = self.haskellSrcExts_1_14_0;
};
syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
@ -1840,6 +1842,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {};
syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {};
syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {};
syb_0_4_1 = callPackage ../development/libraries/haskell/syb/0.4.1.nix {};
syb = null; # by default, we assume that syb ships with GHC, which is
# true for the older GHC versions
@ -1925,6 +1928,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {};
tasty = callPackage ../development/libraries/haskell/tasty {};
tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {};
templateDefault = callPackage ../development/libraries/haskell/template-default {};
temporary = callPackage ../development/libraries/haskell/temporary {};
@ -2290,14 +2299,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
hasktags = callPackage ../development/tools/haskell/hasktags {};
hlint = callPackage ../development/tools/haskell/hlint {};
hlint = callPackage ../development/tools/haskell/hlint {
haskellSrcExts = self.haskellSrcExts_1_14_0;
};
hslogger = callPackage ../development/tools/haskell/hslogger {};
SourceGraph = callPackage ../development/tools/haskell/SourceGraph {
haskellSrcExts = self.haskellSrcExts_1_11_1;
};
tar = callPackage ../development/libraries/haskell/tar {};
threadscope = callPackage ../development/tools/haskell/threadscope {};

1266
pkgs/top-level/node-packages-generated.nix
View File

File diff suppressed because it is too large Load Diff

1
pkgs/top-level/node-packages.json
View File

@ -74,6 +74,7 @@
, "generator-angular"
, "statsd"
, "karma"
, "ungit"
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
]

4
pkgs/top-level/node-packages.nix
View File

@ -1,4 +1,4 @@
{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self }:
{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self, generated ? ./node-packages-generated.nix }:
{
nativeDeps = {
@ -23,4 +23,4 @@
'';
/* Put manual packages below here (ideally eventually managed by npm2nix */
} // import ./node-packages-generated.nix { inherit self fetchurl; inherit (pkgs) lib; }
} // import generated { inherit self fetchurl; inherit (pkgs) lib; }

284
pkgs/top-level/python-packages-generated.nix
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More