gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into php

Browse Source
This commit is contained in:
Alexander Foremny
2013-02-22 09:33:26 +01:00
parent bd0903b90b e0344da28c
commit 0c01ceab78
193 changed files with 1733 additions and 1917 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/hydrogen/default.nix
+2 -1
View File
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp
sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp
'';
sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct
'';
# why doesn't scons find librdf?
buildPhase = ''
pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ clangStdenv, fetchgit, llvm, clangUnwrapped }:
clangStdenv.mkDerivation {
name = "emacs-clang-complete-async-20130218";
src = fetchgit {
url = "git://github.com/Golevka/emacs-clang-complete-async.git";
rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
};
buildInputs = [ llvm clangUnwrapped ];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
install -m 755 clang-complete $out/bin
install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
'';
meta = {
homepage = "https://github.com/Golevka/emacs-clang-complete-async";
description = "An emacs plugin to complete C and C++ code using libclang";
license = "GPLv3+";
};
}
pkgs/applications/graphics/inkscape/default.nix
+3 -3
View File
@@ -4,14 +4,14 @@
, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
stdenv.mkDerivation rec {
name = "inkscape-0.48.3.1";
name = "inkscape-0.48.4";
src = fetchurl {
url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
sha256 = "126vfsafkfj6z65i5vp6g5dg9hvp3dd1zppjhms78257ns2zafq7";
sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7";
};
patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ];
patches = [ ./configure-python-libs.patch ];
propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from
pkgs/applications/graphics/meshlab/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}:
{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}:
stdenv.mkDerivation rec {
name = "meshlab-1.3.2";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
buildInputs = [ qt unzip ];
buildInputs = [ qt4 unzip ];
meta = {
description = "System for the processing and editing of unstructured 3D triangular meshes";
pkgs/applications/misc/evtest/default.nix
+19
View 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";
};
}
pkgs/applications/misc/ikiwiki/default.nix
+2 -2
View File
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
version = "3.20121212";
version = "3.20130212";
lib = stdenv.lib;
in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz";
sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
pkgs/applications/networking/browsers/chromium/clone_detached.patch
+19
View File
@@ -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 {
pkgs/applications/networking/browsers/chromium/default.nix
+25 -2
View File
@@ -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;
@@ -117,12 +134,16 @@ in stdenv.mkDerivation rec {
patches = optional cupsSupport ./cups_allow_deprecated.patch
++ optional pulseSupport ./pulseaudio_array_bounds.patch
++ maybeFixPulseAudioBuild;
++ maybeFixPulseAudioBuild
++ optional post25 ./clone_detached.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 // {
@@ -202,4 +223,6 @@ in stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.linux;
};
} // optionalAttrs only25 {
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
}
pkgs/applications/networking/browsers/chromium/sources.nix
+9 -9
View File
@@ -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";
};
}
pkgs/applications/networking/browsers/firefox/18.0.nix → pkgs/applications/networking/browsers/firefox/19.0.nix
+6 -6
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, freetype, fontconfig, file, alsaLib, nspr, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
@@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "18.0.2";
firefoxVersion = "19.0";
xulVersion = "18.0.2"; # this attribute is used by other packages
xulVersion = "19.0"; # this attribute is used by other packages
src = fetchurl {
@@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b";
sha1 = "816d64e8c9432349cd208fd181d210c54f985351";
};
commonConfigureFlags =
@@ -60,7 +60,7 @@ rec {
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
alsaLib nspr libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
@@ -125,7 +125,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+7 -8
View File
@@ -3,7 +3,6 @@
, zlib
, alsaLib
, curl
, nss
, nspr
, fontconfig
, freetype
@@ -44,9 +43,9 @@ let
throw "no x86_64 debugging version available"
else rec {
# -> http://labs.adobe.com/downloads/flashplayer10.html
version = "11.2.202.251";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_x86_64.tar.gz";
sha256 = "0nkwpqp8ilv21rlmr4jv8abdnfmz292y3w1qlx6r67qf926nfrz2";
version = "11.2.202.262";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
sha256 = "1bfr7ajpqkah4kshhqkmi2c15mm962absrq9ks7gfsfaircp387j";
}
else if stdenv.system == "i686-linux" then
if debug then {
@@ -55,9 +54,9 @@ let
url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
} else rec {
version = "11.2.202.251";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_i386.tar.gz";
sha256 = "0nph42s1bspf88m1qqrvc93kkxkrvq3lfs5iq4l5dflwzs32jdm3";
version = "11.2.202.262";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
sha256 = "0fhslr46apa6qfzdhagmjb8vbl741ryh6j14qy2271nl2q687jsx";
}
else throw "Flash Player is not supported on this platform";
@@ -77,7 +76,7 @@ stdenv.mkDerivation {
};
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
[ zlib alsaLib curl nspr fontconfig freetype expat libX11
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
libvdpau
];
pkgs/applications/networking/instant-messengers/linphone/default.nix
+9 -5
View File
@@ -1,18 +1,22 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip
, speex, readline, mediastreamer }:
, speex, readline, mediastreamer, libsoup }:
stdenv.mkDerivation rec {
name = "linphone-3.5.0";
name = "linphone-3.5.2";
src = fetchurl {
url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz";
sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix";
sha256 = "0830iam7kgqphgk3q6qx93kp5wrf0gnm5air82jamy7377jxadys";
};
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ];
patches = [ ./fix-deprecated.patch ];
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ];
buildNativeInputs = [ intltool pkgconfig ];
preConfigure = "rm -r mediastreamer2 oRTP";
configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
meta = {
pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch
+35
View File
@@ -0,0 +1,35 @@
diff --git a/gtk/main.c b/gtk/main.c
index 7079bc8..f076127 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){
GdkPixbuf *pbuf;
const char *app_name="Linphone";
- g_thread_init(NULL);
+ g_type_init();
gdk_threads_init();
progpath = strdup(argv[0]);
diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 1c54fca..45c9091 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) {
linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
- g_thread_create(check_username_availability, (void*)w, FALSE, NULL);
+ g_thread_new (NULL, check_username_availability, (void*)w);
}
else {
if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){
ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
- g_thread_init (NULL);
+ g_type_init ();
gdk_threads_init ();
GtkWidget *p1=create_intro();
pkgs/applications/networking/mailreaders/notmuch/default.nix
+3 -3
View File
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "notmuch-0.14";
name = "notmuch-0.15";
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753";
sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
description = "Notmuch -- The mail indexer";
longDescription = "";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ];
platforms = stdenv.lib.platforms.gnu;
};
}
pkgs/applications/science/logic/hol_light/default.nix
+3 -3
View File
@@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation {
name = "hol_light-20121213";
name = "hol_light-20130124";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = "153";
sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0";
rev = "155";
sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr";
};
buildInputs = [ ocaml findlib camlp5 ];
pkgs/applications/version-management/git-and-tools/default.nix
+1 -1
View File
@@ -49,7 +49,7 @@ rec {
network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
SafeSemaphore networkPprotocolXmpp async dns DAV;
SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob;
};
qgit = import ./qgit {
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+4 -4
View File
@@ -8,18 +8,18 @@
, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
, transformers, transformersBase, utf8String, wai, waiLogger, warp
, yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
, networkPprotocolXmpp, async, dns, DAV
, networkPprotocolXmpp, async, dns, DAV, uuid, Glob
}:
let
version = "3.20130107";
version = "3.20130216";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq";
sha256 = "1zbxkv9kkfyr8haml0wih1fi2xi6qazwzcxjyv8q65fa80ksskbr";
name = "git-annex-${version}.tar.gz";
};
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
transformers transformersBase utf8String wai waiLogger warp yesod
yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
async dns DAV ];
async dns DAV uuid Glob ];
checkTarget = "test";
doCheck = true;
pkgs/applications/video/kdenlive/default.nix
+3 -3
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "kdenlive-${version}";
version = "0.9.2";
version = "0.9.4";
src = fetchurl {
url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2";
sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1";
url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2";
sha256 = "1l3axf3y83gdfr6yc1lmy296h09gypkpqsc01w7pprg0y19rrfif";
};
buildInputs =
pkgs/applications/window-managers/xmonad/default.nix
+4
View File
@@ -9,6 +9,10 @@ cabal.mkDerivation (self: {
buildDepends = [
extensibleExceptions filepath mtl utf8String X11
];
postInstall = ''
mkdir -p $out/share/man/man1
mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/
'';
meta = {
homepage = "http://xmonad.org";
description = "A tiling window manager";
pkgs/build-support/kernel/make-initrd.nix
+2 -1
View File
@@ -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 {
buildNativeInputs = inputsFun stdenv.cross.platform.uboot;
makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot;
};
inherit compressor;
}
pkgs/build-support/kernel/make-initrd.sh
+1 -1
View File
@@ -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
pkgs/build-support/release/nix-build.nix
+8 -4
View File
@@ -46,17 +46,17 @@ stdenv.mkDerivation (
header "Copying build directory to $KEEPBUILDDIR"
mkdir -p $KEEPBUILDDIR
cp -R $TMPDIR/* $KEEPBUILDDIR
stopNest
stopNest
fi
fi
'';
}
// args //
// args //
{
name = name + (if src ? version then "-" + src.version else "");
postHook = ''
. ${./functions.sh}
origSrc=$src
@@ -75,7 +75,11 @@ stdenv.mkDerivation (
echo "$system" > $out/nix-support/system
if [ -z "${toString doCoverageAnalysis}" ]; then
echo "nix-build none $out" >> $out/nix-support/hydra-build-products
for i in $outputs; do
if [ "$i" = out ]; then j=none; else j="$i"; fi
mkdir -p ''${!i}/nix-support
echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products
done
fi
'';
pkgs/desktops/e17/embryo/default.nix
+1 -1
View File
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
untouched.
'';
homepage = http://enlightenment.org/;
license = with stdenv.lib.licenses; [ bsd2 bsd3 ]; # not sure
license = with stdenv.lib.licenses; [ bsd2.shortName bsd3.shortName ]; # not sure
};
}
pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libart_lgpl-2.3.20";
stdenv.mkDerivation rec {
name = "libart_lgpl-2.3.21";
src = fetchurl {
url = mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2;
sha256 = "0iyqsc517lj8xnidchnk0fxa6aqvss4hv8p9fk6bba86lbiillym";
url = "mirror://gnome/sources/libart_lgpl/2.3/${name}.tar.bz2";
sha256 = "1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx";
};
}
pkgs/development/compilers/ghc/with-packages.nix
+7
View File
@@ -64,6 +64,13 @@ stdenv.mkDerivation rec {
ln -s $f $out/etc/bash_completion.d/
echo -n .
done
for s in 1 2 3 4 5 6 7 8 9; do
for f in "$currentPath/share/man/man$s/"*; do
mkdir -p $out/share/man/man$s
ln -sv $f $out/share/man/man$s/
echo -n .
done
done
for f in "$currentPkgDir/"*.conf; do
ln -s $f $linkedPkgDir
echo -n .
pkgs/development/compilers/idris/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/interpreters/love/default.nix
+23 -49
View File
@@ -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 ];
};
}
pkgs/development/interpreters/pure/default.nix
+7 -5
View File
@@ -1,5 +1,5 @@
x@{builderDefsPackage
, llvm, gmp, mpfr, readline
, llvm, gmp, mpfr, readline, bison, flex
, ...}:
builderDefsPackage
(a :
@@ -12,11 +12,11 @@ let
sourceInfo = rec {
baseName="pure";
project="pure-lang";
version="0.49";
version="0.56";
name="${baseName}-${version}";
extension="tar.gz";
url="http://${project}.googlecode.com/files/${name}.${extension}";
hash="0kkrcmmqks82g3qlkvs3cd23v6b5948rw3xsdadd1jidh74jg33x";
hash="1ll29j31lp7ymp1kq57328q8md7pkp8jmwsadp67j4cdlzc3zdhj";
};
in
rec {
@@ -29,8 +29,10 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
patches = [ ./new-gcc.patch ];
meta = {
description = "A purely functional programming language based on term rewriting";
maintainers = with a.lib.maintainers;
pkgs/development/interpreters/pure/new-gcc.patch
+62
View File
@@ -0,0 +1,62 @@
diff --git a/runtime.cc b/runtime.cc
index 04cbc40..54a0b43 100644
--- a/runtime.cc
+++ b/runtime.cc
@@ -13121,39 +13121,6 @@ unsigned int sleep(unsigned int secs)
}
#endif
-/* Horrible kludge to get round, trunc and the inverse hyperbolic functions
- from libmingwex.a (these are in C99, but not in the Windows system
- libraries, and LLVM doesn't know how to get them either). */
-
-extern "C"
-double __round(double x)
-{
- return round(x);
-}
-
-extern "C"
-double __trunc(double x)
-{
- return trunc(x);
-}
-
-extern "C"
-double __asinh(double x)
-{
- return asinh(x);
-}
-
-extern "C"
-double __acosh(double x)
-{
- return acosh(x);
-}
-
-extern "C"
-double __atanh(double x)
-{
- return atanh(x);
-}
/* File type bits. */
diff --git a/util.hh b/util.hh
index ae95b79..eab3330 100644
--- a/util.hh
+++ b/util.hh
@@ -58,13 +58,6 @@ char *default_encoding();
double my_strtod(const char *nptr, char **endptr);
char *my_formatd(char *buffer, const char *format, double d);
-/* Windows doesn't have strptime, so we provide a suitable replacement from
- GNU libc (see strptime.c). */
-
-#ifndef HAVE_STRPTIME
-extern "C"
-char *strptime(const char *s, const char *format, struct tm *tm);
-#endif
/* Windows doesn't have mkstemp, so we provide a suitable replacement. */
pkgs/development/interpreters/python/python-linkme-wrapper.sh
+1 -1
View File
@@ -14,7 +14,7 @@ PROG=$(basename "$0")
SITES=
pypath() {
BIN=$(realpath -s "$(dirname "$BIN")")
BIN=$(realpath -s "$(dirname "$1")")
ENV=$(dirname "$BIN")
SITE="$ENV/lib/python2.7/site-packages"
SITES="$SITES${SITES:+:}$SITE"
pkgs/development/interpreters/ruby/generated.nix
+67 -67
View File
@@ -4,12 +4,12 @@ g: # Get dependencies from patched gems
{
aliases = {
ZenTest = g.ZenTest_4_9_0;
actionmailer = g.actionmailer_3_2_11;
actionpack = g.actionpack_3_2_11;
activemodel = g.activemodel_3_2_11;
activerecord = g.activerecord_3_2_11;
activeresource = g.activeresource_3_2_11;
activesupport = g.activesupport_3_2_11;
actionmailer = g.actionmailer_3_2_12;
actionpack = g.actionpack_3_2_12;
activemodel = g.activemodel_3_2_12;
activerecord = g.activerecord_3_2_12;
activeresource = g.activeresource_3_2_12;
activesupport = g.activesupport_3_2_12;
arel = g.arel_3_0_2;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
autotest_rails = g.autotest_rails_4_1_2;
@@ -17,7 +17,7 @@ g: # Get dependencies from patched gems
builder = g.builder_3_1_4;
buildr = g.buildr_1_4_9;
bundler = g.bundler_1_2_3;
childprocess = g.childprocess_0_3_7;
childprocess = g.childprocess_0_3_8;
daemons = g.daemons_1_1_9;
diff_lcs = g.diff_lcs_1_1_3;
erubis = g.erubis_2_7_0;
@@ -31,13 +31,13 @@ g: # Get dependencies from patched gems
i18n = g.i18n_0_6_1;
journey = g.journey_1_0_4;
jruby_pageant = g.jruby_pageant_1_1_1;
json = g.json_1_7_6;
json_pure = g.json_pure_1_7_6;
json = g.json_1_7_7;
json_pure = g.json_pure_1_7_7;
macaddr = g.macaddr_1_6_1;
mail = g.mail_2_4_4;
mime_types = g.mime_types_1_20_1;
mime_types = g.mime_types_1_21;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_5_0;
multi_json = g.multi_json_1_5_1;
net_sftp = g.net_sftp_2_0_5;
net_ssh = g.net_ssh_2_6_5;
nix = g.nix_0_1_1;
@@ -48,8 +48,8 @@ g: # Get dependencies from patched gems
rack_protection = g.rack_protection_1_3_2;
rack_ssl = g.rack_ssl_1_3_3;
rack_test = g.rack_test_0_6_2;
rails = g.rails_3_2_11;
railties = g.railties_3_2_11;
rails = g.rails_3_2_12;
railties = g.railties_3_2_12;
rake = g.rake_10_0_3;
rb_fsevent = g.rb_fsevent_0_9_3;
rdoc = g.rdoc_3_12_1;
@@ -108,71 +108,71 @@ installed versions.'';
requiredGems = [ ];
sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96'';
};
actionmailer_3_2_11 = {
actionmailer_3_2_12 = {
basename = ''actionmailer'';
meta = {
description = ''Email composition, delivery, and receiving framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
};
name = ''actionmailer-3.2.11'';
requiredGems = [ g.actionpack_3_2_11 g.mail_2_4_4 ];
sha256 = ''12j8k1kfz5lqqlrxna88455hx62mbs638414dhnwsw358yf52qnn'';
name = ''actionmailer-3.2.12'';
requiredGems = [ g.actionpack_3_2_12 g.mail_2_4_4 ];
sha256 = ''0rjcyz5p139iv7r9gb9nw6c490mksf6n3rnfxsg6bdaxpabinlc7'';
};
actionpack_3_2_11 = {
actionpack_3_2_12 = {
basename = ''actionpack'';
meta = {
description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
};
name = ''actionpack-3.2.11'';
requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
sha256 = ''0ins0by3il1fkg5aslr7rb97ykkrrns7dsp6qr8wwvr1dvrzrnbq'';
name = ''actionpack-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
sha256 = ''19p8slf607ssvhd1xkqmk0ddhxqh99faqbgw9i0gyjh1hxyh4apk'';
};
activemodel_3_2_11 = {
activemodel_3_2_12 = {
basename = ''activemodel'';
meta = {
description = ''A toolkit for building modeling frameworks (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
};
name = ''activemodel-3.2.11'';
requiredGems = [ g.activesupport_3_2_11 g.builder_3_0_4 ];
sha256 = ''0q5f70wv76aprdawqgwa0ldsg3v45mqi36yicir336941lcs28nf'';
name = ''activemodel-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.builder_3_0_4 ];
sha256 = ''1w43k2yhdybrrhph87zhb9shc1j8z1ryhpqy15y7cj9gc4a1bnqf'';
};
activerecord_3_2_11 = {
activerecord_3_2_12 = {
basename = ''activerecord'';
meta = {
description = ''Object-relational mapper framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
};
name = ''activerecord-3.2.11'';
requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.arel_3_0_2 g.tzinfo_0_3_35 ];
sha256 = ''049h164hwd6j7p8rvb46h776rshmkk4dpvh9cynihaajvzmcj3lw'';
name = ''activerecord-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_35 ];
sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi'';
};
activeresource_3_2_11 = {
activeresource_3_2_12 = {
basename = ''activeresource'';
meta = {
description = ''REST modeling framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
};
name = ''activeresource-3.2.11'';
requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 ];
sha256 = ''0pjxfl589an08pm29cqid8dsbn3f7dlr56kpr6bs3gbzg9k3b44h'';
name = ''activeresource-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 ];
sha256 = ''0dmy7n93ndxfqkccs0mv82dzkr130414djg96qi8njyj07ad84fi'';
};
activesupport_3_2_11 = {
activesupport_3_2_12 = {
basename = ''activesupport'';
meta = {
description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
};
name = ''activesupport-3.2.11'';
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_0 ];
sha256 = ''1dyi5vw118hfm88fxgrlfy3w5s6ka8505asw0nrrfma04jvpbq9s'';
name = ''activesupport-3.2.12'';
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_1 ];
sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
};
arel_3_0_2 = {
basename = ''arel'';
@@ -234,7 +234,7 @@ rails support and extra plugins for migrations and fixtures.'';
longDescription = ''AWS SDK for Ruby'';
};
name = ''aws-sdk-1.8.1.2'';
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_6 ];
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
sha256 = ''0z3ins8rd8v3r40sn70kg21f5di58lqjfxppl19hi3pdjxgdrr7x'';
};
builder_3_0_4 = {
@@ -312,16 +312,16 @@ for those one-off tasks, with a language that's a joy to use.
requiredGems = [ ];
sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w'';
};
childprocess_0_3_7 = {
childprocess_0_3_8 = {
basename = ''childprocess'';
meta = {
description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
homepage = ''http://github.com/jarib/childprocess'';
longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
};
name = ''childprocess-0.3.7'';
name = ''childprocess-0.3.8'';
requiredGems = [ g.ffi_1_3_1 ];
sha256 = ''1dq7zyjm9fdivxm83nbhn8y5w9cc5wa458qlmkkcy52yvv0vsc84'';
sha256 = ''08rp4krw0g60567ih4w51ndlq2pg92al0dycy0bs0m3msq68nlq4'';
};
daemons_1_1_9 = {
basename = ''daemons'';
@@ -513,16 +513,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
};
json_1_7_6 = {
json_1_7_7 = {
basename = ''json'';
meta = {
description = ''JSON Implementation for Ruby'';
homepage = ''http://flori.github.com/json'';
longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
};
name = ''json-1.7.6'';
name = ''json-1.7.7'';
requiredGems = [ ];
sha256 = ''025hdczzmj7zbwcdr53d8qc0bg8i7j5wpp1ps4cqkllz89snb82a'';
sha256 = ''1v5pn3g9ignbgrfl72dbf7bzvxsm90ybp24fa3bm9cv5cpa2ww7x'';
};
json_pure_1_7_5 = {
basename = ''json_pure'';
@@ -535,16 +535,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap'';
};
json_pure_1_7_6 = {
json_pure_1_7_7 = {
basename = ''json_pure'';
meta = {
description = ''JSON Implementation for Ruby'';
homepage = ''http://flori.github.com/json'';
longDescription = ''This is a JSON implementation in pure Ruby.'';
};
name = ''json_pure-1.7.6'';
name = ''json_pure-1.7.7'';
requiredGems = [ ];
sha256 = ''1cjwg6f9gj7w2n9916w12i1g97ngqqar44sc2r1x9ib5jicspb00'';
sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
};
macaddr_1_6_1 = {
basename = ''macaddr'';
@@ -565,16 +565,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
longDescription = ''A really Ruby Mail handler.'';
};
name = ''mail-2.4.4'';
requiredGems = [ g.mime_types_1_20_1 g.treetop_1_4_12 g.i18n_0_6_1 ];
requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_1 ];
sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
};
mime_types_1_20_1 = {
mime_types_1_21 = {
basename = ''mime_types'';
meta = {
description = ''This library allows for the identification of a file's likely MIME content type'';
homepage = ''http://mime-types.rubyforge.org/'';
longDescription = ''This library allows for the identification of a file's likely MIME content
type. This is release 1.20.1 with new MIME types. The identification of MIME
type. This is release 1.21 with new MIME types. The identification of MIME
content type is based on a file's filename extensions.
MIME types are used in MIME-compliant communications, as in e-mail or
@@ -596,9 +596,9 @@ follows the official {IANA registry}[http://www.iana.org/assignments/media-types
({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].'';
};
name = ''mime-types-1.20.1'';
name = ''mime-types-1.21'';
requiredGems = [ ];
sha256 = ''13l7avr24nwzk0xpyqh04iqpf58vqsb3bbqjmjr04bsryq8azlb0'';
sha256 = ''1qmx53a2kqk0nnhjbfvbc213wsxiprl0wqm7f2xvcsh253ld91iw'';
};
minitar_0_5_3 = {
basename = ''minitar'';
@@ -611,16 +611,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
requiredGems = [ ];
sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
};
multi_json_1_5_0 = {
multi_json_1_5_1 = {
basename = ''multi_json'';
meta = {
description = ''A gem to provide swappable JSON backends.'';
homepage = ''http://github.com/intridea/multi_json'';
longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
};
name = ''multi_json-1.5.0'';
name = ''multi_json-1.5.1'';
requiredGems = [ ];
sha256 = ''0fk75m2496ghgv78yybzhrmf9izw65va3x90gdjkbsw8vfkghk79'';
sha256 = ''0c2jxjg6lx811515s35vnyjl9m9rsb2adw6yj2fxgqkc7yx1fjsz'';
};
net_sftp_2_0_5 = {
basename = ''net_sftp'';
@@ -779,27 +779,27 @@ request helpers feature.'';
requiredGems = [ g.rack_1_5_2 ];
sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
};
rails_3_2_11 = {
rails_3_2_12 = {
basename = ''rails'';
meta = {
description = ''Full-stack web application framework.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
name = ''rails-3.2.11'';
requiredGems = [ g.activesupport_3_2_11 g.actionpack_3_2_11 g.activerecord_3_2_11 g.activeresource_3_2_11 g.actionmailer_3_2_11 g.railties_3_2_11 g.bundler_1_2_3 ];
sha256 = ''0gk0wnydzb5dknk3d0n9vy51xixmwgcq5j6jqzr9m8wsi2cjkq7m'';
name = ''rails-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_3 ];
sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
};
railties_3_2_11 = {
railties_3_2_12 = {
basename = ''railties'';
meta = {
description = ''Tools for creating, working with, and running Rails applications.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
};
name = ''railties-3.2.11'';
requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_1 g.activesupport_3_2_11 g.actionpack_3_2_11 ];
sha256 = ''0gjna6jskckh35xp03sjlb7xq2cgabmjl7nvczh6kq8xb1vh09dw'';
name = ''railties-3.2.12'';
requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_1 g.activesupport_3_2_12 g.actionpack_3_2_12 ];
sha256 = ''0d8wy1n591x12bigj3jh8c9djzi8k68vh14342mc22raxwp5rwdw'';
};
rake_0_9_2_2 = {
basename = ''rake'';
@@ -857,7 +857,7 @@ documentation.
See RDoc for a description of RDoc's markup and basic use.'';
};
name = ''rdoc-3.12.1'';
requiredGems = [ g.json_1_7_6 ];
requiredGems = [ g.json_1_7_7 ];
sha256 = ''1hflgw2v0lyx38kdwj71jyibc14j6ghb6zmp2l3g47v7d2m47z4g'';
};
rjb_1_4_2 = {
@@ -943,7 +943,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
};
name = ''rubyforge-2.0.4'';
requiredGems = [ g.json_pure_1_7_6 ];
requiredGems = [ g.json_pure_1_7_7 ];
sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1'';
};
rubyzip_0_9_9 = {
@@ -979,7 +979,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
};
name = ''selenium-webdriver-2.29.0'';
requiredGems = [ g.multi_json_1_5_0 g.rubyzip_0_9_9 g.childprocess_0_3_7 g.websocket_1_0_7 ];
requiredGems = [ g.multi_json_1_5_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj'';
};
sinatra_1_3_2 = {
@@ -1001,7 +1001,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
name = ''sprockets-2.2.2'';
requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_0 g.rack_1_5_2 g.tilt_1_3_3 ];
requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_1 g.rack_1_5_2 g.tilt_1_3_3 ];
sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
};
systemu_2_5_2 = {
pkgs/development/libraries/atkmm/2.22.x.nix → pkgs/development/libraries/atkmm/default.nix
View File
pkgs/development/libraries/glibmm/2.30.x.nix
-24
View File
@@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.30.1";
src = fetchurl {
url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
};
buildNativeInputs = [pkgconfig];
propagatedBuildInputs = [glib libsigcxx];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/development/libraries/glibmm/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.34.1";
src = fetchurl {
url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz";
sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl";
};
buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/development/libraries/gtkmm/2.24.x.nix → pkgs/development/libraries/gtkmm/2.x.nix
View File
pkgs/development/libraries/gtkmm/3.2.x.nix → pkgs/development/libraries/gtkmm/3.x.nix
View File
pkgs/development/libraries/haskell/DAV/default.nix
+1
View File
@@ -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";
pkgs/development/libraries/haskell/Diff/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Diff";
version = "0.2.0";
sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k";
version = "0.3.0";
sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98";
meta = {
description = "O(ND) diff algorithm in haskell";
license = self.stdenv.lib.licenses.bsd3;
pkgs/development/libraries/haskell/Glob/default.nix
+14
View File
@@ -0,0 +1,14 @@
{ cabal, dlist, filepath, transformers }:
cabal.mkDerivation (self: {
pname = "Glob";
version = "0.7.2";
sha256 = "1x4gh7z9jx9hdkjwsc31yyjssw6i7ziixhjrxr9b8zkijk1b4r5i";
buildDepends = [ dlist filepath transformers ];
meta = {
homepage = "http://iki.fi/matti.niemenmaa/glob/";
description = "Globbing library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/Graphalyze/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Graphalyze";
version = "0.14.0.0";
sha256 = "027nxvv38cza6y6rivmvc9wpglbazkjrkyriwv3mn03pp21y53fg";
version = "0.14.0.1";
sha256 = "1prgszkrnb22x9xkwmxbvb9w1h78ffig9268f3q3y65knggmwp1x";
buildDepends = [
bktrees fgl filepath graphviz pandoc random text time
];
pkgs/development/libraries/haskell/HStringTemplate/default.nix
+6 -6
View File
@@ -1,14 +1,14 @@
{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb
, sybWithClass, text, time, utf8String
{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text
, time, utf8String, void
}:
cabal.mkDerivation (self: {
pname = "HStringTemplate";
version = "0.6.12";
sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p";
version = "0.7.0";
sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai";
buildDepends = [
blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time
utf8String
blazeBuilder deepseq filepath mtl parsec syb text time utf8String
void
];
meta = {
description = "StringTemplate implementation in Haskell";
pkgs/development/libraries/haskell/SMTPClient/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SMTPClient";
version = "1.0.4";
sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2";
version = "1.1.0";
sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk";
buildDepends = [ extensibleExceptions hsemail network ];
meta = {
description = "A simple SMTP client library";
pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+2 -2
View File
@@ -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";
pkgs/development/libraries/haskell/authenticate/default.nix
+7 -8
View File
@@ -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.1";
sha256 = "1r53mnj4b4x0prcqqf6y3gdia2j1l3155iw79jzlx0cnxbdsfnc7";
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";
pkgs/development/libraries/haskell/base64-conduit/default.nix
+2 -2
View File
@@ -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";
pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+2 -2
View File
@@ -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";
pkgs/development/libraries/haskell/blaze-html/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.5.1.3";
sha256 = "0ia7pk346lc7664w859q09p163cxgxjjpkk7cbmbl1wj2shshh1w";
version = "0.6.0.0";
sha256 = "0n8jpmslcs29pfyb8jhp43dg4058ahd9y3kf2p2wr3r6b9yr5dll";
buildDepends = [ blazeBuilder blazeMarkup text ];
meta = {
homepage = "http://jaspervdj.be/blaze";
pkgs/development/libraries/haskell/bmp/1.2.3.4.nix → pkgs/development/libraries/haskell/bmp/1.2.4.1.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bmp";
version = "1.2.3.4";
sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6";
version = "1.2.4.1";
sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap";
buildDepends = [ binary ];
meta = {
homepage = "http://code.ouroborus.net/bmp";
pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+2 -2
View File
@@ -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
pkgs/development/libraries/haskell/classy-prelude/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude";
version = "0.5.0";
sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp";
version = "0.5.1";
sha256 = "0kgnffqvh13adadp85iw4ybbs5jpa5hwrr2dsi2aj9p8lvzac1jy";
buildDepends = [
basicPrelude hashable liftedBase systemFilepath text transformers
unorderedContainers vector
pkgs/development/libraries/haskell/conduit/default.nix
+2 -2
View File
@@ -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
pkgs/development/libraries/haskell/crypto-api/default.nix
+4 -4
View File
@@ -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";
pkgs/development/libraries/haskell/crypto-conduit/default.nix
+2 -2
View File
@@ -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";
pkgs/development/libraries/haskell/filestore/default.nix
+1
View File
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
buildDepends = [
Diff filepath HUnit mtl parsec split time utf8String xml
];
jailbreak = true;
meta = {
description = "Interface for versioning file stores";
license = self.stdenv.lib.licenses.bsd3;
pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+2 -2
View File
@@ -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
];
pkgs/development/libraries/haskell/ghc-mod/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.11.3";
sha256 = "13r3cz25lf0ndsyfc5adqx5mdv7hcl3qp7n2syg2msrn133xpwb2";
version = "1.11.4";
sha256 = "1bxmpvad415ayzwyijjm0zsck0z8aa1nfjixwb6l80i6lbxi4rfg";
isLibrary = false;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/gloss/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.7.8.1";
sha256 = "0bi60zprgq1dd6prshvgqyyp13l6n5f171aryxg254kjagvrm3lf";
version = "1.7.8.2";
sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4";
buildDepends = [ bmp GLUT OpenGL ];
jailbreak = true;
meta = {
pkgs/development/libraries/haskell/graphviz/default.nix
+5 -4
View File
@@ -1,13 +1,14 @@
{ cabal, colour, dlist, fgl, filepath, polyparse, text
{ cabal, colour, dlist, fgl, filepath, polyparse, temporary, text
, transformers, wlPprintText
}:
cabal.mkDerivation (self: {
pname = "graphviz";
version = "2999.15.0.1";
sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy";
version = "2999.16.0.0";
sha256 = "1g4q4wyj5amz9xvgnqn143p5nq6m4a0lggxz7jn9l2hwp41bx1g8";
buildDepends = [
colour dlist fgl filepath polyparse text transformers wlPprintText
colour dlist fgl filepath polyparse temporary text transformers
wlPprintText
];
meta = {
homepage = "http://projects.haskell.org/graphviz/";
pkgs/development/libraries/haskell/hamlet/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
version = "1.1.6.1";
sha256 = "15jqlfb7l49xqd2szzjhffbnxs7azq85a759bbwx3jfxdz89cv0k";
version = "1.1.6.3";
sha256 = "1kpj8j47licmdf364n0fn5908hsl6ib1wkiqhcx3m0nimb7pjnss";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
];
pkgs/development/libraries/haskell/happstack/happstack-server.nix
+3 -2
View File
@@ -6,14 +6,15 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "7.1.2";
sha256 = "1pqrwsgdp1qf5jd2nzdrj2wkd2bq9n0ciwyzvzn8nmwyqgkdzs4f";
version = "7.1.5";
sha256 = "0w00y84arc8z92d1d3l6f7gh1hmkm4yrj70pnnrsaca3i603w11a";
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb systemFilepath
text threads time timeCompat transformers transformersBase
utf8String xhtml zlib
];
jailbreak = true;
meta = {
homepage = "http://happstack.com";
description = "Web related tools and services";
pkgs/development/libraries/haskell/heist/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "heist";
version = "0.11.0";
sha256 = "1zbwbgabdj6x0vi7l8wfq7rx77p8b4zxz5wv43nr67irszyz1k7w";
version = "0.11.0.1";
sha256 = "0d5nn0kfs7hbgs4b77i8c8pq2q5hldqk08dacva7xlxvjrlxsyn6";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time
pkgs/development/libraries/haskell/highlighting-kate/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.3.5";
sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3";
version = "0.5.3.7";
sha256 = "04wa1al83v5ak6gvrwqy2b63mda0qfi2ircxfs9ddk1gkdscrlrl";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
pkgs/development/libraries/haskell/hjsmin/default.nix
+2 -2
View File
@@ -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";
pkgs/development/libraries/haskell/hledger-web/default.nix
+3
View File
@@ -19,6 +19,9 @@ cabal.mkDerivation (self: {
shakespeareJs shakespeareText text time transformers wai waiExtra
warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic
];
patchPhase = ''
sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal
'';
jailbreak = true;
meta = {
homepage = "http://hledger.org";
pkgs/development/libraries/haskell/hoogle/default.nix
+1
View File
@@ -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";
pkgs/development/libraries/haskell/hs-bibutils/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hs-bibutils";
version = "4.16";
sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb";
version = "4.17";
sha256 = "0vv1qsxbwwb1nfwpvxvqacfjs3sswldrx3wimaxixmw9ynkkkwdg";
buildDepends = [ syb ];
meta = {
homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";
pkgs/development/libraries/haskell/hsdns/default.nix
+4 -4
View File
@@ -2,15 +2,15 @@
cabal.mkDerivation (self: {
pname = "hsdns";
version = "1.5";
sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399";
version = "1.6";
sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa";
buildDepends = [ network ];
extraLibraries = [ adns ];
noHaddock = true;
meta = {
homepage = "http://gitorious.org/hsdns";
homepage = "http://github.com/peti/hsdns";
description = "Asynchronous DNS Resolver";
license = "LGPL";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
pkgs/development/libraries/haskell/hsyslog/default.nix
+3 -3
View File
@@ -2,10 +2,10 @@
cabal.mkDerivation (self: {
pname = "hsyslog";
version = "1.4";
sha256 = "f3bf4bf47565cb0245afb0e8ffa3f79635b02f0032081845a5999964d828f4db";
version = "1.5";
sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp";
meta = {
homepage = "http://gitorious.org/hsyslog";
homepage = "http://github.com/peti/hsyslog";
description = "FFI interface to syslog(3) from POSIX.1-2001.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
pkgs/development/libraries/haskell/html-conduit/default.nix
+2 -2
View File
@@ -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
pkgs/development/libraries/haskell/http-conduit/default.nix
+2 -2
View File
@@ -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
pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+7 -7
View File
@@ -1,15 +1,15 @@
{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit
, conduit, dataDefault, httpConduit, httpTypes, liftedBase
, monadControl, network, networkConduit, text, wai, warp, word8
{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit
, dataDefault, httpConduit, httpTypes, liftedBase, monadControl
, network, networkConduit, text, wai, warp, word8
}:
cabal.mkDerivation (self: {
pname = "http-reverse-proxy";
version = "0.1.1.1";
sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2";
version = "0.1.1.3";
sha256 = "0z2h2xbvg034snfh3hzc0v2zp5j57lcak2h4vz10lwaqr3jxqnpn";
buildDepends = [
blazeBuilder caseInsensitive classyPreludeConduit conduit
dataDefault httpConduit httpTypes liftedBase monadControl network
blazeBuilder caseInsensitive classyPrelude conduit dataDefault
httpConduit httpTypes liftedBase monadControl network
networkConduit text wai warp word8
];
meta = {
pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hxt-regex-xmlschema";
version = "9.0.4";
sha256 = "0jl89p9sb76zb6j2b9ssxaai6jq3jbnnpv4v05wfvlmk8apckwgf";
version = "9.1.0";
sha256 = "0l97rkrvl6pmxdgiwbwh2s3l00lyaihrhsffhh69639bgs67zgwr";
buildDepends = [ hxtCharproperties parsec ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
pkgs/development/libraries/haskell/lambdabot-utils/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "lambdabot-utils";
version = "4.2.1";
sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx";
version = "4.2.2";
sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
buildDepends = [
binary haskellSrc mtl network random regexCompat regexPosix syb
tagsoup utf8String zlib
pkgs/development/libraries/haskell/lens/default.nix
+4 -4
View File
@@ -3,19 +3,19 @@
, MonadCatchIOTransformers, mtl, parallel, profunctorExtras
, profunctors, reflection, semigroupoids, semigroups, split, tagged
, text, transformers, transformersCompat, unorderedContainers
, vector
, vector, void
}:
cabal.mkDerivation (self: {
pname = "lens";
version = "3.8.5";
sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn";
version = "3.8.7.3";
sha256 = "0z28vv3k6zg2zsd3pb1vlhv75q0zjlh4zf1md77cviyyljwc0j09";
buildDepends = [
bifunctors comonad comonadsFd comonadTransformers contravariant
distributive filepath genericDeriving hashable
MonadCatchIOTransformers mtl parallel profunctorExtras profunctors
reflection semigroupoids semigroups split tagged text transformers
transformersCompat unorderedContainers vector
transformersCompat unorderedContainers vector void
];
meta = {
homepage = "http://github.com/ekmett/lens/";
pkgs/development/libraries/haskell/maccatcher/default.nix
+15
View File
@@ -0,0 +1,15 @@
{ cabal, binary, parsec }:
cabal.mkDerivation (self: {
pname = "maccatcher";
version = "2.1.5";
sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary parsec ];
meta = {
description = "Obtain the host MAC address on *NIX and Windows";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/monad-logger/default.nix
+2 -2
View File
@@ -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
pkgs/development/libraries/haskell/monad-par/0.3.nix → pkgs/development/libraries/haskell/monad-par/0.3.4.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "monad-par";
version = "0.3";
sha256 = "19vzz8qhv8z84grcb4myivmmaj0sn7rm956nqxv5dh2l8c279zsd";
version = "0.3.4";
sha256 = "1j1xskd8smpfi2dpiwnpwakw0hs0i2yn1lrs9l06wz4b148hwc4k";
buildDepends = [
abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
parallel
pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monadcryptorandom";
version = "0.5";
sha256 = "19sb9mgfvmmmx1sn0aiq6dn5nl0201xwgs6xqakn7pz5vsqcww2b";
version = "0.5.1";
sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6";
buildDepends = [ cryptoApi mtl tagged transformers ];
meta = {
homepage = "https://github.com/TomMD/monadcryptorandom";
pkgs/development/libraries/haskell/network-conduit/default.nix
+2 -2
View File
@@ -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
];
pkgs/development/libraries/haskell/pandoc/default.nix
+3
View File
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
text time xml zipArchive zlib
];
configureFlags = "-fblaze_html_0_5";
patchPhase = ''
sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal
'';
meta = {
homepage = "http://johnmacfarlane.net/pandoc";
description = "Conversion between markup formats";
pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-postgresql";
version = "1.1.2.1";
sha256 = "1iz6w9isva1drbr37c8f42g3nnl78sp27ydaj0975yqyp7nh7and";
version = "1.1.3.1";
sha256 = "1lbr4x45hzk73439x6is9zw6y3mqy1ivmblncvg70kzw0kmjhpnk";
buildDepends = [
aeson conduit monadControl persistent postgresqlLibpq
postgresqlSimple text time transformers
pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+5 -5
View File
@@ -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.2";
sha256 = "0pb52k7a7js71s4d2mynd62i8gk99az7y72rycs0xg9r9cr081p3";
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";
pkgs/development/libraries/haskell/persistent-template/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "1.1.2.1";
sha256 = "02sqrq847cxywj9hwixvi0bqq09kxr9w6lhn6kqg4ww0mw2add6s";
version = "1.1.2.4";
sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9";
buildDepends = [ aeson monadControl persistent text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
pkgs/development/libraries/haskell/persistent/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.1.4";
sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj";
version = "1.1.5.1";
sha256 = "1ds0q3mzgg60makx7impyxsvpzd3issa89igcy176yb54ypjwfnz";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
pkgs/development/libraries/haskell/project-template/default.nix
+6 -7
View File
@@ -1,15 +1,14 @@
{ cabal, base64Bytestring, base64Conduit, classyPreludeConduit
, conduit, mtl, resourcet, systemFileio, systemFilepath, text
, transformers
{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit
, mtl, resourcet, systemFileio, systemFilepath, text, transformers
}:
cabal.mkDerivation (self: {
pname = "project-template";
version = "0.1.2";
sha256 = "16rgarx78jwiimh3q8flxvmfraxmc1dxl8r04q4j1p9ap3mnvg61";
version = "0.1.3";
sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm";
buildDepends = [
base64Bytestring base64Conduit classyPreludeConduit conduit mtl
resourcet systemFileio systemFilepath text transformers
base64Bytestring base64Conduit classyPrelude conduit mtl resourcet
systemFileio systemFilepath text transformers
];
meta = {
homepage = "https://github.com/fpco/haskell-ide";
pkgs/development/libraries/haskell/publicsuffixlist/default.nix
+14
View File
@@ -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;
};
})
pkgs/development/libraries/haskell/readline/default.nix
+5 -7
View File
@@ -1,9 +1,9 @@
{ cabal, readline, ncurses } :
{ cabal, readline, ncurses }:
cabal.mkDerivation (self : {
cabal.mkDerivation (self: {
pname = "readline";
version = "1.0.1.0";
sha256 = "07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d";
version = "1.0.3.0";
sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0";
propagatedBuildInputs = [ readline ncurses ];
# experimentally link with ncursesw because ghci can't interpret ld scripts,
# and ncurses sometimes seems to be a script pointing to ncursesw
@@ -14,8 +14,6 @@ cabal.mkDerivation (self : {
description = "An interface to the GNU readline library";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})
pkgs/development/libraries/haskell/repa-io/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa-io";
version = "3.2.3.1";
sha256 = "19dnz8xa18yydprnwzgdcbrndi6akwc53rs1104z0awffh83iynm";
version = "3.2.3.2";
sha256 = "116qxq0jsq3hbj0hxjxfr9sl29vzj1rpfbzfxgc243v1hh4rdjfr";
buildDepends = [ binary bmp repa vector ];
jailbreak = true;
meta = {
pkgs/development/libraries/haskell/shakespeare-css/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-css";
version = "1.0.2";
sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3";
version = "1.0.2.1";
sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca";
buildDepends = [ parsec shakespeare text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
pkgs/development/libraries/haskell/shakespeare/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
version = "1.0.3";
sha256 = "0js56njy5rbviavga5qlp8d989wdpqf7lcyhwrjf1clf3k4f8anl";
version = "1.0.3.1";
sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs";
buildDepends = [ parsec text ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
pkgs/development/libraries/haskell/show/default.nix
+4 -4
View File
@@ -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";
pkgs/development/libraries/haskell/simple-reflect/default.nix
+13
View File
@@ -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;
};
})
pkgs/development/libraries/haskell/simple-sendfile/default.nix
+2 -2
View File
@@ -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";
pkgs/development/libraries/haskell/skein/default.nix
+2 -2
View File
@@ -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";
pkgs/development/libraries/haskell/smallcheck/default.nix
+4 -4
View File
@@ -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";
pkgs/development/libraries/haskell/snap/snap.nix
+10 -10
View File
@@ -1,22 +1,22 @@
{ cabal, aeson, attoparsec, cereal, clientsession, comonad
, configurator, directoryTree, dlist, either, errors, filepath
, hashable, heist, lens, logict, MonadCatchIOTransformers, mtl
, mwcRandom, pwstoreFast, regexPosix, snapCore, snapServer, stm
, syb, text, time, transformers, unorderedContainers, vector
, vectorAlgorithms, xmlhtml
, configurator, directoryTree, dlist, errors, filepath, hashable
, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
, time, transformers, unorderedContainers, vector, vectorAlgorithms
, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "snap";
version = "0.11.0";
sha256 = "0mw1fxjijd3z9bz1znrc5vfxa4mc1by481gxfmk2hdlcsib9sp7n";
version = "0.11.2";
sha256 = "1z9n15dhbxg0j17c1ik0vhdhxy2mz70915xd4jffg9jrdvlky51a";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson attoparsec cereal clientsession comonad configurator
directoryTree dlist either errors filepath hashable heist lens
logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast
regexPosix snapCore snapServer stm syb text time transformers
directoryTree dlist errors filepath hashable heist lens logict
MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
snapCore snapServer stm syb text time transformers
unorderedContainers vector vectorAlgorithms xmlhtml
];
jailbreak = true;
pkgs/development/libraries/haskell/socks/default.nix
+2 -2
View File
@@ -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";
pkgs/development/libraries/haskell/tagstream-conduit/default.nix
+6 -5
View File
@@ -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";
pkgs/development/libraries/haskell/unix-time/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-time";
version = "0.1.4";
sha256 = "1a8z9r75jk4z4diyigk0qzljkjqirxm30vf3jp75plnc9irysnw5";
version = "0.1.5";
sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg";
meta = {
description = "Unix time parser/formatter and utilities";
license = self.stdenv.lib.licenses.bsd3;
pkgs/development/libraries/haskell/uuid/default.nix
+14
View File
@@ -0,0 +1,14 @@
{ cabal, binary, cryptohash, maccatcher, random, time }:
cabal.mkDerivation (self: {
pname = "uuid";
version = "1.2.9";
sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi";
buildDepends = [ binary cryptohash maccatcher random time ];
meta = {
homepage = "http://projects.haskell.org/uuid/";
description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

Some files were not shown because too many files have changed in this diff Show More