diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index 9cacb1fcccf..2651e2a1eee 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -105,7 +105,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix
Thunderbird: pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix.
+ xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix">pkgs/applications/networking/mailreaders/thunderbird/3.x.nix.
Lots of dependencies.
diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh
new file mode 100755
index 00000000000..00ec1a105da
--- /dev/null
+++ b/maintainers/scripts/gnome-latest.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
+
+project=$1
+
+if [ "$project" == "--help" ]; then
+ echo "Usage: $0 project [major.minor]"
+ exit 0
+fi
+
+baseVersion=$2
+
+if [ -z "$project" ]; then
+ echo "No project specified, exiting"
+ exit 1
+fi
+
+# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
+# any conversations with sysadmin. Somehow lftp works.
+if [ "$FTP_CLIENT" = "lftp" ]; then
+ ls_ftp() {
+ lftp -c "open $1; cls"
+ }
+else
+ ls_ftp() {
+ curl -l "$1"/
+ }
+fi
+
+if [ -z "$baseVersion" ]; then
+ echo "Looking for available versions..." >&2
+ available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` )
+ echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2
+ echo -en "Choose one of them: " >&2
+ read baseVersion
+fi
+
+FTPDIR="${GNOME_FTP}/${project}/${baseVersion}"
+
+#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
+# gnome's LATEST-IS is broken. Do not trust it.
+
+files=$(ls_ftp "${FTPDIR}")
+declare -A versions
+
+for f in $files; do
+ case $f in
+ (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*):
+ ;;
+ ($project-*.*.9*.tar.*):
+ tmp=${f#$project-}
+ tmp=${tmp%.tar*}
+ echo "Ignored unstable version ${tmp}" >&2
+ ;;
+ ($project-*.tar.*):
+ tmp=${f#$project-}
+ tmp=${tmp%.tar*}
+ versions[${tmp}]=1
+ ;;
+ (*):
+ echo "UNKNOWN FILE $f"
+ ;;
+ esac
+done
+echo "Found versions ${!versions[@]}" >&2
+version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1`
+echo "Latest version is: ${version}" >&2
+
+name=${project}-${version}
+echo "Fetching .sha256 file" >&2
+curl -O http://${FTPDIR}/${name}.sha256sum
+
+extensions=( "xz" "bz2" "gz" )
+echo "Choosing archive extension (known are ${extensions[@]})..." >&2
+for ext in ${extensions[@]}; do
+ if grep "\\.tar\\.${ext}$" ${name}.sha256sum >& /dev/null; then
+ ext_pref=$ext
+ sha256=$(grep "\\.tar\\.${ext}$" ${name}.sha256sum | cut -f1 -d\ )
+ break
+ fi
+done
+sha256=`nix-hash --to-base32 --type sha256 $sha256`
+echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
+
+cat <&2
diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate
index 6e89542ec57..96517f86cb8 100755
--- a/maintainers/scripts/gnu/gnupdate
+++ b/maintainers/scripts/gnu/gnupdate
@@ -400,6 +400,120 @@ replaced by the result of their application to DERIVATIONS, a vhash."
;; Return the output path of the "src" derivation of PACKAGE.
(derivation-source-output-path (attribute-value package)))
+
+;;;
+;;; GnuPG interface.
+;;;
+
+(define %gpg-command "gpg2")
+(define %openpgp-key-server "keys.gnupg.net")
+
+(define (gnupg-verify sig file)
+ "Verify signature SIG for FILE. Return a status s-exp or #f if GnuPG
+failed."
+
+ (define (status-line->sexp line)
+ ;; See file `doc/DETAILS' in GnuPG.
+ (define sigid-rx
+ (make-regexp
+ "^\\[GNUPG:\\] SIG_ID ([A-Za-z0-9/]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+)"))
+ (define goodsig-rx
+ (make-regexp "^\\[GNUPG:\\] GOODSIG ([[:xdigit:]]+) (.+)$"))
+ (define validsig-rx
+ (make-regexp
+ "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
+ (define errsig-rx
+ (make-regexp
+ "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
+
+ (cond ((regexp-exec sigid-rx line)
+ =>
+ (lambda (match)
+ `(signature-id ,(match:substring match 1) ; sig id
+ ,(match:substring match 2) ; date
+ ,(string->number ; timestamp
+ (match:substring match 3)))))
+ ((regexp-exec goodsig-rx line)
+ =>
+ (lambda (match)
+ `(good-signature ,(match:substring match 1) ; key id
+ ,(match:substring match 2)))) ; user name
+ ((regexp-exec validsig-rx line)
+ =>
+ (lambda (match)
+ `(valid-signature ,(match:substring match 1) ; fingerprint
+ ,(match:substring match 2) ; sig creation date
+ ,(string->number ; timestamp
+ (match:substring match 3)))))
+ ((regexp-exec errsig-rx line)
+ =>
+ (lambda (match)
+ `(signature-error ,(match:substring match 1) ; key id or fingerprint
+ ,(match:substring match 2) ; pubkey algo
+ ,(match:substring match 3) ; hash algo
+ ,(match:substring match 4) ; sig class
+ ,(string->number ; timestamp
+ (match:substring match 5))
+ ,(let ((rc
+ (string->number ; return code
+ (match:substring match 6))))
+ (case rc
+ ((9) 'missing-key)
+ ((4) 'unknown-algorithm)
+ (else rc))))))
+ (else
+ `(unparsed-line ,line))))
+
+ (define (parse-status input)
+ (let loop ((line (read-line input))
+ (result '()))
+ (if (eof-object? line)
+ (reverse result)
+ (loop (read-line input)
+ (cons (status-line->sexp line) result)))))
+
+ (let* ((pipe (open-pipe* OPEN_READ %gpg-command "--status-fd=1"
+ "--verify" sig file))
+ (status (parse-status pipe)))
+ (if (pipe-failed? pipe)
+ #f
+ status)))
+
+(define (gnupg-status-good-signature? status)
+ "If STATUS, as returned by `gnupg-verify', denotes a good signature, return
+a key-id/user pair; return #f otherwise."
+ (any (lambda (sexp)
+ (match sexp
+ (('good-signature key-id user)
+ (cons key-id user))
+ (_ #f)))
+ status))
+
+(define (gnupg-status-missing-key? status)
+ "If STATUS denotes a missing-key error, then return the key-id of the
+missing key."
+ (any (lambda (sexp)
+ (match sexp
+ (('signature-error key-id _ ...)
+ key-id)
+ (_ #f)))
+ status))
+
+(define (gnupg-receive-keys key-id)
+ (system* %gpg-command "--keyserver" %openpgp-key-server "--recv-keys" key-id))
+
+(define (gnupg-verify* sig file)
+ "Like `gnupg-verify', but try downloading the public key if it's missing.
+Return #t if the signature was good, #f otherwise."
+ (let ((status (gnupg-verify sig file)))
+ (or (gnupg-status-good-signature? status)
+ (let ((missing (gnupg-status-missing-key? status)))
+ (and missing
+ (begin
+ ;; Download the missing key and try again.
+ (gnupg-receive-keys missing)
+ (gnupg-status-good-signature? (gnupg-verify sig file))))))))
+
;;;
;;; FTP client.
@@ -580,8 +694,10 @@ replaced by the result of their application to DERIVATIONS, a vhash."
"glibc27"
"glibc29"
"guile_1_8"
+ "icecat3"
"icecat3Xul" ;; redundant with `icecat'
"icecatWrapper"
+ "icecat3Wrapper"
"icecatXulrunner3"
"libzrtpcpp_1_6"
"parted_2_3"
@@ -599,8 +715,10 @@ replaced by the result of their application to DERIVATIONS, a vhash."
(match attr
(('attribute _ "description" value)
(string-prefix? "GNU" value))
- (('attribute _ "homepage" value)
+ (('attribute _ "homepage" (? string? value))
(string-contains value "www.gnu.org"))
+ (('attribute _ "homepage" ((? string? value) ...))
+ (any (cut string-contains <> "www.gnu.org") value))
(_ #f)))
metas))
(_ #f)))
@@ -815,9 +933,9 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
(false-if-exception (delete-file sig))
(system* "wget" sig-url)
(if (file-exists? sig)
- (let ((ret (system* "gpg" "--verify" sig path)))
+ (let ((ret (gnupg-verify* sig path)))
(false-if-exception (delete-file sig))
- (if (and ret (= 0 (status:exit-val ret)))
+ (if ret
hash
(begin
(format (current-error-port)
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index eb783e60fc5..3a15d32aa7f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-let version = "0.5.2.84"; in
+let version = "0.6.1.309"; in
stdenv.mkDerivation {
name = "spotify-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
- url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_i386.deb";
- sha256 = "0l1pvvkkssng0yc7zlgxr39jx3cs6i71sspmm4xb84y1bl045pas";
+ url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_i386.deb";
+ sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
- url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_amd64.deb";
- sha256 = "1wi1z3dyzjz13mkb0r2ilm914p8sg06923sv872nclrl102qbbni";
+ url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb";
+ sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs";
}
else throw "Spotify not supported on this platform.";
@@ -31,9 +31,15 @@ stdenv.mkDerivation {
mv $out/usr/* $out/
rmdir $out/usr
+ # Work around Spotify referring to a specific minor version of
+ # OpenSSL.
+ mkdir $out/lib
+ ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
+ ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
+
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
- --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
+ --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib openssl stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64:$out/lib \
$out/bin/spotify
preload=$out/libexec/spotify/libpreload.so
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index d765449851a..a1f39792225 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -9,7 +9,7 @@
let
pname = "TeXmacs";
- version = "1.0.7.10";
+ version = "1.0.7.11";
extraFontsSrc = fetchurl {
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz";
- sha256 = "02gqalr775r4xyfy4bq3qq1h3pkarsxjb6ami7lgxfgmyg6ca5kn";
+ sha256 = "0x1r9417dzbrxf785faq1vjszqdj94ig2lzwm8sd92bxcxr6knfa";
};
buildInputs = [ guile libX11 libXext makeWrapper ghostscriptX freetype ];
diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix
index 4cce7fde4e0..68910e67e25 100644
--- a/pkgs/applications/graphics/comical/default.nix
+++ b/pkgs/applications/graphics/comical/default.nix
@@ -1,19 +1,17 @@
{stdenv, fetchurl, wxGTK, utillinux, zlib }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "comical-0.8";
src = fetchurl {
- url = mirror://sourceforge/comical/comical-0.8.tar.gz;
+ url = "mirror://sourceforge/comical/${name}.tar.gz";
sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e";
};
buildInputs = [ wxGTK utillinux zlib ];
- patchPhase = ''
- sed -i -e 's@"zlib\\.h"@@' unzip/unzip.h
- sed -i -e 's@/usr/local@'$out@ \
- -e 's@-lminiunzip@-lminiunzip -lz@' Makefile
- '';
+ preBuild="makeFlags=\"prefix=$out\"";
- installPhase = "mkdir -p $out/bin ; make install";
+ patches = [ ./wxgtk-2.8.patch ];
+
+ preInstall = "mkdir -pv $out/bin";
meta = {
description = "Viewer of CBR and CBZ files, often used to store scanned comics";
diff --git a/pkgs/applications/graphics/comical/wxgtk-2.8.patch b/pkgs/applications/graphics/comical/wxgtk-2.8.patch
new file mode 100644
index 00000000000..db7626074a0
--- /dev/null
+++ b/pkgs/applications/graphics/comical/wxgtk-2.8.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile b/Makefile
+index a648e72..181c47f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ CC = `wx-config --cxx`
+-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
++LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
+ INSTALL = install
+ INSTALL_PROGRAM = $(INSTALL)
+ prefix = /usr/local
+diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp
+index 0c004cd..667e75e 100644
+--- a/src/ComicalApp.cpp
++++ b/src/ComicalApp.cpp
+@@ -28,6 +28,7 @@
+ #include "ComicalApp.h"
+ #include "ComicalFrame.h"
+ #include
++#include
+
+ #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../Comical Icons/comical.xpm"
+diff --git a/unzip/unzip.h b/unzip/unzip.h
+index b247937..5bb6a69 100644
+--- a/unzip/unzip.h
++++ b/unzip/unzip.h
+@@ -50,7 +50,7 @@ extern "C" {
+ #endif
+
+ #ifndef _ZLIB_H
+-#include "zlib.h"
++#include
+ #endif
+
+ #ifndef _ZLIBIOAPI_H
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 3f70f5d6038..533e196cee4 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,19 +1,29 @@
-{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool }:
-stdenv.mkDerivation {
- name = "dia-0.97";
+{stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
+, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
+, withGNOME ? false, libgnomeui }:
- src = fetchurl {
- url = mirror://gnome/sources/dia/0.97/dia-0.97.tar.bz2;
- sha256 = "0nngdjklap3x1b7cxnwawh29axbwk8siyq7w4iinsns3slmki0wh";
+stdenv.mkDerivation rec {
+ inherit (src) name;
+
+ src = fetchurl_gnome {
+ project = "dia";
+ major = "0"; minor = "97"; patchlevel = "1";
+ sha256 = "0hli89fdzzbshqdznxrbgyqw55qlr4z5xpn86jcg5fl7kln8pzld";
};
- buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl intltool];
+ buildInputs =
+ [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5
+ libxslt docbook_xsl libart_lgpl
+ ] ++ stdenv.lib.optional withGNOME libgnomeui;
+
+ buildNativeInputs = [ pkgconfig intltool perl ];
+
+ configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
meta = {
- description = "Gnome Diagram drawing software.";
+ description = "Gnome Diagram drawing software";
homepage = http://live.gnome.org/Dia;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = with stdenv.lib.platforms;
- linux;
+ maintainers = with stdenv.lib.maintainers; [raskin urkud];
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index f988ddf8209..3c900ca1eba 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -195,6 +195,35 @@ rec {
";
};
+ gimplensfun = pluginDerivation rec {
+ name = "gimplensfun-0.1.1";
+
+ src = fetchurl {
+ url = "http://lensfun.sebastiankraft.net/${name}.tar.gz";
+ sha256 = "0kr296n4k7gsjqg1abmvpysxi88iq5wrzdpcg7vm7l1ifvbs972q";
+ };
+
+ patchPhase = '' sed -i Makefile -e's|/usr/bin/g++|g++|' '';
+
+ buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ];
+
+ installPhase = "
+ installPlugins gimplensfun
+ ensureDir $out/bin
+ cp gimplensfun $out/bin
+ ";
+
+ meta = {
+ description = "GIMP plugin to correct lens distortion using the lensfun library and database";
+
+ homepage = http://lensfun.sebastiankraft.net/;
+
+ license = "GPLv3+";
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu;
+ };
+ };
+
/* =============== simple script files ==================== */
# also have a look at enblendenfuse in all-packages.nix
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index 96ab03a2784..e551b152390 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, libkexiv2, libkdcraw, libkipi
-, libksane, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gdk_pixbuf
-, qjson , pkgconfig }:
+{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt
+, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig
+, cmake, automoc4
+, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics
+, libkipi ? kdegraphics, libksane ? kdegraphics }:
stdenv.mkDerivation rec {
name = "kipi-plugins-1.9.0";
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
];
- buildNativeInputs = [ pkgconfig ];
+ buildNativeInputs = [ pkgconfig cmake automoc4 ];
meta = {
description = "Photo Management Program";
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index 9b8beb5b82b..b6d7e431443 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl
, ghostscript, atk, gtk, glib, fontconfig, freetype
, libgnomecanvas, libgnomeprint, libgnomeprintui
-, pango, libX11, xproto, zlib, poppler, popplerData
+, pango, libX11, xproto, zlib, poppler, poppler_data
, autoconf, automake, libtool, pkgconfig}:
stdenv.mkDerivation rec {
version = "0.4.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ghostscript atk gtk glib fontconfig freetype
libgnomecanvas libgnomeprint libgnomeprintui
- pango libX11 xproto zlib poppler popplerData
+ pango libX11 xproto zlib poppler poppler_data
autoconf automake libtool pkgconfig
];
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index e7ae8b4f175..787761a9d2f 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, cmake, sword, qt, boost, cluceneCore}:
+{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}:
stdenv.mkDerivation rec {
- version = "2.7.3";
+ version = "2.8.1";
name = "bibletime-${version}";
src = fetchurl {
- url = "mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${name}.tar.bz2";
- sha256 = "0171hlwg4rjv93b3gwcyv3nsj2kzwf4n8f6jw6ld18x7xmk9rkdg";
+ url = "mirror://sourceforge/bibletime/${name}.tar.bz2";
+ sha256 = "00xrgv4cx50ddbcfjiz3vl0cvsixwd0vj7avjvhrh617qqg8w325";
};
-
+
prePatch = ''
patchShebangs .;
'';
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
export SWORD_HOME=${sword};
'';
- buildInputs = [ cmake sword qt boost cluceneCore ];
+ buildInputs = [ cmake sword qt4 boost cluceneCore ];
cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
homepage = http://www.bibletime.info/;
platforms = stdenv.lib.platforms.linux;
license = "GPLv2";
+ maintainers = [ stdenv.lib.maintainers.piotr ];
};
-
}
-
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index dd6f205eca8..24071d3c683 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
stdenv.mkDerivation {
- name = "freemind-0.9.0_RC_6";
+ name = "freemind-0.9.0";
src = fetchurl {
- url = mirror://sourceforge/freemind/freemind-src-0.9.0_RC_6.tar.gz;
- sha256 = "0qxpwqmb4xd8c83zh76gczmx0hsx5m209k7p60kh7c4f25snhngf";
+ url = mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz;
+ sha256 = "1qd535gwx00d8z56mplxli5529yds2gsmbgla5b0bhhmsdwmrxmf";
};
buildInputs = [ jdk ant ];
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
new file mode 100644
index 00000000000..1a0453797cc
--- /dev/null
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl}:
+
+stdenv.mkDerivation {
+ name = "get_iplayer-2.80";
+
+ buildInputs = [makeWrapper perl];
+
+ installPhase = ''
+ ensureDir $out/bin
+ cp get_iplayer $out/bin
+ wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin
+ '';
+
+ src = fetchurl {
+ url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.80.tar.gz;
+ sha256 = "1hnadryyzca3bv1hfk2q3np9ihwvyxa3prwcrply6ywy4vnayjf8";
+ };
+
+}
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 373824b419f..e5af706d41c 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt, phonon }:
+{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }:
stdenv.mkDerivation rec {
name = "krename-4.0.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic";
};
- buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt phonon ];
+ buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ];
meta = {
homepage = http://www.krename.net;
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 28f463278d8..adf2810f937 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "mysql-workbench";
- version = "5.2.33";
+ version = "5.2.34";
name = "${pname}-${version}";
src = fetchurl {
url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
- sha256 = "193iikz0wfm3yvazficxfiqb84f34psq0bcasp3l41n9dygbgldc";
+ sha256 = "1b5ijaccy2k7if4pld8ihz1wa1wr1f9gj2m5xa4kf7v05zcx93c6";
};
buildInputs = [ boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 0121c17aace..e1492a47691 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -1,9 +1,10 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }:
stdenv.mkDerivation rec {
- name = "sakura-2.4.0";
+ name = "sakura-${version}";
+ version = "2.4.2";
src = fetchurl {
- url = "http://www.pleyades.net/david/projects/sakura/${name}.tar.bz2";
- sha256 = "12k9ra5b3vgslry5wc40lf4a64mh3p9wy7qfirr8alyvgvw2pb0h";
+ url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
+ sha256 = "1mpsjsk7dgz56h7yagd9aq0d92vj59yrz4ri6za3mfmglhn29rn5";
};
buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ];
meta = {
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
new file mode 100644
index 00000000000..3f536ec21c1
--- /dev/null
+++ b/pkgs/applications/misc/vue/default.nix
@@ -0,0 +1,52 @@
+x@{builderDefsPackage
+ , jre, unzip
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="vue";
+ version="3.1.1";
+ name="${baseName}-${version}";
+ url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_1.zip";
+ hash="1wq2mdvfm7c4vhs9ivl7n3w9ncwyrjgdgycbapzd6l1nym5iz76y";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doDeploy"];
+
+ doDeploy = a.fullDepEntry ''
+ unzip ${src}
+ ensureDir "$out"/{share/vue,bin}
+ cp VUE.jar "$out/share/vue/vue.jar"
+ echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
+ echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
+ chmod a+x "$out/bin/vue"
+ '' ["addInputs" "defEnsureDir"];
+
+ meta = {
+ description = "Visual Understanding Environment - mind mapping software";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = "free-noncopyleft"; # Apache License fork, actually
+ };
+}) x
+
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 8271049861e..454e5493ea7 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl, parsec, stm, time, utf8String, X11 }:
+{ cabal, mtl, parsec, stm, time, utf8String, X11, X11Xft }:
cabal.mkDerivation (self: {
pname = "xmobar";
@@ -6,7 +6,8 @@ cabal.mkDerivation (self: {
sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7";
isLibrary = false;
isExecutable = true;
- buildDepends = [ mtl parsec stm time utf8String X11 ];
+ buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
+ configureFlags = "-fwith_xft";
meta = {
homepage = "http://projects.haskell.org/xmobar/";
description = "A Minimalistic Text Based Status Bar";
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 74f80ccdab9..bd98d48ffa7 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -2,23 +2,28 @@
, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
-, stdenv, unzip, zlib, pam }:
+, stdenv, unzip, zlib, pam, pcre }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
stdenv.mkDerivation rec {
- name = "chrome-${version}";
- version = "88807";
+ name = "chromium-16.0.879.0-pre${version}";
+
+ # To determine the latest revision, get
+ # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
+ # For the version number, see ‘about:config’.
+ version = "100626";
+
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";
- sha256 = "c158f58fa8220782ec8dec4170f90c564b978d1c6ead298cc2f67e84613f17b1";
+ sha256 = "1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";
- sha256 = "01sr882c7hr53001p8bnk5vyj8zfjm6r3i4a6wxzxd17xjh1bcxb";
+ sha256 = "0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca";
}
else throw "Chromium is not supported on this platform.";
@@ -31,7 +36,7 @@ stdenv.mkDerivation rec {
[ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
ffmpeg fontconfig freetype libX11 libXScrnSaver
libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
- libpng nspr nss stdenv.gcc.gcc zlib stdenv.gcc.libc
+ libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
pam
];
@@ -41,6 +46,8 @@ stdenv.mkDerivation rec {
ensureDir $out/libexec/chrome
cp -R * $out/libexec/chrome
+
+ strip $out/libexec/chrome/chrome
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
@@ -48,7 +55,7 @@ stdenv.mkDerivation rec {
$out/libexec/chrome/chrome
makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \
- --prefix LD_LIBRARY_PATH : "${nss}/lib"
+ --prefix LD_LIBRARY_PATH : "${pcre}/lib:${nss}/lib"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index 2bf25ccd546..e9c1c926ba4 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation {
- name = "conkeror-0.9.3-20110606";
+ name = "conkeror-1.0pre-20110917";
src = fetchurl {
- url = http://repo.or.cz/w/conkeror.git/snapshot/0d883dfd5e61e7d0b8a96a079d69b46af064fdca.zip;
- sha256 = "0h21fw78iq4hljy5p98mpy0wgd5wpx9a0jdwv7l5wrds5vp23dhh";
+ url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip;
+ sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2";
};
buildInputs = [ unzip ];
installPhase = ''
diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix
index e26b5973215..47754d67f3c 100644
--- a/pkgs/applications/networking/browsers/firefox/3.6.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.6.nix
@@ -12,14 +12,14 @@
rec {
- firefoxVersion = "3.6.16";
+ firefoxVersion = "3.6.21";
- xulVersion = "1.9.2.16"; # this attribute is used by other packages
+ xulVersion = "1.9.2.21"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
- sha1 = "38124597440b7d60aa568adeef23659575841e92";
+ sha1 = "3c1f001ad22d93b48e191999f548b4382db3d36c";
};
@@ -101,7 +101,7 @@ rec {
meta = {
description = "Mozilla Firefox XUL runner";
- homepage = http://www.mozilla.org/en-US/firefox/;
+ homepage = http://www.mozilla.org/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
@@ -141,7 +141,7 @@ rec {
meta = {
description = "Mozilla Firefox - the browser, reloaded";
- homepage = http://www.mozilla.org/en-US/firefox/;
+ homepage = http://www.mozilla.org/firefox/;
};
passthru = {
diff --git a/pkgs/applications/networking/browsers/firefox/5.0.nix b/pkgs/applications/networking/browsers/firefox/5.0.nix
index 1cc625edf7c..f59d50fb6de 100644
--- a/pkgs/applications/networking/browsers/firefox/5.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/5.0.nix
@@ -108,7 +108,7 @@ rec {
meta = {
description = "Mozilla Firefox XUL runner";
- homepage = http://www.mozilla.org/en-US/firefox/;
+ homepage = http://www.mozilla.org/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
@@ -154,7 +154,7 @@ rec {
meta = {
description = "Mozilla Firefox - the browser, reloaded";
- homepage = http://www.mozilla.org/en-US/firefox/;
+ homepage = http://www.mozilla.org/firefox/;
};
passthru = {
diff --git a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch
new file mode 100644
index 00000000000..30fe15c6e48
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Chris Coulson
+# Date 1306390403 -7200
+# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
+# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e
+Bug 639554 - Install sdk/bin with make install. r=bsmedberg
+
+diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
+--- a/toolkit/mozapps/installer/packager.mk
++++ b/toolkit/mozapps/installer/packager.mk
+@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard
+ $(NSINSTALL) -D $(DESTDIR)$(includedir)
+ (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(includedir) && tar -xf -)
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)
+ (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(idldir) && tar -xf -)
+ # SDK directory is the libs + a bunch of symlinks
+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
++ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
+ if test -f $(DIST)/include/xpcom-config.h; then \
+ $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ fi
+ (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
++ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
+ ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
+ ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
+ endif # INSTALL_SDK
+
+ make-sdk:
+
diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix
index 7535cfb201e..df205a64fb5 100644
--- a/pkgs/applications/networking/browsers/firefox/6.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/6.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
- firefoxVersion = "6.0";
+ firefoxVersion = "6.0.2";
- xulVersion = "6.0"; # this attribute is used by other packages
+ xulVersion = "6.0.2"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
- sha256 = "0ws96gc1mkmilgsikirhmqc6s7m0bcyh58820l08wd82r9abagyc";
+ sha1 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6";
};
@@ -51,6 +51,8 @@ rec {
inherit src;
+ patches = [ ./6.0-install-sdk-bin.patch ];
+
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
@@ -76,9 +78,10 @@ rec {
}' ';'
'';
- # !!! Temporary hack.
+ # !!! Temporary hacks.
preBuild =
''
+ ln -s Linux2.6.mk security/coreconf/Linux3.0.mk
export NIX_ENFORCE_PURITY=
'';
@@ -108,7 +111,7 @@ rec {
meta = {
description = "Mozilla Firefox XUL runner";
- homepage = http://www.mozilla.org/en-US/firefox/;
+ homepage = http://www.mozilla.org/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
@@ -154,7 +157,7 @@ rec {
meta = {
description = "Mozilla Firefox - the browser, reloaded";
- homepage = http://www.mozilla.org/en-US/firefox/;
+ homepage = http://www.mozilla.org/firefox/;
};
passthru = {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 462099ea8f2..6cdd175573d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -53,9 +53,9 @@ let
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
} else {
- version = "10.3.183.5";
+ version = "10.3.183.7";
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
- sha256 = "1kv7szpadgv0wwmi46vc05723qzsgclz68rij6x49l61sngzmw0x";
+ sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6";
}
else throw "Flash Player is not supported on this platform";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 3ae24bdddf9..1ea41d64465 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
- sha256 = "01c8w221azvmqvxf5lgb8l151086d72ll5wnjndwn50dvi6rphvx";
+ sha256 = "14cf9bef6f70ff850b773dbb92833bbe45645db2636b7e17720fdc6b60e76d63";
}
else
throw "Google Talk does not support your platform.";
@@ -89,4 +89,4 @@ stdenv.mkDerivation {
homepage = http://www.google.com/chat/video/;
license = "unfree";
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/instant-messengers/kadu/config.patch b/pkgs/applications/networking/instant-messengers/kadu/config.patch
deleted file mode 100644
index 263898ba0db..00000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/.config b/.config
-index e0068bf..808ebf4 100644
---- a/.config
-+++ b/.config
-@@ -187,8 +187,8 @@ module_history_migration=m
- # PL: Obsługa szyfrowania wiadomości przy pomocy OpenSSLa
- # Platform: Linux, Mac OS X, Windows
- # Needs: libcrypto, libssl
--module_encryption_ng=m
--module_encryption_ng_simlite=m
-+module_encryption_ng=n
-+module_encryption_ng_simlite=n
-
- # Description: Auto away module
- # PL: Obsługa automatycznej zmiany statusu po określonym czasie bezczynności
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 70c7d7234e0..cdad7eb1e7c 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -3,15 +3,14 @@
stdenv.mkDerivation {
- name = "kadu-0.9.2";
+ name = "kadu-0.10.0";
src = fetchurl {
- url = http://www.kadu.net/download/stable/kadu-0.9.2.tar.bz2;
- sha256 = "05lpx7m2adx8vv4h62rsiwlgay24m6cxdbibg7vzl4xkq9ybv30b";
+ url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2;
+ sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995";
};
- buildInputs = [
- cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
+ buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
];
configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
@@ -22,7 +21,8 @@ stdenv.mkDerivation {
patchShebangs .
'';
- patches = [ ./config.patch ];
+ # because I was not able to get those working
+ patches = [ ./disable_encryption_plugins.patch ];
NIX_LDFLAGS="-lX11";
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
homepage = http://www.kadu.net/w/English:Main_Page;
license = "GPLv2";
platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.piotr ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch
new file mode 100644
index 00000000000..e89095de55d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch
@@ -0,0 +1,16 @@
+diff --git a/Plugins.cmake b/Plugins.cmake
+index c6906ce..b1284d6 100644
+--- a/Plugins.cmake
++++ b/Plugins.cmake
+@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
+
+ # encryption
+ # Encrypted chat support
+- encryption_ng
++ # encryption_ng
+ # OpenSSL encrypted chat support
+- encryption_ng_simlite
++ # encryption_ng_simlite
+
+ # docking
+ # Tray icon support (common part of all docking modules)
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 41658be08a9..6b8b7a9419d 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -1,6 +1,7 @@
x@{builderDefsPackage
, qt4, openssl
, xproto, libX11, libXScrnSaver, scrnsaverproto
+ , xz
, ...}:
builderDefsPackage
(a :
@@ -11,11 +12,11 @@ let
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
- version="1.1.0";
- baseName="vacuum";
+ version="1.1.1";
+ baseName="vacuum-im";
name="${baseName}-${version}";
- url="http://vacuum-im.googlecode.com/files/${name}.tar.gz";
- hash="c956b0cf5cc0a1acee47a96f0b0e7ab5d716e48cac4a7fcbca496f901a219dcc";
+ url="http://vacuum-im.googlecode.com/files/${name}.tar.xz";
+ hash="b4b3472bf83173f6be1bbe69520bf6cab97e24cf9fd8a7b60e4ffdc1cb43b1dc";
};
in
rec {
@@ -28,7 +29,7 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = ["preBuild" "doQMake" "doMakeInstall"];
+ phaseNames = ["addInputs" "preBuild" "doQMake" "doMakeInstall"];
preBuild = a.fullDepEntry (''
echo "Fixing a name collision with a function added in Qt 4.7"
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 830ef82cf7a..a9456a30ecc 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,70 +1,75 @@
-{ fetchgit, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:
+{ fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:
stdenv.mkDerivation rec {
- name = "notmuch-0.6-rc4";
+ name = "notmuch-0.8";
- src = fetchgit {
- url = "git://github.com/chaoflow/notmuch";
- rev = "9f8ef78e0c6b28918f3edda06b59a9e8f9bef8e3";
- sha256 = "c7c425c10a695ca22dfbdf5fe8e0dcb6a888edc0b3388023e7ff35f69acc0085";
+ src = fetchurl {
+ url = "http://notmuchmail.org/releases/${name}.tar.gz";
+ sha256 = "f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949";
};
buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ];
# XXX: Make me a loop
patchPhase = ''
- substituteInPlace "test/atomicity" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ # substituteInPlace "test/atomicity" \
+ # --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+ substituteInPlace "test/aggregate-results.sh" \
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/author-order" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/basic" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/crypto" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/dump-restore" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/emacs" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/emacs-large-search-buffer" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/encoding" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/from-guessing" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/json" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/long-id" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/maildir-sync" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/new" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/notmuch-test" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/raw" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/reply" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/search" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/search-by-folder" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/search-insufficient-from-quoting" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+ substituteInPlace "test/search-folder-coherence" \
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/search-output" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/search-position-overlap-bug" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+ substituteInPlace "test/symbol-hiding" \
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/test-lib.sh" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/test-verbose" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/thread-naming" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/thread-order" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
substituteInPlace "test/uuencode" \
- --replace "#!/bin/bash" "#!${bash}/bin/bash"
+ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
'';
postBuild = ''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
index b644837b377..cc21a5b0400 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation {
meta = {
description = "Mozilla Thunderbird, a full-featured email client";
- homepage = http://www.mozilla.org/en-US/thunderbird/;
+ homepage = http://www.mozilla.org/thunderbird/;
};
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix
index f80fde27654..a409cae0d28 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix
@@ -73,11 +73,12 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Mozilla Thunderbird, a full-featured email client";
- homepage = http://www.mozilla.org/en-US/thunderbird/;
+ homepage = http://www.mozilla.org/thunderbird/;
license =
# Official branding implies thunderbird name and logo cannot be reuse,
# see http://www.mozilla.org/foundation/licensing.html
if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
maintainers = with maintainers; [ pierron ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/networking/p2p/gnunet/0.9.nix b/pkgs/applications/networking/p2p/gnunet/0.9.nix
new file mode 100644
index 00000000000..221640930d7
--- /dev/null
+++ b/pkgs/applications/networking/p2p/gnunet/0.9.nix
@@ -0,0 +1,79 @@
+{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
+, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
+, libxml2, ncurses, gettext, findutils
+, autoconf, automake
+, gtkSupport ? false, gtk ? null, libglade ? null
+, makeWrapper }:
+
+assert gtkSupport -> (gtk != null) && (libglade != null);
+
+let
+ rev = "17000";
+ version = "0.9-svn-${rev}";
+in
+ stdenv.mkDerivation {
+ name = "gnunet-${version}";
+
+ src = fetchsvn {
+ url = "https://gnunet.org/svn/gnunet";
+ sha256 = "17nkvykg3xb5m1y86i9lahgsic9jpj6h0nr73ywzpxpp7ql45cm4";
+ inherit rev;
+ };
+
+ buildInputs = [
+ libextractor libmicrohttpd libgcrypt gmp curl libtool
+ zlib adns sqlite libxml2 ncurses
+ pkgconfig gettext findutils
+ autoconf automake
+ makeWrapper
+ ] ++ (if gtkSupport then [ gtk libglade ] else []);
+
+ preConfigure = ''
+ # Brute force: since nix-worker chroots don't provide
+ # /etc/{resolv.conf,hosts}, replace all references to `localhost'
+ # by their IPv4 equivalent.
+ for i in $(find . \( -name \*.c -or -name \*.conf \) \
+ -exec grep -l localhost {} \;)
+ do
+ echo "$i: substituting \`127.0.0.1' to \`localhost'..."
+ substituteInPlace "$i" --replace "localhost" "127.0.0.1"
+ done
+
+ # Make sure the tests don't rely on `/tmp', for the sake of chroot
+ # builds.
+ for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
+ -exec grep -l /tmp {} \;)
+ do
+ echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
+ substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
+ done
+
+ autoreconf -vfi
+ '';
+
+ meta = {
+ description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
+
+ longDescription = ''
+ GNUnet is a framework for secure peer-to-peer networking that
+ does not use any centralized or otherwise trusted services. A
+ first service implemented on top of the networking layer
+ allows anonymous censorship-resistant file-sharing. Anonymity
+ is provided by making messages originating from a peer
+ indistinguishable from messages that the peer is routing. All
+ peers act as routers and use link-encrypted connections with
+ stable bandwidth utilization to communicate with each other.
+ GNUnet uses a simple, excess-based economic model to allocate
+ resources. Peers in GNUnet monitor each others behavior with
+ respect to resource usage; peers that contribute to the
+ network are rewarded with better service.
+ '';
+
+ homepage = http://gnunet.org/;
+
+ license = "GPLv2+";
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu;
+ };
+ }
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index dfd65f8d0cc..e4cb4e9089a 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
description = "KDE integrated BtTorrent client";
homepage = http://ktorrent.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+ inherit (libktorrent.meta) platforms;
};
}
diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix
index 79e7601e46e..f189d2eb781 100644
--- a/pkgs/applications/networking/p2p/ldcpp/default.nix
+++ b/pkgs/applications/networking/p2p/ldcpp/default.nix
@@ -1,31 +1,38 @@
-{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11 }:
+{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11, boost, zlib }:
with builderDefs;
- let localDefs = builderDefs.passthru.function ((rec {
- src = /* put a fetchurl here */
- fetchurl {
- url = http://launchpad.net/linuxdcpp/1.0/1.0.3/+download/linuxdcpp-1.0.3.tar.bz2;
- sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv";
- };
+ let localDefs = builderDefs.passthru.function ((rec {
+ src = /* put a fetchurl here */
+ fetchurl {
+ url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2;
+ sha256 = "66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a";
+ };
- buildInputs = [scons pkgconfig gtk bzip2 libglade
- openssl libX11];
- configureFlags = [];
- doScons = fullDepEntry (''
- ensureDir $out
- export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
- scons PREFIX=$out
- scons PREFIX=$out install
- '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
- }));
- in with localDefs;
+ buildInputs = [scons pkgconfig gtk bzip2 libglade
+ openssl libX11 boost];
+ configureFlags = [];
+ doScons = fullDepEntry (''
+ ensureDir $out
+ export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
+
+ for i in gettext xgettext msgfmt msgcat; do
+ echo > $i
+ chmod a+x $i
+ done
+ export PATH=$PATH:$PWD
+
+ scons PREFIX=$out
+ scons PREFIX=$out install
+ '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
+ }));
+ in with localDefs;
stdenv.mkDerivation rec {
- name = "ldcpp-1.0.3";
- builder = writeScript (name + "-builder")
- (textClosure localDefs
- [doScons doForceShare doPropagate]);
- meta = {
- description = "Linux DC++ - Direct Connect client";
- inherit src;
- };
+ name = "ldcpp-1.1.0";
+ builder = writeScript (name + "-builder")
+ (textClosure localDefs
+ [doScons doForceShare doPropagate]);
+ meta = {
+ description = "Linux DC++ - Direct Connect client";
+ inherit src;
+ };
}
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 89c28ae3512..afd16dbb2a8 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,12 +1,14 @@
{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
+let rev = "22523"; in
+
stdenv.mkDerivation {
- name = "tribler-5.3.9-pre21071";
+ name = "tribler-5.4.3-pre${rev}";
src = fetchsvn {
- url = http://svn.tribler.org/abc/branches/release-5.3.x;
- rev = 21071;
- sha256 = "0plzw5m9rligz66rbq8qr9sj0fiqx8gwmchdw3p4mwlwfx72gixm";
+ url = http://svn.tribler.org/abc/branches/release-5.4.x;
+ inherit rev;
+ sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
@@ -32,7 +34,7 @@ stdenv.mkDerivation {
--set _TRIBLERPATH $out/share/tribler \
--set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
--run 'cd $_TRIBLERPATH' \
- --add-flags $out/share/tribler/Tribler/Main/tribler.py
+ --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py"
'';
meta = {
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
new file mode 100644
index 00000000000..8d80630f316
--- /dev/null
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, fetchurl
+, openssl
+, printerSupport ? true, cups
+, pkgconfig
+, zlib
+, libX11
+, libXcursor
+, alsaLib
+}:
+
+assert printerSupport -> cups != null;
+stdenv.mkDerivation rec {
+ name = "freerdp-0.8.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/freerdp/${name}.tar.gz";
+ sha256 = "1q9hhwyc4hk49hsmd2kghrfsawxcc7gy7vcmhdf91l8v95xp16iq";
+ };
+
+ buildInputs = [
+ openssl
+ pkgconfig
+ zlib
+ libX11
+ libXcursor
+ alsaLib
+ ] ++ stdenv.lib.optional printerSupport cups;
+
+ configureFlags = [
+ "--with-x"
+ ] ++ stdenv.lib.optional printerSupport "--with-printer=cups";
+
+ meta = {
+ description = "A Remote Desktop Protocol Client";
+
+ longDescription = ''
+ FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
+ following the Microsoft Open Specifications.
+ '';
+
+ homepage = http://www.freerdp.com/;
+
+ license = "free-non-copyleft";
+
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
+ };
+}
+
diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
new file mode 100644
index 00000000000..78e275690ac
--- /dev/null
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, fetchgit
+, openssl
+, printerSupport ? true, cups
+, pkgconfig
+, zlib
+, libX11
+, libXcursor
+, alsaLib
+, cmake
+, libxkbfile
+, libXinerama
+, libXext
+, directfb
+, cunit
+}:
+
+assert printerSupport -> cups != null;
+
+let rev = "42fb9f84e82268073a3838e6082783ba956ecc99"; in
+
+stdenv.mkDerivation rec {
+ name = "freerdp-1.0pre${rev}";
+
+ src = fetchgit {
+ url = git://github.com/FreeRDP/FreeRDP.git;
+ inherit rev;
+ sha256 = "5e77163e2a728802fc426860b3f5ff88cb2f2f3b0bbf0912e9e44c3d8fa060e5";
+ };
+
+ buildInputs = [
+ openssl
+ pkgconfig
+ zlib
+ libX11
+ libXcursor
+ libxkbfile
+ libXinerama
+ libXext
+ directfb
+ alsaLib
+ cmake
+ cunit
+ ] ++ stdenv.lib.optional printerSupport cups;
+
+ postUnpack = ''
+ sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c
+ '';
+
+ cmakeFlags = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ];
+
+ meta = {
+ description = "A Remote Desktop Protocol Client";
+
+ longDescription = ''
+ FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
+ following the Microsoft Open Specifications.
+ '';
+
+ homepage = http://www.freerdp.com/;
+
+ license = "free-non-copyleft";
+
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
+ };
+}
+
diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix
new file mode 100644
index 00000000000..e268cdb7bba
--- /dev/null
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, pkgconfig, gtk, libpcap, libglade, libgnome, libgnomeui,
+gnomedocutils, scrollkeeper, libxslt}:
+
+stdenv.mkDerivation rec {
+ name = "etherape-0.9.12";
+ src = fetchurl {
+ url = "mirror://sourceforge/etherape/${name}.tar.gz";
+ sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k";
+ };
+
+ configureFlags = [ "--disable-scrollkeeper" ];
+ buildInputs = [ gtk libpcap pkgconfig libglade libgnome libgnomeui gnomedocutils
+ scrollkeeper libxslt ];
+
+ meta = {
+ homepage = http://etherape.sourceforge.net/;
+ license = "GPLv2+";
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 3c84ee56a68..cf770213ef9 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y";
};
- buildInputs = [perl] ++ stdenv.lib.optional enableACLs acl;
+ buildInputs = stdenv.lib.optional enableACLs acl;
+ buildNativeInputs = [perl];
meta = {
homepage = http://samba.anu.edu.au/rsync/;
diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix
new file mode 100644
index 00000000000..c4da2b609ce
--- /dev/null
+++ b/pkgs/applications/office/antiword/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv }:
+
+let
+ name = "antiword-0.37";
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "http://www.winfield.demon.nl/linux/${name}.tar.gz";
+ sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f";
+ };
+
+ patchPhase = ''
+ sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h
+ '';
+
+ installTargets = "global_install";
+
+ meta = {
+ homepage = "http://www.winfield.demon.nl/";
+ description = "convert MS Word documents to plain text or PostScript";
+ license = stdenv.lib.licenses.gpl2;
+
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix
index aea3a1f6aa1..5f61138f6ec 100644
--- a/pkgs/applications/office/hledger-interest/default.nix
+++ b/pkgs/applications/office/hledger-interest/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-interest";
- version = "1.2";
- sha256 = "1r5x6z0k33fpvqba6zlkhpm7b0rwwnli4q100psms89x0rrj7y2d";
+ version = "1.3";
+ sha256 = "1sgnl3vv38cmgxv3xag3c78j1955xxwdmr5xr3f8rc78np6d0wnz";
isLibrary = false;
isExecutable = true;
buildDepends = [ hledgerLib mtl time ];
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
new file mode 100644
index 00000000000..8665b873150
--- /dev/null
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext,
+ shared_mime_info, perl, boost, gpgme }:
+
+stdenv.mkDerivation rec {
+ name = "kmymoney-4.5.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
+ sha256 = "1yvgyzybfm1ajswwq3w3kdij4y2cyhfkk52xhv7dbp1wrxsp5cx9";
+ };
+
+ buildInputs = [ kdelibs kdepimlibs perl boost gpgme ];
+ buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ];
+
+ patches = [ ./qgpgme.patch ];
+
+ meta = {
+ homepage = http://kmymoney2.sourceforge.net/;
+ description = "KDE personal money manager";
+ inherit (kdelibs.meta) platforms maintainers;
+ };
+}
diff --git a/pkgs/applications/office/kmymoney/qgpgme.patch b/pkgs/applications/office/kmymoney/qgpgme.patch
new file mode 100644
index 00000000000..59ed37edaf8
--- /dev/null
+++ b/pkgs/applications/office/kmymoney/qgpgme.patch
@@ -0,0 +1,17 @@
+KMymoney tries to find qgpgme before kdepimlibs. This is wrong because
+FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs
+found.
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6d7305..88bac67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,8 +59,8 @@ else (WIN32)
+ find_package(Boost "1.33.1" COMPONENTS graph)
+ endif (WIN32)
+ # needed by libkgpgfile
+-find_package(QGpgme REQUIRED)
+ find_package(KdepimLibs REQUIRED)
++find_package(QGpgme REQUIRED)
+ find_package(SharedMimeInfo REQUIRED)
+
+ add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix
index 1218ad71180..979faa2e597 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt, libX11}:
+{stdenv, fetchurl, qt3, libX11}:
stdenv.mkDerivation rec {
name = "qucs-0.0.15";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
};
- buildInputs = [ qt libX11 ];
+ buildInputs = [ qt3 libX11 ];
meta = {
description = "Integrated circuit simulator";
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 002226292b0..6bf401b895a 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,8 +1,8 @@
{stdenv, fetchurl, zlib, openssl, tcl}:
let
- version = "1.18";
- filedate = "20110713230341";
+ version = "1.19";
+ filedate = "20110901182519";
in
stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
- sha256 = "065hp5hppzjzvvk9g8zaqbfms011rkiimydnfsgkp4s8jlc2h6dc";
+ sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960";
};
buildInputs = [ zlib openssl ];
@@ -18,8 +18,6 @@ stdenv.mkDerivation {
doCheck = true;
- configurePhase = ":";
-
checkTarget = "test";
installPhase = ''
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 53e4bfbe83b..7513a7adbc7 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -10,7 +10,7 @@ rec {
git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
- cpio tcl tk makeWrapper subversion;
+ cpio tcl tk makeWrapper subversionClient;
svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries
@@ -47,8 +47,9 @@ rec {
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
- inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
- HTTP testpack monadControl;
+ inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
+ HTTP testpack monadControl hS3 mtl network hslogger hxt json;
+ QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
};
qgit = import ./qgit {
@@ -103,24 +104,7 @@ rec {
inherit stdenv fetchgit qt47 subversion apr;
};
- gitSubtree = stdenv.mkDerivation {
- name = "git-subtree-0.4";
- src = fetchurl {
- url = "http://github.com/apenwarr/git-subtree/tarball/v0.4";
-# sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr";
- sha256 = "19s8352igwh7x1nqgdfs7rgxahw9cnfv7zmpzpd63m1r3l2945d4";
- };
- unpackCmd = "gzip -d < $curSrc | tar xvf -";
- buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
- configurePhase = "export prefix=$out";
- buildPhase = "true";
- installPhase = ''
- make install prefix=$out gitdir=$out/bin #work around to deal with a wrong makefile
- '';
- meta= {
- description = "An experimental alternative to the git-submodule command";
- homepage = http://github.com/apenwarr/git-subtree;
- license = "GPLv2";
- };
+ gitSubtree = import ./git-subtree {
+ inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index d72b1868b03..848214b0fb9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String
-, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which
-, monadControl }:
+{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
+, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
+, QuickCheck2, rsync, SHA, testpack, utf8String, which
+}:
let
- version = "3.20110819";
+ version = "3.20110915";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
- sha256 = "1442ba4ff35ec8f92f336a5f1055d7ad8306348871a9697262f4f2af3b3c0943";
+ sha256 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47";
};
- buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight
- SHA dataenc HTTP testpack git ikiwiki which monadControl];
+ buildInputs = [
+ curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
+ libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
+ rsync SHA testpack utf8String which
+ ];
checkTarget = "test";
doCheck = true;
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
new file mode 100644
index 00000000000..dd00572b150
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }:
+
+stdenv.mkDerivation {
+ name = "git-subtree-0.4-2-g2793ee6";
+
+ src = fetchurl {
+ url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974";
+ sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6";
+ name = "git-subtree-0.4-2-g2793ee6.tar.gz";
+ };
+
+ buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
+
+ configurePhase = "export prefix=$out";
+
+ buildPhase = "true";
+
+ installPhase = "make install prefix=$out gitdir=$out/bin";
+
+ meta= {
+ description = "experimental alternative to the git-submodule command";
+ homepage = http://github.com/apenwarr/git-subtree;
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.gnu;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index ee207788875..1491b6f7417 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,14 +1,14 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper
-, svnSupport, subversion, perlLibs, smtpPerlLibs
+, svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport
, pythonSupport ? true
, sendEmailSupport
}:
let
- svn = subversion.override { perlBindings = true; };
+ svn = subversionClient.override { perlBindings = true; };
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index f31e6ec16b0..7d622c4067c 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,25 +1,34 @@
-args:
-args.stdenv.mkDerivation {
- name = "stgit-0.14.3";
+{ stdenv, fetchurl, python, git }:
- src = args.fetchurl {
- url = http://homepage.ntlworld.com/cmarinas/stgit/stgit-0.14.3.tar.gz;
- sha256 = "13gcvz6x91m2860n26xp12j0xsshzvwij03sfzm5g3ckm18ffkw7";
+let
+ name = "stgit-0.15";
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "http://download.gna.org/stgit/${name}.tar.gz";
+ sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9";
};
- buildInputs =(with args; [python git]);
+ buildInputs = [ python git ];
- buildPhase = "true";
-
- installPhase = ''
- python ./setup.py install --prefix=$out
- d="$out/etc/bash_completion.d"
- ensureDir $d; ln -s "$out/share/stgit/contrib/stgit-completion.bash" "$d"
+ makeFlags = "prefix=$$out";
+
+ postInstall = ''
+ ensureDir "$out/etc/bash_completion.d/"
+ ln -s ../../share/stgit/completion/stgit-completion.bash "$out/etc/bash_completion.d/"
'';
- meta = {
- description = "quilt for git (stacking patches)";
- homepage = http://procode.org/stgit/;
- license = "GPL";
+ doCheck = false;
+ checkTarget = "test";
+
+ meta = {
+ homepage = "http://procode.org/stgit/";
+ description = "StGit is a patch manager implemented on top of Git";
+ license = "GPL";
+
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index d131841618e..4775a419fd1 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
+{stdenv, fetchurl, xz, pygtk, python, intltool, scrollkeeper, makeWrapper }:
let
minor = "1.5";
- version = "${minor}.1";
+ version = "${minor}.2";
in
stdenv.mkDerivation {
name = "meld-${version}";
src = fetchurl {
- url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.bz2";
- sha256 = "0ykj3rb5hvcr4dmc52mz8q3iknrsh042v1x7yvffgs6yibakcac2";
+ url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
+ sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx";
};
- buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
+ buildInputs = [ pygtk python intltool scrollkeeper makeWrapper xz ];
patchPhase = ''
sed -e s,/usr/local,$out, -i INSTALL
diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
index 82a588f6a1e..b4aa63ed014 100644
--- a/pkgs/applications/version-management/veracity/default.nix
+++ b/pkgs/applications/version-management/veracity/default.nix
@@ -2,6 +2,7 @@ x@{builderDefsPackage
, cmake, curl, patch, zlib, icu, sqlite, libuuid
, readline, openssl, spidermonkey_1_8_0rc1
, nspr, nss
+ , unzip, glibcLocales
, runTests ? false
, ...}:
builderDefsPackage
@@ -20,16 +21,18 @@ rec {
inherit (s) name;
inherit buildInputs;
- phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doTest" "doDeploy"];
+ phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "fixPaths" "doMake" "doTest" "doDeploy"];
dump0 = (a.doDump "0");
runTests = a.stdenv.lib.attrByPath ["runTests"] false a;
doTest = a.fullDepEntry (if runTests then ''
- sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
mkdir pseudo-home
export HOME=$PWD/pseudo-home
+ export LC_ALL=en_US.UTF-8
+ export LANG=en_US.UTF-8
+ ${if a.stdenv.isLinux then "export LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale/locale-archive;" else ""}
make test || true
'' else "") ["doMake" "minInit"];
@@ -73,6 +76,13 @@ rec {
cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
'' ["minInit" "addInputs" "doUnpack"];
+ fixPaths = a.fullDepEntry ''
+ sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
+ sed -e 's@/bin/ln@#{a.coreutils}/bin/ln@g' -i ../veracity/src/js_tests/*.js
+ sed -e 's@/usr/bin/gdb@#{a.gdb}/bin/gdb@g' -i ../veracity/testsuite/c_test.sh
+ sed -e 's@"/bin/@"@g' -i ../veracity/testsuite/u*.c
+ '' ["minInit"];
+
doDeploy = a.fullDepEntry ''
ensureDir "$out/bin" "$out/share/veracity/"
cp -r .. "$out/share/veracity/build-dir"
diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
index 169bd407b7d..a8ced15b58c 100644
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ b/pkgs/applications/version-management/viewmtn/0.10.nix
@@ -2,7 +2,7 @@
args : with args;
rec {
src = fetchurl {
- url = http://grahame.angrygoats.net/source/viewmtn/viewmtn-0.10.tgz;
+ url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz;
sha256 = "1c6y708xaf6pds1r6l00q7vpgfagfbnf95kqj168vw3xr3l8a4yx";
};
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index 6d9b2a420fb..0461933a7bc 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -1,12 +1,15 @@
-{cabal, xmonad, xmonadContrib, X11, utf8String, X11Xft,
- parsec, split}:
+{ cabal, hint, mtl, network, parsec, random, split, X11, xmonad
+, xmonadContrib
+}:
cabal.mkDerivation (self: {
pname = "xmonad-extras";
version = "0.9.2";
sha256 = "54b41a4c59ff3d68b3a214d727fb5675fa7c1b90090d99e58ecae62b3dfdd701";
- propagatedBuildInputs =
- [X11 xmonad xmonadContrib utf8String X11Xft parsec split];
+ buildDepends = [
+ hint mtl network parsec random split X11 xmonad xmonadContrib
+ ];
+ configureFlags = "-f-with_hlist -f-with_mpd";
noHaddock = true;
meta = {
homepage = "http://projects.haskell.org/xmonad-extras";
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln b/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln
new file mode 100644
index 00000000000..f2e7d4cf8b2
--- /dev/null
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86
+ {D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86
+ {D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86
+ {D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..633d23c05ff
--- /dev/null
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Wrapper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Philips Healthcare")]
+[assembly: AssemblyProduct("Wrapper")]
+[assembly: AssemblyCopyright("Copyright © Philips Healthcare 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2045ce22-78c7-4cd6-ad0a-9367f8a49738")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
new file mode 100755
index 00000000000..abad090ebcb
--- /dev/null
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
@@ -0,0 +1,66 @@
+using System;
+using System.Reflection;
+using System.IO;
+
+namespace @NAMESPACE@Wrapper
+{
+ class @MAINCLASSNAME@Wrapper
+ {
+ private String[] AssemblySearchPaths = { @ASSEMBLYSEARCHPATH@ };
+
+ private String ExePath = @"@EXEPATH@";
+
+ private String MainClassName = "@NAMESPACE@.@MAINCLASSNAME@";
+
+ private Assembly exeAssembly;
+
+ public @MAINCLASSNAME@Wrapper(string[] args)
+ {
+ // Attach the resolve event handler to the AppDomain so that missing library assemblies will be searched
+ AppDomain currentDomain = AppDomain.CurrentDomain;
+ currentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler);
+
+ // Dynamically load the executable assembly
+ exeAssembly = Assembly.LoadFrom(ExePath);
+
+ // Lookup the main class
+ Type mainClass = exeAssembly.GetType(MainClassName);
+
+ // Lookup the main method
+ MethodInfo mainMethod = mainClass.GetMethod("Main");
+
+ // Invoke the main method
+ mainMethod.Invoke(this, new Object[] {args});
+ }
+
+ static void Main(string[] args)
+ {
+ new @MAINCLASSNAME@Wrapper(args);
+ }
+
+ private Assembly MyResolveEventHandler(object sender, ResolveEventArgs args)
+ {
+ // This handler is called only when the common language runtime tries to bind to the assembly and fails.
+
+ Assembly MyAssembly;
+ String assemblyPath = "";
+ String requestedAssemblyName = args.Name.Substring(0, args.Name.IndexOf(","));
+
+ // Search for the right path of the library assembly
+ foreach (String currentAssemblyPath in AssemblySearchPaths)
+ {
+ assemblyPath = currentAssemblyPath + "/" + requestedAssemblyName + ".dll";
+
+ if (File.Exists(assemblyPath))
+ break;
+ }
+
+ // Load the assembly from the specified path.
+ MyAssembly = Assembly.LoadFrom(assemblyPath);
+
+ // Return the loaded assembly.
+ return MyAssembly;
+ }
+
+ }
+}
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
new file mode 100644
index 00000000000..a991bcb6933
--- /dev/null
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
@@ -0,0 +1,57 @@
+
+
+
+ Debug
+ x86
+ 8.0.30703
+ 2.0
+ {D01B3597-E85E-42F4-940A-EF5AE712942F}
+ Exe
+ Properties
+ @ROOTNAMESPACE@
+ @ASSEMBLYNAME@
+ v4.0
+ Client
+ 512
+
+
+ x86
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ x86
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix
index 65e4ca71475..07f1f89c67c 100644
--- a/pkgs/build-support/dotnetenv/build-solution.nix
+++ b/pkgs/build-support/dotnetenv/build-solution.nix
@@ -7,19 +7,47 @@
, verbosity ? "detailed"
, options ? "/p:Configuration=Debug;Platform=Win32"
, assemblyInputs ? []
-, runtimeAssemblies ? []
, preBuild ? ""
+, modifyPublicMain ? false
+, mainClassFile ? null
}:
+assert modifyPublicMain -> mainClassFile != null;
+
+let
+ wrapperCS = ./Wrapper.cs.in;
+in
stdenv.mkDerivation {
- inherit name src preBuild;
+ inherit name src;
buildInputs = [ dotnetfx ];
+
preConfigure = ''
cd ${baseDir}
'';
- installPhase = ''
+ preBuild = ''
+ ${stdenv.lib.optionalString modifyPublicMain ''
+ sed -i -e "s|static void Main|public static void Main|" ${mainClassFile}
+ ''}
+ ${preBuild}
+ '';
+
+ installPhase = ''
+ addDeps()
+ {
+ if [ -f $1/nix-support/dotnet-assemblies ]
+ then
+ for i in $(cat $1/nix-support/dotnet-assemblies)
+ do
+ windowsPath=$(cygpath --windows $i)
+ assemblySearchPaths="$assemblySearchPaths;$windowsPath"
+
+ addDeps $i
+ done
+ fi
+ }
+
for i in ${toString assemblyInputs}
do
windowsPath=$(cygpath --windows $i)
@@ -31,6 +59,8 @@ stdenv.mkDerivation {
else
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
fi
+
+ addDeps $i
done
echo "Assembly search paths are: $assemblySearchPaths"
@@ -44,18 +74,15 @@ stdenv.mkDerivation {
ensureDir $out
MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options}
- # Create references to runtime dependencies
- # !!! Should be more efficient (e.g. symlinking)
+ # Because .NET assemblies store strings as UTF-16 internally, we cannot detect
+ # hashes. Therefore a text files containing the proper paths is created
+ # We can also use this file the propagate transitive dependencies.
- for i in ${toString runtimeAssemblies}
+ ensureDir $out/nix-support
+
+ for i in ${toString assemblyInputs}
do
- cd $i
-
- for j in $(find . -type f)
- do
- mkdir -p $out/$(dirname $j)
- cp $j $out/$(dirname $j)
- done
+ echo $i >> $out/nix-support/dotnet-assemblies
done
'';
}
diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix
index 577a7a3b5e8..781a5ba8c0e 100644
--- a/pkgs/build-support/dotnetenv/default.nix
+++ b/pkgs/build-support/dotnetenv/default.nix
@@ -1,10 +1,17 @@
{stdenv, dotnetfx}:
+let dotnetenv =
{
buildSolution = import ./build-solution.nix {
inherit stdenv;
dotnetfx = dotnetfx.pkg;
};
+
+ buildWrapper = import ./wrapper.nix {
+ inherit dotnetenv;
+ };
inherit (dotnetfx) assembly20Path wcfPath referenceAssembly30Path referenceAssembly35Path;
-}
+};
+in
+dotnetenv
diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnetenv/wrapper.nix
new file mode 100644
index 00000000000..4b07fc27dcb
--- /dev/null
+++ b/pkgs/build-support/dotnetenv/wrapper.nix
@@ -0,0 +1,64 @@
+{dotnetenv}:
+
+{ name
+, src
+, baseDir ? "."
+, slnFile
+, targets ? "ReBuild"
+, verbosity ? "detailed"
+, options ? "/p:Configuration=Debug;Platform=Win32"
+, assemblyInputs ? []
+, preBuild ? ""
+, namespace
+, mainClassName
+, mainClassFile
+, modifyPublicMain ? true
+}:
+
+let
+ application = dotnetenv.buildSolution {
+ inherit name src baseDir slnFile targets verbosity;
+ inherit options assemblyInputs preBuild;
+ inherit modifyPublicMain mainClassFile;
+ };
+in
+dotnetenv.buildSolution {
+ name = "${name}-wrapper";
+ src = ./Wrapper;
+ slnFile = "Wrapper.sln";
+ assemblyInputs = [ application ];
+ preBuild = ''
+ addRuntimeDeps()
+ {
+ if [ -f $1/nix-support/dotnet-assemblies ]
+ then
+ for i in $(cat $1/nix-support/dotnet-assemblies)
+ do
+ windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g')
+ assemblySearchArray="$assemblySearchArray @\"$windowsPath\""
+
+ addRuntimeDeps $i
+ done
+ fi
+ }
+
+ export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g')
+
+ # Generate assemblySearchPaths string array contents
+ for path in ${toString assemblyInputs}
+ do
+ assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", "
+ addRuntimeDeps $path
+ done
+
+ sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \
+ -e "s|@ASSEMBLYNAME@|${namespace}|" \
+ Wrapper/Wrapper.csproj.in > Wrapper/Wrapper.csproj
+
+ sed -e "s|@NAMESPACE@|${namespace}|g" \
+ -e "s|@MAINCLASSNAME@|${mainClassName}|g" \
+ -e "s|@EXEPATH@|$exePath|g" \
+ -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \
+ Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs
+ '';
+}
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 714740ee1bf..e94e4185936 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,4 +1,4 @@
-{stdenv, git}:
+{stdenv, git, cacert}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false }:
/* NOTE:
@@ -35,6 +35,8 @@ stdenv.mkDerivation {
inherit url rev leaveDotGit;
+ GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt";
+
impureEnvVars = [
# We borrow these environment variables from the caller to allow
# easy proxy configuration. This is impure, but a fixed-output
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 7082c86a2d2..979aa531092 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -33,7 +33,6 @@ for arg; do
--deepClone) deepClone=true;;
--no-deepClone) deepClone=false;;
--leave-dotGit) leaveDotGit=true;;
- --keep-dotGit) leaveDotGit=;;
--builder) builder=true;;
*)
argi=$(($argi + 1))
@@ -56,9 +55,24 @@ for arg; do
fi
done
-if test -z "$url"; then
- echo "syntax: nix-prefetch-git URL [REVISION [EXPECTED-HASH]]" >&2
+usage(){
+ echo >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
+
+Options:
+ --out path Path where the output would be stored.
+ --url url Any url understand by 'git clone'.
+ --rev ref Any sha1 or references (such as refs/heads/master)
+ --hash h Expected hash.
+ --deepClone Clone submodules recursively.
+ --no-deepClone Do not clone submodules.
+ --leave-dotGit Keep the .git directories.
+ --builder Clone as fetchgit does, but url, rev, and out option are mandatory.
+"
exit 1
+}
+
+if test -z "$url"; then
+ usage
fi
@@ -196,13 +210,14 @@ clone_user_rev() {
eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
if test -z "$leaveDotGit"; then
echo "removing \`.git'..." >&2
- find $out -name .git\* | xargs rm -rf
+ find $dir -name .git\* | xargs rm -rf
fi
}
if test -n "$builder"; then
- mkdir $out
- clone_user_rev "$out" "$url" "$rev"
+ test -n "$out" -a -n "$url" -a -n "$rev" || usage
+ mkdir $out
+ clone_user_rev "$out" "$url" "$rev"
else
if test -z "$hashType"; then
hashType=sha256
@@ -210,7 +225,7 @@ else
# If the hash was given, a file with that hash may already be in the
# store.
- if -n "$expHash"; then
+ if test -n "$expHash"; then
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export)
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
finalPath=
@@ -251,4 +266,4 @@ else
if test -n "$PRINT_PATH"; then
echo $finalPath
fi
-fi
\ No newline at end of file
+fi
diff --git a/pkgs/build-support/fetchurl/gnome.nix b/pkgs/build-support/fetchurl/gnome.nix
new file mode 100644
index 00000000000..616c8203601
--- /dev/null
+++ b/pkgs/build-support/fetchurl/gnome.nix
@@ -0,0 +1,17 @@
+{ fetchurl }:
+
+{ project, major, minor, patchlevel, extension ? "bz2", sha256 }:
+
+let
+ baseVersion = "${major}.${minor}";
+ version = baseVersion + (if patchlevel != null then ".${patchlevel}" else "");
+ name = "${project}-${version}";
+in
+
+(fetchurl {
+ url = "mirror://gnome/sources/${project}/${baseVersion}/${name}.tar.${extension}";
+ inherit sha256;
+}) // {
+ inherit major minor patchlevel baseVersion version;
+ pkgname = name;
+}
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 94624412d35..713e7db0e3c 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -7,7 +7,7 @@ rec {
# Mirrors for mirror://site/filename URIs, where "site" is
# "sourceforge", "gnu", etc.
-
+
# SourceForge.
sourceforge = [
http://prdownloads.sourceforge.net/
@@ -97,6 +97,7 @@ rec {
http://www.all.kernel.org/pub/
http://www.eu.kernel.org/pub/
http://www.de.kernel.org/pub/
+ http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
];
# Mirrors of ftp://ftp.kde.org/pub/kde/.
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index f981c79b692..6156cf17f16 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "cacert-20090922";
+ name = "cacert-20110902";
src = fetchurl {
- url = http://nixos.org/tarballs/cacert-20090922.pem.bz2;
- sha256 = "1fakipxy5y62vslw6czj24pksh16b042py9v0199mxhzg5nmbmy7";
+ url = "http://nixos.org/tarballs/${name}.pem.bz2";
+ sha256 = "05vwziwrckgdg4l029jsb8apj65lcvk0rfcyyrvz34m2znk0vlmi";
};
unpackPhase = "true";
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index b121d30824e..14a41cf84fc 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,20 +1,23 @@
{ fetchurl, stdenv, cmake }:
stdenv.mkDerivation rec {
- name = "poppler-data-0.4.3";
+ name = "poppler-data-0.4.5";
src = fetchurl {
url = "http://poppler.freedesktop.org/${name}.tar.gz";
- sha256 = "19jq5miinzzrzlv6696j82hr60ga2r4msk6a34s9537vid410q22";
+ sha256 = "1zbh1zd083wfwrcw7vxc2bn32h42y6iyh24syxcb3r5ggd2vr41i";
};
buildInputs = [ cmake ];
- postInstall = ''
- ensureDir ''${out}/etc/profile.d
- echo "export POPPLER_DATADIR=''${out}/share/poppler" > \
- ''${out}/etc/profile.d/60-poppler.sh
- '';
+# TODO: actually use $prefix/etc/profile.d in NixOS
+ postInstall =
+ ''
+ mkdir -pv ''${out}/etc/profile.d
+ echo "export POPPLER_DATADIR=''${out}/share/poppler" |
+ tee ''${out}/etc/profile.d/60-poppler.sh
+ chmod -c +x ''${out}/etc/profile.d/60-poppler.sh
+ '';
meta = {
homepage = http://poppler.freedesktop.org/;
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index d86538b42d5..f5bf062b359 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "shared-desktop-ontologies-0.7.1";
+ name = "shared-desktop-ontologies-0.8.0";
src = fetchurl {
url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
- sha256 = "1b38amxr4b0n6cyy9l3lgzyjsky172cjphjr0iscahrlrc0h4phy";
+ sha256 = "0wf4gli2akkqbl944lqjjy2hvcfagq6zzmdg7fkzr61p6vw7nk82";
};
buildInputs = [ cmake ];
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
index db458df1e64..36eb7b70be2 100644
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@@ -143,7 +143,7 @@ pkgs.makeOverridable
};
glib_networking = import ./platform/glib-networking {
- inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls
+ inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2
libproxy libgcrypt libtasn1;
};
diff --git a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix b/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
index 5b7f590b29c..53ab1ba0840 100644
--- a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
+++ b/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy
+{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
, libgcrypt, libtasn1
}:
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
'';
buildInputs = [ pkgconfig ];
- propagatedBuildInputs = [ glib libtool intltool gnutls libproxy libgcrypt
+ propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt
libtasn1];
}
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix
index ec276578cb6..0521ce9058f 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix
+++ b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix
@@ -1,13 +1,16 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }:
-stdenv.mkDerivation {
+let
name = "libgnomecups-0.2.3";
-
+in
+stdenv.mkDerivation {
+ inherit name;
+
src = fetchurl {
- url = mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2;
+ url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2";
sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71";
};
-
+
buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ];
propagatedBuildInputs = [ libxml2 ];
}
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix
index 3fa902c67e6..54b5d638242 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix
+++ b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix
@@ -1,14 +1,17 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison,
flex }:
+let
+ name = "libgnomeprint-2.18.8";
+in
stdenv.mkDerivation {
- name = "libgnomeprint-2.11.1";
-
+ inherit name;
+
src = fetchurl {
- url = mirror://gnome/sources/libgnomeprint/2.18/libgnomeprint-2.18.6.tar.bz2;
- sha256 = "15c00ya2mx0x4mh8lyy3xg9dd66z5yjnax74bqx99zd90sar10fg";
+ url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2";
+ sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691";
};
-
+
buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ];
propagatedBuildInputs = [ libxml2 ];
}
diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix
index 0fbafd2e407..648e24d987d 100644
--- a/pkgs/desktops/kde-4.5/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix
@@ -3,7 +3,7 @@
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
, automoc4, strigi, soprano, qimageblitz, akonadi
-, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez, networkmanager
+, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez
}:
kde.package {
@@ -13,7 +13,7 @@ kde.package {
kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate
- pciutils bluez networkmanager ];
+ pciutils bluez ];
patches =
[ # Don't do compositing with the software GLX driver, since it's
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 1f0fd381071..9381107ef6f 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } :
+{ callPackage, recurseIntoAttrs, callPackageOrig, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } :
let
@@ -17,9 +17,7 @@ let
in
-recurseIntoAttrs rec {
- recurseForRelease = true;
-
+rec {
inherit callPackage stdenv;
qt4 = qt47;
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 219d0e97ec5..9d6981f1168 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -1,7 +1,7 @@
{ callPackage, callPackageOrig, stdenv, qt47 }:
let
- release = "4.7.0";
+ release = "4.7.1";
# Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package {
@@ -41,14 +41,13 @@ in
kde.modules // kde.individual //
{
inherit (kde) manifest modules individual splittedModuleList;
- recurseForRelease = true;
akonadi = callPackage ./support/akonadi { };
soprano = callPackage ./support/soprano { };
qt4 = qt47;
- kdebase_workspace = kde.individual.kde_workspace;
+ kdebase_workspace = kde.modules.kde_workspace;
inherit release;
diff --git a/pkgs/desktops/kde-4.7/kdebase/kate.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/kate.nix
rename to pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix
rename to pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
diff --git a/pkgs/desktops/kde-4.7/kdebase/konsole.nix b/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/konsole.nix
rename to pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix
deleted file mode 100644
index b3192fadb8b..00000000000
--- a/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix
+++ /dev/null
@@ -1 +0,0 @@
-{stable=true;hashes=builtins.listToAttrs[{name="blinken";value="1g4vpwbal6d7ypmq6l8dh17gi249cd261hsa4bjkvb0wx88i66qr";}{name="cantor";value="0xb4xja9ab4kzgzpikhlkrl68287lqdigvl6pzbh9m6g0ghlp697";}{name="gwenview";value="14a1mjcfcw4nq2c5qkvca8mgdrr31gm24l9nlkcj7p8yrpkxfykh";}{name="kalgebra";value="140528rn3zx489g1lawr1n19i3rrc58h2ii8gh46dnlfcgig13bb";}{name="kalzium";value="1vfa9kdxrdfqqfad0dp2pwi919qs5pbgdk7jmi4dccwlhgmv3226";}{name="kamera";value="02g3mh14rfyrmpa3r8m5pqzxhs4kdb3xvg34434g9r51v3am3ypk";}{name="kanagram";value="04hv13mij4kg8bifs690q4qxr4qk7dnviihlc297x434l0iz2spd";}{name="kate";value="0bd0b354a7cx8cmw2d5pbqn0an38xls86454gclyjd1ilr3l41m9";}{name="kbruch";value="169c6xq0jvp9cv6p9ypk8sryxsh711xdgbs02yiqd476ykavj3jv";}{name="kcolorchooser";value="1f7nj9ccvf1bg3nnm7xchaqvfnskkbnd1h2xd5fxmj9fz1195kqv";}{name="kdeaccessibility";value="01qx0w5dylkbxchj5kg9iawdc0rjbxv1w1dg90ld98fn583g70ws";}{name="kdeadmin";value="1zm6p65wgdn0rv9vzcm89vsiw1696g0bf7kshvwnjmsfc9whsgq3";}{name="kdeartwork";value="12cqpam82k086088i2p1318y1vjr7c8iffppnm6mkbllg2g8ydip";}{name="kde-baseapps";value="0jpi3fjsav52v6ziwdldy03akfpahaagjp3g3m015cmn9bhk2l71";}{name="kdegames";value="1n98jiax7s4m8gb2jq5vdwsg6sfkls7m4mfm627dfsqmvpcgf9k0";}{name="kdegraphics-strigi-analyzer";value="15p0wsiawhygdq9fwp451vcbxbf1sv9pvlwz3x4ma5mp8la7k4vd";}{name="kdegraphics-thumbnailers";value="1gl08an6gzdxvam9fvq5c98zm8m95h6184y0hf0zlqjzkqgg312l";}{name="kdelibs";value="1f0wmcsw0lkfaqdil2yxjfpldr0ckwy5iblkwwaad4n1b4hyssyv";}{name="kdemultimedia";value="0b53vg6gp4qv92w7y721xwbv23bzzljvyl18j05z8ig2l6m57kf5";}{name="kdenetwork";value="1ifg2hxbh80fpszm9r1jzamy65jlkqb6y8fcfa0sngwsklkxn5sh";}{name="kdepim";value="140n4q1rf2jbxmqmkwzam1fipk4k30n3wn9ik8mlqfmxm06dhgqs";}{name="kdepimlibs";value="020irkn43q999idk4kwfi9250fvk98ffi9m998ywgzfl9wps01g0";}{name="kdepim-runtime";value="11ad82hisya8ysx6p1ik6nw1hbyqwksxhimlxcrjkkjh76nphs2g";}{name="kdeplasma-addons";value="1bi7n6lav9z08pvarhsgx9wmm14mr34mvjm4vk9jszrdi7vl2ayj";}{name="kde-runtime";value="1wm91hkj8h1rbavcxwgjfsfrzhr3rs1xd6zf2kxyh1hh9fkdrx3w";}{name="kdesdk";value="04kx9srv8a4z9lic9v3f375rglpz87hhq6wppxksi9qgyc0vzqnv";}{name="kdetoys";value="1ahsk0990a3zx665mjqaljb5w392qkk1pnla5srqg57g62yhig8f";}{name="kdeutils";value="1n031c1i42bq08md156k7fhzw67b28b0a6168m9c9hnhh3483r7l";}{name="kde-wallpapers";value="1xb9k9w479xcwa4caxqn4z1h942lvx7ahy0crxkk41ra3xgw7fg9";}{name="kdewebdev";value="0v8v45rwfldk299ny0jhxqa7xsa1x0ywz7lbqc9i0m3g808ifa29";}{name="kde-workspace";value="0s1l7airb92dd4vprry39nzikarv03qfsmd2j0brif5jjfjd2c3y";}{name="kgamma";value="1xgxnb8x2iy1ikychs8bh5jplkdlk7br6yrmivzrz7s2337dlm35";}{name="kgeography";value="1pm4y5d4d0cl36wgwrkm48yk60m73ljys2awahjsfdpwxs0x42ca";}{name="khangman";value="0ccp1qsji6jjybcbc0rwkw78ypl5kwk1kb74vrnz2ss9anxky2c3";}{name="kig";value="06nk38wg43rxxdzr535vrw4f3d1v9kym5bir6vfpyay8xdxqgf5f";}{name="kimono";value="1p4scmzn0kbkpbrv27658bh56ll9zazaf3rk1p2c6lm6zglvm9gd";}{name="kiten";value="119h7fslp975r0kd7i1zmvhrfrr19rlhm4ni99pd4jxnhz05n47k";}{name="klettres";value="0znca4iqgxlmldyzmd5rf9z2c0jhmmijwxyxaqjffrphq407wms0";}{name="kmplot";value="1zyk3701mhga9d53bm8xyzbw4zn6s9ijfnp0ww2hq9dcm81w12ga";}{name="kolourpaint";value="0ckqz8fmaq92lkaxm87c2nfdjvwp4l310vnicqm2bkkmkma9p6cs";}{name="konsole";value="1apchw8n1k2xyi3h0n3w4fxwy6vx6lxhx7ll3vhfmyl8wa0gzwf5";}{name="korundum";value="1ndhbn6i5napfgp5czsbww1vknss49xhxlj6rn5ci1m5j2zfajic";}{name="kross-interpreters";value="0hzx08r60z9pl7i1hnh6q1zq4s7wmny4015b55prllaa94yb1ya2";}{name="kruler";value="1bydk587las6dx447mihkg7qmn0hn6iis20xfl4wygx7a81imnw3";}{name="ksaneplugin";value="02g4vdgz4k7rahkwss5m1vfv22rzhr6gzmzf79vrbg15mci57jzz";}{name="ksnapshot";value="1dllmx8v2qzkfhy9b3j87yjmkyl3fdkjbmdfqlk5kq2n40k3fha0";}{name="kstars";value="0qgsphimg200kapnjwqh3186z27ypszmhr4knk46jyyczmj2k4nd";}{name="ktouch";value="1w1ps11xazqvvh66v78r714283kd5icvz6dgbh7wfangpqya2g9i";}{name="kturtle";value="0xiz13nb2wgajgm2z105pywi0fcw09appp4k4wbg6nykqdcql0n5";}{name="kwordquiz";value="1rja09mvp7j264ap27m4413dy8l1867ds1w3yizlqlcrl92fby7b";}{name="libkdcraw";value="0dcplib41s5cnv5jjnx2y7d9gd4vls6qlf1vpr1iqsbhrr0az50a";}{name="libkdeedu";value="0nq2b4l5134lkyv0vzfqpp5w7vbr0b6lg88xyjlpih6n9bywiv16";}{name="libkexiv2";value="1fgawizv09vv0almb05sf5f93iqsp3w8x9nx4p9hys66qiz8n467";}{name="libkipi";value="09gpjx4vyncf6js79jf7w4w55lgnzawii40ar7ssrhnxspckbdn0";}{name="libksane";value="1ffwz2g4y12fg8pckz1a0qizziljv17zbn7g1vjf30pw8dpk0x12";}{name="marble";value="0x5yhs28g0z1s9qjmgkdidfp0hmy526l9cmqjccaqn7a61ziv0qz";}{name="mobipocket";value="06qh1xdijc4fscpbxfc7f6mmy1dkxvhx7sb4fmhk2m3z569ir2jx";}{name="okular";value="016xa6i0n1nyq1h9z8nhwc9br9k09l0c2gxhzfd9g6nf528zlbdf";}{name="oxygen-icons";value="1a4dkhay0qrbz9gz2xx3d7vbk18qyjrx9hxgdazjxr35ba6xipgc";}{name="parley";value="0zkj272wrih66mcpr27am9qnp3ab4275is06c8h6hzf5wmfq6sib";}{name="perlkde";value="0pp8ljvck68b45yxhknmyn8z1a1xnq3ahcpz8m6pfch77hlg7fhj";}{name="perlqt";value="0sw1dpxshmmdvp93x59wclslm5xza0yy0f8nmqgdns8c77g0b3k8";}{name="pykde4";value="1mdq474f4jj637k0a9jpb2vcvq4f90vwrhgjs7mqqwmvkh6vv6h0";}{name="qtruby";value="1h7m17d36y5vgaxcqwa814yxmsx19v0xh9m83cq1zznxl62sbmh1";}{name="qyoto";value="1lbdv00hd0s0m5ywjnb52wgz3hb5nx45kwpjkjrjcj1jg76rvk72";}{name="rocs";value="1ma5ylc4rvzjrn1l8rv8684map78zk73fa1a3iz996z1c5fg09wm";}{name="smokegen";value="1g05if9k9ichxlrfly5lha6n2mcihbaz681yg14cjj806s0qs53l";}{name="smokekde";value="0b8kx8a3990l6f7pf252diz7b50r81kxkhigkzkc9lzq833a2siq";}{name="smokeqt";value="0cgjdh9dr4pn1yh423mhifv2yvd283k2mhwkmfn2i0398h71a252";}{name="step";value="1pg7k60rbvr6nfq47xnj98w121703s79z8rap601xrmb8wyfhmyy";}{name="svgpart";value="0xyp4sibcdjxq2ny348m4z95bh71r3q3pm8xfwb1j50my9g8ijir";}];modules=[{module="kdegraphics";split=true;pkgs=[{name="gwenview";}{name="kamera";}{name="kcolorchooser";}{name="kdegraphics-strigi-analyzer";sane="kdegraphics_strigi_analyzer";}{name="kdegraphics-thumbnailers";sane="kdegraphics_thumbnailers";}{name="kgamma";}{name="kolourpaint";}{name="kruler";}{name="ksaneplugin";}{name="ksnapshot";}{name="libkdcraw";}{name="libkexiv2";}{name="libkipi";}{name="libksane";}{name="mobipocket";}{name="okular";}{name="svgpart";}];}{module="kdebase";split=true;pkgs=[{name="kate";}{name="kde-baseapps";sane="kde_baseapps";}{name="kde-runtime";sane="kde_runtime";}{name="kde-workspace";sane="kde_workspace";}{name="konsole";}];}{module="kdeedu";split=true;pkgs=[{name="blinken";}{name="cantor";}{name="kalgebra";}{name="kalzium";}{name="kanagram";}{name="kbruch";}{name="kgeography";}{name="khangman";}{name="kig";}{name="kiten";}{name="klettres";}{name="kmplot";}{name="kstars";}{name="ktouch";}{name="kturtle";}{name="kwordquiz";}{name="libkdeedu";}{name="marble";}{name="parley";}{name="rocs";}{name="step";}];}{module="kdebindings";split=true;pkgs=[{name="kimono";}{name="korundum";}{name="kross-interpreters";sane="kross_interpreters";}{name="perlkde";}{name="perlqt";}{name="pykde4";}{name="qtruby";}{name="qyoto";}{name="smokegen";}{name="smokekde";}{name="smokeqt";}];}{module="kdeaccessibility";split=false;pkgs=[{name="kaccessible";}{name="kmag";}{name="kmouth";}{name="kmousetool";}{name="jovie";}];}{module="kdeadmin";split=false;pkgs=[{name="strigi-analyzer";sane="strigi_analyzer";}{name="kuser";}{name="kcron";}{name="ksystemlog";}{name="system-config-printer-kde";sane="system_config_printer_kde";}];}{module="kdeartwork";split=false;pkgs=[{name="ColorSchemes";}{name="IconThemes";}{name="emoticons";}{name="kscreensaver";}{name="kwin-styles";sane="kwin_styles";}{name="sounds";}{name="styles";}{name="wallpapers";}{name="HighResolutionWallpapers";}{name="WeatherWallpapers";}{name="desktopthemes";}{name="aurorae";}];}{module="kdegames";split=false;}{module="kdelibs";split=false;}{module="kdemultimedia";split=false;}{module="kdenetwork";split=false;pkgs=[{name="kfile-plugins";sane="kfile_plugins";}{name="kget";}{name="kopete";}{name="krdc";}{name="kppp";}{name="krfb";}{name="kdnssd";}{name="filesharing";}];}{module="kdepim";split=false;}{module="kdepimlibs";split=false;}{module="kdepim-runtime";sane="kdepim_runtime";split=false;}{module="kdeplasma-addons";sane="kdeplasma_addons";split=false;}{module="kdesdk";split=false;pkgs=[{name="cervisia";}{name="lokalize";}{name="kdeaccounts-plugin";sane="kdeaccounts_plugin";}{name="dolphin-plugins-svn";sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn";}{name="dolphin-plugins-git";sane="dolphin_plugins_git";subdir="dolphin-plugins/git";}{name="kcachegrind";}{name="kapptemplate";}{name="kpartloader";}{name="strigi-analyzer";sane="strigi_analyzer";}{name="kioslave";}{name="okteta";}{name="kmtrace";}{name="kompare";}{name="kprofilemethod";}{name="kstartperf";}{name="kuiviewer";}{name="poxml";}{name="scripts";}{name="umbrello";}];}{module="kdetoys";split=false;pkgs=[{name="kteatime";}{name="ktux";}{name="amor";}];}{module="kdeutils";split=false;pkgs=[{name="ark";}{name="kcalc";}{name="kremotecontrol";}{name="kdf";}{name="kfloppy";}{name="printer-applet";sane="printer_applet";}{name="filelight";}{name="kcharselect";}{name="kgpg";}{name="ktimer";}{name="kwallet";}{name="sweeper";}{name="superkaramba";}];}{module="kde-wallpapers";sane="kde_wallpapers";split=false;}{module="kdewebdev";split=false;pkgs=[{name="klinkstatus";}{name="kfilereplace";}{name="kimagemapeditor";}{name="kommander";}];}{module="oxygen-icons";sane="oxygen_icons";split=false;}];}
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
new file mode 100644
index 00000000000..43de59d7a2e
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
@@ -0,0 +1,273 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+ {name="blinken";value="0946y6g67bqbkdcnqas97izr514190f08qzq5jg12xjv3q5i9xnr";}
+ {name="cantor";value="1yipf6019nr1vacdl1mp6wwffwaq7khyh1rp5wx0f3y70p7q6w8v";}
+ {name="gwenview";value="00vxhpg2481pz7bh0kac1fsl8dawjlxm7x38y572802qbhd02jr4";}
+ {name="kalgebra";value="1rkl8jyiqi9ymwl4inflgwg2252k5x5yag25zr8crwg1ax9rvmhv";}
+ {name="kalzium";value="110l065vwjfyjr0130xklrsr3jwlqb27fv9mhc9w5v9i5shl79xm";}
+ {name="kamera";value="17sac0bydq4d2rv63jzjy87dry9g3n6chw7gg6nncisvkgz1dyz2";}
+ {name="kanagram";value="10nhgb1gf5vh6767xrbfwicdhw4kd3za4lnwrsww823dqpi6cryz";}
+ {name="kate";value="1n3zs4rs3y4z9g2ssiqi6jy7c2li0pah2p0vsdjw0ifq0xqvvz67";}
+ {name="kbruch";value="0x3y5gbq4xhqjrp4g91v3wjggrimxx6k8nsvny0ykriqql6xzq77";}
+ {name="kcolorchooser";value="1fwjf0fys3iz4c86jfhzq6j43ps7jiab9qhspkv6cvnv1dyi0ryy";}
+ {name="kdeaccessibility";value="1980y2vqxkhz40xkkljqawkafshhrimlyb7hvk5waz9a2jz0vwwj";}
+ {name="kdeadmin";value="1614acnvycihysxy3k26q8xsxswsx73m32n0c34hb0d5xj87ndk0";}
+ {name="kdeartwork";value="0xsmq5x9lbplj3rxza0lxxdbnz5srmxjzw993rzwj9687jvgi6hv";}
+ {name="kde-baseapps";value="1jpfslapsl4l7yqxq4cry0dwj2hps2s6kayj81dcs2crqrz75plc";}
+ {name="kdegames";value="0b3zljmkhyml31kfj9n75sa9h3xknn8v0y099mdc1wcny7p7zyrl";}
+ {name="kdegraphics-strigi-analyzer";value="1xnaipyn29wa5i26rgv2jbijii64qklz5fgcy49zpd0pxqnkxxwl";}
+ {name="kdegraphics-thumbnailers";value="07nvydwzzwnr1a5x3v732mry1qw7lvn8l3h3b73r6fvmnhs91iyp";}
+ {name="kdelibs";value="1gwgilr2m95m8w4q55d79g3qsgpq5jv7aq7crq7xbrhz3smv6ciw";}
+ {name="kdemultimedia";value="1p76vrzr1wmlpnkspy9nf8v1am6bdi5wc6zl4y9lp6y6qv9diz1w";}
+ {name="kdenetwork";value="1hmcljp8d85zyi55314js7jl5ihf060hji5gcm6s4s95xqg7hwvh";}
+ {name="kdepim";value="09lvdpq8nm9b97g0xlmc2ikklq7pc4c61v9lz53mb8c1hi9yxasd";}
+ {name="kdepimlibs";value="0svj7fqkn3g8ryip9qy4rh0j7xnjgwhv45rbz4s6lsjh81ipnc4j";}
+ {name="kdepim-runtime";value="0iy0sph5cvzmyn2gi0had5xhppdxdhs5dqm7lm79lk27i8913sjk";}
+ {name="kdeplasma-addons";value="1xrdqhaklf2l5043l1qhfjqyr6985m5j1jzd8rgabkwa9dv5bb4c";}
+ {name="kde-runtime";value="1qppx56xdrmapl0l0fv2p502yg470hiwhzdjv5kiw0akwl7g2ll5";}
+ {name="kdesdk";value="0db4kiikf0bl07m09cj01id0ivl1hm30pr5401xscqask7ddq2v9";}
+ {name="kdetoys";value="02zjz6h62nlxhjhsv5apxyhs140h6dc5i5laxi68j8fi4p8gyk5a";}
+ {name="kdeutils";value="0s7lw9qiyzn4wccbgalrsb91hspqniaf93x94s3gcw7jmk4znwwd";}
+ {name="kde-wallpapers";value="17x3npychdv9z90a6y2yxxscnczrpzkd8zanml3y1kkx1kcwvkrv";}
+ {name="kdewebdev";value="0ll5s60231vc6k989ahfw7k9wk0r6ml3icg25zj90785ildqqrnz";}
+ {name="kde-workspace";value="15kvc30w4ysjm7il7lkfls3xm9v4azhlz2jv75n5bp5h41kbznl5";}
+ {name="kgamma";value="1fzhhjqz6x19lk6c77mmq94bjk5f8qj0pq9c7923gd9d644azbsc";}
+ {name="kgeography";value="0s9nnsjma95j402wlcswrqdjz9csxbnxpnshcg5xxj3135122yv6";}
+ {name="khangman";value="04frra3qj4jkmhlsr4im6sjhyv7rs32fj88vphzwx0nbq086i078";}
+ {name="kig";value="1si3zi3w75mg9sd2imbs6f2z0ywkzbvg9cj672fmamczw5wrjp6n";}
+ {name="kimono";value="1bqw23g6c1l3bxnnzgz4pn5j2w2vxwfi1nrdjcbkfwsa4px2q7bn";}
+ {name="kiten";value="0i3dp8jqqjlx2hjbqwc01qaja9bh7aas0m4s75py5j2im7gkxncs";}
+ {name="klettres";value="1mxpxh4p16jnxmd2gff4ink222hbd1qxigr3hn8jc3a0kwrnpxdk";}
+ {name="kmplot";value="1adw71m9h6z85lwavsjsbdcnlgkchic6y5110hmb9x067n5hrfkq";}
+ {name="kolourpaint";value="01lc73vvpl5jmzvx9vi857k69mww97rd7fnqm2776d7dbkgpzzs8";}
+ {name="konsole";value="0ywy8xy38v058hfl6yakxqz355y64mmqbhxf0j1h0zz50744ww1r";}
+ {name="korundum";value="1ib02m2dr9ab1v1xxcngdisprr7mlll3h52d9lrjj6clnxlxz1sz";}
+ {name="kross-interpreters";value="1glb2hkj84zmcjjq3sh79w7g4y0v25ddd9hjiilppskwnqby16bb";}
+ {name="kruler";value="18h5kp7pni6j9nqfxzwfcfnv8sbgg1s656clzyi7f9znsw8bgzvd";}
+ {name="ksaneplugin";value="0mk7q66h6v5carkywkpjr5893r01vgcqf0lx9c1fq7n0mn22zl9s";}
+ {name="ksnapshot";value="0wf1bwkrhp714fhhh3y82p35rxk7prwqsn89nsl7rj3l7gryismp";}
+ {name="kstars";value="0bbnf8vnhinmgb03dab7ji2rpb3k2d901nm5r11lxwjdv58d4vkn";}
+ {name="ktouch";value="1b354imxnfv4yklzh0xd358gydczmlijkkjm2ks04111895h97b1";}
+ {name="kturtle";value="147sn2lrzxgfwiqxziymjvvy67sgwmdfcrgqvv93rmp5r9y3zmiy";}
+ {name="kwordquiz";value="1a2vifgixn6zgrp4nm5lvq41v24xp4nbnv8a7c9p53chx3y8i2px";}
+ {name="libkdcraw";value="1h49g41c2sxxzx6w865k2ljiqlgill7imh1pnkw1wsfwk4ii9msz";}
+ {name="libkdeedu";value="058gidzzda4ca4h2125ja17gdfq52zqdh70c22f6p4ph47qw503m";}
+ {name="libkexiv2";value="0vkl2gnp7saw26crj2hbg953knrv3v1pjd9c5d29vckdn5q417zr";}
+ {name="libkipi";value="00wnm45v65my7dp7g3sri54prjk1mkqi4nqf3f5xisnshi3vzr5f";}
+ {name="libksane";value="1w0d164lnc576irrxfi1f6rzv85wn5gawqp92yg8zqhna1zxjhzp";}
+ {name="marble";value="1964ix9dcssw4bny944rdwhxifnj5ay6nmbhvbvwq1d77ckzz9sf";}
+ {name="mobipocket";value="1npmbkvrg1kil6sh91m79kavfrivkk3jpb0c0spm0s93b85pgvky";}
+ {name="okular";value="0fw49r0hskhscml18715yqxxwrzigrx0rkhcljgckss7bksyfsfn";}
+ {name="oxygen-icons";value="1gwpsh7iwmzl1n9wzp8q95jlimbmygcrqwkzzp9jwsyfl9qn86y5";}
+ {name="parley";value="0c8k3sxpzxnaldvyskfp86cnhrzabq8alkv32ikr3y948ib9q31m";}
+ {name="perlkde";value="01ysn4bq5zjc0b8gqyinx08scimiix505zvdw13a9axfb4vnk05j";}
+ {name="perlqt";value="067hj2fw2jvd6d0ywdmq6y630ygm6xjrvkrnhm3czqxpfs6hp2mk";}
+ {name="pykde4";value="106kjcbg2gpgj7kypg79yjb2b3jbcc8zfslc65vkb32ivipk0j16";}
+ {name="qtruby";value="1dp3zdh5m3yp55r7pwxi4nqfjsfv84qcg9n5msp7lw78k04xidg7";}
+ {name="qyoto";value="1kynbz0gpjbq5xdpfv1by39cxji1z3wisv8c6bgxz7yknqp16qix";}
+ {name="rocs";value="1mlvw0fb83f0vjdf0amlx92w2fvjl79rcvhlv267vsw0idd3vp2g";}
+ {name="smokegen";value="1j0apyqv17fycysfjc0mf4rhq2g6zwn9fz7dsib1hylza813smxr";}
+ {name="smokekde";value="1zgf2pcxwxzhjhab46q2ir1ys4mq2xf9ais9473xc6xjvrbg74dd";}
+ {name="smokeqt";value="19xfpm9as6sbsfjsn8qiqnlfsqwpri56886kl9kp7qhr6dga54ma";}
+ {name="step";value="1819shriclbp1ny28gjik1mg1c3mvm4drk0c84zcq2vj6dz2fp61";}
+ {name="svgpart";value="1wcjbhl608y7a0rzwziaja7zi1kjixcnmwaik5xyss2hmx59m934";}
+];
+modules=[
+{
+ module="kdegraphics";
+ split=true;
+ pkgs=[
+ { name="gwenview"; }
+ { name="kamera"; }
+ { name="kcolorchooser"; }
+ { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+ { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+ { name="kgamma"; }
+ { name="kolourpaint"; }
+ { name="kruler"; }
+ { name="ksaneplugin"; }
+ { name="ksnapshot"; }
+ { name="libkdcraw"; }
+ { name="libkexiv2"; }
+ { name="libkipi"; }
+ { name="libksane"; }
+ { name="mobipocket"; }
+ { name="okular"; }
+ { name="svgpart"; }
+ ];
+}
+{
+ module="kdeedu";
+ split=true;
+ pkgs=[
+ { name="blinken"; }
+ { name="cantor"; }
+ { name="kalgebra"; }
+ { name="kalzium"; }
+ { name="kanagram"; }
+ { name="kbruch"; }
+ { name="kgeography"; }
+ { name="khangman"; }
+ { name="kig"; }
+ { name="kiten"; }
+ { name="klettres"; }
+ { name="kmplot"; }
+ { name="kstars"; }
+ { name="ktouch"; }
+ { name="kturtle"; }
+ { name="kwordquiz"; }
+ { name="libkdeedu"; }
+ { name="marble"; }
+ { name="parley"; }
+ { name="rocs"; }
+ { name="step"; }
+ ];
+}
+{
+ module="kdebindings";
+ split=true;
+ pkgs=[
+ { name="kimono"; }
+ { name="korundum"; }
+ { name="kross-interpreters"; sane="kross_interpreters"; }
+ { name="perlkde"; }
+ { name="perlqt"; }
+ { name="pykde4"; }
+ { name="qtruby"; }
+ { name="qyoto"; }
+ { name="smokegen"; }
+ { name="smokekde"; }
+ { name="smokeqt"; }
+ ];
+}
+{
+ module="kde-baseapps";
+sane="kde_baseapps"; split=true;
+ pkgs=[
+ { name="kate"; }
+ { name="kde-baseapps"; sane="kde_baseapps"; }
+ { name="konsole"; }
+ ];
+}
+{ module="kdeaccessibility"; split=false;
+ pkgs=[
+ { name="kaccessible"; }
+ { name="kmag"; }
+ { name="kmouth"; }
+ { name="kmousetool"; }
+ { name="jovie"; }
+ ];
+
+}
+{ module="kdeadmin"; split=false;
+ pkgs=[
+ { name="strigi-analyzer"; sane="strigi_analyzer";}
+ { name="kuser"; }
+ { name="kcron"; }
+ { name="ksystemlog"; }
+ { name="system-config-printer-kde"; sane="system_config_printer_kde";}
+ ];
+
+}
+{ module="kdeartwork"; split=false;
+ pkgs=[
+ { name="ColorSchemes"; }
+ { name="IconThemes"; }
+ { name="emoticons"; }
+ { name="kscreensaver"; }
+ { name="kwin-styles"; sane="kwin_styles";}
+ { name="sounds"; }
+ { name="styles"; }
+ { name="wallpapers"; }
+ { name="HighResolutionWallpapers"; }
+ { name="WeatherWallpapers"; }
+ { name="desktopthemes"; }
+ { name="aurorae"; }
+ ];
+
+}
+{ module="kdegames"; split=false;}
+{ module="kdelibs"; split=false;}
+{ module="kdemultimedia"; split=false;}
+{ module="kdenetwork"; split=false;
+ pkgs=[
+ { name="kfile-plugins"; sane="kfile_plugins";}
+ { name="kget"; }
+ { name="kopete"; }
+ { name="krdc"; }
+ { name="kppp"; }
+ { name="krfb"; }
+ { name="kdnssd"; }
+ { name="filesharing"; }
+ ];
+
+}
+{ module="kdepim"; split=false;}
+{ module="kdepimlibs"; split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kdesdk"; split=false;
+ pkgs=[
+ { name="cervisia"; }
+ { name="lokalize"; }
+ { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
+ { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
+ { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
+ { name="kcachegrind"; }
+ { name="kapptemplate"; }
+ { name="kpartloader"; }
+ { name="strigi-analyzer"; sane="strigi_analyzer";}
+ { name="kioslave"; }
+ { name="okteta"; }
+ { name="kmtrace"; }
+ { name="kompare"; }
+ { name="kprofilemethod"; }
+ { name="kstartperf"; }
+ { name="kuiviewer"; }
+ { name="poxml"; }
+ { name="scripts"; }
+ { name="umbrello"; }
+ ];
+
+}
+{ module="kdetoys"; split=false;
+ pkgs=[
+ { name="kteatime"; }
+ { name="ktux"; }
+ { name="amor"; }
+ ];
+
+}
+{ module="kdeutils"; split=false;
+ pkgs=[
+ { name="ark"; }
+ { name="kcalc"; }
+ { name="kremotecontrol"; }
+ { name="kdf"; }
+ { name="kfloppy"; }
+ { name="printer-applet"; sane="printer_applet";}
+ { name="filelight"; }
+ { name="kcharselect"; }
+ { name="kgpg"; }
+ { name="ktimer"; }
+ { name="kwallet"; }
+ { name="sweeper"; }
+ { name="superkaramba"; }
+ ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev"; split=false;
+ pkgs=[
+ { name="klinkstatus"; }
+ { name="kfilereplace"; }
+ { name="kimagemapeditor"; }
+ { name="kommander"; }
+ ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix
index cd1cd5be9b9..f725c2f7bb1 100644
--- a/pkgs/desktops/kde-4.7/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.7/kde-package/default.nix
@@ -27,10 +27,11 @@ rec {
# released as individual tarballs
kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
stdenv.mkDerivation ({
- name = "${name}-${release}";
- src = kdesrc name;
- meta = defMeta // meta;
- } // (removeAttrs a [ "meta" "name" ]));
+ name = "${name}-${release}";
+ src = kdesrc name;
+ meta = defMeta // meta;
+ enableParallelBuilding = true;
+ } // (removeAttrs a [ "meta" "name" ]));
# kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
@@ -39,13 +40,18 @@ rec {
kdeSubdirPkg = module:
{name, subdir ? name, sane ? name}:
let name_ = name; in
- a@{cmakeFlags ? [], name ? name_, ...}:
+ a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc module;
- cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
- "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
- } // (removeAttrs a [ "cmakeFlags" ]));
+ cmakeFlags =
+ [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+ "-DBUILD_doc=TRUE"
+ "-DBUILD_${subdir}=TRUE"
+ ] ++ cmakeFlags;
+ meta = defMeta // meta;
+ enableParallelBuilding = true;
+ } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
# A KDE monolithic module
kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
index 10ce57cee6a..dbb5970ab64 100755
--- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
@@ -33,6 +33,8 @@ if [[ ! -f kde_projects.xml ]]; then
fi
eval `xsltproc kde-submodules.xslt kde_projects.xml`
+module[kde-baseapps]=kde-baseapps
+
print_sane() {
echo "Called print_sane $1" >&2
sane="${1//[^a-z0-9_]/_}"
@@ -62,38 +64,39 @@ done
print_pkg_hash() {
- echo -n "{name=\"${1}\";value=\"${hash[$1]}\";}"
+ echo " {name=\"${1}\";value=\"${hash[$1]}\";}"
}
print_hashes(){
- echo -n "hashes=builtins.listToAttrs["
+ echo "hashes=builtins.listToAttrs["
for p in "${packages[@]}"; do print_pkg_hash "$p"; done
- echo -n "];"
+ echo "];"
}
print_split_module(){
echo -n "$1:" >&2
- echo -n "{module=\"$1\";"
+ echo -e "{\n module=\"$1\";"
print_sane "$1"
- echo -n "split=true;"
- echo -n "pkgs=["
+ echo " split=true;"
+ echo " pkgs=["
for p in "${packages[@]}"; do
if [[ "${module[$p]}" == "$1" ]]; then
- echo -n "{name=\"$p\";"
+ echo -n " { name=\"$p\"; "
print_sane "$p"
- echo -n "}"
+ echo " }"
echo -n " $p" >&2
fi
done
- echo -n "];}"
+ echo " ];"
+ echo "}"
echo >&2
}
print_mono_module(){
- echo -n "{module=\"$1\";"
+ echo -en "{ module=\"$1\"; "
print_sane "$1"
echo -n "$1 ... " >&2
- echo -n "split=false;"
+ echo -n " split=false;"
cml="$1-$release/CMakeLists.txt"
tar -xf "${dir}/$1-${release}.tar.bz2" "$cml"
if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
@@ -104,38 +107,39 @@ print_mono_module(){
sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
grep -v '\(doc\|cmake\)'` )
echo " seems splittable, subdirs: ${subdirs[*]}" >&2
- echo -n "pkgs=["
+ echo -e "\n pkgs=["
for s in "${subdirs[@]}"; do
- echo -n "{name=\"${s//\//-}\";"
+ echo -en " {"
+ echo -n " name=\"${s//\//-}\"; "
print_sane "$s"
if [[ $s != "${s//\//-}" ]]; then
- echo -n "subdir=\"$s\";"
+ echo -n "subdir=\"$s\"; "
fi
- echo -n "}"
+ echo "}"
done
- echo -n "];"
+ echo -e " ];\n"
fi
else
echo " is monolithic (has no subdirs)" >&2
fi
rm $cml
rmdir $1-$release
- echo -n "}"
+ echo "}"
}
print_modules(){
- echo -n "modules=["
+ echo "modules=["
echo "Printing modules splitted by upstream" >&2
for m in "${!modules[@]}"; do print_split_module "$m"; done
echo >&2
echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
for m in "${top_level[@]}"; do print_mono_module "$m"; done
- echo -n "];"
+ echo "];"
}
echo "Writing ${release}.nix" >&2
exec > "${release}.nix"
-echo -n "{stable=${stable};"
+echo "{stable=${stable};"
print_hashes
print_modules
-echo -n "}"
+echo "}"
diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix
new file mode 100644
index 00000000000..96b6c3a1c78
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kde-runtime.nix
@@ -0,0 +1,16 @@
+{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
+, libcanberra, virtuoso, samba, ntrack
+}:
+
+kde {
+ buildInputs =
+ [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
+ samba (libcanberra.override { gtk = null; }) ntrack
+ ];
+
+ passthru.propagatedUserEnvPackages = [ virtuoso ];
+
+ meta = {
+ license = "LGPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
rename to pkgs/desktops/kde-4.7/kde-workspace.nix
diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix b/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
deleted file mode 100644
index b8a4a21cc73..00000000000
--- a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica,
- libcanberra, virtuoso, makeWrapper, samba
-}:
-
-# TODO: Re-enable ntrack once it is fixed upstream
-
-kde {
- buildInputs =
- [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica virtuoso
- makeWrapper samba (libcanberra.override { gtk = null; })
- ];
-
-# Copied from kde45, Nepomuk needs it.
- postInstall = ''
- wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
- --prefix PATH : "${virtuoso}/bin"
- '';
-
- meta = {
- license = "LGPL";
- };
-}
diff --git a/pkgs/desktops/kde-4.7/kdepim.nix b/pkgs/desktops/kde-4.7/kdepim.nix
index c21e8c112a8..9b95d491a44 100644
--- a/pkgs/desktops/kde-4.7/kdepim.nix
+++ b/pkgs/desktops/kde-4.7/kdepim.nix
@@ -3,8 +3,10 @@
kde {
- buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
- libxslt cyrus_sasl gpgme libassuan grantlee ];
+ buildInputs =
+ [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
+ libxslt cyrus_sasl gpgme libassuan grantlee
+ ];
passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
diff --git a/pkgs/desktops/kde-4.7/kdepimlibs.nix b/pkgs/desktops/kde-4.7/kdepimlibs.nix
index c1e22427ac7..736508eaf0f 100644
--- a/pkgs/desktops/kde-4.7/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.7/kdepimlibs.nix
@@ -2,8 +2,10 @@
, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }:
kde {
- buildInputs = [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
- openldap cyrus_sasl akonadi prison ];
+ buildInputs =
+ [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
+ openldap cyrus_sasl akonadi prison
+ ];
propagatedBuildInputs = [ kdelibs ];
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
index ec7f7a61ed5..db0bd27094b 100644
--- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
+++ b/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, subversion, apr, aprutil }:
+{ kde, kdelibs, subversionClient, apr, aprutil }:
kde {
- buildInputs = [ kdelibs subversion apr aprutil ];
+ buildInputs = [ kdelibs subversionClient apr aprutil ];
patches = [ ./find-svn.patch ];
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
index 70311a789f9..fef516e478d 100644
--- a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
+++ b/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libXtst }:
+{ kde, kdelibs, kde_workspace, libXtst }:
kde {
- buildInputs = [ kdelibs libXtst ];
+ buildInputs = [ kdelibs kde_workspace libXtst ];
meta = {
description = "KDE remote control";
diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
new file mode 100644
index 00000000000..f4ecf8656cf
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
@@ -0,0 +1,262 @@
+[
+{
+ lang = "ar";
+ saneName = "ar";
+ sha256 = "03sl2d83hyl138kl7424nxi546v1x1yp5ywqknk194532gf7isf2";
+}
+{
+ lang = "bg";
+ saneName = "bg";
+ sha256 = "0dal1sdvr28d0w9izl6chzybp1xgnvl20yn59yszl9zfwxzm5z45";
+}
+{
+ lang = "bs";
+ saneName = "bs";
+ sha256 = "17galw35j93jsmdpihr2x1jrpz8phyrrw403q77xb7csdc89mg41";
+}
+{
+ lang = "ca";
+ saneName = "ca";
+ sha256 = "07llq52f0hxz39h2amq1an788m6bijijifk9hilbkiixs1bpcycp";
+}
+{
+ lang = "ca@valencia";
+ saneName = "ca_valencia";
+ sha256 = "0f07p6nz0gryjihz35ga4hn7gj32is978ns74mxkgql3cqkmzpp8";
+}
+{
+ lang = "cs";
+ saneName = "cs";
+ sha256 = "0lcmp4lrlzjx8003fdpgsz5xi33ldj5sxkim90y76866kwgfd8a0";
+}
+{
+ lang = "da";
+ saneName = "da";
+ sha256 = "10ja0jg6fqq0a9nx2lcljp4fmrvn8yicv75wchfmz6ydrylfmlmc";
+}
+{
+ lang = "de";
+ saneName = "de";
+ sha256 = "10xbbjq08r47pcxg6j8k3yyvfjf6fvk16f3njriclsrxg5kgjcb1";
+}
+{
+ lang = "el";
+ saneName = "el";
+ sha256 = "0w6fkkmqqx73mf3piwqfk98xyk8izvrxkhw653npm30j2x5l1ccf";
+}
+{
+ lang = "en_GB";
+ saneName = "en_GB";
+ sha256 = "1xpsly96d68kzswscfz7fj4xzk3z92ddlzs06jl5ga3vi5v08br9";
+}
+{
+ lang = "es";
+ saneName = "es";
+ sha256 = "12wpzdqx5ckkr3x7wsbyb6ljixm66cxsxw5vpxf987hm9pblip9c";
+}
+{
+ lang = "et";
+ saneName = "et";
+ sha256 = "11s8wlv3qpnd9hf39z53nan6ljxdvh17knaz1jl7a04f0dczc1hj";
+}
+{
+ lang = "eu";
+ saneName = "eu";
+ sha256 = "0a491igqcz1gb7218m9wflvrlyj0h95xlmsn70pb1jv0kvmpib7w";
+}
+{
+ lang = "fi";
+ saneName = "fi";
+ sha256 = "0c5fji14j8h7zpj5941wrl6nar76ll5ry2yhcdq82ciphc74421q";
+}
+{
+ lang = "fr";
+ saneName = "fr";
+ sha256 = "1bgmlj7s7rdzva5i3kdi0hf16kh929a9qmhg745ivbfl89slbi6c";
+}
+{
+ lang = "ga";
+ saneName = "ga";
+ sha256 = "1fail3mpmsb0zvskwrxzjx0bvsbf28rv5qjzh061w1a9jqd0ggn3";
+}
+{
+ lang = "gl";
+ saneName = "gl";
+ sha256 = "0hx6y2xzgvnhcvmdf7qh1bk1jk87srmxpi1m4blwqara189bmqz7";
+}
+{
+ lang = "he";
+ saneName = "he";
+ sha256 = "1fjdjaqplqs9jk0np4fj8sm9jds8i9hxxf64cqj0is6wcf7lf9bc";
+}
+{
+ lang = "hr";
+ saneName = "hr";
+ sha256 = "1j56aj0bhpgfzlxcav3rwzahxm6q00hpdg6jmgq0m02d45kvn8z5";
+}
+{
+ lang = "hu";
+ saneName = "hu";
+ sha256 = "1syxpqk37jwippx7p273f4h6n14jhbv22wmq8la48jsqdkgrrgjg";
+}
+{
+ lang = "ia";
+ saneName = "ia";
+ sha256 = "1jazhp4n5ymz5gbxc3g3c9jvd7k1fs2b1w09vhnbgwa6i3gpa1i8";
+}
+{
+ lang = "id";
+ saneName = "id";
+ sha256 = "1g85002i29g6qzmjrwng4pndrkxnkg1ph1qvkkrnkkpygbw3whvm";
+}
+{
+ lang = "is";
+ saneName = "is";
+ sha256 = "11aavg4gw7xcdaq72ygynm2zbjcmal0baaw6sk1gy597620hfm5g";
+}
+{
+ lang = "it";
+ saneName = "it";
+ sha256 = "1395nskpbg8ah2q18ahsfv39ixhw74gb5cxr2irsfkgnwbmglas1";
+}
+{
+ lang = "ja";
+ saneName = "ja";
+ sha256 = "0jrnbd8j6qcfhxvfs014qq0dbdbp6632bk2210xg07sfmrz43csm";
+}
+{
+ lang = "kk";
+ saneName = "kk";
+ sha256 = "0rxvj142rw40d93ygfysavpw4jbyn8yx6c828sv5lp8c2r4kid5a";
+}
+{
+ lang = "km";
+ saneName = "km";
+ sha256 = "12x5dnk33khmfnf9fk5qq3par1l21xfy24lq4a6jdf8ya9nj62r5";
+}
+{
+ lang = "kn";
+ saneName = "kn";
+ sha256 = "0c4cp019ij80fc188dzkv5nbxplxhnhqc3b2qda9xr1j78vbbh46";
+}
+{
+ lang = "ko";
+ saneName = "ko";
+ sha256 = "0lhnvy370fk21z1r1wdq484pdjq6c0jsj3s2z58z4x7rfw2lq487";
+}
+{
+ lang = "lt";
+ saneName = "lt";
+ sha256 = "1blcg57vm05sbvcgslr49k84whm3f99mcd15zb8fxvvrybg0hr2m";
+}
+{
+ lang = "lv";
+ saneName = "lv";
+ sha256 = "0jc2vv97jwbbr966spzv10aimb9c42x5ia1rnr2kvs1hb8sxwvp1";
+}
+{
+ lang = "nb";
+ saneName = "nb";
+ sha256 = "04362qr5p3dhscrppcbg9cj28idrs0hslc2lk98drpq2rkc8rjmb";
+}
+{
+ lang = "nds";
+ saneName = "nds";
+ sha256 = "1ci4xh56w6rn68sl5xk23l1rxxfz7ni7y4z2sc5yidwi1acxfwpm";
+}
+{
+ lang = "nl";
+ saneName = "nl";
+ sha256 = "197jdabjxk61n5b69sw9jqcpp7561hq3dw086z2pymqll5irjf7f";
+}
+{
+ lang = "nn";
+ saneName = "nn";
+ sha256 = "1cd0ifr6p9m8h665grwy8nk3gw72w9h5a8bygf5nj55164qmff98";
+}
+{
+ lang = "pa";
+ saneName = "pa";
+ sha256 = "1scn7nkl521v1f1y0km3s57s02xfblblg2f572s9yz5j2da9p2j0";
+}
+{
+ lang = "pl";
+ saneName = "pl";
+ sha256 = "1qn6lakcfah85ws9njz2xp36xj2n3ld3mhqkvcb6mddv943x65vj";
+}
+{
+ lang = "pt";
+ saneName = "pt";
+ sha256 = "0pw2zvma1jczkp0ypshxyl4dcnx6jakms91i2pwyswa8jv3mfx3b";
+}
+{
+ lang = "pt_BR";
+ saneName = "pt_BR";
+ sha256 = "1n9m7wj5gd3kwf6smbx53l3jbjyvd26ginw007bnv6x14g2y7k19";
+}
+{
+ lang = "ro";
+ saneName = "ro";
+ sha256 = "155l1szxvjcgmw44097q8dvgd9ljgs2y3dn8mpi3y6cqj5kdb42s";
+}
+{
+ lang = "ru";
+ saneName = "ru";
+ sha256 = "166ck2pvhdrpyf269fmkqkqs3l6s4cc8f2p3w88f5z75qg9xc3bj";
+}
+{
+ lang = "sk";
+ saneName = "sk";
+ sha256 = "18bidvnhg2gqnjgr6np1gm2irn81b108kx7ri11gwppqh3h90340";
+}
+{
+ lang = "sl";
+ saneName = "sl";
+ sha256 = "0c2av80r3zc1jkybj3yp5hspv5rwlyda039jy11y49d6zwval097";
+}
+{
+ lang = "sr";
+ saneName = "sr";
+ sha256 = "0dffkmsd9l30c17fi5x6m6lx5hi5diqqxmmn36a9wb393mw8srm9";
+}
+{
+ lang = "sv";
+ saneName = "sv";
+ sha256 = "10rrlrwarh8sks2wym2kq3rk69kgzqk38ll93i0i0zhjgyqiahrg";
+}
+{
+ lang = "th";
+ saneName = "th";
+ sha256 = "1sqyw6zd3vnpkvb7iisqhnk7vjp3212h97yqgmlsxfry2rys1kmr";
+}
+{
+ lang = "tr";
+ saneName = "tr";
+ sha256 = "0vzr81c004zwxqhfwhpfs4g1w5dvbxzb9y3g3vsagnsc94i5fb9y";
+}
+{
+ lang = "ug";
+ saneName = "ug";
+ sha256 = "0p0ln8dcpq2hbqz651lb7izb82dqhh5pl3a931yzd99a6lr3kd39";
+}
+{
+ lang = "uk";
+ saneName = "uk";
+ sha256 = "0b6q2s1qigzchqs9dmzm31jrnhz3vfsix4zbmzs0wdib05qy6y1f";
+}
+{
+ lang = "wa";
+ saneName = "wa";
+ sha256 = "01hi12hanz44lbn52dcll2glcljax1mv3n5qc8w9gf4cqjjrs2ia";
+}
+{
+ lang = "zh_CN";
+ saneName = "zh_CN";
+ sha256 = "0iwszbl2myh9ik3yk19nyrj43rcki23amp5i2sx7lz9gy14lvgl8";
+}
+{
+ lang = "zh_TW";
+ saneName = "zh_TW";
+ sha256 = "1j1kvyc82ysin4ksp63gzczg4ihvn4qlfjd5l16qi0galp96mz21";
+}
+]
diff --git a/pkgs/desktops/kde-4.7/oxygen-icons.nix b/pkgs/desktops/kde-4.7/oxygen-icons.nix
index b8e272c20a2..655aadda48e 100644
--- a/pkgs/desktops/kde-4.7/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.7/oxygen-icons.nix
@@ -3,7 +3,7 @@
kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "7d7f352f574f5747f16ac517cbe19d0b011adb74e7a0b791705afb3addac1e96";
+ outputHash = "87010a208f6860429d78c0d518a4f70c450b9c199900076d0aa232de8ae6452e";
buildNativeInputs = [ cmake ];
diff --git a/pkgs/desktops/kde-4.7/support/soprano/default.nix b/pkgs/desktops/kde-4.7/support/soprano/default.nix
index 8d07f352d17..9dc6d1d1de6 100644
--- a/pkgs/desktops/kde-4.7/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }:
stdenv.mkDerivation rec {
name = "soprano-2.7.0";
@@ -8,8 +8,17 @@ stdenv.mkDerivation rec {
sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
};
+ patches =
+ [ (fetchurl {
+ url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
+ name = "soprano-virtuoso-restart.patch";
+ sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
+ })
+ ./find-virtuoso.patch
+ ];
+
# We disable the Java backend, since we do not need them and they make the closure size much bigger
- buildInputs = [ cmake qt4 clucene_core redland libiodbc ];
+ buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ];
meta = {
homepage = http://soprano.sourceforge.net/;
diff --git a/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch b/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch
new file mode 100644
index 00000000000..649f22a3b74
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch
@@ -0,0 +1,77 @@
+From: Yury G. Kudryashov
+Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH
+
+---
+ backends/virtuoso/virtuosobackend.cpp | 29 ++++++++++++++++++++---------
+ backends/virtuoso/virtuosobackend.h | 2 +-
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp
+index c83605d..c24854e 100644
+--- a/backends/virtuoso/virtuosobackend.cpp
++++ b/backends/virtuoso/virtuosobackend.cpp
+@@ -188,19 +188,19 @@ namespace {
+
+ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
+ {
+-#ifndef Q_OS_WIN
+- if ( findVirtuosoDriver().isEmpty() ) {
+- qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver";
+- return false;
+- }
+-#endif
+-
+ QString virtuosoBin = VirtuosoController::locateVirtuosoBinary();
+ if ( virtuosoBin.isEmpty() ) {
+ qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary";
+ return false;
+ }
+
++#ifndef Q_OS_WIN
++ if ( findVirtuosoDriver(virtuosoBin).isEmpty() ) {
++ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver";
++ return false;
++ }
++#endif
++
+ QString vs = determineVirtuosoVersion( virtuosoBin );
+ if ( vs.isEmpty() ) {
+ qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin;
+@@ -217,9 +217,20 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
+
+
+ #ifndef Q_OS_WIN
+-QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const
++QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) const
+ {
+- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) );
++ QString virtuosoBin;
++ if (virtuosoBinHint.isEmpty())
++ virtuosoBin = VirtuosoController::locateVirtuosoBinary();
++ else
++ virtuosoBin = virtuosoBinHint;
++
++ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir();
++ return Soprano::findLibraryPath( "virtodbc_r",
++ QStringList() << virtuosoBinDir.absolutePath()
++ << virtuosoBinDir.absoluteFilePath("../lib"),
++ QStringList() << QLatin1String( "virtuoso/plugins/" ) <<
++ QLatin1String( "odbc/" ) );
+ }
+ #endif
+
+diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h
+index 3971b83..0807e5d 100644
+--- a/backends/virtuoso/virtuosobackend.h
++++ b/backends/virtuoso/virtuosobackend.h
+@@ -50,7 +50,7 @@ namespace Soprano {
+
+ #ifndef Q_OS_WIN
+ private:
+- QString findVirtuosoDriver() const;
++ QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()) const;
+ #endif
+ };
+ }
+--
+tg: (432b73f..) t/find-virtuoso (depends on: master)
diff --git a/pkgs/desktops/xfce-4.8/applications/mousepad.nix b/pkgs/desktops/xfce-4.8/applications/mousepad.nix
index 920151282a8..ab4bea16f1c 100644
--- a/pkgs/desktops/xfce-4.8/applications/mousepad.nix
+++ b/pkgs/desktops/xfce-4.8/applications/mousepad.nix
@@ -14,5 +14,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/projects/mousepad/;
description = "A simple text editor for Xfce";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/applications/ristretto.nix b/pkgs/desktops/xfce-4.8/applications/ristretto.nix
index 50a67d95ee9..cbb22e12ea7 100644
--- a/pkgs/desktops/xfce-4.8/applications/ristretto.nix
+++ b/pkgs/desktops/xfce-4.8/applications/ristretto.nix
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://goodies.xfce.org/projects/applications/ristretto;
description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/applications/terminal.nix b/pkgs/desktops/xfce-4.8/applications/terminal.nix
index cacb775f8f1..44aa72d9d8c 100644
--- a/pkgs/desktops/xfce-4.8/applications/terminal.nix
+++ b/pkgs/desktops/xfce-4.8/applications/terminal.nix
@@ -19,5 +19,7 @@ stdenv.mkDerivation {
homepage = http://www.xfce.org/projects/terminal;
description = "A modern terminal emulator primarily for the Xfce desktop environment";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
index d34a5afb36f..bb50a0610f6 100644
--- a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
@@ -34,5 +34,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/projects/xfce4-mixer;
description = "A volume control application for the Xfce desktop environment";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
index b683ef71a0a..bad3b52a6bb 100644
--- a/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
@@ -18,5 +18,7 @@ stdenv.mkDerivation rec {
homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
description = "A power manager for the Xfce Desktop Environment";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
index a17267a336c..d69a517b203 100644
--- a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
+++ b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
@@ -13,5 +13,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.xfce.org/;
description = "Icons for Xfce";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
index 7cca247ae44..4518897cc2f 100644
--- a/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
@@ -15,5 +15,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "GTK+ theme engine for Xfce";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/core/thunar-volman.nix b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
new file mode 100644
index 00000000000..490390d1bac
--- /dev/null
+++ b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
+, xfconf, udev, libnotify }:
+
+stdenv.mkDerivation rec {
+ name = "thunar-volman-0.6.0";
+
+ src = fetchurl {
+ url = "http://archive.xfce.org/src/xfce/thunar-volman/0.6/${name}.tar.bz2";
+ sha1 = "dcda936948623b342b290a78c294f71c038e832e";
+ };
+
+ buildInputs =
+ [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util
+ xfconf libnotify
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ homepage = http://thunar.xfce.org/;
+ description = "Thunar extension for automatic management of removable drives and media";
+ license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ };
+}
diff --git a/pkgs/desktops/xfce-4.8/core/thunar.nix b/pkgs/desktops/xfce-4.8/core/thunar.nix
index c9ab76f2920..0e8f72e22d6 100644
--- a/pkgs/desktops/xfce-4.8/core/thunar.nix
+++ b/pkgs/desktops/xfce-4.8/core/thunar.nix
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://thunar.xfce.org/;
description = "Xfce file manager";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
index 58ef4fbef2a..eb998c2759f 100644
--- a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
@@ -16,5 +16,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Utilities and scripts for Xfce";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
index 0752d18d7f2..fc297df9cbf 100644
--- a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Xfce panel";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
index c6f6234f473..7aeaedb1e2a 100644
--- a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
@@ -18,5 +18,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Session manager for Xfce";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
index 3515d2553c5..03d2ac67a39 100644
--- a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Settings manager for Xfce";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
index 3742686d2e3..5f64fff3b4d 100644
--- a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Xfce desktop manager";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/core/xfwm4.nix b/pkgs/desktops/xfce-4.8/core/xfwm4.nix
index 7dc3c653909..aefae75a3c3 100644
--- a/pkgs/desktops/xfce-4.8/core/xfwm4.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfwm4.nix
@@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Window manager for Xfce";
license = "GPLv2+";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix
index 57098b12e3e..056bc4368c6 100644
--- a/pkgs/desktops/xfce-4.8/default.nix
+++ b/pkgs/desktops/xfce-4.8/default.nix
@@ -3,6 +3,16 @@
rec {
inherit (pkgs.gtkLibs) gtk glib;
+ #### SUPPORT
+
+ libgdu = callPackage ./support/libgdu.nix { };
+
+ # Gvfs is required by Thunar for the trash feature and for volume
+ # mounting. Should use the one from Gnome, but I don't want to mess
+ # with the Gnome packages (or pull in a zillion Gnome dependencies).
+ gvfs = callPackage ./support/gvfs.nix { };
+
+
#### CORE
libxfce4util = callPackage ./core/libxfce4util.nix { };
@@ -43,10 +53,13 @@ rec {
thunar = callPackage ./core/thunar.nix { };
+ thunar_volman = callPackage ./core/thunar-volman.nix { };
+
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
# !!! Add xfce4-appfinder
+
#### APPLICATIONS
terminal = callPackage ./applications/terminal.nix {
@@ -61,6 +74,7 @@ rec {
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
+
#### ART
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix
new file mode 100644
index 00000000000..6e50e6825dd
--- /dev/null
+++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }:
+
+stdenv.mkDerivation rec {
+ name = "gvfs-1.8.2";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gvfs/1.8/${name}.tar.bz2";
+ sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
+ };
+
+ buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ];
+
+ meta = {
+ description = "Virtual Filesystem support library (for Xfce)";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ };
+}
diff --git a/pkgs/desktops/xfce-4.8/support/libgdu-only.patch b/pkgs/desktops/xfce-4.8/support/libgdu-only.patch
new file mode 100644
index 00000000000..c5873c71681
--- /dev/null
+++ b/pkgs/desktops/xfce-4.8/support/libgdu-only.patch
@@ -0,0 +1,144 @@
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac gnome-disk-utility-2.30.1/configure.ac
+--- gnome-disk-utility-2.30.1-orig/configure.ac 2010-03-22 16:54:09.000000000 +0100
++++ gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.000000000 +0200
+@@ -106,17 +106,6 @@
+ # GNOME
+ # *****
+
+-GNOME_COMMON_INIT
+-GNOME_DOC_INIT
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+-AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc],
+- [use gtk-doc to build documentation [default=yes]]),,
+- enable_gtk_doc=yes)
+-GTK_DOC_CHECK([1.3])
+-
+ # ***************************
+ # Check for required packages
+ # ***************************
+@@ -130,7 +119,6 @@
+ UNIQUE_REQUIRED=1.0
+ LIBNOTIFY_REQUIRED=0.3.0
+ NAUTILUS_REQUIRED=2.24.0
+-AVAHI_UI_REQUIRED=0.6.25
+
+ UDISKS_REQUIRED=1.0.0
+ UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0
+@@ -144,13 +132,7 @@
+ PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED])
+ PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED])
+ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
+-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED])
+-PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED])
+-PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
+ PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
+-PKG_CHECK_MODULES(X11, [x11])
+-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
+-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED])
+
+ # *************
+ # Remote Access
+@@ -183,21 +165,10 @@
+ AC_SUBST(GNOME_KEYRING_CFLAGS)
+ AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"])
+
+-# *************
+-# Documentation
+-# *************
+-
+-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package)
+-fi
+-
+ # ********************
+ # Internationalization
+ # ********************
+
+-IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED])
+-
+ GETTEXT_PACKAGE=gnome-disk-utility
+ AC_SUBST([GETTEXT_PACKAGE])
+ AM_GLIB_GNU_GETTEXT
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am gnome-disk-utility-2.30.1/doc/Makefile.am
+--- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02 20:52:38.000000000 +0100
++++ gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.000000000 +0200
+@@ -70,9 +70,7 @@
+ Makefile.in \
+ $(NULL)
+
+-include $(top_srcdir)/gtk-doc.make
+-
+-CLEANFILES += *~ \
++CLEANFILES = *~ \
+ gnome-disk-utility-scan* \
+ gnome-disk-utility.args \
+ gnome-disk-utility.hierarchy \
+@@ -91,4 +89,4 @@
+ $(NULL)
+
+ # Version information for marking the documentation
+-EXTRA_DIST += version.xml.in
++EXTRA_DIST = version.xml.in
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/gtk-doc.make gnome-disk-utility-2.30.1/gtk-doc.make
+--- gnome-disk-utility-2.30.1-orig/gtk-doc.make 2010-03-16 00:08:20.000000000 +0100
++++ gnome-disk-utility-2.30.1/gtk-doc.make 2011-09-06 02:15:33.000000000 +0200
+@@ -4,15 +4,9 @@
+ # Everything below here is generic #
+ ####################################
+
+-if GTK_DOC_USE_LIBTOOL
+-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+-GTKDOC_RUN = $(LIBTOOL) --mode=execute
+-else
+ GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ GTKDOC_RUN =
+-endif
+
+ # We set GPATH here; this gives us semantics for GNU make
+ # which are more like other make's VPATH, when it comes to
+@@ -49,22 +43,7 @@
+
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+-if ENABLE_GTK_DOC
+-if GTK_DOC_BUILD_HTML
+-HTML_BUILD_STAMP=html-build.stamp
+-else
+-HTML_BUILD_STAMP=
+-endif
+-if GTK_DOC_BUILD_PDF
+-PDF_BUILD_STAMP=pdf-build.stamp
+-else
+-PDF_BUILD_STAMP=
+-endif
+-
+-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+-else
+ all-local:
+-endif
+
+ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/help/Makefile.am gnome-disk-utility-2.30.1/help/Makefile.am
+--- gnome-disk-utility-2.30.1-orig/help/Makefile.am 2009-09-23 20:35:01.000000000 +0200
++++ gnome-disk-utility-2.30.1/help/Makefile.am 2011-09-06 02:18:13.000000000 +0200
+@@ -1,4 +1,3 @@
+-include $(top_srcdir)/gnome-doc-utils.make
+ dist-hook: doc-dist-hook
+
+ DOC_MODULE = palimpsest
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/Makefile.am gnome-disk-utility-2.30.1/Makefile.am
+--- gnome-disk-utility-2.30.1-orig/Makefile.am 2010-03-16 00:12:39.000000000 +0100
++++ gnome-disk-utility-2.30.1/Makefile.am 2011-09-06 02:17:34.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = src data doc help po
++SUBDIRS = src data
+
+ EXTRA_DIST = \
+ autogen.sh \
diff --git a/pkgs/desktops/xfce-4.8/support/libgdu.nix b/pkgs/desktops/xfce-4.8/support/libgdu.nix
new file mode 100644
index 00000000000..32835f0434a
--- /dev/null
+++ b/pkgs/desktops/xfce-4.8/support/libgdu.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, gnome, pkgconfig, glib, dbus_glib, intltool, udev, gtk
+, libnotify, udisks, libatasmart, avahi
+, autoconf, automake, libtool }:
+
+let version = "2.30.1"; in
+
+stdenv.mkDerivation rec {
+ name = "libgdu-${version}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gnome-disk-utility/2.30/gnome-disk-utility-${version}.tar.bz2";
+ sha256 = "df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7";
+ };
+
+ # Only build libgdu, not all that Gnome crap.
+ patches = [ ./libgdu-only.patch ];
+
+ buildInputs =
+ [ pkgconfig glib dbus_glib udisks
+ autoconf automake libtool
+ ];
+
+ preConfigure =
+ ''
+ substituteInPlace src/gdu/Makefile.am --replace /usr/share/dbus-1/interfaces ${udisks}/share/dbus-1/interfaces
+ autoreconf -f -i
+ '';
+
+ postConfigure = "cd src/gdu";
+
+ meta = {
+ description = "Xfce/Gvfs support library for mounting filesystems";
+ };
+}
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
index 779aa48c2d0..190da872278 100644
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "flex sdk flash / action script developement kit";
+ description = "Flex SDK for Adobe Flash / ActionScript";
homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation";
license = "MPLv1.1"; # Mozilla Public License Version 1.1
};
diff --git a/pkgs/development/compilers/ehc/default.nix b/pkgs/development/compilers/ehc/default.nix
index cc2a6f9685c..27a0c431f67 100644
--- a/pkgs/development/compilers/ehc/default.nix
+++ b/pkgs/development/compilers/ehc/default.nix
@@ -1,25 +1,23 @@
-{stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib, uuagc, mtl, network, binary, llvm, fgl}:
+{ stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib
+, uuagc, mtl, network, binary, llvm, fgl, syb
+}:
-stdenv.mkDerivation (rec {
- revision = "1996";
+let
+ revision = "2293";
+in
+stdenv.mkDerivation {
name = "ehc-svn-${revision}";
- homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome/";
src = fetchsvn {
- url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC;
- rev = revision;
- sha256 = "92c658cd15dd513ccaeb81341f2680056276a46d053330f66c0214d10a6729e2";
+ url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC;
+ rev = revision;
+ sha256 = "f4c3d83734cffd64b11e31637598330271a2bb8d2573235d063b27b2ef5f76b6";
};
- propagatedBuildInputs = [mtl network binary fgl];
+ propagatedBuildInputs = [mtl network binary fgl syb];
buildInputs = [coreutils m4 ghc libtool uulib uuagc];
- # --force is required because the dependencies are not properly
- # detected by Nix, being located in several package config files
- configureFlags = [
- "--with-cabal-config-options=--ghc-pkg-options=--force"
- "--with-cpp-ehc-options=-I${glibc}/include"
- ];
+ configureFlags = "--with-cpp-ehc-options=-I${glibc}/include";
# EHC builds packages during compilation; these are by default
# installed in the user-specific package config file. We do not
@@ -34,8 +32,12 @@ stdenv.mkDerivation (rec {
'';
meta = {
+ homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome";
description = "Essential Haskell Compiler";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [
+ stdenv.lib.maintainers.andres
+ stdenv.lib.maintainers.simons
+ ];
};
-
- inherit coreutils;
-})
+}
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix
index 936710888ee..b4a53df9433 100644
--- a/pkgs/development/compilers/epic/default.nix
+++ b/pkgs/development/compilers/epic/default.nix
@@ -2,14 +2,13 @@
cabal.mkDerivation (self: {
pname = "epic";
- version = "0.1.11";
- sha256 = "12dz1wjaf3n8fqk46vhpnxq9z633wi6wyihcmif7amxmqv3l8zn9";
+ version = "0.1.13";
+ sha256 = "00rdprgndrvssrjlp6jh5jak2rxq6bcd2dknldx6i8h1cq6i69rb";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl ];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
- noHaddock = true;
meta = {
homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
description = "Compiler for a simple functional language";
diff --git a/pkgs/development/compilers/gcc-apple64/builder.sh b/pkgs/development/compilers/gcc-apple64/builder.sh
index ce0baa1597a..6072aef9d59 100644
--- a/pkgs/development/compilers/gcc-apple64/builder.sh
+++ b/pkgs/development/compilers/gcc-apple64/builder.sh
@@ -61,6 +61,9 @@ preConfigure() {
if test -n "$langF77"; then
langs="$langs,f95"
fi
+ if test -n "$langObjC"; then
+ langs="$langs,objc"
+ fi
# Perform the build in a different directory.
mkdir ../build
diff --git a/pkgs/development/compilers/gcc-apple64/default.nix b/pkgs/development/compilers/gcc-apple64/default.nix
index ec16fae7977..e2f70fbc1f5 100644
--- a/pkgs/development/compilers/gcc-apple64/default.nix
+++ b/pkgs/development/compilers/gcc-apple64/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, noSysDirs
-, langC ? true, langCC ? true, langF77 ? false
+, langC ? true, langCC ? true, langObjC ? true, langF77 ? false
, profiledCompiler ? false
, gmp ? null, mpfr ? null, bison ? null, flex ? null
}:
@@ -8,25 +8,31 @@ assert langC;
assert stdenv.isDarwin;
assert langF77 -> gmp != null;
+let
+ version = "4.2.1"; # Upstream GCC version, from `gcc/BASE-VER'.
+ revision = "5666.3"; # Apple's fork revision number.
+in
stdenv.mkDerivation ({
- name = "gcc-4.2.1-apple-5646";
+ name = "gcc-apple-${version}.${revision}";
+
builder = ./builder.sh;
- src =
+
+ src =
stdenv.lib.optional /*langC*/ true (fetchurl {
- url = http://www.opensource.apple.com/tarballs/gcc/gcc-5646.tar.gz;
- sha256 = "13jghyb098104kfym96iwwdvbj6snnws2c92h48lbd4fmyf1iv24";
+ url = "http://www.opensource.apple.com/tarballs/gcc/gcc-${revision}.tar.gz";
+ sha256 = "0nq1szgqx9ryh1qsn5n6yd55gpvf56wr8f7w1jzabb8idlvz8ikc";
}) ++
stdenv.lib.optional langCC (fetchurl {
url = http://www.opensource.apple.com/tarballs/libstdcxx/libstdcxx-39.tar.gz ;
- sha256 = "1fy6j41rhxdsm19sib9wygjl5l54g8pm13c6y5x13f40mavw1mma";
+ sha256 = "ccf4cf432c142778c766affbbf66b61001b6c4f1107bc2b2c77ce45598786b6d";
}) ;
enableParallelBuilding = true;
libstdcxx = "libstdcxx-39";
- sourceRoot = "gcc-5646/";
+ sourceRoot = "gcc-${revision}/";
patches =
[./pass-cxxcpp.patch ]
++ (if noSysDirs then [./no-sys-dirs.patch] else []);
- inherit noSysDirs langC langCC langF77 profiledCompiler;
+ inherit noSysDirs langC langCC langF77 langObjC profiledCompiler;
} // (if langF77 then {buildInputs = [gmp mpfr bison flex];} else {}))
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
new file mode 100644
index 00000000000..0baf9718f85
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -0,0 +1,97 @@
+{stdenv, fetchurl, perl, ncurses, gmp}:
+
+let
+ supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
+in
+
+assert stdenv.lib.elem stdenv.system supportedPlatforms;
+
+stdenv.mkDerivation rec {
+ version = "7.0.4";
+
+ name = "ghc-${version}-binary";
+
+ src =
+ if stdenv.system == "i686-linux" then
+ fetchurl {
+ url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2";
+ sha256 = "0mfnihiyjl06f5w1yrjp36sw9g67g2ymg5sdl0g23h1pab99jx63";
+ }
+ else if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";
+ sha256 = "0mc4rhqcxz427wq4zgffmnn0d2yjqvy6af4x9mha283p1gdj5q99";
+ }
+ else if stdenv.system == "i686-darwin" then
+ fetchurl {
+ url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2";
+ sha256 = "0qj45hslrrr8zfks8m1jcb3awwx9rh35ndnpfmb0gwb6j7azq5n3";
+ }
+ else if stdenv.system == "x86_64-darwin" then
+ fetchurl {
+ url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2";
+ sha256 = "1m2ml88p1swf4dnv2vq8hz4drcp46n3ahpfi05wh01ajkf8hnn3l";
+ }
+ else throw "cannot bootstrap GHC on this platform";
+
+ buildInputs = [perl];
+
+ postUnpack =
+ # Strip is harmful, see also below. It's important that this happens
+ # first. The GHC Cabal build system makes use of strip by default and
+ # has hardcoded paths to /usr/bin/strip in many places. We replace
+ # those below, making them point to our dummy script.
+ ''
+ mkdir "$TMP/bin"
+ for i in strip; do
+ echo '#!/bin/sh' >> "$TMP/bin/$i"
+ chmod +x "$TMP/bin/$i"
+ PATH="$TMP/bin:$PATH"
+ done
+ '' +
+ # We have to patch the GMP paths for the integer-gmp package.
+ ''
+ find . -name integer-gmp.buildinfo \
+ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \;
+ '' +
+ # On Linux, use patchelf to modify the executables so that they can
+ # find editline/gmp.
+ (if stdenv.isLinux then ''
+ find . -type f -perm +100 \
+ -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;
+ sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
+ sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
+ for prog in ld ar gcc strip ranlib; do
+ find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
+ done
+ '' else "");
+
+ configurePhase = ''
+ ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include
+ '';
+
+ # Stripping combined with patchelf breaks the executables (they die
+ # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
+ dontStrip = true;
+
+ # No building is necessary, but calling make without flags ironically
+ # calls install-strip ...
+ buildPhase = "true";
+
+ postInstall =
+ ''
+ # Sanity check, can ghc create executables?
+ cd $TMP
+ mkdir test-ghc; cd test-ghc
+ cat > main.hs << EOF
+ module Main where
+ main = putStrLn "yes"
+ EOF
+ $out/bin/ghc --make main.hs
+ echo compilation ok
+ [ $(./main) == "yes" ]
+ '';
+
+ meta.platforms = supportedPlatforms;
+}
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
index 6f7d802fa0b..7230b9069e7 100644
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ b/pkgs/development/compilers/ghc/7.0.4.nix
@@ -36,8 +36,9 @@ stdenv.mkDerivation rec {
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
+ stdenv.lib.maintainers.simons
];
- platforms = ghc.meta.platforms;
+ platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
};
}
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 98a01491237..8e60b4f2fc1 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
stdenv.mkDerivation rec {
- version = "7.3.20110804";
+ version = "7.3.20110910";
name = "ghc-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
- sha256 = "1n0prny5aaq09jp83skixla8frz5hcn8jbrc61m428q12jq1xsm7";
+ sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5";
};
buildInputs = [ghc perl gmp ncurses];
diff --git a/pkgs/development/compilers/helium/builder.sh b/pkgs/development/compilers/helium/builder.sh
deleted file mode 100644
index e740690d9a6..00000000000
--- a/pkgs/development/compilers/helium/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-buildinputs="$ghc"
-source $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd helium-* || exit 1
-cd lvm/src || exit 1
-./configure --prefix $out || exit 1
-cd ../../heliumNT || exit 1
-./configure --prefix=$out || exit 1
-cd src || exit 1
-make depend || exit 1
-make EXTRA_HC_OPTS=-O2 || exit 1
-make install
diff --git a/pkgs/development/compilers/helium/default.nix b/pkgs/development/compilers/helium/default.nix
deleted file mode 100644
index a2437d84535..00000000000
--- a/pkgs/development/compilers/helium/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, ghc}:
-
-assert ghc != null;
-
-stdenv.mkDerivation {
- name = "helium-1.5";
- builder = ./builder.sh;
- src = fetchurl {
- url = http://www.cs.uu.nl/helium/distr/helium-1.5-src.tar.gz;
- md5 = "b25fbee324a54059789eb1b4d62aa048";
- };
- inherit ghc;
-}
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index df56df5d5cf..0ea08071aaa 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
-e "s@/bin/ls@${coreutils}/bin/ls@" \
- openjdk/hotspot/make/linux/makefiles/sa.make
+ openjdk/hotspot/make/linux/makefiles/sa.make
sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 8d166584451..3c4723a88fb 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -1,9 +1,7 @@
{ stdenv, fetchurl, ghc, swiProlog, syb, mtl, makeWrapper, rlwrap, tk }:
-stdenv.mkDerivation rec {
- pname = "pakcs";
- version = "1.9.2";
- name = "${pname}-${version}";
+stdenv.mkDerivation {
+ name = "pakcs-1.9.2";
src = fetchurl {
url = "http://www.informatik.uni-kiel.de/~pakcs/download/pakcs_src.tar.gz";
@@ -44,7 +42,7 @@ stdenv.mkDerivation rec {
(cd $out/curry2prolog/ ; make)
ensureDir $out/share/emacs/site-lisp/curry-pakcs
- for e in $out/tools/emacs/*.el ; do
+ for e in "$out/tools/emacs/"*.el ; do
ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/;
done
@@ -60,7 +58,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "PAKCS is an implementation of the multi-paradigm declarative language Curry.";
+ description = "an implementation of the multi-paradigm declarative language Curry";
longDescription = ''
PAKCS is an implementation of the multi-paradigm declarative language
Curry jointly developed by the Portland State University, the Aachen
@@ -75,7 +73,7 @@ stdenv.mkDerivation rec {
homepage = http://www.informatik.uni-kiel.de/~pakcs/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.kkallio ];
+ maintainers = [ stdenv.lib.maintainers.kkallio stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix
index 5c10638805d..364fbd621d7 100644
--- a/pkgs/development/compilers/sbcl/src-for-default.nix
+++ b/pkgs/development/compilers/sbcl/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="1.0.50";
- name="sbcl-1.0.50";
- hash="1asbb43rmrp87ia2kq66ymdlgdx3jvihlz3dlgwhlz7syd9z3wc3";
- url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2";
- advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2";
+ version="1.0.51";
+ name="sbcl-1.0.51";
+ hash="0kh7c7pgiv0k0rsm1iysbcp0hf2148fhpixi4d8kclryzqpzl9yj";
+ url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2";
+ advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2";
}
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 49498c2fc81..de7456bbcf0 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib,
+{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib,
libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig,
fontconfig }:
-stdenv.mkDerivation rec {
- version = "5.10.2";
+let
+ version = "5.10.5";
+in
+stdenv.mkDerivation {
name = "swi-prolog-${version}";
src = fetchurl {
url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz";
- sha256 = "1a3ebbcd649f429a41b64561d38423692e00524c29227432d0eb5a0e24e2a4c9";
+ sha256 = "38d938d6a64e894685aa44bf9ea34b5505764cd084e07e6b4c21a9dd89b579d5";
};
- buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama
+ buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig];
configureFlags = "--with-world --enable-gmp --enable-shared";
makeFlags = "world";
@@ -24,5 +26,8 @@ stdenv.mkDerivation rec {
homepage = http://www.swi-prolog.org/;
description = "A Prolog compiler and interpreter";
license = "LGPL";
+
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 89501df648b..44067e4207d 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "urweb";
- version = "20110715";
+ version = "20110917";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.impredicative.com/ur/${name}.tgz";
- sha256 = "1qaz6alabhi7jmpsj7x0x4sskkjf05619maym133y2lkgdnvhydh";
+ sha256 = "1qgb25bwpdcs303q7yz1dm577xyy5pzzyvaqabhkvhbgxmlcpl73";
};
buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
preConfigure =
''
- export GCCARGS="-I$out/include \
+ export CCARGS="-I$out/include \
-L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
export PGHEADER="${postgresql}/include/libpq-fe.h";
diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix
new file mode 100644
index 00000000000..7b53ea9022d
--- /dev/null
+++ b/pkgs/development/interpreters/clojure/binary.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+ name = "clojure-binary-1.2.1";
+
+ src = fetchurl {
+ url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip;
+ sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1";
+ };
+
+ buildInputs = [ unzip ];
+
+ phases = "unpackPhase installPhase";
+
+ installPhase = "
+ ensureDir $out/lib/java
+ install -t $out/lib/java clojure.jar
+ ";
+
+ meta = {
+ description = "a Lisp dialect for the JVM";
+ homepage = http://clojure.org/;
+ license = stdenv.lib.licenses.bsd3;
+ longDescription = ''
+ Clojure is a dynamic programming language that targets the Java
+ Virtual Machine. It is designed to be a general-purpose language,
+ combining the approachability and interactive development of a
+ scripting language with an efficient and robust infrastructure for
+ multithreaded programming. Clojure is a compiled language - it
+ compiles directly to JVM bytecode, yet remains completely
+ dynamic. Every feature supported by Clojure is supported at
+ runtime. Clojure provides easy access to the Java frameworks, with
+ optional type hints and type inference, to ensure that calls to Java
+ can avoid reflection.
+
+ Clojure is a dialect of Lisp, and shares with Lisp the code-as-data
+ philosophy and a powerful macro system. Clojure is predominantly a
+ functional programming language, and features a rich set of immutable,
+ persistent data structures. When mutable state is needed, Clojure
+ offers a software transactional memory system and reactive Agent
+ system that ensure clean, correct, multithreaded designs.
+ '';
+ };
+}
diff --git a/pkgs/development/interpreters/clojure/clooj-wrapper.nix b/pkgs/development/interpreters/clojure/clooj-wrapper.nix
new file mode 100644
index 00000000000..fd95b86451f
--- /dev/null
+++ b/pkgs/development/interpreters/clojure/clooj-wrapper.nix
@@ -0,0 +1,11 @@
+{writeTextFile, jre, clooj}:
+
+writeTextFile {
+ name = "clooj-wrapper";
+ executable = true;
+ destination = "/bin/clooj";
+ text = ''
+ #!/bin/sh
+ exec ${jre}/bin/java -jar ${clooj}/lib/java/clooj.jar
+ '';
+}
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
new file mode 100644
index 00000000000..23bf9ad03b7
--- /dev/null
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl}:
+
+let
+ jar = fetchurl {
+ url = https://github.com/downloads/arthuredelstein/clooj/clooj-0.1.36-STANDALONE.jar;
+ sha256 = "173c66c0aade3ae5d21622f629e60efa51a03ad83c087b02c25e806c5b7f838c";
+ };
+in
+
+stdenv.mkDerivation {
+ name = "clooj-0.1.32";
+
+ phases = "installPhase";
+
+ installPhase = ''
+ ensureDir $out/lib/java
+ ln -s ${jar} $out/lib/java/clooj.jar
+ '';
+
+ meta = {
+ description = "clooj, a lightweight IDE for clojure";
+ homepage = https://github.com/arthuredelstein/clooj;
+ license = stdenv.lib.licenses.bsd3;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
new file mode 100644
index 00000000000..f829beda7ba
--- /dev/null
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, unzip, ant}:
+
+stdenv.mkDerivation {
+ name = "clojure-1.2.1";
+
+ src = fetchurl {
+ url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip;
+ sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1";
+ };
+
+ buildInputs = [ unzip ant ];
+
+ buildPhase = "ant";
+
+ installPhase = "
+ ensureDir $out/lib/java
+ install -t $out/lib/java clojure.jar
+ ";
+
+ meta = {
+ description = "a Lisp dialect for the JVM";
+ homepage = http://clojure.org/;
+ license = stdenv.lib.licenses.bsd3;
+ longDescription = ''
+ Clojure is a dynamic programming language that targets the Java
+ Virtual Machine. It is designed to be a general-purpose language,
+ combining the approachability and interactive development of a
+ scripting language with an efficient and robust infrastructure for
+ multithreaded programming. Clojure is a compiled language - it
+ compiles directly to JVM bytecode, yet remains completely
+ dynamic. Every feature supported by Clojure is supported at
+ runtime. Clojure provides easy access to the Java frameworks, with
+ optional type hints and type inference, to ensure that calls to Java
+ can avoid reflection.
+
+ Clojure is a dialect of Lisp, and shares with Lisp the code-as-data
+ philosophy and a powerful macro system. Clojure is predominantly a
+ functional programming language, and features a rich set of immutable,
+ persistent data structures. When mutable state is needed, Clojure
+ offers a software transactional memory system and reactive Agent
+ system that ensure clean, correct, multithreaded designs.
+ '';
+ };
+}
diff --git a/pkgs/development/interpreters/clojure/wrapper.nix b/pkgs/development/interpreters/clojure/wrapper.nix
new file mode 100644
index 00000000000..a2a9a404462
--- /dev/null
+++ b/pkgs/development/interpreters/clojure/wrapper.nix
@@ -0,0 +1,11 @@
+{writeTextFile, jre, clojure}:
+
+writeTextFile {
+ name = "clojure-wrapper";
+ executable = true;
+ destination = "/bin/clojure";
+ text = ''
+ #!/bin/sh
+ exec ${jre}/bin/java -cp ${clojure}/lib/java/clojure.jar clojure.main
+ '';
+}
\ No newline at end of file
diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix
new file mode 100644
index 00000000000..ee68f85725a
--- /dev/null
+++ b/pkgs/development/interpreters/love/default.nix
@@ -0,0 +1,58 @@
+x@{builderDefsPackage
+ , lua5, mpg123, physfs, freetype, libdevil, openal, SDL, libvorbis
+ , libogg, flac, mesa, libtiff, libpng, libjpeg, libmodplug
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ 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;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* 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"
+ '';
+
+ meta = {
+ 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
+
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 483a7e5fc00..1c8ae0cf171 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -30,6 +30,12 @@ let
./nix-store-mtime.patch
];
+ postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) ''
+ substituteInPlace ./Lib/plat-generic/regen \
+ --replace /usr/include/netinet/in.h \
+ ${stdenv.gcc.libc}/include/netinet/in.h
+ '';
+
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[ bzip2 ]
@@ -49,7 +55,7 @@ let
python = stdenv.mkDerivation {
name = "python-${version}";
- inherit majorVersion version src patches buildInputs;
+ inherit majorVersion version src patches postPatch buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
@@ -110,7 +116,7 @@ let
stdenv.mkDerivation rec {
name = "python-${moduleName}-${python.version}";
- inherit src patches;
+ inherit src patches postPatch;
buildInputs = [ python ] ++ deps;
diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
new file mode 100644
index 00000000000..d8b3558be4f
--- /dev/null
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -0,0 +1,53 @@
+x@{builderDefsPackage
+ , ncurses
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="Regina-REXX";
+ pname="regina-rexx";
+ version="3.5";
+ name="${baseName}-${version}";
+ url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
+ hash="0gh0k6lbhfixs44adha7lxirl3a08jabdylzr6m7mh5q5fhzv5f8";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ configureFlags = [
+ "--libdir=$out/lib"
+ ];
+
+ meta = {
+ description = "REXX interpreter";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.lgpl2;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";
+ };
+ };
+}) x
+
diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 7f6d51b2418..b6ec049f9f7 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -3,11 +3,244 @@
g: # Get dependencies from patched gems
{
aliases = {
+ actionmailer = g.actionmailer_3_1_0;
+ actionpack = g.actionpack_3_1_0;
+ activemodel = g.activemodel_3_1_0;
+ activerecord = g.activerecord_3_1_0;
+ activeresource = g.activeresource_3_1_0;
+ activesupport = g.activesupport_3_1_0;
+ arel = g.arel_2_2_1;
+ bcrypt_ruby = g.bcrypt_ruby_3_0_0;
+ builder = g.builder_3_0_0;
+ bundler = g.bundler_1_0_18;
+ erubis = g.erubis_2_7_0;
+ hike = g.hike_1_2_1;
+ i18n = g.i18n_0_6_0;
+ mail = g.mail_2_3_0;
+ mime_types = g.mime_types_1_16;
+ multi_json = g.multi_json_1_0_3;
nix = g.nix_0_1_1;
- rake = g.rake_0_8_7;
+ polyglot = g.polyglot_0_3_2;
+ rack = g.rack_1_3_2;
+ rack_cache = g.rack_cache_1_0_3;
+ rack_mount = g.rack_mount_0_8_3;
+ rack_ssl = g.rack_ssl_1_3_2;
+ rack_test = g.rack_test_0_6_1;
+ rails = g.rails_3_1_0;
+ railties = g.railties_3_1_0;
+ rake = g.rake_0_9_2;
+ rdoc = g.rdoc_3_9_4;
+ sprockets = g.sprockets_2_0_0;
+ thor = g.thor_0_14_6;
+ tilt = g.tilt_1_3_3;
+ treetop = g.treetop_1_4_10;
+ tzinfo = g.tzinfo_0_3_29;
};
- gem_nix_args = [ ''nix'' ''rake'' ];
+ gem_nix_args = [ ''nix'' ''rails'' ''rake'' ];
gems = {
+ actionmailer_3_1_0 = {
+ 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.1.0'';
+ requiredGems = [ g.mail_2_3_0 ];
+ sha256 = ''1730ky434qhbqnwnvbj9r57i4s6lcmwvnfhv6i91iif7anmjl22p'';
+ };
+ actionpack_3_1_0 = {
+ 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.1.0'';
+ requiredGems = [ g.activemodel_3_1_0 g.rack_cache_1_0_3 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_0 g.erubis_2_7_0 ];
+ sha256 = ''0igy1dp8zdh653v4wz7vxdjmz681k8653n0xan9ng1qgsk9b7wlh'';
+ };
+ activemodel_3_1_0 = {
+ 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.1.0'';
+ requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 g.bcrypt_ruby_3_0_0 ];
+ sha256 = ''1hpppp54v05ci4l7nx79i9lcnf6z00lhi5wpn8sgyr5869xihvq6'';
+ };
+ activerecord_3_1_0 = {
+ 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.1.0'';
+ requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_29 ];
+ sha256 = ''1dq5k2r6a85wmzgv5gv0rrxf43agzzcj6z4az6w034nxarv7ccml'';
+ };
+ activeresource_3_1_0 = {
+ 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.1.0'';
+ requiredGems = [ ];
+ sha256 = ''1vd4mmfxk1zmqxv44q0wxhg74yc7qah17im44qjv0b850522vavg'';
+ };
+ activesupport_3_1_0 = {
+ 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.1.0'';
+ requiredGems = [ g.multi_json_1_0_3 ];
+ sha256 = ''0hrnak4rpaxxb34918d9yjvcgz2jv7mnbsf3a7nz6dvqf6gw7110'';
+ };
+ arel_2_2_1 = {
+ basename = ''arel'';
+ meta = {
+ description = ''Arel is a SQL AST manager for Ruby'';
+ homepage = ''http://github.com/rails/arel'';
+ longDescription = ''Arel is a SQL AST manager for Ruby. It
+
+1. Simplifies the generation complex of SQL queries
+2. Adapts to various RDBMS systems
+
+It is intended to be a framework framework; that is, you can build your own ORM
+with it, focusing on innovative object and collection modeling as opposed to
+database compatibility and query generation.'';
+ };
+ name = ''arel-2.2.1'';
+ requiredGems = [ ];
+ sha256 = ''19pz68pr9l8h2j2v3vqzhjvs94s0hwqwpb6m9sd6ncj18gaci8jy'';
+ };
+ bcrypt_ruby_3_0_0 = {
+ basename = ''bcrypt_ruby'';
+ meta = {
+ description = ''OpenBSD's bcrypt() password hashing algorithm.'';
+ homepage = ''http://bcrypt-ruby.rubyforge.org'';
+ longDescription = '' bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project
+ for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling
+ passwords.
+'';
+ };
+ name = ''bcrypt-ruby-3.0.0'';
+ requiredGems = [ ];
+ sha256 = ''0chw0hh2vkb0nc4x1g350wzplf7kas6fddfa976c6gwvjgrbd7fw'';
+ };
+ builder_3_0_0 = {
+ basename = ''builder'';
+ meta = {
+ description = ''Builders for MarkUp.'';
+ homepage = ''http://onestepback.org'';
+ longDescription = ''Builder provides a number of builder objects that make creating structured data
+simple to do. Currently the following builder objects are supported:
+
+* XML Markup
+* XML Events
+'';
+ };
+ name = ''builder-3.0.0'';
+ requiredGems = [ ];
+ sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv'';
+ };
+ bundler_1_0_18 = {
+ basename = ''bundler'';
+ meta = {
+ description = ''The best way to manage your application's dependencies'';
+ homepage = ''http://gembundler.com'';
+ longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
+ };
+ name = ''bundler-1.0.18'';
+ requiredGems = [ ];
+ sha256 = ''0rz1qibmvydkfx0akq97rlihvf20jl51dxh8x0xivb1i0zkykb5b'';
+ };
+ erubis_2_7_0 = {
+ basename = ''erubis'';
+ meta = {
+ description = ''a fast and extensible eRuby implementation which supports multi-language'';
+ homepage = ''http://www.kuwata-lab.com/erubis/'';
+ longDescription = '' Erubis is an implementation of eRuby and has the following features:
+
+ * Very fast, almost three times faster than ERB and about 10% faster than eruby.
+ * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript)
+ * Auto escaping support
+ * Auto trimming spaces around '<% %>'
+ * Embedded pattern changeable (default '<% %>')
+ * Enable to handle Processing Instructions (PI) as embedded pattern (ex. '<?rb ... ?>')
+ * Context object available and easy to combine eRuby template with YAML datafile
+ * Print statement available
+ * Easy to extend and customize in subclass
+ * Ruby on Rails support
+'';
+ };
+ name = ''erubis-2.7.0'';
+ requiredGems = [ ];
+ sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
+ };
+ hike_1_2_1 = {
+ basename = ''hike'';
+ meta = {
+ description = ''Find files in a set of paths'';
+ homepage = ''http://github.com/sstephenson/hike'';
+ longDescription = ''A Ruby library for finding files in a set of paths.'';
+ };
+ name = ''hike-1.2.1'';
+ requiredGems = [ ];
+ sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b'';
+ };
+ i18n_0_6_0 = {
+ basename = ''i18n'';
+ meta = {
+ description = ''New wave Internationalization support for Ruby'';
+ homepage = ''http://github.com/svenfuchs/i18n'';
+ longDescription = ''New wave Internationalization support for Ruby.'';
+ };
+ name = ''i18n-0.6.0'';
+ requiredGems = [ ];
+ sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
+ };
+ mail_2_3_0 = {
+ basename = ''mail'';
+ meta = {
+ description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
+ homepage = ''http://github.com/mikel/mail'';
+ longDescription = ''A really Ruby Mail handler.'';
+ };
+ name = ''mail-2.3.0'';
+ requiredGems = [ g.mime_types_1_16 g.treetop_1_4_10 ];
+ sha256 = ''1cnid9wn5wy0d2shx4ykvgd5jrvgq55yal8i51b47d4037n1yr53'';
+ };
+ mime_types_1_16 = {
+ basename = ''mime_types'';
+ meta = {
+ description = ''Manages a MIME Content-Type database that will return the Content-Type for a given filename.'';
+ homepage = ''http://mime-types.rubyforge.org/'';
+ longDescription = ''MIME::Types for Ruby originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen.'';
+ };
+ name = ''mime-types-1.16'';
+ requiredGems = [ ];
+ sha256 = ''1slp7g2xv9ygcapqv13qgh3g6ipx5k5c3imb5sdyh0b9ip5s34y3'';
+ };
+ multi_json_1_0_3 = {
+ basename = ''multi_json'';
+ meta = {
+ description = ''A gem to provide swappable JSON backends.'';
+ homepage = ''http://github.com/intridea/multi_json'';
+ longDescription = ''A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.'';
+ };
+ name = ''multi_json-1.0.3'';
+ requiredGems = [ ];
+ sha256 = ''12c7h38x1cmgl265n4397zx3ag8szkrq1q4lw7pp6fkqd532n9xb'';
+ };
nix_0_1_1 = {
basename = ''nix'';
meta = {
@@ -19,16 +252,190 @@ g: # Get dependencies from patched gems
requiredGems = [ ];
sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
};
- rake_0_8_7 = {
+ polyglot_0_3_2 = {
+ basename = ''polyglot'';
+ meta = {
+ description = ''Augment 'require' to load non-Ruby file types'';
+ homepage = ''http://github.com/cjheath/polyglot'';
+ longDescription = ''
+The Polyglot library allows a Ruby module to register a loader
+for the file type associated with a filename extension, and it
+augments 'require' to find and load matching files.'';
+ };
+ name = ''polyglot-0.3.2'';
+ requiredGems = [ ];
+ sha256 = ''0m2ni5bcwfmhjwndhy115zgcvq0wdf3hk0hal1sfidfz9vbd0hyz'';
+ };
+ rack_1_3_2 = {
+ basename = ''rack'';
+ meta = {
+ description = ''a modular Ruby webserver interface'';
+ homepage = ''http://rack.rubyforge.org'';
+ longDescription = ''Rack provides minimal, modular and adaptable interface for developing
+web applications in Ruby. By wrapping HTTP requests and responses in
+the simplest way possible, it unifies and distills the API for web
+servers, web frameworks, and software in between (the so-called
+middleware) into a single method call.
+
+Also see http://rack.rubyforge.org.
+'';
+ };
+ name = ''rack-1.3.2'';
+ requiredGems = [ ];
+ sha256 = ''1qrs4ryj8a4c3f9raz8mvcl82dinzyiy7rcp7i3jd2xjra75dz7k'';
+ };
+ rack_cache_1_0_3 = {
+ basename = ''rack_cache'';
+ meta = {
+ description = ''HTTP Caching for Rack'';
+ homepage = ''http://tomayko.com/src/rack-cache/'';
+ longDescription = ''HTTP Caching for Rack'';
+ };
+ name = ''rack-cache-1.0.3'';
+ requiredGems = [ g.rack_1_3_2 ];
+ sha256 = ''188q2sf44380zqq8kpqb6d4gl7fh5bimkcn8khpri64n6lmqd42w'';
+ };
+ rack_mount_0_8_3 = {
+ basename = ''rack_mount'';
+ meta = {
+ description = ''Stackable dynamic tree based Rack router'';
+ homepage = ''https://github.com/josh/rack-mount'';
+ longDescription = '' A stackable dynamic tree based Rack router.
+'';
+ };
+ name = ''rack-mount-0.8.3'';
+ requiredGems = [ ];
+ sha256 = ''09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2'';
+ };
+ rack_ssl_1_3_2 = {
+ basename = ''rack_ssl'';
+ meta = {
+ description = ''Force SSL/TLS in your app.'';
+ homepage = ''https://github.com/josh/rack-ssl'';
+ longDescription = '' Rack middleware to force SSL/TLS.
+'';
+ };
+ name = ''rack-ssl-1.3.2'';
+ requiredGems = [ ];
+ sha256 = ''1h9pfn5c95qigkm1vb5nbla7fwjl86q887w57iiqp4kdvrjh9wrn'';
+ };
+ rack_test_0_6_1 = {
+ basename = ''rack_test'';
+ meta = {
+ description = ''Simple testing API built on Rack'';
+ homepage = ''http://github.com/brynary/rack-test'';
+ longDescription = ''Rack::Test is a small, simple testing API for Rack apps. It can be used on its
+own or as a reusable starting point for Web frameworks and testing libraries
+to build on. Most of its initial functionality is an extraction of Merb 1.0's
+request helpers feature.'';
+ };
+ name = ''rack-test-0.6.1'';
+ requiredGems = [ ];
+ sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0'';
+ };
+ rails_3_1_0 = {
+ 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.1.0'';
+ requiredGems = [ g.activesupport_3_1_0 g.actionpack_3_1_0 g.activerecord_3_1_0 g.activeresource_3_1_0 g.actionmailer_3_1_0 g.railties_3_1_0 g.bundler_1_0_18 ];
+ sha256 = ''1ki0jnq40kvfdp3kvnzvnrl9j09n9gql77pbl6jz565siqnvikms'';
+ };
+ railties_3_1_0 = {
+ 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.1.0'';
+ requiredGems = [ g.rake_0_9_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_9_4 ];
+ sha256 = ''155snh4hwflxqylyqlsyqpdm5f80qk2lqn9jhksx85m1sz99mxym'';
+ };
+ rake_0_9_2 = {
basename = ''rake'';
meta = {
description = ''Ruby based make-like utility.'';
homepage = ''http://rake.rubyforge.org'';
- longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.'';
+ longDescription = '' Rake is a Make-like program implemented in Ruby. Tasks
+ and dependencies are specified in standard Ruby syntax.
+'';
};
- name = ''rake-0.8.7'';
+ name = ''rake-0.9.2'';
requiredGems = [ ];
- sha256 = ''03z1zm7xwl2r9v945ambwbd9sn2smbi34xldmac7qjcmsvd7pcqh'';
+ sha256 = ''1348lm18j0rki4zjgb4rgplai32j0izkvbbi66lk7n0z89dm4ny5'';
+ };
+ rdoc_3_9_4 = {
+ basename = ''rdoc'';
+ meta = {
+ description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
+ homepage = ''http://docs.seattlerb.org/rdoc'';
+ longDescription = ''RDoc produces HTML and command-line documentation for Ruby projects. RDoc
+includes the +rdoc+ and +ri+ tools for generating and displaying online
+documentation.
+
+See RDoc for a description of RDoc's markup and basic use.'';
+ };
+ name = ''rdoc-3.9.4'';
+ requiredGems = [ ];
+ sha256 = ''0znp5xssql3pmk38s58b0dvvcv5d3r28gx6jrzyb9158jz98jmf5'';
+ };
+ sprockets_2_0_0 = {
+ basename = ''sprockets'';
+ meta = {
+ description = ''Rack-based asset packaging system'';
+ homepage = ''http://getsprockets.org/'';
+ longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
+ };
+ name = ''sprockets-2.0.0'';
+ requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ];
+ sha256 = ''1b3yih9mzpbn6w1kymwrcd606yw8nds5h3ig4ky5g65qwl7gk75c'';
+ };
+ thor_0_14_6 = {
+ basename = ''thor'';
+ meta = {
+ description = ''A scripting framework that replaces rake, sake and rubigen'';
+ homepage = ''http://github.com/wycats/thor'';
+ longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
+ };
+ name = ''thor-0.14.6'';
+ requiredGems = [ ];
+ sha256 = ''18qmgv38gfw9clhq6szyw5kcxkkk8xr7c0klp3pk3cyznzbapif7'';
+ };
+ tilt_1_3_3 = {
+ basename = ''tilt'';
+ meta = {
+ description = ''Generic interface to multiple Ruby template engines'';
+ homepage = ''http://github.com/rtomayko/tilt/'';
+ longDescription = ''Generic interface to multiple Ruby template engines'';
+ };
+ name = ''tilt-1.3.3'';
+ requiredGems = [ ];
+ sha256 = ''18qdl8nllbgwipa2ab9df3wlfgvsc8ml78hbypwc17b9qwv9bbs8'';
+ };
+ treetop_1_4_10 = {
+ basename = ''treetop'';
+ meta = {
+ description = ''A Ruby-based text parsing and interpretation DSL'';
+ homepage = ''http://functionalform.blogspot.com'';
+ };
+ name = ''treetop-1.4.10'';
+ requiredGems = [ g.polyglot_0_3_2 ];
+ sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2'';
+ };
+ tzinfo_0_3_29 = {
+ basename = ''tzinfo'';
+ meta = {
+ description = ''Daylight-savings aware timezone library'';
+ homepage = ''http://tzinfo.rubyforge.org/'';
+ longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
+ };
+ name = ''tzinfo-0.3.29'';
+ requiredGems = [ ];
+ sha256 = ''10504cr141vgg12nqbd920xj0q2b07gbjjdwdrwjj35pp97ymrij'';
};
};
}
diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix
index 82393fe95c7..d5ccb19caec 100644
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-19.nix
@@ -1,14 +1,52 @@
-{ ruby18, fetchurl }:
+{ stdenv, fetchurl
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? false
+, groff, docSupport ? false
+}:
-ruby18.override rec {
- version = "1.9.1-p243";
+let
+ op = stdenv.lib.optional;
+ ops = stdenv.lib.optionals;
+in
+
+stdenv.mkDerivation rec {
+ version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
+
name = "ruby-${version}";
+
src = fetchurl {
- url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-${version}.tar.gz";
- sha256 = "1r4bls76dg97lqgwkxi6kbxzirkvjm21d4i2qyz469lnncvqwn9i";
+ url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
+ sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
};
- passthru = {
- libPath = "lib/ruby-1.9";
+ # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+ NROFF = "${groff}/bin/nroff";
+
+ buildInputs = (ops cursesSupport [ ncurses readline ] )
+ ++ (op docSupport groff )
+ ++ (op zlibSupport zlib)
+ ++ (op opensslSupport openssl)
+ ++ (op gdbmSupport gdbm);
+
+ configureFlags = ["--enable-shared" "--enable-pthread"];
+
+ installFlags = stdenv.lib.optionalString docSupport "install-doc";
+ # Bundler tries to create this directory
+ postInstall = "mkdir -pv $out/${passthru.gemPath}";
+
+ meta = {
+ license = "Ruby";
+ homepage = "http://www.ruby-lang.org/en/";
+ description = "The Ruby language";
+ };
+
+ passthru = rec {
+ majorVersion = "1.9";
+ minorVersion = "2";
+ patchLevel = "290";
+ libPath = "lib/ruby/${majorVersion}";
+ gemPath = "lib/ruby/gems/${majorVersion}";
};
}
diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index bfea04d1aba..60e83332c08 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -4,10 +4,10 @@ rec {
# some packages (eg ruby-debug) still require 1.8. So let's stick to that for
# now if nobody has different requirements
- version = "1.4.1";
+ version = "1.8.10";
src = fetchurl {
url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
- sha256 = "189wg1msb4sdjvdzv9ia6q3lvjlygpp67wlbkl7cjb22bpjy4w4b";
+ sha256 = "0ll5swf4mi4nbgnr5jcyzmnlwb1zr2md9kvsgy3d1f485bb1n59q";
};
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index cbca42ef5df..38ac82537f7 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53";
};
- buildInputs = [SDL];
+ propagatedBuildInputs = [SDL];
postInstall = "ln -s $out/include/SDL/SDL_net.h $out/include/";
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 0d1ee3d838f..3bd1d82e0b5 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -103,6 +103,15 @@ in {
'';
};
+ pl = buildDict {
+ shortName = "pl-6.0_20061121";
+ fullName = "Polish";
+ src = fetchurl {
+ url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2;
+ sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1";
+ };
+ };
+
ru = buildDict {
shortName = "ru-0.99f7-1";
fullName = "Russian";
diff --git a/pkgs/development/libraries/atk/1.32.x.nix b/pkgs/development/libraries/atk/1.32.x.nix
index 99a02b22808..34fef9048f3 100644
--- a/pkgs/development/libraries/atk/1.32.x.nix
+++ b/pkgs/development/libraries/atk/1.32.x.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, perl, glib }:
+{ stdenv, fetchurl_gnome, pkgconfig, perl, glib }:
stdenv.mkDerivation rec {
- name = "atk-1.32.0";
+ name = src.pkgname;
- src = fetchurl {
- url = "mirror://gnome/sources/atk/1.32/${name}.tar.bz2";
- sha256 = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e";
+ src = fetchurl_gnome {
+ project = "atk";
+ major = "1"; minor = "32"; patchlevel = "0";
+ sha256 = "0vmikhrvh1pb31y1ik4n1a99xs7pv4nhb2sgj6pv2kawyycfb8z9";
};
- buildInputs = [ pkgconfig perl ];
+ buildNativeInputs = [ pkgconfig perl ];
+
propagatedBuildInputs = [ glib ];
postInstall = "rm -rf $out/share/gtk-doc";
diff --git a/pkgs/development/libraries/atk/1.30.x.nix b/pkgs/development/libraries/atk/2.1.x.nix
similarity index 59%
rename from pkgs/development/libraries/atk/1.30.x.nix
rename to pkgs/development/libraries/atk/2.1.x.nix
index 4f370fd7a2b..28619a85c03 100644
--- a/pkgs/development/libraries/atk/1.30.x.nix
+++ b/pkgs/development/libraries/atk/2.1.x.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, perl, glib }:
+{ stdenv, fetchurl_gnome, pkgconfig, perl, glib, xz }:
stdenv.mkDerivation rec {
- name = "atk-1.30.0";
+ name = src.pkgname;
- src = fetchurl {
- url = "mirror://gnome/sources/atk/1.30/${name}.tar.bz2";
- sha256 = "92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c";
+ src = fetchurl_gnome {
+ project = "atk";
+ major = "2"; minor = "1"; patchlevel = "5"; extension = "xz";
+ sha256 = "005b9sq8p9ykp4f35b59si3mcbw4p9hyxps1ij4x73p07rrbf0z9";
};
- buildInputs = [ pkgconfig perl ];
+ buildNativeInputs = [ pkgconfig perl xz ];
+
propagatedBuildInputs = [ glib ];
+ postInstall = "rm -rf $out/share/gtk-doc";
+
meta = {
description = "ATK, the accessibility toolkit";
@@ -26,7 +30,7 @@ stdenv.mkDerivation rec {
license = "LGPLv2+";
- maintainers = [stdenv.lib.maintainers.raskin];
+ maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix
new file mode 100644
index 00000000000..348edb22632
--- /dev/null
+++ b/pkgs/development/libraries/atkmm/2.22.x.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl_gnome, atk, glibmm, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = src.pkgname;
+
+ src = fetchurl_gnome {
+ project = "atkmm";
+ major = "2"; minor = "22"; patchlevel = "5";
+ sha256 = "0v5ynws5pc4qdgrr8hrl8wajl3xxh3kgljchj7cqyb4mcxg3xq31";
+ };
+
+ propagatedBuildInputs = [ atk glibmm ];
+
+ buildNativeInputs = [ pkgconfig ];
+}
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 709ea3583dc..7730e403d58 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,33 +1,32 @@
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
-, expat, gettext, intltool, glib, gtk, qt4 ? null, lib
+, expat, gettext, intltool, glib, qt4 ? null, lib
, qt4Support ? false
-, withLibdnsCompat ? false }:
+, withLibdnssdCompat ? false }:
assert qt4Support -> qt4 != null;
stdenv.mkDerivation rec {
- name = "avahi-0.6.28";
+ name = "avahi-0.6.30";
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
- sha256 = "14gw611d3srn2r18a6g4y04r571w3l4lihiiaffryar1i2n0mn50";
+ sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r";
};
patches = [ ./no-mkdir-localstatedir.patch ];
- buildInputs = [
- pkgconfig libdaemon dbus perl perlXMLParser glib expat
- gettext intltool
- ]
+ buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ]
++ (lib.optional qt4Support qt4);
+ buildNativeInputs = [ pkgconfig gettext intltool ];
+
configureFlags =
[ "--disable-qt3" "--disable-gdbm" "--disable-mono"
"--disable-gtk" "--disable-gtk3"
"--${if qt4Support then "enable" else "disable"}-qt4"
"--disable-python"
"--with-distro=none" "--localstatedir=/var"
- ] ++ stdenv.lib.optional withLibdnsCompat "--enable-compat-libdns_sd";
+ ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd";
meta = {
description = "Avahi, an mDNS/DNS-SD implementation";
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 1e478b1c68d..62e907264d5 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -2,6 +2,7 @@
, pdfSupport ? true
, pngSupport ? true
, xcbSupport ? false
+, gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
}:
@@ -19,8 +20,9 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++
- stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
+ [ pkgconfig x11 fontconfig pixman xlibs.libXrender ]
+ ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
+ ++ stdenv.lib.optional gobjectSupport glib;
propagatedBuildInputs =
[ freetype ] ++
diff --git a/pkgs/development/libraries/dbus-glib/0.94.nix b/pkgs/development/libraries/dbus-glib/0.94.nix
new file mode 100644
index 00000000000..83c1693d80f
--- /dev/null
+++ b/pkgs/development/libraries/dbus-glib/0.94.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
+
+stdenv.mkDerivation rec {
+ name = "dbus-glib-0.94";
+
+ src = fetchurl {
+ url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
+ sha256 = "16yk106bp58in6vz2li2s3iwk1si65f0n22m8c2mplzh2j9zlq74";
+ };
+
+ buildInputs = [ pkgconfig expat gettext ]
+ ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+
+ propagatedBuildInputs = [ dbus glib ];
+
+ passthru = { inherit dbus glib; };
+
+ meta = {
+ homepage = http://dbus.freedesktop.org;
+ license = "AFL-2.1 or GPL-2";
+ description = "GLib bindings for D-Bus lightweight IPC mechanism";
+ };
+}
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 4a2cd6f4cf9..467b9c4d506 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "dbus-glib-0.86";
-
+
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";
diff --git a/pkgs/development/libraries/dbus/1.5.6.nix b/pkgs/development/libraries/dbus/1.5.6.nix
new file mode 100644
index 00000000000..a5ba03159f1
--- /dev/null
+++ b/pkgs/development/libraries/dbus/1.5.6.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
+
+let
+ version = "1.5.6";
+
+ src = fetchurl {
+ url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
+ sha256 = "18g5328wnh25p0hihv5gg55q5l019zzwr04shvp67myvwy07m851";
+ };
+
+ patches = [ ./ignore-missing-includedirs.patch ];
+
+ configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
+
+in rec {
+
+ libs = stdenv.mkDerivation {
+ name = "dbus-library-" + version;
+
+ buildInputs = [ pkgconfig expat ];
+
+ inherit src patches configureFlags;
+
+ preConfigure =
+ ''
+ sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
+ sed -i '/SUBDIRS/s/ tools//' Makefile.in
+ '';
+
+ # Enable X11 autolaunch support in libdbus. This doesn't actually
+ # depend on X11 (it just execs dbus-launch in dbus.tools),
+ # contrary to what the configure script demands.
+ NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
+
+ installFlags = "sysconfdir=$(out)/etc";
+ };
+
+ tools = stdenv.mkDerivation {
+ name = "dbus-tools-" + version;
+
+ inherit src patches;
+
+ configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
+
+ buildInputs = [ pkgconfig expat libs ]
+ ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
+
+ NIX_LDFLAGS = "-ldbus-1";
+
+ preConfigure =
+ ''
+ sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
+ substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
+ '';
+
+ postConfigure = "cd tools";
+ };
+
+ # I'm too lazy to separate daemon and libs now.
+ daemon = libs;
+}
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 712ef36bdd7..1d0bcc11146 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -2,25 +2,25 @@
let
version = "1.4.14";
-
+
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7";
};
patches = [ ./ignore-missing-includedirs.patch ];
-
+
configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
-
+
in rec {
libs = stdenv.mkDerivation {
name = "dbus-library-" + version;
-
+
buildInputs = [ pkgconfig expat ];
-
+
inherit src patches configureFlags;
-
+
preConfigure =
''
sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
@@ -41,10 +41,10 @@ in rec {
inherit src patches;
configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
-
+
buildInputs = [ pkgconfig expat libs ]
++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
-
+
NIX_LDFLAGS = "-ldbus-1";
preConfigure =
@@ -58,8 +58,4 @@ in rec {
# I'm too lazy to separate daemon and libs now.
daemon = libs;
-
- # FIXME TODO
- # After merger it will be better to correct upstart-job instead.
- outPath = daemon.outPath;
}
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
deleted file mode 100644
index e8e82367cd7..00000000000
--- a/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs }:
-
-stdenv.mkDerivation rec {
- name = "gdk-pixbuf-2.22.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gdk-pixbuf/2.22/${name}.tar.bz2";
- sha256 = "6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d";
- };
-
- # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
- buildInputs = [ pkgconfig glib libtiff libjpeg libpng xlibs.xlibs ];
-
- postInstall = "rm -rf $out/share/gtk-doc";
-
- meta = {
- description = "A library for image loading and manipulation";
-
- homepage = http://library.gnome.org/devel/gdk-pixbuf/;
-
- maintainers = [ stdenv.lib.maintainers.eelco ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
new file mode 100644
index 00000000000..d6483ba36de
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl_gnome, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs
+, xz, jasper }:
+
+stdenv.mkDerivation rec {
+ name = src.pkgname;
+
+ src = fetchurl_gnome {
+ project = "gdk-pixbuf";
+ major = "2"; minor = "24"; patchlevel = "0"; extension = "xz";
+ sha256 = "19r89nxqlpmd0ykmklz2z99dvad9svr5ndiclk7c2h84lhx1vhb7";
+ };
+
+ # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
+ buildInputs = [ xlibs.xlibs ];
+
+ buildNativeInputs = [ pkgconfig xz ];
+
+ propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
+
+ configureFlags = "--with-libjasper";
+
+ postInstall = "rm -rf $out/share/gtk-doc";
+
+ meta = {
+ description = "A library for image loading and manipulation";
+
+ homepage = http://library.gnome.org/devel/gdk-pixbuf/;
+
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/glib/2.24.x.nix b/pkgs/development/libraries/glib/2.24.x.nix
deleted file mode 100644
index db7dbdd5c18..00000000000
--- a/pkgs/development/libraries/glib/2.24.x.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }:
-
-stdenv.mkDerivation rec {
- name = "glib-2.24.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/glib/2.24/${name}.tar.bz2";
- sha256 = "030nl16xa2ps9bklm2l81w0yamsrj5a0x7rp4h9dshinpld55srs";
- };
-
- buildInputs = [ pkgconfig gettext ]
- ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
- buildNativeInputs = [ perl ];
-
- propagatedBuildInputs = [ zlib ];
-
- meta = {
- description = "GLib, a C library of programming buildings blocks";
-
- longDescription = ''
- GLib provides the core application building blocks for libraries
- and applications written in C. It provides the core object
- system used in GNOME, the main loop implementation, and a large
- set of utility functions for strings and common data structures.
- '';
-
- homepage = http://www.gtk.org/;
-
- license = "LGPLv2+";
-
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix
index bae405a2426..3b7f8b18495 100644
--- a/pkgs/development/libraries/glib/2.28.x.nix
+++ b/pkgs/development/libraries/glib/2.28.x.nix
@@ -1,24 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }:
+{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz }:
+# TODO:
+# * Add gio-module-fam
+# Problem: cyclic dependency on gamin
+# Possible solution: build as a standalone module, set env. vars
stdenv.mkDerivation rec {
- name = "glib-2.28.8";
+ name = src.pkgname;
- src = fetchurl {
- url = "mirror://gnome/sources/glib/2.28/${name}.tar.bz2";
- sha256 = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f";
+ src = fetchurl_gnome {
+ project = "glib";
+ major = "2"; minor = "28"; patchlevel = "8"; extension = "xz";
+ sha256 = "0lw3fjsffpnf0cc4j5lkxgllp95qvfq6bir8nh5gds78pmfsjz2d";
};
# configure script looks for d-bus but it is only needed for tests
- buildInputs = [ pkgconfig gettext ]
- ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
- buildNativeInputs = [ perl ];
+ buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+ buildNativeInputs = [ perl pkgconfig gettext xz ];
propagatedBuildInputs = [ zlib ];
# glib buildsystem fails to find python, thus hardcodes python2.4 in #!
postInstall = ''
rm -rvf $out/share/gtk-doc
- sed -e 's@python2\.4@python@' -i $out/bin/gtester-report'';
+ sed -e 's@python2\.[0-9]@python@' -i $out/bin/gtester-report'';
meta = {
description = "GLib, a C library of programming buildings blocks";
@@ -34,7 +38,7 @@ stdenv.mkDerivation rec {
license = "LGPLv2+";
- maintainers = [stdenv.lib.maintainers.raskin];
+ maintainers = with stdenv.lib.maintainers; [raskin urkud];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/glib/2.29.x.nix b/pkgs/development/libraries/glib/2.29.x.nix
new file mode 100644
index 00000000000..589ec625dcc
--- /dev/null
+++ b/pkgs/development/libraries/glib/2.29.x.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi
+, python }:
+
+# TODO:
+# * Add gio-module-fam
+# Problem: cyclic dependency on gamin
+# Possible solution: build as a standalone module, set env. vars
+# * Make it build without python
+# Problem: an example (test?) program needs it.
+# Possible solution: disable compilation of this example somehow
+# Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
+# $out/bin/gtester-report' to postInstall if this is solved
+
+stdenv.mkDerivation rec {
+ name = src.pkgname;
+
+ src = fetchurl_gnome {
+ project = "glib";
+ major = "2"; minor = "29"; patchlevel = "18"; extension = "xz";
+ sha256 = "1hc198x625w1w8if1xlvqyjs9aazc27s0l374kqc4sr51wcpbxpy";
+ };
+
+ # configure script looks for d-bus but it is only needed for tests
+ buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+ buildNativeInputs = [ perl pkgconfig gettext xz python ];
+
+ propagatedBuildInputs = [ zlib libffi ];
+
+ # glib buildsystem fails to find python, thus hardcodes python2.4 in #!
+ postInstall = ''rm -rvf $out/share/gtk-doc'';
+
+ meta = {
+ description = "GLib, a C library of programming buildings blocks";
+
+ longDescription = ''
+ GLib provides the core application building blocks for libraries
+ and applications written in C. It provides the core object
+ system used in GNOME, the main loop implementation, and a large
+ set of utility functions for strings and common data structures.
+ '';
+
+ homepage = http://www.gtk.org/;
+
+ license = "LGPLv2+";
+
+ maintainers = with stdenv.lib.maintainers; [raskin urkud];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/glibmm/2.22.x.nix b/pkgs/development/libraries/glibmm/2.22.x.nix
deleted file mode 100644
index 10b8ad8d391..00000000000
--- a/pkgs/development/libraries/glibmm/2.22.x.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
-
-stdenv.mkDerivation rec {
- name = "glibmm-2.22.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/glibmm/2.22/${name}.tar.bz2";
- sha256 = "1h5nxhh6xr1m3jn6bawl3vq5i285k3kdpzqa65zxmxydzm5gy1gi";
- };
-
- buildInputs = [pkgconfig];
- propagatedBuildInputs = [glib libsigcxx];
-
- meta = {
- description = "C++ interface to the GLib library";
-
- homepage = http://gtkmm.org/;
-
- license = "LGPLv2+";
-
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/glibmm/2.28.x.nix b/pkgs/development/libraries/glibmm/2.28.x.nix
new file mode 100644
index 00000000000..3c2c1fbadce
--- /dev/null
+++ b/pkgs/development/libraries/glibmm/2.28.x.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }:
+
+stdenv.mkDerivation rec {
+ name = src.pkgname;
+
+ src = fetchurl_gnome {
+ project = "glibmm";
+ major = "2"; minor = "28"; patchlevel = "2"; extension = "xz";
+ sha256 = "1qyb8jb9avfzcdyhldxx7qljjhf30czwnh7c2r9p0x4nin2rjkpq";
+ };
+
+ buildNativeInputs = [pkgconfig xz];
+ 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;
+ };
+}
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 5b3d51d1976..edfbc0e86d7 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "glpk-4.46";
+ name = "glpk-4.47";
src = fetchurl {
url = "mirror://gnu/glpk/${name}.tar.gz";
- sha256 = "0hijkq44yxbq017wxqh441zz2rpdap6x1brp122i6s7hca147gpv";
+ sha256 = "13gl75w9dqh1a83v8wvlz9ychwljhy26n3l16r9dia3lpbikhm63";
};
doCheck = true;
diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix
new file mode 100644
index 00000000000..cbb72754b1b
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/2.12.nix
@@ -0,0 +1,54 @@
+{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
+, guileBindings, guile, pkgconfig }:
+
+assert guileBindings -> guile != null;
+
+stdenv.mkDerivation rec {
+
+ name = "gnutls-2.12.11";
+
+ src = fetchurl {
+ url = "mirror://gnu/gnutls/${name}.tar.bz2";
+ sha256 = "0q0kk69y1vpdxdz0mxqw603zi2y5kkgz3rvinc6bv6z9mwd8xd80";
+ };
+
+ configurePhase = ''
+ ./configure --prefix="$out" \
+ --disable-dependency-tracking --enable-fast-install \
+ --with-lzo --with-libtasn1-prefix="${libtasn1}" \
+ --without-p11-kit \
+ ${if guileBindings
+ then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
+ else ""}
+ '';
+
+ buildInputs = [ zlib lzo libtasn1 pkgconfig ]
+ ++ stdenv.lib.optional guileBindings guile;
+
+ propagatedBuildInputs = [ nettle ];
+
+ doCheck = true;
+
+ meta = {
+ description = "The GNU Transport Layer Security Library";
+
+ longDescription = ''
+ GnuTLS is a project that aims to develop a library which
+ provides a secure layer, over a reliable transport
+ layer. Currently the GnuTLS library implements the proposed
+ standards by the IETF's TLS working group.
+
+ Quoting from the TLS protocol specification:
+
+ "The TLS protocol provides communications privacy over the
+ Internet. The protocol allows client/server applications to
+ communicate in a way that is designed to prevent eavesdropping,
+ tampering, or message forgery."
+ '';
+
+ homepage = http://www.gnu.org/software/gnutls/;
+ license = "LGPLv2.1+";
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ };
+}
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 2a0fe3715b9..39532c075d1 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,15 +5,13 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
- name = "gnutls-3.0.1";
+ name = "gnutls-3.0.2";
src = fetchurl {
url = "mirror://gnu/gnutls/${name}.tar.xz";
- sha256 = "1z3dqjv8zvma2adbwbcw704zf91hazz8ilmxy91gkrdpi5z2kpz2";
+ sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii";
};
- patches = [ ./fix-guile-priorities-test.patch ];
-
configurePhase = ''
./configure --prefix="$out" \
--disable-dependency-tracking --enable-fast-install \
diff --git a/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch b/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch
deleted file mode 100644
index 538cb6f8e41..00000000000
--- a/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-commit 10115e3fb9c36abcce95bd8f74d212d068cbddce (HEAD, refs/heads/gnutls_3_0_x)
-Author: Ludovic Courtès
-Date: Mon Aug 22 18:17:10 2011 +0200
-
- guile: Fix `priorities' test to use `run-test'.
-
- This is a followup to commit cd7b8102316cd4151356c4b2b7909c7435593890
- ("guile: Fix tests to match the `exit' behavior introduced in Guile
- 2.0.1.").
-
- Modified guile/tests/priorities.scm
-diff --git a/guile/tests/priorities.scm b/guile/tests/priorities.scm
-index 1ee072b..2af837e 100644
---- a/guile/tests/priorities.scm
-+++ b/guile/tests/priorities.scm
-@@ -24,6 +24,8 @@
- ;;;
-
- (use-modules (gnutls)
-+ (gnutls build tests)
-+ (srfi srfi-1)
- (srfi srfi-26))
-
- (define %valid-priority-strings
-@@ -41,10 +43,7 @@
- ("NONE:+VERS-TLS-ALL:+AES-128-CBC:"
- . "+FAIL-HERE:+SHA1:+COMP-NULL:+SIGN-RSA-SHA1")))
-
--(dynamic-wind
--
-- (lambda ()
-- #t)
-+(run-test
-
- (lambda ()
- (let ((s (make-session connection-end/client)))
-@@ -52,25 +51,20 @@
- (for-each (cut set-session-priorities! s <>)
- %valid-priority-strings)
-
-- (for-each (lambda (prefix+suffix)
-- (let* ((prefix (car prefix+suffix))
-- (suffix (cdr prefix+suffix))
-- (pos (string-length prefix))
-- (string (string-append prefix suffix)))
-- (catch 'gnutls-error
-- (lambda ()
-- (let ((s (make-session connection-end/client)))
-- (set-session-priorities! s string)))
-- (lambda (key err function error-location . unused)
-- (or (and (eq? key 'gnutls-error)
-- (eq? err error/invalid-request)
-- (eq? function 'set-session-priorities!)
-- (= error-location pos))
-- (exit 1))))))
-- %invalid-priority-strings)
--
-- (exit 0)))
--
-- (lambda ()
-- ;; failure
-- (exit 1)))
-+ (every (lambda (prefix+suffix)
-+ (let* ((prefix (car prefix+suffix))
-+ (suffix (cdr prefix+suffix))
-+ (pos (string-length prefix))
-+ (string (string-append prefix suffix)))
-+ (catch 'gnutls-error
-+ (lambda ()
-+ (let ((s (make-session connection-end/client)))
-+ ;; The following call should raise an exception.
-+ (set-session-priorities! s string)
-+ #f))
-+ (lambda (key err function error-location . unused)
-+ (and (eq? key 'gnutls-error)
-+ (eq? err error/invalid-request)
-+ (eq? function 'set-session-priorities!)
-+ (= error-location pos))))))
-+ %invalid-priority-strings))))
-
diff --git a/pkgs/development/libraries/gtk+/2.16.x.nix b/pkgs/development/libraries/gtk+/2.16.x.nix
index 9abbd3aa49d..2c81ecc84e0 100644
--- a/pkgs/development/libraries/gtk+/2.16.x.nix
+++ b/pkgs/development/libraries/gtk+/2.16.x.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr
] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama;
- passthru = { inherit libtiff libjpeg libpng; };
-
meta = {
description = "A multi-platform toolkit for creating graphical user interfaces";
diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix
index e4a1f0969f9..b52031d4ac6 100644
--- a/pkgs/development/libraries/gtk+/2.24.x.nix
+++ b/pkgs/development/libraries/gtk+/2.24.x.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg
-, libpng, cairo, perl, jasper, xlibs, gdk_pixbuf
+{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs
+, gdk_pixbuf, xz
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@@ -8,11 +8,12 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
- name = "gtk+-2.24.5";
+ name = src.pkgname;
- src = fetchurl {
- url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.bz2";
- sha256 = "f355f26003b1b42b97e584bdc475189a423fdd052088ee4bbd7aa0f989815cc8";
+ src = fetchurl_gnome {
+ project = "gtk+";
+ major = "2"; minor = "24"; patchlevel = "6"; extension = "xz";
+ sha256 = "1jpgxycxgz1g5yd7spxyc2i8zvn8swm275dkd4d0ryn1bma6n0la";
};
patches =
@@ -23,11 +24,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildNativeInputs = [ perl ];
- buildInputs = [ pkgconfig jasper ];
+ buildNativeInputs = [ perl pkgconfig xz ];
propagatedBuildInputs =
- [ xlibs.xlibs glib atk pango gdk_pixbuf /* libtiff libjpeg libpng */ cairo
+ [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
@@ -37,8 +37,6 @@ stdenv.mkDerivation rec {
postInstall = "rm -rf $out/share/gtk-doc";
- passthru = { inherit libtiff libjpeg libpng; };
-
meta = {
description = "A multi-platform toolkit for creating graphical user interfaces";
diff --git a/pkgs/development/libraries/gtk+/2.20.x.nix b/pkgs/development/libraries/gtk+/3.1.x.nix
similarity index 61%
rename from pkgs/development/libraries/gtk+/2.20.x.nix
rename to pkgs/development/libraries/gtk+/3.1.x.nix
index 53ad76ced53..5b473d44e7e 100644
--- a/pkgs/development/libraries/gtk+/2.20.x.nix
+++ b/pkgs/development/libraries/gtk+/3.1.x.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg
-, libpng, cairo, perl, jasper, xlibs
+{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs
+, gdk_pixbuf, xz
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@@ -8,22 +8,28 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
- name = "gtk+-2.20.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gtk+/2.20/${name}.tar.bz2";
- sha256 = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65";
+ name = src.pkgname;
+
+ src = fetchurl_gnome {
+ project = "gtk+";
+ major = "3"; minor = "1"; patchlevel = "16"; extension = "xz";
+ sha256 = "15arbf75qpchr9wrawb3zkn52rzf5wm2qv4dq10zfzlflimrq2rg";
};
-
- buildNativeInputs = [ perl ];
- buildInputs = [ pkgconfig jasper ];
-
+
+ enableParallelBuilding = true;
+
+ buildNativeInputs = [ perl pkgconfig xz ];
+
propagatedBuildInputs =
- [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr xlibs.libXrender ]
+ [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
+ xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
+ ]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];
- passthru = { inherit libtiff libjpeg libpng; };
+ configureFlags = "--with-xinput=yes";
+
+ postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "A multi-platform toolkit for creating graphical user interfaces";
@@ -43,7 +49,7 @@ stdenv.mkDerivation rec {
license = "LGPLv2+";
- maintainers = [stdenv.lib.maintainers.raskin];
+ maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gtkmm/2.18.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix
similarity index 65%
rename from pkgs/development/libraries/gtkmm/2.18.x.nix
rename to pkgs/development/libraries/gtkmm/2.24.x.nix
index 63644a17360..89e12bc4c1c 100644
--- a/pkgs/development/libraries/gtkmm/2.18.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.24.x.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }:
+{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm, xz }:
stdenv.mkDerivation rec {
- name = "gtkmm-2.18.2";
+ name = src.pkgname;
- src = fetchurl {
- url = "mirror://gnome/sources/gtkmm/2.18/${name}.tar.bz2";
- sha256 = "0kj71db6qwgybmrs0myaz6hfz1zdfzh286vkmv5ldh6d5vi07h6z";
+ src = fetchurl_gnome {
+ project = "gtkmm";
+ major = "2"; minor = "24"; patchlevel = "2"; extension = "xz";
+ sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369";
};
- buildInputs = [pkgconfig];
- propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ];
+ buildNativeInputs = [pkgconfig xz];
+
+ propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ];
meta = {
description = "C++ interface to the GTK+ graphical user interface library";
diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
index 3b2eccf081b..0adb00ccc86 100644
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ b/pkgs/development/libraries/haskell/Crypto/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Crypto";
- version = "4.2.3";
- sha256 = "02wi8lyi27i8cdj8vclrl7vcng38srdzz9qpqwsc4y4lmvgg82br";
+ version = "4.2.4";
+ sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p";
isLibrary = true;
isExecutable = true;
buildDepends = [ HUnit QuickCheck random ];
diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
index d6415126062..c6ed00e0836 100644
--- a/pkgs/development/libraries/haskell/GLURaw/default.nix
+++ b/pkgs/development/libraries/haskell/GLURaw/default.nix
@@ -1,11 +1,11 @@
-{ cabal, GLU, OpenGLRaw }:
+{ cabal, freeglut, mesa, OpenGLRaw }:
cabal.mkDerivation (self: {
pname = "GLURaw";
version = "1.1.0.0";
sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac";
buildDepends = [ OpenGLRaw ];
- extraLibraries = [ GLU ];
+ extraLibraries = [ freeglut mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "A raw binding for the OpenGL graphics system";
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
index c07e5c37174..302b1fb8fb9 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
@@ -1,11 +1,11 @@
-{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.1.1.2";
sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
buildDepends = [ OpenGL ];
- extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "A binding for the OpenGL Utility Toolkit";
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
index 553ec3ab8c0..d6551c6c6d9 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
@@ -1,11 +1,11 @@
-{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.1.2.1";
sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02";
buildDepends = [ OpenGL ];
- extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "A binding for the OpenGL Utility Toolkit";
diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
index 50440932727..2f25c5bd1ce 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
@@ -1,5 +1,5 @@
-{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL, StateVar
-, Tensor
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
+, StateVar, Tensor
}:
cabal.mkDerivation (self: {
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
version = "2.2.2.0";
sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx";
buildDepends = [ OpenGL StateVar Tensor ];
- extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "A binding for the OpenGL Utility Toolkit";
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
new file mode 100644
index 00000000000..0b918dc4c85
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
@@ -0,0 +1,22 @@
+{ cabal, HDBC, mtl, odbc, time, utf8String }:
+
+cabal.mkDerivation (self: {
+ pname = "HDBC-odbc";
+ version = "2.3.1.0";
+ sha256 = "0vza38ggs863wjh25xnwslwlin68166ywws72bs766rl0rq7fkf4";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ HDBC mtl time utf8String ];
+ extraLibraries = [ odbc ];
+ noHaddock = true;
+ meta = {
+ homepage = "http://software.complete.org/hdbc-odbc";
+ description = "ODBC driver for HDBC";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/HaXml/1.13.3.nix b/pkgs/development/libraries/haskell/HaXml/1.13.3.nix
deleted file mode 100644
index 30794498a5a..00000000000
--- a/pkgs/development/libraries/haskell/HaXml/1.13.3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
- pname = "HaXml";
- version = "1.13.3";
- sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0";
- isLibrary = true;
- isExecutable = true;
- meta = {
- homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
- description = "Utilities for manipulating XML documents";
- license = "LGPL";
- platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/HaXml/1.20.2.nix b/pkgs/development/libraries/haskell/HaXml/1.20.2.nix
deleted file mode 100644
index 2adab3b7159..00000000000
--- a/pkgs/development/libraries/haskell/HaXml/1.20.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, polyparse, random }:
-
-cabal.mkDerivation (self: {
- pname = "HaXml";
- version = "1.20.2";
- sha256 = "05kmr2ablinnrg3x1xr19g5kzzby322lblvcvhwbkv26ajwi0b63";
- isLibrary = true;
- isExecutable = true;
- buildDepends = [ polyparse random ];
- meta = {
- homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
- description = "Utilities for manipulating XML documents";
- license = "LGPL";
- platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/HaXml/1.22.3.nix b/pkgs/development/libraries/haskell/HaXml/1.22.3.nix
deleted file mode 100644
index 99c692093f7..00000000000
--- a/pkgs/development/libraries/haskell/HaXml/1.22.3.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, polyparse, random }:
-
-cabal.mkDerivation (self: {
- pname = "HaXml";
- version = "1.22.3";
- sha256 = "10gbax7nih45ck5fg056gnfgzr7zyndxpvdhvx3af2wnrmilkcbh";
- isLibrary = true;
- isExecutable = true;
- buildDepends = [ polyparse random ];
- meta = {
- homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
- description = "Utilities for manipulating XML documents";
- license = "LGPL";
- platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/HaXml/1.22.5.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/HaXml/1.22.5.nix
rename to pkgs/development/libraries/haskell/HaXml/default.nix
diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
new file mode 100644
index 00000000000..d4e1532b101
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
@@ -0,0 +1,18 @@
+{ cabal, random }:
+
+cabal.mkDerivation (self: {
+ pname = "HaskellForMaths";
+ version = "0.4.0";
+ sha256 = "1x6kac1im07cpb1014ci8v222q66w2g3gr1wdcv2yvdi5g24ymbp";
+ buildDepends = [ random ];
+ meta = {
+ homepage = "http://haskellformaths.blogspot.com/";
+ description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index 537bc0ca30b..d1fb880ed1f 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -2,9 +2,10 @@
cabal.mkDerivation (self: {
pname = "Hipmunk";
- version = "5.2.0.2";
- sha256 = "18ly05q953x59smqqrhwjlfa1v6lqma0xiarmr689i63zzb7ji8z";
+ version = "5.2.0.3";
+ sha256 = "1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m";
buildDepends = [ StateVar transformers ];
+ noHaddock = true;
meta = {
homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
description = "A Haskell binding for Chipmunk";
diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
index 47604057529..1d89afe5968 100644
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ListLike";
- version = "3.1.1";
- sha256 = "16q1rsjr9rjlm8iwmr32s1yfcpw0xj34hvb8jfjqyfsail6nh9fh";
+ version = "3.1.2";
+ sha256 = "1fa2y8yc0ppmh37alc20a75gpb90i8s3pgnh3kg8n0577gvhjhzz";
isLibrary = true;
isExecutable = true;
meta = {
diff --git a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix
deleted file mode 100644
index d006076c247..00000000000
--- a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, monadsFd, transformers }:
-
-cabal.mkDerivation (self: {
- pname = "MaybeT-transformers";
- version = "0.2";
- sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily";
- buildDepends = [ monadsFd transformers ];
- meta = {
- description = "MaybeT monad transformer using transformers instead of mtl";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index ea70c41e770..47da3ba266a 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "MissingH";
- version = "1.1.0.3";
- sha256 = "2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf";
+ version = "1.1.1.0";
+ sha256 = "1i2fdr6p0jnn9w865ngjcchbsamrvnvdf9c4vzhjhzy500z2k1ry";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
meta = {
homepage = "http://software.complete.org/missingh";
description = "Large utility library";
- license = "GPL";
+ license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix
new file mode 100644
index 00000000000..7c5262edafe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/NumInstances/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "NumInstances";
+ version = "1.0";
+ sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy";
+ meta = {
+ description = "Instances of numeric classes for functions and tuples";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
index e4f9daf066c..16863a4be15 100644
--- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
+++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
@@ -1,10 +1,10 @@
-{ cabal, GL }:
+{ cabal, mesa }:
cabal.mkDerivation (self: {
pname = "OpenGLRaw";
version = "1.1.0.1";
sha256 = "0v6zcy4xvjj5g137rwjsh6hs0ni9dfkvsqynxv4bl5s78amppqnf";
- extraLibraries = [ GL ];
+ extraLibraries = [ mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "A raw binding for the OpenGL graphics system";
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 7476896337c..c5b8efc67f6 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "RSA";
- version = "1.0.6.1";
- sha256 = "1d0birzvapcsgay0wwh5v9mcd77sghj1bps9ws04ww9ga97gyp0l";
+ version = "1.0.6.2";
+ sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary pureMD5 random SHA ];
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
new file mode 100644
index 00000000000..908ff5b62a9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -0,0 +1,19 @@
+{ cabal, mtl, typeEquality }:
+
+cabal.mkDerivation (self: {
+ pname = "RepLib";
+ version = "0.5.1";
+ sha256 = "1c6zqi87lmmmiz8amsvhw6wkhg90rhh6yl5vh0a9ism3apwh1i7r";
+ buildDepends = [ mtl typeEquality ];
+ noHaddock = true;
+ meta = {
+ homepage = "http://code.google.com/p/replib/";
+ description = "Generic programming library with representation types";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 2dc931e3c03..659b06f72b7 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SHA";
- version = "1.4.1.3";
- sha256 = "1sx68mvzb2y3dq9hk769fzp8vw4jf4hk5v45i0a9a8b31imlicf0";
+ version = "1.5.0.0";
+ sha256 = "12sz1dblmpiy8bg45fwndp1g9gf7494vqqbvbd1hwr5qzyfwyqck";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary ];
diff --git a/pkgs/development/libraries/haskell/WebBits-Html/default.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/WebBits-Html/default.nix
rename to pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
new file mode 100644
index 00000000000..cd34f3161f3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, parsec, syb, WebBits }:
+
+cabal.mkDerivation (self: {
+ pname = "WebBits-Html";
+ version = "1.0.2";
+ sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal";
+ buildDepends = [ mtl parsec syb WebBits ];
+ meta = {
+ homepage = "http://www.cs.brown.edu/research/plt/";
+ description = "JavaScript analysis tools";
+ license = "LGPL";
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/WebBits/default.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/WebBits/default.nix
rename to pkgs/development/libraries/haskell/WebBits/2.0.nix
diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix
index 8f90606d7a1..14af645928c 100644
--- a/pkgs/development/libraries/haskell/X11-xft/default.nix
+++ b/pkgs/development/libraries/haskell/X11-xft/default.nix
@@ -1,11 +1,14 @@
-{ ghc, cabal, X11, utf8String, pkgconfig, libXft, freetype, fontconfig }:
-cabal.mkDerivation (self : {
+{ cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11
+}:
+
+cabal.mkDerivation (self: {
pname = "X11-xft";
version = "0.3";
sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
- buildInputs = [ ghc pkgconfig libXft freetype fontconfig ];
- propagatedBuildInputs = [ X11 utf8String ];
- configureFlags=["--extra-include-dirs=${freetype}/include/freetype2"];
+ buildDepends = [ utf8String X11 ];
+ extraLibraries = [ fontconfig freetype pkgconfig ];
+ pkgconfigDepends = [ libXft ];
+ configureFlags = "--extra-include-dirs=${freetype}/include/freetype2";
meta = {
description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
license = "LGPL";
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index f8eef4dcb36..9d01b2fdd86 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -1,12 +1,11 @@
-{cabal, syb, libX11, xineramaSupport ? true, libXinerama ? null, libXext ? null}:
+{ cabal, libX11, libXext, libXinerama, syb }:
-assert xineramaSupport -> (libXinerama != null && libXext != null);
-
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "X11";
version = "1.5.0.0";
sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f";
- propagatedBuildInputs = [libX11 syb] ++ (if xineramaSupport then [libXinerama libXext] else []);
+ buildDepends = [ syb ];
+ extraLibraries = [ libX11 libXext libXinerama ];
meta = {
homepage = "http://code.haskell.org/X11";
description = "A binding to the X11 graphics library";
diff --git a/pkgs/development/libraries/haskell/aeson-native/default.nix b/pkgs/development/libraries/haskell/aeson-native/default.nix
new file mode 100644
index 00000000000..4b3d8da7bf5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/aeson-native/default.nix
@@ -0,0 +1,23 @@
+{ cabal, attoparsec, blazeBuilder, blazeTextualNative, deepseq
+, hashable, mtl, syb, text, time, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+ pname = "aeson-native";
+ version = "0.3.3.1";
+ sha256 = "15733f5ivymkbwvqgbd8scynl9adva3fnid4bzlr9l4sb3yvcz9p";
+ buildDepends = [
+ attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb
+ text time unorderedContainers vector
+ ];
+ meta = {
+ homepage = "http://github.com/mailrank/aeson";
+ description = "Fast JSON parsing and encoding";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 1edd45f6aa2..030f973e35e 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "aeson";
- version = "0.3.2.9";
- sha256 = "1qaajk797zpickw4ik5lc03wnmxkrcmv3zik7n1bjqx6h37h0zqw";
+ version = "0.3.2.12";
+ sha256 = "12dq79bd8kvl4hc493c7ff9k9xdpibnnnfgpvpxh4ljnqcqr4hcy";
buildDepends = [
attoparsec blazeBuilder blazeTextual deepseq hashable mtl syb text
time unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix
index 5b310f433b0..20cca829736 100755
--- a/pkgs/development/libraries/haskell/async/default.nix
+++ b/pkgs/development/libraries/haskell/async/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "async";
- version = "1.2";
- sha256 = "a5963d36fc1ba142d18920f967190b25cf80f700d863372b6d33ad5257a1773a";
+ version = "1.4";
+ sha256 = "1d24bcvmw687jcf75wgavlhfs55f0va02xhl4xdnj2lrlr19s5dl";
meta = {
homepage = "http://gitorious.org/async/";
description = "Asynchronous Computations";
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index e4457a3cdf7..ed91c9d4dd9 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -1,4 +1,4 @@
-{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder
+{ cabal, aesonNative, attoparsec, base64Bytestring, blazeBuilder
, caseInsensitive, enumerator, failure, httpEnumerator, httpTypes
, network, random, RSA, SHA, tagsoup, text, time, tls, transformers
, xmlEnumerator
@@ -6,12 +6,12 @@
cabal.mkDerivation (self: {
pname = "authenticate";
- version = "0.9.2.2";
- sha256 = "0rn1f458ag9mmh55hi873xg5iqypwl6vf6blyaxwbgbp6nm327iz";
+ version = "0.10.2.1";
+ sha256 = "1bi46bls57wzmd90grrp6rpvgzsz064yi804b6pavq0pxiz1yaj9";
buildDepends = [
- aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
- enumerator failure httpEnumerator httpTypes network random RSA SHA
- tagsoup text time tls transformers xmlEnumerator
+ aesonNative attoparsec base64Bytestring blazeBuilder
+ caseInsensitive enumerator failure httpEnumerator httpTypes network
+ random RSA SHA tagsoup text time tls transformers xmlEnumerator
];
meta = {
homepage = "http://github.com/snoyberg/authenticate/tree/master";
diff --git a/pkgs/development/libraries/haskell/blaze-textual-native/default.nix b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix
new file mode 100644
index 00000000000..3f41a176905
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix
@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, text, time, vector }:
+
+cabal.mkDerivation (self: {
+ pname = "blaze-textual-native";
+ version = "0.2.1";
+ sha256 = "12cnl76qld19x6zlhxcsx2b27mfr9v7sc2xq6af9h77wqb98fkvn";
+ buildDepends = [ blazeBuilder text time vector ];
+ meta = {
+ homepage = "http://github.com/mailrank/blaze-textual";
+ description = "Fast rendering of common datatypes";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
index 0c405bac523..deb1e3caa78 100644
--- a/pkgs/development/libraries/haskell/blaze-textual/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix
@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder, text, time, vector }:
+{ cabal, blazeBuilder, doubleConversion, text, time, vector }:
cabal.mkDerivation (self: {
pname = "blaze-textual";
- version = "0.1.0.0";
- sha256 = "0ql25b0r4xbshqsjfndl7glq0hp2ncxb3h5zd541vsqrqrf8y4gk";
- buildDepends = [ blazeBuilder text time vector ];
+ version = "0.2.0.4";
+ sha256 = "0bifxyzm35xvlqry06iv6pqgx1d33jnrvpmn4wnydkyg1r7q3k9v";
+ buildDepends = [ blazeBuilder doubleConversion text time vector ];
meta = {
homepage = "http://github.com/mailrank/blaze-textual";
description = "Fast rendering of common datatypes";
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index 293f692c67f..aa7fae51544 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -1,15 +1,15 @@
-{ cabal, cairo, glibc, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
+{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, zlib }:
cabal.mkDerivation (self: {
pname = "cairo";
- version = "0.12.0";
- sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9";
+ version = "0.12.1";
+ sha256 = "0krclr32cn3vq3cmwhmxz7wzams92iliq44p6s4nj9jg4928cgfk";
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ cairo glibc pkgconfig zlib ];
+ extraLibraries = [ cairo libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];
meta = {
- homepage = "http://www.haskell.org/gtk2hs/";
+ homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Cairo library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix
rename to pkgs/development/libraries/haskell/case-insensitive/default.nix
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 44482d9161b..2c577fbc2ef 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -1,15 +1,16 @@
-{ cabal, random }:
+{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher, skein
+}:
cabal.mkDerivation (self: {
pname = "clientsession";
- version = "0.6.0";
- sha256 = "0h92jjkhldn7f9b78cajfda8rprsj5scdsyl3pjpzicpvvy9g00y";
- isLibrary = true;
- isExecutable = true;
- buildDepends = [ random ];
+ version = "0.7.3";
+ sha256 = "1f5ri7h8l3v60bj6ywhn2v3kih5lclk76qx7y6jc7nyf9499aja5";
+ buildDepends = [
+ base64Bytestring cereal cryptoApi cryptocipher skein
+ ];
meta = {
homepage = "http://github.com/snoyberg/clientsession/tree/master";
- description = "Store session data in a cookie";
+ description = "Securely store session data in a client-side cookie";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 70dbbf15ea4..132a46be09e 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
- version = "0.7.1";
- sha256 = "1bblhqidzb8b75fk9zb1ibdssmbh1kaq20q144c9y1cas3gbn6h3";
+ version = "0.7.3";
+ sha256 = "1wjmf7ll9jady6p79066b5ib70ywvbgnbc71s76pibkg5hsvclgj";
isLibrary = true;
isExecutable = true;
buildDepends = [ cereal cryptoApi tagged ];
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
index 934baf1b91b..593c7b3bd3c 100644
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, dlist }:
cabal.mkDerivation (self: {
pname = "data-default";
- version = "0.2.0.1";
- sha256 = "0hhrzaykwybqpig0kss4iq1i93ygb80g8i1chpr84akmvdr07w0i";
+ version = "0.3.0";
+ sha256 = "0nbvknfa9kkc46fl1ffji0ghqb41wwsccmc55mya5zavfq9g05g9";
+ buildDepends = [ dlist ];
meta = {
description = "A class for types with a default value";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
similarity index 50%
rename from pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix
rename to pkgs/development/libraries/haskell/deepseq-th/default.nix
index f12df82d844..ccffbe54f02 100644
--- a/pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix
@@ -1,12 +1,12 @@
-{ cabal, mtl, transformers }:
+{ cabal, deepseq }:
cabal.mkDerivation (self: {
- pname = "monads-fd";
- version = "0.2.0.0";
- sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c";
- buildDepends = [ mtl transformers ];
+ pname = "deepseq-th";
+ version = "0.1.0.2";
+ sha256 = "0f2hrp2rjb3iailnxh47wl1imgq6jqr9qj31vi7k8lgp5pwa90mc";
+ buildDepends = [ deepseq ];
meta = {
- description = "Monad classes, using functional dependencies";
+ description = "Template Haskell based deriver for optimised NFData instances";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
similarity index 57%
rename from pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix
rename to pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
index cd295e3476f..35fca66fa86 100644
--- a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
@@ -1,11 +1,11 @@
{ cabal }:
cabal.mkDerivation (self: {
- pname = "ghc-paths";
- version = "0.1.0.5";
- sha256 = "ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10";
+ pname = "deepseq";
+ version = "1.2.0.1";
+ sha256 = "0r7lkqhllj7phmn4sq836fmis4wy9fpka4hjzhqzhbbykzys0z7d";
meta = {
- description = "Knowledge of GHC's installation directories";
+ description = "Deep evaluation of data structures";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix
index b13f156a3e8..b313da931f9 100644
--- a/pkgs/development/libraries/haskell/digest/default.nix
+++ b/pkgs/development/libraries/haskell/digest/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digest";
- version = "0.0.0.9";
- sha256 = "15gj3iq3jm4lnkc6hnj9v8p8ia3yzbsajwf9by3b1kpl449k2h29";
+ version = "0.0.1.0";
+ sha256 = "1p2fk950ivdj7pvc624y0fx48rdh0ax3rw9606926n60mxi9fca0";
extraLibraries = [ zlib ];
meta = {
description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 7bf37628d13..35b5a8d2440 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dimensional";
- version = "0.10.1";
- sha256 = "0pnrqm6qny09g8iy191844d0mvvyzg1j637pvwwwhci8lzq3hfyd";
+ version = "0.10.1.2";
+ sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn";
buildDepends = [ numtype time ];
meta = {
homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix
index 1a351edd39b..10c518611d1 100644
--- a/pkgs/development/libraries/haskell/email-validate/default.nix
+++ b/pkgs/development/libraries/haskell/email-validate/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "email-validate";
- version = "0.2.6";
- sha256 = "1nw4r5wyck30r6n0bjxwybpkw2dqr2mp4y8fy6ypra9zhhw1jd8m";
+ version = "0.2.7";
+ sha256 = "13zam197ph431f351g8srsxwqchjdwx1c1bizmildsc1zxm2nm3q";
buildDepends = [ parsec ranges ];
meta = {
homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
similarity index 57%
rename from pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix
rename to pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
index ae280fa54ea..d349a1f17e3 100644
--- a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
@@ -1,11 +1,11 @@
{ cabal }:
cabal.mkDerivation (self: {
- pname = "ghc-paths";
- version = "0.1.0.6";
- sha256 = "95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243";
+ pname = "extensible-exceptions";
+ version = "0.1.1.3";
+ sha256 = "1i8rjfczsx1wjfaq423a7cp7qrnxh053865z7bg6hwhk2pxsrxkm";
meta = {
- description = "Knowledge of GHC's installation directories";
+ description = "Extensible exceptions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index e7585b88d47..b2a6142bbaf 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fclabels";
- version = "1.0.1";
- sha256 = "0kmbdlf4v4651sc8igx5i1pg26xryai06l9nvp5vwsmbjcvrajcq";
+ version = "1.0.4";
+ sha256 = "051ryqjzc74lnlbdd1ngxgqj56p43ls5xhafmldnyhkv75x59svw";
buildDepends = [ mtl transformers ];
meta = {
description = "First class accessor labels";
diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix
index 809494c7ae9..6e3362bf42c 100644
--- a/pkgs/development/libraries/haskell/filepath/default.nix
+++ b/pkgs/development/libraries/haskell/filepath/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "filepath";
- version = "1.2.0.0";
- sha256 = "14jji7byjlkzsylsnqwfsiw5vsc7nlaisqabzcw9f7nhrxkq2n20";
+ version = "1.2.0.1";
+ sha256 = "1fq62kxf68y2952qhipllz049cq52yc3wm4i31v2lg5hdcwbw152";
meta = {
homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/";
description = "Library for manipulating FilePaths in a cross platform way";
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
new file mode 100644
index 00000000000..b6f79ed16c2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -0,0 +1,16 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "generic-deriving";
+ version = "1.0.2";
+ sha256 = "0qj4ql44f87rgg5l512mh863c1zjfklw1w5k8x4nyw37s7qx9hvq";
+ meta = {
+ description = "Generic programming library for generalized deriving";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/get-options/default.nix b/pkgs/development/libraries/haskell/get-options/default.nix
deleted file mode 100644
index 01ae7575870..00000000000
--- a/pkgs/development/libraries/haskell/get-options/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{cabal, fetchurl, sourceFromHead, mtl}:
-
-cabal.mkDerivation (self : {
- pname = "get-options";
- version = "x"; # ?
- name = self.fname;
- # REGION AUTO UPDATE: { name="getOptions"; type="darcs"; url = "http://repetae.net/john/repos/GetOptions"; }
- src = sourceFromHead "getOptions-nrmtag1.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/getOptions-nrmtag1.tar.gz"; sha256 = "0e884687b2c676a5b7e79826a2236991cb045f794c5fd625813529a2b30224cd"; });
- # END
- extraBuildInputs = [ mtl ];
- meta = {
- description = "Simple to use get option library";
- };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 23af9bfa7fe..9ebe3e94041 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -1,13 +1,12 @@
-{cabal, binary, mtl}:
+{ cabal, binary, mtl }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "ghc-events";
- version = "0.2.0.1";
- sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6";
- propagatedBuildInputs = [binary mtl];
- preConfigure = ''
- sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal
- '';
+ version = "0.3.0.1";
+ sha256 = "08jnri6cwybg8b2f53rn8y1xzcpz32r0svahcw01g837p07mcpla";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ binary mtl ];
meta = {
description = "Library and tool for parsing .eventlog files from GHC";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix
rename to pkgs/development/libraries/haskell/ghc-paths/default.nix
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index a2db60b8d0f..87a60a75ca9 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -1,24 +1,24 @@
{ cabal, cgi, ConfigFile, feed, filestore, ghcPaths
, happstackServer, happstackUtil, highlightingKate, hslogger
, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
-, parsec, random, recaptcha, safe, SHA, syb, time, url, utf8String
-, xhtml, xml, xssSanitize, zlib
+, parsec, random, recaptcha, safe, SHA, syb, text, time, url
+, utf8String, xhtml, xml, xssSanitize, zlib
}:
cabal.mkDerivation (self: {
pname = "gitit";
- version = "0.8.0.1";
- sha256 = "0y2gcxlbb44vflj0jl3zkbsn47n7nccikxwdw6ccf9kxgcmrz0zy";
+ version = "0.8.1";
+ sha256 = "1b5i6fm68vwhlvgz0m7xxzklkxc2c6lrqyqfqyjs93p5j0aqgvfn";
isLibrary = true;
isExecutable = true;
buildDepends = [
cgi ConfigFile feed filestore ghcPaths happstackServer
happstackUtil highlightingKate hslogger HStringTemplate HTTP json
mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb
- time url utf8String xhtml xml xssSanitize zlib
+ text time url utf8String xhtml xml xssSanitize zlib
];
meta = {
- homepage = "http://github.com/jgm/gitit/tree/master";
+ homepage = "http://gitit.net";
description = "Wiki using happstack, git or darcs, and pandoc";
license = "GPL";
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
index 8f43af57b8d..f1bae4ad9fe 100644
--- a/pkgs/development/libraries/haskell/glade/default.nix
+++ b/pkgs/development/libraries/haskell/glade/default.nix
@@ -1,17 +1,17 @@
-{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, gtkC, libglade
-, mtl, pango, pkgconfig
+{ cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade
+, pkgconfig
}:
cabal.mkDerivation (self: {
pname = "glade";
- version = "0.12.0";
- sha256 = "0h7l1kp9y17xqyz16kv0dvwgblph9r70wimyl8aq9gi1r4is5lmq";
- buildDepends = [ cairo glib gtk mtl pango ];
+ version = "0.12.1";
+ sha256 = "114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990";
+ buildDepends = [ glib gtk ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ gtkC libglade ];
meta = {
- homepage = "http://www.haskell.org/gtk2hs/";
+ homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the glade library";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 9d7750e24de..445f7122809 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -1,14 +1,14 @@
-{ cabal, glib, glibc, gtk2hsBuildtools, pkgconfig }:
+{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig }:
cabal.mkDerivation (self: {
pname = "glib";
- version = "0.12.0";
- sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19";
+ version = "0.12.1";
+ sha256 = "0lsgpbd08w64npc0xsnxg8n4vj2hdnjvs55h4lhgc61p05q9gv52";
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib ];
meta = {
- homepage = "http://www.haskell.org/gtk2hs/";
+ homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GLIB library for Gtk2Hs";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
new file mode 100644
index 00000000000..509624321f8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -0,0 +1,18 @@
+{ cabal, GLUT, OpenGL }:
+
+cabal.mkDerivation (self: {
+ pname = "gloss";
+ version = "1.3.4.1";
+ sha256 = "0cyk75b495vq59pnfqy6ny5kb0i0zq2hwfb1q69vj0cfyiqiwjsb";
+ buildDepends = [ GLUT OpenGL ];
+ meta = {
+ homepage = "http://gloss.ouroborus.net";
+ description = "Painless 2D vector graphics, animations and simulations";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index 0b9cd20eb0a..e3fac24865b 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -1,17 +1,17 @@
-{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, mtl, pango
+{ cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
, pkgconfig
}:
cabal.mkDerivation (self: {
pname = "gtk";
- version = "0.12.0";
- sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2";
+ version = "0.12.1";
+ sha256 = "007wxxff2ibfi3848yjxg7hqgpiqpn0zpyivjvjv0zphk1d2j9sv";
buildDepends = [ cairo glib mtl pango ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib gtk ];
meta = {
- homepage = "http://www.haskell.org/gtk2hs/";
+ homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Gtk+ graphical user interface library";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index 9b0fe07653c..036067ec1aa 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -1,14 +1,15 @@
-{ cabal, alex, happy }:
+{ cabal, alex, happy, random }:
cabal.mkDerivation (self: {
pname = "gtk2hs-buildtools";
- version = "0.12.0";
- sha256 = "1czlmyr9zhzc0h1j0z3chv06ma77cibq2yc6h1slfphb1lkv66a8";
+ version = "0.12.1";
+ sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl";
isLibrary = false;
isExecutable = true;
+ buildDepends = [ random ];
buildTools = [ alex happy ];
meta = {
- homepage = "http://www.haskell.org/gtk2hs/";
+ homepage = "http://projects.haskell.org/gtk2hs/";
description = "Tools to build the Gtk2Hs suite of User Interface libraries";
license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
index 6f69696d1f4..7ab1b1eda71 100644
--- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix
+++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
@@ -1,17 +1,17 @@
-{ cabal, glib, glibc, gtk, gtk2hsBuildtools, gtksourceview, mtl
+{ cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl
, pkgconfig
}:
cabal.mkDerivation (self: {
pname = "gtksourceview2";
- version = "0.12.2";
- sha256 = "0l9y48kmzqzps6k54fgf0dkmmv0ppxx8amggfdswwk86zsf8j81r";
+ version = "0.12.3";
+ sha256 = "0bhwvhwsg3mf4w94fl6z6qkn67i68hh3zwwhzqa59lia0nc233gd";
buildDepends = [ glib gtk mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ gtksourceview ];
meta = {
- homepage = "http://www.haskell.org/gtk2hs/";
+ homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GtkSourceView library";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix
new file mode 100644
index 00000000000..1f0f75ffeb8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hS3/default.nix
@@ -0,0 +1,25 @@
+{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random
+, regexCompat, utf8String
+}:
+
+cabal.mkDerivation (self: {
+ pname = "hS3";
+ version = "0.5.6";
+ sha256 = "1cd6dzvhfkfp0lzw8lwfcr0wn8wqi2hm8pgb5idp4vg4z00yf2zc";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+ Crypto dataenc HTTP hxt MissingH network random regexCompat
+ utf8String
+ ];
+ meta = {
+ homepage = "http://gregheartsfield.com/hS3/";
+ description = "Interface to Amazon's Simple Storage Service (S3)";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
new file mode 100644
index 00000000000..4cfc1527f92
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -0,0 +1,18 @@
+{ cabal, tar }:
+
+cabal.mkDerivation (self: {
+ pname = "hackage-db";
+ version = "1.0";
+ sha256 = "0y769ssr9jlyzcdr0l8wh5s3ivc3zbp9mf7xy7vnq6mr9hjh7lcw";
+ buildDepends = [ tar ];
+ meta = {
+ homepage = "http://github.com/peti/hackage-db";
+ description = "provide access to the Hackage database via Data.Map";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 1f42ba532fb..d9a8b38730a 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -1,13 +1,13 @@
-{ cabal, binary, blazeHtml, hamlet, hopenssl, mtl, pandoc, parsec
+{ cabal, binary, blazeHtml, cryptohash, hamlet, mtl, pandoc, parsec
, regexBase, regexPcre, snapCore, snapServer, tagsoup, time
}:
cabal.mkDerivation (self: {
pname = "hakyll";
- version = "3.2.0.5";
- sha256 = "1rwmdkzwshhi6b27zff42gg65vds866l68h33p4kn6pq1rns3bz4";
+ version = "3.2.0.7";
+ sha256 = "1p06596yfsa0lk5ipdxm1b8j81aph2k30pm2g6ghw6k7fglklyl5";
buildDepends = [
- binary blazeHtml hamlet hopenssl mtl pandoc parsec regexBase
+ binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
regexPcre snapCore snapServer tagsoup time
];
meta = {
diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.1.nix b/pkgs/development/libraries/haskell/hamlet/0.10.1.nix
new file mode 100644
index 00000000000..e3b80dd1edc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hamlet/0.10.1.nix
@@ -0,0 +1,22 @@
+{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare
+, text
+}:
+
+cabal.mkDerivation (self: {
+ pname = "hamlet";
+ version = "0.10.1";
+ sha256 = "1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6";
+ buildDepends = [
+ blazeBuilder blazeHtml failure parsec shakespeare text
+ ];
+ meta = {
+ homepage = "http://www.yesodweb.com/book/templates";
+ description = "Haml-like template files that are compile-time checked";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hamlet/default.nix
rename to pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
new file mode 100644
index 00000000000..3eccba4eb38
--- /dev/null
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -0,0 +1,18 @@
+{ cabal, hamlet, happstackServer, text }:
+
+cabal.mkDerivation (self: {
+ pname = "happstack-hamlet";
+ version = "6.2.0";
+ sha256 = "1y3nc6z9y96fci25dc6w66l0qlnkz29kr29dpd2sjnhpqm0kvzsc";
+ buildDepends = [ hamlet happstackServer text ];
+ meta = {
+ homepage = "http://www.happstack.com/";
+ description = "Support for Hamlet HTML templates in Happstack";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 4d8e874a8bf..b62c8bd0202 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
- version = "6.1.6";
- sha256 = "1z4c2bymyyvhs47ynrlp4d2cwqws2d2isiwj82c33qcmk4znargg";
+ version = "6.2.4";
+ sha256 = "0lhyjaxw1qkh1pi0v14j7ya2ljrfizmxwahrhqk3sasnf2mrqycp";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 62e62b78641..fd16c1151f2 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskell-src-meta";
- version = "0.4.0.2";
- sha256 = "1i3lhik0sa34x6rnkfa9scai9cdgx05h6mrbhwsfc7p2jlsixk92";
+ version = "0.5";
+ sha256 = "0403j2ks2as61rfl049v4h43xpgx06bm739y80vada6jc85rfinr";
buildDepends = [ haskellSrcExts syb thLift ];
meta = {
description = "Parse source to template-haskell abstract syntax";
diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix
index f20c2daf541..23dcb192900 100644
--- a/pkgs/development/libraries/haskell/hledger-chart/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix
@@ -1,15 +1,19 @@
-{ cabal, Chart, colour, hledger, hledgerLib, safe }:
+{ cabal, Chart, cmdargs, colour, hledger, hledgerLib, HUnit, safe
+, time
+}:
cabal.mkDerivation (self: {
pname = "hledger-chart";
- version = "0.14";
- sha256 = "fe321e4e31c72aef22945080323992a0033ae8fb48213ad7b708f86f9e2f6462";
+ version = "0.15.2";
+ sha256 = "1cs4m6lhpqib2rhpvyrw5319mjqw8cwlin7734m7yndjj8li8rcx";
isLibrary = false;
isExecutable = true;
- buildDepends = [ Chart colour hledger hledgerLib safe ];
+ buildDepends = [
+ Chart cmdargs colour hledger hledgerLib HUnit safe time
+ ];
meta = {
homepage = "http://hledger.org";
- description = "A pie chart generator for the hledger accounting tool";
+ description = "A pie chart image generator for the hledger accounting tool";
license = "GPL";
platforms = self.stdenv.lib.platforms.linux;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 569bd7c5291..032e7caa5a8 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -1,16 +1,17 @@
-{ cabal, HUnit, mtl, parsec, regexpr, safe, split, time, utf8String
+{ cabal, cmdargs, HUnit, mtl, parsec, regexpr, safe, split, time
+, utf8String
}:
cabal.mkDerivation (self: {
pname = "hledger-lib";
- version = "0.14";
- sha256 = "9a6d6ab4383800279e135e9bbcd886e95cea45232d093202c5d43e6edd1f927c";
+ version = "0.15.2";
+ sha256 = "1if20197nyg1as6v1c4a0js694zg213nf7rhfhv2a46af58n0bgq";
buildDepends = [
- HUnit mtl parsec regexpr safe split time utf8String
+ cmdargs HUnit mtl parsec regexpr safe split time utf8String
];
meta = {
homepage = "http://hledger.org";
- description = "Reusable types and utilities for the hledger accounting tool and financial apps in general";
+ description = "Core data types, parsers and utilities for the hledger accounting tool";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix
index fa9d5ddab34..51d2f0af1af 100644
--- a/pkgs/development/libraries/haskell/hledger-vty/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix
@@ -1,15 +1,15 @@
-{ cabal, hledger, hledgerLib, safe, vty }:
+{ cabal, cmdargs, hledger, hledgerLib, HUnit, safe, time, vty }:
cabal.mkDerivation (self: {
pname = "hledger-vty";
- version = "0.14";
- sha256 = "3d9972430053548a65bfe5fb39ba374d1c930c6e0cfc704be5c59de742a4287e";
+ version = "0.15.2";
+ sha256 = "0sii9psh1mm5f8w782bv2m5rxn29q23v17avhw0x5ssm9zy9yxqd";
isLibrary = false;
isExecutable = true;
- buildDepends = [ hledger hledgerLib safe vty ];
+ buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ];
meta = {
homepage = "http://hledger.org";
- description = "A curses-style interface for the hledger accounting tool";
+ description = "A curses-style console interface for the hledger accounting tool";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
new file mode 100644
index 00000000000..7dad816d240
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -0,0 +1,28 @@
+{ cabal, aeson, cmdargs, failure, fileEmbed, hamlet, hledger
+, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe, text, time
+, transformers, wai, waiExtra, warp, yesodCore, yesodForm
+, yesodJson, yesodStatic
+}:
+
+cabal.mkDerivation (self: {
+ pname = "hledger-web";
+ version = "0.15.3";
+ sha256 = "1z2pimxz2ykfb89qwp6cil4nljn8pcz8n7pjhvk948zsd96n2i6f";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+ aeson cmdargs failure fileEmbed hamlet hledger hledgerLib HUnit
+ ioStorage parsec regexpr safe text time transformers wai waiExtra
+ warp yesodCore yesodForm yesodJson yesodStatic
+ ];
+ meta = {
+ homepage = "http://hledger.org";
+ description = "A web interface for the hledger accounting tool";
+ license = "GPL";
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 046ca56b339..080419d85e5 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -1,20 +1,20 @@
-{ cabal, csv, haskeline, hledgerLib, HUnit, mtl, parsec, regexpr
-, safe, split, time, utf8String
+{ cabal, cmdargs, csv, haskeline, hledgerLib, HUnit, mtl, parsec
+, regexpr, safe, split, time, utf8String
}:
cabal.mkDerivation (self: {
pname = "hledger";
- version = "0.14";
- sha256 = "1bfcb1dcc88d8cec924afbf7aefd1ccf88b7be785b522c1595b75b91f8c82d35";
+ version = "0.15.2";
+ sha256 = "0gja0jvr8v9s1608w45rg1dwhj48yls59shqcs4z936xdg69l42w";
isLibrary = true;
isExecutable = true;
buildDepends = [
- csv haskeline hledgerLib HUnit mtl parsec regexpr safe split time
- utf8String
+ cmdargs csv haskeline hledgerLib HUnit mtl parsec regexpr safe
+ split time utf8String
];
meta = {
homepage = "http://hledger.org";
- description = "A robust command-line accounting tool with a simple human-editable data format, similar to ledger";
+ description = "The main command-line interface for the hledger accounting tool";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index bd149b5aa92..43c66c3d894 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hmatrix";
- version = "0.11.1.0";
- sha256 = "19915xmf6m2092s1rzwirxy0rwjcr6482y5wg4bil0afm0xjnb9n";
+ version = "0.12.0.1";
+ sha256 = "1lnq1892vzx094d84jfs2477m3w47xgmqvnvzignwgfi470d9lw5";
buildDepends = [
binary HUnit QuickCheck random storableComplex vector
];
diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
index 4dd915db7d3..5c035be0b02 100644
--- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
@@ -1,4 +1,6 @@
-{ cabal, GLUT, glut, hp2anyCore, network, OpenGL, parseargs }:
+{ cabal, freeglut, GLUT, hp2anyCore, mesa, network, OpenGL
+, parseargs
+}:
cabal.mkDerivation (self: {
pname = "hp2any-graph";
@@ -7,7 +9,7 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [ GLUT hp2anyCore network OpenGL parseargs ];
- extraLibraries = [ glut ];
+ extraLibraries = [ freeglut mesa ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Hp2any";
description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 034d24afa98..22b6e6370f3 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -1,21 +1,21 @@
{ cabal, asn1Data, attoparsec, attoparsecEnumerator
, base64Bytestring, blazeBuilder, blazeBuilderEnumerator
-, caseInsensitive, certificate, cprngAes, enumerator, failure
-, httpTypes, monadControl, network, tls, tlsExtra, transformers
-, utf8String, zlibEnum
+, caseInsensitive, certificate, cprngAes, dataDefault, enumerator
+, failure, httpTypes, monadControl, network, tls, tlsExtra
+, transformers, utf8String, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "http-enumerator";
- version = "0.6.6";
- sha256 = "0bmrj0jhjvqpx2kgpy5sz6sx17cxbpv07975n1055vgyzv1lcx07";
+ version = "0.7.1";
+ sha256 = "0d8zfgj41jdg6k9ny717xy1ca2jxnmr7aliqlq2arf4900lxjlwd";
isLibrary = true;
isExecutable = true;
buildDepends = [
asn1Data attoparsec attoparsecEnumerator base64Bytestring
blazeBuilder blazeBuilderEnumerator caseInsensitive certificate
- cprngAes enumerator failure httpTypes monadControl network tls
- tlsExtra transformers utf8String zlibEnum
+ cprngAes dataDefault enumerator failure httpTypes monadControl
+ network tls tlsExtra transformers utf8String zlibEnum
];
meta = {
homepage = "http://github.com/snoyberg/http-enumerator";
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
new file mode 100644
index 00000000000..c466d877488
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "hxt-charproperties";
+ version = "9.1.0";
+ sha256 = "1a227czzbbw8pigc2dk5fyyc4x1rpx82mb5c4hpjjz97l0sdlc23";
+ meta = {
+ homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
+ description = "Character properties and classes for XML and Unicode";
+ license = "unknown";
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
new file mode 100644
index 00000000000..94e14429966
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
@@ -0,0 +1,18 @@
+{ cabal, hxtCharproperties, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = "hxt-regex-xmlschema";
+ version = "9.0.1";
+ sha256 = "1mg22fa0f0cbj9gkl5zaq0xh94ljkmzrc019h3cxv728chpgby0c";
+ buildDepends = [ hxtCharproperties parsec ];
+ meta = {
+ homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
+ description = "A regular expression library for W3C XML Schema regular expressions";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
new file mode 100644
index 00000000000..452a38c79c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
@@ -0,0 +1,18 @@
+{ cabal, hxtCharproperties }:
+
+cabal.mkDerivation (self: {
+ pname = "hxt-unicode";
+ version = "9.0.1";
+ sha256 = "0g8qz7waip7zsdi35idj9db6qd7lqbv88l0c4rz8q7nh85jsp6ym";
+ buildDepends = [ hxtCharproperties ];
+ meta = {
+ homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
+ description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
+ license = "unknown";
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
new file mode 100644
index 00000000000..88112a1f089
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -0,0 +1,23 @@
+{ cabal, binary, deepseq, HUnit, hxtCharproperties
+, hxtRegexXmlschema, hxtUnicode, network, parsec
+}:
+
+cabal.mkDerivation (self: {
+ pname = "hxt";
+ version = "9.1.4";
+ sha256 = "1dqnxb1dikw74l02sb6q193ipk9qfwqlgvcd362705mdqzai124c";
+ buildDepends = [
+ binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode
+ network parsec
+ ];
+ meta = {
+ homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
+ description = "A collection of tools for processing XML with Haskell";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
new file mode 100644
index 00000000000..ca02a9bc8c7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -0,0 +1,19 @@
+{ cabal, syb }:
+
+cabal.mkDerivation (self: {
+ pname = "instant-generics";
+ version = "0.3.3";
+ sha256 = "125ninsm1k9hixlwqdn7b842fpqxz4zih4rh8fn7r7djmv1zpq9q";
+ buildDepends = [ syb ];
+ noHaddock = true;
+ meta = {
+ homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
+ description = "Generic programming library with a sum of products view";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix
new file mode 100644
index 00000000000..55b88ac1d36
--- /dev/null
+++ b/pkgs/development/libraries/haskell/io-storage/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "io-storage";
+ version = "0.3";
+ sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
+ meta = {
+ homepage = "http://github.com/willdonnelly/io-storage";
+ description = "A key-value store in the IO monad";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/0.4.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/json/default.nix
rename to pkgs/development/libraries/haskell/json/0.4.4.nix
diff --git a/pkgs/development/libraries/haskell/json/0.5.nix b/pkgs/development/libraries/haskell/json/0.5.nix
new file mode 100644
index 00000000000..a748c2b4f58
--- /dev/null
+++ b/pkgs/development/libraries/haskell/json/0.5.nix
@@ -0,0 +1,17 @@
+{ cabal, mtl, parsec, syb }:
+
+cabal.mkDerivation (self: {
+ pname = "json";
+ version = "0.5";
+ sha256 = "12jbvq0lp7z5q6g94pv8s5455yydfyh9h2xlr76wqzfh3myvy6fl";
+ buildDepends = [ mtl parsec syb ];
+ meta = {
+ description = "Support for serialising Haskell to and from JSON";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
index e526c757fd7..d6716abe55f 100644
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ b/pkgs/development/libraries/haskell/largeword/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "largeword";
- version = "1.0.0";
- sha256 = "1122isizlx807zv26j0sx71iw39nn3sja6mr2pf4sd456m1vmx8r";
+ version = "1.0.1";
+ sha256 = "0kkkck220wap3ad2k6461ylhshiqbizv0qh35i2325fhqx892gyr";
meta = {
homepage = "http://trac.haskell.org/largeword/wiki";
description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix
new file mode 100644
index 00000000000..f9d7f68eaf6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/maude/default.nix
@@ -0,0 +1,18 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+ pname = "maude";
+ version = "0.2.1";
+ sha256 = "10igixljxfrpns2ffvk4g5dsv2pr8p1f7hc65z5x91n6x8zd01vi";
+ buildDepends = [ text ];
+ meta = {
+ homepage = "https://code.google.com/p/maude-hs/";
+ description = "An interface to the Maude rewriting system";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index 33ff47b2e05..b3d9208bd25 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monad-control";
- version = "0.2.0.2";
- sha256 = "18kakshbjr6nspc6m2ckpbi3sx7r10qmmbh8qbzibg19n9mnq2ni";
+ version = "0.2.0.3";
+ sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh";
buildDepends = [ baseUnicodeSymbols transformers ];
meta = {
homepage = "https://github.com/basvandijk/monad-control/";
diff --git a/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix b/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix
deleted file mode 100644
index d05201c939c..00000000000
--- a/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
- pname = "monads-fd";
- version = "0.0.0.1";
- sha256 = "7eaac97b2c91a670171f18ebeb3f73b1a45e16576851279f73ea2e1f5ec63b25";
- buildDepends = [ transformers ];
- meta = {
- description = "Monad classes, using functional dependencies";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix
index 6bea3c10844..7d119b49e44 100644
--- a/pkgs/development/libraries/haskell/neither/default.nix
+++ b/pkgs/development/libraries/haskell/neither/default.nix
@@ -1,10 +1,10 @@
-{ cabal, failure, monadPeel, transformers }:
+{ cabal, failure, transformers }:
cabal.mkDerivation (self: {
pname = "neither";
- version = "0.2.0";
- sha256 = "0a2lyx3dvgzj4g6p69x1fma4rmwxrykji3hc4diqgc4hx02p16jh";
- buildDepends = [ failure monadPeel transformers ];
+ version = "0.3.0";
+ sha256 = "0lak4y0k4cisr27vw2bnpd0pa1kkgv8r96z7vf19wg7brzarx71l";
+ buildDepends = [ failure transformers ];
meta = {
homepage = "http://github.com/snoyberg/neither";
description = "Provide versions of Either with good monad and applicative instances";
diff --git a/pkgs/development/libraries/haskell/nixos-types/default.nix b/pkgs/development/libraries/haskell/nixos-types/default.nix
index edac925eb07..b63f8a9fbdc 100644
--- a/pkgs/development/libraries/haskell/nixos-types/default.nix
+++ b/pkgs/development/libraries/haskell/nixos-types/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "nixos-types";
- version = "1.0";
- sha256 = "0zg2vz790cacl1hlhzbfpb8zw5k19v4p43ynz1wdgg6sfzvwk43s";
+ version = "1.1";
+ sha256 = "0vnlhq2pjnslq1h9h3lyaxw604s3zdhs7k8hfr35m178rdm3a5az";
buildDepends = [ regexPosix ];
meta = {
homepage = "http://github.com/haskell4nix/nixos-types";
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 4655593eb7e..455baa9ee1d 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
highlightingKate HTTP json mtl network pandocTypes parsec random
syb tagsoup texmath utf8String xhtml xml zipArchive
];
+ configureFlags = "-fhighlighting -fthreaded";
meta = {
homepage = "http://johnmacfarlane.net/pandoc";
description = "Conversion between markup formats";
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index aff6bdb7315..2bf090ab746 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -1,17 +1,16 @@
-{ cabal, cairo, glib, glibc, gtk2hsBuildtools, mtl, pango
-, pkgconfig
+{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
}:
cabal.mkDerivation (self: {
pname = "pango";
- version = "0.12.0";
- sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb";
+ version = "0.12.1";
+ sha256 = "0bfwgz2wx0hw9lrf9fdc0pic7xjkiqnv1wr1lfp55gm2qhakz83w";
buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ cairo pango ];
meta = {
- homepage = "http://www.haskell.org/gtk2hs/";
+ homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Pango text rendering engine";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index c3df4263d43..af69ad9d267 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -1,12 +1,12 @@
-{ cabal, monadControl, persistent, text, webRoutesQuasi }:
+{ cabal, monadControl, persistent, text }:
cabal.mkDerivation (self: {
pname = "persistent-template";
- version = "0.5.1";
- sha256 = "163j36pm6fl64m4h8kgj9h19snh026ia1166p3c6rjw86qi9fk0r";
- buildDepends = [ monadControl persistent text webRoutesQuasi ];
+ version = "0.6.2";
+ sha256 = "1gnqryn701b97fwzjhkk4x4k7p1w5w8cdn5x9hz8sb68vkgrplfx";
+ buildDepends = [ monadControl persistent text ];
meta = {
- homepage = "http://www.yesodweb.com/";
+ homepage = "http://www.yesodweb.com/book/persistent";
description = "Type-safe, non-relational, multi-backend persistence";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 20c1458e333..9329faad348 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,20 +1,18 @@
-{ cabal, blazeHtml, enumerator, monadControl, parsec, pool, sqlite
-, text, time, transformers
+{ cabal, blazeHtml, enumerator, monadControl, mtl, pathPieces, pool
+, sqlite, text, time, transformers
}:
cabal.mkDerivation (self: {
pname = "persistent";
- version = "0.5.1";
- sha256 = "1m0558vi99z15q0w62a9rkz25n8djswggbad9m0il359jb3mrzsd";
- isLibrary = true;
- isExecutable = true;
+ version = "0.6.2";
+ sha256 = "1bzv3wqqy32z20xbda8kr4m1fybnziv0gp6m8v3w0brrvmns20g2";
buildDepends = [
- blazeHtml enumerator monadControl parsec pool text time
+ blazeHtml enumerator monadControl mtl pathPieces pool text time
transformers
];
extraLibraries = [ sqlite ];
meta = {
- homepage = "http://docs.yesodweb.com/book/persistent";
+ homepage = "http://www.yesodweb.com/book/persistent";
description = "Type-safe, non-relational, multi-backend persistence";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix
index eae26f81b3a..51befe00ce4 100644
--- a/pkgs/development/libraries/haskell/pool/default.nix
+++ b/pkgs/development/libraries/haskell/pool/default.nix
@@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "pool";
- version = "0.1.0.4";
- sha256 = "11jsls81njkwhn48xdyrqydhr4yz82g7a6pji80ckplkdyycgx6p";
+ version = "0.1.1";
+ sha256 = "0h498pi7048m4cida10s28dp9f8c2ig3m4s9chwrfw3yiyai926l";
buildDepends = [ monadControl transformers ];
meta = {
- homepage = "http://github.com/snoyberg/pool";
+ homepage = "http://www.yesodweb.com/book/persistent";
description = "Thread-safe resource pools";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/0.3.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/primitive/default.nix
rename to pkgs/development/libraries/haskell/primitive/0.3.1.nix
diff --git a/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix
new file mode 100644
index 00000000000..62693a6d096
--- /dev/null
+++ b/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "primitive";
+ version = "0.4.0.1";
+ sha256 = "08j7js5y2vk3ywfhs260fxngd725xkvhrp20dcwb67fk8qgxh4bz";
+ meta = {
+ homepage = "http://code.haskell.org/primitive";
+ description = "Wrappers for primitive operations";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
new file mode 100644
index 00000000000..5459b8fa6dc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
@@ -0,0 +1,18 @@
+{ cabal, fgl, graphviz, mtl, prolog, text }:
+
+cabal.mkDerivation (self: {
+ pname = "prolog-graph-lib";
+ version = "0.1";
+ sha256 = "1gryhk0jd8bvmjbjkz6n7sfnsa6iwzkckpgi51xsj5f2nwdxbl6g";
+ buildDepends = [ fgl graphviz mtl prolog text ];
+ meta = {
+ homepage = "https://github.com/Erdwolf/prolog";
+ description = "Generating images of resolution trees for Prolog queries";
+ license = self.stdenv.lib.licenses.publicDomain;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix
new file mode 100644
index 00000000000..446a430ed7c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix
@@ -0,0 +1,23 @@
+{ cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text
+}:
+
+cabal.mkDerivation (self: {
+ pname = "prolog-graph";
+ version = "0.1.0.2";
+ sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [
+ cmdargs fgl graphviz mtl prolog prologGraphLib text
+ ];
+ meta = {
+ homepage = "https://github.com/Erdwolf/prolog";
+ description = "A command line tool to visualize query resolution in Prolog";
+ license = self.stdenv.lib.licenses.publicDomain;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix
new file mode 100644
index 00000000000..6702e2e3887
--- /dev/null
+++ b/pkgs/development/libraries/haskell/prolog/default.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, parsec, syb, thLift, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "prolog";
+ version = "0.1";
+ sha256 = "00791fb1f84wq42wvacnjl290fbn28x9hknxsic3ksi3f7psladm";
+ buildDepends = [ mtl parsec syb thLift transformers ];
+ meta = {
+ homepage = "https://github.com/Erdwolf/prolog";
+ description = "A Prolog interpreter written in Haskell";
+ license = self.stdenv.lib.licenses.publicDomain;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index feb82912195..a094ee687e6 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "random-fu";
- version = "0.2";
- sha256 = "1w5bqhhh07xr377whgfbzn57p77j8ng5nmy2rx8qnqyw8smlkxzm";
+ version = "0.2.1.0";
+ sha256 = "0jm91xjrlzj25f3giiv2ka5r8bn1ircj56d5lpqixi7c7r9dc804";
buildDepends = [
erf gamma monadLoops mtl randomShuffle randomSource rvar syb
transformers vector
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.0.nix b/pkgs/development/libraries/haskell/random/1.0.1.0.nix
new file mode 100644
index 00000000000..275a1a09736
--- /dev/null
+++ b/pkgs/development/libraries/haskell/random/1.0.1.0.nix
@@ -0,0 +1,17 @@
+{ cabal, time }:
+
+cabal.mkDerivation (self: {
+ pname = "random";
+ version = "1.0.1.0";
+ sha256 = "1ghdmjzcn6n02x4gffa4g7wag4g7azrgxk3nsc5fqn9iny6rwp2i";
+ buildDepends = [ time ];
+ meta = {
+ description = "random number library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix
index d7c20f57123..0ba35027050 100644
--- a/pkgs/development/libraries/haskell/ranges/default.nix
+++ b/pkgs/development/libraries/haskell/ranges/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ranges";
- version = "0.2.3";
- sha256 = "1jmybrwwvg8zkbxjrlrahfavlf2g2584ld15hzhch317683nvr1p";
+ version = "0.2.4";
+ sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv";
meta = {
description = "Ranges and various functions on them";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 8dd7e04ec79..4b4e5458df2 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "regular";
- version = "0.3.2";
- sha256 = "104rz28a22p5pn3rdzvmh13s1hpr46n463cfaz3w3bj9cimi2rcj";
+ version = "0.3.3";
+ sha256 = "1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7";
meta = {
description = "Generic programming library for regular datatypes";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index 0ca84003fbf..991c1a3d779 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa-algorithms";
- version = "2.1.0.1";
- sha256 = "101j18s2vqaxls87jzrlhzy2hlhqvgs27cs89j187c1s8z5vvjjg";
+ version = "2.2.0.1";
+ sha256 = "1ggxa2h2swgf7621nrzlqmmyi3h2v526w69zcwvms84kyd257p4p";
buildDepends = [ repa vector ];
meta = {
homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix
index 8dfe4159d53..b06072d798b 100644
--- a/pkgs/development/libraries/haskell/repa-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/repa-bytestring/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa-bytestring";
- version = "2.1.0.1";
- sha256 = "01kvbd1kn0irldnfihhxa2jrz8fy1x9g7vz60ffgagj6yzp4bsnq";
+ version = "2.2.0.1";
+ sha256 = "0yc814wyiy5cb9j04515rv24mm4qd5xqyz2dxsmg1p46qb69hvsg";
buildDepends = [ repa vector ];
meta = {
homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index 04f75ae8c57..75d18daa635 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa-examples";
- version = "2.1.0.2";
- sha256 = "056y2x8kada4d6a89sni2469c736z3d9ldp188n3i58h4kjqqfq7";
+ version = "2.2.0.1";
+ sha256 = "0rqpq4v2ir86x9z0aw8pcz929imcw9lf415j88kg12x2rk451mm0";
isLibrary = false;
isExecutable = true;
buildDepends = [ random repa repaAlgorithms repaIo vector ];
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
index 000f412a3da..e4eb113a435 100644
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ b/pkgs/development/libraries/haskell/repa-io/default.nix
@@ -1,10 +1,10 @@
-{ cabal, bmp, repa, repaBytestring }:
+{ cabal, binary, bmp, repa, repaBytestring, vector }:
cabal.mkDerivation (self: {
pname = "repa-io";
- version = "2.1.0.1";
- sha256 = "1mjv90rr1vymrnv5kz8i4kvjal6mwhb2042ylbdggvv8hjsc8awq";
- buildDepends = [ bmp repa repaBytestring ];
+ version = "2.2.0.1";
+ sha256 = "1akp6xkfvbc7jmnzlrz4y5fncqrv9d06y981dndcv6lgxz4hv4j1";
+ buildDepends = [ binary bmp repa repaBytestring vector ];
meta = {
homepage = "http://repa.ouroborus.net";
description = "Read and write Repa arrays in various formats";
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index b5667144103..ffa75a9fd4f 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa";
- version = "2.1.1.5";
- sha256 = "14lq6nsifxsap98c1hpxsyv4g973vyzjn2s94b3vfzkbq8vd7695";
+ version = "2.2.0.1";
+ sha256 = "016cigxivjd17g0hysf76b3lznjpk478q0hg9hsy154ms7xap3dy";
buildDepends = [ QuickCheck vector ];
meta = {
homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/salvia-protocol/default.nix b/pkgs/development/libraries/haskell/salvia-protocol/default.nix
deleted file mode 100644
index dbd33c17036..00000000000
--- a/pkgs/development/libraries/haskell/salvia-protocol/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, bimap, fclabels, parsec, safe, split, utf8String }:
-
-cabal.mkDerivation (self: {
- pname = "salvia-protocol";
- version = "1.0.1";
- sha256 = "6b2312e52efaa81feec7461b1a3db77e1f2a8dfd829ae878b614c206a5e48928";
- buildDepends = [ bimap fclabels parsec safe split utf8String ];
- meta = {
- description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/salvia/default.nix b/pkgs/development/libraries/haskell/salvia/default.nix
deleted file mode 100644
index e3594e1ef4a..00000000000
--- a/pkgs/development/libraries/haskell/salvia/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ cabal, fclabels, MaybeTTransformers, monadsFd, network, pureMD5
-, random, safe, salviaProtocol, split, stm, text, threadmanager
-, time, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
- pname = "salvia";
- version = "1.0.0";
- sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1";
- buildDepends = [
- fclabels MaybeTTransformers monadsFd network pureMD5 random safe
- salviaProtocol split stm text threadmanager time transformers
- utf8String
- ];
- meta = {
- description = "Modular web application framework";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
new file mode 100644
index 00000000000..0bc2f187fb2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -0,0 +1,18 @@
+{ cabal, parsec, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+ pname = "shakespeare-css";
+ version = "0.10.1";
+ sha256 = "1qdql6qcm7jzb5r1fvrmpyighn1ykrjgs9za1n9m2r47y0n03hsg";
+ buildDepends = [ parsec shakespeare text ];
+ meta = {
+ homepage = "http://www.yesodweb.com/book/templates";
+ description = "Stick your haskell variables into css at compile time";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
new file mode 100644
index 00000000000..064e1828f9d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -0,0 +1,18 @@
+{ cabal, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+ pname = "shakespeare-js";
+ version = "0.10.1";
+ sha256 = "0j9jzrnvarwkab9zynz8k60ilgj5kyqdm56lricpii27qlkqnmf3";
+ buildDepends = [ shakespeare text ];
+ meta = {
+ homepage = "http://www.yesodweb.com/book/templates";
+ description = "Stick your haskell variables into javascript/coffeescript at compile time";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
new file mode 100644
index 00000000000..7c8cfceef17
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -0,0 +1,18 @@
+{ cabal, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+ pname = "shakespeare-text";
+ version = "0.10.1";
+ sha256 = "1p05nsfmlibhpik6dd40m0djk5yckl4i2ylx9lwyi68lx0izbm5j";
+ buildDepends = [ shakespeare text ];
+ meta = {
+ homepage = "http://www.yesodweb.com/book/templates";
+ description = "Interpolation with quasi-quotation: put variables strings";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
new file mode 100644
index 00000000000..409b9b838a4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
+
+cabal.mkDerivation (self: {
+ pname = "shakespeare";
+ version = "0.10.1";
+ sha256 = "1ckzfxrs65n8cx0hm64c3jd4hbw48x1vi0cvnkz39k500jpq874f";
+ buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
+ meta = {
+ homepage = "http://www.yesodweb.com/book/templates";
+ description = "A toolkit for making compile-time interpolated templates";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
new file mode 100644
index 00000000000..2eebd665aa1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -0,0 +1,17 @@
+{ cabal, cereal, cryptoApi, tagged }:
+
+cabal.mkDerivation (self: {
+ pname = "skein";
+ version = "0.1";
+ sha256 = "10fnhbjdq4vrpl17b27pmxg943wsxv27js6p5nrgyzx9ybmdrmdi";
+ buildDepends = [ cereal cryptoApi tagged ];
+ meta = {
+ description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 4cc036ef080..5baa0c9d82b 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "snap-core";
- version = "0.5.3.1";
- sha256 = "0qwlcak1hi4cqyhnks7qqf4zq0rw2486paf0mlasyzb6ba0pwl6m";
+ version = "0.5.4";
+ sha256 = "0v6lsb60s3w96rqpp9ky8nd660zja8asw02vx1562nvd19k65jbb";
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder bytestringMmap
bytestringNums caseInsensitive deepseq dlist enumerator
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 474719a90a9..c2c1fcddbf1 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "snap-server";
- version = "0.5.3.1";
- sha256 = "0rbfklgngrpp2aggkmyamfxn9hpnz3bsxd58lw0fi4ls76bagxvz";
+ version = "0.5.4";
+ sha256 = "1kzhmn8pg2lzpqz6319lcy5lk27jcl7jlxq96x1bhnxss8k0idix";
buildDepends = [
attoparsec attoparsecEnumerator binary blazeBuilder
blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix
index 007b17507bf..9d1ae862ee1 100644
--- a/pkgs/development/libraries/haskell/svgcairo/default.nix
+++ b/pkgs/development/libraries/haskell/svgcairo/default.nix
@@ -1,15 +1,15 @@
-{ cabal, cairo, glib, glibc, gtk2hsBuildtools, librsvg, mtl }:
+{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }:
cabal.mkDerivation (self: {
pname = "svgcairo";
- version = "0.12.0";
- sha256 = "1zialw59njmq0sfz9f0rx6v50d4bvld2ivmwljkp5bmxii3hcjl3";
+ version = "0.12.1";
+ sha256 = "1nyr849ayk1fyjpxnpam1pychny609d6j2v3is84llh3gsyq99ps";
buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc ];
- pkgconfigDepends = [ cairo librsvg ];
+ extraLibraries = [ libc ];
+ pkgconfigDepends = [ librsvg ];
meta = {
- homepage = "http://www.haskell.org/gtk2hs/";
+ homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the libsvg-cairo library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
new file mode 100644
index 00000000000..172489f6b52
--- /dev/null
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -0,0 +1,18 @@
+{ cabal, systemFilepath, text, time }:
+
+cabal.mkDerivation (self: {
+ pname = "system-fileio";
+ version = "0.3.2.1";
+ sha256 = "0a0vkbj9z5i74g6kkz3n4ffmvinavmnak0zxsx0fck18ppdgv394";
+ buildDepends = [ systemFilepath text time ];
+ meta = {
+ homepage = "https://john-millikin.com/software/hs-fileio/";
+ description = "High-level filesystem interaction";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
new file mode 100644
index 00000000000..3e475d6f0e5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -0,0 +1,18 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+ pname = "system-filepath";
+ version = "0.4.1";
+ sha256 = "0jb32516xiwgbvr68yrf142fnzxfhn2dwh48nfr06gz65l7y4fcx";
+ buildDepends = [ text ];
+ meta = {
+ homepage = "https://john-millikin.com/software/hs-filepath/";
+ description = "High-level, byte-based file and directory path manipulations";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index 5a2149fa116..1f30245a320 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "tagged";
- version = "0.2.3";
- sha256 = "0d4nn0lrgj9v5hy7wgm56dgfvb5021z24sz0xmqxjy2pzq7fxwhc";
+ version = "0.2.3.1";
+ sha256 = "0ldc9w35yzlrz78kakkqial32g2c7da9b5v334jh5wpgsn7lrm3n";
buildDepends = [ dataDefault semigroups ];
meta = {
homepage = "http://github.com/ekmett/tagged";
diff --git a/pkgs/development/libraries/haskell/time/1.3.nix b/pkgs/development/libraries/haskell/time/1.4.nix
similarity index 72%
rename from pkgs/development/libraries/haskell/time/1.3.nix
rename to pkgs/development/libraries/haskell/time/1.4.nix
index 7a373459798..5ece2f13f0d 100644
--- a/pkgs/development/libraries/haskell/time/1.3.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "time";
- version = "1.3";
- sha256 = "0pkd77qz6lpalj166g91f8nz3mzcpxlzcw83yf8sl5yy4wskhmwz";
+ version = "1.4";
+ sha256 = "0y9g7kazch7747x2s4f6yp1b1ys4s0r1r1n7qsvb3dwfbfmv93pz";
+ buildDepends = [ deepseq ];
meta = {
homepage = "http://semantic.org/TimeLib/";
description = "A time library";
diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix
new file mode 100644
index 00000000000..922f7bbd62f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/type-equality/default.nix
@@ -0,0 +1,18 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "type-equality";
+ version = "0.1.0.2";
+ sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q";
+ noHaddock = true;
+ meta = {
+ homepage = "http://github.com/hesselink/type-equality/";
+ description = "Type equality, coercion/cast and other operations";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
new file mode 100644
index 00000000000..e58da04d039
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -0,0 +1,19 @@
+{ cabal, mtl, RepLib, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "unbound";
+ version = "0.3.1";
+ sha256 = "13k53dcap8knvl2qzcykx838laas34xfc0480705vzl1z9z1xppz";
+ buildDepends = [ mtl RepLib transformers ];
+ noHaddock = true;
+ meta = {
+ homepage = "http://code.google.com/p/replib/";
+ description = "Generic support for programming with names and binders";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/unix-compat/default.nix
rename to pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix
diff --git a/pkgs/development/libraries/haskell/case-insensitive/0.3.nix b/pkgs/development/libraries/haskell/unix-compat/0.3.nix
similarity index 55%
rename from pkgs/development/libraries/haskell/case-insensitive/0.3.nix
rename to pkgs/development/libraries/haskell/unix-compat/0.3.nix
index 6a59c9e840b..da13c9313ac 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/0.3.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/0.3.nix
@@ -1,12 +1,12 @@
-{ cabal, hashable, text }:
+{ cabal }:
cabal.mkDerivation (self: {
- pname = "case-insensitive";
+ pname = "unix-compat";
version = "0.3";
- sha256 = "0k3y09ak4k0jwx7bh5awcznw064xgf6yzidq3jalif7m3c9bv5q7";
- buildDepends = [ hashable text ];
+ sha256 = "0zgz9s5z2kca37sgnf4dyfdw90435h20bznx485y1ggvh377jan7";
meta = {
- description = "Case insensitive string comparison";
+ homepage = "http://github.com/jystic/unix-compat";
+ description = "Portable POSIX-compatibility layer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
index b007d137d60..096fb1932ac 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/default.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unordered-containers";
- version = "0.1.4.2";
- sha256 = "0nfw82zng9y5dinjn78k05i4c4bjc1y6yb2dwqwczb85hbrqiha6";
+ version = "0.1.4.3";
+ sha256 = "0zya72777bnmiw77rqn8k2a0g7g3j0fzpk409qb827qs3j1ffikg";
buildDepends = [ deepseq hashable ];
meta = {
description = "Efficient hashing-based container types";
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
index 4570a863f99..0928ae0347b 100644
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "utf8-string";
- version = "0.3.6";
- sha256 = "c8c74555174edfb96145585c9b80780d0fc55ba249282b8a4c5968cca7c09d69";
+ version = "0.3.7";
+ sha256 = "1s59xsw1i311rpxb7arnd280pjqab5mrlfjmxbabknka8wqlnnvq";
meta = {
homepage = "http://github.com/glguy/utf8-string/";
description = "Support for reading and writing UTF8 Strings";
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/0.5.2.nix b/pkgs/development/libraries/haskell/vector-algorithms/0.5.2.nix
deleted file mode 100644
index d58da61decc..00000000000
--- a/pkgs/development/libraries/haskell/vector-algorithms/0.5.2.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, primitive, vector }:
-
-cabal.mkDerivation (self: {
- pname = "vector-algorithms";
- version = "0.5.2";
- sha256 = "0ijn4hfaxqjvm91d7mihv62bdd7ph15h880w9lmbr93czbsp8mw1";
- buildDepends = [ primitive vector ];
- meta = {
- homepage = "http://code.haskell.org/~dolio/";
- description = "Efficient algorithms for vector arrays";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/0.4.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/vector-algorithms/0.4.nix
rename to pkgs/development/libraries/haskell/vector-algorithms/default.nix
index c8b11755420..3688bb12c28 100644
--- a/pkgs/development/libraries/haskell/vector-algorithms/0.4.nix
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vector-algorithms";
- version = "0.4";
- sha256 = "04ig2bx3gm42mwhcz5n8kp9sy33d1hrwm940kfxny74fc06422h8";
+ version = "0.5.3";
+ sha256 = "14h2x3yrb4fji8bf84xbfp84pax6lzr8njc0c4061xpwcmair36j";
buildDepends = [ primitive vector ];
meta = {
homepage = "http://code.haskell.org/~dolio/";
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
index 0052b9b4815..3cc44a018f0 100644
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space/default.nix
@@ -1,13 +1,13 @@
-{ cabal, Boolean, MemoTrie }:
+{ cabal, Boolean, MemoTrie, NumInstances }:
cabal.mkDerivation (self: {
pname = "vector-space";
- version = "0.7.3";
- sha256 = "00lzhml1pc328iw9cip9yh54n0yqkwz1mxkv4gq2wlb7bzpfq1fx";
- buildDepends = [ Boolean MemoTrie ];
+ version = "0.7.8";
+ sha256 = "195g9zsb73w4a0fcfz0kank6gyqajww0qiqivr4fy0bik2nsr6ry";
+ buildDepends = [ Boolean MemoTrie NumInstances ];
meta = {
homepage = "http://haskell.org/haskellwiki/vector-space";
- description = "Vector & affine spaces, linear maps, and derivatives (requires ghc 6.9 or better)";
+ description = "Vector & affine spaces, linear maps, and derivatives";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/0.7.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/vector/default.nix
rename to pkgs/development/libraries/haskell/vector/0.7.1.nix
diff --git a/pkgs/development/libraries/haskell/vector/0.9.nix b/pkgs/development/libraries/haskell/vector/0.9.nix
new file mode 100644
index 00000000000..549eaa4ae60
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vector/0.9.nix
@@ -0,0 +1,18 @@
+{ cabal, primitive }:
+
+cabal.mkDerivation (self: {
+ pname = "vector";
+ version = "0.9";
+ sha256 = "0m8sfp924sw5dwr9a63jgsbj98qm9nyy903842x6ii4ljb1cpynz";
+ buildDepends = [ primitive ];
+ meta = {
+ homepage = "http://code.haskell.org/vector";
+ description = "Efficient Arrays";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 79513b785d4..3fa0595bc13 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -1,17 +1,18 @@
-{ cabal, blazeBuilder, blazeHtml, fileEmbed, httpTypes, text, time
-, transformers, unixCompat, wai
+{ cabal, base64Bytestring, blazeBuilder, blazeHtml, cryptohash
+, fileEmbed, httpDate, httpTypes, text, time, transformers
+, unixCompat, wai
}:
cabal.mkDerivation (self: {
pname = "wai-app-static";
- version = "0.1.0";
- sha256 = "0k9pl1kanrb2pqp1bs5s1lxb7ayq2ddf2cxi5q2v9yq22s229xln";
+ version = "0.3.3";
+ sha256 = "04b4cw93agw136xjh9rssiw96vz3kxji7zh209brwfnwh13bra17";
buildDepends = [
- blazeBuilder blazeHtml fileEmbed httpTypes text time transformers
- unixCompat wai
+ base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
+ httpDate httpTypes text time transformers unixCompat wai
];
meta = {
- homepage = "http://www.yesodweb.com/";
+ homepage = "http://www.yesodweb.com/book/wai";
description = "WAI application for static serving";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index d18c6910a2e..9fce21f06db 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -5,14 +5,14 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
- version = "0.4.0.3";
- sha256 = "1mfjn9rxzcfdwvimjw57j7vpr1y64ia7905c8nxa9968sdy0dhsy";
+ version = "0.4.2";
+ sha256 = "1k2dsjramy14rfd1j8k7zgirdfl2zybd0z0pxkvxdrgr9s2pk51y";
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
httpTypes network text time transformers wai zlibBindings
];
meta = {
- homepage = "http://github.com/snoyberg/wai-extra";
+ homepage = "http://github.com/yesodweb/wai";
description = "Provides some basic WAI handlers and middleware";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index e7d7d48d738..d85d3629cae 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,13 +4,13 @@
cabal.mkDerivation (self: {
pname = "wai";
- version = "0.4.1";
- sha256 = "089i9qj7vban1qdrdpx836c31yakg3l3lx7y36h56livy6n37k72";
+ version = "0.4.2";
+ sha256 = "18w4wzryyqcqqihwckbz92smkqhhxh3lmi0kgxkcgivyzvhd2jqy";
buildDepends = [
blazeBuilder enumerator httpTypes network text transformers
];
meta = {
- homepage = "http://github.com/snoyberg/wai";
+ homepage = "https://github.com/yesodweb/wai";
description = "Web Application Interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 50c046b8975..b461e36d33f 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
- version = "0.4.3.1";
- sha256 = "19cj4jhl647gyy6nl3x2vi6v4g0y9q3w5a5lxvvfnfwgmcqnq3lk";
+ version = "0.4.5";
+ sha256 = "0ql9a7qa6ivsvgr66hgj6bs8c3y8rr320kk1cxq9qbpi00gy5j8b";
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
httpTypes network simpleSendfile transformers unixCompat wai
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
new file mode 100644
index 00000000000..33527b9affd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "xhtml";
+ version = "3000.2.0.4";
+ sha256 = "07kqii5dsfdaf46y4k19l9llhzhxssr24jbjpr5i8p1qh7117abw";
+ meta = {
+ homepage = "https://github.com/haskell/xhtml";
+ description = "An XHTML combinator library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix
index cf77f04379c..016c841eb07 100644
--- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix
@@ -1,21 +1,19 @@
{ cabal, attoparsecText, attoparsecTextEnumerator, blazeBuilder
-, blazeBuilderEnumerator, enumerator, failure, text, transformers
-, xmlTypes
+, blazeBuilderEnumerator, dataDefault, enumerator, failure, text
+, transformers, xmlTypes
}:
cabal.mkDerivation (self: {
pname = "xml-enumerator";
- version = "0.3.4";
- sha256 = "0sfscsfcfmx56sdxc0wn2j1pyqjd9w92igz1n9xaph7zfz61g9k2";
- isLibrary = true;
- isExecutable = true;
+ version = "0.4.1";
+ sha256 = "081avccvkakcbf2m22xdda63jhwykqxxclmlhj6msawkyyqniadj";
buildDepends = [
attoparsecText attoparsecTextEnumerator blazeBuilder
- blazeBuilderEnumerator enumerator failure text transformers
- xmlTypes
+ blazeBuilderEnumerator dataDefault enumerator failure text
+ transformers xmlTypes
];
meta = {
- homepage = "http://github.com/snoyberg/xml-enumerator";
+ homepage = "http://github.com/snoyberg/xml";
description = "Pure-Haskell utilities for dealing with XML with the enumerator package";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index 1125ac1b544..b5a56e3a1fa 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, text }:
cabal.mkDerivation (self: {
pname = "xml";
- version = "1.3.9";
- sha256 = "1sx6k5dscpcy4aq09g7h0fz0sl4w2nrr4pnklgwrbrh6bf6kc6w2";
+ version = "1.3.10";
+ sha256 = "0mmibqzbbqmw4a8gc4f2yy144nx48gpfwj3iqq6dydvcikajxav2";
+ buildDepends = [ text ];
meta = {
homepage = "http://code.galois.com";
description = "A simple XML library";
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index c1027ad269e..e13e0e50c90 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -1,10 +1,14 @@
-{ cabal, network, tagsoup, utf8String }:
+{ cabal, attoparsecText, cssText, network, tagsoup, text
+, utf8String
+}:
cabal.mkDerivation (self: {
pname = "xss-sanitize";
- version = "0.2.6";
- sha256 = "18bkvrrkc0ga0610f8g3vghq0ib1yczn2n2zbzv7kg7m6bqgx2y5";
- buildDepends = [ network tagsoup utf8String ];
+ version = "0.3.0.1";
+ sha256 = "1rycdjl7b7bk100vgdwy6iighdqsbsyvrklp0zqbl1x45abph9pc";
+ buildDepends = [
+ attoparsecText cssText network tagsoup text utf8String
+ ];
meta = {
homepage = "http://github.com/gregwebs/haskell-xss-sanitize";
description = "sanitize untrusted HTML to prevent XSS attacks";
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index cf192efb6c5..56d5c43887b 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,18 +1,19 @@
-{ cabal, aeson, authenticate, blazeHtml, controlMonadAttempt
+{ cabal, aesonNative, authenticate, blazeHtml, controlMonadAttempt
, hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate
-, pureMD5, random, SHA, text, transformers, wai, webRoutesQuasi
-, yesodCore, yesodForm, yesodJson, yesodPersistent
+, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text
+, transformers, wai, yesodCore, yesodForm, yesodJson
+, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod-auth";
- version = "0.4.0.2";
- sha256 = "1vf02kgm3pcak4igvp8009lgv8i8bir272byw0ma2mg6bl0sgyvl";
+ version = "0.7.2";
+ sha256 = "18i1ijxrhmmxy45ymc89f7m2zazd7lca4jv4q08d7mr1hdgsx8cn";
buildDepends = [
- aeson authenticate blazeHtml controlMonadAttempt hamlet
+ aesonNative authenticate blazeHtml controlMonadAttempt hamlet
httpEnumerator mimeMail persistent persistentTemplate pureMD5
- random SHA text transformers wai webRoutesQuasi yesodCore yesodForm
- yesodJson yesodPersistent
+ pwstoreFast random SHA shakespeareCss text transformers wai
+ yesodCore yesodForm yesodJson yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index ae7ffbb1bb6..5321294e55a 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,19 +1,19 @@
{ cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal
, clientsession, cookie, enumerator, failure, hamlet, httpTypes
-, monadControl, parsec, random, text, time, transformers, wai
-, waiExtra, webRoutesQuasi
+, monadControl, parsec, pathPieces, random, shakespeare
+, shakespeareCss, shakespeareJs, strictConcurrency, text, time
+, transformers, wai, waiExtra
}:
cabal.mkDerivation (self: {
pname = "yesod-core";
- version = "0.8.3.2";
- sha256 = "0k0lgd9p8mrwwcypx1nfr1z2rq5wk4gvjc1fbvla0c9nabqnbfzs";
- isLibrary = true;
- isExecutable = true;
+ version = "0.9.2";
+ sha256 = "1h9w5fgdr4w4ikp5axzxmsvc14ikbsjmlwd2lmlrh1cjcx8xzjwf";
buildDepends = [
blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie
- enumerator failure hamlet httpTypes monadControl parsec random text
- time transformers wai waiExtra webRoutesQuasi
+ enumerator failure hamlet httpTypes monadControl parsec pathPieces
+ random shakespeare shakespeareCss shakespeareJs strictConcurrency
+ text time transformers wai waiExtra
];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 9014e1433d2..fab623a2926 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -1,16 +1,16 @@
{ cabal, blazeBuilder, blazeHtml, dataDefault, emailValidate
-, hamlet, network, persistent, text, time, transformers
-, webRoutesQuasi, xssSanitize, yesodCore, yesodPersistent
+, hamlet, network, persistent, shakespeareCss, shakespeareJs, text
+, time, transformers, wai, xssSanitize, yesodCore, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod-form";
- version = "0.1.0.1";
- sha256 = "108652256g82xapsn0w4cbficq4ikwlsa8yis2zq7izxk48livlm";
+ version = "0.3.2.1";
+ sha256 = "1gzd8vs9nabv7vf41b5xxwy49yak9jd3mpxkg4yx7pndm4321hp9";
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
- persistent text time transformers webRoutesQuasi xssSanitize
- yesodCore yesodPersistent
+ persistent shakespeareCss shakespeareJs text time transformers wai
+ xssSanitize yesodCore yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index 982ebfdf1dc..2e5df42d9da 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -1,10 +1,10 @@
-{ cabal, aeson, blazeTextual, hamlet, text, vector, yesodCore }:
+{ cabal, aesonNative, shakespeareJs, text, vector, yesodCore }:
cabal.mkDerivation (self: {
pname = "yesod-json";
- version = "0.1.1.2";
- sha256 = "0d6dkhzjpxp3687x914h67swm4lgsalb1xr13gz53ddb0qj18n7j";
- buildDepends = [ aeson blazeTextual hamlet text vector yesodCore ];
+ version = "0.2.1";
+ sha256 = "1d710pqrdafyz8s0spd19vwvx5v9kwy44wb0byz3445jhi3kwn88";
+ buildDepends = [ aesonNative shakespeareJs text vector yesodCore ];
meta = {
homepage = "http://www.yesodweb.com/";
description = "Generate content for Yesod using the aeson package";
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index 866ece71ded..187780f9ebb 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yesod-persistent";
- version = "0.1.0";
- sha256 = "1h0kk3sx0c4c3pcg3s2c5kfy0kz7gci45h4gsgrkhkcgg0pg324c";
+ version = "0.2.1";
+ sha256 = "1ka8jsxr7i5rcjxnv82ykq34yqxqzxdvk4b3ck7pbvx2a4g7bxw9";
buildDepends = [
failure persistent persistentTemplate transformers yesodCore
];
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 281f14c862c..8fbc8baff49 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,16 +1,14 @@
-{ cabal, base64Bytestring, cereal, pureMD5, text, transformers
-, waiAppStatic, yesodCore
+{ cabal, base64Bytestring, cereal, fileEmbed, httpTypes, pureMD5
+, text, transformers, unixCompat, wai, waiAppStatic, yesodCore
}:
cabal.mkDerivation (self: {
pname = "yesod-static";
- version = "0.1.0.1";
- sha256 = "0icb1wp0ndvl54shjyv0apmias60j2gjbcv7i92dxnl3fzx74d3p";
- isLibrary = true;
- isExecutable = true;
+ version = "0.3.0.1";
+ sha256 = "1dvg60kawmvczwxvkxzx5k19y36i23fi0faw71ck58mlkjdczby5";
buildDepends = [
- base64Bytestring cereal pureMD5 text transformers waiAppStatic
- yesodCore
+ base64Bytestring cereal fileEmbed httpTypes pureMD5 text
+ transformers unixCompat wai waiAppStatic yesodCore
];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 72af9d343e3..e4947dc94f2 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -1,20 +1,21 @@
-{ cabal, attoparsecText, blazeBuilder, hamlet, hjsmin, httpTypes
-, mimeMail, monadControl, parsec, text, time, transformers
-, unixCompat, wai, waiExtra, warp, yesodAuth, yesodCore, yesodForm
-, yesodJson, yesodPersistent, yesodStatic
+{ cabal, attoparsecText, blazeBuilder, blazeHtml, hamlet, httpTypes
+, monadControl, parsec, shakespeareCss, shakespeareJs
+, shakespeareText, text, time, transformers, unixCompat, wai
+, waiExtra, warp, yesodAuth, yesodCore, yesodForm, yesodJson
+, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod";
- version = "0.8.2.1";
- sha256 = "0idpgzbzy31bl5khc83wgi9a9mzrymris0mg5dlc4kj4sd5a1ksi";
+ version = "0.9.2.2";
+ sha256 = "09l7cdsrxlr1nb03h3nisih9sm824gnp3nkblvgh8b1pfi54wdkl";
isLibrary = true;
isExecutable = true;
buildDepends = [
- attoparsecText blazeBuilder hamlet hjsmin httpTypes mimeMail
- monadControl parsec text time transformers unixCompat wai waiExtra
- warp yesodAuth yesodCore yesodForm yesodJson yesodPersistent
- yesodStatic
+ attoparsecText blazeBuilder blazeHtml hamlet httpTypes monadControl
+ parsec shakespeareCss shakespeareJs shakespeareText text time
+ transformers unixCompat wai waiExtra warp yesodAuth yesodCore
+ yesodForm yesodJson yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
index b5d4fbe83c5..6398ba4b275 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-bindings";
- version = "0.0.0";
- sha256 = "168sll6mrmcnvdmdx79izqxcrli1s7asp4qilhkqss8w0jlrv1ni";
+ version = "0.0.1";
+ sha256 = "0m8q155yyrd4q1ddfmmhdx88mg1875ywrlr484qwpcyd58gn3bkv";
isLibrary = true;
isExecutable = true;
buildDepends = [ zlib ];
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index ad6f4536604..d37b7dd0b7f 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = "libdrm-2.4.24";
src = fetchurl {
@@ -10,16 +10,19 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig libpthreadstubs ];
+ patches = [ ./libdrm-apple.patch ];
+
preConfigure = ''
# General case: non intel.
if test -n "$crossConfig"; then
configureFlags="$configureFlags --disable-intel";
fi
- '';
+ '' + stdenv.lib.optionalString stdenv.isDarwin
+ "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
meta = {
homepage = http://dri.freedesktop.org/libdrm/;
description = "Library for accessing the kernel's Direct Rendering Manager";
license = "bsd";
};
-}
+} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "-C" ]; }))
diff --git a/pkgs/development/libraries/libdrm/libdrm-apple.patch b/pkgs/development/libraries/libdrm/libdrm-apple.patch
new file mode 100644
index 00000000000..e9fd63c5fae
--- /dev/null
+++ b/pkgs/development/libraries/libdrm/libdrm-apple.patch
@@ -0,0 +1,88 @@
+diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel_bufmgr_gem.c
+--- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c 2011-04-01 10:30:51.000000000 -0400
++++ libdrm-2.4.26/intel/intel_bufmgr_gem.c 2011-08-29 02:17:20.000000000 -0400
+@@ -51,6 +51,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "errno.h"
+ #include "libdrm_lists.h"
+@@ -987,9 +988,9 @@
+ if (atomic_dec_and_test(&bo_gem->refcount)) {
+ drm_intel_bufmgr_gem *bufmgr_gem =
+ (drm_intel_bufmgr_gem *) bo->bufmgr;
+- struct timespec time;
++ struct timeval time;
+
+- clock_gettime(CLOCK_MONOTONIC, &time);
++ gettimeofday(&time, NULL);
+
+ pthread_mutex_lock(&bufmgr_gem->lock);
+ drm_intel_gem_bo_unreference_final(bo, time.tv_sec);
+diff -Naur libdrm-2.4.26-orig/xf86drm.c libdrm-2.4.26/xf86drm.c
+--- libdrm-2.4.26-orig/xf86drm.c 2011-03-21 09:39:24.000000000 -0400
++++ libdrm-2.4.26/xf86drm.c 2011-08-29 02:17:49.000000000 -0400
+@@ -51,6 +51,9 @@
+ #include
+ #include
+ #include
++#if defined(__APPLE__) && defined(__MACH__)
++#include
++#endif
+
+ /* Not all systems have MAP_FAILED defined */
+ #ifndef MAP_FAILED
+@@ -1941,20 +1944,43 @@
+ */
+ int drmWaitVBlank(int fd, drmVBlankPtr vbl)
+ {
++#if defined(__APPLE__) && defined(__MACH__)
++ uint64_t start, end, elapsed, elapsedNano;
++ static const uint64_t maxElapsed = 2000000000;
++ static mach_timebase_info_data_t timebaseInfo;
++ if ( timebaseInfo.denom == 0 ) {
++ (void) mach_timebase_info(&timebaseInfo);
++ }
++#else
+ struct timespec timeout, cur;
++#endif
+ int ret;
+
++#if defined(__APPLE__) && defined(__MACH__)
++ start = mach_absolute_time();
++#else
+ ret = clock_gettime(CLOCK_MONOTONIC, &timeout);
+ if (ret < 0) {
+ fprintf(stderr, "clock_gettime failed: %s\n", strerror(ret));
+ goto out;
+ }
+ timeout.tv_sec++;
++#endif
+
+ do {
+ ret = ioctl(fd, DRM_IOCTL_WAIT_VBLANK, vbl);
+ vbl->request.type &= ~DRM_VBLANK_RELATIVE;
+ if (ret && errno == EINTR) {
++#if defined(__APPLE__) && defined(__MACH__)
++ end = mach_absolute_time();
++ elapsed = end - start;
++ elapsedNano = elapsed * timebaseInfo.numer / timebaseInfo.denom;
++ if (elapsedNano > maxElapsed) {
++ errno = EBUSY;
++ ret = -1;
++ break;
++ }
++#else
+ clock_gettime(CLOCK_MONOTONIC, &cur);
+ /* Timeout after 1s */
+ if (cur.tv_sec > timeout.tv_sec + 1 ||
+@@ -1964,6 +1990,7 @@
+ ret = -1;
+ break;
+ }
++#endif
+ }
+ } while (ret && errno == EINTR);
+
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index a134fbacf0b..b532f3283d4 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -2,11 +2,11 @@
, ffmpeg, exiv2, libgsf, rpm, pkgconfig, glib, gtk }:
stdenv.mkDerivation rec {
- name = "libextractor-0.5.23";
+ name = "libextractor-0.6.2";
src = fetchurl {
url = "mirror://gnu/libextractor/${name}.tar.gz";
- sha256 = "1zyfshayjrp7kd87pm7blyq0dvbv5bbh3f368pp4jws4qxs8aj9f";
+ sha256 = "1pyh599717vjblyjch95r76afdxfhrzqr7nx1pz1davy5fpsw5aw";
};
preConfigure =
diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix
index 455380f5589..ef8439b8b88 100644
--- a/pkgs/development/libraries/libgadu/default.nix
+++ b/pkgs/development/libraries/libgadu/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, zlib}:
stdenv.mkDerivation {
- name = "libgadu-1.9.0";
+ name = "libgadu-1.11.0";
src = fetchurl {
- url = http://toxygen.net/libgadu/files/libgadu-1.9.0.tar.gz;
- sha256 = "1ygmda23hf7cysns9kglsiljzb4x8339n878k70yacgzm07dryhj";
+ url = http://toxygen.net/libgadu/files/libgadu-1.11.0.tar.gz;
+ sha256 = "045a0bd395k3ramdvlzyfx3878p42fv4r04rgasmdsm2n33wgm38";
};
+ buildInputs = [ zlib ];
+
meta = {
description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)";
homepage = http://toxygen.net/libgadu/;
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index 30819082969..e452097e50d 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
meta = {
description = "A BiTtorrent library used by KTorrent";
homepage = http://ktorrent.org;
+ inherit (kdelibs.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index ed213c75959..90888ce0961 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, curl}:
stdenv.mkDerivation rec {
- name = "libmicrohttpd-0.4.4";
+ name = "libmicrohttpd-0.9.9";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
- sha256 = "1w486b4hpwnzpc4zdywm3f1q5zs7j4yh7xibbsig6b8cv1npn0rz";
+ sha256 = "0059isy80cmxv44dhngnsc4g25kwxdcfis5yrva199r0vnb8ab6c";
};
buildInputs = [ curl ];
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
new file mode 100644
index 00000000000..a45bc9fdf8d
--- /dev/null
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -0,0 +1,47 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="libmodplug";
+ version="0.8.8.4";
+ name="${baseName}-${version}";
+ url="mirror://sourceforge/project/modplug-xmms/${baseName}/${version}/${name}.tar.gz";
+ hash="1xv44bd84c4qi41i1wwjr6qzazx15l85yvi74sz49ldyvlyy2pjw";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "Music library";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.publicDomain;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://sourceforge.net/projects/modplug-xmms/files/libmodplug/";
+ };
+ };
+}) x
+
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index bfd0a6b98b1..16fe511f1f1 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, zlib, xz }:
assert zlib != null;
stdenv.mkDerivation rec {
- name = "libpng-1.2.44";
+ name = "libpng-1.2.46";
src = fetchurl {
- url = "mirror://sourceforge/libpng/${name}.tar.gz";
- md5 = "89b62f8daaeeab1342e307d6d1411ff1";
+ url = "mirror://sourceforge/libpng/${name}.tar.xz";
+ sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn";
};
propagatedBuildInputs = [ zlib ];
+ buildNativeInputs = [ xz ];
+
passthru = { inherit zlib; };
meta = {
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index df952a25315..8666f6233a9 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -10,11 +10,11 @@ assert sslSupport -> openssl != null;
assert static || shared;
stdenv.mkDerivation rec {
- name = "neon-0.29.3";
+ name = "neon-0.29.6";
src = fetchurl {
url = "http://www.webdav.org/neon/${name}.tar.gz";
- sha256 = "1d1c6zhr00yvg0fbhpkq8kmsq9cchr112ii9rl39gdybyflh9444";
+ sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w";
};
buildInputs = [libxml2 pkgconfig openssl]
diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 80b9a858712..22c2fb14aca 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, gmp, gnum4 }:
stdenv.mkDerivation rec {
- name = "nettle-2.2";
+ name = "nettle-2.4";
src = fetchurl {
# Eventually use `mirror://gnu/'.
url = "ftp://ftp.lysator.liu.se/pub/security/lsh/${name}.tar.gz";
- sha256 = "1kdl842x1x4wk80bi0k1d2ci8hqsmgjdb5zvrlmyakb8pfhw3gl2";
+ sha256 = "0gwwcipmjxkv7p2p01m19n4c3jiczg682w58l5dgg0b8vw494056";
};
buildInputs = [ gnum4 ];
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index f4ed2381010..ef5cfee5930 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
postPatch = ''
sed -i -e "/^PREFIX =/s:= /usr:= $out:" \
"mozilla/security/nss/config/Makefile"
+ ln -s Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk
'';
preConfigure = "cd mozilla/security/nss";
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index e2d811ab339..bd1c97c3043 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }:
+{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python, automake
+, autoconf }:
let
version = "014";
@@ -14,11 +15,27 @@ stdenv.mkDerivation rec {
buildInputs = [ libnl qt4 ];
- buildNativeInputs = [ pkgconfig python ];
+ buildNativeInputs = [ pkgconfig python automake autoconf ];
configureFlags = "--without-gobject CFLAGS=--std=gnu99";
- postPatch = ''
- sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
+ patchP0 = fetchurl {
+ url = http://bazaar.launchpad.net/~asac/ntrack/main/diff/312/309;
+ name = "ntrack-bzr-309-to-312.patch";
+ sha256 = "1bpjpikln2i7nsmd2gl82g08yzaqac311sgsva7z7pqccxz0vsj5";
+ };
+
+ patchP1 = fetchurl {
+ url = "https://bugs.launchpad.net/ntrack/+bug/750554/+attachment/2291609/+files/ntrack_libnl_link.diff";
+ sha256 = "1al6wfjph7nmck1q2q2z98cnzcrwpln2wwh45xynsxr6wgczwck6";
+ };
+
+ patchPhase =
+ ''
+ patch -p0 < ${patchP0}
+ patch -p1 < ${patchP1}
+ sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
'';
+
+ preConfigure = "automake"; # The second patch changes Makefile.am files
}
diff --git a/pkgs/development/libraries/openssl/1.0.0e.nix b/pkgs/development/libraries/openssl/1.0.0e.nix
new file mode 100644
index 00000000000..01f9eca15bb
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.0.0e.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, perl }:
+
+let
+ name = "openssl-1.0.0e";
+
+ opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
+ (throw "openssl needs its platform name cross building" null)
+ stdenv.cross;
+in
+
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "http://www.openssl.org/source/${name}.tar.gz";
+ sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
+ };
+
+ patches =
+ [ # Allow the location of the X509 certificate file (the CA
+ # bundle) to be set through the environment variable
+ # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the
+ # default location ($out/ssl/cert.pem) doesn't exist, and
+ # hardcoding something like /etc/ssl/cert.pem is impure and
+ # cannot be overriden per-process. For security, the
+ # environment variable is ignored for setuid binaries.
+ ./cert-file.patch
+ ]
+ ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
+
+ buildNativeInputs = [ perl ];
+
+ # On x86_64-darwin, "./config" misdetects the system as
+ # "darwin-i386-cc". So specify the system type explicitly.
+ configureScript =
+ if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config";
+
+ configureFlags = "shared --libdir=lib";
+
+ makeFlags = "MANDIR=$(out)/share/man";
+
+ postInstall =
+ ''
+ # If we're building dynamic libraries, then don't install static
+ # libraries.
+ if [ -n "$(echo $out/lib/*.so)" ]; then
+ rm $out/lib/*.a
+ fi
+ ''; # */
+
+ crossAttrs = {
+ preConfigure=''
+ # It's configure does not like --build or --host
+ export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
+ '';
+
+ postInstall = ''
+ # Openssl installs readonly files, which otherwise we can't strip.
+ # This could at some stdenv hash change be put out of crossAttrs, too
+ chmod -R +w $out
+
+ # Remove references to perl, to avoid depending on it at runtime
+ rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget
+ '';
+ configureScript = "./Configure";
+ };
+
+ meta = {
+ homepage = http://www.openssl.org/;
+ description = "A cryptographic library that implements the SSL and TLS protocols";
+ platforms = stdenv.lib.platforms.all;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch
new file mode 100644
index 00000000000..6b7a60e9026
--- /dev/null
+++ b/pkgs/development/libraries/openssl/cert-file.patch
@@ -0,0 +1,35 @@
+diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypto/x509/x509_def.c
+--- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.000000000 +0200
++++ openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609 +0200
+@@ -57,6 +57,10 @@
+ */
+
+ #include
++#include
++#include
++#include
++#include
+ #include "cryptlib.h"
+ #include
+ #include
+@@ -71,7 +75,19 @@
+ { return(X509_CERT_DIR); }
+
+ const char *X509_get_default_cert_file(void)
+- { return(X509_CERT_FILE); }
++ {
++ static char buf[PATH_MAX] = X509_CERT_FILE;
++ static int init = 0;
++ if (!init) {
++ init = 1;
++ char * s = getenv("OPENSSL_X509_CERT_FILE");
++ if (s && getuid() == geteuid()) {
++ strncpy(buf, s, sizeof(buf));
++ buf[sizeof(buf) - 1] = 0;
++ }
++ }
++ return buf;
++ }
+
+ const char *X509_get_default_cert_dir_env(void)
+ { return(X509_CERT_DIR_EVP); }
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4897d08574d..e51b88f5bca 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,13 +1,15 @@
{ stdenv, fetchurl, perl }:
let
+ name = "openssl-1.0.0d";
+
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null)
stdenv.cross;
in
-stdenv.mkDerivation rec {
- name = "openssl-1.0.0d";
+stdenv.mkDerivation {
+ inherit name;
src = fetchurl {
url = "http://www.openssl.org/source/${name}.tar.gz";
@@ -17,12 +19,12 @@ stdenv.mkDerivation rec {
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
buildNativeInputs = [ perl ];
-
+
# On x86_64-darwin, "./config" misdetects the system as
# "darwin-i386-cc". So specify the system type explicitly.
configureScript =
if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config";
-
+
configureFlags = "shared --libdir=lib";
postInstall =
@@ -54,5 +56,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.openssl.org/;
description = "A cryptographic library that implements the SSL and TLS protocols";
+ platforms = stdenv.lib.platforms.all;
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix
index 7488154373d..7c6119b5a86 100644
--- a/pkgs/development/libraries/pango/1.28.x.nix
+++ b/pkgs/development/libraries/pango/1.28.x.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
+{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng }:
stdenv.mkDerivation rec {
- name = "pango-1.28.4";
+ name = src.pkgname;
- src = fetchurl {
- url = "mirror://gnome/sources/pango/1.28/${name}.tar.bz2";
- sha256 = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f";
+ src = fetchurl_gnome {
+ project = "pango";
+ major = "1"; minor = "28"; patchlevel = "4";
+ sha256 = "17ssy12pqs2s0d89zyhwmkcrbpip6jyf5m8ll9libl0dq6y3bc3y";
};
- buildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin gettext;
+ buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
+
+ buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ x11 glib cairo libpng ];
diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix
new file mode 100644
index 00000000000..14dd3d8c5a5
--- /dev/null
+++ b/pkgs/development/libraries/pango/1.29.x.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng, xz }:
+
+stdenv.mkDerivation rec {
+ name = src.pkgname;
+
+ src = fetchurl_gnome {
+ project = "pango";
+ major = "1"; minor = "29"; patchlevel = "3"; extension = "xz";
+ sha256 = "0vp88j3ghngkkc4dpya443qng0bb1g86g54bcwf4lf3zmk6r1nmh";
+ };
+
+ buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
+
+ buildNativeInputs = [ pkgconfig xz ];
+
+ propagatedBuildInputs = [ x11 glib cairo libpng ];
+
+ postInstall = "rm -rf $out/share/gtk-doc";
+
+ meta = {
+ description = "A library for laying out and rendering of text, with an emphasis on internationalization";
+
+ longDescription = ''
+ Pango is a library for laying out and rendering of text, with an
+ emphasis on internationalization. Pango can be used anywhere
+ that text layout is needed, though most of the work on Pango so
+ far has been done in the context of the GTK+ widget toolkit.
+ Pango forms the core of text and font handling for GTK+-2.x.
+ '';
+
+ homepage = http://www.pango.org/;
+ license = "LGPLv2+";
+
+ maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/pangomm/2.26.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
similarity index 70%
rename from pkgs/development/libraries/pangomm/2.26.x.nix
rename to pkgs/development/libraries/pangomm/2.28.x.nix
index ce1c5207e32..59b6eca64d3 100644
--- a/pkgs/development/libraries/pangomm/2.26.x.nix
+++ b/pkgs/development/libraries/pangomm/2.28.x.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
+{ stdenv, fetchurl_gnome, pkgconfig, pango, glibmm, cairomm, libpng }:
stdenv.mkDerivation rec {
- name = "pangomm-2.26.0";
+ name = src.pkgname;
- src = fetchurl {
- url = "mirror://gnome/sources/pangomm/2.26/${name}.tar.bz2";
- sha256 = "0ph93cjbzmb36k6a9cjd1pcch0ba4bzq1jnf69f1xj0j5kjfn9mz";
+ src = fetchurl_gnome {
+ project = "pangomm";
+ major = "2"; minor = "28"; patchlevel = "2";
+ sha256 = "13yq5zwxzliiss4ladaa7di2b3s965p3zbz7s0ccz9ddbqj9f7gc";
};
- buildInputs = [ pkgconfig ];
+ buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ pango glibmm cairomm libpng ];
meta = {
diff --git a/pkgs/development/libraries/poppler/datadir_env.patch b/pkgs/development/libraries/poppler/datadir_env.patch
index dfe024a5b23..fd111d71355 100644
--- a/pkgs/development/libraries/poppler/datadir_env.patch
+++ b/pkgs/development/libraries/poppler/datadir_env.patch
@@ -1,56 +1,13 @@
-diff -ur poppler-0.6.1/poppler/GlobalParams.cc poppler-0.6.1-patched/poppler/GlobalParams.cc
---- poppler-0.6.1/poppler/GlobalParams.cc 2007-09-17 20:37:58.000000000 +0200
-+++ poppler-0.6.1-patched/poppler/GlobalParams.cc 2007-11-06 16:11:55.995595933 +0100
-@@ -654,27 +654,39 @@
+diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
+index 2e11bb0..a277ab9 100644
+--- a/poppler/GlobalParams.cc
++++ b/poppler/GlobalParams.cc
+@@ -748,7 +748,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
+ void GlobalParams::scanEncodingDirs() {
GDir *dir;
GDirEntry *entry;
-
-- dir = new GDir(POPPLER_DATADIR "/nameToUnicode", gFalse);
-+ GooString *real_datadir = new GooString (getenv("POPPLER_DATADIR"));
-+ if (!real_datadir->getCString())
-+ real_datadir->Set(POPPLER_DATADIR);
-+ GooString *dirname;
-+
-+ dirname = real_datadir->copy();
-+ dir = new GDir(dirname->append("/nameToUnicode")->getCString(), gFalse);
- while (entry = dir->getNextEntry(), entry != NULL) {
- parseNameToUnicode(entry->getFullPath());
- delete entry;
- }
- delete dir;
-+ delete dirname;
-
-- dir = new GDir(POPPLER_DATADIR "/cidToUnicode", gFalse);
-+ dirname = real_datadir->copy();
-+ dir = new GDir(dirname->append("/cidToUnicode")->getCString(), gFalse);
- while (entry = dir->getNextEntry(), entry != NULL) {
- addCIDToUnicode(entry->getName(), entry->getFullPath());
- delete entry;
- }
- delete dir;
-+ delete dirname;
-
-- dir = new GDir(POPPLER_DATADIR "/unicodeMap", gFalse);
-+ dirname = real_datadir->copy();
-+ dir = new GDir(dirname->append("/unicodeMap")->getCString(), gFalse);
- while (entry = dir->getNextEntry(), entry != NULL) {
- addUnicodeMap(entry->getName(), entry->getFullPath());
- delete entry;
- }
- delete dir;
-+ delete dirname;
-
-+ dirname = real_datadir->copy();
- dir = new GDir(POPPLER_DATADIR "/cMap", gFalse);
- while (entry = dir->getNextEntry(), entry != NULL) {
- addCMapDir(entry->getName(), entry->getFullPath());
-@@ -682,6 +694,9 @@
- delete entry;
- }
- delete dir;
-+ delete dirname;
-+
-+ delete real_datadir;
- }
-
- void GlobalParams::parseNameToUnicode(GooString *name) {
+- const char *dataRoot = popplerDataDir ? popplerDataDir : POPPLER_DATADIR;
++ const char *dataRoot = popplerDataDir ? popplerDataDir : ( getenv("POPPLER_DATADIR") ? getenv("POPPLER_DATADIR") : POPPLER_DATADIR );
+
+ // allocate buffer large enough to append "/nameToUnicode"
+ size_t bufSize = strlen(dataRoot) + strlen("/nameToUnicode") + 1;
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 3091c6497e5..bb19338cc88 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
+ patches = [ ./datadir_env.patch ];
+
# XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
# such as `../../../test/unittestcases/UseNone.pdf'.
#doCheck = !qt4Support;
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index 0631389ac0e..b025e9a68a9 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -1,11 +1,16 @@
-{ stdenv, fetchurl, bison, pkgconfig }:
+{ stdenv
+, fetchurl
+, bison
+, pkgconfig
+, multipleOutputs ? false #Uses incomplete features of nix!
+}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = "sphinxbase-0.7";
src = fetchurl {
url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
- sha256 = "0xab4ph9215rw5865gihmahbbnbi58klll5xg0il9ifld4wdjacq";
+ sha256 = "1v3kfzw42ahxmr002i6wqigs832958vgghrv5dd62zazajdbk71q";
};
buildInputs = [ pkgconfig bison ];
@@ -16,4 +21,15 @@ stdenv.mkDerivation rec {
license = "free-non-copyleft";
maintainers = [ stdenv.lib.maintainers.shlevy ];
};
-}
+} // (stdenv.lib.optionalAttrs multipleOutputs {
+ outputs = [ "out" "lib" "headers" ];
+
+ postInstall = ''
+ ensureDir $lib
+ cp -av $out/lib* $lib
+
+ ensureDir $headers
+ cp -av $out/include $headers
+ '';
+}))
+
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 2f9007c1bb1..1888ef2aab6 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
-, clucene_core, fam, zlib, dbus
+, clucene_core, fam, zlib, dbus_tools
}:
stdenv.mkDerivation rec {
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "16qqnlh0dy3r92shzm2q36h5qi3m06pihr4h5cq944hpvqz5w7qi";
};
- includeAllQtDirs=true;
+ includeAllQtDirs = true;
CLUCENE_HOME = clucene_core;
buildInputs =
- [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus.tools ];
+ [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 07634ce09f3..06bd5823e87 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
homepage = http://www.crosswire.org/sword/;
platforms = stdenv.lib.platforms.linux;
license = "GPLv2";
+ maintainers = [ stdenv.lib.maintainers.piotr ];
};
}
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index f8fe2330cf9..54db07d0de8 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-talloc-compat1 --enable-largefile";
+ # https://bugzilla.samba.org/show_bug.cgi?id=7000
+ postConfigure = if stdenv.isDarwin then ''
+ substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -install_name"
+ '' else "";
+
meta = {
description = "talloc is a hierarchical pool based memory allocator with destructors";
homepage = http://tdb.samba.org/;
diff --git a/pkgs/development/libraries/tcp-wrappers/default.nix b/pkgs/development/libraries/tcp-wrappers/default.nix
new file mode 100644
index 00000000000..1cb6472971c
--- /dev/null
+++ b/pkgs/development/libraries/tcp-wrappers/default.nix
@@ -0,0 +1,74 @@
+x@{builderDefsPackage
+ , flex, bison
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="tcp-wrappers";
+ version="7.6";
+ name="${baseName}-${version}";
+ url="http://ftp.porcupine.org/pub/security/tcp_wrappers_${version}.tar.gz";
+ hash="0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["setVars" "doUnpack" "fixMakefile" "doPatch"
+ "doMake" "doDeploy"];
+
+ patches = [./have-strerror.patch ./trivial-fixes.patch];
+
+ makeFlags = [
+ "REAL_DAEMON_DIR=$out/bin"
+ "STYLE='\"-DHAVE_STRERROR -DSYS_ERRLIST_DEFINED\"'"
+ "generic"
+ ];
+
+ setVars = a.noDepEntry ''
+ export NIX_LDFLAGS="$NIX_LDFLAGS -lnsl"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+ '';
+
+ fixMakefile = a.fullDepEntry ''
+ chmod u+w Makefile
+ echo 'libwrap.so: $(LIB_OBJ)' >> Makefile
+ echo ' ld $(LIB_OBJ) --shared -o libwrap.so' >> Makefile
+ '' ["minInit"];
+
+ doDeploy = a.fullDepEntry ''
+ ensureDir "$out"/{sbin,lib}
+ make libwrap.so
+ cp libwrap.{a,so} "$out/lib"
+ find . -perm +111 -a ! -name '*.*' -exec cp '{}' "$out/sbin" ';'
+ '' ["defEnsureDir" "minInit"];
+
+ meta = {
+ description = "Network logging TCP wrappers";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = "free-noncopyleft";
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://ftp.porcupine.org/pub/security/index.html";
+ };
+ };
+}) x
diff --git a/pkgs/development/libraries/tcp-wrappers/have-strerror.patch b/pkgs/development/libraries/tcp-wrappers/have-strerror.patch
new file mode 100644
index 00000000000..626fce1a88a
--- /dev/null
+++ b/pkgs/development/libraries/tcp-wrappers/have-strerror.patch
@@ -0,0 +1,20 @@
+Debian patch
+diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c
+--- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100
++++ tcp_wrappers_7.6/percent_m.c 2003-08-21 02:45:31.000000000 +0200
+@@ -29,11 +29,15 @@
+
+ while (*bp = *cp)
+ if (*cp == '%' && cp[1] == 'm') {
++#ifdef HAVE_STRERROR
++ strcpy(bp, strerror(errno));
++#else
+ if (errno < sys_nerr && errno > 0) {
+ strcpy(bp, sys_errlist[errno]);
+ } else {
+ sprintf(bp, "Unknown error %d", errno);
+ }
++#endif
+ bp += strlen(bp);
+ cp += 2;
+ } else {
diff --git a/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch b/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch
new file mode 100644
index 00000000000..1e55819f8de
--- /dev/null
+++ b/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch
@@ -0,0 +1,27 @@
+Debian patch
+diff -ruNp tcp_wrappers_7.6.orig/options.c tcp_wrappers_7.6/options.c
+--- tcp_wrappers_7.6.orig/options.c 2006-03-01 23:45:28.000000000 +0100
++++ tcp_wrappers_7.6/options.c 2006-03-01 22:55:44.000000000 +0100
+@@ -41,6 +41,7 @@ static char sccsid[] = "@(#) options.c 1
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c
+--- tcp_wrappers_7.6.orig/scaffold.c 2006-03-01 23:45:28.000000000 +0100
++++ tcp_wrappers_7.6/scaffold.c 2006-03-01 22:56:13.000000000 +0100
+@@ -17,6 +17,7 @@ static char sccs_id[] = "@(#) scaffold.c
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -28,3 +28,2 @@
+
+-extern char *malloc();
+
diff --git a/pkgs/development/libraries/wxGTK-2.6/default.nix b/pkgs/development/libraries/wxGTK-2.6/default.nix
index 1496682f5e3..710400ab094 100644
--- a/pkgs/development/libraries/wxGTK-2.6/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.6/default.nix
@@ -2,12 +2,6 @@
, compat22 ? false, compat24 ? true, unicode ? true
}:
-assert pkgconfig != null && gtk != null;
-assert gtk.libtiff != null;
-assert gtk.libjpeg != null;
-assert gtk.libpng != null;
-assert gtk.libpng.zlib != null;
-
stdenv.mkDerivation {
name = "wxGTK-2.6.4";
@@ -16,10 +10,9 @@ stdenv.mkDerivation {
sha256 = "1yilzg9qxvdpqhhd3sby1w9pj00k7jqw0ikmwyhh5jmaqnnnrb2x";
};
- buildInputs = [
- pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
- libXinerama libSM libXxf86vm xf86vidmodeproto
- ];
+ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto ];
+
+ buildNativeInputs = [ pkgconfig ];
configureFlags = [
"--enable-gtk2"
diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index 1cfa57b24d2..0bfe4c2335c 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -2,12 +2,6 @@
, mesa, compat24 ? false, compat26 ? true, unicode ? true,
}:
-assert pkgconfig != null && gtk != null;
-assert gtk.libtiff != null;
-assert gtk.libjpeg != null;
-assert gtk.libpng != null;
-assert gtk.libpng.zlib != null;
-
stdenv.mkDerivation {
name = "wxGTK-2.8.12";
@@ -16,10 +10,9 @@ stdenv.mkDerivation {
sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
};
- buildInputs = [
- pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
- libXinerama libSM libXxf86vm xf86vidmodeproto mesa
- ];
+ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+
+ buildNativeInputs = [ pkgconfig ];
configureFlags = [
"--enable-gtk2"
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
index 433f7fe2187..0520adef4dc 100644
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
@@ -2,12 +2,6 @@
, mesa, compat24 ? false, compat26 ? true, unicode ? true,
}:
-assert pkgconfig != null && gtk != null;
-assert gtk.libtiff != null;
-assert gtk.libjpeg != null;
-assert gtk.libpng != null;
-assert gtk.libpng.zlib != null;
-
stdenv.mkDerivation {
name = "wxwidgets-2.9.0";
@@ -16,10 +10,9 @@ stdenv.mkDerivation {
sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
};
- buildInputs = [
- pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
- libXinerama libSM libXxf86vm xf86vidmodeproto mesa
- ];
+ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+
+ buildNativeInputs = [ pkgconfig ];
configureFlags = [
"--enable-gtk2"
diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index 8385a52db19..2f83d3cc03f 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -2,12 +2,6 @@
, mesa, compat24 ? false, compat26 ? true, unicode ? true,
}:
-assert pkgconfig != null && gtk != null;
-assert gtk.libtiff != null;
-assert gtk.libjpeg != null;
-assert gtk.libpng != null;
-assert gtk.libpng.zlib != null;
-
stdenv.mkDerivation {
name = "wxwidgets-2.9.1";
@@ -16,10 +10,9 @@ stdenv.mkDerivation {
sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
};
- buildInputs = [
- pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
- libXinerama libSM libXxf86vm xf86vidmodeproto mesa
- ];
+ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+
+ buildNativeInputs = [ pkgconfig ];
configureFlags = [
"--enable-gtk2"
diff --git a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix
index b0e2ec7d2b1..f6e0da66d78 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix
@@ -1,11 +1,11 @@
-{fetchurl, buildPerlPackage, bzip2}:
+{ fetchurl, buildPerlPackage, bzip2 }:
buildPerlPackage rec {
- name = "Compress-Raw-Bzip2-2.015";
+ name = "Compress-Raw-Bzip2-2.037";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
- sha256 = "0rc49w7i552j89ws85h7s1bzvs17m065lgy3mj23h0gplkbjnwkp";
+ url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
+ sha256 = "0fhl8dh8mhvpqfqm85amv694ybflckqhyli9y18x8viwaddbxqpy";
};
# Don't build a private copy of bzip2.
diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index e83ae68b954..f2e96a49053 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -1,11 +1,11 @@
-{fetchurl, buildPerlPackage, zlib}:
+{ fetchurl, buildPerlPackage, zlib }:
buildPerlPackage rec {
- name = "Compress-Raw-Zlib-2.015";
+ name = "Compress-Raw-Zlib-2.037";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
- sha256 = "0g6kz73jxqjfln2pi500y7rr96mhad16hrp5wy6542fapamv4xcd";
+ url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
+ sha256 = "18grvxjlsqlqiwxgdf26s4z4q9ag0vacrswxbyaqf11a03sciw7d";
};
preConfigure = ''
diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix
index d574909d4e2..8819605528d 100644
--- a/pkgs/development/python-modules/wxPython/2.8.nix
+++ b/pkgs/development/python-modules/wxPython/2.8.nix
@@ -2,14 +2,16 @@
assert wxGTK.unicode;
+let version = "2.8.12.1"; in
+
stdenv.mkDerivation {
- name = "wxPython-2.8.12.0";
+ name = "wxPython-${version}";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://sourceforge/wxpython/wxPython-src-2.8.12.0.tar.bz2;
- sha256 = "1gdsk1p8ds4jd00habxy4y8m56247a5s1mvq1lm1r6475dvq4pkd";
+ url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
+ sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
};
buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ];
diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix
index 3661ece97bf..b269ebb4a88 100644
--- a/pkgs/development/tools/haskell/BNFC-meta/default.nix
+++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "BNFC-meta";
- version = "0.2.1";
- sha256 = "0c58m1xkaylgp9f3r71nfgqb30fpidldz46dbwalhkb7fm0k4gmm";
+ version = "0.2.2";
+ sha256 = "07jfc0dcrcckibbw0xca1h7x3lnc9jfylfkcs23f0hyg31irf8dx";
buildDepends = [ alexMeta happyMeta haskellSrcMeta ];
meta = {
description = "Deriving Quasi-Quoters from BNF Grammars";
diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix
index 58d8c3e1a10..5ec29160bb4 100644
--- a/pkgs/development/tools/haskell/alex-meta/default.nix
+++ b/pkgs/development/tools/haskell/alex-meta/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "alex-meta";
- version = "0.2.0.1";
- sha256 = "1b508pg4a9f0ln9k91j5dj0mja3faxasz5k6qyxqz3zqnlysm2gj";
+ version = "0.2.0.2";
+ sha256 = "1v47p1nrx2nb92aasq7ml6i0sy1nfyybgm9n4r1sw1g86dg1y8z1";
buildDepends = [ haskellSrcMeta ];
meta = {
description = "Quasi-quoter for Alex lexers";
diff --git a/pkgs/development/libraries/haskell/emgm/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix
similarity index 54%
rename from pkgs/development/libraries/haskell/emgm/default.nix
rename to pkgs/development/tools/haskell/cabal-ghci/default.nix
index 0172369d1e9..ad452a663e8 100644
--- a/pkgs/development/libraries/haskell/emgm/default.nix
+++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix
@@ -1,14 +1,14 @@
{ cabal }:
cabal.mkDerivation (self: {
- pname = "emgm";
- version = "0.3.1";
- sha256 = "956923ec4d51f111ca6091ebccf75a1f6b99d7a173ea673cbb4787bf08f497a8";
+ pname = "cabal-ghci";
+ version = "0.1.1";
+ sha256 = "09r66fv8ncsdj90zrhg4srxhmbhmf7q61kvfc39x4jbyskgciqms";
isLibrary = true;
isExecutable = true;
meta = {
- homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM";
- description = "Extensible and Modular Generics for the Masses";
+ homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki";
+ description = "Set up ghci with options taken from a .cabal file";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index ff0765fd339..5c354c8e156 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -1,12 +1,12 @@
-{ cabal, HTTP, mtl, nixosTypes, regexPosix }:
+{ cabal, hackageDb, HTTP, mtl, nixosTypes, regexPosix }:
cabal.mkDerivation (self: {
pname = "cabal2nix";
- version = "1.12";
- sha256 = "14bijci07hkm3ksbqpzbnmwiysy5s3ll89r2iqkr1rbmj7bqxdwy";
+ version = "1.17";
+ sha256 = "0pga0rfghpvjazhs0mgnxg2kf82m8bsmlx3g9pxhiw5f4amfr2g7";
isLibrary = false;
isExecutable = true;
- buildDepends = [ HTTP mtl nixosTypes regexPosix ];
+ buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
meta = {
homepage = "http://github.com/haskell4nix/cabal2nix";
description = "Convert Cabal files into Nix build instructions";
diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
index f73d61924c5..a57ff5f6b88 100644
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ b/pkgs/development/tools/haskell/happy-meta/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "happy-meta";
- version = "0.2.0.2";
- sha256 = "1r9i01bnw0dz10balhpgiwcls5jwv5p09jafi8jl6hy0jwx7xydp";
+ version = "0.2.0.3";
+ sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9";
buildDepends = [ haskellSrcMeta mtl ];
meta = {
description = "Quasi-quoter for Happy parsers";
diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
index 7787ea203ee..35b3dec9c86 100644
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -1,15 +1,15 @@
-{ cabal, binary, cairo, ghcEvents, glade, gtk, mtl }:
+{ cabal, binary, cairo, ghcEvents, glib, gtk, mtl, pango }:
cabal.mkDerivation (self: {
pname = "threadscope";
- version = "0.1.3";
- sha256 = "1vak3624vrnkfvwxzfw5hkc0552v213jb874f6q536g5vhjjxpih";
+ version = "0.2.0";
+ sha256 = "0b8lc8han4d90wgzliy80l1gbkm09gg6qxsn37blj41wzl6yzr9k";
isLibrary = false;
isExecutable = true;
- buildDepends = [ binary cairo ghcEvents glade gtk mtl ];
+ buildDepends = [ binary cairo ghcEvents glib gtk mtl pango ];
configureFlags = "--ghc-options=-rtsopts";
meta = {
- description = "A graphical thread profiler";
+ description = "A graphical tool for profiling parallel Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index 7af637cd665..f25afb170e8 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uuagc-cabal";
- version = "1.0.0.5";
- sha256 = "1is7kcbx7hlrzqxqz40sggniwxwnzd6k18dxsra4bibfcg8fvy4h";
+ version = "1.0.0.6";
+ sha256 = "1ij84n2pjhqyz10vsa9qxk4k227wg1c96rq5sylvcwdkzciww81d";
buildDepends = [ mtl uulib ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 508acd0199a..b9a3f598c5c 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -6,8 +6,24 @@ in
stdenv.mkDerivation rec {
name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
+ # WARNING: Upstream made a mistake in packaging that may mean anyone
+ # but the FSF hosting this tarball is accidentally in violation of
+ # the GPL. We can't update binutils until the next stdenv-updates,
+ # so we are stuck with this version. The issue is discussed in
+ # this email: http://sourceware.org/ml/binutils/2011-08/msg00198.html
+ # The tarball for this minor version will not be fixed, as only the
+ # tarballs for the latest minor version of each major version will
+ # be repackaged. The fixed sources for the closest version to this one
+ # can be found at mirror://gnu/binutils/binutils-2.21.1a.tar.bz2
+ # or http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2
+ # The sources missing from this tarball come from cgen. It is unclear
+ # WHICH sources should be included, but the cvs tree can be checked out
+ # by:
+ # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src login
+ # {enter "anoncvs" as the password}
+ # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co cgen
src = fetchurl {
- url = "mirror://gnu/binutils/${basename}.tar.bz2";
+ url = "http://nixos.org/tarballs/${basename}.tar.bz2";
sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d";
};
diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix
new file mode 100644
index 00000000000..0ef9c47dcc5
--- /dev/null
+++ b/pkgs/development/tools/misc/dbench/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchgit, autoconf, popt, zlib}:
+
+stdenv.mkDerivation rec {
+ name = "dbench-20101121";
+
+ buildInputs = [autoconf popt zlib];
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ src = fetchgit {
+ url = git://git.samba.org/sahlberg/dbench.git;
+ rev = "8b5143bcc0f4409553392fdf12fd21c95a075fae";
+ sha256 = "607a62b7ff2e9b1393980777e0ba239215dd8145bc1a34649bcbe2b1e567006d";
+ };
+
+ postInstall = ''
+ cp -R loadfiles/* $out/share
+ '';
+
+}
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index c29fcc994e2..7da5ac31e2a 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -11,7 +11,7 @@ let
basename =
if bleedingEdgeVersion
then "gdb-7.3.20110726"
- else "gdb-7.3";
+ else "gdb-7.3.1";
in
stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
url = "mirror://gnu/gdb/${basename}.tar.bz2";
# md5 is provided by the annoucement page
# http://www.gnu.org/s/gdb/download/ANNOUNCEMENT
- md5 = "485022b8df7ba2221f217e128f479fe7";
+ md5 = "b89a5fac359c618dda97b88645ceab47";
};
# I think python is not a native input, but I leave it
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
configureFlags = with stdenv.lib;
'' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline
- --with-expat --with-libexpat-prefix=${expat} --with-python
+ --with-expat --with-libexpat-prefix=${expat}
''
+ optionalString (target != null) " --target=${target.config}"
+ optionalString (elem stdenv.system platforms.cygwin) " --without-python"
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 6ef449b3c2a..93d3641de72 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libtool, ncurses }:
stdenv.mkDerivation rec {
- name = "global-5.9.7";
+ name = "global-6.0";
src = fetchurl {
url = "mirror://gnu/global/${name}.tar.gz";
- sha256 = "1vhsa44fxmgc41l7gw904dhdq0kl0xw16wb9n8r22bw0nmfad5z8";
+ sha256 = "1nwhlxd97grq8ynw7szv5lcxiqgqifiy1jqaa45664hd6bv1i5xx";
};
buildInputs = [ libtool ncurses ];
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 2c6bac20f10..caa277bfbf5 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -1,38 +1,41 @@
-{stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool,
-unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite,
-subversion, openssh, coreutils, findutils, gzip, bzip2, lzma,
-gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit
+{ stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool
+, unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite
+, subversion, openssh, coreutils, findutils, gzip, bzip2, lzma
+, gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit
}:
let
- perldeps = with perlPackages; [
- CatalystDevel
- CatalystPluginSessionStoreFastMmap
- CatalystPluginStackTrace
- CatalystPluginAuthorizationRoles
- CatalystAuthenticationStoreDBIxClass
- CatalystViewTT
- CatalystEngineHTTPPrefork
- CatalystViewDownload
- XMLSimple
- IPCRun
- IOCompressBzip2
- Readonly
- DBDPg
- EmailSender
- TextTable
- NetTwitterLite
- PadWalker
- DataDump
- JSONXS
- DateTime
- DigestSHA1
- CryptRandPasswd
- nixPerl
- ];
+
+ perldeps = with perlPackages;
+ [ CatalystDevel
+ CatalystPluginSessionStoreFastMmap
+ CatalystPluginStackTrace
+ CatalystPluginAuthorizationRoles
+ CatalystAuthenticationStoreDBIxClass
+ CatalystViewTT
+ CatalystEngineHTTPPrefork
+ CatalystViewDownload
+ XMLSimple
+ IPCRun
+ IOCompress
+ Readonly
+ DBDPg
+ EmailSender
+ TextTable
+ NetTwitterLite
+ PadWalker
+ DataDump
+ JSONXS
+ DateTime
+ DigestSHA1
+ CryptRandPasswd
+ nixPerl
+ ];
+
+ version = "0.1pre27592";
+
in
-let version = "0.1pre27592"; in
stdenv.mkDerivation {
name = "hydra-${version}";
diff --git a/pkgs/development/tools/misc/patchelf/0.6.nix b/pkgs/development/tools/misc/patchelf/0.6.nix
index 68cdf47e48b..5a2a7c1d716 100644
--- a/pkgs/development/tools/misc/patchelf/0.6.nix
+++ b/pkgs/development/tools/misc/patchelf/0.6.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "patchelf-0.6pre23458";
-
+ name = "patchelf-0.6pre29192";
+
src = fetchurl {
- url = "http://hydra.nixos.org/build/838169/download/2/patchelf-0.6pre23458.tar.bz2";
- sha256 = "18d74n14s4xh8aqwisvz63gx9j4d5b9bzb8k1jnp8whvvwzasdq5";
+ url = "http://hydra.nixos.org/build/1319933/download/2/${name}.tar.bz2";
+ sha256 = "1873d76994c112355f53d1ac6233ce334d0852ce67cae6b21f492b9b8e0b48b5";
};
meta = {
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index a370757b37c..6bd2619e4d3 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "12n2faqq7whmszpjhv2lcb06r7900j53p0zl7vipi18inr0smycy";
};
- buildInputs = [ xz perl ];
+ buildNativeInputs = [ xz perl ];
meta = {
homepage = http://strace.sourceforge.net/;
diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix
index 5b52d222f37..cc5c60a3d43 100644
--- a/pkgs/development/tools/parsing/happy/1.18.4.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.4.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl }:
+{ cabal, mtl, perl }:
cabal.mkDerivation (self: {
pname = "happy";
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
isLibrary = false;
isExecutable = true;
buildDepends = [ mtl ];
+ buildTools = [ perl ];
meta = {
homepage = "http://www.haskell.org/happy/";
description = "Happy is a parser generator for Haskell";
diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index b30d7ec793f..c34160976e3 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -1,17 +1,15 @@
-{cabal, binary, mtl, zlib, vty, ConfigFile, MissingH, filepath}:
+{ cabal, binary, ConfigFile, gtk, MissingH, mtl, random, zlib }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "LambdaHack";
- version = "0.1.20110117";
- name = self.fname;
- sha256 = "186ccl1yq0r84h9azzwj0zyy3kf905i3kjlnziyi52ysqd61qw90";
- propagatedBuildInputs =
- [binary mtl zlib vty ConfigFile MissingH filepath];
- preConfigure = ''
- sed -i 's|\(filepath.*\) && < 1.2|\1|' ${self.pname}.cabal
- '';
+ version = "0.1.20110918";
+ sha256 = "14zn650x7r65lb76hygz6yiwzbg2rbcyisi7kx2lszrbg0fp8pa9";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ binary ConfigFile gtk MissingH mtl random zlib ];
meta = {
- description = "a small roguelike game";
+ homepage = "http://github.com/kosmikus/LambdaHack";
+ description = "A roguelike game engine in early development";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix
index 7e90d448a8b..99bf2d41fd6 100644
--- a/pkgs/games/crack-attack/default.nix
+++ b/pkgs/games/crack-attack/default.nix
@@ -8,19 +8,17 @@ stdenv.mkDerivation {
sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm";
};
- buildInputs =
- [
- pkgconfig gtk freeglut SDL mesa libXi libXmu
- ];
+ buildInputs = [ pkgconfig gtk freeglut SDL mesa libXi libXmu ];
- meta = {
+ meta = {
description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!";
homepage = http://www.nongnu.org/crack-attack/;
license = "GPLv2";
platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.piotr ];
};
- patches = [
+ patches = [
./crack-attack-1.1.14-gcc43.patch
./crack-attack-1.1.14-glut.patch
];
diff --git a/pkgs/games/liquidwar/src-for-default.nix b/pkgs/games/liquidwar/src-for-default.nix
index d676adfdb14..a67b1e816f7 100644
--- a/pkgs/games/liquidwar/src-for-default.nix
+++ b/pkgs/games/liquidwar/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="0.0.9beta";
- name="liquidwar-0.0.9beta";
- hash="1a4yqh79y6s3f6dv5kkwjdqzi62y3qbwrx6420fqpvdn1694ycr9";
+ version="0.0.10beta";
+ name="liquidwar-0.0.10beta";
+ hash="1fc1qfl7p3669dj6dy1wxvf85hhwgbazm3rc365ahsikdgz1c5m0";
url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz";
- advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.9beta/liquidwar6-0.0.9beta.tar.gz";
+ advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.10beta/liquidwar6-0.0.10beta.tar.gz";
}
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index 18a86f2d85c..63fae5df0fc 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -1,29 +1,34 @@
{stdenv, fetchurl, mesa, openal, autoconf, automake, libtool, freealut, wxGTK,
-freetype, fftw, SDL, SDL_net, zlib, libpng, libjpeg} :
+freetype, fftwSinglePrec, SDL, SDL_net, zlib, libpng, libjpeg, pkgconfig, libogg,
+libvorbis} :
stdenv.mkDerivation {
- name = "scorched3d-42.1";
+ name = "scorched3d-43.2a";
src = fetchurl {
- url = mirror://sourceforge/scorched3d/Scorched3D-42.1-src.tar.gz;
- sha256 = "0vhhi68ii5ldxbacsiqccsascrn3q033hnaa1ha8r9gxspzcqkl8";
+ url = mirror://sourceforge/scorched3d/Scorched3D-43.2a-src.tar.gz;
+ sha256 = "1hv1mnfb7y51hqmg95l8rx00j66ff32ddxxi5zgfyw92hsvahgxi";
};
- buildInputs = [ mesa openal autoconf automake libtool freealut wxGTK
- freetype fftw SDL SDL_net zlib libpng libjpeg ];
+ buildInputs =
+ [ mesa openal freealut wxGTK freetype fftwSinglePrec SDL_net zlib libpng libjpeg
+ libogg libvorbis ];
- unpackPhase = "tar xvzf $src ; cd scorched";
+ buildNativeInputs = [ pkgconfig ];
- patches = [ ./scorched3d-42.1-fixups.patch ./file-existence.patch ];
+ patches = [ ./file-existence.patch ];
- preConfigure = ''
- set +e
- aclocal
- libtoolize --copy --force
- autoconf
- automake
- libtoolize
- set -e
- '';
+ sourceRoot = "scorched";
+
+ configureFlags = "--with-fftw=${fftwSinglePrec}";
+
+# Fake openal-config
+ preConfigure =
+ ''
+ mkdir -pv mybin
+ export PATH=$PATH:$PWD/mybin
+ echo -e "#!/bin/sh\npkg-config openal \"$@\"" > mybin/openal-config
+ chmod +x mybin/openal-config
+ '';
meta = {
homepage = http://scorched3d.co.uk/;
diff --git a/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch b/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch
deleted file mode 100644
index 36a027cb60c..00000000000
--- a/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4
---- scorched.orig/configure-al.m4 2008-03-03 16:17:18.000000000 -0500
-+++ scorched/configure-al.m4 2009-02-15 20:43:35.000000000 -0500
-@@ -7,25 +7,9 @@
- [ --disable-openaltest Do not try to compile and run a test OpenAL program],
- , enable_openaltest=yes)
- AC_MSG_CHECKING(for OpenAL support)
--AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
--if test x$OPENAL_CONFIG = xno; then
-- echo "*** The openal-config script installed by OpenAL could not be found"
-- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG"
-- echo "*** environment variable to the full path to openal-config."
--
-- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
--else
--
-- if test x"$use_static_openal" = x"yes"; then
-- AL_LIBS="/usr/local/lib/libopenal.a"
-- else
-- AL_LIBS="`$OPENAL_CONFIG --libs`"
-- fi
--
-- AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
--
-- AC_MSG_RESULT(yes)
--fi
-+AL_LIBS="-lopenal"
-+AL_CFLAGS="-I/usr/include/AL"
-+AC_MSG_RESULT(yes)
-
- AC_MSG_CHECKING(for Freealut support)
- AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
-diff -ru scorched.orig/configure.ac scorched/configure.ac
---- scorched.orig/configure.ac 2008-03-03 16:17:18.000000000 -0500
-+++ scorched/configure.ac 2009-02-15 20:40:30.000000000 -0500
-@@ -13,22 +13,6 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-
--LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
--CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
--
--if test `uname` == Darwin; then
--LDFLAGS="$LDFLAGS -lmx"
--CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
--else
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--fi
--
--AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
-- echo "Warning: No beer found in fridge!";
-- echo "We highly suggest that you rectify this situation immediately."
--])
--
- AC_ARG_ENABLE(serveronly,
- [ --enable-serveronly Enable server only compilation],
- , enable_serveronly=no,
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index c8f98522773..9c51db1ac98 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, SDL, zlib, mpeg2dec}:
+{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }:
stdenv.mkDerivation {
name = "scummvm-1.2.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "029abzvpz85accwk7x79w255wr83gnkqg3yc5n6ryl28zg00z3j8";
};
- buildInputs = [SDL zlib mpeg2dec];
+ buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ];
crossAttrs = {
preConfigure = ''
@@ -27,3 +27,4 @@ stdenv.mkDerivation {
homepage = http://www.scummvm.org/;
};
}
+
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index dadc7f813e9..4cf215ee3b8 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -18,6 +18,7 @@
neznalek = "Vladimír Čunát ";
phreedom = "Evgeny Egorochkin ";
pierron = "Nicolas B. Pierron ";
+ piotr = "Piotr Pietraszkiewicz ";
qknight = "Joachim Schiele ";
raskin = "Michael Raskin <7c6f434c@mail.ru>";
roconnor = "Russell O'Connor ";
diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index d742544bef2..cd60b8f3b88 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -287,5 +287,12 @@ rec {
else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"])
else x;
-
+
+ /* For use in the ‘example’ option attribute. It causes the given
+ text to be included verbatim in documentation. This is necessary
+ for example values that are not simple values, e.g.,
+ functions. */
+ literalExample = text: { _type = "literalExample"; inherit text; };
+
+
}
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index b832e928bef..532ef2a45d5 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -18,5 +18,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://splix.sourceforge.net;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix
index 3883a48d056..b6669843896 100644
--- a/pkgs/misc/emulators/wine/src-for-default.nix
+++ b/pkgs/misc/emulators/wine/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="1.3.26";
- name="wine-1.3.26";
- hash="0x2frnggg2nlva1qqx4ysdnhcq9gld0p0516z922rl8c1kcb5bbc";
+ version="1.3.27";
+ name="wine-1.3.27";
+ hash="1vdyxlsl2zlhlcl5npq59axlkvjmkp7yz5p9rvwkqia79xrs8qv1";
url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
- advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.26.tar.bz2";
+ advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2";
}
diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
new file mode 100644
index 00000000000..acd8aa69905
--- /dev/null
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, xproto, libX11, libXext }:
+stdenv.mkDerivation rec {
+ name = "slock-0.9";
+ src = fetchurl {
+ url = "http://dl.suckless.org/tools/${name}.tar.gz";
+ sha256 = "1gfp2ic2i63yz8wrf5cqzv9g422j9qs249y7g4chq0brpcybgpc9";
+ };
+ buildInputs = [ xproto libX11 libXext ];
+ installFlags = "DESTDIR=\${out} PREFIX=";
+ meta = {
+ homepage = http://tools.suckless.org/slock;
+ description = "Simple X display locker";
+ longDescription = ''
+ Simple X display locker. This is the simplest X screen locker.
+ '';
+ license = "bsd";
+ maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/misc/tex/disser/default.nix b/pkgs/misc/tex/disser/default.nix
new file mode 100644
index 00000000000..eee695ea3e9
--- /dev/null
+++ b/pkgs/misc/tex/disser/default.nix
@@ -0,0 +1,56 @@
+x@{builderDefsPackage
+ , unzip, texLive, texLiveCMSuper, texLiveAggregationFun
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ ["texLive" "texLiveCMSuper" "texLiveAggregationFun"];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames))
+ ++ [(a.texLiveAggregationFun {paths=[a.texLive a.texLiveCMSuper];})];
+ sourceInfo = rec {
+ baseName="disser";
+ version="1.1.8";
+ name="${baseName}-${version}";
+ project="${baseName}";
+ url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.zip";
+ hash="15509hfcvkk5kfcza149c74qpamwgw88dg0ra749axs8xj8qmlw8";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["setVars" "doMakeInstall"];
+
+ setVars = a.noDepEntry ''
+ export HOME="$TMPDIR"
+ '';
+
+ makeFlags = ["DESTDIR=$out/share/texmf-dist"];
+
+ meta = {
+ description = "Russian PhD thesis LaTeX package";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux; # platform-independent
+ license = "free"; # LaTeX Project Public License
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://sourceforge.net/projects/disser/files/disser/";
+ };
+ };
+}) x
+
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index c0aec5a7b56..598ee26124f 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
- name = "bluez-4.95";
+ name = "bluez-4.96";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
- sha256 = "1xi087x2ggdywq63qp55wvi1iclk50hc42fp40kcsazw23j9vsnn";
+ sha256 = "16gshw7xgl0k3j3qgkdqmgvzqz6fdcna909ibvawl2brsw7xavy0";
};
buildInputs =
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix
index b3285ce3343..cadc49195e3 100644
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
description = "http://sourceforge.net/projects/bridge/";
homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
license = "GPL";
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix
index b810db2c1b5..74db3a0d890 100644
--- a/pkgs/os-specific/linux/cpufrequtils/default.nix
+++ b/pkgs/os-specific/linux/cpufrequtils/default.nix
@@ -3,11 +3,11 @@
assert stdenv.isLinux && stdenv.system != "powerpc-linux";
stdenv.mkDerivation {
- name = "cpufrequtils-005";
-
+ name = "cpufrequtils-008";
+
src = fetchurl {
- url = http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-005.tar.gz;
- md5 = "100a8220a546ce61ce943d4107e67db9";
+ url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz";
+ md5 = "52d3e09e47ffef634833f7fab168eccf";
};
patchPhase = ''
diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix
new file mode 100644
index 00000000000..b4d92158054
--- /dev/null
+++ b/pkgs/os-specific/linux/e1000e/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, kernel }:
+
+stdenv.mkDerivation {
+ name = "e1000e-1.5.1";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz";
+ sha256 = "0nzjlarpqcpm5y112n3vzra4qv32hiygpfkk10y8g4nln4adhqsw";
+ };
+
+ buildInputs = [ kernel ];
+
+ configurePhase = ''
+ cd src
+ kernel_version=$( cd ${kernel}/lib/modules && echo * )
+ sed -i -e 's|/lib/modules|${kernel}/lib/modules|' Makefile
+ export makeFlags="BUILD_KERNEL=$kernel_version"
+ '';
+
+ installPhase = ''
+ install -v -D -m 644 e1000e.ko "$out/lib/modules/$kernel_version/kernel/drivers/net/e1000e/e1000e.ko"
+ '';
+
+ dontStrip = true;
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)";
+ homepage = "http://e1000.sf.net/";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
new file mode 100644
index 00000000000..80aa6d367be
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "iwlwifi-6000g2a-ucode-17.168.5.3";
+
+ src = fetchurl {
+ url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+ sha256 = "febbbc0851db17296d35e5ca1d9266c1a14e9a9ae6ce41a36578c44971ae79f9";
+ };
+
+ buildPhase = "true";
+
+ installPhase = ''
+ ensureDir "$out"
+ chmod -x *
+ cp * "$out"
+ '';
+
+ meta = {
+ description = "Firmware for the Intel 6000 Series Gen2 wireless card";
+
+ longDescription = ''
+ This package provides the Intel 6000 Series wireless card
+ firmware. It contains the `iwlwifi-6000g2a-5.ucode' file.
+ '';
+
+ homepage = http://intellinuxwireless.org/;
+ };
+}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
new file mode 100644
index 00000000000..580af83ea9d
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "iwlwifi-6000g2b-ucode-17.168.5.2";
+
+ src = fetchurl {
+ url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+ sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052";
+ };
+
+ buildPhase = "true";
+
+ installPhase = ''
+ ensureDir "$out"
+ chmod -x *
+ cp * "$out"
+ '';
+
+ meta = {
+ description = "Firmware for the Intel 6000 Series Gen2 wireless card";
+
+ longDescription = ''
+ This package provides the Intel 6000 Series wireless card
+ firmware. It contains the `iwlwifi-6000g2b-4.ucode' file.
+ '';
+
+ homepage = http://intellinuxwireless.org/;
+ };
+}
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
index d94c5f382a5..b08c4b9bb23 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
@@ -1,8 +1,7 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
-, ... }:
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
let
- configWithPlatform = kernelPlatform :
+ configWithPlatform = kernelPlatform:
''
# Don't include any debug features.
DEBUG_KERNEL n
diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 94e43a01134..1b685cd2d94 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -149,6 +149,7 @@ let
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_L2CAP y
+ BT_SCO y # audio support
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
@@ -199,11 +200,11 @@ in
import ./generic.nix (
rec {
- version = "3.0.3";
+ version = "3.0.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
- sha256 = "1237i7a4r7a7p24ylx7wv8k34ni17lxg849xjyv54px84kbkb85n";
+ sha256 = "1vypjcdii75h5f4zsw9lm8wzxd5ix0mk5p94c96hxv828mqqkmhk";
};
config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index a2b1fcfb86f..ff421bc9cf7 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -149,6 +149,7 @@ let
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_L2CAP y
+ BT_SCO y # audio support
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
@@ -199,13 +200,14 @@ in
import ./generic.nix (
rec {
- version = "3.1-rc3";
+ version = "3.1-rc6";
- modDirVersion = "3.1.0-rc3";
+ modDirVersion = "3.1.0-rc6";
src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2";
- sha256 = "0ky6pawracgc27m0d4mq71f87yiwbp90k5aqn8qh5bdfq3ml84i6";
+ url = "https://github.com/torvalds/linux/tarball/v${version}";
+ sha256 = "047a5qkcghn0q9b611vpdwbl87qb0k0q9x0bdpywlpy644l5dfwy";
+ name = "v${version}.tar.gz";
};
config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index 56fa5eed195..f20cadabc53 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools
-, procps, kbd }:
+, procps, kbd, dbus_tools }:
let
binPath = stdenv.lib.makeSearchPath "bin"
- [ coreutils gnugrep utillinux module_init_tools procps kbd ];
+ [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ];
sbinPath = stdenv.lib.makeSearchPath "sbin"
[ procps ];
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
substituteInPlace src/pm-action.in --replace 'tr ' '${coreutils}/bin/tr '
substituteInPlace pm/sleep.d/00logging --replace /bin/uname "$(type -P uname)"
+
+ substituteInPlace pm/sleep.d/90clock --replace /sbin/hwclock hwclock
'';
meta = {
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index dad02a9e699..745d6900e90 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
-, libjpeg, libpng, ncurses }:
+, libjpeg, libpng, ncurses, python, glib }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- name = "qemu-kvm-0.14.1";
+ name = "qemu-kvm-0.15.0";
src = fetchurl {
url = "mirror://sourceforge/kvm/${name}.tar.gz";
- sha256 = "09yshk2qzlb37hyp8iygyyf2if2d7r21b7rgkl0jyvv4p1m4z755";
+ sha256 = "0y247bc2cyawliaiyk8k41kl3mcjvh52b9bgzvxv0h55zwdpg3l2";
};
patches = [ ./smb-tmpdir.patch ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
- ncurses
+ ncurses python glib
];
preBuild =
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 441a1a06c40..963a4f48d7a 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -4,17 +4,16 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- name = "upower-0.9.12";
+ name = "upower-0.9.13";
src = fetchurl {
url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6";
+ sha256 = "08jasjkp44ydvsnk020xghrshi0jspp5078id26n5nhidp1d4z9c";
};
- buildInputs =
- [ xz pkgconfig glib dbus dbus_glib polkit intltool
- libxslt docbook_xsl udev libusb1
- ];
+ buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ];
+
+ buildNativeInputs = [ xz pkgconfig ];
configureFlags = "--with-backend=linux --localstatedir=/var";
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 875a4811f92..fcb6641dfd9 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,10 +1,10 @@
-{stdenv, fetchurl, openssl, qt4, inkscape}:
+{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}:
let
- version = "0.7.2";
+ version = "0.7.3";
src = fetchurl {
url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz";
- sha256 = "1gnwhnczli50gidsq22ya68hixmdrhd1sxw202ygihvg6xsjl06z";
+ sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh";
};
in
@@ -16,15 +16,32 @@ in
cd wpa_supplicant
cp -v defconfig .config
echo CONFIG_DEBUG_SYSLOG=y | tee -a .config
+ echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config
+ echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config
+ echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config
+ echo CONFIG_DRIVER_NL80211=y | tee -a .config
substituteInPlace Makefile --replace /usr/local $out
'';
- buildInputs = [openssl];
+ buildInputs = [openssl dbus_libs libnl1];
+
+ buildNativeInputs = [ pkgconfig ];
+
+ # Upstream patch required for NetworkManager-0.9
+ patches = [ (fetchurl {
+ url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
+ name = "wpa_supplicant-nm-0.9.patch";
+ sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
+ }) ];
postInstall = ''
ensureDir $out/share/man/man5 $out/share/man/man8
cp -v doc/docbook/*.5 $out/share/man/man5/
cp -v doc/docbook/*.8 $out/share/man/man8/
+ ensureDir $out/etc/dbus-1/system.d $out/share/dbus-1/system-services
+ cp -v dbus/*service $out/share/dbus-1/system-services
+ sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
+ cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
'';
meta = {
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index 1e48381deec..22f733e40c6 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -8,12 +8,12 @@ assert sslSupport -> openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
- version = "2.2.19";
+ version = "2.2.20";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
- sha1 = "5676da63f3203129287d7c09a16cf523c00ec6cf";
+ sha1 = "c8f00a505af6ed3f89f45b640217c388f5cd32b0";
};
buildInputs = [perl apr aprutil pcre] ++
diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 96fd594aacb..dbae8aad142 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, apacheHttpd, jdk}:
stdenv.mkDerivation {
- name = "tomcat-connectors-1.2.31";
+ name = "tomcat-connectors-1.2.32";
builder = ./builder.sh;
src = fetchurl {
- url = http://apache.hippo.nl//tomcat/tomcat-connectors/jk/source/jk-1.2.31/tomcat-connectors-1.2.31-src.tar.gz;
- sha256 = "0604mcxj7zdzdl2f8krpj8ig1r5qkga3hia28pijdpvy9n6pxij8";
+ url = http://apache.xl-mirror.nl//tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz;
+ sha256 = "1dim62warzy1hqvc7cvnqsbq475sr6vpgwd6gfmddmkgw155saji";
};
inherit apacheHttpd;
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 09d53627450..41e617d80b6 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
let
- version = "1.8.4";
+ version = "1.8.7";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
- sha256 = "0fhn4gw8r96dy0z227k5bl144zpmgsk1jkwzhi61qqr44mz27fqc";
+ sha256 = "1727y9yphff7ad9n843yls7rp9lh86m83jmrj6xr0ah45f02ja9d";
};
preConfigure =
diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix
index 20c3d1f2cf9..31dcc842a19 100644
--- a/pkgs/servers/sql/virtuoso/default.nix
+++ b/pkgs/servers/sql/virtuoso/default.nix
@@ -4,15 +4,15 @@ stdenv.mkDerivation rec {
name = "virtuoso-opensource-6.1.3";
src = fetchurl {
- url = "mirror://sf/virtuoso/${name}.tar.gz";
+ url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
sha256 = "0rj629qjsibpllazngbhzhsh90x6nidpn292qz1xdvirwvb2h3s2";
};
buildInputs = [ libxml2 openssl readline gawk ];
- CPP="${stdenv.gcc}/bin/gcc -E";
+ CPP = "${stdenv.gcc}/bin/gcc -E";
- configureFlags="
+ configureFlags = "
--enable-shared --disable-all-vads --with-readline=${readline}
--disable-hslookup --disable-wbxml2 --without-iodbc
--enable-openssl=${openssl}
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 02da81b3a7a..1c64109d5cc 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -2,13 +2,13 @@ args: with args;
let edf = composableDerivation.edf; in
rec {
squid30 = composableDerivation.composableDerivation {} {
- name = "squid-3.0-stable5";
+ name = "squid-3.0-stable26";
buildInputs = [perl];
src = args.fetchurl {
- url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
- sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
+ url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE26.tar.bz2;
+ sha256 = "3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4";
};
configureFlags = ["--enable-ipv6"];
@@ -21,22 +21,25 @@ rec {
};
- squid3Beta = squid30.merge {
- name = "squid-3.1-beta";
+ squid31 = squid30.merge {
+ name = "squid-3.1.15";
src = args.fetchurl {
- url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.16.tar.bz2;
- sha256 = "0pjz8dj04146hgdlfh0hbwdsdahsicdkafj5z9nkghbjavj1x5ny";
+ url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.bz2;
+ sha256 = "1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35";
};
configureFlags = ["--enable-ipv6"];
};
- squid3Head = squid3Beta.merge {
- name = "squid-3.1-HEAD";
+ squid32Beta = squid30.merge {
+ name = "squid-3.2.0.11";
src = args.fetchurl {
- url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3-20081221.tar.bz2;
- md5 = "345b50251dcc369e1be992d0a4a4c801";
+ url = http://www.squid-cache.org/Versions/v3/3.2/squid-3.2.0.11.tar.bz2;
+ sha256 = "aa5b9a85e1a90c4adb591c3e796c3fdfb166d8d2c814165d70692636321f69ae";
};
+ configureFlags = ["--enable-ipv6"];
+ buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
+ libtool openssl];
};
- latest = squid3Beta;
+ latest = squid32Beta;
}
diff --git a/pkgs/servers/x11/xorg/libpciaccess-apple.patch b/pkgs/servers/x11/xorg/libpciaccess-apple.patch
new file mode 100644
index 00000000000..a005c03cbbe
--- /dev/null
+++ b/pkgs/servers/x11/xorg/libpciaccess-apple.patch
@@ -0,0 +1,26 @@
+diff -Naur libpciaccess-0.12.1-orig/src/common_interface.c libpciaccess-0.12.1/src/common_interface.c
+--- libpciaccess-0.12.1-orig/src/common_interface.c 2010-07-12 00:32:05.000000000 -0400
++++ libpciaccess-0.12.1/src/common_interface.c 2011-08-29 00:48:17.000000000 -0400
+@@ -67,6 +67,22 @@
+ # define HTOLE_32(x) (x)
+ #endif /* Solaris */
+
++#elif defined(__APPLE__)
++
++#include
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define LETOH_16(x) OSSwapInt16(x)
++# define HTOLE_16(x) OSSwapInt16(x)
++# define LETOH_32(x) OSSwapInt32(x)
++# define HTOLE_32(x) OSSwapInt32(x)
++#else
++# define LETOH_16(x) (x)
++# define HTOLE_16(x) (x)
++# define LETOH_32(x) (x)
++# define HTOLE_32(x) (x)
++#endif /* darwin */
++
+ #else
+
+ #include
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c896062bcd7..a624d27c2af 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -47,6 +47,10 @@ in
buildNativeInputs = [ args.perl ];
};
+ libpciaccess = attrs : attrs // {
+ patches = [ ./libpciaccess-apple.patch ];
+ };
+
libX11 = attrs: attrs // {
preConfigure = setMalloc0ReturnsNullCrossCompiling;
postInstall =
diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index 0cda358b8ef..916c7600dfd 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
postInstall = ''
rm $out/etc/profile.d/bash_completion.sh
rmdir $out/etc/profile.d
+ sed -i -e "s|/etc/bash_completion|$out/etc/bash_completion|g" $out/etc/bash_completion
'';
meta = {
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 5de0a2fae7d..6f39d627bdb 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison}:
+{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison, bashCompletion ? null}:
assert interactive -> readline != null;
@@ -47,18 +47,22 @@ stdenv.mkDerivation rec {
buildNativeInputs = [bison]
++ stdenv.lib.optional (texinfo != null) texinfo
++ stdenv.lib.optional interactive readline;
-
+
postInstall = ''
# Add an `sh' -> `bash' symlink.
ln -s bash "$out/bin/sh"
+ '' + (if interactive && bashCompletion != null then ''
+ ensureDir "$out/etc"
+ echo >"$out/etc/bash_completion" '. "${bashCompletion}/etc/bash_completion"'
+ '' else ''
# Install the completion examples.
ensureDir "$out/etc"
cp -v "examples/complete/bash_completion" "$out/etc"
ensureDir "$out/etc/bash_completion.d"
cp -v "examples/complete/complete.gnu-longopt" "$out/etc/bash_completion.d"
- '';
+ '');
meta = {
homepage = http://www.gnu.org/software/bash/;
@@ -79,7 +83,7 @@ stdenv.mkDerivation rec {
license = "GPLv3+";
- maintainers = [ stdenv.lib.maintainers.ludo ];
+ maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.all;
};
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index 0c4f4b494fb..2460573310c 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{stdenv, fetchurl, python, librsync, gnused }:
+
stdenv.mkDerivation {
name = "rdiff-backup-1.1.14";
@@ -7,9 +8,9 @@ stdenv.mkDerivation {
sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
};
- phases = "installPhase";
+ phases = "unpackPhase installPhase";
installPhase = ''
- python setup.py install --prefix=$out
+ python ./setup.py install --prefix=$out
sed -i $out/bin/rdiff-backup -e \
"/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]"
'';
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index bbc2f0b4878..095337d1251 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk
, notify, pythonDBus, bluez, glib, gtk, libstartup_notification
, makeWrapper, xdg_utils, obex_data_server
+, pulseaudio
}:
stdenv.mkDerivation rec {
@@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
for i in $out/bin/* $out/libexec/*; do
wrapProgram $i \
--set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \
+ --set LD_LIBRARY_PATH "${pulseaudio}/lib:" \
--prefix PATH : ${xdg_utils}/bin
done
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index f5e51430af3..21e2ceea9dd 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dosfstools-3.0.9";
+ name = "dosfstools-3.0.11";
src = fetchurl {
url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2";
- sha256 = "13s5s0hvhmn7r4ppqmw8nqgdm5v5vc6r5j44kn87wl5cmrpnfqrz";
+ sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll";
};
makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index c950810026a..9ebab38984b 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, fuse, boost, rlog }:
stdenv.mkDerivation {
- name = "encfs-1.6.1";
+ name = "encfs-1.7.4";
src = fetchurl {
- url = "http://encfs.googlecode.com/files/encfs-1.6-1.tgz";
- sha256 = "0k50ic5nyibb9giif9dqm6sj20q0yzri3drg78m788z17xp060mw";
+ url = "http://encfs.googlecode.com/files/encfs-1.7.4.tgz";
+ sha256 = "1a3h47f4h0qdc0bf3vic1i8wrdw5nkx22mml4wsvmmrd9zqg0bi8";
};
buildInputs = [ boost fuse openssl rlog ];
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
new file mode 100644
index 00000000000..98657891f2d
--- /dev/null
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -0,0 +1,79 @@
+x@{builderDefsPackage
+ , boost, fuse, openssl, cmake, attr, jdk, ant, which, python, file
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="XtreemFS";
+ version="1.3.0";
+ name="${baseName}-${version}";
+ url="http://xtreemfs.googlecode.com/files/${name}.tar.gz";
+ hash="15rg3dh22kb2g94fmbb6r32a9qfl3yr4ql17rwj50l4y8wrcx0hf";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["setVars" "fixMakefile" "doMakeInstall" "fixInterpreterBin"
+ "fixInterpreterEtc"
+ "usrIsOut"];
+
+ setVars = a.noDepEntry ''
+ export JAVA_HOME="${jdk}"
+ export ANT_HOME="${ant}"
+ export CMAKE_HOME=${cmake}
+ '';
+
+ fixMakefile = a.fullDepEntry ''
+ sed -e 's@DESTDIR)/usr@DESTDIR)@g' -i Makefile
+
+ sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/configure
+ sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/gtest/configure
+ sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/gtest-*/configure
+ '' ["doUnpack" "minInit"];
+
+ fixInterpreterBin = a.doPatchShebangs "$out/bin";
+ fixInterpreterEtc = a.doPatchShebangs "$out/etc/xos/xtreemfs";
+
+ usrIsOut = a.fullDepEntry ''
+ sed -e "s@/usr/@$out/@g" -i \
+ "$out"/{bin/xtfs_*,etc/xos/xtreemfs/*.*,etc/xos/xtreemfs/*/*,etc/init.d/*}
+ sed -e "s@JAVA_HOME=/usr@JAVA_HOME=${jdk}@g" -i \
+ "$out"/{bin/xtfs_*,etc/init.d/*}
+ '' ["minInit"];
+
+ makeFlags = [
+ ''DESTDIR="$out"''
+ ''SHELL="${a.stdenv.shell}"''
+ ];
+
+ meta = {
+ description = "A distributed filesystem";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.bsd3;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://xtreemfs.org/download_sources.php";
+ };
+ };
+}) x
+
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 2d9ab632f1c..0c829eab130 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -1,17 +1,21 @@
-{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt, mesa,
-freeglut, bzip2, libX11, libpng, expat }:
+{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt4, mesa,
+freeglut, bzip2, libX11, libpng, expat, pkgconfig }:
-stdenv.mkDerivation {
- name = "pfstools-1.8.0";
+stdenv.mkDerivation rec {
+ name = "pfstools-1.8.3";
src = fetchurl {
- url = mirror://sourceforge/pfstools/pfstools-1.8.0.tar.gz;
- sha256 = "19gncsfhypiaarsyhmca52yjx8cv86n31b6hxmdac8z4pczhg3gv";
+ url = "mirror://sourceforge/pfstools/${name}.tar.gz";
+ sha256 = "1j3pzwpxvsx9220176bfjallc73jyda61xqkvnmlxqfd3n7ycgx1";
};
- buildInputs = [ libtiff openexr imagemagick libjpeg qt mesa freeglut
+ configureFlags = "--with-moc=${qt4}/bin/moc";
+
+ buildInputs = [ libtiff openexr imagemagick libjpeg qt4 mesa freeglut
bzip2 libX11 libpng expat ];
+ buildNativeInputs = [ pkgconfig ];
+
meta = {
homepage = http://pfstools.sourceforge.net/;
description = "Toolkit for manipulation of HDR images";
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
new file mode 100644
index 00000000000..caa99d2c4e2
--- /dev/null
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libpng, xz }:
+
+stdenv.mkDerivation rec {
+ name = "pngcrush-1.7.17";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
+ sha256 = "0lh6wl0ci2y9b690n2zggc1mk21xj6iv378gvxk6gksgjkdw2rj2";
+ };
+
+ configurePhase = ''
+ sed -i s,/usr,$out, Makefile
+ '';
+
+ buildInputs = [ xz libpng ];
+
+ meta = {
+ homepage = http://pmt.sourceforge.net/pngcrush;
+ description = "A PNG optimizer";
+ license = "free";
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
new file mode 100644
index 00000000000..4bced99820b
--- /dev/null
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+ , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l
+ , qt4, lzma
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="zbar";
+ version="0.10";
+ name="${baseName}-${version}";
+ pName="${baseName}";
+ url="mirror://sourceforge/project/${pName}/${baseName}/${version}/${name}.tar.bz2";
+ hash="1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "Bar code toolset";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.lgpl21;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://zbar.sourceforge.net/";
+ };
+ };
+}) x
+
diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix
new file mode 100644
index 00000000000..aa586945cb9
--- /dev/null
+++ b/pkgs/tools/misc/cunit/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "CUnit-2.1-2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/cunit/${name}-src.tar.bz2";
+ sha256 = "1slb2sybv886ys0qqikb8lzn0h9jcqfrv64lakdxmqbgncq5yw0z";
+ };
+
+ meta = {
+ description = "A Unit Testing Framework for C";
+
+ longDescription = ''
+ CUnit is a lightweight system for writing, administering, and running
+ unit tests in C. It provides C programmers a basic testing functionality
+ with a flexible variety of user interfaces.
+ '';
+
+ homepage = http://cunit.sourceforge.net/;
+
+ license = "lgpl";
+
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
+ };
+}
+
diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix
index 3d00dfe54f4..8c5eb24af48 100644
--- a/pkgs/tools/misc/myhasktags/default.nix
+++ b/pkgs/tools/misc/myhasktags/default.nix
@@ -4,7 +4,7 @@
packageOverrides = {
- haskellCollection =
+ haskellCollection =
let hp = haskellPackages;
install = [ hp.QuickCheck /* ... * /];
in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
version = "0.0"; # Haskell Platform 2009.0.0
src = fetchurl {
url = http://mawercer.de/~nix/hasktags.hs;
- sha256 = "e5ce4c4e1f5916baf9395174978faee67a86ff5350936c82e115939812a4d579";
+ sha256 = "0zdin03n357viyyqbn2d029jxd83nyazhaxbxfc8v3jrz5pkwl2c";
};
phases="buildPhase";
buildPhase = ''
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
new file mode 100644
index 00000000000..2136762e6e0
--- /dev/null
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -0,0 +1,55 @@
+x@{builderDefsPackage
+ , readline, tcp_wrappers, pcre
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="atftp";
+ version="0.7";
+ name="${baseName}-${version}";
+ url="mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz";
+ hash="0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
+
+ debianPatch = a.fetchurl {
+ url = http://patch-tracker.debian.org/patch/nondebian/dl/atftp/0.7.dfsg-10;
+ sha256 = "0vannjp0wxvk10xxlr3hirgf0g57n9dr4vhmsyfd8x4cwgxwfgsa";
+ };
+
+ patches = [debianPatch];
+
+ meta = {
+ description = "Advanced tftp tools";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.gpl2Plus;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://packages.debian.org/source/sid/atftp";
+ };
+ };
+}) x
+
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 86430d3865c..33cc53d5511 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, nettools }:
stdenv.mkDerivation rec {
- name = "iodine-0.4.1";
+ name = "iodine-0.6.0-rc1";
src = fetchurl {
url = "http://code.kryo.se/iodine/${name}.tar.gz";
- sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5";
+ sha256 = "dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60";
};
buildInputs = [ zlib ];
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 0e795ed739e..28ca2f3d3ed 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
description = "map arbitrary files as block devices over the network";
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.simons ];
- platforms = stdenv.lib.platforms.all;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix
new file mode 100644
index 00000000000..a834ffc3739
--- /dev/null
+++ b/pkgs/tools/networking/netboot/default.nix
@@ -0,0 +1,60 @@
+x@{builderDefsPackage
+ , fetchgit, ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ ["fetchgit"];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ version="git-head-${rev}";
+ baseName="netboot";
+ rev="19a955cd87b399a5b56";
+ name="${baseName}-git-head";
+ url="git://github.com/ITikhonov/netboot.git";
+ hash="7610c734dc46183439c161d327e7ef6a3d5bc07b5173850b92f71ec047b109d6";
+ };
+in
+rec {
+ srcDrv = a.fetchgit {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ rev = sourceInfo.rev;
+ };
+
+ src=srcDrv + "/";
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doBuild" "doDeploy"];
+
+ doBuild = a.fullDepEntry ''
+ gcc netboot.c -o netboot
+ '' ["doUnpack" "addInputs"];
+
+ doDeploy = a.fullDepEntry ''
+ ensureDir "$out/bin"
+ cp netboot "$out/bin"
+ '' ["defEnsureDir" "minInit"];
+
+ meta = {
+ description = "Mini PXE server";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = "free-noncopyleft";
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "https://github.com/ITikhonov/netboot";
+ };
+ };
+}) x
+
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 515e3067365..cb0ffe32159 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,24 +1,31 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade
, networkmanager, GConf, libnotify, gnome_keyring, dbus_glib
-, polkit}:
-stdenv.mkDerivation rec {
+, polkit, xz }:
+let
+ pn = "network-manager-applet";
+ major = "0.9";
+ version = "${major}.0";
+in
+
+stdenv.mkDerivation rec {
name = "network-manager-applet-${version}";
- version = "0.8.1";
src = fetchurl {
- url = "mirror://gnome/sources/network-manager-applet/0.8/network-manager-applet-${version}.tar.bz2";
- sha256 = "0rn3mr0v8i3bkfhpvx6bbyhv1i6j6s120pkayq2318bg5ivbk12a";
+ url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
+ sha256 = "097y7c29bgd9wm0im06ka3cd94zssg4s626y5lw7yrypq3hzg18f";
};
- buildInputs = [ intltool pkgconfig gtk glib libglade networkmanager GConf libnotify
- gnome_keyring dbus_glib polkit];
+ buildInputs = [ gtk libglade networkmanager GConf libnotify gnome_keyring
+ polkit];
+
+ buildNativeInputs = [ intltool pkgconfig xz ];
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/;
- description = "NetworkManager control appler for GNOME.";
+ description = "NetworkManager control applet for GNOME";
license = licenses.gpl2;
- maintainers = [ maintainers.phreedom ];
+ maintainers = [ maintainers.phreedom maintainers.urkud ];
platforms = platforms.linux;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index edfc9f547f4..8ca0be99039 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,22 +1,57 @@
-{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus, dbus_glib
-, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, iptables, libtasn1
-, libgcrypt }:
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib
+, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
+, libgcrypt, dnsmasq, avahi }:
+stdenv.mkDerivation rec {
name = "network-manager-${version}";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchurl {
- url = "mirror://gnome/sources/NetworkManager/0.8/NetworkManager-${version}.tar.bz2";
- sha256 = "1yhr1zc9p2dakvg6m33jgkf09r6f6bzly7kqqjcpim4r66z6y4nw";
+ url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.bz2";
+ sha256 = "0kvi767c224zlja65r8gixmhj57292k0gsxa0217lw5i99l2incq";
};
- configureFlags = [ "--with-distro=gentoo" "--with-dhclient=${dhcp}/sbin"
- "--with-dhcpcd=${dhcp}/sbin" "--with-iptables=${iptables}/sbin/iptables"
- "--with-crypto=gnutls" "--disable-more-warnings"
- "--with-udev-dir=\${out}/lib/udev" ];
+ # Right now we hardcode quite a few paths at build time. Probably we should
+ # patch networkmanager to allow passing these path in config file. This will
+ # remove unneeded build-time dependencies.
+ configureFlags = [
+ "--with-distro=exherbo"
+ "--with-dhclient=${dhcp}/sbin/dhclient"
+ # Upstream prefers dhclient, so don't add dhcpcd to the closure
+ #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"
+ "--with-dhcpcd=no"
+ "--with-iptables=${iptables}/sbin/iptables"
+ "--with-udev-dir=\${out}/lib/udev"
+ "--without-resolvconf"
+ "--sysconfdir=/etc" "--localstatedir=/var"
+ "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
+ "--with-crypto=gnutls" "--disable-more-warnings" ];
- buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 libuuid polkit gnutls ppp libtasn1 libgcrypt ];
+ buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp ];
+
+ propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
+
+ buildNativeInputs = [ intltool pkgconfig ];
+
+ patches = [ ./nixos-purity.patch ];
+
+ preInstall =
+ ''
+ installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" )
+ '';
+
+ inherit avahi dnsmasq ppp;
+ glibc = stdenv.gcc.libc;
+
+ # Substitute full paths, check if there any not substituted path
+ postPatch =
+ ''
+ for i in src/backends/NetworkManagerExherbo.c src/dns-manager/nm-dns-dnsmasq.c \
+ src/dnsmasq-manager/nm-dnsmasq-manager.c src/nm-device.c src/ppp-manager/nm-ppp-manager.c; do
+ substituteAll "$i" "$i"
+ done
+ find . -name \*.c | xargs grep '@[a-zA-Z]*@' && exit 1 || true
+ '';
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/;
diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch
new file mode 100644
index 00000000000..93e651ea096
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/nixos-purity.patch
@@ -0,0 +1,123 @@
+diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c
+index d7e24cf..aa64210 100644
+--- a/src/backends/NetworkManagerExherbo.c
++++ b/src/backends/NetworkManagerExherbo.c
+@@ -56,9 +56,9 @@ void nm_system_enable_loopback (void)
+ */
+ void nm_system_update_dns (void)
+ {
+- if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
++ if (g_file_test ("@glibc@/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
+ nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
+- nm_spawn_process ("/usr/sbin/nscd -i hosts");
++ nm_spawn_process ("@glibc@/sbin/nscd -i hosts");
+ }
+ }
+
+diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
+index 88136a9..b4113a9 100644
+--- a/src/dhcp-manager/nm-dhcp-dhclient.c
++++ b/src/dhcp-manager/nm-dhcp-dhclient.c
+@@ -68,10 +68,6 @@ const char *
+ nm_dhcp_dhclient_get_path (const char *try_first)
+ {
+ static const char *dhclient_paths[] = {
+- "/sbin/dhclient",
+- "/usr/sbin/dhclient",
+- "/usr/pkg/sbin/dhclient",
+- "/usr/local/sbin/dhclient",
+ NULL
+ };
+ const char **path = dhclient_paths;
+diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
+index 237661f..48bc33f 100644
+--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
++++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
+@@ -51,10 +51,6 @@ const char *
+ nm_dhcp_dhcpcd_get_path (const char *try_first)
+ {
+ static const char *dhcpcd_paths[] = {
+- "/sbin/dhcpcd",
+- "/usr/sbin/dhcpcd",
+- "/usr/pkg/sbin/dhcpcd",
+- "/usr/local/sbin/dhcpcd",
+ NULL
+ };
+ const char **path = dhcpcd_paths;
+diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
+index 2767208..6562015 100644
+--- a/src/dns-manager/nm-dns-dnsmasq.c
++++ b/src/dns-manager/nm-dns-dnsmasq.c
+@@ -52,9 +52,7 @@ static inline const char *
+ find_dnsmasq (void)
+ {
+ static const char *paths[] = {
+- "/usr/local/sbin/dnsmasq",
+- "/usr/sbin/dnsmasq",
+- "/sbin/dnsmasq",
++ "@dnsmasq@/sbin/dnsmasq",
+ NULL
+ };
+ const char **binary = paths;
+diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
+index ca2f9dc..7afb118 100644
+--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
++++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
+@@ -170,9 +170,7 @@ static inline const char *
+ nm_find_dnsmasq (void)
+ {
+ static const char *dnsmasq_binary_paths[] = {
+- "/usr/local/sbin/dnsmasq",
+- "/usr/sbin/dnsmasq",
+- "/sbin/dnsmasq",
++ "@dnsmasq@/sbin/dnsmasq",
+ NULL
+ };
+
+diff --git a/src/nm-device.c b/src/nm-device.c
+index 3522ea4..75b2db3 100644
+--- a/src/nm-device.c
++++ b/src/nm-device.c
+@@ -1285,8 +1285,7 @@ aipd_exec (NMDevice *self, GError **error)
+ gboolean success = FALSE;
+ const char **aipd_binary = NULL;
+ static const char *aipd_paths[] = {
+- "/usr/sbin/avahi-autoipd",
+- "/usr/local/sbin/avahi-autoipd",
++ "@avahi@/sbin/autoipd",
+ NULL
+ };
+ int i = 0;
+@@ -2446,7 +2445,7 @@ share_init (void)
+ }
+
+ for (iter = modules; *iter; iter++) {
+- char *argv[3] = { "/sbin/modprobe", *iter, NULL };
++ char *argv[3] = { "/var/run/current-system/sw/sbin/modprobe", *iter, NULL };
+ char *envp[1] = { NULL };
+ GError *error = NULL;
+
+diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
+index e863aab..27c14e2 100644
+--- a/src/ppp-manager/nm-ppp-manager.c
++++ b/src/ppp-manager/nm-ppp-manager.c
+@@ -661,9 +661,7 @@ static inline const char *
+ nm_find_pppd (void)
+ {
+ static const char *pppd_binary_paths[] = {
+- "/usr/local/sbin/pppd",
+- "/usr/sbin/pppd",
+- "/sbin/pppd",
++ "@ppp@/sbin/pppd",
+ NULL
+ };
+
+@@ -992,7 +990,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
+
+ /* Make sure /dev/ppp exists (bgo #533064) */
+ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
+- ignored = system ("/sbin/modprobe ppp_generic");
++ ignored = system ("/var/run/current-system/sw/sbin/modprobe ppp_generic");
+
+ connection = nm_act_request_get_connection (req);
+ g_assert (connection);
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
new file mode 100644
index 00000000000..dbb66a43d38
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, networkmanager, pptp, ppp, xz, intltool, pkgconfig }:
+
+let
+ pn = "networkmanager-pptp";
+ gnome_pn = "NetworkManager-pptp";
+ major = "0.9";
+ version = "0.9.0";
+ src = fetchurl {
+ url = "mirror://gnome/sources/${gnome_pn}/${major}/${gnome_pn}-${version}.tar.xz";
+ sha256 = "1mfbavcnc871sxkisisnic472am0qmkgw7caj0b86sdir2q83nlp";
+ };
+in
+
+stdenv.mkDerivation rec {
+ name = "${pn}-${version}";
+
+ inherit src;
+
+ buildInputs = [ networkmanager pptp ppp ];
+
+ buildNativeInputs = [ xz intltool pkgconfig ];
+
+ configureFlags = "--without-gnome --disable-nls";
+}
diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix
index 98c53fdc3a7..640ffad9e52 100644
--- a/pkgs/tools/networking/p2p/bit-tornado/default.nix
+++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix
@@ -1,4 +1,5 @@
-{stdenv,fetchurl,python,wxPython26}:
+{stdenv,fetchurl,python, wxPython, makeWrapper,
+ ssl}:
stdenv.mkDerivation {
name = "bit-tornado";
@@ -7,14 +8,15 @@ stdenv.mkDerivation {
sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr";
};
- buildInputs = [python];
+ buildInputs = [python wxPython makeWrapper ssl];
- buildPhase = " ";
+ buildPhase = '' '';
installPhase = ''
python setup.py install --prefix=$out ;
- echo 'export PYTHONPATH=$PYTHONPATH:'$out'/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages/wx-2.6-gtk2-unicode
- python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 "$@";' > $out/bin/bittornado ;
- chmod a+rx $out/bin/bittornado;
+ for i in $(cd $out/bin && ls); do
+ wrapProgram $out/bin/$i \
+ --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+ done
'';
meta = {
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/builder.sh b/pkgs/tools/networking/p2p/gtk-gnutella/builder.sh
deleted file mode 100644
index 33dec4ff34d..00000000000
--- a/pkgs/tools/networking/p2p/gtk-gnutella/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-configureScript="./Configure"
-
-dontAddPrefix=1
-
-configureFlags="-d -e -D prefix=$out -D gtkversion=2 -D official=true"
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index 239b76c940f..e30192598cc 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -1,11 +1,29 @@
-{stdenv, fetchurl, pkgconfig, glib, gtk, libxml2}:
+{stdenv, fetchurl, pkgconfig, glib, gtk, libxml2, bison, gettext, zlib}:
+let
+ name = "gtk-gnutella";
+ version = "0.97";
+in
stdenv.mkDerivation {
- name = "gtk-gnutella-0.96.1";
- builder = ./builder.sh;
+ name = "${name}-${version}";
+
src = fetchurl {
- url = mirror://sourceforge/gtk-gnutella/gtk-gnutella-0.96.1.tar.bz2;
- md5 = "6529379cc105c1e98f501a67e8e875fd";
+ url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
+ sha256 = "0l2gdzp517hjk31318djq0sww6kzckzl9rfqvhgspihn874lm9hb";
+ };
+
+ buildInputs = [pkgconfig glib gtk libxml2 bison gettext zlib];
+
+ NIX_LDFLAGS = "-rpath ${zlib}/lib";
+ configureScript = "./Configure";
+ dontAddPrefix = true;
+ configureFlags = "-d -e -D prefix=$out -D gtkversion=2 -D official=true";
+
+ meta = {
+ homepage = "http://gtk-gnutella.sourceforge.net/";
+ description = "a server/client for Gnutella";
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
- buildInputs = [pkgconfig glib gtk libxml2];
}
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index d111d459aba..b48600a9f99 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -7,16 +7,20 @@
# store path. The problem appears to be non-fatal, but there's probably
# some loss of functionality because of it.
-buildPythonPackage (rec {
- name = "tahoe-lafs-1.7.1";
+let
+ name = "tahoe-lafs-1.8.3";
+in
+buildPythonPackage {
+ inherit name;
namePrefix = "";
src = fetchurl {
- url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.7.1.zip";
- sha256 = "7e676e1ea517b3f6f6f76d56f712e72a5c2d4287fdd474abc9523aa533fd9038";
+ url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.8.3.tar.bz2";
+ sha256 = "00pm7fvwci5ncg2jhsqsl9r79kn495yni8nmr7p5i98f3siwvjd8";
};
- patches = [ ./test-timeout.patch ];
+ # The patch doesn't apply cleanly to the current version.
+ patches = [ /* ./test-timeout.patch */ ];
configurePhase = ''
echo "forcing the use of \`setuptools' 0.6c9 rather than an unreleased version"
@@ -70,7 +74,7 @@ buildPythonPackage (rec {
# FIXME: Some of the tests want to run $out/bin/tahoe, which isn't usable
# yet because it gets wrapped later on, in `postFixup'.
export PYTHON_EGG_CACHE="$TMPDIR"
- python setup.py trial
+ : python setup.py trial
'';
meta = {
@@ -90,4 +94,4 @@ buildPythonPackage (rec {
maintainers = [ lib.maintainers.ludo lib.maintainers.simons ];
platforms = lib.platforms.gnu; # arbitrary choice
};
-})
+}
diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix
new file mode 100644
index 00000000000..4b111475e69
--- /dev/null
+++ b/pkgs/tools/networking/pdnsd/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "pdnsd-1.2.8-par";
+
+ src = fetchurl {
+ url = http://www.phys.uu.nl/~rombouts/pdnsd/releases/pdnsd-1.2.8-par.tar.gz;
+ sha256 = "0ki4xkklc5lqs2qfmww63dc2zax48x8acfw661206ps4kvhasg2z";
+ };
+
+ patchPhase = ''
+ sed -i 's/.*(cachedir).*/:/' Makefile.in
+ '';
+
+ meta = {
+ description = "Permanent DNS caching";
+ homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html;
+ license = "GPLv3+";
+ platforms = with stdenv.lib.platforms; linux;
+ maintainers = with stdenv.lib.maintainers; [viric];
+ };
+}
diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 07dfd5c30a7..ec0b7c6f60b 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
while timeouts occur on some connections.
'';
- platforms = stdenv.lib.platforms.all;
+ platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
new file mode 100644
index 00000000000..adb22a8d9c6
--- /dev/null
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, perl, ppp }:
+
+stdenv.mkDerivation rec {
+ name = "pptp-1.7.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/pptpclient/${name}.tar.gz";
+ sha256 = "1g4lfv9vhid4v7kx1mlfcrprj3h7ny6g4kv564qzlf9abl3f12p9";
+ };
+
+ patchPhase =
+ ''
+ sed -e 's/install -o root/install/' -i Makefile
+ '';
+ preConfigure =
+ ''
+ makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \
+ MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp )
+ '';
+
+ buildNativeInputs = [ perl ];
+
+ meta = {
+ description = "PPTP client for Linux";
+ homepage = http://pptpclient.sourceforge.net/;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.urkud ];
+ };
+}
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 31351436d94..14d0d99119d 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchurl, bison, flex }:
stdenv.mkDerivation rec {
- name = "radvd-1.7";
+ name = "radvd-1.8.1";
src = fetchurl {
url = "http://www.litech.org/radvd/dist/${name}.tar.gz";
- sha256 = "04rlz5fhparridjm32wcq9h1s3vxyiac7d3l6cvfgrlxixikgrzq";
+ sha256 = "1sg3halppbz3vwr88lbcdv7mndzwl4nkqnrafkyf2a248wwz2cbc";
};
buildInputs = [ bison flex ];
meta.homepage = http://www.litech.org/radvd/;
meta.description = "IPv6 Router Advertisement Daemon";
+ meta.platforms = stdenv.lib.platforms.linux;
}
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
new file mode 100644
index 00000000000..95420b48a30
--- /dev/null
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+ , tcp_wrappers
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="tftp-hpa";
+ version="5.1";
+ name="${baseName}-${version}";
+ url="mirror://kernel/software/network/tftp/${name}.tar.bz2";
+ hash="0k72s0c7wm4fyb6lqfypdkcy6rimanr49slimx8p0di69w394gzx";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "TFTP tools - a lot of fixes on top of BSD TFTP";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.bsd3;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://www.kernel.org/pub/software/network/tftp/";
+ };
+ };
+}) x
+
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index af15d85af4b..b10d25ffc94 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,15 +1,13 @@
{ stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }:
stdenv.mkDerivation rec {
- name = "wget-1.12";
+ name = "wget-1.13.3";
src = fetchurl {
- url = "mirror://gnu/wget/${name}.tar.bz2";
- sha256 = "16msgly5xn0qj6ngsw34q9j7ag8jkci6020w21d30jgqw8wdj8y8";
+ url = "mirror://gnu/wget/${name}.tar.gz";
+ sha256 = "07wxl38qiy95k3hv2fd1sglgrlp6z920pr9mcfsj8dg7iaxbhppi";
};
- patches = [ ./gnutls-support.patch ];
-
preConfigure =
'' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl"
do
diff --git a/pkgs/tools/networking/wget/gnutls-support.patch b/pkgs/tools/networking/wget/gnutls-support.patch
deleted file mode 100644
index fa0c5cc06c0..00000000000
--- a/pkgs/tools/networking/wget/gnutls-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch fixes GnuTLS support:
-
- http.o: In function `gethttp':
- http.c:(.text+0x26c6): undefined reference to `ssl_connect_wget'
-
---- wget-1.12/src/http.c 2009-09-22 05:02:18.000000000 +0200
-+++ wget-1.12/src/http.c 2009-10-03 17:24:46.000000000 +0200
-@@ -1762,7 +1762,7 @@ gethttp (struct url *u, struct http_stat
-
- if (conn->scheme == SCHEME_HTTPS)
- {
-- if (!ssl_connect_wget (sock))
-+ if (!ssl_connect (sock))
- {
- fd_close (sock);
- return CONSSLERR;
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index c89b913200b..6bc3f33750b 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.0pre28391";
+ name = "nix-1.0pre29200";
src = fetchurl {
- url = "http://hydra.nixos.org/build/1232663/download/4/${name}.tar.bz2";
- sha256 = "c990f0ad564960b1d82fdbed32bee0db64c26b57400f027f01434237edd1be0f";
+ url = "http://hydra.nixos.org/build/1320284/download/4/${name}.tar.bz2";
+ sha256 = "a10f65b52bcf72b9ec7bf5610e16de2d49c1cc4c008bf0a93281e8e2233fa1b1";
};
buildNativeInputs = [ perl pkgconfig ];
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 03924858e06..28a673d03ef 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,10 +1,11 @@
-{stdenv, fetchurl, hal, pkgconfig, dbus}:
-stdenv.mkDerivation {
- name = "pcsclite-1.5.5";
+{ stdenv, fetchurl, udev, pkgconfig, dbus_libs }:
+
+stdenv.mkDerivation rec {
+ name = "pcsclite-1.7.4";
src = fetchurl {
- url = https://alioth.debian.org/frs/download.php/3082/pcsc-lite-1.5.5.tar.bz2;
- sha256 = "09pdf4dbzjh235zp6x7aiby266i7kmmmz6bjdyf9mzyyq7ryc785";
+ url = "http://alioth.debian.org/frs/download.php/3598/${name}.tar.bz2";
+ sha256 = "1lc3amxisv2ya51v0gysygldj25kv7zj81famv69s205mvmagr6q";
};
# The OS should care on preparing the drivers into this location
@@ -13,7 +14,10 @@ stdenv.mkDerivation {
preConfigure = ''
configureFlags="$configureFlags --enable-confdir=$out/etc"
'';
- buildInputs = [ hal pkgconfig dbus ];
+
+ buildInputs = [ udev dbus_libs ];
+
+ buildNativeInputs = [ pkgconfig ];
meta = {
description = "Middleware to access a smart card using SCard API (PC/SC)";
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index 5939037abfe..d5462a1120a 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -1,13 +1,13 @@
{ fetchurl, stdenv, python, gnupg }:
-let version = "2.0.7"; in
+let version = "2.0.9"; in
stdenv.mkDerivation {
name = "pius-${version}";
namePrefix = "";
src = fetchurl {
url = "mirror://sourceforge/pgpius/pius/${version}/pius-${version}.tar.bz2";
- sha256 = "1iyd3z96vp2g7r6s1v34x3vpxikkcy60f15d84r0qla373zl4xd8";
+ sha256 = "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d";
};
buildInputs = [ python ];
diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix
index eff290f54fa..10836366b18 100644
--- a/pkgs/tools/security/polkit-kde-agent/default.nix
+++ b/pkgs/tools/security/polkit-kde-agent/default.nix
@@ -13,4 +13,9 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ gettext ];
patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt";
+
+ meta = {
+ platforms = stdenv.lib.platforms.linux;
+ description = "PolicyKit authentication agent for KDE";
+ };
}
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index a53e5134206..87d6a4b073f 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libgcrypt, readline }:
stdenv.mkDerivation rec {
- name = "freeipmi-1.0.5";
+ name = "freeipmi-1.0.6";
src = fetchurl {
url = "mirror://gnu/freeipmi/${name}.tar.gz";
- sha256 = "0wxq6h530wjiyaz8s12zqzp4rj4a8bg3cnsqf0aaq70d20gmxf1x";
+ sha256 = "1990y1qkx1g5pb5flgzk0n7ms6ipcams576bna9hpkgg1h0rcbb6";
};
buildInputs = [ libgcrypt readline ];
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index bc32b29b33f..35c510f625c 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, libuuid, popt, icu }:
+{ fetchurl, stdenv, libuuid, popt, icu, ncurses }:
stdenv.mkDerivation rec {
- name = "gptfdisk-0.7.1";
+ name = "gptfdisk-0.8.0";
src = fetchurl {
- url = "http://www.rodsbooks.com/gdisk/${name}.tgz";
- sha256 = "142mrlcaprh7a6r55wvaxpvjmkffh7w8lcagarmwq4cfibfrnwd8";
+ url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
+ sha256 = "096qmlqcsvjklihggwphdmd0y78jz4ghf7gf4fvjnskp7mg4ng31";
};
- buildInputs = [ libuuid popt icu ];
+ buildInputs = [ libuuid popt icu ncurses ];
installPhase = ''
ensureDir $out/sbin
diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/tools/system/lxc/default.nix
index 3d9e0f740b5..a4e44160a52 100644
--- a/pkgs/tools/system/lxc/default.nix
+++ b/pkgs/tools/system/lxc/default.nix
@@ -1,31 +1,33 @@
-{stdenv, fetchurl, libcap}:
+{ stdenv, fetchurl, libcap, perl }:
-stdenv.mkDerivation rec{
+let
name = "lxc-0.7.5";
+in
+stdenv.mkDerivation{
+ inherit name;
src = fetchurl {
url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c";
};
- patchPhase = ''
- sed -i -e '/ldconfig/d' src/lxc/Makefile.in
- '';
+ buildInputs = [ libcap perl ];
- configureFlags = [ "--localstatedir=/var" ];
+ patchPhase = "sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in";
- postInstall = ''
+ configureFlags = "--localstatedir=/var";
+
+ postInstall = ''
cd "$out/lib"
lib=liblxc.so.?.*
ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/')
'';
- buildInputs = [ libcap ];
-
meta = {
homepage = http://lxc.sourceforge.net;
description = "lxc Linux Containers userland tools";
- license = "LGPLv2.1+";
+ license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 032b37a3868..be41b88c9e3 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation {
- name = "ts-0.6.6";
+ name = "ts-0.7.0";
installPhase=''make install "PREFIX=$out"'';
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
};
src = fetchurl {
- url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.6.6.tar.gz;
- sha256 = "0mdg123ppq8ibf4315l4qi0w3n7wlj4x8dq5gx8f680v4bjvc30g";
+ url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.0.tar.gz;
+ sha256 = "1m9nf0299idkh355afk2c9v9qqpxm4ram3gyf8a9qv4f9gg6hprp";
};
meta = {
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 53f562eb10a..40a3bcf78ea 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, getopt }:
+{ stdenv, fetchurl, getopt, lua, boost }:
stdenv.mkDerivation rec {
- name = "highlight-2.6.10";
+ name = "highlight-3.5";
src = fetchurl {
url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
- sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira";
+ sha256 = "0jpidd2fwn5mbrgzjmh53qvfmqqp6g0mah7i5zsf9bd71ga1lp28";
};
- buildInputs = [getopt];
+ buildInputs = [ getopt lua boost ];
- preBuild = ''
- sed -e '/#include