svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32719
This commit is contained in:
commit
84fb9ca331
@ -3,17 +3,20 @@
|
|||||||
, libvorbis, libcdio, libcddb, flac, ffmpeg
|
, libvorbis, libcdio, libcddb, flac, ffmpeg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
let
|
||||||
name = "audacious-3.0";
|
version = "3.2.1";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "audacious-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://distfiles.atheme.org/${name}.tar.gz";
|
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
|
||||||
sha256 = "0kj78hgf73fmbm6y3idir2kavbnnlv0jb9ka0pcsb12sxb994s68";
|
sha256 = "064a8d2887a0f92a1637df9d71b8eefa8064199c04eccfaac725f840cff6eac3";
|
||||||
};
|
};
|
||||||
|
|
||||||
pluginsSrc = fetchurl {
|
pluginsSrc = fetchurl {
|
||||||
url = "http://distfiles.atheme.org/audacious-plugins-3.0.tar.gz";
|
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
|
||||||
sha256 = "0hhxk1mxnnrb1shshpf1nf8mqpc9q1qpsljwn4jzylcnwy6pq4rw";
|
sha256 = "5b7d3e52f6b8903bc01ae15651817e990d3348ae6b9734767f354eb2dbfc8c2d";
|
||||||
};
|
};
|
||||||
|
|
||||||
# `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
|
# `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
|
||||||
@ -51,6 +54,6 @@ stdenv.mkDerivation rec {
|
|||||||
meta = {
|
meta = {
|
||||||
description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
|
description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
|
||||||
homepage = http://audacious-media-player.org/;
|
homepage = http://audacious-media-player.org/;
|
||||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
30
pkgs/applications/editors/emacs-modes/ocaml/default.nix
Normal file
30
pkgs/applications/editors/emacs-modes/ocaml/default.nix
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
{ stdenv, fetchurl, emacs, ocaml }:
|
||||||
|
|
||||||
|
# this package installs the emacs-mode which
|
||||||
|
# resides in the ocaml compiler sources.
|
||||||
|
|
||||||
|
let version = stdenv.lib.removePrefix "ocaml-" ocaml.name;
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "ocaml-mode-${version}";
|
||||||
|
inherit (ocaml) prefixKey src;
|
||||||
|
|
||||||
|
# a quick configure to get the Makefile generated. Since
|
||||||
|
# we do not build the ocaml itself, we don't really
|
||||||
|
# need it to support any features.
|
||||||
|
configureFlags = [ "-no-tk" "-no-curses" "-no-pthread" ];
|
||||||
|
|
||||||
|
buildInputs = [ emacs ];
|
||||||
|
dontBuild = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
cd emacs;
|
||||||
|
ensureDir "$out/share/emacs/site-lisp" "$out/bin"
|
||||||
|
EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://caml.inria.fr;
|
||||||
|
description = "OCaml mode package for Emacs";
|
||||||
|
platforms = stdenv.lib.platforms.unix;
|
||||||
|
};
|
||||||
|
}
|
@ -1,33 +0,0 @@
|
|||||||
{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL
|
|
||||||
, openexr, libsamplerate, libXi, libtiff, ilmbase, freetype}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "blender-2.49b";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
|
||||||
sha256 = "1214fp2asij7l1sci2swh46nfjgpm72gk2qafq70xc0hmas4sm93";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate
|
|
||||||
libXi libtiff ilmbase freetype ];
|
|
||||||
|
|
||||||
cmakeFlags = [ "-DFREETYPE_INC=${freetype}/include" "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF"
|
|
||||||
"-DPYTHON_LIBPATH=${python}/lib" ];
|
|
||||||
|
|
||||||
NIX_LDFLAGS = "-lX11";
|
|
||||||
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2";
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
ensureDir $out/bin
|
|
||||||
cp bin/* $out/bin
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "3D Creation/Animation/Publishing System";
|
|
||||||
homepage = http://www.blender.org;
|
|
||||||
# They comment two licenses: GPLv2 and Blender License, but they
|
|
||||||
# say: "The BL has not been activated yet."
|
|
||||||
license = "GPLv2+";
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,24 +1,24 @@
|
|||||||
{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
|
{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
|
||||||
libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
|
libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
|
||||||
python, zlib }:
|
python, zlib, boost }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "blender-2.57";
|
name = "blender-2.62";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
url = "http://download.blender.org/source/${name}.tar.gz";
|
||||||
sha256 = "1f4l0zkfmbd8ydzwvmb5jw89y7ywd9k8m2f1b3hrdpgjcqhq3lcb";
|
sha256 = "19xfr5vx66p4p3hnqpglpky6f4bh3ay484mdgh7zg6j9f80dp53q";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
|
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
|
||||||
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg ];
|
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost ];
|
||||||
|
|
||||||
patchPhase = ''
|
cmakeFlags = [
|
||||||
sed -e "s@/usr/local@${python}@" -i build_files/cmake/FindPythonLibsUnix.cmake
|
"-DOPENEXR_INC=${openexr}/include/OpenEXR"
|
||||||
'';
|
"-DWITH_OPENCOLLADA=OFF"
|
||||||
|
"-DWITH_INSTALL_PORTABLE=OFF"
|
||||||
cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
|
"-DPYTHON_LIBPATH=${python}/lib"
|
||||||
"-DWITH_OPENCOLLADA=OFF" "-DWITH_INSTALL_PORTABLE=OFF"];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
|
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
|
# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
|
||||||
{ fetchurl, stdenv, texLive, python, makeWrapper
|
{ fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig
|
||||||
, libX11, qt, xz
|
, libX11, qt, xz
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61";
|
sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [texLive qt python makeWrapper xz ];
|
buildInputs = [texLive qt python makeWrapper xz pkgconfig ];
|
||||||
|
|
||||||
# don't ask me why it can't find libX11.so.6
|
# don't ask me why it can't find libX11.so.6
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -1,41 +0,0 @@
|
|||||||
From 0fbc8097f98481439e68aeb095a8d7e106924bbe Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jonathan Daugherty <jtd@galois.com>
|
|
||||||
Date: Tue, 21 Feb 2012 11:06:57 -0800
|
|
||||||
Subject: [PATCH 6/8] Loosen dependencies on SHA, HUnit, and test-framework
|
|
||||||
|
|
||||||
---
|
|
||||||
mathblog.cabal | 8 ++++----
|
|
||||||
1 files changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mathblog.cabal b/mathblog.cabal
|
|
||||||
index ea5498c..371dd12 100644
|
|
||||||
--- a/mathblog.cabal
|
|
||||||
+++ b/mathblog.cabal
|
|
||||||
@@ -44,7 +44,7 @@ Executable mb
|
|
||||||
process >= 1.0,
|
|
||||||
time >= 1.1,
|
|
||||||
old-locale >= 1.0,
|
|
||||||
- SHA >= 1.4 && < 1.5,
|
|
||||||
+ SHA >= 1.4 && < 1.6,
|
|
||||||
bytestring >= 0.9 && < 1.0,
|
|
||||||
HStringTemplate >= 0.6 && < 0.7,
|
|
||||||
ConfigFile >= 1.1 && < 1.2
|
|
||||||
@@ -79,12 +79,12 @@ Executable mb-tests
|
|
||||||
process >= 1.0 && < 1.1,
|
|
||||||
time >= 1.1,
|
|
||||||
old-locale >= 1.0 && < 1.1,
|
|
||||||
- SHA >= 1.4 && < 1.5,
|
|
||||||
+ SHA >= 1.4 && < 1.6,
|
|
||||||
bytestring >= 0.9 && < 1.0,
|
|
||||||
HStringTemplate >= 0.6 && < 0.7,
|
|
||||||
ConfigFile >= 1.1 && < 1.2,
|
|
||||||
- HUnit >= 1.2.2 && < 1.2.3,
|
|
||||||
- test-framework >= 0.3.3 && < 0.4,
|
|
||||||
+ HUnit >= 1.2.2 && < 1.2.5,
|
|
||||||
+ test-framework >= 0.3.3 && < 0.6,
|
|
||||||
test-framework-hunit >= 0.2.6 && < 0.3
|
|
||||||
|
|
||||||
GHC-Options: -Wall
|
|
||||||
--
|
|
||||||
1.7.8
|
|
||||||
|
|
@ -4,17 +4,14 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "mathblog";
|
pname = "mathblog";
|
||||||
version = "0.4";
|
version = "0.5";
|
||||||
sha256 = "0kpawik74hp9k56b858idnlkla3iaalys8mas6c4gf4jfw2w0r3j";
|
sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g";
|
||||||
isLibrary = false;
|
isLibrary = false;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA
|
ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA
|
||||||
testFramework testFrameworkHunit time
|
testFramework testFrameworkHunit time
|
||||||
];
|
];
|
||||||
patches = [
|
|
||||||
./0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
|
|
||||||
];
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A program for creating and managing a static weblog with LaTeX math and function graphs";
|
description = "A program for creating and managing a static weblog with LaTeX math and function graphs";
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
86
pkgs/applications/networking/dropbox/default.nix
Normal file
86
pkgs/applications/networking/dropbox/default.nix
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
{ stdenv, fetchurl, makeDesktopItem
|
||||||
|
, xlibs, gtkLibs, gnome
|
||||||
|
, dbus, dbus_glib, fontconfig, gcc, patchelf
|
||||||
|
}:
|
||||||
|
|
||||||
|
# this package contains the daemon version of dropbox
|
||||||
|
# it's unfortunately closed source
|
||||||
|
#
|
||||||
|
# note: the resulting program has to be invoced as
|
||||||
|
# 'dropbox' because the internal python engine takes
|
||||||
|
# uses the name of the program as starting point.
|
||||||
|
#
|
||||||
|
# todo: dropbox is shipped with some copies of libraries.
|
||||||
|
# replace these libraries with the appropriate ones in
|
||||||
|
# nixpkgs.
|
||||||
|
|
||||||
|
# note: there is a i686 version available as well
|
||||||
|
assert stdenv.system == "x86_64-linux";
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
version = "1.2.52";
|
||||||
|
sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252";
|
||||||
|
|
||||||
|
# relative location where the dropbox libraries are stored
|
||||||
|
appdir = "opt/dropbox";
|
||||||
|
|
||||||
|
# Libraries referenced by dropbox binary.
|
||||||
|
# Be aware that future versions of the dropbox binary may refer
|
||||||
|
# to different versions than are currently in these packages.
|
||||||
|
ldpath = with xlibs; with gtkLibs; with gnome;
|
||||||
|
stdenv.lib.makeSearchPath "lib" [
|
||||||
|
libSM libX11 libXext libXcomposite libXcursor libXdamage
|
||||||
|
libXfixes libXi libXinerama libXrandr libXrender
|
||||||
|
atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf
|
||||||
|
gtk pango
|
||||||
|
];
|
||||||
|
|
||||||
|
desktopItem = makeDesktopItem {
|
||||||
|
name = "dropbox";
|
||||||
|
exec = "dropbox";
|
||||||
|
comment = "Online directories";
|
||||||
|
desktopName = "Dropbox";
|
||||||
|
genericName = "Online storage";
|
||||||
|
categories = "Application;Internet;";
|
||||||
|
};
|
||||||
|
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "dropbox-${version}-bin";
|
||||||
|
src = fetchurl {
|
||||||
|
name = "dropbox-${version}.tar.gz";
|
||||||
|
url = "http://www.dropbox.com/download?plat=lnx.x86_64";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
|
||||||
|
sourceRoot = ".";
|
||||||
|
|
||||||
|
patchPhase = ''
|
||||||
|
rm -f .dropbox-dist/dropboxd
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
ensureDir "$out/${appdir}"
|
||||||
|
cp -r .dropbox-dist/* "$out/${appdir}/"
|
||||||
|
ensureDir "$out/bin"
|
||||||
|
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
|
||||||
|
|
||||||
|
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
|
||||||
|
"$out/${appdir}/dropbox"
|
||||||
|
|
||||||
|
RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${appdir}
|
||||||
|
echo "updating rpaths to: $RPATH"
|
||||||
|
find "$out/${appdir}" -type f -a -perm +0100 \
|
||||||
|
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
|
||||||
|
|
||||||
|
ensureDir "$out/share/applications"
|
||||||
|
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [ patchelf ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Online stored folders (daemon version)";
|
||||||
|
homepage = http://www.dropbox.com;
|
||||||
|
};
|
||||||
|
}
|
48
pkgs/applications/networking/irc/bip/default.nix
Normal file
48
pkgs/applications/networking/irc/bip/default.nix
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
{ stdenv, fetchurl, bison, flex, autoconf, automake, openssl }:
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
version = "0.8.8";
|
||||||
|
sha256 = "7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7";
|
||||||
|
|
||||||
|
# fetches patches from a gentoo mirror
|
||||||
|
fetchPatch =
|
||||||
|
{ file, sha256 }:
|
||||||
|
fetchurl {
|
||||||
|
url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/${file}";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "bip-${version}";
|
||||||
|
|
||||||
|
# fetch sources from debian, because the creator's website provides
|
||||||
|
# the files only via https but with an untrusted certificate.
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
|
||||||
|
# includes an important security patch
|
||||||
|
patches = map fetchPatch [
|
||||||
|
{ file = "bip-0.8.8-configure.patch";
|
||||||
|
sha256 = "286e169745e6cd768f0cb95bbc9589ca2bda497eb06461174549b80a459d901c";
|
||||||
|
}
|
||||||
|
{ file = "bip-CVE-2012-0806.patch";
|
||||||
|
sha256 = "e47523095ee1d717c762ca0195520026c6ea2c30d8adcf434d276d42f052d506";
|
||||||
|
}
|
||||||
|
{ file = "bip-freenode.patch";
|
||||||
|
sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
configureFlags = [ "--disable-pie" ];
|
||||||
|
|
||||||
|
buildInputs = [ bison flex autoconf automake openssl ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "An IRC proxy (bouncer)";
|
||||||
|
homepage = http://bip.milkypond.org/;
|
||||||
|
license = stdenv.lib.licenses.gpl2;
|
||||||
|
};
|
||||||
|
}
|
@ -32,7 +32,7 @@ in stdenv.mkDerivation {
|
|||||||
libX11 libXext libXft
|
libX11 libXext libXft
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = {
|
||||||
description = "Binary news reader of KDE";
|
description = "Binary news reader of KDE";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
|
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
|
||||||
, cmake, makeWrapper }:
|
, cmake, makeWrapper, libjpeg }:
|
||||||
|
|
||||||
let version = "3.6.1"; in
|
let version = "3.7.0"; in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "tulip-${version}";
|
name = "tulip-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/auber/${name}-src.tar.gz";
|
url = "mirror://sourceforge/auber/tulip/tulip-3.7.0/${name}-src.tar.gz";
|
||||||
sha256 = "0d76zmp7gmid4lc91zz6sp4rzxlga6vfwfqhap04326r4zl4nx1q";
|
sha256 = "150fj9pdxblvl5sby61cb2kq98r6h8yljk3vq5xizn198d3fz4jq";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libxml2 freetype glew mesa qt4 ];
|
buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ];
|
||||||
|
|
||||||
buildNativeInputs = [ cmake makeWrapper ];
|
buildNativeInputs = [ cmake makeWrapper ];
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.7.8";
|
version = "1.7.9.2";
|
||||||
svn = subversionClient.override { perlBindings = true; };
|
svn = subversionClient.override { perlBindings = true; };
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
||||||
sha256 = "ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713";
|
sha256 = "bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./docbook2texi.patch ];
|
patches = [ ./docbook2texi.patch ];
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
{ fetchurl, pythonPackages }:
|
{ fetchurl, pythonPackages }:
|
||||||
|
|
||||||
pythonPackages.buildPythonPackage rec {
|
pythonPackages.buildPythonPackage rec {
|
||||||
name = "novaclient-2.4.3";
|
name = "novaclient-2012.1";
|
||||||
namePrefix = "";
|
namePrefix = "";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://pypi.python.org/packages/source/p/python-novaclient/python-${name}.tar.gz";
|
url = "http://pypi.python.org/packages/source/p/python-novaclient/python-${name}.tar.gz";
|
||||||
md5 = "c4be4adf371d1a84ce1581af365a53d0";
|
md5 = "8f53a308e08b2af4645281917be77ffc";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 pythonPackages.ssl ];
|
pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 pythonPackages.ssl ];
|
||||||
|
@ -1,33 +1,37 @@
|
|||||||
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
|
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
|
||||||
, libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
|
, libXcursor, libXmu, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
|
||||||
, python, which, alsaLib, curl, gawk
|
, python, which, alsaLib, curl, gawk
|
||||||
, xorriso, makeself, perl, jdk
|
, xorriso, makeself, perl, jdk, pkgconfig
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let version = "4.1.6"; in
|
let version = "4.1.8"; in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "virtualbox-${version}-${kernel.version}";
|
name = "virtualbox-${version}-${kernel.version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||||
sha256 = "0zmbq0h9g4lamzmxqg281nr9pp88606dxh2dsw6vy1m86g5kfham";
|
sha256 = "1q04825ayynzgh8zl6y038lzxp3jk1a3dxpg6f52kk4vkirdc5pg";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ];
|
buildInputs =
|
||||||
|
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
|
||||||
|
hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
|
||||||
|
pkgconfig which libXmu
|
||||||
|
];
|
||||||
|
|
||||||
patchPhase = "
|
patchPhase = ''
|
||||||
set -x
|
set -x
|
||||||
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
|
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
|
||||||
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
|
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
|
||||||
-e 's@MKISOFS --version@MKISOFS -version@' \\
|
-e 's@MKISOFS --version@MKISOFS -version@' \
|
||||||
-i configure
|
-i configure
|
||||||
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
|
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
|
||||||
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
|
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
|
||||||
find . -type f | xargs sed 's/depmod -a/true/' -i
|
find . -type f | xargs sed 's/depmod -a/true/' -i
|
||||||
export USER=nix
|
export USER=nix
|
||||||
set +x
|
set +x
|
||||||
";
|
'';
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs
|
./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs
|
||||||
|
@ -2,8 +2,9 @@
|
|||||||
# as autostart item.
|
# as autostart item.
|
||||||
|
|
||||||
{stdenv, lib}:
|
{stdenv, lib}:
|
||||||
{ name # name of the desktop file (without .desktop)
|
{ name # name of the desktop file (without .desktop)
|
||||||
, package # package where the desktop file resides in
|
, package # package where the desktop file resides in
|
||||||
|
, srcPrefix ? "" # additional prefix that the desktop file may have in the 'package'
|
||||||
, after ? null
|
, after ? null
|
||||||
, condition ? null
|
, condition ? null
|
||||||
, phase ? "2"
|
, phase ? "2"
|
||||||
@ -20,7 +21,7 @@ stdenv.mkDerivation {
|
|||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
ensureDir $out/share/autostart
|
ensureDir $out/share/autostart
|
||||||
target=${name}.desktop
|
target=${name}.desktop
|
||||||
cp ${package}/share/applications/${name}.desktop $target
|
cp ${package}/share/applications/${srcPrefix}${name}.desktop $target
|
||||||
chmod +rw $target
|
chmod +rw $target
|
||||||
echo "X-KDE-autostart-phase=${phase}" >> $target
|
echo "X-KDE-autostart-phase=${phase}" >> $target
|
||||||
${lib.optionalString (after != null) ''echo "${after}" >> $target''}
|
${lib.optionalString (after != null) ''echo "${after}" >> $target''}
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
, lcovExtraTraceFiles ? []
|
, lcovExtraTraceFiles ? []
|
||||||
, src, stdenv
|
, src, stdenv
|
||||||
, name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
|
, name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
|
||||||
|
, failureHook ? null
|
||||||
, ... } @ args:
|
, ... } @ args:
|
||||||
|
|
||||||
stdenv.mkDerivation (
|
stdenv.mkDerivation (
|
||||||
@ -37,7 +38,8 @@ stdenv.mkDerivation (
|
|||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
failureHook = ''
|
failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) +
|
||||||
|
''
|
||||||
if test -n "$succeedOnFailure"; then
|
if test -n "$succeedOnFailure"; then
|
||||||
if test -n "$keepBuildDirectory"; then
|
if test -n "$keepBuildDirectory"; then
|
||||||
KEEPBUILDDIR="$out/`basename $TMPDIR`"
|
KEEPBUILDDIR="$out/`basename $TMPDIR`"
|
||||||
|
@ -54,7 +54,7 @@ stdenv.mkDerivation (
|
|||||||
|
|
||||||
eval "$preAutoconf"
|
eval "$preAutoconf"
|
||||||
|
|
||||||
if test -x ./bootstrap; then ./bootstrap
|
if test -x ./bootstrap && test -f ./bootstrap; then ./bootstrap
|
||||||
elif test -x ./bootstrap.sh; then ./bootstrap.sh
|
elif test -x ./bootstrap.sh; then ./bootstrap.sh
|
||||||
elif test -x ./autogen.sh; then ./autogen.sh
|
elif test -x ./autogen.sh; then ./autogen.sh
|
||||||
elif test -x ./autogen ; then ./autogen
|
elif test -x ./autogen ; then ./autogen
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "epic";
|
pname = "epic";
|
||||||
version = "0.9.2";
|
version = "0.9.3";
|
||||||
sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw";
|
sha256 = "1x8y3ljha8r52pw83mjfv5i49dq0b7i1xbxg8j9hlvr2vwfa4237";
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [ Cabal mtl ];
|
buildDepends = [ Cabal mtl ];
|
||||||
|
@ -223,7 +223,7 @@ stdenv.mkDerivation ({
|
|||||||
++ (optional (cloog != null) cloog)
|
++ (optional (cloog != null) cloog)
|
||||||
++ (optional (zlib != null) zlib)
|
++ (optional (zlib != null) zlib)
|
||||||
++ (optionals langJava [ boehmgc zip unzip ])
|
++ (optionals langJava [ boehmgc zip unzip ])
|
||||||
++ (optionals javaAwtGtk [ gtk libart_lgpl ] ++ xlibs)
|
++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
|
||||||
++ (optionals (cross != null) [binutilsCross])
|
++ (optionals (cross != null) [binutilsCross])
|
||||||
++ (optionals langAda [gnatboot])
|
++ (optionals langAda [gnatboot])
|
||||||
++ (optionals langVhdl [gnat])
|
++ (optionals langVhdl [gnat])
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "idris";
|
pname = "idris";
|
||||||
version = "0.9.1";
|
version = "0.9.2";
|
||||||
sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
|
sha256 = "0n4dh3vxkjvw8rb5iqm8lvi21q2ljw2pzn453wfcisdadkpv4fh5";
|
||||||
isLibrary = false;
|
isLibrary = false;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
installPhase = ''
|
installPhase = ''
|
||||||
for b in cgc cgfxcat cginfo
|
for b in cgc cgfxcat cginfo
|
||||||
do
|
do
|
||||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
|
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b"
|
||||||
done
|
done
|
||||||
# FIXME: cgfxcat and cginfo need more patchelf
|
# FIXME: cgfxcat and cginfo need more patchelf
|
||||||
ensureDir "$out/bin/"
|
ensureDir "$out/bin/"
|
||||||
@ -33,10 +33,9 @@ stdenv.mkDerivation rec {
|
|||||||
ensureDir "$out/include/"
|
ensureDir "$out/include/"
|
||||||
cp -v -r include/Cg/ "$out/include/"
|
cp -v -r include/Cg/ "$out/include/"
|
||||||
ensureDir "$out/lib/"
|
ensureDir "$out/lib/"
|
||||||
[ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
|
[ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
|
||||||
[ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
|
[ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/"
|
||||||
for mandir in man1 man3 \
|
for mandir in man1 man3 manCg manCgFX
|
||||||
${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX
|
|
||||||
do
|
do
|
||||||
ensureDir "$out/share/man/$mandir/"
|
ensureDir "$out/share/man/$mandir/"
|
||||||
cp -v share/man/$mandir/* "$out/share/man/$mandir/"
|
cp -v share/man/$mandir/* "$out/share/man/$mandir/"
|
||||||
|
@ -11,10 +11,10 @@ let
|
|||||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||||
sourceInfo = rec {
|
sourceInfo = rec {
|
||||||
baseName="angelscript";
|
baseName="angelscript";
|
||||||
version="2.20.2";
|
version="2.22.1";
|
||||||
name="${baseName}-${version}";
|
name="${baseName}-${version}";
|
||||||
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
|
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
|
||||||
hash="0s5d6av27dl6kxkzns011zwznj7r8zy5ypfhl6x9r1kzaqdkqz2a";
|
hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
|
@ -1 +0,0 @@
|
|||||||
import ./ruby-19.nix
|
|
@ -31,7 +31,8 @@ let
|
|||||||
wrapProgram "$prog" \
|
wrapProgram "$prog" \
|
||||||
--prefix GEM_PATH : "$GEM_PATH" \
|
--prefix GEM_PATH : "$GEM_PATH" \
|
||||||
--prefix RUBYLIB : "${rubygems}/lib" \
|
--prefix RUBYLIB : "${rubygems}/lib" \
|
||||||
--set RUBYOPT 'rubygems'
|
--set RUBYOPT rubygems \
|
||||||
|
$extraWrapperFlags ''${extraWrapperFlagsArray[@]}
|
||||||
done
|
done
|
||||||
|
|
||||||
for prog in $out/gems/*/bin/*; do
|
for prog in $out/gems/*/bin/*; do
|
||||||
|
@ -61,4 +61,11 @@ in
|
|||||||
buildInputs = [ jdk ];
|
buildInputs = [ jdk ];
|
||||||
JAVA_HOME = jdk;
|
JAVA_HOME = jdk;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
buildr = {
|
||||||
|
# Many Buildfiles rely on RUBYLIB containing the current directory
|
||||||
|
# (as was the default in Ruby < 1.9.2).
|
||||||
|
extraWrapperFlags = "--prefix RUBYLIB : .";
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
91
pkgs/development/libraries/boost/1.49.nix
Normal file
91
pkgs/development/libraries/boost/1.49.nix
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
|
||||||
|
, enableRelease ? true
|
||||||
|
, enableDebug ? false
|
||||||
|
, enableSingleThreaded ? false
|
||||||
|
, enableMultiThreaded ? true
|
||||||
|
, enableShared ? true
|
||||||
|
, enableStatic ? false
|
||||||
|
, enablePIC ? false
|
||||||
|
, enableExceptions ? false
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
variant = stdenv.lib.concatStringsSep ","
|
||||||
|
(stdenv.lib.optional enableRelease "release" ++
|
||||||
|
stdenv.lib.optional enableDebug "debug");
|
||||||
|
|
||||||
|
threading = stdenv.lib.concatStringsSep ","
|
||||||
|
(stdenv.lib.optional enableSingleThreaded "single" ++
|
||||||
|
stdenv.lib.optional enableMultiThreaded "multi");
|
||||||
|
|
||||||
|
link = stdenv.lib.concatStringsSep ","
|
||||||
|
(stdenv.lib.optional enableShared "shared" ++
|
||||||
|
stdenv.lib.optional enableStatic "static");
|
||||||
|
|
||||||
|
# To avoid library name collisions
|
||||||
|
finalLayout = if ((enableRelease && enableDebug) ||
|
||||||
|
(enableSingleThreaded && enableMultiThreaded) ||
|
||||||
|
(enableShared && enableStatic)) then
|
||||||
|
"tagged" else "system";
|
||||||
|
|
||||||
|
cflags = if (enablePIC && enableExceptions) then
|
||||||
|
"cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
|
||||||
|
else if (enablePIC) then
|
||||||
|
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
|
||||||
|
else if (enableExceptions) then
|
||||||
|
"cflags=-fexceptions"
|
||||||
|
else
|
||||||
|
"";
|
||||||
|
in
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "boost-1.49.0";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "http://boost.org/";
|
||||||
|
description = "Boost C++ Library Collection";
|
||||||
|
license = "boost-license";
|
||||||
|
|
||||||
|
platforms = stdenv.lib.platforms.unix;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||||
|
};
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2";
|
||||||
|
sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
|
||||||
|
};
|
||||||
|
|
||||||
|
# See <http://svn.boost.org/trac/boost/ticket/4688>.
|
||||||
|
patches = [ ./boost_filesystem_post_1_49_0.patch ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
buildInputs = [icu expat zlib bzip2 python];
|
||||||
|
|
||||||
|
configureScript = "./bootstrap.sh";
|
||||||
|
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
|
||||||
|
|
||||||
|
buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
|
||||||
|
|
||||||
|
installPhase = ":";
|
||||||
|
|
||||||
|
crossAttrs = rec {
|
||||||
|
buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
|
||||||
|
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
|
||||||
|
# override them.
|
||||||
|
propagatedBuildInputs = buildInputs;
|
||||||
|
# We want to substitute the contents of configureFlags, removing thus the
|
||||||
|
# usual --build and --host added on cross building.
|
||||||
|
preConfigure = ''
|
||||||
|
export configureFlags="--prefix=$out --without-icu"
|
||||||
|
'';
|
||||||
|
buildPhase = ''
|
||||||
|
set -x
|
||||||
|
cat << EOF > user-config.jam
|
||||||
|
using gcc : cross : $crossConfig-g++ ;
|
||||||
|
EOF
|
||||||
|
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,12 @@
|
|||||||
|
diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp
|
||||||
|
--- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 22:39:33.000000000 +0100
|
||||||
|
+++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp 2012-02-25 20:00:33.628767485 +0100
|
||||||
|
@@ -45,7 +45,7 @@
|
||||||
|
{
|
||||||
|
#if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__)
|
||||||
|
// ISO C calls this "the locale-specific native environment":
|
||||||
|
- static std::locale lc("");
|
||||||
|
+ static std::locale lc;
|
||||||
|
#else // Mac OS
|
||||||
|
// "All BSD system functions expect their string parameters to be in UTF-8 encoding
|
||||||
|
// and nothing else."
|
21
pkgs/development/libraries/caelum/default.nix
Normal file
21
pkgs/development/libraries/caelum/default.nix
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "caelum-0.6.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://caelum.googlecode.com/files/${name}.tar.gz";
|
||||||
|
sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ ois ogre boost ];
|
||||||
|
buildNativeInputs = [ cmake pkgconfig ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Add-on for the OGRE, aimed to render atmospheric effects";
|
||||||
|
homepage = http://code.google.com/p/caelum/;
|
||||||
|
license = "LGPLv2.1+";
|
||||||
|
};
|
||||||
|
}
|
@ -12,7 +12,7 @@ cross :
|
|||||||
|
|
||||||
let
|
let
|
||||||
# For GNU/Hurd, see below.
|
# For GNU/Hurd, see below.
|
||||||
version = if hurdHeaders != null then "20120221" else "2.12.2";
|
version = if hurdHeaders != null then "20120223" else "2.12.2";
|
||||||
|
|
||||||
needsPortsNative = stdenv.isMips || stdenv.isArm;
|
needsPortsNative = stdenv.isMips || stdenv.isArm;
|
||||||
needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
|
needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
|
||||||
@ -75,8 +75,7 @@ stdenv.mkDerivation ({
|
|||||||
|
|
||||||
/* Allow nixos and nix handle the locale-archive. */
|
/* Allow nixos and nix handle the locale-archive. */
|
||||||
./nix-locale-archive.patch
|
./nix-locale-archive.patch
|
||||||
]
|
];
|
||||||
++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-sigstate-functions.patch);
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Needed for glibc to build with the gnumake 3.82
|
# Needed for glibc to build with the gnumake 3.82
|
||||||
@ -144,8 +143,8 @@ stdenv.mkDerivation ({
|
|||||||
# maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
|
# maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
|
||||||
# See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
|
# See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
|
||||||
url = "git://git.sv.gnu.org/hurd/glibc.git";
|
url = "git://git.sv.gnu.org/hurd/glibc.git";
|
||||||
sha256 = "fbc053f23167059af414ae1ba9a65931a9d9afaf7d2efb9eba3e258757d12f7d";
|
sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d";
|
||||||
rev = "b29b3d0ae35be390cab59e4798cbaf9b45fb06e3";
|
rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1";
|
||||||
}
|
}
|
||||||
else fetchurl {
|
else fetchurl {
|
||||||
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
|
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
This patch adds a GNU ld version script entry for the `_hurd_sigstate_*'
|
|
||||||
functions that were introduced to support SA_SIGINFO. A similar patch
|
|
||||||
should be applied upstream soon.
|
|
||||||
|
|
||||||
diff --git a/hurd/Versions b/hurd/Versions
|
|
||||||
index 83c8ab1..295cfda 100644
|
|
||||||
--- a/hurd/Versions
|
|
||||||
+++ b/hurd/Versions
|
|
||||||
@@ -156,6 +156,11 @@ libc {
|
|
||||||
# functions used in macros & inline functions
|
|
||||||
__errno_location;
|
|
||||||
}
|
|
||||||
+ GLIBC_2.13 {
|
|
||||||
+ # functions introduced for SA_SIGINFO support and referenced from
|
|
||||||
+ # <hurd/signal.h>
|
|
||||||
+ _hurd_sigstate_*;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
%if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
|
|
||||||
HURD_CTHREADS_0.3 {
|
|
24
pkgs/development/libraries/haskell/HSH/default.nix
Normal file
24
pkgs/development/libraries/haskell/HSH/default.nix
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
{ cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
|
||||||
|
, regexPosix
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "HSH";
|
||||||
|
version = "2.0.4";
|
||||||
|
sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8";
|
||||||
|
isLibrary = true;
|
||||||
|
isExecutable = true;
|
||||||
|
buildDepends = [
|
||||||
|
filepath hslogger MissingH mtl regexBase regexCompat regexPosix
|
||||||
|
];
|
||||||
|
meta = {
|
||||||
|
homepage = "http://software.complete.org/hsh";
|
||||||
|
description = "Library to mix shell scripting with Haskell programs";
|
||||||
|
license = "LGPL";
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [
|
||||||
|
self.stdenv.lib.maintainers.andres
|
||||||
|
self.stdenv.lib.maintainers.simons
|
||||||
|
];
|
||||||
|
};
|
||||||
|
})
|
17
pkgs/development/libraries/haskell/IfElse/default.nix
Normal file
17
pkgs/development/libraries/haskell/IfElse/default.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ cabal, mtl }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "IfElse";
|
||||||
|
version = "0.85";
|
||||||
|
sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
|
||||||
|
buildDepends = [ mtl ];
|
||||||
|
meta = {
|
||||||
|
description = "Anaphoric and miscellaneous useful control-flow";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [
|
||||||
|
self.stdenv.lib.maintainers.andres
|
||||||
|
self.stdenv.lib.maintainers.simons
|
||||||
|
];
|
||||||
|
};
|
||||||
|
})
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "attoparsec-conduit";
|
pname = "attoparsec-conduit";
|
||||||
version = "0.2.0";
|
version = "0.2.0.1";
|
||||||
sha256 = "11jcsqyqc33xn980rac7fmdgj99dg4bp75b5whqzpnr67ginjjv9";
|
sha256 = "1jxb2zanfmfqdmd5q770r4yz2s0giky9ify6fcsjwc8wiah4aji1";
|
||||||
buildDepends = [ attoparsec conduit text transformers ];
|
buildDepends = [ attoparsec conduit text transformers ];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://github.com/snoyberg/conduit";
|
homepage = "http://github.com/snoyberg/conduit";
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "authenticate";
|
pname = "authenticate";
|
||||||
version = "1.0.0";
|
version = "1.0.0.1";
|
||||||
sha256 = "0a163dhi69gh6zmi43jidxlaknbk1y0frjlwijdf7fp073rh0p87";
|
sha256 = "0wrbr7kwd4g8idd6i4ghvpd5q7nq0b8zx5qphqvkbs128m0r308d";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
|
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
|
||||||
conduit httpConduit httpTypes network tagsoup text transformers
|
conduit httpConduit httpTypes network tagsoup text transformers
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
{ cabal }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "base64-bytestring";
|
||||||
|
version = "0.1.0.3";
|
||||||
|
sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3";
|
||||||
|
meta = {
|
||||||
|
homepage = "https://github.com/bos/base64-bytestring";
|
||||||
|
description = "Fast base64 encoding and deconding for ByteStrings";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [
|
||||||
|
self.stdenv.lib.maintainers.andres
|
||||||
|
self.stdenv.lib.maintainers.simons
|
||||||
|
];
|
||||||
|
};
|
||||||
|
})
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "blaze-builder-conduit";
|
pname = "blaze-builder-conduit";
|
||||||
version = "0.2.0";
|
version = "0.2.0.1";
|
||||||
sha256 = "13fcxmzw4xz7y271vdf6w6fj6isninjcxnm7h7gbk4yf31wx831r";
|
sha256 = "0p6kq43avsf21biskjardv7k47bag16ki2gmwjpk8ram9mwlz0zg";
|
||||||
buildDepends = [ blazeBuilder conduit text transformers ];
|
buildDepends = [ blazeBuilder conduit text transformers ];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://github.com/snoyberg/conduit";
|
homepage = "http://github.com/snoyberg/conduit";
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "clientsession";
|
pname = "clientsession";
|
||||||
version = "0.7.4";
|
version = "0.7.4.1";
|
||||||
sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss";
|
sha256 = "1fnrngbx86zcvh0ybv7ans132d216ayxdzlgw0x4qh0sw9r3w2ip";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
|
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
|
||||||
skein tagged
|
skein tagged
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
{ cabal, deepseq }:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "containers-deepseq";
|
|
||||||
version = "0.1.0.1";
|
|
||||||
sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
|
|
||||||
buildDepends = [ deepseq ];
|
|
||||||
meta = {
|
|
||||||
description = "Provide orphan NFData instances for containers as needed. (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
@ -1,18 +0,0 @@
|
|||||||
{ cabal, attempt, transformers }:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "control-monad-attempt";
|
|
||||||
version = "0.3.0.1";
|
|
||||||
sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
|
|
||||||
buildDepends = [ attempt transformers ];
|
|
||||||
meta = {
|
|
||||||
homepage = "http://github.com/snoyberg/control-monad-attempt";
|
|
||||||
description = "Monad transformer for attempt. (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "convertible";
|
pname = "convertible";
|
||||||
version = "1.0.11.0";
|
version = "1.0.11.1";
|
||||||
sha256 = "0qkz760ddshmglmrf47a01978c9zhxfss44b6vmfkwwfcjb7da2b";
|
sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6";
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [ mtl text time ];
|
buildDepends = [ mtl text time ];
|
||||||
|
@ -1,24 +0,0 @@
|
|||||||
{ cabal, conduit, convertibleText, dataObject, failure, text
|
|
||||||
, transformers, yaml
|
|
||||||
}:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "data-object-yaml";
|
|
||||||
version = "0.3.4.2";
|
|
||||||
sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap";
|
|
||||||
isLibrary = true;
|
|
||||||
isExecutable = true;
|
|
||||||
buildDepends = [
|
|
||||||
conduit convertibleText dataObject failure text transformers yaml
|
|
||||||
];
|
|
||||||
meta = {
|
|
||||||
homepage = "http://github.com/snoyberg/data-object-yaml";
|
|
||||||
description = "Serialize data to and from Yaml files (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "filestore";
|
pname = "filestore";
|
||||||
version = "0.4.0.4";
|
version = "0.4.1";
|
||||||
sha256 = "14rp2689gjnk9pqk2xv4m3q3icgfvbik32c2d6gx4l2y7n78dsbx";
|
sha256 = "02ki6b4rbmk463qmmqia7igkrsr7h1kxal94k6pikkikylx2f8r7";
|
||||||
buildDepends = [ Diff filepath parsec split time utf8String xml ];
|
buildDepends = [ Diff filepath parsec split time utf8String xml ];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://johnmacfarlane.net/repos/filestore";
|
homepage = "http://johnmacfarlane.net/repos/filestore";
|
||||||
|
@ -1,21 +1,22 @@
|
|||||||
{ cabal, cgi, ConfigFile, feed, filepath, filestore, ghcPaths
|
{ cabal, blazeHtml, cgi, ConfigFile, feed, filepath, filestore
|
||||||
, happstackServer, happstackUtil, highlightingKate, hslogger
|
, ghcPaths, happstackServer, happstackUtil, highlightingKate
|
||||||
, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
|
, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
|
||||||
, parsec, random, recaptcha, safe, SHA, syb, text, time, url
|
, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
|
||||||
, utf8String, xhtml, xml, xssSanitize, zlib
|
, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "gitit";
|
pname = "gitit";
|
||||||
version = "0.8.1";
|
version = "0.9";
|
||||||
sha256 = "1b5i6fm68vwhlvgz0m7xxzklkxc2c6lrqyqfqyjs93p5j0aqgvfn";
|
sha256 = "00kjfmczj5m3b8r8djdpad8d27s44z7pf76yyc0sdja1f3bd4mlp";
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
cgi ConfigFile feed filepath filestore ghcPaths happstackServer
|
blazeHtml cgi ConfigFile feed filepath filestore ghcPaths
|
||||||
happstackUtil highlightingKate hslogger HStringTemplate HTTP json
|
happstackServer happstackUtil highlightingKate hslogger
|
||||||
mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb
|
HStringTemplate HTTP json mtl network pandoc pandocTypes parsec
|
||||||
text time url utf8String xhtml xml xssSanitize zlib
|
random recaptcha safe SHA syb tagsoup text time url utf8String
|
||||||
|
xhtml xml xssSanitize zlib
|
||||||
];
|
];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://gitit.net";
|
homepage = "http://gitit.net";
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "hxt";
|
pname = "hxt";
|
||||||
version = "9.2.1";
|
version = "9.2.2";
|
||||||
sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y";
|
sha256 = "0ichjpshq10b11dyfv1q7rs2m190x3gplx6k54amlxv45nwd1s6r";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
|
binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
|
||||||
hxtUnicode mtl network parsec
|
hxtUnicode mtl network parsec
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
{ cabal, blazeBuilder, blazeBuilderEnumerator, enumerator
|
|
||||||
, jsonTypes, text, transformers
|
|
||||||
}:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "json-enumerator";
|
|
||||||
version = "0.0.1.2";
|
|
||||||
sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d";
|
|
||||||
buildDepends = [
|
|
||||||
blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text
|
|
||||||
transformers
|
|
||||||
];
|
|
||||||
meta = {
|
|
||||||
homepage = "http://github.com/snoyberg/json-enumerator";
|
|
||||||
description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
@ -1,13 +1,12 @@
|
|||||||
{ cabal, failure, text, time }:
|
{ cabal, transformers }:
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "data-object";
|
pname = "monads-tf";
|
||||||
version = "0.3.1.9";
|
version = "0.1.0.0";
|
||||||
sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
|
sha256 = "1d38rddm9h8crs96zhzj87a3ygix0ipyxy0qcyas88k60fgavg5i";
|
||||||
buildDepends = [ failure text time ];
|
buildDepends = [ transformers ];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://github.com/snoyberg/data-object/tree/master";
|
description = "Monad classes, using type families";
|
||||||
description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
platforms = self.ghc.meta.platforms;
|
platforms = self.ghc.meta.platforms;
|
||||||
maintainers = [
|
maintainers = [
|
@ -1,18 +0,0 @@
|
|||||||
{ cabal, failure, transformers }:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "neither";
|
|
||||||
version = "0.3.1";
|
|
||||||
sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk";
|
|
||||||
buildDepends = [ failure transformers ];
|
|
||||||
meta = {
|
|
||||||
homepage = "http://github.com/snoyberg/neither";
|
|
||||||
description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "pandoc-types";
|
pname = "pandoc-types";
|
||||||
version = "1.9.0.2";
|
version = "1.9.1";
|
||||||
sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl";
|
sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i";
|
||||||
buildDepends = [ syb ];
|
buildDepends = [ syb ];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://johnmacfarlane.net/pandoc";
|
homepage = "http://johnmacfarlane.net/pandoc";
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "persistent";
|
pname = "persistent";
|
||||||
version = "0.8.0";
|
version = "0.8.0.1";
|
||||||
sha256 = "0z70ibicfbfripp1x9csfvfhn7k26j78jvvig9ylsjwldhysr7qr";
|
sha256 = "1lsmsx0zxa3h83z29r6h3r94czg7c8apid9mah48f8hxlfynbqhi";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
|
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
|
||||||
monadControl mtl pathPieces poolConduit text time transformers
|
monadControl mtl pathPieces poolConduit text time transformers
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
{ cabal, monadControl, transformers }:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "pool";
|
|
||||||
version = "0.1.2.1";
|
|
||||||
sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c";
|
|
||||||
buildDepends = [ monadControl transformers ];
|
|
||||||
meta = {
|
|
||||||
homepage = "http://www.yesodweb.com/book/persistent";
|
|
||||||
description = "Thread-safe resource pools. (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
16
pkgs/development/libraries/haskell/stm/2.3.nix
Normal file
16
pkgs/development/libraries/haskell/stm/2.3.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ cabal }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "stm";
|
||||||
|
version = "2.3";
|
||||||
|
sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm";
|
||||||
|
meta = {
|
||||||
|
description = "Software Transactional Memory";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [
|
||||||
|
self.stdenv.lib.maintainers.andres
|
||||||
|
self.stdenv.lib.maintainers.simons
|
||||||
|
];
|
||||||
|
};
|
||||||
|
})
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "testpack";
|
pname = "testpack";
|
||||||
version = "2.1.1";
|
version = "2.1.2";
|
||||||
sha256 = "1z8g3xhvy901h7kr7q4wcms5b23xniskrgxfpq42w4b34acwvhmg";
|
sha256 = "12dhl8svy0wmdwlvkp0p0j6wr6vgv4hrjcpdv48kc5rcwjvh8xif";
|
||||||
buildDepends = [ HUnit mtl QuickCheck random ];
|
buildDepends = [ HUnit mtl QuickCheck random ];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";
|
homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "utility-ht";
|
pname = "utility-ht";
|
||||||
version = "0.0.7.1";
|
version = "0.0.8";
|
||||||
sha256 = "0k097kyv6rxjvg1drnphv2mg882xx2lk098hs557fcsr16w658ma";
|
sha256 = "02sm1xj5xa65hpkvl2yk89d9dlg3c2ap8qcviq9zj10asmsbzyd8";
|
||||||
meta = {
|
meta = {
|
||||||
description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
|
description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "wai-app-static";
|
pname = "wai-app-static";
|
||||||
version = "1.1.1";
|
version = "1.1.2";
|
||||||
sha256 = "0i73rxgmng7grs8cgxw8769jg0cvpsb5gi4s0iwrdyh3xd1vj7iy";
|
sha256 = "1nvzqg3wk7i2p1kcpb9f9wdzbrfl6gxid44l94mmvc7xjcmdl6qw";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
|
base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
|
||||||
httpDate httpTypes text time transformers unixCompat wai
|
httpDate httpTypes text time transformers unixCompat wai
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
|
{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit
|
||||||
, conduit, dataDefault, fastLogger, httpTypes, network, text, time
|
, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes
|
||||||
, transformers, wai, zlibConduit
|
, network, text, time, transformers, wai, zlibConduit
|
||||||
}:
|
}:
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "wai-extra";
|
pname = "wai-extra";
|
||||||
version = "1.1.0";
|
version = "1.1.0.1";
|
||||||
sha256 = "1mj2swb2bgsay9prpw6h0wmwsqyan53ndyczmhppdax4y5088f55";
|
sha256 = "0kavvbywkkwj9914y622wsziwfca9qjaqz798mjhl1ip5bfy73b0";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit
|
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
|
||||||
dataDefault fastLogger httpTypes network text time transformers wai
|
conduit dataDefault fastLogger httpTypes network text time
|
||||||
zlibConduit
|
transformers wai zlibConduit
|
||||||
];
|
];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://github.com/yesodweb/wai";
|
homepage = "http://github.com/yesodweb/wai";
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "wai";
|
pname = "wai";
|
||||||
version = "1.1.0";
|
version = "1.1.0.1";
|
||||||
sha256 = "1kmmivcak9v13rgivs2vhr543dfdx19wncwlpda453570ywam7vh";
|
sha256 = "0klyi3d4rivgvbasamxccvkz1w44ak0rcbx840ypdcjq8mbcb85f";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
blazeBuilder conduit httpTypes network text transformers vault
|
blazeBuilder conduit httpTypes network text transformers vault
|
||||||
];
|
];
|
||||||
|
@ -1,15 +1,16 @@
|
|||||||
{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
|
{ cabal, blazeBuilder, blazeBuilderConduit, bytestringLexing
|
||||||
, conduit, httpTypes, liftedBase, network, simpleSendfile
|
, caseInsensitive, conduit, httpTypes, liftedBase, network
|
||||||
, transformers, unixCompat, wai
|
, simpleSendfile, transformers, unixCompat, wai
|
||||||
}:
|
}:
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "warp";
|
pname = "warp";
|
||||||
version = "1.1.0";
|
version = "1.1.0.1";
|
||||||
sha256 = "1an2j89422rcvrvrmhg1hwj8vpikjj5xdzb3h37rjsfj6qlqy5cf";
|
sha256 = "1bgjnnkqgcyj00jd4rgsnpmac0yfd1ydd6i61b252gyrr9dd0wm9";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
|
blazeBuilder blazeBuilderConduit bytestringLexing caseInsensitive
|
||||||
liftedBase network simpleSendfile transformers unixCompat wai
|
conduit httpTypes liftedBase network simpleSendfile transformers
|
||||||
|
unixCompat wai
|
||||||
];
|
];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://github.com/yesodweb/wai";
|
homepage = "http://github.com/yesodweb/wai";
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
{ cabal, pathPieces, text }:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "web-routes-quasi";
|
|
||||||
version = "0.7.1.1";
|
|
||||||
sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf";
|
|
||||||
isLibrary = true;
|
|
||||||
isExecutable = true;
|
|
||||||
buildDepends = [ pathPieces text ];
|
|
||||||
meta = {
|
|
||||||
homepage = "http://docs.yesodweb.com/web-routes-quasi/";
|
|
||||||
description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
@ -1,21 +0,0 @@
|
|||||||
{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text
|
|
||||||
, utf8String
|
|
||||||
}:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "web-routes";
|
|
||||||
version = "0.27.1";
|
|
||||||
sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz";
|
|
||||||
buildDepends = [
|
|
||||||
blazeBuilder httpTypes mtl network parsec text utf8String
|
|
||||||
];
|
|
||||||
meta = {
|
|
||||||
description = "Library for maintaining correctness and composability of URLs within an application";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
@ -1,24 +0,0 @@
|
|||||||
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
|
|
||||||
, blazeBuilderEnumerator, dataDefault, enumerator, failure, text
|
|
||||||
, transformers, xmlTypes
|
|
||||||
}:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "xml-enumerator";
|
|
||||||
version = "0.4.4.1";
|
|
||||||
sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj";
|
|
||||||
buildDepends = [
|
|
||||||
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
|
|
||||||
dataDefault enumerator failure text transformers xmlTypes
|
|
||||||
];
|
|
||||||
meta = {
|
|
||||||
homepage = "http://github.com/snoyberg/xml";
|
|
||||||
description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
@ -7,8 +7,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "yesod";
|
pname = "yesod";
|
||||||
version = "0.10.1";
|
version = "0.10.1.1";
|
||||||
sha256 = "1m4prrpxdcj7qn755as37kn66f7didparhar520anr9cryn0wfr9";
|
sha256 = "1d64kx0jfk1d1r4k8r57y5wz84pjxs481qdnzgjfv279y467fki6";
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "zlib-conduit";
|
pname = "zlib-conduit";
|
||||||
version = "0.2.0";
|
version = "0.2.0.1";
|
||||||
sha256 = "1vwan9vglj7xdna3pfw71bcfcp10s4vn6fd6wwdz7wvxrbn52gsk";
|
sha256 = "0css7cr9jj6rn829bw8mlbdl0d6iz9ckhsbrlrdcppx8k4gzb4rg";
|
||||||
buildDepends = [ conduit transformers zlibBindings ];
|
buildDepends = [ conduit transformers zlibBindings ];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://github.com/snoyberg/conduit";
|
homepage = "http://github.com/snoyberg/conduit";
|
||||||
|
@ -1,18 +1,19 @@
|
|||||||
{stdenv, fetchurl, cmake, libX11, libuuid}:
|
{stdenv, fetchurl, cmake, libX11, libuuid, xz}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "itk-3.16.0";
|
name = "itk-4.0.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://sourceforge/itk/InsightToolkit-3.16.0.tar.gz;
|
url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz;
|
||||||
sha256 = "18r021ib2g94qlajjsny0r6cpc61rmr0zrpb2l0mx1y7j9ckr6ks";
|
sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ];
|
cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ];
|
||||||
|
|
||||||
# makeFlags = [ "VERBOSE=1" ];
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs = [ cmake libX11 libuuid ];
|
buildNativeInputs = [ cmake xz ];
|
||||||
|
buildInputs = [ libX11 libuuid ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Insight Segmentation and Registration Toolkit";
|
description = "Insight Segmentation and Registration Toolkit";
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "krb5";
|
pname = "krb5";
|
||||||
version = "1.6.3";
|
version = "1.10";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
webpage = http://web.mit.edu/kerberos/;
|
webpage = http://web.mit.edu/kerberos/;
|
||||||
in
|
in
|
||||||
@ -11,8 +11,8 @@ stdenv.mkDerivation (rec {
|
|||||||
inherit name;
|
inherit name;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${webpage}/dist/krb5/1.6/${name}-signed.tar";
|
url = "${webpage}/dist/krb5/1.10/${name}-signed.tar";
|
||||||
sha256 = "7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a";
|
sha256 = "1pa4m6538drb51gsqxbbxlsnc9fm9ccid9m2s3pv3di5l0a7l8bg";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ perl ncurses yacc ];
|
buildInputs = [ perl ncurses yacc ];
|
||||||
|
@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
propagatedBuildInputs = [ zlib ];
|
propagatedBuildInputs = [ zlib ];
|
||||||
|
|
||||||
|
# At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
|
||||||
|
# had this same problem. This links it somewhere that mysqlworkbench looks.
|
||||||
|
postInstall = ''
|
||||||
|
( cd $out/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h )
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.nih.at/libzip;
|
homepage = http://www.nih.at/libzip;
|
||||||
description = "A C library for reading, creating and modifying zip archives";
|
description = "A C library for reading, creating and modifying zip archives";
|
||||||
|
23
pkgs/development/libraries/mysocketw/default.nix
Normal file
23
pkgs/development/libraries/mysocketw/default.nix
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{stdenv, fetchurl, openssl}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "mysocketw-031026";
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz;
|
||||||
|
sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [ ./gcc.patch ];
|
||||||
|
|
||||||
|
configurePhase = ''
|
||||||
|
sed -i s,/usr/local,$out, Makefile.conf
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [ openssl ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
|
||||||
|
license = "LGPLv2.1+";
|
||||||
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
};
|
||||||
|
}
|
13
pkgs/development/libraries/mysocketw/gcc.patch
Normal file
13
pkgs/development/libraries/mysocketw/gcc.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
I picked it up from:
|
||||||
|
http://www.rigsofrods.com/wiki/images/c/c0/Socketw.patch
|
||||||
|
|
||||||
|
--- a/src/sw_base.cxx.old 2009-12-19 21:19:31.057051328 -0800
|
||||||
|
+++ b/src/sw_base.cxx 2009-12-19 21:19:44.939551918 -0800
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
#include <time.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
|
||||||
|
#ifndef __WIN32__
|
||||||
|
#include <netdb.h>
|
23
pkgs/development/libraries/ogrepaged/default.nix
Normal file
23
pkgs/development/libraries/ogrepaged/default.nix
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "ogre-paged-1.1.3";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://ogre-paged.googlecode.com/files/${name}.tar.gz";
|
||||||
|
sha256 = "1qqlkg17plk87dm3fsm34x8lkd5rxkhiz77ppcgc71a7z050vhjq";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ ois ogre libX11 boost ];
|
||||||
|
buildNativeInputs = [ cmake pkgconfig ];
|
||||||
|
|
||||||
|
cmakeFlags = "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF";
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Paged Geometry for Ogre3D";
|
||||||
|
homepage = http://code.google.com/p/ogre-paged/;
|
||||||
|
license = "MIT";
|
||||||
|
};
|
||||||
|
}
|
11
pkgs/development/libraries/zlib/latest.nix
Normal file
11
pkgs/development/libraries/zlib/latest.nix
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
|
# To be removed in stdenv-updates, as default.nix is already right there.
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "zlib-1.2.6";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://www.zlib.net/${name}.tar.gz";
|
||||||
|
sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
|
||||||
|
};
|
||||||
|
}
|
@ -1,16 +1,24 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
let
|
||||||
name = "ocaml-make-6.33.0";
|
|
||||||
|
version = "6.36.0";
|
||||||
|
sha256 = "7c9a771d79bf945050dc7530957f4b61669976177818185e64c002cbfd75e3a2";
|
||||||
|
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "ocaml-make-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.ocaml.info/ocaml_sources/ocaml-make-6.33.0.tar.gz";
|
url = "http://hg.ocaml.info/release/ocaml-make/archive/release-${version}.tar.bz2";
|
||||||
sha256 = "3054303ba04e4bbbe038e08310fabc3e5a0e3899bbba33d9ac5ed7a1b9d1e05a";
|
inherit sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
phases = [ "unpackPhase" "installPhase" ];
|
installPhase = ''
|
||||||
|
ensureDir "$out/include/"
|
||||||
|
cp OCamlMakefile "$out/include/"
|
||||||
|
'';
|
||||||
|
|
||||||
installPhase = "cp OCamlMakefile $out";
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://www.ocaml.info/home/ocaml_sources.html";
|
homepage = "http://www.ocaml.info/home/ocaml_sources.html";
|
||||||
|
5
pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
Normal file
5
pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
addOcamlMakefile () {
|
||||||
|
export OCAMLMAKEFILE="@out@/include/OCamlMakefile"
|
||||||
|
}
|
||||||
|
|
||||||
|
envHooks=(${envHooks[@]} addOcamlMakefile)
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591";
|
sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ocaml findlib python];
|
buildInputs = [ocaml findlib python ocaml_make];
|
||||||
|
|
||||||
createFindlibDestdir = true;
|
createFindlibDestdir = true;
|
||||||
|
|
||||||
@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
# fix some paths to the appropriate store paths.
|
# fix some paths to the appropriate store paths.
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}|g'
|
sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g'
|
||||||
sed -i "Makefile" -e's|/usr|${python}|g'
|
sed -i "Makefile" -e's|/usr|${python}|g'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
61
pkgs/development/tools/build-managers/cmake/2.8.7.nix
Normal file
61
pkgs/development/tools/build-managers/cmake/2.8.7.nix
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
|
||||||
|
, useNcurses ? false, ncurses, useQt4 ? false, qt4
|
||||||
|
, darwinInstallNameToolUtility }:
|
||||||
|
|
||||||
|
with stdenv.lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
os = stdenv.lib.optionalString;
|
||||||
|
majorVersion = "2.8";
|
||||||
|
minorVersion = "7";
|
||||||
|
version = "${majorVersion}.${minorVersion}";
|
||||||
|
in
|
||||||
|
|
||||||
|
# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
|
||||||
|
|
||||||
|
inherit majorVersion;
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
|
||||||
|
sha256 = "130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches =
|
||||||
|
# Don't search in non-Nix locations such as /usr, but do search in
|
||||||
|
# Nixpkgs' Glibc.
|
||||||
|
optional (stdenv ? glibc) ./search-path.patch;
|
||||||
|
|
||||||
|
buildInputs = [ curl expat zlib bzip2 libarchive ]
|
||||||
|
++ optional stdenv.isDarwin darwinInstallNameToolUtility
|
||||||
|
++ optional useNcurses ncurses
|
||||||
|
++ optional useQt4 qt4;
|
||||||
|
|
||||||
|
CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
|
||||||
|
|
||||||
|
configureFlags =
|
||||||
|
"--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
|
||||||
|
+ stdenv.lib.optionalString useQt4 " --qt-gui";
|
||||||
|
|
||||||
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
|
postUnpack =
|
||||||
|
''
|
||||||
|
dontUseCmakeConfigure=1
|
||||||
|
source $setupHook
|
||||||
|
fixCmakeFiles $sourceRoot
|
||||||
|
'';
|
||||||
|
|
||||||
|
preConfigure = optionalString (stdenv ? glibc)
|
||||||
|
''
|
||||||
|
substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.cmake.org/;
|
||||||
|
description = "Cross-Platform Makefile Generator";
|
||||||
|
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||||
|
};
|
||||||
|
}
|
@ -1,5 +1,11 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
|
let
|
||||||
|
bindir = if stdenv.system == "i686-linux" then "bin.linuxx86"
|
||||||
|
else if stdenv.system == "x86_64-linux" then "bin.linux"
|
||||||
|
else throw "Unsupported platform by now";
|
||||||
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "jam-2.5";
|
name = "jam-2.5";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -9,7 +15,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
ensureDir $out/bin
|
ensureDir $out/bin
|
||||||
cp bin.linux/jam $out/bin
|
cp ${bindir}/jam $out/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -15,6 +15,8 @@ cp -v $clojuresrc $out/lib
|
|||||||
patch --verbose $out_bin -p0 < $patches
|
patch --verbose $out_bin -p0 < $patches
|
||||||
chmod -v 755 $out_bin
|
chmod -v 755 $out_bin
|
||||||
|
|
||||||
|
patchShebangs $out
|
||||||
|
|
||||||
echo "Testing out \"lein version\"..."
|
echo "Testing out \"lein version\"..."
|
||||||
$out_bin version
|
$out_bin version
|
||||||
echo "Success."
|
echo "Success."
|
||||||
|
@ -2,17 +2,17 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "leiningen";
|
pname = "leiningen";
|
||||||
version = "1.6.2";
|
version = "1.7.0";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://raw.github.com/technomancy/leiningen/stable/bin/lein-pkg";
|
url = "https://raw.github.com/technomancy/leiningen/1.7.0/bin/lein-pkg";
|
||||||
sha256 = "e177a493ed0c4a7874f1391d5cc72cc1e541e55ed3d6e075feec87b5da6f8277";
|
sha256 = "1339f6ffc7bae3171174fc9eae990f5b9710ff2804038e931d531632c57f189c";
|
||||||
};
|
};
|
||||||
|
|
||||||
jarsrc = fetchurl {
|
jarsrc = fetchurl {
|
||||||
url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.6.2-standalone.jar";
|
url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.7.0-standalone.jar";
|
||||||
sha256 = "e35272556ece82d9a6a54b86266626da1b5f990ff556639dd7dd1025d6ed4226";
|
sha256 = "501eaa1c2a19ca4ffc2fde1776552cb513d69ee874abb547c40cee92156e50bf";
|
||||||
};
|
};
|
||||||
|
|
||||||
clojuresrc = fetchurl {
|
clojuresrc = fetchurl {
|
||||||
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||||||
homepage = https://github.com/technomancy/leiningen;
|
homepage = https://github.com/technomancy/leiningen;
|
||||||
description = "Project automation for Clojure";
|
description = "Project automation for Clojure";
|
||||||
license = "EPL";
|
license = "EPL";
|
||||||
|
|
||||||
platforms = stdenv.lib.platforms.unix;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
@ -1,15 +1,14 @@
|
|||||||
--- lein-pkg 2012-01-09 20:47:44.000000000 -0800
|
--- lein-pkg 2012-02-28 15:26:40.000000000 -0800
|
||||||
+++ lein-pkg-nix 2012-01-09 20:45:01.000000000 -0800
|
+++ lein-pkg-nix 2012-02-28 17:17:02.000000000 -0800
|
||||||
@@ -70,7 +70,7 @@
|
@@ -71,30 +71,14 @@
|
||||||
LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
|
LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
|
||||||
LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
|
LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
|
||||||
CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
|
CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
|
||||||
-CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
|
-CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
|
||||||
+CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar"
|
+CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar"
|
||||||
NULL_DEVICE=/dev/null
|
|
||||||
|
|
||||||
# apply context specific CLASSPATH entries
|
# apply context specific CLASSPATH entries
|
||||||
@@ -78,23 +78,7 @@
|
if [ -f .lein-classpath ]; then
|
||||||
CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
|
CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -26,11 +25,8 @@
|
|||||||
-
|
-
|
||||||
-# Do not use installed leiningen jar during self-compilation
|
-# Do not use installed leiningen jar during self-compilation
|
||||||
-if ! { [ "$1" = "compile" ] &&
|
-if ! { [ "$1" = "compile" ] &&
|
||||||
- grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
|
- grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
|
||||||
- project.clj ;}; then
|
- project.clj ;}; then
|
||||||
- CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
|
- CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
|
||||||
-fi
|
-fi
|
||||||
+CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*"
|
+CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*"
|
||||||
|
|
||||||
if [ $DEBUG ]; then
|
|
||||||
echo $CLASSPATH
|
|
||||||
|
52
pkgs/development/tools/documentation/doxygen/1.7.nix
Normal file
52
pkgs/development/tools/documentation/doxygen/1.7.nix
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
{ stdenv, fetchurl, perl, flex, bison, qt4 }:
|
||||||
|
|
||||||
|
let
|
||||||
|
name = "doxygen-1.7.4";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
inherit name;
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
|
||||||
|
sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [ ./tmake.patch ];
|
||||||
|
|
||||||
|
buildInputs =
|
||||||
|
[ perl flex bison ]
|
||||||
|
++ stdenv.lib.optional (qt4 != null) qt4;
|
||||||
|
|
||||||
|
prefixKey = "--prefix ";
|
||||||
|
|
||||||
|
configureFlags =
|
||||||
|
[ "--dot dot" ]
|
||||||
|
++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
|
||||||
|
|
||||||
|
preConfigure = stdenv.lib.optionalString (qt4 != null)
|
||||||
|
''
|
||||||
|
echo "using QTDIR=${qt4}..."
|
||||||
|
export QTDIR=${qt4}
|
||||||
|
'';
|
||||||
|
|
||||||
|
makeFlags = "MAN1DIR=share/man/man1";
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
license = "GPLv2+";
|
||||||
|
homepage = "http://doxygen.org/";
|
||||||
|
description = "Doxygen, a source code documentation generator tool";
|
||||||
|
|
||||||
|
longDescription = ''
|
||||||
|
Doxygen is a documentation system for C++, C, Java, Objective-C,
|
||||||
|
Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP,
|
||||||
|
C\#, and to some extent D. It can generate an on-line
|
||||||
|
documentation browser (in HTML) and/or an off-line reference
|
||||||
|
manual (in LaTeX) from a set of documented source files.
|
||||||
|
'';
|
||||||
|
|
||||||
|
maintainers = [stdenv.lib.maintainers.simons];
|
||||||
|
platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
|
||||||
|
};
|
||||||
|
}
|
@ -1,14 +1,14 @@
|
|||||||
{ stdenv, fetchurl, perl, flex, bison, qt4 }:
|
{ stdenv, fetchurl, perl, flex, bison, qt4 }:
|
||||||
|
|
||||||
let
|
let
|
||||||
name = "doxygen-1.7.4";
|
name = "doxygen-1.8.0";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit name;
|
inherit name;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
|
url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
|
||||||
sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44";
|
sha256 = "0cymkk8wpws326aqpsixyzr4pk98xgpzrvxxjm76ar79pcs91ykh";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./tmake.patch ];
|
patches = [ ./tmake.patch ];
|
||||||
|
20
pkgs/development/tools/haskell/haskdogs/default.nix
Normal file
20
pkgs/development/tools/haskell/haskdogs/default.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{ cabal, Cabal, filepath, HSH }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "haskdogs";
|
||||||
|
version = "0.3";
|
||||||
|
sha256 = "0aji59sazlhn5yardgrsdpf85fvb0mwn4bpslcjxr7mnmpa7j0kz";
|
||||||
|
isLibrary = false;
|
||||||
|
isExecutable = true;
|
||||||
|
buildDepends = [ Cabal filepath HSH ];
|
||||||
|
meta = {
|
||||||
|
homepage = "http://github.com/ierton/haskdogs";
|
||||||
|
description = "Generate ctags file for haskell project directory and it's deps";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [
|
||||||
|
self.stdenv.lib.maintainers.andres
|
||||||
|
self.stdenv.lib.maintainers.simons
|
||||||
|
];
|
||||||
|
};
|
||||||
|
})
|
19
pkgs/development/tools/haskell/hasktags/default.nix
Normal file
19
pkgs/development/tools/haskell/hasktags/default.nix
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{ cabal, filepath }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "hasktags";
|
||||||
|
version = "0.68.2";
|
||||||
|
sha256 = "0lb28vj8mhaskw3n7wpjgbj0311ywh76yc0ajczzsiqa3p6mypss";
|
||||||
|
isLibrary = false;
|
||||||
|
isExecutable = true;
|
||||||
|
buildDepends = [ filepath ];
|
||||||
|
meta = {
|
||||||
|
description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [
|
||||||
|
self.stdenv.lib.maintainers.andres
|
||||||
|
self.stdenv.lib.maintainers.simons
|
||||||
|
];
|
||||||
|
};
|
||||||
|
})
|
@ -1,7 +0,0 @@
|
|||||||
source $stdenv/setup
|
|
||||||
|
|
||||||
makeFlags="-e PREFIX=\"$out\""
|
|
||||||
|
|
||||||
ensureDir $out/bin
|
|
||||||
|
|
||||||
genericBuild
|
|
@ -1,11 +0,0 @@
|
|||||||
{stdenv, fetchurl, ghc}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "frown-0.6.1";
|
|
||||||
src = fetchurl {
|
|
||||||
url = http://www.informatik.uni-bonn.de/~ralf/frown/frown-0.6.1.tar.gz;
|
|
||||||
md5 = "b6fe9a8bf029c2a7c31b574be05816cf";
|
|
||||||
};
|
|
||||||
builder = ./builder.sh;
|
|
||||||
buildInputs = [ghc];
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, openssl, python, zlib, v8 }:
|
{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.6.10";
|
version = "0.6.10";
|
||||||
@ -17,11 +17,17 @@ stdenv.mkDerivation rec {
|
|||||||
"--shared-v8-libpath=${v8}/lib"
|
"--shared-v8-libpath=${v8}/lib"
|
||||||
];
|
];
|
||||||
|
|
||||||
patchPhase = ''
|
patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
|
||||||
|
|
||||||
|
prePatch = ''
|
||||||
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
|
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ python openssl v8 zlib];
|
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
|
install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Event-driven I/O framework for the V8 JavaScript engine";
|
description = "Event-driven I/O framework for the V8 JavaScript engine";
|
||||||
|
21
pkgs/development/web/nodejs/no-arch-flag.patch
Normal file
21
pkgs/development/web/nodejs/no-arch-flag.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff -Naur node-v0.6.10-orig/wscript node-v0.6.10/wscript
|
||||||
|
--- node-v0.6.10-orig/wscript 2012-02-02 19:56:42.000000000 -0500
|
||||||
|
+++ node-v0.6.10/wscript 2012-02-25 14:18:50.000000000 -0500
|
||||||
|
@@ -443,17 +443,6 @@
|
||||||
|
if sys.platform.startswith("darwin"):
|
||||||
|
# used by platform_darwin_*.cc
|
||||||
|
conf.env.append_value('LINKFLAGS', ['-framework','Carbon'])
|
||||||
|
- # cross compile for architecture specified by DEST_CPU
|
||||||
|
- if 'DEST_CPU' in conf.env:
|
||||||
|
- arch = conf.env['DEST_CPU']
|
||||||
|
- # map supported_archs to GCC names:
|
||||||
|
- arch_mappings = {'ia32': 'i386', 'x64': 'x86_64'}
|
||||||
|
- if arch in arch_mappings:
|
||||||
|
- arch = arch_mappings[arch]
|
||||||
|
- flags = ['-arch', arch]
|
||||||
|
- conf.env.append_value('CCFLAGS', flags)
|
||||||
|
- conf.env.append_value('CXXFLAGS', flags)
|
||||||
|
- conf.env.append_value('LINKFLAGS', flags)
|
||||||
|
if 'DEST_CPU' in conf.env:
|
||||||
|
arch = conf.env['DEST_CPU']
|
||||||
|
# TODO: -m32 is only available on 64 bit machines, so check host type
|
@ -1,21 +1,15 @@
|
|||||||
{ fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost,
|
{ fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost,
|
||||||
pkgconfig, libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
|
pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
|
||||||
angelscript
|
angelscript, caelum, ogrepaged, mysocketw, libxcb
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
/* version = "1780"; */
|
version = "0.39.4";
|
||||||
version = "0.37";
|
|
||||||
name = "rigsofrods-${version}";
|
name = "rigsofrods-${version}";
|
||||||
|
|
||||||
/* src = fetchsvn {
|
|
||||||
url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk;
|
|
||||||
rev = version;
|
|
||||||
}; */
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://sourceforge/rigsofrods/rigsofrods/0.37-dev/RoR-0.37.126-Sources.zip;
|
url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2;
|
||||||
sha256 = "03mxmxpfdlsri0j3nqgyj2pc4gpzs8zq8qgg6qhnyazi7j95j4mk";
|
sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx";
|
||||||
};
|
};
|
||||||
|
|
||||||
contentPackSrc = fetchurl {
|
contentPackSrc = fetchurl {
|
||||||
@ -26,45 +20,34 @@ stdenv.mkDerivation rec {
|
|||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
|
|
||||||
"-DROR_USE_CURL=TRUE"
|
"-DROR_USE_CURL=TRUE"
|
||||||
"-DROR_USE_MYGUI=TRUE"
|
"-DROR_USE_MYGUI=TRUE"
|
||||||
# "-DROR_USE_OPNEAL=TRUE"
|
"-DROR_USE_OPNEAL=TRUE"
|
||||||
# "-DROR_USE_MOFILEREADER=TRUE"
|
"-DROR_USE_CAELUM=TRUE"
|
||||||
# "-DROR_USE_CAELUM=TRUE"
|
"-DROR_USE_PAGED=TRUE"
|
||||||
# "-DROR_USE_PAGED=TRUE"
|
|
||||||
"-DROR_USE_ANGELSCRIPT=TRUE"
|
"-DROR_USE_ANGELSCRIPT=TRUE"
|
||||||
# "-DROR_USE_SOCKETW=TRUE"
|
"-DROR_USE_SOCKETW=TRUE"
|
||||||
|
"-DCMAKE_BUILD_TYPE=Release"
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../bin/plugins.cfg
|
sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
|
||||||
sed -e "/CgProgramManager/d" -i ../bin/plugins.cfg
|
|
||||||
ensureDir $out/share/rigsofrods
|
ensureDir $out/share/rigsofrods
|
||||||
cp -r .. $out/share/rigsofrods/build-dir
|
cp -r ../bin/* $out/share/rigsofrods
|
||||||
|
cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
|
||||||
ensureDir $out/bin
|
ensureDir $out/bin
|
||||||
for i in RoR rorconfig RoRViewer; do
|
ln -s $out/share/rigsofrods/{RoR,rorconfig} $out/bin
|
||||||
echo '#! ${stdenv.shell}' >> "$out/bin/$i"
|
cd $out/share/rigsofrods
|
||||||
if [ "$i" = "rorconfig" ]; then
|
mkdir packs
|
||||||
echo "[ -d \"\$HOME/.rigsofrods\" ] && cp -r '$out/share/rigsofrods/build-dirs/bin/skeleton' \"\$HOME/.rigsofrods\"" >> "$out/bin/$i"
|
cd packs
|
||||||
echo "chmod u+w -R \"\$HOME/.rigsofrods\"" >> "$out/bin/$i"
|
|
||||||
fi
|
|
||||||
echo "\"$out/share/rigsofrods/build-dir/bin/$i\"" >> "$out/bin/$i"
|
|
||||||
chmod a+x "$out/bin/$i"
|
|
||||||
done
|
|
||||||
cd $out/share/rigsofrods/build-dir/bin/
|
|
||||||
unzip "${contentPackSrc}"
|
unzip "${contentPackSrc}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure = ''
|
patches = [ ./doubleslash.patch ./paths.patch ];
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -langelscript -lgtk-x11-2.0"
|
|
||||||
sed -e 's@wxLOCALE_CONV_ENCODING@0@g' -i source/configurator/configurator.cpp
|
|
||||||
'';
|
|
||||||
|
|
||||||
# patches = [ ./wx.patch ];
|
|
||||||
|
|
||||||
buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
|
buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
|
||||||
libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript ];
|
libuuid openal ogre ois curl gtk mygui unzip angelscript
|
||||||
|
caelum ogrepaged mysocketw libxcb ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "3D simulator game where you can drive, fly and sail various vehicles";
|
description = "3D simulator game where you can drive, fly and sail various vehicles";
|
||||||
|
13
pkgs/games/rigsofrods/doubleslash.patch
Normal file
13
pkgs/games/rigsofrods/doubleslash.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/CMakeDependenciesConfig.txt b/CMakeDependenciesConfig.txt
|
||||||
|
index 447a440..e2562de 100644
|
||||||
|
--- a/CMakeDependenciesConfig.txt
|
||||||
|
+++ b/CMakeDependenciesConfig.txt
|
||||||
|
@@ -228,7 +228,7 @@ ELSEIF(UNIX)
|
||||||
|
# Paged Geometry
|
||||||
|
find_path(PAGED_INCLUDE_DIRS "PagedGeometry/PagedGeometry.h")
|
||||||
|
if(PAGED_INCLUDE_DIRS)
|
||||||
|
- set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};/${PAGED_INCLUDE_DIRS}/PagedGeometry")
|
||||||
|
+ set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};${PAGED_INCLUDE_DIRS}/PagedGeometry")
|
||||||
|
find_library(PAGED_LIBRARIES "PagedGeometry")
|
||||||
|
set(ROR_USE_PAGED ON)
|
||||||
|
else()
|
12
pkgs/games/rigsofrods/paths.patch
Normal file
12
pkgs/games/rigsofrods/paths.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/source/main/framework/ContentManager.cpp b/source/main/framework/ContentManager.cpp
|
||||||
|
index 0bfea8c..82cdab9 100644
|
||||||
|
--- a/source/main/framework/ContentManager.cpp
|
||||||
|
+++ b/source/main/framework/ContentManager.cpp
|
||||||
|
@@ -238,6 +238,7 @@ bool ContentManager::init(void)
|
||||||
|
#endif // USE_OPENAL
|
||||||
|
|
||||||
|
// and the content
|
||||||
|
+ ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("Program Path")+"packs", "FileSystem", "Packs", true);
|
||||||
|
ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"packs", "FileSystem", "Packs", true);
|
||||||
|
ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"mods", "FileSystem", "Packs", true);
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/source/configurator/configurator.cpp b/source/configurator/configurator.cpp
|
|
||||||
index c058820..5a4b316 100644
|
|
||||||
--- a/source/configurator/configurator.cpp
|
|
||||||
+++ b/source/configurator/configurator.cpp
|
|
||||||
@@ -2155,7 +2155,7 @@ void MyDialog::OnsightrangesliderScroll(wxScrollEvent &e)
|
|
||||||
int v = sightRange->GetValue();
|
|
||||||
if(v == sightRange->GetMax())
|
|
||||||
{
|
|
||||||
- s = "Unlimited";
|
|
||||||
+ s = _("Unlimited");
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
s.Printf(wxT("%i m"), v);
|
|
@ -3,17 +3,17 @@
|
|||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
name = "spring-lobby-${version}";
|
name = "spring-lobby-${version}";
|
||||||
version = "0.116";
|
version = "0.139";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
|
url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
|
||||||
sha256 = "04gb2dc2xc0lj2d14jzz330kn5faffdz3xph9bg2m68b28fv0xsk";
|
sha256 = "0ibvv2p4c0qa933mr3hfn5lp8c6h1dycl6k6i1n2gvpa8jr598m5";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost ];
|
buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost ];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
substituteInPlace tools/regen_config_header.sh --replace "#!/bin/bash" "#!${bash}/bin/bash"
|
substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||||
substituteInPlace tools/test-susynclib.awk --replace "#!/usr/bin/awk" "#!${gawk}/bin/awk"
|
substituteInPlace tools/test-susynclib.awk --replace "#!/usr/bin/awk" "#!${gawk}/bin/awk"
|
||||||
substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system"
|
substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system"
|
||||||
'';
|
'';
|
||||||
@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
|
|||||||
description = "A free cross-platform lobby client for the Spring RTS project.";
|
description = "A free cross-platform lobby client for the Spring RTS project.";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = [ maintainers.phreedom ];
|
maintainers = [ maintainers.phreedom ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
@ -42,7 +42,7 @@ rec {
|
|||||||
else if x == null then "x is null"
|
else if x == null then "x is null"
|
||||||
else if isInt x then "x is an integer `${toString x}'"
|
else if isInt x then "x is an integer `${toString x}'"
|
||||||
else if isString x then "x is a string `${substring 0 50 x}...'"
|
else if isString x then "x is a string `${substring 0 50 x}...'"
|
||||||
else "x is probably a path `${substring 0 50 (toString x)}'";
|
else "x is probably a path `${substring 0 50 (toString x)}...'";
|
||||||
|
|
||||||
# trace the arguments passed to function and its result
|
# trace the arguments passed to function and its result
|
||||||
# maybe rewrite these functions in a traceCallXml like style. Then one function is enough
|
# maybe rewrite these functions in a traceCallXml like style. Then one function is enough
|
||||||
|
@ -45,7 +45,7 @@ mkDerivation {
|
|||||||
# the buildNativeInputs environment variable.
|
# the buildNativeInputs environment variable.
|
||||||
buildNativeInputs = [ ] ++ buildInputs ;
|
buildNativeInputs = [ ] ++ buildInputs ;
|
||||||
name = "env-${name}";
|
name = "env-${name}";
|
||||||
phases = [ "buildPhase" ];
|
phases = [ "buildPhase" "fixupPhase" ];
|
||||||
setupNew = substituteAll {
|
setupNew = substituteAll {
|
||||||
src = ../../stdenv/generic/setup.sh;
|
src = ../../stdenv/generic/setup.sh;
|
||||||
preHook="";
|
preHook="";
|
||||||
@ -56,7 +56,7 @@ mkDerivation {
|
|||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
set -x
|
set -x
|
||||||
mkdir -p "$out/dev-envs" "$out/nix-support"
|
mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin"
|
||||||
s="$out/nix-support/setup-new-modified"
|
s="$out/nix-support/setup-new-modified"
|
||||||
cp "$setupNew" "$s"
|
cp "$setupNew" "$s"
|
||||||
# shut some warning up.., do not use set -e
|
# shut some warning up.., do not use set -e
|
||||||
@ -111,6 +111,12 @@ mkDerivation {
|
|||||||
export PATH
|
export PATH
|
||||||
echo $name loaded
|
echo $name loaded
|
||||||
EOF
|
EOF
|
||||||
exit 0
|
|
||||||
|
cat >> "$out/bin/load-''${name/env-/}-env" << EOF
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
source "$out/dev-envs/''${name/env-/}"
|
||||||
|
EOF
|
||||||
|
chmod +x "$out/bin/load-''${name/env-/}-env"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
@ -10,16 +10,14 @@ stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
kernelVersion=$(cd ${kernel}/lib/modules && ls)
|
|
||||||
sed -e 's/break/true/' -i test_off.sh
|
sed -e 's/break/true/' -i test_off.sh
|
||||||
sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh
|
sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh
|
||||||
sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/$kernelVersion@" -i Makefile
|
sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.version}@" -i Makefile
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
kernelVersion=$(cd ${kernel}/lib/modules && ls)
|
ensureDir $out/lib/modules/${kernel.version}/misc
|
||||||
ensureDir $out/lib/modules/$kernelVersion/misc
|
cp acpi_call.ko $out/lib/modules/${kernel.version}/misc
|
||||||
cp acpi_call.ko $out/lib/modules/$kernelVersion/misc
|
|
||||||
ensureDir $out/bin
|
ensureDir $out/bin
|
||||||
cp test_off.sh $out/bin/test_discrete_video_off.sh
|
cp test_off.sh $out/bin/test_discrete_video_off.sh
|
||||||
'';
|
'';
|
||||||
|
93
pkgs/os-specific/linux/apparmor/default.nix
Normal file
93
pkgs/os-specific/linux/apparmor/default.nix
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
{ stdenv, fetchurl
|
||||||
|
, autoconf, automake, libtool, makeWrapper
|
||||||
|
, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext, bash, pam, TermReadKey, RpcXML, swig}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
|
name = "apparmor-${version}";
|
||||||
|
version = "2.6.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://launchpad.net/apparmor/2.6/2.6.1/+download/${name}.tar.gz";
|
||||||
|
sha256 = "1x7225xgzyc5agbn41xsip236anr1kmaw70xc94pag82q7c1bc4w";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ autoconf automake libtool perl bison flex gettext which rpm tetex LocaleGettext pam TermReadKey RpcXML swig makeWrapper ];
|
||||||
|
|
||||||
|
prePatch = ''
|
||||||
|
substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc}/include"
|
||||||
|
substituteInPlace libraries/libapparmor/src/Makefile.am --replace "/usr/include" "${glibc}/include"
|
||||||
|
substituteInPlace common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
|
||||||
|
substituteInPlace common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
|
||||||
|
|
||||||
|
substituteInPlace parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
|
||||||
|
substituteInPlace parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
|
||||||
|
substituteInPlace parser/Makefile --replace "/usr/include/bits/socket.h" "${glibc}/include/bits/socket.h"
|
||||||
|
substituteInPlace parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
|
||||||
|
|
||||||
|
substituteInPlace parser/tst/gen-xtrans.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
|
||||||
|
substituteInPlace parser/tst/Makefile --replace "/usr/bin/prove" "${perl}/bin/prove"
|
||||||
|
substituteInPlace parser/tst/Makefile --replace "./caching.sh" "${bash}/bin/bash ./caching.sh"
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildPhase =''
|
||||||
|
PERL5LIB=$PERL5LIB:$out/lib/perl5/site_perl:$out/lib
|
||||||
|
|
||||||
|
cd libraries/libapparmor
|
||||||
|
./autogen.sh
|
||||||
|
./configure --prefix=$out --with-perl # see below
|
||||||
|
make
|
||||||
|
make check
|
||||||
|
make install
|
||||||
|
ensureDir $out/lib/perl5/site_perl/
|
||||||
|
cp swig/perl/LibAppArmor.pm $out/lib/perl5/site_perl/
|
||||||
|
cp swig/perl/LibAppArmor.bs $out/lib/perl5/site_perl/
|
||||||
|
# this is automatically copied elsewhere....
|
||||||
|
|
||||||
|
cd ../../utils
|
||||||
|
make
|
||||||
|
make install DESTDIR=$out BINDIR=$out/bin VENDOR_PERL=/lib/perl5/site_perl
|
||||||
|
|
||||||
|
cd ../parser
|
||||||
|
make
|
||||||
|
make install DESTDIR=$out DISTRO=unknown
|
||||||
|
|
||||||
|
# cd ../changehat/mod_apparmor
|
||||||
|
# make # depends on libapparmor having been built first
|
||||||
|
# make install
|
||||||
|
|
||||||
|
cd ../changehat/pam_apparmor
|
||||||
|
make # depends on libapparmor having been built first
|
||||||
|
make install DESTDIR=$out
|
||||||
|
|
||||||
|
cd ../../profiles
|
||||||
|
LD_LIBRARY_PATH=$out/lib make
|
||||||
|
#LD_LIBRARY_PATH=$out/lib make check # depends on the parser having been built first
|
||||||
|
make install DESTDIR=$out
|
||||||
|
|
||||||
|
'';
|
||||||
|
installPhase = ''
|
||||||
|
for i in $out/bin/*; do
|
||||||
|
wrapProgram $i --prefix PERL5LIB : "$PERL5LIB:$out/lib/perl5/5.10.1/i686-linux-thread-multi/"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
passthru = {
|
||||||
|
linux_2_6_37_patch = {
|
||||||
|
name= "apparmor";
|
||||||
|
features.apparmor = true;
|
||||||
|
patch = [
|
||||||
|
"${src}/kernel-patches/2.6.37/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch"
|
||||||
|
"${src}/kernel-patches/2.6.37/0002-AppArmor-compatibility-patch-for-v5-interface.patch"
|
||||||
|
"${src}/kernel-patches/2.6.37/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = http://apparmor.net/;
|
||||||
|
description = "A Linux application security system";
|
||||||
|
license = licenses.gpl2;
|
||||||
|
maintainers = [ maintainers.phreedom ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -17,14 +17,13 @@ stdenv.mkDerivation {
|
|||||||
preBuild = ''
|
preBuild = ''
|
||||||
kernelVersion=$(cd ${kernel}/lib/modules && ls)
|
kernelVersion=$(cd ${kernel}/lib/modules && ls)
|
||||||
substituteInPlace Makefile \
|
substituteInPlace Makefile \
|
||||||
--replace "\$(shell uname -r)" "$kernelVersion" \
|
--replace "\$(shell uname -r)" "${kernel.version}" \
|
||||||
--replace "/lib/modules" "${kernel}/lib/modules"
|
--replace "/lib/modules" "${kernel}/lib/modules"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
kernelVersion=$(cd ${kernel}/lib/modules && ls)
|
ensureDir $out/lib/modules/${kernel.version}/misc
|
||||||
ensureDir $out/lib/modules/$kernelVersion/misc
|
cp bbswitch.ko $out/lib/modules/${kernel.version}/misc
|
||||||
cp bbswitch.ko $out/lib/modules/$kernelVersion/misc
|
|
||||||
|
|
||||||
ensureDir $out/bin
|
ensureDir $out/bin
|
||||||
tee $out/bin/discrete_vga_poweroff << EOF
|
tee $out/bin/discrete_vga_poweroff << EOF
|
||||||
|
39
pkgs/os-specific/linux/gogoclient/config-paths.patch
Normal file
39
pkgs/os-specific/linux/gogoclient/config-paths.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
diff -urN gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in
|
||||||
|
--- gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in 2009-11-20 17:53:12.000000000 +0100
|
||||||
|
+++ gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in 2012-02-25 15:16:12.758849219 +0100
|
||||||
|
@@ -224,7 +224,7 @@
|
||||||
|
#
|
||||||
|
# broker_list=<file_name>
|
||||||
|
#
|
||||||
|
-broker_list=tsp-broker-list.txt
|
||||||
|
+broker_list=/var/lib/gogoc/tsp-broker-list.txt
|
||||||
|
|
||||||
|
#
|
||||||
|
# Last Server Used File Name:
|
||||||
|
@@ -234,7 +234,7 @@
|
||||||
|
#
|
||||||
|
# last_server=<file_name>
|
||||||
|
#
|
||||||
|
-last_server=tsp-last-server.txt
|
||||||
|
+last_server=/var/lib/gogoc/tsp-last-server.txt
|
||||||
|
|
||||||
|
#
|
||||||
|
# Always Use Last Known Working Server:
|
||||||
|
@@ -294,7 +294,7 @@
|
||||||
|
#
|
||||||
|
# log_filename=<file_name>
|
||||||
|
#
|
||||||
|
-log_filename=gogoc.log
|
||||||
|
+log_filename=/var/log/gogoc.log
|
||||||
|
|
||||||
|
#
|
||||||
|
# Log File Rotation:
|
||||||
|
@@ -313,7 +313,7 @@
|
||||||
|
#
|
||||||
|
# log_rotation=<yes|no>
|
||||||
|
#
|
||||||
|
-log_rotation=yes
|
||||||
|
+log_rotation=no
|
||||||
|
|
||||||
|
#
|
||||||
|
# Log File Rotation Size:
|
38
pkgs/os-specific/linux/gogoclient/default.nix
Normal file
38
pkgs/os-specific/linux/gogoclient/default.nix
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
{stdenv, fetchurl, openssl, nettools, iproute, procps}:
|
||||||
|
|
||||||
|
let baseName = "gogoclient";
|
||||||
|
version = "1.2";
|
||||||
|
in
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "${baseName}-${version}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz;
|
||||||
|
sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49";
|
||||||
|
};
|
||||||
|
patches = [./gcc46-include-fix.patch ./config-paths.patch ];
|
||||||
|
makeFlags = ["target=linux"];
|
||||||
|
installFlags = ["installdir=$(out)"];
|
||||||
|
|
||||||
|
buildInputs = [openssl];
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
ensureDir $out/share/${name}
|
||||||
|
chmod 444 $out/bin/gogoc.conf
|
||||||
|
mv $out/bin/gogoc.conf $out/share/${name}/gogoc.conf.sample
|
||||||
|
rm $out/bin/gogoc.conf.sample
|
||||||
|
|
||||||
|
substituteInPlace "$out/template/linux.sh" \
|
||||||
|
--replace "/sbin/ifconfig" "${nettools}/sbin/ifconfig" \
|
||||||
|
--replace "/sbin/route" "${nettools}/sbin/route" \
|
||||||
|
--replace "/sbin/ip" "${iproute}/sbin/ip" \
|
||||||
|
--replace "/sbin/sysctl" "${procps}/sbin/sysctl"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://gogonet.gogo6.com;
|
||||||
|
description = "Client to connect to the Freenet6 IPv6 tunnel broker service";
|
||||||
|
maintainers = [stdenv.lib.maintainers.bluescreen303];
|
||||||
|
};
|
||||||
|
}
|
22
pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch
Normal file
22
pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc
|
||||||
|
--- gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc 2009-11-20 17:34:55.000000000 +0100
|
||||||
|
+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc 2012-02-25 15:06:20.764698284 +0100
|
||||||
|
@@ -15,6 +15,7 @@
|
||||||
|
// **************************************************************************
|
||||||
|
#include <gogocmessaging/clientmsgsender.h>
|
||||||
|
#include <assert.h>
|
||||||
|
+#include <stddef.h>
|
||||||
|
|
||||||
|
|
||||||
|
namespace gogocmessaging
|
||||||
|
diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc
|
||||||
|
--- gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc 2009-11-20 17:34:56.000000000 +0100
|
||||||
|
+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc 2012-02-25 15:06:36.722740288 +0100
|
||||||
|
@@ -15,6 +15,7 @@
|
||||||
|
// **************************************************************************
|
||||||
|
#include <gogocmessaging/servermsgsender.h>
|
||||||
|
#include <assert.h>
|
||||||
|
+#include <stddef.h>
|
||||||
|
|
||||||
|
|
||||||
|
namespace gogocmessaging
|
33
pkgs/os-specific/linux/mcelog/default.nix
Normal file
33
pkgs/os-specific/linux/mcelog/default.nix
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
{ stdenv, fetchgit }:
|
||||||
|
|
||||||
|
# Shows the machine check exceptions logged by the kernel.
|
||||||
|
# E.g. a log is generated when intel processors cpu-throttle.
|
||||||
|
|
||||||
|
# The releases of this package are no longer on kernel.org
|
||||||
|
# hence we fetch them from github. Apparently, these
|
||||||
|
# are also more recent.
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2";
|
||||||
|
version = "1.0pre-${rev}";
|
||||||
|
sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7";
|
||||||
|
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
|
||||||
|
name = "mcelog-${version}";
|
||||||
|
|
||||||
|
src = fetchgit {
|
||||||
|
url = "https://github.com/andikleen/mcelog";
|
||||||
|
inherit sha256;
|
||||||
|
inherit rev;
|
||||||
|
};
|
||||||
|
|
||||||
|
makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Tool to display logged machine check exceptions";
|
||||||
|
homepage = http://mcelog.org/;
|
||||||
|
license = stdenv.lib.licenses.gpl2;
|
||||||
|
};
|
||||||
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user