alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' of github.com:NixOS/nixpkgs

Browse source
This commit is contained in:
Cillian de Róiste 2013-08-28 00:26:39 +02:00
parent 01cc4301f3 71e735998e
commit 6e3416c898
41 changed files with 411 additions and 502 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

3
pkgs/applications/misc/calibre/default.nix
View file

@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
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 = ['../qt-everywhere-opensource-src-4.8.5/include/%s'%(m) for m in ('QtGui', 'QtCore')]|"
-e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s\'%(m) for m in ('QtGui', 'QtCore')]|"
'';
buildInputs =

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 {

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

4
pkgs/applications/virtualization/qemu/default.nix
View file

@ -7,14 +7,14 @@
, x86Only ? false
}:
let n = "qemu-1.6.0"; in
let n = "qemu-1.5.2"; in
stdenv.mkDerivation rec {
name = n + (if x86Only then "-x86-only" else "");
src = fetchurl {
url = "http://wiki.qemu.org/download/${n}.tar.bz2";
sha256 = "0j6bnaa93fyqwzg07krx5w1fb88ap1yz1hp84ilkpm16va5facii";
sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn";
};
buildInputs =

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

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 ];
};
})

4
pkgs/development/libraries/haskell/hoogle/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "hoogle";
version = "4.2.19";
sha256 = "0mfmb3ky93gicwd1i4n3xfhlr3y6zgc4dv2nrilrr9l0kfka37f8";
version = "4.2.20";
sha256 = "0sff230qc9lk3kqr9azg399fsaybwqpic9pj52jyw61ffasnl2dd";
isLibrary = true;
isExecutable = true;
buildDepends = [

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;

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

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/id3lib/default.nix
View file

@ -1,9 +1,11 @@
{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;

168
pkgs/development/libraries/libav/default.nix
View file

@ -1,72 +1,112 @@
{ stdenv, fetchurl, pkgconfig, yasm, xz
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? false, x264 ? null
, xvidSupport ? true, xvidcore ? null
, faacSupport ? false, faac ? null
{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? 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";
src = fetchurl {
url = "http://libav.org/releases/${name}.tar.xz";
sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz";
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";
};
# `--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"
"--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";
libavFun = version : sha256 : stdenv.mkDerivation rec {
name = "libav-${version}";
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;
src = fetchurl {
url = "http://libav.org/releases/${name}.tar.xz";
inherit sha256;
};
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"
]
++ 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"
;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
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;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
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
meta = {
homepage = http://libav.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
};
}

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

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

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

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

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

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

3
pkgs/tools/system/fcron/default.nix
View file

@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
# fcron would have been default user/grp
"--with-username=root"
"--with-groupname=root"
"--with-rootname=root"
"--with-rootgroup=root"
"--disable-checks"
];
installTargets = "install-staged"; # install does also try to change permissions of /etc/* files

14
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 { };
@ -4484,7 +4486,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 { };
@ -9323,8 +9327,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; });

6
pkgs/top-level/haskell-packages.nix
View file

@ -869,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 {};
@ -1338,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 {

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

17
pkgs/top-level/python-packages.json
View file

@ -103,6 +103,23 @@
},
"Products.CMFCalendar": {
"propagatedBuildInputs": [ "eggtestinfo" ]
},
"Pillow": {
"buildInputs": [
"pkgs.freetype",
"pkgs.libjpeg",
"pkgs.zlib",
"pkgs.libtiff",
"pkgs.libwebp"
],
"configurePhase": [
"sed -i \"setup.py\" \\",
" -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include(\"${pkgs.freetype}\")|g ;",
" s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include(\"${pkgs.libjpeg}\")|g ;",
" s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include(\"${pkgs.zlib}\")|g ;",
" s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include(\"${pkgs.libwebp}\")|g ;",
" s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include(\"${pkgs.libtiff}\")|g ;'"
]
}
}
},

4
pkgs/top-level/python-packages.nix
View file

@ -7017,13 +7017,13 @@ pythonPackages = modules // import ./python-packages-generated.nix {
} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") {
pypi2nix = pythonPackages.buildPythonPackage rec {
rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5";
rev = "e85eb9e75e7290c17e89822d6a5c1c52c1b59269";
name = "pypi2nix-1.0_${rev}";
src = pkgs.fetchurl {
url = "https://github.com/garbas/pypi2nix/tarball/${rev}";
name = "${name}.tar.bz";
sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril";
sha256 = "0wk9019pgpc2467819cz98fdvihjkpihlh1yywfxlvn04ymb315q";
};
propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ];