mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-15 13:28:02 +00:00
Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
This commit is contained in:
Yury G. Kudryashov
commit
08761e83fc
@ -1,22 +1,19 @@
|
||||
{ stdenv, fetchurl, emacs, texinfo }:
|
||||
|
||||
let
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "magit-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
|
||||
sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq";
|
||||
sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4";
|
||||
};
|
||||
|
||||
buildInputs = [emacs texinfo];
|
||||
|
||||
configurePhase =
|
||||
'' sed -i Makefile \
|
||||
-e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|"
|
||||
'';
|
||||
configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )";
|
||||
|
||||
meta = {
|
||||
description = "Magit, an Emacs interface to Git";
|
||||
@ -34,7 +31,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
license = "GPLv3+";
|
||||
homepage = "http://github.com/philjackson/magit";
|
||||
homepage = "https://github.com/magit/magit";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with stdenv.lib.maintainers; [ simons ludo ];
|
||||
};
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, withGNOME ? false, libgnomeui }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (src) name;
|
||||
name = src.pkgname;
|
||||
|
||||
src = fetchurl_gnome {
|
||||
project = "dia";
|
||||
|
||||
@ -1,22 +1,28 @@
|
||||
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
|
||||
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
|
||||
liblqr1, lensfun, pkgconfig }:
|
||||
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
|
||||
shared_desktop_ontologies, marble }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "digikam-1.5.0";
|
||||
name = "digikam-2.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
|
||||
sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz";
|
||||
sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
|
||||
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
|
||||
pkgconfig ];
|
||||
pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
|
||||
marble ];
|
||||
|
||||
KDEDIRS=kdeedu;
|
||||
|
||||
patches = [ ./include.diff ];
|
||||
# Make digikam find some FindXXXX.cmake
|
||||
preConfigure = ''
|
||||
cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
|
||||
cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Photo Management Program";
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
|
||||
index 9ee36cc..c6e5c00 100644
|
||||
--- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
|
||||
+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
|
||||
@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS)
|
||||
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/
|
||||
${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/
|
||||
+ ${LIBMARBLEWIDGET_INCLUDE_DIR}/..
|
||||
${QT_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
|
||||
, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
|
||||
, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
|
||||
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calibre-0.8.30";
|
||||
name = "calibre-0.8.32";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
|
||||
sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282";
|
||||
sha256 = "0d0zq4sr0qm8jarg0ps24lfizb4hyb57pjsp81y1sb5nzjki7jml";
|
||||
};
|
||||
|
||||
inherit python;
|
||||
@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
|
||||
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
|
||||
fontconfig podofo qt4 pil chmlib icu
|
||||
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
|
||||
pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
|
||||
pythonPackages.cssutils pythonPackages.beautifulsoap
|
||||
pythonPackages.sqlite3 sqlite
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
$out/lib/calibre/calibre/ebooks/metadata/*.py
|
||||
$out/lib/calibre/calibre/ebooks/rtf2xml/*.py"
|
||||
|
||||
sed -i "s/env python/python/" $PYFILES
|
||||
sed -i "s/env python[0-9.]*/python/" $PYFILES
|
||||
for a in $out/bin/*; do
|
||||
wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib
|
||||
done
|
||||
|
||||
16
pkgs/applications/misc/taskwarrior/default.nix
Normal file
16
pkgs/applications/misc/taskwarrior/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "task-warrior-1.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.taskwarrior.org/download/task-1.9.4.tar.gz;
|
||||
sha256 = "0jnk30k1b2j3nx39il70jmj6p49wxp6cl4awd8hw71gqkcf6480h";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Command-line todo list manager";
|
||||
homepage = http://taskwarrior.org/;
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
20
pkgs/applications/misc/taskwarrior/unstable.nix
Normal file
20
pkgs/applications/misc/taskwarrior/unstable.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl, cmake, lua5 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "task-warrior-2.0.0.beta4";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.taskwarrior.org/download/task-2.0.0.beta4.tar.gz;
|
||||
sha256 = "1c9n6b5ly3m5kminnsvqgmjxdkb68w4av9kdnh47dw4sj3gwrn1w";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-ldl";
|
||||
|
||||
buildInputs = [ cmake lua5 ];
|
||||
|
||||
meta = {
|
||||
description = "Command-line todo list manager";
|
||||
homepage = http://taskwarrior.org/;
|
||||
license = "MIT";
|
||||
};
|
||||
}
|
||||
@ -9,11 +9,11 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hol_light-20111204";
|
||||
name = "hol_light-20111224";
|
||||
src = fetchsvn {
|
||||
url = http://hol-light.googlecode.com/svn/trunk;
|
||||
rev = "114";
|
||||
sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3";
|
||||
rev = "116";
|
||||
sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib camlp5 ];
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
{stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
|
||||
, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
|
||||
, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
|
||||
, libXdmcp, pixman, doxygen
|
||||
, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
|
||||
, docbook_xml_dtd_45, libxslt, coreutils}:
|
||||
|
||||
let
|
||||
version = "3.4.9";
|
||||
version = "3.4.11";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -12,11 +14,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
|
||||
sha256 = "0382v482904xv295l0gvhwzc64b7631miiv8wyq7jxmwqf2vfbp7";
|
||||
sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d";
|
||||
};
|
||||
|
||||
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
|
||||
imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev
|
||||
imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
|
||||
libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
|
||||
asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];
|
||||
|
||||
# We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
|
||||
@ -27,10 +30,17 @@ stdenv.mkDerivation rec {
|
||||
sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
|
||||
# Remove the 'root' PATH override (I don't know why they have that)
|
||||
sed /WHOAMI/d -i utils/awsetbg
|
||||
# Russian manpages fail to be generated:
|
||||
# [ 56%] Generating manpages/ru/man1/awesome.1.xml
|
||||
# asciidoc: ERROR: <stdin>: line 3: name section expected
|
||||
# asciidoc: FAILED: <stdin>: line 3: section title expected
|
||||
# make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "set(AWE_MAN_LANGS es fr de ru)" \
|
||||
"set(AWE_MAN_LANGS es fr de)"
|
||||
'';
|
||||
|
||||
patches = [ ./cmake284.patch ];
|
||||
|
||||
# XXX: maybe not needed anymore
|
||||
# Somehow libev does not get into the rpath, although it should.
|
||||
# Something may be wrong in the gcc wrapper.
|
||||
preBuild = ''
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
use strict;
|
||||
use XML::Simple;
|
||||
use List::Util qw(min);
|
||||
|
||||
my @packagesFiles = ();
|
||||
my @urlPrefixes = ();
|
||||
@ -13,6 +14,44 @@ while(-f $ARGV[0]) {
|
||||
push(@urlPrefixes, $urlPrefix);
|
||||
}
|
||||
|
||||
|
||||
sub rpmvercmp {
|
||||
my ($version1, $version2) = @_;
|
||||
my @vercmps1 = split /\./, $version1;
|
||||
my @vercmps2 = split /\./, $version2;
|
||||
my $l1 = scalar(@vercmps1);
|
||||
my $l2 = scalar(@vercmps2);
|
||||
my $l = min($l1, $l2);
|
||||
|
||||
for(my $i=0; $i<$l; $i++) {
|
||||
my $v1 = $vercmps1[$i];
|
||||
my $v2 = $vercmps2[$i];
|
||||
|
||||
if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) {
|
||||
if ( int($v1) > int($v2) ) {
|
||||
return 1;
|
||||
}
|
||||
elsif ( int($v1) < int($v2) ) {
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
if ( $v1 gt $v2 ) {
|
||||
return 1;
|
||||
}
|
||||
elsif ( $v1 lt $v2 ) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if($l1 == $l2) {
|
||||
return 0;
|
||||
} elsif ($l1 > $l2) {
|
||||
return 1;
|
||||
} elsif ($l1 < $l2) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
my @toplevelPkgs = @ARGV;
|
||||
|
||||
my @archs = split ' ', ($ENV{'archs'} or "");
|
||||
@ -36,7 +75,8 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
|
||||
if (defined $pkgs{$pkg->{name}}) {
|
||||
my $earlierPkg = $pkgs{$pkg->{name}};
|
||||
print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
|
||||
if ($earlierPkg->{'time'}->{file} <= $pkg->{'time'}->{file}) {
|
||||
# <version epoch="0" ver="1.28.0" rel="2.el6"/>
|
||||
if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) {
|
||||
print STDERR "WARNING: replaced package $pkg->{name} with newer one\n";
|
||||
$pkg->{urlPrefix} = $urlPrefixes[$i];
|
||||
$pkgs{$pkg->{name}} = $pkg;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
|
||||
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
|
||||
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
|
||||
, getopt, udev, herqq, phonon
|
||||
, getopt, udev, herqq, phonon, libjpeg
|
||||
}:
|
||||
|
||||
kde {
|
||||
@ -11,7 +11,7 @@ kde {
|
||||
[
|
||||
acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
|
||||
libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
|
||||
shared_desktop_ontologies udev xz libxml2
|
||||
shared_desktop_ontologies udev xz libxml2 libjpeg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ qt4 soprano strigi phonon ];
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clean-2.3";
|
||||
name = "clean-2.4";
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then (fetchurl {
|
||||
url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_boot.tar.gz";
|
||||
sha256 = "0rrjpqdbqwbx7n8v35wi3wpm6lpv9zd1n5q50byb2h0ljqw31j9h";
|
||||
url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz";
|
||||
sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
|
||||
})
|
||||
else if stdenv.system == "x86_64-linux" then (fetchurl {
|
||||
url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_64_boot.tar.gz";
|
||||
sha256 = "0bvkaiwcaa1p6h1bl4bgnia1yd0j8nq6sb1yiwar74y2m1wwmjqj";
|
||||
url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
|
||||
sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
|
||||
})
|
||||
else throw "Architecture not supported";
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.3.20111212";
|
||||
version = "7.4.0.20111219";
|
||||
|
||||
name = "ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
|
||||
sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
|
||||
url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2";
|
||||
sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n";
|
||||
};
|
||||
|
||||
buildInputs = [ghc perl gmp ncurses] ++
|
||||
|
||||
18
pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
Normal file
18
pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ cabal, mtl, network, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HTTP";
|
||||
version = "4000.2.2";
|
||||
sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh";
|
||||
buildDepends = [ mtl network parsec ];
|
||||
meta = {
|
||||
homepage = "https://github.com/haskell/HTTP";
|
||||
description = "A library for client-side HTTP";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -1,14 +1,14 @@
|
||||
{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist
|
||||
, hashable, mtl, syb, text, time, unorderedContainers, vector
|
||||
{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl
|
||||
, syb, text, time, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "aeson";
|
||||
version = "0.4.0.1";
|
||||
sha256 = "15aq3r36vda8v1fn3pn0k638w32kzy15kbrf97krvg3xdwrvybky";
|
||||
version = "0.5.0.0";
|
||||
sha256 = "1n7c0kf6rdf5p76mjcxlqrzhnfz4b1zkkbxk9w94hibb0s4kwxv6";
|
||||
buildDepends = [
|
||||
attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb
|
||||
text time unorderedContainers vector
|
||||
attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
|
||||
unorderedContainers vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/bos/aeson";
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
{ cabal, attoparsec, conduit, text, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "attoparsec-conduit";
|
||||
version = "0.0.0";
|
||||
sha256 = "1cwmi86faisg10l15w8mz3619phvrn2hl10blr6pziv1k8c3ncj7";
|
||||
buildDepends = [ attoparsec conduit text transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/conduit";
|
||||
description = "Turn attoparsec parsers into sinks";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,18 @@
|
||||
{ cabal, blazeBuilder, conduit, text, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "blaze-builder-conduit";
|
||||
version = "0.0.0";
|
||||
sha256 = "022j78sj9cs4xcbvxz0f2lga0rhxcwaj1mkxn0019rbx3lix1nh3";
|
||||
buildDepends = [ blazeBuilder conduit text transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/conduit";
|
||||
description = "Convert streams of builders to streams of 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: {
|
||||
pname = "blaze-html";
|
||||
version = "0.4.3.0";
|
||||
sha256 = "1018mfsc1cqbyxlil136171n9qi9sypchlmmfqawf3aa1sjskmfg";
|
||||
version = "0.4.3.1";
|
||||
sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp";
|
||||
buildDepends = [ blazeBuilder text ];
|
||||
meta = {
|
||||
homepage = "http://jaspervdj.be/blaze";
|
||||
|
||||
17
pkgs/development/libraries/haskell/byteorder/default.nix
Normal file
17
pkgs/development/libraries/haskell/byteorder/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "byteorder";
|
||||
version = "1.0.3";
|
||||
sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way";
|
||||
meta = {
|
||||
homepage = "http://community.haskell.org/~aslatter/code/byteorder";
|
||||
description = "Exposes the native endianness or byte ordering of the system";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
22
pkgs/development/libraries/haskell/conduit/default.nix
Normal file
22
pkgs/development/libraries/haskell/conduit/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ cabal, liftedBase, monadControl, text, transformers
|
||||
, transformersBase
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "0.0.0.1";
|
||||
sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv";
|
||||
buildDepends = [
|
||||
liftedBase monadControl text transformers transformersBase
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/conduit";
|
||||
description = "A pull-based approach to streaming data";
|
||||
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: {
|
||||
pname = "data-accessor";
|
||||
version = "0.2.2";
|
||||
sha256 = "1jqd0qlv1yab83d5pdbzjw6q4a2kvbsar6kgczq0f0xn9gxm0qci";
|
||||
version = "0.2.2.1";
|
||||
sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb";
|
||||
buildDepends = [ transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Record_access";
|
||||
|
||||
@ -1,20 +1,19 @@
|
||||
{ cabal, convertibleText, dataObject, enumerator, failure, text
|
||||
{ cabal, conduit, convertibleText, dataObject, failure, text
|
||||
, transformers, yaml
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "data-object-yaml";
|
||||
version = "0.3.3.6";
|
||||
sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3";
|
||||
version = "0.3.4";
|
||||
sha256 = "1wx6m7mjmdks8ym6dh117bhkdks4d1jlfchqif0svcwg04qnfczd";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
convertibleText dataObject enumerator failure text transformers
|
||||
yaml
|
||||
conduit convertibleText dataObject failure text transformers yaml
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/data-object-yaml";
|
||||
description = "Serialize data to and from Yaml files";
|
||||
description = "Serialize data to and from Yaml files (deprecated)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "derive";
|
||||
version = "2.5.4";
|
||||
sha256 = "0gmj24qzh3vyvp0a44v4mf1qpkrg4d9q0m15d0yfbyzrimyjx1c7";
|
||||
version = "2.5.5";
|
||||
sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ haskellSrcExts syb transformers uniplate ];
|
||||
|
||||
18
pkgs/development/libraries/haskell/dstring/default.nix
Normal file
18
pkgs/development/libraries/haskell/dstring/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ cabal, baseUnicodeSymbols, dlist }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "dstring";
|
||||
version = "0.4.0.3";
|
||||
sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c";
|
||||
buildDepends = [ baseUnicodeSymbols dlist ];
|
||||
meta = {
|
||||
homepage = "https://github.com/basvandijk/dstring";
|
||||
description = "Difference strings";
|
||||
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: {
|
||||
pname = "enumerator";
|
||||
version = "0.4.16";
|
||||
sha256 = "16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs";
|
||||
version = "0.4.17";
|
||||
sha256 = "009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9";
|
||||
buildDepends = [ text transformers ];
|
||||
meta = {
|
||||
homepage = "https://john-millikin.com/software/enumerator/";
|
||||
|
||||
17
pkgs/development/libraries/haskell/fast-logger/default.nix
Normal file
17
pkgs/development/libraries/haskell/fast-logger/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ cabal, blazeBuilder }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "fast-logger";
|
||||
version = "0.0.1";
|
||||
sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim";
|
||||
buildDepends = [ blazeBuilder ];
|
||||
meta = {
|
||||
description = "A fast logging system";
|
||||
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: {
|
||||
pname = "gloss";
|
||||
version = "1.5.2.1";
|
||||
sha256 = "1mwk9gnkbjr76f9g79ixxlwzpsvmhflp5c8a0584fyypjg2r33n3";
|
||||
version = "1.6.0.1";
|
||||
sha256 = "0yy8yl2s3n0kyr14bcxp1hjzh3wlrhc0xp2ngl3wbz1hbzyrsdlf";
|
||||
buildDepends = [ bmp GLUT OpenGL ];
|
||||
meta = {
|
||||
homepage = "http://gloss.ouroborus.net";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hamlet";
|
||||
version = "0.10.5";
|
||||
sha256 = "0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3";
|
||||
version = "0.10.6";
|
||||
sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml failure parsec shakespeare text
|
||||
];
|
||||
|
||||
@ -1,14 +1,10 @@
|
||||
{ cabal, binary, blas, gsl, HUnit, liblapack, QuickCheck, random
|
||||
, storableComplex, vector
|
||||
}:
|
||||
{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hmatrix";
|
||||
version = "0.12.0.2";
|
||||
sha256 = "08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d";
|
||||
buildDepends = [
|
||||
binary HUnit QuickCheck random storableComplex vector
|
||||
];
|
||||
version = "0.13.0.0";
|
||||
sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd";
|
||||
buildDepends = [ binary storableComplex vector ];
|
||||
extraLibraries = [ blas gsl liblapack ];
|
||||
configureFlags = "-fvector";
|
||||
meta = {
|
||||
|
||||
31
pkgs/development/libraries/haskell/http-conduit/default.nix
Normal file
31
pkgs/development/libraries/haskell/http-conduit/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
|
||||
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
|
||||
, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
|
||||
, monadControl, network, text, tls, tlsExtra, transformers
|
||||
, transformersBase, utf8String, zlibConduit, zlibEnum
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.0.0";
|
||||
sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cprngAes
|
||||
dataDefault failure httpTypes liftedBase monadControl network text
|
||||
tls tlsExtra transformers transformersBase utf8String zlibConduit
|
||||
zlibEnum
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/http-enumerator";
|
||||
description = "HTTP client package with conduit interface and HTTPS support";
|
||||
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: {
|
||||
pname = "http-enumerator";
|
||||
version = "0.7.2";
|
||||
sha256 = "096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc";
|
||||
version = "0.7.2.1";
|
||||
sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
20
pkgs/development/libraries/haskell/lifted-base/default.nix
Normal file
20
pkgs/development/libraries/haskell/lifted-base/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ cabal, baseUnicodeSymbols, monadControl, transformersBase }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lifted-base";
|
||||
version = "0.1.0.2";
|
||||
sha256 = "1j810pdkhl6kpc368081ar1k9342k3bl4cmx294zdyd0j00n23zx";
|
||||
buildDepends = [
|
||||
baseUnicodeSymbols monadControl transformersBase
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/basvandijk/lifted-base";
|
||||
description = "lifted IO operations from the base library";
|
||||
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: {
|
||||
pname = "multirec";
|
||||
version = "0.7";
|
||||
sha256 = "1n196qqggfnk8fa1x296rdbyb77a6ykhy01z8x2glgdimzpxsiay";
|
||||
version = "0.7.1";
|
||||
sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph";
|
||||
noHaddock = true;
|
||||
meta = {
|
||||
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
|
||||
|
||||
18
pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
Executable file
18
pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
Executable file
@ -0,0 +1,18 @@
|
||||
{ cabal, text }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "path-pieces";
|
||||
version = "0.1.0";
|
||||
sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/path-pieces";
|
||||
description = "Components of paths";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent";
|
||||
version = "0.6.4.3";
|
||||
sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4";
|
||||
version = "0.6.4.4";
|
||||
sha256 = "0n4zl0r8nmp3pwsgc0kiy7fgk2dfvdvagv1gvjxrs8545c5ycggv";
|
||||
buildDepends = [
|
||||
blazeHtml dataObject enumerator monadControl mtl pathPieces pool
|
||||
text time transformers transformersBase
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "regular";
|
||||
version = "0.3.3";
|
||||
sha256 = "1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7";
|
||||
version = "0.3.4";
|
||||
sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq";
|
||||
meta = {
|
||||
description = "Generic programming library for regular datatypes";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
20
pkgs/development/libraries/haskell/repr/default.nix
Normal file
20
pkgs/development/libraries/haskell/repr/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "repr";
|
||||
version = "0.4.1.2";
|
||||
sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs";
|
||||
buildDepends = [
|
||||
baseUnicodeSymbols dstring random stringCombinators
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/basvandijk/repr";
|
||||
description = "Render overloaded expressions to their textual representation";
|
||||
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: {
|
||||
pname = "shakespeare-css";
|
||||
version = "0.10.4";
|
||||
sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz";
|
||||
version = "0.10.5";
|
||||
sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs";
|
||||
buildDepends = [ parsec shakespeare text ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/templates";
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
{ cabal, parsec, shakespeare, text }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "shakespeare-i18n";
|
||||
version = "0.0.0";
|
||||
sha256 = "1zyr63ncd92c30afh0sf4lq7p253jd3gjvcv65f7i0njqpc1lg9y";
|
||||
buildDepends = [ parsec shakespeare text ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/i18n";
|
||||
description = "A type-based approach to internationalization";
|
||||
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: {
|
||||
pname = "shakespeare-js";
|
||||
version = "0.10.3";
|
||||
sha256 = "1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2";
|
||||
version = "0.10.4";
|
||||
sha256 = "15mh93d38qpqnrgxvaq659zwl2mks9xhkynhlpjrf8zb234knxjw";
|
||||
buildDepends = [ shakespeare text ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/templates";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "simple-sendfile";
|
||||
version = "0.1.3";
|
||||
sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8";
|
||||
version = "0.2.0";
|
||||
sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264";
|
||||
buildDepends = [ network ];
|
||||
meta = {
|
||||
description = "Cross platform library for the sendfile system call";
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
{ cabal, baseUnicodeSymbols }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "string-combinators";
|
||||
version = "0.6.0.2";
|
||||
sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi";
|
||||
buildDepends = [ baseUnicodeSymbols ];
|
||||
meta = {
|
||||
homepage = "https://github.com/basvandijk/string-combinators";
|
||||
description = "Polymorphic functions to build and combine stringlike values";
|
||||
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: {
|
||||
pname = "syb-with-class";
|
||||
version = "0.6.1.2";
|
||||
sha256 = "1hzwhfpl4w5nblkr2l4l4i7xxkvv7n5adr3i9miqmw1krlxs852d";
|
||||
version = "0.6.1.3";
|
||||
sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d";
|
||||
meta = {
|
||||
description = "Scrap Your Boilerplate With Class";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "texmath";
|
||||
version = "0.5.0.3";
|
||||
sha256 = "0pw3b5qvsngy0wdny8y3widkaphvjksg7mnpa8yzqfsw0rl36s0p";
|
||||
version = "0.5.0.4";
|
||||
sha256 = "0wi7zix10p73hb8aiyq47d27k5hi0l0ba5p6h7kdbhia9xm5w5w5";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ parsec syb xml ];
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive
|
||||
, dataDefault, enumerator, httpTypes, network, text, time
|
||||
, transformers, wai, zlibBindings, zlibEnum
|
||||
, dataDefault, enumerator, fastLogger, httpTypes, network, text
|
||||
, time, transformers, wai, zlibBindings, zlibEnum
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-extra";
|
||||
version = "0.4.5.2";
|
||||
sha256 = "05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1";
|
||||
version = "0.4.6";
|
||||
sha256 = "1wpdfzw5qzbd33iypgppp4822vn7vhja6y26dnkb17n08r83vvhv";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault
|
||||
enumerator httpTypes network text time transformers wai
|
||||
enumerator fastLogger httpTypes network text time transformers wai
|
||||
zlibBindings zlibEnum
|
||||
];
|
||||
meta = {
|
||||
|
||||
22
pkgs/development/libraries/haskell/wai-logger/default.nix
Normal file
22
pkgs/development/libraries/haskell/wai-logger/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger
|
||||
, httpTypes, network, time, wai
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-logger";
|
||||
version = "0.1.2";
|
||||
sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9";
|
||||
buildDepends = [
|
||||
blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
|
||||
time wai
|
||||
];
|
||||
meta = {
|
||||
description = "A logging system for WAI";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "0.4.6.2";
|
||||
sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94";
|
||||
version = "0.4.6.3";
|
||||
sha256 = "1gfjhp1s42ynpi3kh8fr6fp5nwirxz0gasr7zs7q2qwwvlq9pzm6";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
|
||||
httpTypes network simpleSendfile transformers unixCompat wai
|
||||
|
||||
25
pkgs/development/libraries/haskell/xml-conduit/default.nix
Normal file
25
pkgs/development/libraries/haskell/xml-conduit/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ cabal, attoparsec, attoparsecConduit, blazeBuilder
|
||||
, blazeBuilderConduit, conduit, dataDefault, failure
|
||||
, systemFilepath, text, transformers, xmlTypes
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xml-conduit";
|
||||
version = "0.5.0";
|
||||
sha256 = "008rrqglxajihcf3yp9cwif67dnabyjjiymxvssznrl8ljz4yn8y";
|
||||
buildDepends = [
|
||||
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
|
||||
conduit dataDefault failure systemFilepath text transformers
|
||||
xmlTypes
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/xml";
|
||||
description = "Pure-Haskell utilities for dealing with XML with the conduit package";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -1,12 +1,15 @@
|
||||
{ cabal, enumerator, transformers }:
|
||||
{ cabal, aeson, attoparsec, conduit, text, transformers
|
||||
, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yaml";
|
||||
version = "0.4.1.2";
|
||||
sha256 = "1c7ffs5gkwk0l0vg7amsflra1j8ifd9cvvbqx9jzkqsay8hbr4vb";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ enumerator transformers ];
|
||||
version = "0.5.1.1";
|
||||
sha256 = "1l3f1rbdajdf9944kwbf90a1wxv00g2jcgjkg54k6c3iqbx956w2";
|
||||
buildDepends = [
|
||||
aeson attoparsec conduit text transformers unorderedContainers
|
||||
vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/yaml/";
|
||||
description = "Low-level binding to the libyaml C library";
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-auth";
|
||||
version = "0.7.8";
|
||||
sha256 = "1v3mvb22g56frvwb82l73k7cqrl926hg133x5idl5q66fp8h94q0";
|
||||
version = "0.7.9";
|
||||
sha256 = "08vlj61y3czv0v8dnfdkyfww5sccia6j0fxnn1hxk44zghwhy214";
|
||||
buildDepends = [
|
||||
aeson authenticate blazeHtml controlMonadAttempt hamlet
|
||||
httpEnumerator mimeMail persistent persistentTemplate pureMD5
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal
|
||||
, clientsession, cookie, dataObject, dataObjectYaml, enumerator
|
||||
, failure, hamlet, httpTypes, monadControl, parsec, pathPieces
|
||||
, random, shakespeare, shakespeareCss, shakespeareJs
|
||||
, strictConcurrency, text, time, transformers, transformersBase
|
||||
, vector, wai, waiExtra
|
||||
, failure, fastLogger, hamlet, httpTypes, monadControl, parsec
|
||||
, pathPieces, random, shakespeare, shakespeareCss, shakespeareI18n
|
||||
, shakespeareJs, text, time, transformers, transformersBase, vector
|
||||
, wai, waiExtra, waiLogger
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-core";
|
||||
version = "0.9.3.6";
|
||||
sha256 = "00h1ylrr5wrid9vn3jhspibprx0175j9rcwdb1hd7ya5gwmzlhjs";
|
||||
version = "0.9.4";
|
||||
sha256 = "1m9cxm3pngg4pq7j3p1sh7lrjp5gslnn6zcimc5ln8yldxx01c6g";
|
||||
buildDepends = [
|
||||
aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
|
||||
cookie dataObject dataObjectYaml enumerator failure hamlet
|
||||
httpTypes monadControl parsec pathPieces random shakespeare
|
||||
shakespeareCss shakespeareJs strictConcurrency text time
|
||||
transformers transformersBase vector wai waiExtra
|
||||
cookie dataObject dataObjectYaml enumerator failure fastLogger
|
||||
hamlet httpTypes monadControl parsec pathPieces random shakespeare
|
||||
shakespeareCss shakespeareI18n shakespeareJs text time transformers
|
||||
transformersBase vector wai waiExtra waiLogger
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-form";
|
||||
version = "0.3.4.1";
|
||||
sha256 = "0khkc4bpqfgfs0zl753x4l5qpkfr8hv0kwzz6qpry5skxa326q6i";
|
||||
version = "0.3.4.2";
|
||||
sha256 = "1ahkbycxvjh1yvxfbf8wg6mlklmwm8hmy15x0b07g2xq7h1jmc5i";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
|
||||
persistent shakespeareCss shakespeareJs text time transformers wai
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ cabal, aeson, shakespeareJs, text, unorderedContainers, vector
|
||||
, yesodCore
|
||||
{ cabal, aeson, attoparsecEnumerator, blazeBuilder, shakespeareJs
|
||||
, text, transformers, unorderedContainers, vector, yesodCore
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-json";
|
||||
version = "0.2.2.1";
|
||||
sha256 = "16l5ygj9xsg2lzw3mkn1kmq543n9w5z1g6lyl8nw5bblp66lfxq3";
|
||||
version = "0.2.3";
|
||||
sha256 = "0bd75zzxqrarqk8b2v515jv0zbi5x27fmb9cbj3g57l9ig57lqy5";
|
||||
buildDepends = [
|
||||
aeson shakespeareJs text unorderedContainers vector yesodCore
|
||||
aeson attoparsecEnumerator blazeBuilder shakespeareJs text
|
||||
transformers unorderedContainers vector yesodCore
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-static";
|
||||
version = "0.3.2";
|
||||
sha256 = "0m0fws0bwhf1cyw1a3cg85mhdjr9pv35a39671jsqkkvmmxiixlf";
|
||||
version = "0.3.2.1";
|
||||
sha256 = "0gggavj5bxb12axlfl8kmqizgg55nmcrr6z5za60n3bp70sq4vn4";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text
|
||||
transformers unixCompat wai waiAppStatic yesodCore
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod";
|
||||
version = "0.9.3.4";
|
||||
sha256 = "1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v";
|
||||
version = "0.9.4.1";
|
||||
sha256 = "0dcd4m91liash046i0qaq51s447sl4fn55gsg7mi807lffik436q";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zipper";
|
||||
version = "0.4";
|
||||
sha256 = "0s3gw883kwxgmz9sk3638ba8i1zb5dirv2hanc3caf6pfay6caks";
|
||||
version = "0.4.1";
|
||||
sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi";
|
||||
buildDepends = [ multirec ];
|
||||
meta = {
|
||||
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
|
||||
|
||||
18
pkgs/development/libraries/haskell/zlib-conduit/default.nix
Normal file
18
pkgs/development/libraries/haskell/zlib-conduit/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ cabal, conduit, transformers, zlibBindings }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zlib-conduit";
|
||||
version = "0.0.0";
|
||||
sha256 = "1nqcw809xqlycggn4nqys205gv3kjwws16910xlx2b8b9f8ayxjg";
|
||||
buildDepends = [ conduit transformers zlibBindings ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/conduit";
|
||||
description = "Streaming compression/decompression via conduits";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, qt4, cmake, doxygen }:
|
||||
{ stdenv, fetchurl, qt4, cmake }:
|
||||
|
||||
let
|
||||
baseName = "libdbusmenu-qt";
|
||||
v = "0.8.3";
|
||||
v = "0.9.0";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -10,10 +10,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
|
||||
sha256 = "1fkw6wpxjmmx4p8779z662qphip3pgdcsn6cyb0frryfj4sa32ka";
|
||||
sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 doxygen ];
|
||||
buildInputs = [ qt4 ];
|
||||
buildNativeInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = "-DWITH_DOC=OFF";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Provides a Qt implementation of the DBusMenu spec";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
rec {
|
||||
advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz";
|
||||
version = "3.8";
|
||||
url="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz";
|
||||
hash = "1512n6c5q9ykqmk5zbwyb1na9qb9shd900kf4xhl5g07aypm7qr5";
|
||||
name = "libev-3.8";
|
||||
advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz";
|
||||
version = "4.04";
|
||||
url="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz";
|
||||
hash = "ab3a09e967e3b868055cd9363fd236aa093f8643d19cc7042e90e0dfe905b012";
|
||||
name = "libev-4.04";
|
||||
|
||||
}
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "popt-1.15";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "popt-1.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://rpm5.org/files/popt/popt-1.15.tar.gz;
|
||||
sha256 = "1wqbcimg4zlfp7261i89s1918a46fjfbvq1a4ij4a6prk27576q6";
|
||||
url = "http://rpm5.org/files/popt/${name}.tar.gz";
|
||||
sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "command line option parsing library";
|
||||
};
|
||||
}
|
||||
|
||||
@ -85,7 +85,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# The following libraries are only used in plugins
|
||||
buildInputs = [ cups # Qt dlopen's libcups instead of linking to it
|
||||
mysql postgresql sqlite libjpeg libmng libtiff icu ];
|
||||
mysql postgresql sqlite libjpeg libmng libtiff icu ]
|
||||
++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ];
|
||||
|
||||
buildNativeInputs = [ perl pkgconfig which ];
|
||||
|
||||
|
||||
@ -1,26 +1,20 @@
|
||||
{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }:
|
||||
{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
|
||||
, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "soprano-2.7.0";
|
||||
name = "soprano-2.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/soprano/${name}.tar.bz2";
|
||||
sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
|
||||
sha256 = "0f6kg39bi4h4iblfs9ny88cs951sigm50yr6w50afc3f1nqzdmhp";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ (fetchurl { # Applied upstream, remove if upgrading
|
||||
url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
|
||||
name = "soprano-virtuoso-restart.patch";
|
||||
sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
|
||||
})
|
||||
./find-virtuoso.patch
|
||||
];
|
||||
patches = [ ./find-virtuoso.patch ];
|
||||
|
||||
# We disable the Java backend, since we do not need them and they make the closure size much bigger
|
||||
buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
|
||||
|
||||
buildNativeInputs = [ cmake ];
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
|
||||
meta = {
|
||||
homepage = http://soprano.sourceforge.net/;
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}:
|
||||
|
||||
let
|
||||
version = "0.10";
|
||||
version = "0.12";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "libstartup-notification-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
|
||||
sha256 = "0nalaay0yj3gq85insp9l31hsv5zp390m4nn37y235v151ffpfv4";
|
||||
sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libxcb pkgconfig xcbutil ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
|
||||
, clucene_core, fam, zlib, dbus_tools
|
||||
, clucene_core, fam, zlib, dbus_tools, pkgconfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
|
||||
CLUCENE_HOME = clucene_core;
|
||||
|
||||
buildInputs =
|
||||
[ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
|
||||
[ zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig perl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,41 +1,41 @@
|
||||
{ fetchurl, stdenv, python
|
||||
, libjpeg, zlib, freetype }:
|
||||
{ fetchurl, stdenv, python, libjpeg, zlib, freetype }:
|
||||
|
||||
let version = "1.1.6";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "python-imaging-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
|
||||
sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
|
||||
};
|
||||
let version = "1.1.7"; in
|
||||
|
||||
buildInputs = [ python libjpeg zlib freetype ];
|
||||
stdenv.mkDerivation {
|
||||
name = "python-imaging-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
|
||||
sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
buildInputs = [ python libjpeg zlib freetype ];
|
||||
|
||||
configurePhase = ''
|
||||
sed -i "setup.py" \
|
||||
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
|
||||
s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
|
||||
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
|
||||
doCheck = true;
|
||||
|
||||
configurePhase = ''
|
||||
sed -i "setup.py" \
|
||||
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
|
||||
s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
|
||||
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
|
||||
'';
|
||||
|
||||
buildPhase = "python setup.py build_ext -i";
|
||||
checkPhase = "python selftest.py";
|
||||
installPhase = "python setup.py install --prefix=$out";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.pythonware.com/products/pil/;
|
||||
description = "The Python Imaging Library (PIL)";
|
||||
|
||||
longDescription = ''
|
||||
The Python Imaging Library (PIL) adds image processing
|
||||
capabilities to your Python interpreter. This library
|
||||
supports many file formats, and provides powerful image
|
||||
processing and graphics capabilities.
|
||||
'';
|
||||
|
||||
buildPhase = "python setup.py build_ext -i";
|
||||
checkPhase = "python selftest.py";
|
||||
installPhase = "python setup.py install --prefix=$out";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.pythonware.com/products/pil/;
|
||||
description = "The Python Imaging Library (PIL)";
|
||||
|
||||
longDescription = ''
|
||||
The Python Imaging Library (PIL) adds image processing
|
||||
capabilities to your Python interpreter. This library
|
||||
supports many file formats, and provides powerful image
|
||||
processing and graphics capabilities.
|
||||
'';
|
||||
|
||||
license = "http://www.pythonware.com/products/pil/license.htm";
|
||||
};
|
||||
}
|
||||
license = "http://www.pythonware.com/products/pil/license.htm";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cabal2nix";
|
||||
version = "1.21";
|
||||
sha256 = "00gsayb7axxm8z9jrngckb7c666x1kibvln67g2rpchi6djg6wn7";
|
||||
version = "1.23";
|
||||
sha256 = "1rnvnzwb4n89hq4wpyq1h6x773r7y23clqj5slsfnas7j3alzz8c";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
|
||||
|
||||
@ -29,7 +29,7 @@ let
|
||||
|
||||
nixConfig = ''
|
||||
CONFIG_PREFIX "$out"
|
||||
CONFIG_INSTALL_NO_USR n
|
||||
CONFIG_INSTALL_NO_USR y
|
||||
'';
|
||||
|
||||
staticConfig = (if enableStatic then ''
|
||||
@ -58,12 +58,6 @@ stdenv.mkDerivation rec {
|
||||
make oldconfig
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv -v $out/usr/bin/* $out/bin
|
||||
mv -v $out/usr/sbin/* $out/sbin
|
||||
rm -fRv $out/usr/
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
extraCrossConfig = ''
|
||||
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"
|
||||
|
||||
@ -1,25 +1,19 @@
|
||||
{stdenv, fetchurl, libuuid, popt, devicemapper, udev }:
|
||||
{stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt, udev }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cryptsetup-1.0.6";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cryptsetup-1.4.1";
|
||||
src = fetchurl {
|
||||
url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2;
|
||||
sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd";
|
||||
url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2";
|
||||
sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-libdevmapper" ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c
|
||||
'';
|
||||
|
||||
buildInputs = [ libuuid popt devicemapper ];
|
||||
buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ];
|
||||
|
||||
meta = {
|
||||
homepage = http://code.google.com/p/cryptsetup/;
|
||||
description = "LUKS for dm-crypt";
|
||||
license = "GPLv2";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
maintainers = with stdenv.lib.maintainers; [ viric chaoflow ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -214,9 +214,9 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.2-rc6";
|
||||
version = "3.2-rc7";
|
||||
|
||||
modDirVersion = "3.2.0-rc6";
|
||||
modDirVersion = "3.2.0-rc7";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
|
||||
@ -225,7 +225,7 @@ import ./generic.nix (
|
||||
src = fetchurl {
|
||||
#url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
|
||||
url = "mirror://kernel/linux/kernel/v3.0/testing/linux-${version}.tar.bz2";
|
||||
sha256 = "18wdp3r3xvq12ddv7c7z0h0i8zsm3wrahl83s6jqbixrw4aq5zbd";
|
||||
sha256 = "0phakj1c97n2fdz9lh5gmpg6c5g45z2xpgrz3q2z2y9w9dgk3mqd";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -19,6 +19,10 @@ stdenv.mkDerivation {
|
||||
|
||||
makeFlags = "DESTDIR=$(out)";
|
||||
|
||||
crossAttrs = {
|
||||
CC = stdenv.cross.config + "-gcc";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://procps.sourceforge.net/;
|
||||
description = "Utilities that give information about processes using the /proc filesystem";
|
||||
|
||||
@ -1148,11 +1148,51 @@ let
|
||||
})) // {inherit python ;};
|
||||
|
||||
xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
|
||||
name = "xcb-util-0.3.6";
|
||||
name = "xcb-util-0.3.8";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2;
|
||||
sha256 = "0mqfyq6skm19hhfmd5kmcn0v4di4pmbdszmbf2lmhn01mc8yxf7z";
|
||||
url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2;
|
||||
sha256 = "1fa7njhg7dsqbrkwrzbkfszdp1dmggvlsrb05qshkg2h8wldkvn1";
|
||||
};
|
||||
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
|
||||
})) // {inherit gperf m4 libxcb xproto ;};
|
||||
|
||||
xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) {
|
||||
name = "xcb-util-image-0.3.8";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2;
|
||||
sha256 = "1nd67105lb8qfa7r2lli5sxnipi1p1wnbwa04l9k30kfq8l0afa0";
|
||||
};
|
||||
buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
|
||||
})) // {inherit gperf m4 libxcb xcbutil xproto ;};
|
||||
|
||||
xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) {
|
||||
name = "xcb-util-keysyms-0.3.8";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2;
|
||||
sha256 = "08b1d19gaqv3agpkvh5mgcir11vjy89ywdknva0cb073mzvk4gci";
|
||||
};
|
||||
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
|
||||
})) // {inherit gperf m4 libxcb xproto ;};
|
||||
|
||||
xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
|
||||
name = "xcb-util-renderutil-0.3.8";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2;
|
||||
sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp";
|
||||
};
|
||||
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
|
||||
})) // {inherit gperf m4 libxcb xproto ;};
|
||||
|
||||
xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
|
||||
name = "xcb-util-wm-0.3.8";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2;
|
||||
sha256 = "01shwv13rfcxycrsla6c5xlrk1qska7kvvj10n7jcibx9jzanmy5";
|
||||
};
|
||||
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
|
||||
})) // {inherit gperf m4 libxcb xproto ;};
|
||||
@ -1432,7 +1472,7 @@ let
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2;
|
||||
sha256 = "017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc";
|
||||
sha256 = "1p18lfw7ii8k1vam75wv9a2piwf6n2988dh56i4b98zf4av78y81";
|
||||
};
|
||||
buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
|
||||
})) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
|
||||
@ -1537,7 +1577,7 @@ let
|
||||
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
|
||||
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
|
||||
|
||||
xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
|
||||
xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) {
|
||||
name = "xf86-video-intel-2.14.901";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
@ -1547,6 +1587,16 @@ let
|
||||
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
|
||||
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
|
||||
|
||||
xf86videointel_2_17_0 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_17_0 then overrides.xf86videointel_2_17_0 else x: x) {
|
||||
name = "xf86-video-intel-2.17.0";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2;
|
||||
sha256 = "11s3vjp0lrfmb4bv848fd5bajj77j3rf451lm0qyylnclbr5114b";
|
||||
};
|
||||
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ];
|
||||
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
|
||||
|
||||
xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
|
||||
name = "xf86-video-mach64-6.8.2";
|
||||
builder = ./builder.sh;
|
||||
@ -1978,14 +2028,14 @@ let
|
||||
})) // {inherit libxcb ;};
|
||||
|
||||
xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) {
|
||||
name = "xlsclients-1.1.1";
|
||||
name = "xlsclients-1.1.2";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2;
|
||||
sha256 = "0ng81cm40881gddzwrfdbsvbnqfpqllxaxdsa8m2ljqxlq9mwfs5";
|
||||
url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2;
|
||||
sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w";
|
||||
};
|
||||
buildInputs = [pkgconfig libxcb xcbutil ];
|
||||
})) // {inherit libxcb xcbutil ;};
|
||||
buildInputs = [pkgconfig libxcb ];
|
||||
})) // {inherit libxcb ;};
|
||||
|
||||
xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) {
|
||||
name = "xmessage-1.0.3";
|
||||
|
||||
@ -1,2 +1,8 @@
|
||||
mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901
|
||||
mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0
|
||||
mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
|
||||
mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2
|
||||
mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2
|
||||
mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2
|
||||
mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
|
||||
mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2
|
||||
|
||||
@ -2,9 +2,13 @@
|
||||
|
||||
# Typical command to generate the list of tarballs:
|
||||
|
||||
# export i="mirror://xorg/X11R7.4/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.4.list
|
||||
# export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list
|
||||
# manually update extra.list
|
||||
# then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
|
||||
# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
|
||||
# tarballs-x.y.list is generated + changes for individual packages
|
||||
# extra.list are packages not contained in the tarballs
|
||||
# old.list are packages that used to be part of the tarballs
|
||||
|
||||
|
||||
use strict;
|
||||
|
||||
@ -44,11 +48,16 @@ while (<>) {
|
||||
my $tarball = "$_";
|
||||
print "\nDOING TARBALL $tarball\n";
|
||||
|
||||
$tarball =~ /\/((?:(?:[A-Za-z0-9]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/;
|
||||
die unless defined $1;
|
||||
my $pkg = $1;
|
||||
$pkg =~ s/-//g;
|
||||
#next unless $pkg eq "xcbutil";
|
||||
my $pkg;
|
||||
if ($tarball =~ s/:([a-zA-Z0-9_]+)$//) {
|
||||
$pkg = $1;
|
||||
} else {
|
||||
$tarball =~ /\/((?:(?:[A-Za-z0-9]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/;
|
||||
die unless defined $1;
|
||||
$pkg = $1;
|
||||
$pkg =~ s/-//g;
|
||||
#next unless $pkg eq "xcbutil";
|
||||
}
|
||||
|
||||
$tarball =~ /\/([^\/]*)\.tar\.bz2$/;
|
||||
my $pkgName = $1;
|
||||
|
||||
@ -3,8 +3,8 @@ mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
|
||||
mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2
|
||||
mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
|
||||
@ -179,7 +179,7 @@ mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2
|
||||
mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2
|
||||
mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2
|
||||
mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
|
||||
version = "4.3.10";
|
||||
version = "4.3.15";
|
||||
|
||||
documentation = fetchurl {
|
||||
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
|
||||
sha256 = "f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9";
|
||||
sha256 = "73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4";
|
||||
};
|
||||
|
||||
in
|
||||
@ -16,15 +16,53 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
|
||||
sha256 = "63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c";
|
||||
sha256 = "8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486";
|
||||
};
|
||||
|
||||
configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
|
||||
buildInputs = [ ncurses coreutils ];
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp"
|
||||
'';
|
||||
|
||||
# XXX: think/discuss about this, also with respect to nixos vs nix-on-X
|
||||
postInstall = ''
|
||||
ensureDir $out/share/
|
||||
tar xf ${documentation} -C $out/share
|
||||
ensureDir $out/etc/
|
||||
cat > $out/etc/zprofile <<EOF
|
||||
if test -e /etc/NIXOS; then
|
||||
if test -r /etc/zprofile; then
|
||||
. /etc/zprofile
|
||||
else
|
||||
emulate bash
|
||||
alias shopt=false
|
||||
. /etc/profile
|
||||
unalias shopt
|
||||
emulate zsh
|
||||
fi
|
||||
if test -r /etc/zprofile.local; then
|
||||
. /etc/zprofile.local
|
||||
fi
|
||||
else
|
||||
# on non-nixos we just source the global /etc/zprofile as if we did
|
||||
# not use the configure flag
|
||||
if test -r /etc/zprofile; then
|
||||
. /etc/zprofile
|
||||
fi
|
||||
fi
|
||||
EOF
|
||||
$out/bin/zsh -c "zcompile $out/etc/zprofile"
|
||||
mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used
|
||||
'';
|
||||
# XXX: patch zsh to take zwc if newer _or equal_
|
||||
|
||||
buildInputs = [ncurses coreutils];
|
||||
meta = {
|
||||
description = "the Z shell";
|
||||
longDescription = "Zsh is a UNIX command interpreter (shell) usable as an interactive login shell and as a shell script command processor. Of the standard shells, zsh most closely resembles ksh but includes many enhancements. Zsh has command line editing, builtin spelling correction, programmable command completion, shell functions (with autoloading), a history mechanism, and a host of other features.";
|
||||
license = "MIT-like";
|
||||
homePage = "http://www.zsh.org/";
|
||||
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
|
||||
31
pkgs/tools/networking/smbldaptools/default.nix
Normal file
31
pkgs/tools/networking/smbldaptools/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}:
|
||||
|
||||
let
|
||||
version = "0.9.7";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "smbldap-tools-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/smbldap-tools/sources/${version}/smbldap-tools-${version}.tar.gz";
|
||||
sha256 = "0y1k2j5qjxy66yvl36adbp9m1brapiz9ycaisdyy6093xvw1nh7j";
|
||||
};
|
||||
|
||||
buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ];
|
||||
|
||||
preConfigure = ''
|
||||
export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for i in $out/sbin/*; do
|
||||
wrapProgram $i \
|
||||
--prefix PERL5LIB : $PERL5LIB:$out/lib/perl5/site_perl
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://gna.org/projects/smbldap-tools/;
|
||||
description = "SAMBA LDAP tools";
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, zlib, libpng, gd, geoip, db4}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "webalizer-2.21-02";
|
||||
name = "webalizer-2.23-05";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.21-02-src.tgz;
|
||||
sha256 = "0spfsqxhgfnmd2yyhrmrj8chjilr8qbx1g2n3kn44k9gd4y3jfc7";
|
||||
url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2;
|
||||
sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g";
|
||||
};
|
||||
|
||||
preConfigure =
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ fetchurl, stdenv, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "asciidoc-8.6.1";
|
||||
name = "asciidoc-8.6.6";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/asciidoc/${name}.tar.gz";
|
||||
sha256 = "1c844ahv4naghfv1jabyr8gnv2fsx4k7366vh63zx0h0w2x7ylaq";
|
||||
sha256 = "9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -1342,6 +1342,10 @@ let
|
||||
|
||||
smartmontools = callPackage ../tools/system/smartmontools { };
|
||||
|
||||
smbldaptools = callPackage ../tools/networking/smbldaptools {
|
||||
inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1;
|
||||
};
|
||||
|
||||
smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
|
||||
|
||||
fusesmb = callPackage ../tools/filesystems/fusesmb { };
|
||||
@ -2232,7 +2236,8 @@ let
|
||||
# Reasonably current HEAD snapshot. Should *always* be lowPrio.
|
||||
haskellPackages_ghcHEAD =
|
||||
haskellPackagesFun ../development/compilers/ghc/head.nix
|
||||
(haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
|
||||
# (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
|
||||
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
|
||||
(x : x.ghcHEADPrefs) false false lowPrio;
|
||||
|
||||
haxeDist = import ../development/compilers/haxe {
|
||||
@ -7412,6 +7417,10 @@ let
|
||||
withKde = getConfig [ "taskJuggler" "kde" ] false;
|
||||
};
|
||||
|
||||
taskwarrior = callPackage ../applications/misc/taskwarrior { };
|
||||
|
||||
taskwarrior_unstable = callPackage ../applications/misc/taskwarrior/unstable.nix { };
|
||||
|
||||
tesseract = callPackage ../applications/graphics/tesseract { };
|
||||
|
||||
thinkingRock = callPackage ../applications/misc/thinking-rock { };
|
||||
@ -8034,7 +8043,9 @@ let
|
||||
|
||||
bluedevil = callPackage ../tools/bluetooth/bluedevil { };
|
||||
|
||||
digikam = callPackage ../applications/graphics/digikam { };
|
||||
digikam = callPackage ../applications/graphics/digikam {
|
||||
boost = boost147;
|
||||
};
|
||||
|
||||
k3b = callPackage ../applications/misc/k3b { };
|
||||
|
||||
|
||||
@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok
|
||||
xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
|
||||
zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
|
||||
HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok
|
||||
HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok
|
||||
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
|
||||
text = self.text_0_11_1_12; # 7.2 ok, 7.3 ok
|
||||
transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok
|
||||
@ -439,6 +439,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
attoparsec = callPackage ../development/libraries/haskell/attoparsec {};
|
||||
|
||||
attoparsecConduit = callPackage ../development/libraries/haskell/attoparsec-conduit {};
|
||||
|
||||
attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {};
|
||||
|
||||
authenticate = callPackage ../development/libraries/haskell/authenticate {};
|
||||
@ -467,6 +469,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
|
||||
|
||||
blazeBuilderConduit = callPackage ../development/libraries/haskell/blaze-builder-conduit {};
|
||||
|
||||
blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {};
|
||||
|
||||
blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
|
||||
@ -481,6 +485,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
bson = callPackage ../development/libraries/haskell/bson {};
|
||||
|
||||
byteorder = callPackage ../development/libraries/haskell/byteorder {};
|
||||
|
||||
bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
|
||||
|
||||
bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {};
|
||||
@ -527,6 +533,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
|
||||
|
||||
conduit = callPackage ../development/libraries/haskell/conduit {};
|
||||
|
||||
ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
|
||||
|
||||
controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {};
|
||||
@ -612,6 +620,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; };
|
||||
|
||||
dstring = callPackage ../development/libraries/haskell/dstring {};
|
||||
|
||||
editline = callPackage ../development/libraries/haskell/editline {};
|
||||
|
||||
emailValidate = callPackage ../development/libraries/haskell/email-validate {};
|
||||
@ -631,6 +641,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
failure = callPackage ../development/libraries/haskell/failure {};
|
||||
|
||||
fastLogger = callPackage ../development/libraries/haskell/fast-logger {};
|
||||
|
||||
fclabels = callPackage ../development/libraries/haskell/fclabels {};
|
||||
|
||||
funcmp = callPackage ../development/libraries/haskell/funcmp {};
|
||||
@ -757,7 +769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {};
|
||||
HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {};
|
||||
HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
|
||||
HTTP = self.HTTP_4000_2_1;
|
||||
HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
|
||||
HTTP = self.HTTP_4000_2_2;
|
||||
|
||||
hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
|
||||
|
||||
@ -833,6 +846,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {};
|
||||
html = self.html_1_0_1_2;
|
||||
|
||||
httpConduit = callPackage ../development/libraries/haskell/http-conduit {};
|
||||
|
||||
httpdShed = callPackage ../development/libraries/haskell/httpd-shed {};
|
||||
|
||||
httpDate = callPackage ../development/libraries/haskell/http-date {};
|
||||
@ -892,6 +907,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
libmpd = callPackage ../development/libraries/haskell/libmpd {};
|
||||
|
||||
liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
|
||||
|
||||
ListLike = callPackage ../development/libraries/haskell/ListLike {};
|
||||
|
||||
ltk = callPackage ../development/libraries/haskell/ltk {};
|
||||
@ -990,7 +1007,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
|
||||
|
||||
pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
|
||||
pathPieces_0_0_0 = callPackage ../development/libraries/haskell/path-pieces/0.0.0.nix {};
|
||||
pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {};
|
||||
pathPieces = self.pathPieces_0_1_0;
|
||||
|
||||
pandoc = callPackage ../development/libraries/haskell/pandoc/default.nix {};
|
||||
|
||||
@ -1022,7 +1041,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
|
||||
|
||||
persistent = callPackage ../development/libraries/haskell/persistent {};
|
||||
persistent = callPackage ../development/libraries/haskell/persistent {
|
||||
pathPieces = self.pathPieces_0_0_0;
|
||||
};
|
||||
|
||||
persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
|
||||
|
||||
@ -1130,6 +1151,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
RepLib = callPackage ../development/libraries/haskell/RepLib {};
|
||||
|
||||
repr = callPackage ../development/libraries/haskell/repr {};
|
||||
|
||||
RSA = callPackage ../development/libraries/haskell/RSA {};
|
||||
|
||||
safe = callPackage ../development/libraries/haskell/safe {};
|
||||
@ -1158,6 +1181,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
strict = callPackage ../development/libraries/haskell/strict {};
|
||||
|
||||
stringCombinators = callPackage ../development/libraries/haskell/string-combinators {};
|
||||
|
||||
syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
|
||||
syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
|
||||
syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};
|
||||
@ -1185,6 +1210,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {};
|
||||
|
||||
shakespeareI18n = callPackage ../development/libraries/haskell/shakespeare-i18n {};
|
||||
|
||||
shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js {};
|
||||
|
||||
shakespeareText = callPackage ../development/libraries/haskell/shakespeare-text {};
|
||||
@ -1336,6 +1363,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
waiExtra = callPackage ../development/libraries/haskell/wai-extra {};
|
||||
|
||||
waiLogger = callPackage ../development/libraries/haskell/wai-logger {};
|
||||
|
||||
warp = callPackage ../development/libraries/haskell/warp {};
|
||||
|
||||
WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
|
||||
@ -1357,7 +1386,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
webRoutes = callPackage ../development/libraries/haskell/web-routes {};
|
||||
|
||||
webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {};
|
||||
webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {
|
||||
pathPieces = self.pathPieces_0_0_0;
|
||||
};
|
||||
|
||||
CouchDB = callPackage ../development/libraries/haskell/CouchDB {};
|
||||
|
||||
@ -1381,6 +1412,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
xml = callPackage ../development/libraries/haskell/xml {};
|
||||
|
||||
xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {};
|
||||
|
||||
xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator {};
|
||||
|
||||
xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
|
||||
@ -1395,7 +1428,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
|
||||
|
||||
yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
|
||||
yesodCore = callPackage ../development/libraries/haskell/yesod-core {
|
||||
pathPieces = self.pathPieces_0_0_0;
|
||||
};
|
||||
|
||||
yesodForm = callPackage ../development/libraries/haskell/yesod-form {};
|
||||
|
||||
@ -1426,6 +1461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
|
||||
|
||||
zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {};
|
||||
|
||||
zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
|
||||
|
||||
Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};
|
||||
|
||||
@ -836,6 +836,14 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
ConvertASN1 = buildPerlPackage rec {
|
||||
name = "Convert-ASN1-0.22";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.22.tar.gz";
|
||||
sha256 = "1vpny8smwl23rai1kxngi5i31jhp6s6cdls19gjhcwsxf76daqxy";
|
||||
};
|
||||
};
|
||||
|
||||
constant = buildPerlPackage {
|
||||
name = "constant-1.15";
|
||||
src = fetchurl {
|
||||
@ -922,6 +930,14 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
CryptSmbHash = buildPerlPackage rec {
|
||||
name = "Crypt-SmbHash-0.12";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BJ/BJKUIT/Crypt-SmbHash-0.12.tar.gz";
|
||||
sha256 = "0dxivcqmabkhpz5xzph6rzl8fvq9xjy26b2ci77pv5gsmdzari38";
|
||||
};
|
||||
};
|
||||
|
||||
CryptSSLeay = buildPerlPackage rec {
|
||||
name = "Crypt-SSLeay-0.57";
|
||||
src = fetchurl {
|
||||
@ -2537,6 +2553,15 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
NetLDAP = buildPerlPackage {
|
||||
name = "Net-LDAP-0.43";
|
||||
propagatedBuildInputs = [ ConvertASN1 ];
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/G/GB/GBARR/perl-ldap-0.43.tar.gz;
|
||||
sha256 = "0ak7393zs8ps6r6in5ilr9l1mzxxh529jr768sjzx4273p7li3m0";
|
||||
};
|
||||
};
|
||||
|
||||
NetServer = buildPerlPackage rec {
|
||||
name = "Net-Server-0.99";
|
||||
src = fetchurl {
|
||||
|
||||
@ -83,6 +83,9 @@ rec {
|
||||
BLK_DEV_CMD640_ENHANCED n
|
||||
|
||||
FUSE_FS m
|
||||
|
||||
# nixos mounts some cgroup
|
||||
CGROUPS y
|
||||
'';
|
||||
kernelTarget = "uImage";
|
||||
uboot = "sheevaplug";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user