Merge branch 'master' into stdenv-updates
Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
This commit is contained in:
Shea Levy
commit
acd4299e75
19
pkgs/applications/misc/evtest/default.nix
Normal file
19
pkgs/applications/misc/evtest/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "evtest-1.30";
|
||||
|
||||
preConfigure = "autoreconf -iv";
|
||||
|
||||
buildInputs = [ autoconf automake pkgconfig libxml2 ];
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://anongit.freedesktop.org/evtest";
|
||||
rev = "1a50f2479c4775e047f234a24d95dda82441bfbd";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Simple tool for input event debugging";
|
||||
license = "GPLv2";
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
From 222f1e980ab84ffd3a21001feaf06dd537570a1a Mon Sep 17 00:00:00 2001
|
||||
From: Ian Farmer <ian@ianfarmer.net>
|
||||
Date: Sat, 16 Feb 2013 09:38:10 -0800
|
||||
Subject: [PATCH] Update Chromium dev channel version to 26.0.1410.5.
|
||||
|
||||
This version requires a patch for compatibility with versions
|
||||
of glibc that support older kernel versions.
|
||||
|
||||
--- a/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:06.000000000 -0800
|
||||
+++ b/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:24.000000000 -0800
|
||||
@@ -1313,7 +1313,7 @@
|
||||
return Sandbox::Cond(0, ErrorCode::TP_32BIT, ErrorCode::OP_EQUAL,
|
||||
CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
|
||||
CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS |
|
||||
- CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID,
|
||||
+ CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED,
|
||||
ErrorCode(ErrorCode::ERR_ALLOWED),
|
||||
Sandbox::Trap(ReportCloneFailure, NULL));
|
||||
} else {
|
||||
@ -14,6 +14,15 @@
|
||||
, glib, gtk, dbus_glib
|
||||
, libXScrnSaver, libXcursor, mesa
|
||||
|
||||
# dependencies for v25
|
||||
, libvpx
|
||||
|
||||
# dependencies for >= v25
|
||||
, protobuf
|
||||
|
||||
# dependencies for >= v26
|
||||
, speechd, libXdamage
|
||||
|
||||
# optional dependencies
|
||||
, libgcrypt ? null # gnomeSupport || cupsSupport
|
||||
|
||||
@ -59,6 +68,7 @@ let
|
||||
use_system_xdg_utils = true;
|
||||
use_system_yasm = true;
|
||||
use_system_zlib = false; # http://crbug.com/143623
|
||||
use_system_protobuf = post25;
|
||||
|
||||
use_system_harfbuzz = false;
|
||||
use_system_icu = false;
|
||||
@ -66,6 +76,9 @@ let
|
||||
use_system_skia = false;
|
||||
use_system_sqlite = false; # http://crbug.com/22208
|
||||
use_system_v8 = false;
|
||||
} // optionalAttrs (post24 && !post25) {
|
||||
use_system_libvpx = true;
|
||||
use_system_protobuf = true;
|
||||
};
|
||||
|
||||
defaultDependencies = [
|
||||
@ -78,7 +91,9 @@ let
|
||||
|
||||
post23 = !versionOlder sourceInfo.version "24.0.0.0";
|
||||
post24 = !versionOlder sourceInfo.version "25.0.0.0";
|
||||
post25 = !versionOlder sourceInfo.version "26.0.0.0";
|
||||
only24 = post23 && !post24;
|
||||
only25 = post24 && !post25;
|
||||
|
||||
maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
|
||||
./pulse_audio_fix.patch;
|
||||
@ -109,7 +124,9 @@ in stdenv.mkDerivation rec {
|
||||
++ optional enableSELinux libselinux
|
||||
++ optional cupsSupport libgcrypt
|
||||
++ optional pulseSupport pulseaudio
|
||||
++ optional post24 pciutils;
|
||||
++ optionals post24 [ pciutils protobuf ]
|
||||
++ optional only25 libvpx
|
||||
++ optionals post25 [ speechd libXdamage ];
|
||||
|
||||
opensslPatches = optional useOpenSSL openssl.patches;
|
||||
|
||||
@ -118,12 +135,16 @@ in stdenv.mkDerivation rec {
|
||||
patches = optional cupsSupport ./cups_allow_deprecated.patch
|
||||
++ optional pulseSupport ./pulseaudio_array_bounds.patch
|
||||
++ maybeFixPulseAudioBuild
|
||||
++ optional post25 ./clone_detached.patch
|
||||
++ [ ./glibc-2.16-use-siginfo_t.patch ];
|
||||
|
||||
postPatch = optionalString useOpenSSL ''
|
||||
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
|
||||
'' + optionalString post24 ''
|
||||
sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi
|
||||
'' + optionalString post25 ''
|
||||
sed -i -e 's|/usr/bin/gcc|gcc|' \
|
||||
third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
|
||||
'';
|
||||
|
||||
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
|
||||
@ -203,4 +224,6 @@ in stdenv.mkDerivation rec {
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} // optionalAttrs only25 {
|
||||
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
|
||||
}
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
dev = {
|
||||
version = "25.0.1364.36";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
|
||||
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
|
||||
version = "26.0.1410.10";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.10.tar.xz";
|
||||
sha256 = "1s5c69j0g2nanapvq3fmkc5iv7s53x2q5d8fxgdzd7c5c8pzlbby";
|
||||
};
|
||||
beta = {
|
||||
version = "25.0.1364.68";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.68.tar.bz2";
|
||||
sha256 = "0ps3dnpih2nxb0zkw251cfrls126ysnp818bjzcbl325cbypcgc9";
|
||||
version = "25.0.1364.84";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.84.tar.bz2";
|
||||
sha256 = "1p5k7vpk4v2m5yhhdkplq4iq4mm1vv297m9sp7max1sjbngwq6m5";
|
||||
};
|
||||
stable = {
|
||||
version = "24.0.1312.69";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.69.tar.bz2";
|
||||
sha256 = "1nvnhkky72nywk601vx5bbjp1m2f5dygza9h34y20inz3jgg8nbr";
|
||||
version = "24.0.1312.70";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.70.tar.bz2";
|
||||
sha256 = "01z2xdfrlw2iynh9ink3d7hddldh2krgx3w9qnq9nq9z54vwwzfq";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# `contents = {object = ...; symlink = /init;}' is a typical
|
||||
# argument.
|
||||
|
||||
{stdenv, perl, cpio, contents, ubootChooser}:
|
||||
{stdenv, perl, cpio, contents, ubootChooser, compressor}:
|
||||
|
||||
let
|
||||
inputsFun = ubootName : [perl cpio]
|
||||
@ -40,4 +40,5 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = inputsFun stdenv.cross.platform.uboot;
|
||||
makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot;
|
||||
};
|
||||
inherit compressor;
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ storePaths=$(perl $pathsFromGraph closure-*)
|
||||
|
||||
# Put the closure in a gzipped cpio archive.
|
||||
mkdir -p $out
|
||||
(cd root && find * -print0 | cpio -o -H newc --null | gzip -9 > $out/initrd)
|
||||
(cd root && find * -print0 | cpio -o -H newc --null | $compressor > $out/initrd)
|
||||
|
||||
if [ -n "$makeUInitrd" ]; then
|
||||
mv $out/initrd $out/initrd.gz
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "idris";
|
||||
version = "0.9.6";
|
||||
sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1";
|
||||
version = "0.9.6.1";
|
||||
sha256 = "1wy79rrm5pvg77i9nvwkcg6swsdbmg2izch48n4lj4idj0ga5g62";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -1,58 +1,32 @@
|
||||
x@{builderDefsPackage
|
||||
, lua5, mpg123, physfs, freetype, libdevil, openal, SDL, libvorbis
|
||||
, libogg, flac, mesa, libtiff, libpng, libjpeg, libmodplug
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
[];
|
||||
{ stdenv, fetchurl, pkgconfig
|
||||
, SDL, mesa, openal, lua5
|
||||
, libdevil, freetype, physfs
|
||||
, libmodplug, mpg123, libvorbis, libogg
|
||||
}:
|
||||
|
||||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="love";
|
||||
version="0.7.2";
|
||||
name="${baseName}-${version}";
|
||||
url="https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
|
||||
hash="0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
src = a.fetchurl {
|
||||
url = sourceInfo.url;
|
||||
sha256 = sourceInfo.hash;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "love-0.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
|
||||
sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
|
||||
};
|
||||
|
||||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
buildInputs = [
|
||||
pkgconfig SDL mesa openal lua5
|
||||
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
|
||||
];
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["setVars" "fixSrc" "doConfigure" "doMakeInstall"];
|
||||
|
||||
fixSrc =a.fullDepEntry ''
|
||||
sed -e '/typedef void (\*__GLXextFuncPtr)/d' -i src/modules/graphics/opengl/GLee.h
|
||||
'' ["minInit" "doUnpack"];
|
||||
|
||||
setVars = a.noDepEntry ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
|
||||
NIX_CFLAGS_COMPILE = ''
|
||||
-I${SDL}/include/SDL
|
||||
-I${freetype}include/freetype2
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
maintainers = with a.lib.maintainers;
|
||||
[
|
||||
raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
license = a.lib.licenses.zlib;
|
||||
};
|
||||
passthru = {
|
||||
updateInfo = {
|
||||
downloadPage = "http://love2d.org/";
|
||||
};
|
||||
};
|
||||
}) x
|
||||
license = "zlib";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
|
||||
caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl
|
||||
network resourcet transformers xmlConduit xmlHamlet
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://floss.scru.org/hDAV";
|
||||
description = "RFC 4918 WebDAV support";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "attoparsec-conduit";
|
||||
version = "0.5.0.3";
|
||||
sha256 = "1n35v7mq93marx6ayja7zfk2hib4whspvysf0a7hjikylp4lfydw";
|
||||
version = "1.0.0";
|
||||
sha256 = "1aw071qcwhxwpd6azhgaiia97rhj50rms4pysbc19iihmdih3ib8";
|
||||
buildDepends = [ attoparsec conduit text transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/conduit";
|
||||
|
||||
@ -1,17 +1,16 @@
|
||||
{ cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit
|
||||
, caseInsensitive, conduit, httpConduit, httpTypes, monadControl
|
||||
, network, resourcet, tagsoup, text, transformers
|
||||
{ cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit
|
||||
, httpConduit, httpTypes, network, tagsoup, text, transformers
|
||||
, unorderedContainers, xmlConduit
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "authenticate";
|
||||
version = "1.3.2.4";
|
||||
sha256 = "1xakp54g5dyppzpm1q3bbx6g4pvs7p2903pyq6bya1n82zsk7yg7";
|
||||
version = "1.3.2.6";
|
||||
sha256 = "12sgi6q6kajjhh8mns9nklxj0kwn32xs5kzi7wmw50shx0smnjrz";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
|
||||
conduit httpConduit httpTypes monadControl network resourcet
|
||||
tagsoup text transformers unorderedContainers xmlConduit
|
||||
aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
|
||||
httpTypes network tagsoup text transformers unorderedContainers
|
||||
xmlConduit
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/yesodweb/authenticate";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "base64-conduit";
|
||||
version = "0.5.1";
|
||||
sha256 = "1zmp6iv55rac7x7w59az7zaarq79fr7zvgg2wcb5b627axlw909l";
|
||||
version = "1.0.0";
|
||||
sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q";
|
||||
buildDepends = [ base64Bytestring conduit ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/conduit";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "blaze-builder-conduit";
|
||||
version = "0.5.0.3";
|
||||
sha256 = "0dbymh29zg0bvhlmai5s6qiqypx46hmlg375jpcq1597vzaanwnw";
|
||||
version = "1.0.0";
|
||||
sha256 = "15q0b0k5dxrp9cw2b4qf9mmjwz1mmxrn3890df5rc9z6yajajrc6";
|
||||
buildDepends = [ blazeBuilder conduit text transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/conduit";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude-conduit";
|
||||
version = "0.5.0";
|
||||
sha256 = "1c1j9cxj08nz1pkrdxhphk6zyn1dxf3wbl8phcrzi8qk6q1vi0bi";
|
||||
version = "0.5.1";
|
||||
sha256 = "1vwcxwrbnczchq2b773kjjr3ysc47widak8qj0kwi26nf3jics4k";
|
||||
buildDepends = [
|
||||
classyPrelude conduit monadControl resourcet transformers void
|
||||
xmlConduit
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "0.5.6";
|
||||
sha256 = "1a5apcds3jjksz7hzw4ag725796axqk9nm5fhn5i4l82zphq2cxs";
|
||||
version = "1.0.0";
|
||||
sha256 = "1sx7s3awzb7y51prmmvrx9gxhd5068rbzwl719lfx3r50k94r00d";
|
||||
buildDepends = [
|
||||
liftedBase monadControl resourcet text transformers
|
||||
transformersBase void
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ cabal, cereal, entropy, largeword, tagged }:
|
||||
{ cabal, cereal, entropy, tagged, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-api";
|
||||
version = "0.10.2";
|
||||
sha256 = "06dbvdwyw2hf5cafpjfhasgyzzbigvvg74c47lafvqvgxvn9v4ms";
|
||||
buildDepends = [ cereal entropy largeword tagged ];
|
||||
version = "0.11";
|
||||
sha256 = "1v42dmm4cx8brb5mpz34wa20c3s27r0v7qiqlb54svzsl0jkfmiy";
|
||||
buildDepends = [ cereal entropy tagged transformers ];
|
||||
meta = {
|
||||
homepage = "http://trac.haskell.org/crypto-api/wiki";
|
||||
description = "A generic interface for cryptographic operations";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-conduit";
|
||||
version = "0.4.3";
|
||||
sha256 = "0h9dmr88hqmz2876mlnzz8s5kmi368zs9pljvvmb9vn7m44gpyrk";
|
||||
version = "0.5.0";
|
||||
sha256 = "0mlf2l784w0wyfjqsxzfdwmn1wb0z1s6mb8kdhw8x1z4a8gy9a92";
|
||||
buildDepends = [ cereal conduit cryptoApi transformers ];
|
||||
meta = {
|
||||
homepage = "https://github.com/meteficha/crypto-conduit";
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "filesystem-conduit";
|
||||
version = "0.5.0.2";
|
||||
sha256 = "0vpxl32k6734vli8nky9cwyabw9alvpjm0g5q822yj9rk2439yfq";
|
||||
version = "1.0.0";
|
||||
sha256 = "1fz3iihcqpg6m3svjqdg8lvkpza955qn8cbs9b3w333vxkglhi6v";
|
||||
buildDepends = [
|
||||
conduit systemFileio systemFilepath text transformers
|
||||
];
|
||||
|
||||
@ -4,12 +4,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hamlet";
|
||||
version = "1.1.6.2";
|
||||
sha256 = "00asrmyb4k9xpsbwwafm3rj1lisssrc3hj3dsr827w9x86xxargy";
|
||||
version = "1.1.6.3";
|
||||
sha256 = "1kpj8j47licmdf364n0fn5908hsl6ib1wkiqhcx3m0nimb7pjnss";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
|
||||
description = "Haml-like template files that are compile-time checked";
|
||||
|
||||
@ -2,13 +2,12 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "highlighting-kate";
|
||||
version = "0.5.3.6";
|
||||
sha256 = "0ypgw56gaa2hvh05ks079lfcaaynki3da471g39f23m3scgkawlr";
|
||||
version = "0.5.3.7";
|
||||
sha256 = "04wa1al83v5ak6gvrwqy2b63mda0qfi2ircxfs9ddk1gkdscrlrl";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
|
||||
prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/jgm/highlighting-kate";
|
||||
description = "Syntax highlighting";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hjsmin";
|
||||
version = "0.1.4";
|
||||
sha256 = "1w4w560p7xy3lci36xy01dpwl0hhf9iv8gy4ldqvh33931pkxhxn";
|
||||
version = "0.1.4.1";
|
||||
sha256 = "0r73hd6kn37mdbm2i3g6v3qqm696kyflqs6ajq68qr5sr62sjb1a";
|
||||
buildDepends = [ blazeBuilder languageJavascript text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/alanz/hjsmin";
|
||||
|
||||
@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
|
||||
haskellSrcExts httpTypes parsec random safe tagsoup time
|
||||
transformers uniplate wai warp
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/hoogle/";
|
||||
description = "Haskell API Search";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "html-conduit";
|
||||
version = "0.1.0.4";
|
||||
sha256 = "1g217856dz1ad545slk020n5w0la4yyd5ygva2gg2g0999padi78";
|
||||
version = "1.1.0";
|
||||
sha256 = "11mkr7plhbn8kyki0h362habzhsnlb7yrg4ypy48d0l3i7p7vm53";
|
||||
buildDepends = [
|
||||
conduit filesystemConduit resourcet systemFilepath tagstreamConduit
|
||||
text transformers xmlConduit xmlTypes
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.8.7.1";
|
||||
sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5";
|
||||
version = "1.8.9";
|
||||
sha256 = "0v99nc29h4qm1dbs7bwk4nwhxwk22vzl4ghrq9r3vishi6gwr7hb";
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cookie
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-reverse-proxy";
|
||||
version = "0.1.1.2";
|
||||
sha256 = "179j6zfmx3g6gc7mzhzhl7ymxkijg9vahjvwjwm0wm15vna52iqa";
|
||||
version = "0.1.1.3";
|
||||
sha256 = "0z2h2xbvg034snfh3hzc0v2zp5j57lcak2h4vz10lwaqr3jxqnpn";
|
||||
buildDepends = [
|
||||
blazeBuilder caseInsensitive classyPrelude conduit dataDefault
|
||||
httpConduit httpTypes liftedBase monadControl network
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "monad-logger";
|
||||
version = "0.2.3.2";
|
||||
sha256 = "0b5jfmzmsb7pdawcm5i74sy934q2d78pjs39invas502kx5bxzk5";
|
||||
version = "0.3.0.1";
|
||||
sha256 = "05pwccs2f5qn22cwvzaiw6bflyxl3avrl89y737rjcsw6755r5sr";
|
||||
buildDepends = [
|
||||
conduit fastLogger monadControl mtl resourcet text transformers
|
||||
transformersBase
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "network-conduit";
|
||||
version = "0.6.2.2";
|
||||
sha256 = "1v8abhw977hr78hkshrbxy04abbbhafvvnhr4xxgqc0phwch02mc";
|
||||
version = "1.0.0";
|
||||
sha256 = "16kgg6wkpl10kcwfijm9iqi7r5gababaymxyhmjab6axfzknppk3";
|
||||
buildDepends = [
|
||||
conduit liftedBase monadControl network transformers
|
||||
];
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-postgresql";
|
||||
version = "1.1.3";
|
||||
sha256 = "0dxazkdck2l5wxiyd7lcgd4xj95c7ql067s5hi3w1k89jf1wcx12";
|
||||
version = "1.1.3.1";
|
||||
sha256 = "1lbr4x45hzk73439x6is9zw6y3mqy1ivmblncvg70kzw0kmjhpnk";
|
||||
buildDepends = [
|
||||
aeson conduit monadControl persistent postgresqlLibpq
|
||||
postgresqlSimple text time transformers
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ cabal, aeson, conduit, monadControl, persistent, text
|
||||
, transformers
|
||||
{ cabal, aeson, conduit, monadControl, monadLogger, persistent
|
||||
, text, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-sqlite";
|
||||
version = "1.1.3";
|
||||
sha256 = "0rhwq9s6w48y867dmy5c0kvgrh9ixy3sqwq1i2zfacak82r6kki1";
|
||||
version = "1.1.4";
|
||||
sha256 = "1xllj5bq7rw9v32ddm515705nviarw0hp4yxj0z8jf5q5jdz2vz0";
|
||||
buildDepends = [
|
||||
aeson conduit monadControl persistent text transformers
|
||||
aeson conduit monadControl monadLogger persistent text transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-template";
|
||||
version = "1.1.2.2";
|
||||
sha256 = "168cxlnpcgkm7m7kzl3zlcvpgdl9wz7vx3anw8z8pc50qjns8dy0";
|
||||
version = "1.1.2.4";
|
||||
sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9";
|
||||
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.5";
|
||||
sha256 = "0jk4vkisc4as6xi0glc0sdldqf4xdj3s5xvv2vwzgjliyalggxga";
|
||||
version = "1.1.5.1";
|
||||
sha256 = "1ds0q3mzgg60makx7impyxsvpzd3issa89igcy176yb54ypjwfnz";
|
||||
buildDepends = [
|
||||
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
|
||||
liftedBase monadControl monadLogger pathPieces poolConduit
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
{ cabal, cereal, dataDefault, text, utf8String }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "publicsuffixlist";
|
||||
version = "0.0.3";
|
||||
sha256 = "1drsm1zp30629rzy0693ggzcx46b7ydzzafmf07mjanmn1kyyqci";
|
||||
buildDepends = [ cereal dataDefault text utf8String ];
|
||||
meta = {
|
||||
homepage = "https://github.com/litherum/publicsuffixlist";
|
||||
description = "Is a given string a domain suffix?";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,10 +1,10 @@
|
||||
{ cabal, QuickCheck, random, smallcheck, syb }:
|
||||
{ cabal, QuickCheck, random, simpleReflect, smallcheck, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "show";
|
||||
version = "0.4.1.2";
|
||||
sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w";
|
||||
buildDepends = [ QuickCheck random smallcheck syb ];
|
||||
version = "0.5";
|
||||
sha256 = "1s9nwhbc1935359r76glirg858c1sg8nfvv0bzzrncrgf0gxcl4f";
|
||||
buildDepends = [ QuickCheck random simpleReflect smallcheck syb ];
|
||||
meta = {
|
||||
description = "'Show' instances for Lambdabot";
|
||||
license = "GPL";
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "simple-reflect";
|
||||
version = "0.3.1";
|
||||
sha256 = "189pc7fk28bwl0mq6hw502kc048n203rb4vpf2wva490r36xiw6s";
|
||||
meta = {
|
||||
homepage = "http://twan.home.fmf.nl/blog/haskell/simple-reflection-of-expressions.details";
|
||||
description = "Simple reflection of expressions containing variables";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "simple-sendfile";
|
||||
version = "0.2.10";
|
||||
sha256 = "07js189yyya2vs3wsc49b7c2zbh63f48kywmz88g7s394bp3n9am";
|
||||
version = "0.2.11";
|
||||
sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj";
|
||||
buildDepends = [ network ];
|
||||
meta = {
|
||||
description = "Cross platform library for the sendfile system call";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "skein";
|
||||
version = "0.1.0.11";
|
||||
sha256 = "16iy3frzxzkiybl5cglvnmvxzziwr8361s00m7130dh82r3vc21q";
|
||||
version = "0.1.0.12";
|
||||
sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a";
|
||||
buildDepends = [ cereal cryptoApi tagged ];
|
||||
meta = {
|
||||
homepage = "https://github.com/meteficha/skein";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ cabal, dlist }:
|
||||
{ cabal, logict, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "smallcheck";
|
||||
version = "0.6.2";
|
||||
sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr";
|
||||
buildDepends = [ dlist ];
|
||||
version = "1.0.1";
|
||||
sha256 = "1b8g7vgvwyz2smx16gbn73k749mazj2zmr2hjhqj4rk0433i6lpk";
|
||||
buildDepends = [ logict mtl ];
|
||||
meta = {
|
||||
homepage = "https://github.com/feuerbach/smallcheck";
|
||||
description = "A property-based testing library";
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "snap";
|
||||
version = "0.11.1";
|
||||
sha256 = "0dd66496fjfp80i6whl356sqk7n03rx4ycsah7x11fc9rvplmr3q";
|
||||
version = "0.11.2";
|
||||
sha256 = "1z9n15dhbxg0j17c1ik0vhdhxy2mz70915xd4jffg9jrdvlky51a";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
@ -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";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "socks";
|
||||
version = "0.4.2";
|
||||
sha256 = "1nbhx2jjij5kjqa0l68s401ach4yziq6w8mvcv589fcscw212w8r";
|
||||
version = "0.5.0";
|
||||
sha256 = "1lk6yvx5a65nz7z89i0sgqzcqw2v6j645nq15kgbpxhcinfdvqs7";
|
||||
buildDepends = [ cereal network ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-socks";
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ cabal, attoparsec, blazeBuilder, blazeBuilderConduit, conduit
|
||||
, text
|
||||
{ cabal, attoparsec, attoparsecConduit, blazeBuilder
|
||||
, blazeBuilderConduit, caseInsensitive, conduit, text, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tagstream-conduit";
|
||||
version = "0.5.3";
|
||||
sha256 = "08g34dbb59mrpj0lym5a0zlygvj7in57nkhbk84kxvggrhl0jndl";
|
||||
version = "0.5.4";
|
||||
sha256 = "1djf66kn3m4sdwmis82f9w2nkmjyrq12zda7ic9pcsvra579868i";
|
||||
buildDepends = [
|
||||
attoparsec blazeBuilder blazeBuilderConduit conduit text
|
||||
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
|
||||
caseInsensitive conduit text transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/yihuang/tagstream-conduit";
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-app-static";
|
||||
version = "1.3.1.1";
|
||||
sha256 = "0zbkjh2l9qjm4s9z7cm327kdrf58rhasn764pv347ll2n7gphgqq";
|
||||
version = "1.3.1.2";
|
||||
sha256 = "1i0j3n0cp1zq43g06nb3cxajd4k9isg4chdwzzlyimm078a9w54x";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
|
||||
cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-extra";
|
||||
version = "1.3.2.3";
|
||||
sha256 = "1xqx00s1y87ji8n092f0rq150b3ahl1p4xwas5cl01ayp106ywzs";
|
||||
version = "1.3.2.4";
|
||||
sha256 = "12hdg5h4bk04nhcmjm5mc62dng9np0dlik4b1w1syd2lxqv6pdb9";
|
||||
buildDepends = [
|
||||
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
|
||||
conduit dataDefault dateCache fastLogger httpTypes network
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-test";
|
||||
version = "1.3.0.2";
|
||||
sha256 = "0awr1wwhky0mbllfdan42shfckmnnf66dji5zx7rhwjdfqvbbhzn";
|
||||
version = "1.3.0.4";
|
||||
sha256 = "1si54frsn8s8r0ykqc9h571rqbapf82jcvbz8bd49bbylv4j6yy0";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
|
||||
httpTypes HUnit text transformers wai
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai";
|
||||
version = "1.3.0.3";
|
||||
sha256 = "091qykycxfh9f1jysdjxkw4msdgxp796as3yzv9sgqsxvz58rv1n";
|
||||
version = "1.4.0";
|
||||
sha256 = "1213sib2qp1xafrrnmkxabgkba0g00awy6dx9jnlfkj5r6m32wdq";
|
||||
buildDepends = [
|
||||
blazeBuilder conduit httpTypes network text transformers vault
|
||||
];
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "1.3.7.3";
|
||||
sha256 = "0k68dqnz0j9x5698sr2yqcxh1bd3ppv2qh2dn4919lrlpzn3xd93";
|
||||
version = "1.3.7.4";
|
||||
sha256 = "0z043v1fjblbvkn44hzp7j8iawqzbwf67qxq7gsv7jfq1q58xbrx";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
|
||||
httpTypes liftedBase network networkConduit simpleSendfile
|
||||
|
||||
@ -6,14 +6,13 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xml-conduit";
|
||||
version = "1.0.3.3";
|
||||
sha256 = "0jw1r4vmcbxj8kgkdj4pgibihcdmbdj15g06i9p8mdklmmd7gqnz";
|
||||
version = "1.1.0.2";
|
||||
sha256 = "17wv4rngmn8jvg6c3ia48w5q9s9dww9aisrmans9llqs7ks3ndqc";
|
||||
buildDepends = [
|
||||
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
|
||||
blazeHtml blazeMarkup conduit dataDefault failure monadControl
|
||||
resourcet systemFilepath text transformers xmlTypes
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/xml";
|
||||
description = "Pure-Haskell utilities for dealing with XML with the conduit package";
|
||||
|
||||
@ -4,12 +4,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmlhtml";
|
||||
version = "0.2.0.3";
|
||||
sha256 = "03bwsm3dazc01cwndlm92nr35a4fllsxx17rp72d2vnf1571a1vb";
|
||||
version = "0.2.0.4";
|
||||
sha256 = "1z40hkq9l6nw3hcnz6d1x0han7ynjkvbvjy8bl5mq7zmhk1xhmr6";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "XML parser and renderer with HTML 5 quirks mode";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet
|
||||
, httpConduit, httpTypes, liftedBase, mimeMail, network, persistent
|
||||
, persistentTemplate, pureMD5, pwstoreFast, random, SHA
|
||||
{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, fileEmbed
|
||||
, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network
|
||||
, persistent, persistentTemplate, pureMD5, pwstoreFast, random, SHA
|
||||
, shakespeareCss, shakespeareJs, text, transformers
|
||||
, unorderedContainers, wai, yesodCore, yesodForm, yesodJson
|
||||
, yesodPersistent
|
||||
@ -8,16 +8,15 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-auth";
|
||||
version = "1.1.4.1";
|
||||
sha256 = "18x2m1clk3nqaap51c6ayxbh5q6v0i4srcphgyf26lrxq514pvad";
|
||||
version = "1.1.5.3";
|
||||
sha256 = "07srz4zpkn8w382xwi8ri6mh9kgplf0m51819zw1hympphmd9z82";
|
||||
buildDepends = [
|
||||
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
|
||||
httpTypes liftedBase mimeMail network persistent persistentTemplate
|
||||
pureMD5 pwstoreFast random SHA shakespeareCss shakespeareJs text
|
||||
transformers unorderedContainers wai yesodCore yesodForm yesodJson
|
||||
yesodPersistent
|
||||
aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
|
||||
httpConduit httpTypes liftedBase mimeMail network persistent
|
||||
persistentTemplate pureMD5 pwstoreFast random SHA shakespeareCss
|
||||
shakespeareJs text transformers unorderedContainers wai yesodCore
|
||||
yesodForm yesodJson yesodPersistent
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Authentication for Yesod";
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-core";
|
||||
version = "1.1.8.1";
|
||||
sha256 = "1bkqh8k7wwyj5s8pyxmlc1lrz47rz1mj49mqmpbislkjk0p6hbks";
|
||||
version = "1.1.8.2";
|
||||
sha256 = "0brrvij1vldb5zr3vnynikaf1x479qrgf7k3162nhrmwl57lm9sz";
|
||||
buildDepends = [
|
||||
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
|
||||
clientsession conduit cookie failure fastLogger hamlet httpTypes
|
||||
@ -19,7 +19,6 @@ cabal.mkDerivation (self: {
|
||||
text time transformers transformersBase vector wai waiExtra
|
||||
yesodRoutes
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Creation of type-safe, RESTful web applications";
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-default";
|
||||
version = "1.1.3.1";
|
||||
sha256 = "16kxq93q5q6bz47s1rfgswrygyp1g090b8r11n56r8mnr24ix0mi";
|
||||
version = "1.1.3.2";
|
||||
sha256 = "07gm9sj4c231wdmfmb7df1s8wvqa6fw7nhcq554h16h2ibv5pcqg";
|
||||
buildDepends = [
|
||||
dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs
|
||||
text transformers unorderedContainers wai waiExtra warp yaml
|
||||
|
||||
@ -6,15 +6,14 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-form";
|
||||
version = "1.2.1.2";
|
||||
sha256 = "121c6ln8y6l2f9n6pjs2nrghz7w94pb34vp12cj8fabc71vk029j";
|
||||
version = "1.2.1.3";
|
||||
sha256 = "1mrqr6pfrhkk0vv9lhd4wxiic8d1hsraiqmjcqsfbpdyrc6fqypq";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
|
||||
dataDefault emailValidate hamlet network persistent shakespeareCss
|
||||
shakespeareJs text time transformers wai xssSanitize yesodCore
|
||||
yesodPersistent
|
||||
];
|
||||
jailbreak = 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.2.1";
|
||||
sha256 = "0hpab9sgm6pa0lw2nl1p6l4gl3ciscsc21q0d2cp3aa75gavyrjz";
|
||||
version = "1.1.2.2";
|
||||
sha256 = "1z1afpr9xbclpwswlbys7f7w8761vvr06hxhqhnqfzf4ky8g3671";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
|
||||
httpTypes systemFilepath text transformers unixCompat wai
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod";
|
||||
version = "1.1.8.1";
|
||||
sha256 = "01s9b0pqqj7q760vm62ni95k5fqwccw8l6531kqav2vnfvi08ric";
|
||||
version = "1.1.9";
|
||||
sha256 = "0fcvf0bg7dsrka639q20dncinqq0fdv21zyvwpx63qfcmilhmjlm";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
@ -27,7 +27,6 @@ cabal.mkDerivation (self: {
|
||||
yesodAuth yesodCore yesodDefault yesodForm yesodJson
|
||||
yesodPersistent zlib
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Creation of type-safe, RESTful web applications";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zlib-conduit";
|
||||
version = "0.5.0.3";
|
||||
sha256 = "05rlbyxcwq952psbfp94irmygabqxyf1kkm80pwdanlaaky03nsb";
|
||||
version = "1.0.0";
|
||||
sha256 = "0q0l4qw1f2cwjj71n4i082ba47x1xba695q8xk0ky2vw5s8cg0bv";
|
||||
buildDepends = [ conduit transformers void zlibBindings ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/conduit";
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
{ stdenv, fetchurl, libxml2, pkgconfig
|
||||
, compressionSupport ? true, zlib ? null
|
||||
, sslSupport ? true, openssl ? null
|
||||
}:
|
||||
|
||||
assert compressionSupport -> zlib != null;
|
||||
assert sslSupport -> openssl != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "neon-0.26.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.webdav.org/neon/neon-0.26.4.tar.gz;
|
||||
sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj";
|
||||
};
|
||||
|
||||
buildInputs = [libxml2]
|
||||
++ stdenv.lib.optional compressionSupport zlib
|
||||
++ (if sslSupport then [ openssl pkgconfig ] else []);
|
||||
|
||||
configureFlags = ''
|
||||
${if compressionSupport then "--with-zlib" else "--without-zlib"}
|
||||
${if sslSupport then "--with-ssl" else "--without-ssl"}
|
||||
--enable-shared
|
||||
'';
|
||||
|
||||
passthru = {inherit compressionSupport sslSupport;};
|
||||
|
||||
meta = {
|
||||
description = "An HTTP and WebDAV client library";
|
||||
homepage = http://www.webdav.org/neon/;
|
||||
};
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
{ stdenv, fetchurl, libxml2, pkgconfig
|
||||
, compressionSupport ? true, zlib ? null
|
||||
, sslSupport ? true, openssl ? null
|
||||
, static ? false
|
||||
, shared ? true
|
||||
}:
|
||||
|
||||
assert compressionSupport -> zlib != null;
|
||||
assert sslSupport -> openssl != null;
|
||||
assert static || shared;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "neon-0.28.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.webdav.org/neon/${name}.tar.gz";
|
||||
sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6";
|
||||
};
|
||||
|
||||
buildInputs = [libxml2 pkgconfig openssl]
|
||||
++ stdenv.lib.optional compressionSupport zlib;
|
||||
|
||||
configureFlags = ''
|
||||
${if shared then "--enable-shared" else "--disable-shared"}
|
||||
${if static then "--enable-static" else "--disable-static"}
|
||||
${if compressionSupport then "--with-zlib" else "--without-zlib"}
|
||||
${if sslSupport then "--with-ssl" else "--without-ssl"}
|
||||
--enable-shared
|
||||
'';
|
||||
|
||||
passthru = {inherit compressionSupport sslSupport;};
|
||||
|
||||
meta = {
|
||||
description = "An HTTP and WebDAV client library";
|
||||
homepage = http://www.webdav.org/neon/;
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, cmake}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "physfs-2.0.2";
|
||||
name = "physfs-2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/downloads/${name}.tar.gz";
|
||||
sha256 = "02dwy0vsn2dp31f15vxd3yxxr1rgy25ab7ncavyh73i290qnsadf";
|
||||
url = "${meta.homepage}/downloads/${name}.tar.bz2";
|
||||
sha256 = "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://icculus.org/physfs/;
|
||||
homepage = "http://icculus.org/physfs/";
|
||||
description = "Library to provide abstract access to various archives";
|
||||
license = "free";
|
||||
};
|
||||
|
||||
@ -1,39 +1,22 @@
|
||||
{stdenv, fetchurl, libftdi}:
|
||||
|
||||
let
|
||||
# The "GuruPlug installer" from Marvell. See
|
||||
# <http://www.plugcomputer.org/index.php/us/resources/downloads?func=select&id=16>,
|
||||
# linked from <http://www.globalscaletechnologies.com/t-downloads.aspx>.
|
||||
guruplug_installer = fetchurl {
|
||||
url = "http://www.plugcomputer.org/index.php/us/resources/downloads?func=download&id=65&chk=d6878f4bf86070f7b4f7bc93317fcb0f&no_html=1";
|
||||
sha256 = "1nps9li9k1kxb31f9x6d114hh0a3bx886abvgh8vg004ni996hlv";
|
||||
name = "guruplug-installer.tar.gz";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "openocd-0.4.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openocd-${version}";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.berlios.de/openocd/openocd-0.4.0.tar.bz2";
|
||||
sha256 = "1c9j8s3mqgw5spv6nd4lqfkd1l9jmjipi0ya054vnjfsy2617kzv";
|
||||
url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2";
|
||||
sha256 = "0argjhff9x4ilgycics61kfgkvb6kkkhhhmj3fxcyydd8mscri7l";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-ft2232_libftdi" "--disable-werror" ];
|
||||
configureFlags = [ "--enable-ft2232_libftdi"
|
||||
"--enable-jlink"
|
||||
"--enable-rlink"
|
||||
"--enable-ulink"
|
||||
"--enable-stlink" ];
|
||||
|
||||
buildInputs = [ libftdi ];
|
||||
|
||||
# Copy the GuruPlug stuff.
|
||||
# XXX: Unfortunately, these files were written for OpenOCD 0.2.0 and don't
|
||||
# work with 0.4.0.
|
||||
# postInstall =
|
||||
# '' tar xf "${guruplug_installer}"
|
||||
# for dir in interface target board
|
||||
# do
|
||||
# cp -v "guruplug-installer/openocd/$dir/"* \
|
||||
# "$out/share/openocd/scripts/$dir/"
|
||||
# done
|
||||
# '';
|
||||
|
||||
meta = {
|
||||
homepage = http://openocd.berlios.de;
|
||||
description = "OpenOCD, an on-chip debugger";
|
||||
|
||||
18
pkgs/development/tools/parsing/alex/3.0.4.nix
Normal file
18
pkgs/development/tools/parsing/alex/3.0.4.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ cabal, perl, QuickCheck }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "alex";
|
||||
version = "3.0.4";
|
||||
sha256 = "0fgh7ziwxyb140wghh7dpndh41sixcssnba0q942cvkg77m6ah6d";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ QuickCheck ];
|
||||
buildTools = [ perl ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/alex/";
|
||||
description = "Alex is a tool for generating lexical analysers in Haskell";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
277
pkgs/os-specific/linux/kernel/linux-3.8.nix
Normal file
277
pkgs/os-specific/linux/kernel/linux-3.8.nix
Normal file
@ -0,0 +1,277 @@
|
||||
args @ { stdenv, fetchurl, extraConfig ? ""
|
||||
, perl, mktemp, module_init_tools
|
||||
, ... }:
|
||||
|
||||
let
|
||||
configWithPlatform = kernelPlatform :
|
||||
''
|
||||
# Power management and debugging for powertop.
|
||||
DEBUG_KERNEL y
|
||||
PM_ADVANCED_DEBUG y
|
||||
PM_RUNTIME y
|
||||
TIMER_STATS y
|
||||
USB_SUSPEND y
|
||||
BACKTRACE_SELF_TEST n
|
||||
CPU_NOTIFIER_ERROR_INJECT? n
|
||||
DEBUG_DEVRES n
|
||||
DEBUG_NX_TEST n
|
||||
DEBUG_STACK_USAGE n
|
||||
DEBUG_STACKOVERFLOW n
|
||||
RCU_TORTURE_TEST n
|
||||
SCHEDSTATS n
|
||||
|
||||
# Support drivers that need external firmware.
|
||||
STANDALONE n
|
||||
|
||||
# Make /proc/config.gz available.
|
||||
IKCONFIG_PROC y
|
||||
|
||||
# Optimize with -O2, not -Os.
|
||||
CC_OPTIMIZE_FOR_SIZE n
|
||||
|
||||
# Enable the kernel's built-in memory tester.
|
||||
MEMTEST y
|
||||
|
||||
# Include the CFQ I/O scheduler in the kernel, rather than as a
|
||||
# module, so that the initrd gets a good I/O scheduler.
|
||||
IOSCHED_CFQ y
|
||||
BLK_CGROUP y # required by CFQ
|
||||
|
||||
# Enable NUMA.
|
||||
NUMA? y
|
||||
|
||||
# Disable some expensive (?) features.
|
||||
FTRACE n
|
||||
KPROBES n
|
||||
PM_TRACE_RTC n
|
||||
|
||||
# Enable various subsystems.
|
||||
ACCESSIBILITY y # Accessibility support
|
||||
AUXDISPLAY y # Auxiliary Display support
|
||||
DONGLE y # Serial dongle support
|
||||
HIPPI? y
|
||||
MTD_COMPLEX_MAPPINGS y # needed for many devices
|
||||
SCSI_LOWLEVEL y # enable lots of SCSI devices
|
||||
SCSI_LOWLEVEL_PCMCIA y
|
||||
SPI y # needed for many devices
|
||||
SPI_MASTER y
|
||||
WAN y
|
||||
|
||||
# Networking options.
|
||||
IP_PNP n
|
||||
IPV6_PRIVACY y
|
||||
NETFILTER_ADVANCED y
|
||||
IP_VS_PROTO_TCP y
|
||||
IP_VS_PROTO_UDP y
|
||||
IP_VS_PROTO_ESP y
|
||||
IP_VS_PROTO_AH y
|
||||
IP_DCCP_CCID3 n # experimental
|
||||
CLS_U32_PERF y
|
||||
CLS_U32_MARK y
|
||||
|
||||
# Wireless networking.
|
||||
IPW2100_MONITOR y # support promiscuous mode
|
||||
IPW2200_MONITOR? y # support promiscuous mode
|
||||
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
|
||||
HOSTAP_FIRMWARE_NVRAM y
|
||||
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
|
||||
ATH9K_AHB y # Ditto, AHB bus
|
||||
B43_PHY_HT y
|
||||
BCMA_HOST_PCI y
|
||||
|
||||
# Some settings to make sure that fbcondecor works - in particular,
|
||||
# disable tileblitting and the drivers that need it.
|
||||
|
||||
# Enable various FB devices.
|
||||
FB y
|
||||
FB_EFI y
|
||||
FB_NVIDIA_I2C y # Enable DDC Support
|
||||
FB_RIVA_I2C y
|
||||
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
|
||||
FB_ATY_GX y # Mach64 GX support
|
||||
FB_SAVAGE_I2C y
|
||||
FB_SAVAGE_ACCEL y
|
||||
FB_SIS_300 y
|
||||
FB_SIS_315 y
|
||||
FB_3DFX_ACCEL y
|
||||
FB_GEODE y
|
||||
|
||||
# Video configuration
|
||||
# Enable KMS for devices whose X.org driver supports it.
|
||||
DRM_I915_KMS y
|
||||
DRM_RADEON_KMS y
|
||||
# Hybrid graphics support
|
||||
VGA_SWITCHEROO y
|
||||
|
||||
# Sound.
|
||||
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
|
||||
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
|
||||
SND_USB_CAIAQ_INPUT y
|
||||
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
|
||||
|
||||
# USB serial devices.
|
||||
USB_SERIAL_GENERIC y # USB Generic Serial Driver
|
||||
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
|
||||
USB_SERIAL_KEYSPAN_USA28 y
|
||||
USB_SERIAL_KEYSPAN_USA28X y
|
||||
USB_SERIAL_KEYSPAN_USA28XA y
|
||||
USB_SERIAL_KEYSPAN_USA28XB y
|
||||
USB_SERIAL_KEYSPAN_USA19 y
|
||||
USB_SERIAL_KEYSPAN_USA18X y
|
||||
USB_SERIAL_KEYSPAN_USA19W y
|
||||
USB_SERIAL_KEYSPAN_USA19QW y
|
||||
USB_SERIAL_KEYSPAN_USA19QI y
|
||||
USB_SERIAL_KEYSPAN_USA49W y
|
||||
USB_SERIAL_KEYSPAN_USA49WLC y
|
||||
|
||||
# Filesystem options - in particular, enable extended attributes and
|
||||
# ACLs for all filesystems that support them.
|
||||
EXT2_FS_XATTR y # Ext2 extended attributes
|
||||
EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
|
||||
EXT2_FS_SECURITY y # Ext2 Security Labels
|
||||
EXT2_FS_XIP y # Ext2 execute in place support
|
||||
EXT4_FS_POSIX_ACL y
|
||||
EXT4_FS_SECURITY y
|
||||
REISERFS_FS_XATTR y
|
||||
REISERFS_FS_POSIX_ACL y
|
||||
REISERFS_FS_SECURITY y
|
||||
JFS_POSIX_ACL y
|
||||
JFS_SECURITY y
|
||||
XFS_QUOTA y
|
||||
XFS_POSIX_ACL y
|
||||
XFS_RT y # XFS Realtime subvolume support
|
||||
OCFS2_DEBUG_MASKLOG n
|
||||
BTRFS_FS_POSIX_ACL y
|
||||
UBIFS_FS_XATTR? y
|
||||
UBIFS_FS_ADVANCED_COMPR y
|
||||
NFSD_V2_ACL y
|
||||
NFSD_V3 y
|
||||
NFSD_V3_ACL y
|
||||
NFSD_V4 y
|
||||
NFS_FSCACHE y
|
||||
CIFS_XATTR y
|
||||
CIFS_POSIX y
|
||||
CIFS_FSCACHE y
|
||||
|
||||
# Security related features.
|
||||
STRICT_DEVMEM y # Filter access to /dev/mem
|
||||
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
|
||||
|
||||
# Misc. options.
|
||||
8139TOO_8129 y
|
||||
8139TOO_PIO n # PIO is slower
|
||||
AIC79XX_DEBUG_ENABLE n
|
||||
AIC7XXX_DEBUG_ENABLE n
|
||||
AIC94XX_DEBUG n
|
||||
B43_PCMCIA y
|
||||
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
|
||||
BLK_DEV_IDEACPI y # IDE ACPI support
|
||||
BLK_DEV_INTEGRITY y
|
||||
BSD_PROCESS_ACCT_V3 y
|
||||
BT_HCIUART_BCSP y
|
||||
BT_HCIUART_H4 y # UART (H4) protocol support
|
||||
BT_HCIUART_LL y
|
||||
BT_RFCOMM m
|
||||
BT_RFCOMM_TTY y # RFCOMM TTY support
|
||||
CRASH_DUMP n
|
||||
DMAR? n # experimental
|
||||
DVB_DYNAMIC_MINORS? y # we use udev
|
||||
EFI_STUB y # EFI bootloader in the bzImage itself
|
||||
FUSION y # Fusion MPT device support
|
||||
IDE_GD_ATAPI y # ATAPI floppy support
|
||||
IRDA_ULTRA y # Ultra (connectionless) protocol
|
||||
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
|
||||
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
|
||||
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
|
||||
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
|
||||
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
|
||||
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
|
||||
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
|
||||
LOGO n # not needed
|
||||
MEDIA_ATTACH? y
|
||||
MEGARAID_NEWGEN y
|
||||
MICROCODE_AMD y
|
||||
MODVERSIONS y
|
||||
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
|
||||
MTRR_SANITIZER y
|
||||
NET_FC y # Fibre Channel driver support
|
||||
PPP_MULTILINK y # PPP multilink support
|
||||
REGULATOR y # Voltage and Current Regulator Support
|
||||
SCSI_LOGGING y # SCSI logging facility
|
||||
SERIAL_8250 y # 8250/16550 and compatible serial support
|
||||
SLIP_COMPRESSED y # CSLIP compressed headers
|
||||
SLIP_SMART y
|
||||
THERMAL_HWMON y # Hardware monitoring support
|
||||
USB_DEBUG n
|
||||
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
|
||||
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
|
||||
X86_CHECK_BIOS_CORRUPTION y
|
||||
X86_MCE y
|
||||
XEN_DOM0 y
|
||||
|
||||
# Linux Containers
|
||||
RT_GROUP_SCHED? y
|
||||
CGROUP_DEVICE? y
|
||||
CGROUP_MEM_RES_CTLR? y
|
||||
CGROUP_MEM_RES_CTLR_SWAP? y
|
||||
DEVPTS_MULTIPLE_INSTANCES? y
|
||||
|
||||
# Enable staging drivers. These are somewhat experimental, but
|
||||
# they generally don't hurt.
|
||||
STAGING y
|
||||
|
||||
# PROC_EVENTS requires that the netlink connector is not built
|
||||
# as a module. This is required by libcgroup's cgrulesengd.
|
||||
CONNECTOR y
|
||||
PROC_EVENTS y
|
||||
|
||||
# Tracing
|
||||
FTRACE y
|
||||
FUNCTION_TRACER y
|
||||
FTRACE_SYSCALLS y
|
||||
SCHED_TRACER y
|
||||
|
||||
# Devtmpfs support.
|
||||
DEVTMPFS y
|
||||
|
||||
# Media support
|
||||
MEDIA_CAMERA_SUPPORT? y
|
||||
MEDIA_RC_SUPPORT? y
|
||||
MEDIA_USB_SUPPORT y
|
||||
|
||||
# Easier debug of NFS issues
|
||||
SUNRPC_DEBUG y
|
||||
|
||||
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
|
||||
${extraConfig}
|
||||
'';
|
||||
in
|
||||
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.8";
|
||||
modDirVersion = "3.8.0";
|
||||
testing = false;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||
sha256 = "0jqqhfskd88480hkwnkc8rlwkwb56p322irp9xm6gmfyzfyx2w70";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
configCross = configWithPlatform stdenv.cross.platform;
|
||||
|
||||
features.iwlwifi = true;
|
||||
features.efiBootStub = true;
|
||||
features.needsCifsUtils = true;
|
||||
features.canDisableNetfilterConntrackHelpers = true;
|
||||
features.netfilterRPFilter = true;
|
||||
}
|
||||
|
||||
// removeAttrs args ["extraConfig"]
|
||||
)
|
||||
@ -25,8 +25,8 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
configureFlags = ''
|
||||
--with-linux=${kernel}/lib/modules/${kernel.version}/build
|
||||
--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build
|
||||
--with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build
|
||||
--with-linux-obj=${kernel}/lib/modules/${kernel.modDirVersion}/build
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -29,9 +29,9 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
configureFlags = ''
|
||||
--with-linux=${kernel}/lib/modules/${kernel.version}/build
|
||||
--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build
|
||||
--with-spl=${spl}/libexec/spl/${kernel.version}
|
||||
--with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build
|
||||
--with-linux-obj=${kernel}/lib/modules/${kernel.modDirVersion}/build
|
||||
--with-spl=${spl}/libexec/spl/${kernel.modDirVersion}
|
||||
${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""}
|
||||
'';
|
||||
|
||||
|
||||
35
pkgs/servers/http/yaws/default.nix
Normal file
35
pkgs/servers/http/yaws/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{stdenv, fetchurl, erlang, pam, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yaws-${version}";
|
||||
version = "1.95";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://yaws.hyber.org/download/${name}.tar.gz";
|
||||
sha256 = "01jlp6v8l95n9k5rbp4kvklnh95q7yv9lp2a6ahyixb1cn1sxvz4";
|
||||
};
|
||||
|
||||
# The tarball includes a symlink yaws -> yaws-1.95, which seems to be
|
||||
# necessary for importing erlang files
|
||||
unpackPhase = ''
|
||||
tar xzf $src
|
||||
cd $name
|
||||
'';
|
||||
|
||||
configureFlags = "--with-extrainclude=${pam}/include/security";
|
||||
|
||||
buildInputs = [ erlang pam perl ];
|
||||
|
||||
postInstall = ''
|
||||
sed -i "s#which #type -P #" $out/bin/yaws
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A high performance HTTP 1.1 server in Erlang";
|
||||
homepage = http://http://yaws.hyber.org;
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, neon, zlib, noDavsUser ? false}:
|
||||
{ stdenv, fetchurl, neon, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "davfs2-1.4.7";
|
||||
@ -8,19 +8,26 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0i7hrwlfzisb4l2mza1kjj9q9xxixggjplsjm339zl7828mfxh2h";
|
||||
};
|
||||
|
||||
prePatch = stdenv.lib.optional noDavsUser ''
|
||||
echo "dav_user root" >> etc/davfs2.conf
|
||||
echo "dav_group root" >> etc/davfs2.conf
|
||||
'';
|
||||
|
||||
buildInputs = [ neon zlib ];
|
||||
|
||||
patches = [ ./davfs2-install.patch ./isdir.patch ];
|
||||
patches = [ ./davfs2-install.patch ./isdir.patch ./fix-sysconfdir.patch ];
|
||||
|
||||
configureFlags = "--sysconfdir=/etc";
|
||||
|
||||
meta = {
|
||||
longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV.";
|
||||
homepage = "http://savannah.nongnu.org/projects/davfs2";
|
||||
description = "mount WebDAV shares like a typical filesystem";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
license = "GPLv3+";
|
||||
homepage = http://savannah.nongnu.org/projects/davfs2;
|
||||
longDescription = ''
|
||||
Web Distributed Authoring and Versioning (WebDAV), an extension to
|
||||
the HTTP-protocol, allows authoring of resources on a remote web
|
||||
server. davfs2 provides the ability to access such resources like
|
||||
a typical filesystem, allowing for use by standard applications
|
||||
with no built-in support for WebDAV.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
||||
60
pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch
Normal file
60
pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch
Normal file
@ -0,0 +1,60 @@
|
||||
diff -ubr davfs2-1.4.7-orig/etc/Makefile.am davfs2-1.4.7/etc/Makefile.am
|
||||
--- davfs2-1.4.7-orig/etc/Makefile.am 2013-02-21 11:45:00.185763558 +0100
|
||||
+++ davfs2-1.4.7/etc/Makefile.am 2013-02-21 11:53:05.423197775 +0100
|
||||
@@ -24,17 +24,17 @@
|
||||
|
||||
install-data-local: $(dist_pkgdata_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
|
||||
- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf
|
||||
- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets
|
||||
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs
|
||||
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private
|
||||
- chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private
|
||||
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)
|
||||
+ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf
|
||||
+ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets
|
||||
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs
|
||||
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private
|
||||
+ chmod 700 $(out)$(pkgsysconfdir)/certs/private
|
||||
|
||||
uninstall-local:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
|
||||
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||
- echo " rm -f $(DESTDIR)$(pkgsysconfdir)/$$f"; \
|
||||
- rm -f $(DESTDIR)$(pkgsysconfdir)/$$f; \
|
||||
+ echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \
|
||||
+ rm -f $(out)$(pkgsysconfdir)/$$f; \
|
||||
done
|
||||
diff -ubr davfs2-1.4.7-orig/etc/Makefile.in davfs2-1.4.7/etc/Makefile.in
|
||||
--- davfs2-1.4.7-orig/etc/Makefile.in 2013-02-21 11:45:00.185763558 +0100
|
||||
+++ davfs2-1.4.7/etc/Makefile.in 2013-02-21 11:53:27.241207128 +0100
|
||||
@@ -408,19 +408,19 @@
|
||||
|
||||
install-data-local: $(dist_pkgdata_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
|
||||
- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf
|
||||
- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets
|
||||
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs
|
||||
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private
|
||||
- chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private
|
||||
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)
|
||||
+ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf
|
||||
+ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets
|
||||
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs
|
||||
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private
|
||||
+ chmod 700 $(out)$(pkgsysconfdir)/certs/private
|
||||
|
||||
uninstall-local:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
|
||||
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||
- echo " rm -f $(DESTDIR)$(pkgsysconfdir)/$$f"; \
|
||||
- rm -f $(DESTDIR)$(pkgsysconfdir)/$$f; \
|
||||
+ echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \
|
||||
+ rm -f $(out)$(pkgsysconfdir)/$$f; \
|
||||
done
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
40
pkgs/tools/networking/snx/default.nix
Normal file
40
pkgs/tools/networking/snx/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ stdenv, fetchurl, makeWrapper, libX11, pam, gcc33 }:
|
||||
|
||||
let
|
||||
# The proper value for this offset can be found at the top of the snx_install script.
|
||||
archiveOffset = "78";
|
||||
libraryPath = stdenv.lib.makeSearchPath "lib" [libX11 pam gcc33.gcc];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "snx-800007027";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://remote.us.publicisgroupe.net/CSHELL/snx_install.sh";
|
||||
sha256 = "1yq0r8gb6jw5pyfrw3wxvplrxxfhbhgm9ph4gyd754fyn52iwgxv";
|
||||
};
|
||||
|
||||
buildInputs = [makeWrapper];
|
||||
|
||||
unpackPhase = ''
|
||||
tail -n +${archiveOffset} ${src} | bunzip2 -c - | tar xfvp -
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" snx
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/sbin" "$out/libexec"
|
||||
mv snx "$out/libexec/"
|
||||
makeWrapper "$out/libexec/snx" "$out/sbin/snx" --prefix LD_LIBRARY_PATH ":" "${libraryPath}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.checkpoint.com/";
|
||||
description = "Check Point SSL Network Extender";
|
||||
license = "unknown";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
BIN
pkgs/tools/networking/snx/snx_install.sh
Executable file
BIN
pkgs/tools/networking/snx/snx_install.sh
Executable file
Binary file not shown.
@ -331,9 +331,10 @@ let
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
makeInitrd = {contents}: import ../build-support/kernel/make-initrd.nix {
|
||||
inherit stdenv perl cpio contents ubootChooser;
|
||||
};
|
||||
makeInitrd = {contents, compressor ? "gzip -9"}:
|
||||
import ../build-support/kernel/make-initrd.nix {
|
||||
inherit stdenv perl cpio contents ubootChooser compressor;
|
||||
};
|
||||
|
||||
makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
|
||||
|
||||
@ -628,9 +629,7 @@ let
|
||||
|
||||
dar = callPackage ../tools/archivers/dar { };
|
||||
|
||||
davfs2 = callPackage ../tools/filesystems/davfs2 {
|
||||
neon = neon029;
|
||||
};
|
||||
davfs2 = callPackage ../tools/filesystems/davfs2 { };
|
||||
|
||||
dbench = callPackage ../development/tools/misc/dbench { };
|
||||
|
||||
@ -730,6 +729,8 @@ let
|
||||
|
||||
euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; };
|
||||
|
||||
evtest = callPackage ../applications/misc/evtest { };
|
||||
|
||||
exif = callPackage ../tools/graphics/exif { };
|
||||
|
||||
exiftags = callPackage ../tools/graphics/exiftags { };
|
||||
@ -1542,6 +1543,11 @@ let
|
||||
|
||||
smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
|
||||
|
||||
snx = callPackage_i686 ../tools/networking/snx {
|
||||
inherit (pkgsi686Linux) pam gcc33;
|
||||
inherit (pkgsi686Linux.xlibs) libX11;
|
||||
};
|
||||
|
||||
stardict = callPackage ../applications/misc/stardict/stardict.nix {
|
||||
inherit (gnome) libgnomeui scrollkeeper;
|
||||
};
|
||||
@ -4590,19 +4596,7 @@ let
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
neon = neon029;
|
||||
|
||||
neon026 = callPackage ../development/libraries/neon/0.26.nix {
|
||||
compressionSupport = true;
|
||||
sslSupport = true;
|
||||
};
|
||||
|
||||
neon028 = callPackage ../development/libraries/neon/0.28.nix {
|
||||
compressionSupport = true;
|
||||
sslSupport = true;
|
||||
};
|
||||
|
||||
neon029 = callPackage ../development/libraries/neon/0.29.nix {
|
||||
neon = callPackage ../development/libraries/neon {
|
||||
compressionSupport = true;
|
||||
sslSupport = true;
|
||||
};
|
||||
@ -5575,6 +5569,8 @@ let
|
||||
|
||||
xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { };
|
||||
|
||||
yaws = callPackage ../servers/http/yaws { };
|
||||
|
||||
zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix {
|
||||
inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;
|
||||
});
|
||||
@ -5896,6 +5892,18 @@ let
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
|
||||
};
|
||||
|
||||
linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) {
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
|
||||
kernelPatches =
|
||||
[
|
||||
kernelPatches.sec_perm_2_6_24
|
||||
] ++ lib.optionals (platform.kernelArch == "mips")
|
||||
[ kernelPatches.mips_fpureg_emu
|
||||
kernelPatches.mips_fpu_sigill
|
||||
kernelPatches.mips_ext3_n32
|
||||
];
|
||||
};
|
||||
|
||||
/* Linux kernel modules are inherently tied to a specific kernel. So
|
||||
rather than provide specific instances of those packages for a
|
||||
specific kernel, we have a function that builds those packages
|
||||
@ -6016,6 +6024,7 @@ let
|
||||
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4);
|
||||
linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi pkgs.linuxPackages_3_6_rpi);
|
||||
linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7);
|
||||
linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 pkgs.linuxPackages_3_8);
|
||||
|
||||
# The current default kernel / kernel modules.
|
||||
linux = linuxPackages.kernel;
|
||||
@ -7695,7 +7704,6 @@ let
|
||||
sublime = callPackage ../applications/editors/sublime { };
|
||||
|
||||
subversion = callPackage ../applications/version-management/subversion/default.nix {
|
||||
neon = pkgs.neon029;
|
||||
bdbSupport = true;
|
||||
httpServer = false;
|
||||
httpSupport = true;
|
||||
@ -8081,7 +8089,9 @@ let
|
||||
|
||||
blackshadeselite = callPackage ../games/blackshadeselite { };
|
||||
|
||||
blobby = callPackage ../games/blobby {};
|
||||
blobby = callPackage ../games/blobby {
|
||||
boost = boost149;
|
||||
};
|
||||
|
||||
bsdgames = callPackage ../games/bsdgames { };
|
||||
|
||||
|
||||
@ -147,7 +147,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
xhtml = self.xhtml_3000_2_1; # 7.6 ok
|
||||
zlib = self.zlib_0_5_4_0; # 7.6 ok
|
||||
cabalInstall = self.cabalInstall_1_16_0_2; # 7.6 ok
|
||||
alex = self.alex_3_0_2; # 7.6 ok
|
||||
alex = self.alex_3_0_4; # 7.6 ok
|
||||
haddock = self.haddock_2_13_1; # 7.6 ok
|
||||
happy = self.happy_1_18_10; # 7.6 ok
|
||||
primitive = self.primitive_0_5_0_1; # semi-official, but specified
|
||||
@ -1427,6 +1427,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
PSQueue = callPackage ../development/libraries/haskell/PSQueue {};
|
||||
|
||||
publicsuffixlist = callPackage ../development/libraries/haskell/publicsuffixlist {};
|
||||
|
||||
pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {};
|
||||
|
||||
pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {};
|
||||
@ -1536,6 +1538,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
shelly = callPackage ../development/libraries/haskell/shelly {};
|
||||
|
||||
simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {};
|
||||
|
||||
simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {};
|
||||
|
||||
silently = callPackage ../development/libraries/haskell/silently {};
|
||||
@ -1948,7 +1952,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {};
|
||||
alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {};
|
||||
alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {};
|
||||
alex = self.alex_3_0_2;
|
||||
alex_3_0_4 = callPackage ../development/tools/parsing/alex/3.0.4.nix {};
|
||||
alex = self.alex_3_0_4;
|
||||
|
||||
alexMeta = callPackage ../development/tools/haskell/alex-meta {};
|
||||
|
||||
|
||||
@ -2502,6 +2502,28 @@ pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
pyglet = buildPythonPackage rec {
|
||||
name = "pyglet-1.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pyglet.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "048n20d606i3njnzhajadnznnfm8pwchs43hxs50da9p79g2m6qx";
|
||||
};
|
||||
|
||||
patchPhase = let
|
||||
libs = [ pkgs.mesa pkgs.xlibs.libX11 pkgs.freetype pkgs.fontconfig ];
|
||||
paths = pkgs.lib.concatStringsSep "," (map (l: "\"${l}/lib\"") libs);
|
||||
in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.pyglet.org/";
|
||||
description = "A cross-platform windowing and multimedia library";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
};
|
||||
};
|
||||
|
||||
pygments = buildPythonPackage rec {
|
||||
name = "Pygments-1.5";
|
||||
|
||||
@ -2768,6 +2790,24 @@ pythonPackages = python.modules // rec {
|
||||
});
|
||||
|
||||
|
||||
pyserial = buildPythonPackage rec {
|
||||
name = "pyserial-2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/p/pyserial/${name}.tar.gz";
|
||||
md5 = "cde799970b7c1ce1f7d6e9ceebe64c98";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "http://pyserial.sourceforge.net/";
|
||||
license = stdenv.lib.licenses.psfl;
|
||||
description = "Python serial port extension";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
pysqlite = buildPythonPackage (rec {
|
||||
name = "pysqlite-2.5.5";
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user