Merge remote-tracking branch 'upstream/master' into master_clean
This commit is contained in:
Jack Cummings
commit
663a21a8bd
|
|
@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
|
|||
|
||||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20121017";
|
||||
version = "3.20121212";
|
||||
|
||||
lib = stdenv.lib;
|
||||
in
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
|
||||
sha256 = "c0bb6ef9340ebc7eec40812b091700b2bcfd61e7321a22f41026ce130e877028";
|
||||
sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz";
|
||||
};
|
||||
|
||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "kadu-0.10.1";
|
||||
name = "kadu-0.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2;
|
||||
sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g";
|
||||
url = http://download.kadu.im/stable/kadu-0.12.2.tar.bz2;
|
||||
sha256 = "0rqhkiyn8c7jigpxmvwh7daxsgjxlvd16zjdss1azdzd9x2dbym1";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig
|
||||
|
|
@ -21,8 +21,12 @@ stdenv.mkDerivation {
|
|||
patchShebangs .
|
||||
'';
|
||||
|
||||
# because I was not able to get those working
|
||||
patches = [ ./disable_some_plugins.patch ];
|
||||
# Disable the kadu plugins I wasn't able to get to work
|
||||
patchPhase = ''
|
||||
sed -i -e '/mpd_mediaplayer/d' \
|
||||
-e '/encryption_ng/d' \
|
||||
-e '/encryption_ng_simlite/d' Plugins.cmake
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS="-lX11";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
diff --git a/Plugins.cmake b/Plugins.cmake
|
||||
index ad63f20..c14a781 100644
|
||||
--- a/Plugins.cmake
|
||||
+++ b/Plugins.cmake
|
||||
@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
|
||||
|
||||
# encryption
|
||||
# Encrypted chat support
|
||||
- encryption_ng
|
||||
+ # encryption_ng
|
||||
# OpenSSL encrypted chat support
|
||||
- encryption_ng_simlite
|
||||
+ # encryption_ng_simlite
|
||||
|
||||
# docking
|
||||
# Tray icon support (common part of all docking modules)
|
||||
@@ -104,9 +104,9 @@ if (UNIX)
|
||||
|
||||
# mediaplayer
|
||||
# MPD mediaplayer support
|
||||
- mpd_mediaplayer
|
||||
+ # mpd_mediaplayer
|
||||
# MPRIS Media Players support
|
||||
- mprisplayer_mediaplayer
|
||||
+ # mprisplayer_mediaplayer
|
||||
)
|
||||
endif (UNIX)
|
||||
|
||||
|
|
@ -1,20 +1,27 @@
|
|||
{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
|
||||
, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }:
|
||||
, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
|
||||
, pythonPackages, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.9";
|
||||
version = "0.3.9.2";
|
||||
name = "weechat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://weechat.org/files/src/${name}.tar.gz";
|
||||
sha256 = "8666c788cbb212036197365df3ba3cf964a23e4f644d76ea51d66dbe3be593bb";
|
||||
sha256 = "114cffqwnrqx8r4dslz7sc4i4ky4akzh863rnzaw3dnn9ky9r503";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
|
||||
libgcrypt ruby lua5 tcl guile
|
||||
libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/weechat-curses" \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
--prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://http://www.weechat.org/;
|
||||
description = "A fast, light and extensible chat client";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
|
||||
, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext
|
||||
}:
|
||||
|
||||
let
|
||||
name = "celestia-1.6.1";
|
||||
|
||||
gcc46Patch = fetchurl {
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-gcc46.patch?h=packages/celestia";
|
||||
sha256 = "1q840ip5h2q93r0d68jwrvf40ns5qzqss9vzd6xnwvs3wa77m5wp";
|
||||
name = "celestia-1.6.1-gcc46.patch";
|
||||
};
|
||||
|
||||
libpng15Patch = fetchurl {
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-libpng15.patch?h=packages/celestia";
|
||||
sha256 = "19yqbi5k944d3jm0q2mvcfg52kicy4j347gj62dyaijzj505x4pm";
|
||||
name = "celestia-1.6.1-libpng15.patch";
|
||||
};
|
||||
|
||||
linkingPatch = fetchurl {
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-linking.patch?h=packages/celestia";
|
||||
sha256 = "1qzv18b2prqbhy21js5bnf7vwkmrq1dmrq8r0wab7v10axjqdv35";
|
||||
name = "celestia-1.6.1-linking.patch";
|
||||
};
|
||||
|
||||
gcc47Patch = fetchurl {
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc-4.7-fixes.diff?h=packages/celestia";
|
||||
sha256 = "1jqkafwrg1829cwqvlxxkqbf42zqfsgpqd8a5b2qlzma5napdmg5";
|
||||
name = "gcc-4.7-fixes.diff";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/celestia/${name}.tar.gz";
|
||||
sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk";
|
||||
};
|
||||
|
||||
buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua
|
||||
perl automake autoconf libtool gettext ];
|
||||
|
||||
patchPhase = ''
|
||||
patch -Np0 -i "${gcc46Patch}"
|
||||
patch -Np0 -i "${libpng15Patch}"
|
||||
patch -Np1 -i "${linkingPatch}"
|
||||
patch -Np1 -i "${gcc47Patch}"
|
||||
autoreconf
|
||||
configureFlagsArray=( --with-gtk --with-lua=${lua} CFLAGS="-O2 -fsigned-char" CXXFLAGS="-O2 -fsigned-char" )
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Free space simulation";
|
||||
homepage = "http://www.shatters.net/celestia/";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,11 +9,11 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hol_light-20120529";
|
||||
name = "hol_light-20121213";
|
||||
src = fetchsvn {
|
||||
url = http://hol-light.googlecode.com/svn/trunk;
|
||||
rev = "141";
|
||||
sha256 = "a11d7e5db7c6035a2debcf9e73f43c6322389aeac5bc4d123ebf58918052a57f";
|
||||
rev = "153";
|
||||
sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib camlp5 ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, fetchurl, jre }:
|
||||
|
||||
let version = "2.7.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "logisim-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar";
|
||||
sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
cp -v $src $out/logisim.jar
|
||||
|
||||
cat > $out/bin/logisim << EOF
|
||||
#!${stdenv.shell}
|
||||
${jre}/bin/java -jar $out/logisim.jar
|
||||
EOF
|
||||
|
||||
chmod +x $out/bin/logisim
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://ozark.hendrix.edu/~burch/logisim";
|
||||
description = "Logisim is an educational tool for designing and simulating digital logic circuits.";
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "i3-${version}";
|
||||
version = "4.3";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://i3wm.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "895bf586092535efb2bc723ba599c71a027768115e56052f111fc8bb148db925";
|
||||
sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr";
|
||||
};
|
||||
|
||||
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, x11, lua, gettext, groff }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ion-3rc-20070902";
|
||||
name = "ion-3-20090110";
|
||||
meta = {
|
||||
description = "Ion is a tiling tabbed window manager designed with keyboard users in mind.";
|
||||
homepage = http://modeemi.fi/~tuomov/ion;
|
||||
};
|
||||
src = fetchurl {
|
||||
url = http://iki.fi/tuomov/dl/ion-3rc-20070902.tar.gz;
|
||||
sha256 = "062a0rgxzz4h1hih5lp7l2nfvhz095brag9fmnanzqc4dac228xl";
|
||||
url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz;
|
||||
sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
|
||||
};
|
||||
buildInputs = [ x11 lua gettext groff ];
|
||||
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ ensure_version () {
|
|||
|
||||
ensure_target () {
|
||||
echo "Ensuring target. CURRENT_TARGET: $CURRENT_TARGET" >&2
|
||||
[ -z "$CURRENT_TARGET" ] && target default.nix
|
||||
[ -z "$CURRENT_TARGET" ] && target "$(basename "$CONFIG_NAME" .upstream).nix"
|
||||
}
|
||||
|
||||
ensure_name () {
|
||||
|
|
@ -152,8 +152,7 @@ full_path () {
|
|||
|
||||
target () {
|
||||
CURRENT_TARGET="$1"
|
||||
test -e "$CURRENT_TARGET" ||
|
||||
{ [ "$CURRENT_TARGET" = "${CURRENT_TARGET#/}" ] && CURRENT_TARGET="$CONFIG_DIR/$CURRENT_TARGET"; }
|
||||
{ [ "$CURRENT_TARGET" = "${CURRENT_TARGET#/}" ] && CURRENT_TARGET="$CONFIG_DIR/$CURRENT_TARGET"; }
|
||||
echo "Target set to: $CURRENT_TARGET"
|
||||
}
|
||||
|
||||
|
|
@ -190,6 +189,12 @@ replace_once () {
|
|||
replacement="$3"
|
||||
instance="${4:-1}"
|
||||
|
||||
echo "Replacing once:"
|
||||
echo "file: [[$file]]"
|
||||
echo "regexp: [[$regexp]]"
|
||||
echo "replacement: [[$replacement]]"
|
||||
echo "instance: [[$instance]]"
|
||||
|
||||
position="$(line_position "$file" "$regexp" "$instance")"
|
||||
sed -re "${position}s $regexp $replacement " -i "$file"
|
||||
}
|
||||
|
|
@ -204,7 +209,7 @@ set_var_value () {
|
|||
quote='"'
|
||||
let "$no_quotes" && quote=""
|
||||
|
||||
replace_once "$file" "${var} *= *.*" "${var} = ${quote}${value}${quote};"
|
||||
replace_once "$file" "${var} *= *.*" "${var} = ${quote}${value}${quote};" "$instance"
|
||||
}
|
||||
|
||||
do_regenerate () {
|
||||
|
|
@ -227,8 +232,9 @@ do_overwrite () {
|
|||
|
||||
process_config () {
|
||||
CONFIG_DIR="$(directory_of "$1")"
|
||||
CONFIG_NAME="$(basename "$1")"
|
||||
BEGIN_EXPRESSION='# Generated upstream information';
|
||||
source "$CONFIG_DIR/$(basename "$1")"
|
||||
source "$CONFIG_DIR/$CONFIG_NAME"
|
||||
ensure_name
|
||||
ensure_attribute_name
|
||||
retrieve_version
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "1.0.2";
|
||||
name = "arduino-core";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://arduino.googlecode.com/files/arduino-${version}-src.tar.gz";
|
||||
sha256 = "0nszl2hdjjgxk87gyk0xi0ww9grbq83hch3iqmpaf9yp4y9bra0x";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk ant ];
|
||||
|
||||
phases = "unpackPhase patchPhase buildPhase installPhase";
|
||||
|
||||
patchPhase = ''
|
||||
#
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
cd ./core && ant
|
||||
cd ../build && ant
|
||||
cd ..
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/arduino
|
||||
cp -r ./build/linux/work/hardware/ $out/share/arduino
|
||||
cp -r ./build/linux/work/libraries/ $out/share/arduino
|
||||
cp -r ./build/linux/work/tools/ $out/share/arduino
|
||||
cp -r ./build/linux/work/lib/ $out/share/arduino
|
||||
echo ${version} > $out/share/arduino/lib/version.txt
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Arduino libraries";
|
||||
homepage = http://arduino.cc/;
|
||||
license = "GPL";
|
||||
maintainers = [ stdenv.lib.maintainers.antono ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core, avrgcclibc }:
|
||||
|
||||
buildPythonPackage {
|
||||
name = "ino-0.3.4";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/i/ino/ino-0.3.4.tar.gz";
|
||||
sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv";
|
||||
};
|
||||
|
||||
# TODO: add avrgcclibc, it must be rebuild with C++ support
|
||||
propagatedBuildInputs = [ minicom avrdude arduino_core ];
|
||||
|
||||
patchPhase = ''
|
||||
echo "Patching Arduino distribution path"
|
||||
sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' ino/environment.py
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Command line toolkit for working with Arduino hardware";
|
||||
homepage = http://inotool.org/;
|
||||
license = "MIT";
|
||||
maintainers = [ stdenv.lib.maintainers.antono ];
|
||||
};
|
||||
}
|
||||
|
|
@ -89,9 +89,11 @@ let version = "4.7.2";
|
|||
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
|
||||
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
|
||||
gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
|
||||
gccMode = stdenv.lib.attrByPath [ "gcc" "mode" ] null cross;
|
||||
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
|
||||
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
|
||||
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
|
||||
withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
|
||||
crossMingw = (cross != null && cross.libc == "msvcrt");
|
||||
|
||||
crossConfigureFlags =
|
||||
|
|
@ -99,6 +101,7 @@ let version = "4.7.2";
|
|||
withArch +
|
||||
withCpu +
|
||||
withAbi +
|
||||
withMode +
|
||||
(if (crossMingw && crossStageStatic) then
|
||||
" --with-headers=${libcCross}/include" +
|
||||
" --with-gcc" +
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
{ stdenv, fetchurl, readline}:
|
||||
|
||||
let
|
||||
dsoPatch = fetchurl {
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51";
|
||||
sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw";
|
||||
name = "lua-arch.patch";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lua-5.1.5";
|
||||
|
||||
|
|
@ -10,7 +17,19 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ readline ];
|
||||
|
||||
configurePhase = "makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux )";
|
||||
patches = [ dsoPatch ];
|
||||
|
||||
configurePhase = ''
|
||||
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" )
|
||||
installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1" INSTALL_DATA='cp -d' )
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
|
||||
mv "etc/lua.pc" "$out/lib/pkgconfig/"
|
||||
mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
|
||||
rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.lua.org";
|
||||
|
|
@ -25,6 +44,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = "MIT";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Boolean";
|
||||
version = "0.1.1";
|
||||
sha256 = "1id075slxgz67gv382vpr7cr19i59bjajvb60iv2xrhh73gp08yv";
|
||||
version = "0.1.2";
|
||||
sha256 = "07mhg9zf98hlm7qq9gdbrq68a8rpvdby1jwmgrvf3nv2k47dimx6";
|
||||
meta = {
|
||||
description = "Generalized booleans";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
cabal.mkDerivation (self: {
|
||||
pname = "bloomfilter";
|
||||
version = "1.2.6.10";
|
||||
sha256 = "1z2jc7588fkv42dxf0dxsrgk5pmj3xapshy1vyfwipp1q6y20x4j";
|
||||
sha256 = "162vp9riwf5q2l1hnw3g157fpwnw185fk41hkgyf8qaavcrz6slv";
|
||||
buildDepends = [ deepseq ];
|
||||
meta = {
|
||||
homepage = "https://github.com/bos/bloomfilter";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bmp";
|
||||
version = "1.2.3.2";
|
||||
sha256 = "0lr6ys15ap3myzv48xmcy0bv17s4x2drskqz3kmbp06knrx9y1bh";
|
||||
version = "1.2.3.4";
|
||||
sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6";
|
||||
buildDepends = [ binary ];
|
||||
meta = {
|
||||
homepage = "http://code.ouroborus.net/bmp";
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "configurator";
|
||||
version = "0.2.0.1";
|
||||
sha256 = "02w6f5q2xkpc3kgqz6a58g7yr0q4xd8ck1b6lr64ahvqwsjbxy6p";
|
||||
version = "0.2.0.2";
|
||||
sha256 = "011rgd48gv4idkh2dwg4mlyx3s6pgm1263xq5ixsa4sg3jqh9d8b";
|
||||
buildDepends = [
|
||||
attoparsec hashable text unixCompat unorderedContainers
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cryptohash";
|
||||
version = "0.8.1";
|
||||
sha256 = "1xxnmxfpd77ahyjhy2fq3fxhiivhj6k12v1z72ndyhrd3369zqky";
|
||||
version = "0.8.2";
|
||||
sha256 = "0mym1q5sa1pqfffy0p8v12lfim1dlaczppw3c3wjhxgs222303wj";
|
||||
buildDepends = [ cereal cryptoApi tagged ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-cryptohash";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "diagrams-contrib";
|
||||
version = "0.6";
|
||||
sha256 = "059ljwsbrkzj2wvx9q4viinz46nw5lf4yjmx2c1dmwaqfz3i7j7i";
|
||||
version = "0.6.0.1";
|
||||
sha256 = "1wrfdsfb2yj93wq2ykxjyg6g0q56bmxd2rc6r3gd0zcs8kiimaar";
|
||||
buildDepends = [
|
||||
colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hamlet";
|
||||
version = "1.1.2";
|
||||
sha256 = "0k6wnjqmap4wv0p1hvzpd8br4wr4vda9aw87agzf7pix6hwmiybq";
|
||||
version = "1.1.3.1";
|
||||
sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
|
||||
];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
{ cabal, text }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hashable";
|
||||
version = "1.2.0.2";
|
||||
sha256 = "1l827sh7v2jls2gcbxgbvz5hacwi43bcrxwmd3wp92hfwy1yza65";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/tibbe/hashable";
|
||||
description = "A class for types that can be converted to a hash value";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "heist";
|
||||
version = "0.10.1";
|
||||
sha256 = "1rwik8x2bfb0474vc1wzbqlhjgas3089g1rvphs7irfbmyki1646";
|
||||
version = "0.10.2";
|
||||
sha256 = "13v9x5dph52xddkb2dy4gfrapvihf1881fin996ag0snbma3wh68";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
|
||||
filepath hashable MonadCatchIOTransformers mtl random text time
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hsemail";
|
||||
version = "1.7.2";
|
||||
sha256 = "1bl017gfyvjvxs9z1fns6sknk1l55905r82i31aqbz9qyaj70gzx";
|
||||
version = "1.7.3";
|
||||
sha256 = "0i9qh4rbgcgpjiz7nj8rrmj0ai53s420dskfvwrbwl4j6z67f7la";
|
||||
buildDepends = [ mtl parsec ];
|
||||
meta = {
|
||||
homepage = "http://gitorious.org/hsemail";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hslogger-template";
|
||||
version = "2.0.1";
|
||||
sha256 = "1m8h4i8cxxw83vhbw61njvv86qdcff6zi3bf0nyhc4cq7pfrzqvj";
|
||||
version = "2.0.2";
|
||||
sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3";
|
||||
buildDepends = [ hslogger mtl ];
|
||||
meta = {
|
||||
description = "Automatic generation of hslogger functions";
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.8.5.1";
|
||||
sha256 = "1v70rslnga063mlpfs1w03y1s4x7kfisjqwbcbczynhz15s9hymx";
|
||||
version = "1.8.5.2";
|
||||
sha256 = "0c1a6iknvi34sh97j7cfzwyikcz0kdz4vgsc47lr7c2a75gl0via";
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cookie
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit
|
||||
, conduit, httpConduit, httpTypes, liftedBase, monadControl
|
||||
, network, networkConduit, text, wai, warp, word8
|
||||
, conduit, dataDefault, httpConduit, httpTypes, liftedBase
|
||||
, monadControl, network, networkConduit, text, wai, warp, word8
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-reverse-proxy";
|
||||
version = "0.1.0.7";
|
||||
sha256 = "1fshng7bcpzjq5iqnvl2qsyia9yi80b8sbif18a3w86gsw5xcakk";
|
||||
version = "0.1.1";
|
||||
sha256 = "0p04zpw1v0zhzri7wpikc0b8g7n21kgl8j8238vv7xqxapkal0pc";
|
||||
buildDepends = [
|
||||
blazeBuilder caseInsensitive classyPreludeConduit conduit
|
||||
httpConduit httpTypes liftedBase monadControl network
|
||||
dataDefault httpConduit httpTypes liftedBase monadControl network
|
||||
networkConduit text wai warp word8
|
||||
];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lens";
|
||||
version = "3.7.1";
|
||||
sha256 = "16rgfv21f7sl7n6gqn4750i3yv7w972ybn883yr474y4xwhhyh6w";
|
||||
version = "3.7.1.2";
|
||||
sha256 = "1hapcnmyqyc3645gsy1ikwzm2srbbznps6yrfr02y2lcbnjpn3g6";
|
||||
buildDepends = [
|
||||
comonad comonadsFd comonadTransformers filepath hashable mtl
|
||||
parallel semigroups split text transformers unorderedContainers
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mime-types";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0xc36pr84nszyych3jd8sl6kj1grsyv8ci8v7ilrbpnw7ngbkw1p";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "1a34ckmv8qcyk38jydxwph59zcrhnwaah1h6pzn112kysjqjgcsl";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "https://github.com/yesodweb/wai";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "monad-logger";
|
||||
version = "0.2.3.1";
|
||||
sha256 = "15f85cf1nsy3xbjgikrn8cr09r70h8n2c67bpbxnfjna3ak94gkn";
|
||||
version = "0.2.3.2";
|
||||
sha256 = "0b5jfmzmsb7pdawcm5i74sy934q2d78pjs39invas502kx5bxzk5";
|
||||
buildDepends = [
|
||||
conduit fastLogger monadControl mtl resourcet text transformers
|
||||
transformersBase
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "network-conduit";
|
||||
version = "0.6.2";
|
||||
sha256 = "1v9f2x4ryqiwird60n4rkj0jlyn3lqkfs40956xi11r7p656l6q6";
|
||||
version = "0.6.2.1";
|
||||
sha256 = "1pkqkkj18yn31dmxcc8xfq2drg2jm9169my0s3jsxjbyxsyq58l6";
|
||||
buildDepends = [
|
||||
conduit liftedBase monadControl network transformers
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "optparse-applicative";
|
||||
version = "0.4.3";
|
||||
sha256 = "1zsydxgq3lcgzrf9iwas3gkjy0vxn4z2cj6h3m63h0qqa26sfcwz";
|
||||
version = "0.5.2.1";
|
||||
sha256 = "0w4mk851mx8dch8lnck0g82asmzrsc47xrf34jygh0f6v4kbj40i";
|
||||
buildDepends = [ transformers ];
|
||||
meta = {
|
||||
homepage = "https://github.com/pcapriotti/optparse-applicative";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "parallel-io";
|
||||
version = "0.3.2.2";
|
||||
sha256 = "04swl1mp704ijrpmvw800x0fpzmrbd382p45kvqzynmkgqzx33a3";
|
||||
version = "0.3.3";
|
||||
sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ extensibleExceptions random ];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-postgresql";
|
||||
version = "1.1.1";
|
||||
sha256 = "19ywyf0d7n6z8ws7s7jc958g30aiy6il43qwvqh92q1cz8bd1mj9";
|
||||
version = "1.1.2.1";
|
||||
sha256 = "1iz6w9isva1drbr37c8f42g3nnl78sp27ydaj0975yqyp7nh7and";
|
||||
buildDepends = [
|
||||
aeson conduit monadControl persistent postgresqlLibpq
|
||||
postgresqlSimple text time transformers
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-sqlite";
|
||||
version = "1.1.0";
|
||||
sha256 = "0ycs8qb8vksnypzpxi0ypxk7akl68hdwyxzkbchyy6zh3zv2pa4z";
|
||||
version = "1.1.2";
|
||||
sha256 = "0pb52k7a7js71s4d2mynd62i8gk99az7y72rycs0xg9r9cr081p3";
|
||||
buildDepends = [
|
||||
aeson conduit monadControl persistent text transformers
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-template";
|
||||
version = "1.1.1";
|
||||
sha256 = "18rxjqgmjzx0j0sbg9ms779pkq264vf8w0qz679xsyn98wc95i36";
|
||||
version = "1.1.2";
|
||||
sha256 = "1hz8cxx2a84c93x364vgahmv4xd3cbpjx4j7si5n0pasyq3clbvr";
|
||||
buildDepends = [ aeson monadControl persistent text transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent";
|
||||
version = "1.1.0.1";
|
||||
sha256 = "07b9d9fcah3k03r2pm6mfl3qsdp4s9gbb376by3122nvc26w6sjc";
|
||||
version = "1.1.3.1";
|
||||
sha256 = "12gv2gjkrf7qchlv6kj0an8bvpkin8vdhdkxg4ck9ydw7hh292v2";
|
||||
buildDepends = [
|
||||
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
|
||||
liftedBase monadControl monadLogger pathPieces poolConduit
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pretty-show";
|
||||
version = "1.2";
|
||||
sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l";
|
||||
version = "1.3.2";
|
||||
sha256 = "0m3kw4d68gd1mhlgi5vy3k2cqi9f0i4s502m2sgy4pww45fjllxy";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ haskellLexer ];
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "semigroups";
|
||||
version = "0.8.4.1";
|
||||
sha256 = "05wv5amgg3nqr1if936zl330sv1k4i9p8xzdmgxsmchp4lshyr6n";
|
||||
version = "0.8.5";
|
||||
sha256 = "0dnxqqxfyxj0mpy524nvgwagsp6ynadmh2yr4k5159rzbg2xgz90";
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/semigroups/";
|
||||
description = "Haskell 98 semigroups";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "shakespeare-js";
|
||||
version = "1.1.0";
|
||||
sha256 = "0rb1fim6xvpgc2in71drxgimh1z75p72zj0k6hwh2hyfwkj2yh9p";
|
||||
version = "1.1.1";
|
||||
sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg";
|
||||
buildDepends = [ aeson shakespeare text ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "shelly";
|
||||
version = "0.15.0";
|
||||
sha256 = "138x2c76ynv0kl0kg86pawnnlk6973dqkaapycb30rf44p1m53j2";
|
||||
version = "0.15.4";
|
||||
sha256 = "1b8fn5fa350hhlswn97g6zn9454nzn9sz60x55j959phwys0fcdk";
|
||||
buildDepends = [
|
||||
mtl systemFileio systemFilepath text time unixCompat
|
||||
];
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
|
|||
snapCore snapServer stm syb text time transformers
|
||||
unorderedContainers vector vectorAlgorithms xmlhtml
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://snapframework.com/";
|
||||
description = "Top-level package for the Snap Web Framework";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ cabal, time }:
|
||||
{ cabal, text, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "strptime";
|
||||
version = "1.0.8";
|
||||
sha256 = "0cd4wzrg9zpnwrfpp6lxs1ib06h0fcsdqd3idsw663wr5lllfgdq";
|
||||
buildDepends = [ time ];
|
||||
version = "1.0.10";
|
||||
sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
|
||||
buildDepends = [ text time ];
|
||||
meta = {
|
||||
description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
|
|||
buildDepends = [
|
||||
cereal certificate cryptoApi cryptocipher cryptohash mtl network
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-tls";
|
||||
description = "TLS/SSL protocol native implementation (Server and Client)";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "unix-compat";
|
||||
version = "0.4.0.0";
|
||||
sha256 = "0xhhvqdjcmcyavf0g2q2sjghj2h4si1ijg4nc4s8kidbd957z9r8";
|
||||
version = "0.4.1.0";
|
||||
sha256 = "155m3zg692zbfyck4njx1vzvb5vgs0dkzyzlqf2x78ds6j9bzjzi";
|
||||
meta = {
|
||||
homepage = "http://github.com/jystic/unix-compat";
|
||||
description = "Portable POSIX-compatibility layer";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "vault";
|
||||
version = "0.2.0.3";
|
||||
sha256 = "1ky7c5hg7spa545xhgs4ahf07w60k3x149087mla1dxl8lpcz70i";
|
||||
version = "0.2.0.4";
|
||||
sha256 = "1a63rarksp4waj64b9kv8q77wbhdnsnxahkixl1klp25hkp8aan3";
|
||||
buildDepends = [ hashable unorderedContainers ];
|
||||
meta = {
|
||||
homepage = "https://github.com/HeinrichApfelmus/vault";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yaml";
|
||||
version = "0.8.1.1";
|
||||
sha256 = "0n2m205f0jq8v4g84bw642vdqqr68m3jklv98rr21s8r2fyy7937";
|
||||
version = "0.8.1.2";
|
||||
sha256 = "1prk1nxzb84svqr552pgrfxg8kd34zvnh35js8l0q58y9rifxyq0";
|
||||
buildDepends = [
|
||||
aeson attoparsec conduit resourcet text transformers
|
||||
unorderedContainers vector
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-auth";
|
||||
version = "1.1.2.2";
|
||||
sha256 = "16g2lnnwp5219i77fb4pv2y8ljz4msflj38mvh0zw3x93747baf7";
|
||||
version = "1.1.3";
|
||||
sha256 = "0rlp56jsb0cwm1z303b7l9iy5hbip18vlm7fisna4agbf4rj2k0z";
|
||||
buildDepends = [
|
||||
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
|
||||
liftedBase mimeMail network persistent persistentTemplate pureMD5
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-core";
|
||||
version = "1.1.6.1";
|
||||
sha256 = "0pk7pxqp9g5pkbba2na503az9pghgqvs538pcz2k3r3cpb6nhgpa";
|
||||
version = "1.1.7";
|
||||
sha256 = "1z47h7ghhi8mvmrc0rcwb3si1bq4623i5x127k8fahcy6qk4qls8";
|
||||
buildDepends = [
|
||||
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
|
||||
clientsession conduit cookie failure fastLogger hamlet httpTypes
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ cabal.mkDerivation (self: {
|
|||
shakespeareJs text time transformers wai xssSanitize yesodCore
|
||||
yesodPersistent
|
||||
];
|
||||
noHaddock = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Form handling support for Yesod Web Framework";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-static";
|
||||
version = "1.1.1.1";
|
||||
sha256 = "1wp3ijiwsai9npf6zl0bq3fi4rbh0qjy8bii3d178sariv7588js";
|
||||
version = "1.1.1.2";
|
||||
sha256 = "0x3vrzqqddi4fmbivmy5pi66jmnc5fh68j5fjfxn5nyhp4n6z0sw";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
|
||||
httpTypes systemFilepath text transformers unixCompat wai
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ cabal, attoparsec, blazeHtml, blazeMarkup, caseInsensitive, hspec
|
||||
, htmlConduit, httpTypes, HUnit, monadControl, network, persistent
|
||||
, poolConduit, text, transformers, wai, waiTest, xmlConduit
|
||||
, xmlTypes
|
||||
{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
|
||||
, caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit
|
||||
, monadControl, network, persistent, poolConduit, text, time
|
||||
, transformers, wai, waiTest, xmlConduit, xmlTypes
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-test";
|
||||
version = "0.3.2";
|
||||
sha256 = "1wd5iwar6jxbv0p7p47js4spivwhph98h403bnmf3dl7069nyjcs";
|
||||
version = "0.3.3";
|
||||
sha256 = "1jb410r905wd26swh2rk59nbyy389gcfz261adhb69awmsyql5x3";
|
||||
buildDepends = [
|
||||
attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit
|
||||
httpTypes HUnit monadControl network persistent poolConduit text
|
||||
transformers wai waiTest xmlConduit xmlTypes
|
||||
attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
|
||||
cookie hspec htmlConduit httpTypes HUnit monadControl network
|
||||
persistent poolConduit text time transformers wai waiTest
|
||||
xmlConduit xmlTypes
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com";
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod";
|
||||
version = "1.1.7";
|
||||
sha256 = "1qcvmy8ichri9ivfkanj4gp687lwymgi170sbdzwf5phy34bhkc5";
|
||||
version = "1.1.7.2";
|
||||
sha256 = "0mxxzcmp63sdn7g30ilp40dsj2iccajc9gpxycnqxqabdzhqkbm0";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zeromq3-haskell";
|
||||
version = "0.1.4";
|
||||
sha256 = "026b18ligbrfbg4x7vivk6r2gj9rj3vy6pm3h0s81571h6lk3dhx";
|
||||
version = "0.2";
|
||||
sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky";
|
||||
extraLibraries = [ zeromq ];
|
||||
meta = {
|
||||
homepage = "http://github.com/twittner/zeromq-haskell/";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "libgadu-1.11.0";
|
||||
name = "libgadu-1.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://toxygen.net/libgadu/files/libgadu-1.11.0.tar.gz;
|
||||
sha256 = "045a0bd395k3ramdvlzyfx3878p42fv4r04rgasmdsm2n33wgm38";
|
||||
url = http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz;
|
||||
sha256 = "0kifi9blhbimihqw4kaf6wyqhlx8fpp8nq4s6y280ar9p0il2n3z";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
{ stdenv, fetchurl, mesa }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtxc_dxtn-1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
|
||||
sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
tar xf ${mesa.src} --wildcards '*/include/'
|
||||
export NIX_CFLAGS_COMPILE="-I $NIX_BUILD_TOP/[mM]esa*/include"
|
||||
'';
|
||||
}
|
||||
|
|
@ -6,13 +6,18 @@ stdenv.mkDerivation {
|
|||
name = "avr-gcc-libc";
|
||||
|
||||
srcBinutils = fetchurl {
|
||||
url = "mirror://gnu/binutils/binutils-2.21.tar.bz2";
|
||||
sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0";
|
||||
url = "mirror://gnu/binutils/binutils-2.21.1.tar.bz2";
|
||||
sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d";
|
||||
};
|
||||
|
||||
srcGCC = fetchurl {
|
||||
url = "mirror://gcc/releases/gcc-4.6.1/gcc-core-4.6.1.tar.bz2";
|
||||
sha256 = "0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33";
|
||||
url = "mirror://gcc/releases/gcc-4.6.3/gcc-core-4.6.3.tar.bz2";
|
||||
sha256 = "1hai090f0svf886nyhn4glmfw54v9lz88w2izkx5iqhd3j400gi8";
|
||||
};
|
||||
|
||||
srcGCCGPP = fetchurl {
|
||||
url = "mirror://gcc/releases/gcc-4.6.3/gcc-g++-4.6.3.tar.bz2";
|
||||
sha256 = "1s199gb6p65r5k69cdfqqcz5hgifw9bhyj65n2b91s80x4rwgq5k";
|
||||
};
|
||||
|
||||
srcAVRLibc = fetchurl {
|
||||
|
|
@ -55,10 +60,11 @@ stdenv.mkDerivation {
|
|||
|
||||
cd $TMP
|
||||
tar jxf $srcGCC
|
||||
tar jxf $srcGCCGPP
|
||||
cd gcc-*
|
||||
mkdir obj-avr
|
||||
cd obj-avr
|
||||
../configure --target=avr --prefix="$prefix" --disable-nls --enable-languages=c --disable-libssp --with-dwarf2
|
||||
../configure --target=avr --prefix="$prefix" --disable-nls --enable-languages=c,c++ --disable-libssp --with-dwarf2
|
||||
make $MAKE_FLAGS
|
||||
make install
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "splot";
|
||||
version = "0.3.6";
|
||||
sha256 = "0fxjji6b0v3hf4pn1cbh88nvp4n4bfgfkiga6l149flk5nmlapqx";
|
||||
version = "0.3.7";
|
||||
sha256 = "0mal7zphwzycxm2i0v87vn6gvdb582zy51prngj4w11xgpxd7dg1";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "timeplot";
|
||||
version = "1.0.18";
|
||||
sha256 = "1q4kzzqmr7bx97wfaasrkzii6b9zpxcxggshpsjv02bwb1hazxmc";
|
||||
version = "1.0.19";
|
||||
sha256 = "1mwhrcjavx56z3msdf5zqvqlx5m3hbcw85f22h8p9wvfgn79aydx";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -1,46 +1,77 @@
|
|||
{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk
|
||||
{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk, runCommand, gcc
|
||||
, sysconfDir ? "" # set this parameter to override the default value $out/etc
|
||||
, static ? false
|
||||
}:
|
||||
|
||||
let name = "distcc";
|
||||
version = "3.1";
|
||||
let
|
||||
name = "distcc";
|
||||
version = "3.1";
|
||||
distcc = stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2";
|
||||
sha256 = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89";
|
||||
};
|
||||
|
||||
buildInputs = [popt avahi pkgconfig python gtk];
|
||||
preConfigure =
|
||||
''
|
||||
configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
|
||||
CXXFLAGS="-O2 -fno-strict-aliasing"
|
||||
--mandir=$out/share/man
|
||||
${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
|
||||
${if static then "LDFLAGS=-static" else ""}
|
||||
--with${if static == true || popt == null then "" else "out"}-included-popt
|
||||
--with${if avahi != null then "" else "out"}-avahi
|
||||
--with${if gtk != null then "" else "out"}-gtk
|
||||
--without-gnome
|
||||
--enable-rfc2553
|
||||
--disable-Werror # a must on gcc 4.6
|
||||
)
|
||||
installFlags="sysconfdir=$out/etc";
|
||||
'';
|
||||
patches = [ ./20-minute-io-timeout.patch ];
|
||||
|
||||
# The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc.
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
# A derivation that provides gcc and g++ commands, but that
|
||||
# will end up calling distcc for the given cacheDir
|
||||
#
|
||||
# extraConfig is meant to be sh lines exporting environment
|
||||
# variables like DISTCC_HOSTS, DISTCC_DIR, ...
|
||||
links = extraConfig : (runCommand "distcc-links"
|
||||
{ inherit (gcc) langC langCC; }
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
if [ $langC -eq 1 ]; then
|
||||
cat > $out/bin/gcc << EOF
|
||||
#!/bin/sh
|
||||
${extraConfig}
|
||||
exec ${distcc}/bin/distcc gcc "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/gcc
|
||||
fi
|
||||
if [ $langCC -eq 1 ]; then
|
||||
cat > $out/bin/g++ << EOF
|
||||
#!/bin/sh
|
||||
${extraConfig}
|
||||
exec ${distcc}/bin/distcc g++ "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/g++
|
||||
fi
|
||||
'');
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "a fast, free distributed C/C++ compiler";
|
||||
homepage = "http://distcc.org";
|
||||
license = "GPL";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2";
|
||||
sha256 = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89";
|
||||
};
|
||||
|
||||
buildInputs = [popt avahi pkgconfig python gtk];
|
||||
preConfigure =
|
||||
''
|
||||
configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
|
||||
CXXFLAGS="-O2 -fno-strict-aliasing"
|
||||
--mandir=$out/share/man
|
||||
${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
|
||||
${if static then "LDFLAGS=-static" else ""}
|
||||
--with${if static == true || popt == null then "" else "out"}-included-popt
|
||||
--with${if avahi != null then "" else "out"}-avahi
|
||||
--with${if gtk != null then "" else "out"}-gtk
|
||||
--without-gnome
|
||||
--enable-rfc2553
|
||||
)
|
||||
installFlags="sysconfdir=$out/etc";
|
||||
'';
|
||||
patches = [ ./20-minute-io-timeout.patch ];
|
||||
|
||||
# The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "a fast, free distributed C/C++ compiler";
|
||||
homepage = "http://distcc.org";
|
||||
license = "GPL";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
distcc
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv, gccRaw, binutils }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "distcc-masq-${gccRaw.name}";
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
|
||||
bin=${gccRaw}/bin
|
||||
|
||||
shopt -s nullglob
|
||||
if [ -f $bin/gcc ]; then
|
||||
ln -s $bin/gcc $out/bin
|
||||
else
|
||||
for a in $bin/*-gcc; do
|
||||
ln -s $bin/*-gcc $out/bin/gcc
|
||||
ln -s $bin/*-gcc $out/bin/cc
|
||||
done
|
||||
fi
|
||||
|
||||
if [ -f $bin/g++ ]; then
|
||||
ln -s $bin/g++ $out/bin
|
||||
else
|
||||
for a in $bin/*-g++; do
|
||||
ln -sf $bin/*-g++ $out/bin/g++
|
||||
ln -sf $bin/*-g++ $out/bin/c++
|
||||
done
|
||||
fi
|
||||
|
||||
bbin=${binutils}/bin
|
||||
if [ -f $bbin/as ]; then
|
||||
ln -s $bbin/as $out/bin
|
||||
else
|
||||
for a in $bbin/*-as; do
|
||||
ln -sf $bbin/*-as $out/bin/as
|
||||
done
|
||||
fi
|
||||
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,44 +1,24 @@
|
|||
{ fetchurl, stdenv, kernel, binutils
|
||||
{ fetchurl, stdenv, binutils
|
||||
, pkgconfig, gtk, glib, pango, libglade }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sysprof-1.0.12-${kernel.version}";
|
||||
name = "sysprof-1.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.daimi.au.dk/~sandmann/sysprof/sysprof-1.0.12.tar.gz";
|
||||
sha256 = "0f0z1dh97swlrkw3cbv5k2jhy5rk7wxv55hp7yhysw3idgp8wbmz";
|
||||
url = "http://www.sysprof.com/sysprof-1.2.0.tar.gz";
|
||||
sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s";
|
||||
};
|
||||
|
||||
buildInputs = [ binutils pkgconfig gtk glib pango libglade ];
|
||||
|
||||
patches = [ ./configure.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
kernelVersion=$(cd "${kernel}/lib/modules" && echo *)
|
||||
echo "assuming Linux kernel version \`$kernelVersion'"
|
||||
|
||||
sed -i "module/Makefile" \
|
||||
-e"s|^[[:blank:]]*KDIR[[:blank:]]*:=.*$|KDIR := ${kernel}/lib/modules/$kernelVersion/build|g ;
|
||||
s|\$(KMAKE) modules_install|install sysprof-module.ko $out/share/sysprof/module|g ;
|
||||
s|\\[ -e /sbin/depmod.*$|true|g"
|
||||
|
||||
# XXX: We won't run `depmod' after installing the module.
|
||||
'';
|
||||
|
||||
configureFlags = "--enable-kernel-module";
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p "$out/share/sysprof/module"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.daimi.au.dk/~sandmann/sysprof/;
|
||||
homepage = http://sysprof.com/;
|
||||
description = "Sysprof, a system-wide profiler for Linux";
|
||||
license = "GPLv2+";
|
||||
|
||||
longDescription = ''
|
||||
Sysprof is a sampling CPU profiler for Linux that uses a kernel
|
||||
module to profile the entire system, not just a single
|
||||
Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open
|
||||
system call to profile the entire system, not just a single
|
||||
application. Sysprof handles shared libraries and applications
|
||||
do not need to be recompiled. In fact they don't even have to
|
||||
be restarted.
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
|
||||
shlevy = "Shea Levy <shea@shealevy.com>";
|
||||
simons = "Peter Simons <simons@cryp.to>";
|
||||
smironov = "Sergey Mironov <ierton@gmail.com>";
|
||||
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
|
||||
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
|
||||
viric = "Lluís Batlle i Rossell <viric@viric.name>";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/wine/${name}.tar.bz2";
|
||||
sha256 = "08qhjqia2g6pm5rnawcvfz64pm2pmjaxafmwdyn950rdwrd7kbai";
|
||||
sha256 = "0c14paj2j3sswl6mpjjmy9bxnpijk095ks58x9dsycx9c8x0gqvm";
|
||||
};
|
||||
|
||||
gecko = fetchurl {
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
version = "1.5.19";
|
||||
version = "1.5.20";
|
||||
homepage = "http://www.winehq.org/";
|
||||
license = "LGPL";
|
||||
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "spl-0.6.0-rc12-${kernel.version}";
|
||||
name = "spl-0.6.0-rc13-${kernel.version}";
|
||||
src = fetchurl {
|
||||
url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz;
|
||||
sha256 = "166853pqa294f78mn4j4x9pri79lyv3j2h8m9fzhfy7d7gxfqljk";
|
||||
url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz;
|
||||
sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b";
|
||||
};
|
||||
|
||||
patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "zfs-0.6.0-rc12-${kernel.version}";
|
||||
name = "zfs-0.6.0-rc13-${kernel.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz;
|
||||
sha256 = "1mipy6v63y8z3c5chn813x8c2r8mwyja1v19dvars3j85105xf1y";
|
||||
url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz;
|
||||
sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv";
|
||||
};
|
||||
|
||||
patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff -ru redis-2.4.7/deps/hiredis/Makefile redis-2.4.7.patched/deps/hiredis/Makefile
|
||||
--- redis-2.4.7/deps/hiredis/Makefile 2012-02-02 14:29:24.000000000 +0000
|
||||
+++ redis-2.4.7.patched/deps/hiredis/Makefile 2012-12-07 17:14:43.000000000 +0000
|
||||
@@ -20,7 +20,7 @@
|
||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||
CCLINK?=-lm -pthread
|
||||
LDFLAGS?=-L. -Wl,-rpath,.
|
||||
- OBJARCH?=-arch i386 -arch x86_64
|
||||
+ #OBJARCH?=-arch i386 -arch x86_64
|
||||
DYLIBNAME?=libhiredis.dylib
|
||||
DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
|
||||
STLIBNAME?=libhiredis.a
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, fetchgit, cmake, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xkb-switch-1.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/ierton/xkb-switch.git;
|
||||
rev = "4c90511ecf2cacc040c97f034a13254c3fa9dfef";
|
||||
sha256 = "1jxya67v1qnvbzd0cd5gj7xrwvxyfy1rpa70l8p30p9cmw3ahk41";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake libX11 ];
|
||||
|
||||
meta = {
|
||||
description = "Switch X layouts from the command line";
|
||||
homepage = https://github.com/ierton/xkb-switch.git;
|
||||
maintainers = with stdenv.lib.maintainers; [smironov];
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
license = "BSD";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,31 +1,25 @@
|
|||
{stdenv, fetchgit, python}:
|
||||
{ stdenv, fetchurl, python, pandoc }:
|
||||
|
||||
let pkgname = "youtube-dl";
|
||||
pkgver = "2012.09.27";
|
||||
|
||||
let
|
||||
version = "2012.12.11";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${pkgname}-${pkgver}";
|
||||
name = "youtube-dl-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/rg3/${pkgname}";
|
||||
rev = "refs/tags/${pkgver}";
|
||||
sha256 = "a98f3339301324ddd6620f7b1353abed807cd8dea5586d6901d7fe69bc6a397c";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.${version}.tar.gz";
|
||||
sha256 = "03zv3z8p0fi122nqj7ff8hkgqscir4s7psm03rq7dfpg1z35klmn";
|
||||
};
|
||||
|
||||
buildInputs = [python];
|
||||
buildPhase = "sed -i 's|#!/usr/bin/env python|#!#{python}/bin/python|' youtube-dl";
|
||||
buildInputs = [ python pandoc ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp youtube-dl $out/bin
|
||||
configurePhase = ''
|
||||
makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A small command-line program to download videos from YouTube.com and a few more sites";
|
||||
homepage = http://rg3.github.com/youtube-dl/;
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.bluescreen303
|
||||
];
|
||||
homepage = "http://rg3.github.com/youtube-dl/";
|
||||
description = "Command-line tool to download videos from YouTube.com and other sites";
|
||||
maintainers = [ stdenv.lib.maintainers.bluescreen303 stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}:
|
||||
|
||||
let
|
||||
rev = "2178";
|
||||
rev = "2212";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aircrack-ng-1.1-${rev}";
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchsvn {
|
||||
url = "http://trac.aircrack-ng.org/svn/trunk";
|
||||
inherit rev;
|
||||
sha256 = "d16fd3a4e918fd6a855c0d0ae0c863247a45189e6ec35c0c7082d3d07b6438db";
|
||||
sha256 = "80e567b4e4bc501721cd58f7efadcd13fc3b235a41486174826694a6e701ce09";
|
||||
};
|
||||
|
||||
buildInputs = [libpcap openssl zlib];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
{ stdenv, fetchurl, buildPythonPackage }:
|
||||
|
||||
buildPythonPackage {
|
||||
name = "httpie-0.3.1";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/h/httpie/httpie-0.3.1.tar.gz";
|
||||
sha256 = "0abjkwcirmp6qa190qgbgj5fmmkmk5aa3fdiyayl2indh6304x7a";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A command line HTTP client whose goal is to make CLI human-friendly";
|
||||
homepage = http://httpie.org/;
|
||||
license = "BSD";
|
||||
maintainers = [ stdenv.lib.maintainers.antono ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.9";
|
||||
name = "mu-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mu0.googlecode.com/files/mu-${version}.tar.gz";
|
||||
sha256 = "04r0y05awsyb5hqwaxn1hq9jxijw20hwsgdbacqrma519f0y5y43";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile ];
|
||||
|
||||
meta = {
|
||||
description = "mu is a collection of utilties for indexing and searching Maildirs";
|
||||
|
||||
licenses = [ "GPLv3+" ];
|
||||
|
||||
homepage = "http://www.djcbsoftware.nl/code/mu/";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.antono ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mu0-0.9.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://mu0.googlecode.com/files/mu-0.9.7.tar.gz;
|
||||
sha256 = "14nyn791ficyllj9idhiq3mncwnrg71lfxk126804dxba1l90r72";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite pkgconfig xapian glib gmime ];
|
||||
|
||||
/* The tests don't pass */
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "mu is a collection of utilties for indexing and searching Maildirs";
|
||||
|
||||
licenses = [ "GPLv3+" ];
|
||||
|
||||
homepage = http://code.google.com/p/mu0/;
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -373,6 +373,11 @@ let
|
|||
|
||||
archivemount = callPackage ../tools/filesystems/archivemount { };
|
||||
|
||||
arduino_core = callPackage ../development/arduino/arduino-core {
|
||||
jdk = jdk;
|
||||
jre = jdk;
|
||||
};
|
||||
|
||||
argyllcms = callPackage ../tools/graphics/argyllcms {};
|
||||
|
||||
ascii = callPackage ../tools/text/ascii { };
|
||||
|
|
@ -911,6 +916,8 @@ let
|
|||
|
||||
hping = callPackage ../tools/networking/hping { };
|
||||
|
||||
httpie = callPackage ../tools/networking/httpie { };
|
||||
|
||||
httpfs2 = callPackage ../tools/filesystems/httpfs { };
|
||||
|
||||
# FIXME: This Hydra snapshot is outdated and depends on the `nixPerl',
|
||||
|
|
@ -1047,8 +1054,6 @@ let
|
|||
|
||||
lzop = callPackage ../tools/compression/lzop { };
|
||||
|
||||
mu0 = callPackage ../tools/networking/mu0 { };
|
||||
|
||||
mailutils = callPackage ../tools/networking/mailutils {
|
||||
guile = guile_1_8;
|
||||
};
|
||||
|
|
@ -1801,7 +1806,7 @@ let
|
|||
|
||||
xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
|
||||
|
||||
youtubeDL = callPackage ../tools/misc/youtube-dl { };
|
||||
youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; };
|
||||
|
||||
zbar = callPackage ../tools/graphics/zbar {};
|
||||
|
||||
|
|
@ -3072,6 +3077,28 @@ let
|
|||
|
||||
distcc = callPackage ../development/tools/misc/distcc { };
|
||||
|
||||
# distccWrapper: wrapper that works as gcc or g++
|
||||
# It can be used by setting in nixpkgs config like this, for example:
|
||||
# replaceStdenv = { pkgs }: pkgs.distccStdenv;
|
||||
# But if you build in chroot, a default 'nix' will create
|
||||
# a new net namespace, and won't have network access.
|
||||
# You can use an override in packageOverrides to set extraConfig:
|
||||
# packageOverrides = pkgs: {
|
||||
# distccWrapper = pkgs.distccWrapper.override {
|
||||
# extraConfig = ''
|
||||
# DISTCC_HOSTS="myhost1 myhost2"
|
||||
# '';
|
||||
# };
|
||||
#
|
||||
distccWrapper = makeOverridable ({ extraConfig ? "" }:
|
||||
wrapGCC (distcc.links extraConfig)) {};
|
||||
distccStdenv = lowPrio (overrideGCC stdenv distccWrapper);
|
||||
|
||||
distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix {
|
||||
gccRaw = gcc.gcc;
|
||||
binutils = binutils;
|
||||
};
|
||||
|
||||
docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {
|
||||
inherit python pil makeWrapper;
|
||||
};
|
||||
|
|
@ -3155,6 +3182,8 @@ let
|
|||
|
||||
indent = callPackage ../development/tools/misc/indent { };
|
||||
|
||||
ino = callPackage ../development/arduino/ino { };
|
||||
|
||||
inotifyTools = callPackage ../development/tools/misc/inotify-tools { };
|
||||
|
||||
intelgen4asm = callPackage ../development/misc/intelgen4asm { };
|
||||
|
|
@ -4485,6 +4514,8 @@ let
|
|||
|
||||
libxslt = callPackage ../development/libraries/libxslt { };
|
||||
|
||||
libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { };
|
||||
|
||||
libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
|
||||
inherit fetchurl stdenv;
|
||||
});
|
||||
|
|
@ -4567,6 +4598,8 @@ let
|
|||
|
||||
mtdev = callPackage ../development/libraries/mtdev { };
|
||||
|
||||
mu = callPackage ../tools/networking/mu { };
|
||||
|
||||
muparser = callPackage ../development/libraries/muparser { };
|
||||
|
||||
mygui = callPackage ../development/libraries/mygui {};
|
||||
|
|
@ -7909,7 +7942,7 @@ let
|
|||
inherit (pkgs) python perl tcl ruby /*x11*/;
|
||||
lua = pkgs.lua5;
|
||||
# optional features by flags
|
||||
flags = [ "X11" ]; # only flag "X11" by now
|
||||
flags = [ "python" "X11" ]; # only flag "X11" by now
|
||||
};
|
||||
|
||||
virtviewer = callPackage ../applications/virtualization/virt-viewer {};
|
||||
|
|
@ -8062,6 +8095,8 @@ let
|
|||
base14Fonts = "${ghostscript}/share/ghostscript/fonts";
|
||||
};
|
||||
|
||||
xkb_switch = callPackage ../tools/X11/xkb-switch { };
|
||||
|
||||
libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
|
||||
|
||||
xpra = callPackage ../tools/X11/xpra {
|
||||
|
|
@ -8578,6 +8613,12 @@ let
|
|||
|
||||
### SCIENCE
|
||||
|
||||
celestia = callPackage ../applications/science/astronomy/celestia {
|
||||
lua = lua5_1;
|
||||
inherit (xlibs) libXmu;
|
||||
inherit (pkgs.gnome) gtkglext;
|
||||
};
|
||||
|
||||
xplanet = callPackage ../applications/science/astronomy/xplanet { };
|
||||
|
||||
gravit = callPackage ../applications/science/astronomy/gravit { };
|
||||
|
|
@ -8706,6 +8747,8 @@ let
|
|||
|
||||
leo2 = callPackage ../applications/science/logic/leo2 {};
|
||||
|
||||
logisim = callPackage ../applications/science/logic/logisim {};
|
||||
|
||||
matita = callPackage ../applications/science/logic/matita {
|
||||
ocaml = ocaml_3_11_2;
|
||||
inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http
|
||||
|
|
|
|||
|
|
@ -523,7 +523,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
|
||||
|
||||
bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {};
|
||||
bmp_1_2_3_2 = callPackage ../development/libraries/haskell/bmp/1.2.3.2.nix {};
|
||||
bmp_1_2_3_4 = callPackage ../development/libraries/haskell/bmp/1.2.3.4.nix {};
|
||||
bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond
|
||||
|
||||
Boolean = callPackage ../development/libraries/haskell/Boolean {};
|
||||
|
|
@ -910,7 +910,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {};
|
||||
|
||||
hashable = callPackage ../development/libraries/haskell/hashable {};
|
||||
hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {};
|
||||
hashable_1_3_0_2 = callPackage ../development/libraries/haskell/hashable/1.2.0.2.nix {};
|
||||
hashable = self.hashable_1_1_2_5;
|
||||
|
||||
hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue