Merge remote-tracking branch 'origin/master' into stdenv-updates.

This commit is contained in:
Peter Simons 2013-08-30 10:45:11 +02:00
commit 98fcc2f746
54 changed files with 2062 additions and 323 deletions

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

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
, libX11, libXext }:
stdenv.mkDerivation rec {
name = "mupdf-1.1";
name = "mupdf-1.3";
src = fetchurl {
url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
sha256 = "e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34";
sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b";
};
buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
@ -15,6 +15,19 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) "
'';
postInstall = ''
mkdir -p $out/share/applications
cat > $out/share/applications/mupdf.desktop <<EOF
[Desktop Entry]
Type=Application
Version=1.0
Name=mupdf
Comment=PDF viewer
Exec=$out/bin/mupdf-x11
Terminal=false
EOF
'';
meta = {
homepage = http://mupdf.com/;
description = "Lightweight PDF viewer and toolkit written in portable C";

View file

@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/samr7/vanitygen";
license = "AGPLv3";
platforms = stdenv.lib.platforms.all;
};
}

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 {

View file

@ -11,8 +11,8 @@
sha256 = "0xl595fng7qzlc8vh73lslzchr6ayd4vlmz2mpqppb8pai520xxf";
};
stable = {
version = "29.0.1547.57";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.57.tar.xz";
sha256 = "0xl595fng7qzlc8vh73lslzchr6ayd4vlmz2mpqppb8pai520xxf";
version = "29.0.1547.62";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.62.tar.xz";
sha256 = "0ld7cm287k2lkq3rfnhwgvvnjbm9345wvjbwfn4yzwy7gxzyfld6";
};
}

View file

@ -55,5 +55,6 @@ stdenv.mkDerivation {
homepage = "http://coq.inria.fr";
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.roconnor ];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -2,7 +2,7 @@
let
name = "maxima";
version = "5.29.1";
version = "5.30.0";
searchPath =
stdenv.lib.makeSearchPath "bin"
@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
sha256 = "1p94l28adcn0826nah460r9pz71h7wd5klsg885sl2gzds75bn74";
sha256 = "1mhx7g0kzpiagg97s2zhaplsq1li9ya2764mhwl7jgfw2vp3jlm0";
};
buildInputs = [sbcl texinfo perl makeWrapper];
@ -21,7 +21,7 @@ stdenv.mkDerivation {
postInstall = ''
# Make sure that maxima can find its runtime dependencies.
for prog in "$out/bin/"*; do
wrapProgram "$prog" --prefix PATH ":" "${searchPath}"
wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
done
# Move emacs modules and documentation into the right place.
mkdir -p $out/share/emacs $out/share/doc

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 {

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

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 =

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

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

View file

@ -28,6 +28,15 @@ let
in {
cs = buildDict {
shortName = "cs-20040614-1";
fullName = "Czech";
src = fetchurl {
url = mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2;
sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01";
};
};
de = buildDict {
shortName = "de-20030222-1";
fullName = "German";

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

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

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

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

View file

@ -0,0 +1,21 @@
{ cabal, distributive, doctest, filepath, hashable, lens
, reflection, semigroupoids, semigroups, simpleReflect, tagged
, transformers, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "linear";
version = "1.2";
sha256 = "0mna8k6plq0akki5j5zjk1xk1hgks1076q1h5s14v87d0h45wlrh";
buildDepends = [
distributive hashable reflection semigroupoids semigroups tagged
transformers unorderedContainers vector
];
testDepends = [ doctest filepath lens simpleReflect ];
meta = {
homepage = "http://github.com/ekmett/linear/";
description = "Linear Algebra";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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;

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

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

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;

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

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

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

View file

@ -0,0 +1,291 @@
commit 4afa16864ac8ae23a450abf95db023b0c8bea698
Author: Shea Levy <shea@shealevy.com>
Date: Thu Aug 29 07:09:34 2013 -0400
Use CredentialsProviders à la the Java API
Signed-off-by: Shea Levy <shea@shealevy.com>
diff --git a/lib/Net/Amazon/Auth/CredentialsProvider.pm b/lib/Net/Amazon/Auth/CredentialsProvider.pm
new file mode 100755
index 0000000..527acae
--- /dev/null
+++ b/lib/Net/Amazon/Auth/CredentialsProvider.pm
@@ -0,0 +1,9 @@
+package Net::Amazon::Auth::CredentialsProvider;
+
+use Moose::Role 0.85;
+
+requires 'get_credentials';
+
+sub refresh { }
+
+1;
diff --git a/lib/Net/Amazon/Auth/CredentialsProviderChain.pm b/lib/Net/Amazon/Auth/CredentialsProviderChain.pm
new file mode 100755
index 0000000..85cd8e0
--- /dev/null
+++ b/lib/Net/Amazon/Auth/CredentialsProviderChain.pm
@@ -0,0 +1,41 @@
+package Net::Amazon::Auth::CredentialsProviderChain;
+
+use Moose 0.85;
+use MooseX::StrictConstructor 0.16;
+use Net::Amazon::Auth::EnvironmentVariableCredentialsProvider;
+use Net::Amazon::Auth::InstanceProfileCredentialsProvider;
+
+with 'Net::Amazon::Auth::CredentialsProvider';
+
+has 'providers' => ( is => 'ro', isa => 'ArrayRef[Net::Amazon::Auth::CredentialsProvider]', required => 1 );
+
+sub refresh {
+ my $self = shift;
+
+ map { $_->refresh } @{$self->providers};
+}
+
+sub get_credentials {
+ my $self = shift;
+
+ foreach my $provider (@{$self->providers}) {
+ my $res = $provider->get_credentials;
+ if (defined $res->{access_key_id}) {
+ return $res;
+ }
+ }
+
+ return {};
+}
+
+sub default_chain {
+ my $class = shift;
+ return $class->new(providers => [
+ Net::Amazon::Auth::EnvironmentVariableCredentialsProvider->new,
+ Net::Amazon::Auth::InstanceProfileCredentialsProvider->new
+ ]);
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm b/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm
new file mode 100755
index 0000000..ac38a84
--- /dev/null
+++ b/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm
@@ -0,0 +1,26 @@
+package Net::Amazon::Auth::EnvironmentVariableCredentialsProvider;
+
+use Moose 0.85;
+use MooseX::StrictConstructor 0.16;
+
+extends 'Net::Amazon::Auth::FixedCredentialsProvider';
+
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $class = shift;
+
+ my %args = (
+ access_key_id => $ENV{AWS_ACCESS_KEY_ID},
+ secret_access_key => $ENV{AWS_SECRET_ACCESS_KEY}
+ );
+
+ if (exists $ENV{AWS_SESSION_TOKEN}) {
+ $args{session_token} = $ENV{AWS_SESSION_TOKEN};
+ }
+
+ return $class->$orig(\%args);
+};
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm b/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm
new file mode 100755
index 0000000..21d56c7
--- /dev/null
+++ b/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm
@@ -0,0 +1,23 @@
+package Net::Amazon::Auth::FixedCredentialsProvider;
+
+use Moose 0.85;
+use MooseX::StrictConstructor 0.16;
+
+with 'Net::Amazon::Auth::CredentialsProvider';
+
+has 'access_key_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
+has 'secret_access_key' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
+has 'session_token' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
+
+sub get_credentials {
+ my $self = shift;
+ return {
+ access_key_id => $self->access_key_id,
+ secret_access_key => $self->secret_access_key,
+ session_token => $self->session_token
+ };
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm b/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm
new file mode 100755
index 0000000..b9f826a
--- /dev/null
+++ b/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm
@@ -0,0 +1,57 @@
+package Net::Amazon::Auth::InstanceProfileCredentialsProvider;
+
+use Moose 0.85;
+use MooseX::StrictConstructor 0.16;
+use HTTP::Date;
+use JSON;
+
+with 'Net::Amazon::Auth::CredentialsProvider';
+
+has '_ua' => ( is => 'rw', isa => 'LWP::UserAgent', required => 0 );
+has '_access_key_id' => ( is => 'rw', isa => 'Str', required => 0 );
+has '_secret_access_key' => ( is => 'rw', isa => 'Str', required => 0 );
+has '_session_token' => ( is => 'rw', isa => 'Str', required => 0 );
+has '_expiration_date' => ( is => 'rw', isa => 'Int', required => 0, default => 0 );
+
+sub BUILD {
+ my $self = shift;
+ my $ua = LWP::UserAgent->new;
+ $ua->timeout(10);
+ $self->_ua($ua);
+}
+
+sub refresh {
+ my $self = shift;
+
+ my $role_name_response =
+ $self->_ua->get("http://169.254.169.254/latest/meta-data/iam/security-credentials/");
+ if ($role_name_response->code == 200) {
+ my $credentials_response = $self->_ua->get("http://169.254.169.254/latest/meta-data/iam/security-credentials/" . $role_name_response->content);
+
+ if ($credentials_response->code == 200) {
+ my $credentials = decode_json($credentials_response->content);
+ $self->_expiration_date(str2time($credentials->{Expiration}));
+ $self->_access_key_id($credentials->{AccessKeyId});
+ $self->_secret_access_key($credentials->{SecretAccessKey});
+ $self->_session_token($credentials->{Token});
+ }
+ }
+}
+
+sub get_credentials {
+ my $self = shift;
+
+ if (time() - $self->_expiration_date > -5 * 60) { #Credentials available 5 minutes before expiry
+ $self->refresh;
+ }
+
+ return {
+ access_key_id => $self->_access_key_id,
+ secret_access_key => $self->_secret_access_key,
+ session_token => $self->_session_token
+ };
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/lib/Net/Amazon/S3.pm b/lib/Net/Amazon/S3.pm
index 907113e..a369e4b 100755
--- a/lib/Net/Amazon/S3.pm
+++ b/lib/Net/Amazon/S3.pm
@@ -133,9 +133,10 @@ use LWP::UserAgent::Determined;
use URI::Escape qw(uri_escape_utf8);
use XML::LibXML;
use XML::LibXML::XPathContext;
+use Net::Amazon::Auth::FixedCredentialsProvider;
+use Net::Amazon::Auth::CredentialsProviderChain;
-has 'aws_access_key_id' => ( is => 'ro', isa => 'Str', required => 1 );
-has 'aws_secret_access_key' => ( is => 'ro', isa => 'Str', required => 1 );
+has 'credentials_provider' => ( is => 'ro', isa => 'Net::Amazon::Auth::CredentialsProvider', required => 0, default => sub { return Net::Amazon::Auth::CredentialsProviderChain->default_chain; } );
has 'secure' => ( is => 'ro', isa => 'Bool', required => 0, default => 0 );
has 'timeout' => ( is => 'ro', isa => 'Num', required => 0, default => 30 );
has 'retry' => ( is => 'ro', isa => 'Bool', required => 0, default => 0 );
@@ -144,7 +145,23 @@ has 'libxml' => ( is => 'rw', isa => 'XML::LibXML', required => 0 );
has 'ua' => ( is => 'rw', isa => 'LWP::UserAgent', required => 0 );
has 'err' => ( is => 'rw', isa => 'Maybe[Str]', required => 0 );
has 'errstr' => ( is => 'rw', isa => 'Maybe[Str]', required => 0 );
-has 'aws_session_token' => ( is => 'ro', isa => 'Str', required => 0 );
+
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $class = shift;
+
+ my $args = $class->$orig(@_);
+
+ if (exists $args->{aws_access_key_id}) {
+ $args->{credentials_provider} = Net::Amazon::Auth::FixedCredentialsProvider->new({
+ access_key_id => $args->{aws_access_key_id},
+ secret_access_key => $args->{aws_secret_access_key},
+ session_token => $args->{aws_session_token}
+ });
+ delete @{$args}{qw(aws_access_key_id aws_secret_access_key aws_session_token)};
+ }
+ return $args;
+};
__PACKAGE__->meta->make_immutable;
@@ -223,6 +240,24 @@ sub BUILD {
$self->ua($ua);
$self->libxml( XML::LibXML->new );
+
+ die "No AWS credentials found!" unless defined $self->credentials_provider->get_credentials->{access_key_id};
+}
+
+# Backwards compatibility
+sub aws_access_key_id {
+ my $self = shift;
+ return $self->credentials_provider->get_credentials->{access_key_id};
+}
+
+sub aws_secret_access_key {
+ my $self = shift;
+ return $self->credentials_provider->get_credentials->{secret_access_key};
+}
+
+sub aws_session_token {
+ my $self = shift;
+ return $self->credentials_provider->get_credentials->{session_token};
}
=head2 buckets
diff --git a/lib/Net/Amazon/S3/HTTPRequest.pm b/lib/Net/Amazon/S3/HTTPRequest.pm
index 69c6327..d49e95b 100755
--- a/lib/Net/Amazon/S3/HTTPRequest.pm
+++ b/lib/Net/Amazon/S3/HTTPRequest.pm
@@ -63,8 +63,9 @@ sub query_string_authentication_uri {
my $path = $self->path;
my $headers = $self->headers;
- my $aws_access_key_id = $self->s3->aws_access_key_id;
- my $aws_secret_access_key = $self->s3->aws_secret_access_key;
+ my $creds = $self->s3->credentials_provider->get_credentials;
+ my $aws_access_key_id = $creds->{access_key_id};
+ my $aws_secret_access_key = $creds->{secret_access_key};
my $canonical_string
= $self->_canonical_string( $method, $path, $headers, $expires );
my $encoded_canonical
@@ -86,9 +87,10 @@ sub query_string_authentication_uri {
sub _add_auth_header {
my ( $self, $headers, $method, $path ) = @_;
- my $aws_access_key_id = $self->s3->aws_access_key_id;
- my $aws_secret_access_key = $self->s3->aws_secret_access_key;
- my $aws_session_token = $self->s3->aws_session_token;
+ my $creds = $self->s3->credentials_provider->get_credentials;
+ my $aws_access_key_id = $creds->{access_key_id};
+ my $aws_secret_access_key = $creds->{secret_access_key};
+ my $aws_session_token = $creds->{session_token};
if ( not $headers->header('Date') ) {
$headers->header( Date => time2str(time) );

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

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

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

View file

@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
homepage = http://www.strangeloopgames.com;
license = [ "unfree" ];
maintainers = with stdenv.lib.maintainers; [ jcumming ];
platforms = [ "i686-linux"] ;
};
}

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

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

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

View file

@ -1,23 +1,22 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper
, pythonDBus, pygobject, readline, libsndfile, udev, libical, systemd }:
{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python,
pythonPackages, pythonDBus, readline, libsndfile, udev, libical,
systemd }:
assert stdenv.isLinux;
let
pythonpath = "${pythonDBus}/lib/${python.libPrefix}/site-packages:"
+ "${pygobject}/lib/${python.libPrefix}/site-packages";
in
stdenv.mkDerivation rec {
name = "bluez-5.3";
name = "bluez-5.8";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
sha256 = "41b0559e3a8436a739eb7cc79156ca91daf8c115f57971b6bcb422ee0213db42";
sha256 = "1l33lq1lpg7hy26138ir5dj4gl3mql2qxpj20rjnnwyckc3jk700";
};
pythonPath = with pythonPackages;
[ pythonDBus pygobject3 recursivePthLoader ];
buildInputs =
[ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper
[ pkgconfig dbus.libs glib libusb alsaLib python pythonPackages.wrapPython
readline libsndfile udev libical
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.
@ -49,7 +48,9 @@ stdenv.mkDerivation rec {
# FIXME: Move these into a separate package to prevent Bluez from
# depending on Python etc.
postInstall = ''
pushd test
mkdir $out/test
cp -a test $out
pushd $out/test
for a in \
simple-agent \
test-adapter \
@ -58,14 +59,19 @@ stdenv.mkDerivation rec {
list-devices \
monitor-bluetooth \
; do
cp $a $out/bin/bluez-$a
wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath}
ln -s ../test/$a $out/bin/bluez-$a
done
popd
wrapPythonProgramsIn $out/test "$out/test $pythonPath"
# for bluez4 compatibility for NixOS
mkdir $out/sbin
ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
'';
meta = {
meta = with stdenv.lib; {
homepage = http://www.bluez.org/;
description = "Bluetooth support for Linux";
platforms = platforms.linux;
};
}

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

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;

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;

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

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

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

View file

@ -1,17 +1,30 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
stdenv.mkDerivation rec {
name = "elasticsearch-0.20.5";
name = "elasticsearch-0.90.3";
src = fetchurl {
url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
sha256 = "0r0h9znyflajps1k8hl9naixhg1gqmhz7glc009pzzv94ncdzrq1";
sha256 = "1l6rnp4yvlz4z6z4v3af08yd4sl91c4zz20a8yyif2p234lh3n2s";
};
patches = [ ./es-home.patch ];
buildInputs = [ makeWrapper jre utillinux ];
installPhase = ''
mkdir -p $out
cp -R bin config lib $out
# don't want to have binary with name plugin
mv $out/bin/plugin $out/bin/elasticsearch-plugin
# set ES_CLASSPATH and JAVA_HOME
wrapProgram $out/bin/elasticsearch \
--prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \
--prefix PATH : "${utillinux}/bin/" \
--set JAVA_HOME "${jre}"
wrapProgram $out/bin/elasticsearch-plugin \
--prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" --set JAVA_HOME "${jre}"
'';
meta = {

View file

@ -1,6 +1,6 @@
diff -rc elasticsearch-0.20.5/bin/elasticsearch elasticsearch-0.20.5-new/bin/elasticsearch
*** elasticsearch-0.20.5/bin/elasticsearch 2013-03-07 12:16:31.152494626 +0100
--- elasticsearch-0.20.5-new/bin/elasticsearch 2013-03-07 12:24:41.076081272 +0100
diff -rc elasticsearch-0.90.3/bin/elasticsearch elasticsearch-0.90.3-new/bin/elasticsearch
*** elasticsearch-0.90.3/bin/elasticsearch 2013-08-06 15:19:22.000000000 +0200
--- elasticsearch-0.90.3-new/bin/elasticsearch 2013-08-27 16:42:00.935880011 +0200
***************
*** 62,68 ****
done
@ -10,11 +10,50 @@ diff -rc elasticsearch-0.20.5/bin/elasticsearch elasticsearch-0.20.5-new/bin/ela
# make ELASTICSEARCH_HOME absolute
ES_HOME=`cd "$ES_HOME"; pwd`
--- 62,68 ----
--- 62,71 ----
done
# determine elasticsearch home
! ES_HOME=${ES_HOME:=`dirname "$SCRIPT"`/..}
! if [ -z "$ES_HOME" ]; then
! echo "You must set the ES_HOME var" >&2
! exit 1
! fi
# make ELASTICSEARCH_HOME absolute
ES_HOME=`cd "$ES_HOME"; pwd`
diff -rc elasticsearch-0.90.3/bin/plugin elasticsearch-0.90.3-new/bin/plugin
*** elasticsearch-0.90.3/bin/plugin 2013-08-06 15:19:22.000000000 +0200
--- elasticsearch-0.90.3-new/bin/plugin 2013-08-27 16:49:01.024160295 +0200
***************
*** 16,22 ****
done
# determine elasticsearch home
! ES_HOME=`dirname "$SCRIPT"`/..
# make ELASTICSEARCH_HOME absolute
ES_HOME=`cd "$ES_HOME"; pwd`
--- 16,25 ----
done
# determine elasticsearch home
! if [ -z "$ES_HOME" ]; then
! echo "You must set the ES_HOME var" >&2
! exit 1
! fi
# make ELASTICSEARCH_HOME absolute
ES_HOME=`cd "$ES_HOME"; pwd`
***************
*** 46,50 ****
shift
done
! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
--- 49,53 ----
shift
done
! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args

View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, pkgconfig, openobex, bluez}:
{stdenv, fetchurl, pkgconfig, openobex, bluez, cmake}:
stdenv.mkDerivation rec {
name = "obexftp-0.23";
name = "obexftp-0.24";
src = fetchurl {
url = "mirror://sourceforge/openobex/${name}.tar.bz2";
sha256 = "0djv239b14p221xjxzza280w3pnnwzpw4ssd6mshz36ki3r4z9s4";
url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
sha256 = "0szy7p3y75bd5h4af0j5kf0fpzx2w560fpy4kg3603mz11b9c1xr";
};
buildInputs = [pkgconfig bluez];
buildInputs = [pkgconfig bluez cmake];
propagatedBuildInputs = [openobex];

View file

@ -1,17 +1,21 @@
{stdenv, fetchurl, pkgconfig, bluez, libusb}:
{stdenv, fetchurl, pkgconfig, bluez, libusb, cmake}:
stdenv.mkDerivation rec {
name = "openobex-1.5";
name = "openobex-1.7.1";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
sha256 = "0rayjci99ahhvs2d16as1qql3vrcizd0nhi8n3n4g6krf1sh80p6";
url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
sha256 = "0mza0mrdrbcw4yix6qvl31kqy7bdkgxjycr0yx7yl089v5jlc9iv";
};
buildInputs = [pkgconfig bluez libusb];
buildInputs = [pkgconfig bluez libusb cmake];
configureFlags = "--enable-apps";
patchPhase = ''
sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt
'';
meta = {
homepage = http://dev.zuckschwerdt.org/openobex/;
description = "An open source implementation of the Object Exchange (OBEX) protocol";

View file

@ -16,4 +16,10 @@
preFixup = ''
make clean
'';
meta = {
description = "Encoder for the JBIG2 image compression format";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
};
}

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

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

View file

@ -1,9 +1,10 @@
{ stdenv, fetchurl }:
let
dbrev = "3849";
driverdb = fetchurl {
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3812";
sha256 = "1x22ammjwlb7p3cmd13shqq1payb7nr9pgfa9xifs19qyr77mrwp";
url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/trunk/smartmontools/drivedb.h?format=raw";
sha256 = "06c1cl0x4sq64l3rmd5rk8wsbggjixphpgj0kf4awqhjgsi102xz";
name = "smartmontools-drivedb.h";
};
in

View file

@ -1,13 +1,9 @@
{ stdenv, fetchgit, pkgconfig, libuuid, openssl }:
let
arch = if stdenv.system == "x86_64-linux" then "x86_64"
else if stdenv.system == "i686-linux" then "x86"
else throw "vboot_reference for: ${stdenv.system} not supported!";
stdenv.mkDerivation rec {
version = "20130507";
checkout = "25/50225/2";
in stdenv.mkDerivation {
name = "vboot_reference-${version}";
src = fetchgit {
@ -22,6 +18,10 @@ in stdenv.mkDerivation {
else [ (stdenv.lib.overrideDerivation libuuid
(args: { configureFlags = args.configureFlags + " --enable-static"; })) ]);
arch = if stdenv.system == "x86_64-linux" then "x86_64"
else if stdenv.system == "i686-linux" then "x86"
else throw "vboot_reference for: ${stdenv.system} not supported!";
buildPhase = ''
make ARCH=${arch} `pwd`/build/cgpt/cgpt
make ARCH=${arch} `pwd`/build/utility/vbutil_kernel
@ -38,4 +38,10 @@ in stdenv.mkDerivation {
cp build/utility/vbutil_keyblock $out/bin
cp build/utility/vbutil_firmware $out/bin
'';
meta = {
description = "Chrome OS partitioning and kernel signing tools.";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux;
};
}

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 { };
@ -4530,7 +4532,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 { };
@ -7972,6 +7976,8 @@ let
lastwatch = callPackage ../applications/audio/lastwatch { };
lbdb = callPackage ../tools/misc/lbdb { };
lci = callPackage ../applications/science/logic/lci {};
ldcpp = callPackage ../applications/networking/p2p/ldcpp {
@ -9372,8 +9378,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; });

View file

@ -859,10 +859,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 {};
@ -1328,6 +1324,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 {
@ -1342,6 +1340,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
linear = callPackage ../development/libraries/haskell/linear {};
List = callPackage ../development/libraries/haskell/List {};
ListLike = callPackage ../development/libraries/haskell/ListLike {};

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

File diff suppressed because it is too large Load diff

View file

@ -126,6 +126,9 @@ pythonPackages = modules // import ./python-packages-generated.nix {
inherit python buildPythonPackage pygobject pycairo;
};
# A patched version of buildout, useful for buildout based development on Nix
zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
# packages defined here
afew = buildPythonPackage rec {
@ -6590,18 +6593,18 @@ pythonPackages = modules // import ./python-packages-generated.nix {
tarman = buildPythonPackage rec {
version = "0.1.1";
version = "0.1.3";
name = "tarman-${version}";
src = fetchurl {
url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip";
sha256 = "0ppd2365hf841b58fss5pgaja0y0mwx5n0gk1p3rxx9y3r0kyfas";
sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h";
};
buildInputs = [ pkgs.unzip unittest2 nose mock ];
propagatedBuildInputs = [ modules.curses libarchive ];
# two tests fail
# tests are still failing
doCheck = false;
};