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

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

Browse Source
This commit is contained in:
Alexander Foremny 2012-08-26 14:46:43 +02:00
commit 172e6f5e77
195 changed files with 2904 additions and 2105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/audio/flac/default.nix
View File

@ -1,24 +1,25 @@
{stdenv, fetchurl, libogg}:
{ stdenv, fetchurl, libogg }:
stdenv.mkDerivation rec {
name = "flac-1.2.1";
src = fetchurl {
url = mirror://sourceforge/flac/flac-1.2.1.tar.gz;
sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn";
};
buildInputs = [libogg];
buildInputs = [ libogg ];
patches =
[ # Fix for building on GCC 4.3.
(fetchurl {
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
})
];
patches = [
# Fix for building on GCC 4.3.
(fetchurl {
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
})
];
meta = {
homepage = http://flac.sourceforge.net;
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
};
}

28
pkgs/applications/audio/jack-capture/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_capture-${version}";
version = "0.9.69";
src = fetchurl {
url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz";
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
};
buildInputs = [ jackaudio libsndfile pkgconfig ];
buildPhase = "PREFIX=$out make jack_capture";
installPhase = ''
mkdir -p $out/bin
cp jack_capture $out/bin/
'';
meta = with stdenv.lib; {
description = "A program for recording soundfiles with jack";
homepage = http://archive.notam02.no/arkiv/src;
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
platforms = stdenv.lib.platforms.linux;
};
}

32
pkgs/applications/display-managers/slim/default.nix
View File

@ -1,39 +1,33 @@
{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
, fontconfig, freetype, pam, consolekit, dbus_libs }:
stdenv.mkDerivation rec {
name = "slim-1.3.2";
name = "slim-1.3.4";
src = fetchurl {
url = "http://download.berlios.de/slim/${name}.tar.gz";
sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi";
sha256 = "00fmrg2v41jnqhx0yc1kv97xxh5gai18n0i4as9g1fcq1i32cp0m";
};
patches = [
# Allow the paths of the configuration file and theme directory to
# be set at runtime.
./runtime-paths.patch
# Fix a bug in slim's PAM support: the "resp" argument to the
# conversation function is a pointer to a pointer to an array of
# pam_response structures, not a pointer to an array of pointers to
# pam_response structures. Of course C can't tell the difference...
./pam.patch
# Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
# (which assumes that a non-empty string means a remote session).
./pam2.patch
];
buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
buildInputs =
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
pam dbus_libs
] ++ stdenv.lib.optional (consolekit != null) consolekit;
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
preBuild = ''
substituteInPlace Makefile --replace /usr /no-such-path
makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc USE_PAM=1)
'';
cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1";
NIX_CFLAGS_LINK = "-lXmu";
meta = {
homepage = http://slim.berlios.de;
platforms = stdenv.lib.platforms.linux;
};
}

89
pkgs/applications/display-managers/slim/pam.patch
View File

@ -1,89 +0,0 @@
diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp
*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200
--- slim-1.3.1/app.cpp 2009-02-17 19:50:06.000000000 +0100
***************
*** 41,48 ****
Panel* panel = *static_cast<Panel**>(appdata_ptr);
int result = PAM_SUCCESS;
for (int i=0; i<num_msg; i++){
! resp[i]->resp=0;
! resp[i]->resp_retcode=0;
switch(msg[i]->msg_style){
case PAM_PROMPT_ECHO_ON:
// We assume PAM is asking for the username
--- 41,48 ----
Panel* panel = *static_cast<Panel**>(appdata_ptr);
int result = PAM_SUCCESS;
for (int i=0; i<num_msg; i++){
! (*resp)[i].resp=0;
! (*resp)[i].resp_retcode=0;
switch(msg[i]->msg_style){
case PAM_PROMPT_ECHO_ON:
// We assume PAM is asking for the username
***************
*** 51,63 ****
case Panel::Suspend:
case Panel::Halt:
case Panel::Reboot:
! resp[i]->resp=strdup("root");
break;
case Panel::Console:
case Panel::Exit:
case Panel::Login:
! resp[i]->resp=strdup(panel->GetName().c_str());
break;
}
break;
--- 51,63 ----
case Panel::Suspend:
case Panel::Halt:
case Panel::Reboot:
! (*resp)[i].resp=strdup("root");
break;
case Panel::Console:
case Panel::Exit:
case Panel::Login:
! (*resp)[i].resp=strdup(panel->GetName().c_str());
break;
}
break;
***************
*** 73,79 ****
default:
panel->EventHandler(Panel::Get_Passwd);
! resp[i]->resp=strdup(panel->GetPasswd().c_str());
break;
}
break;
--- 73,79 ----
default:
panel->EventHandler(Panel::Get_Passwd);
! (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
break;
}
break;
***************
*** 89,97 ****
}
if (result!=PAM_SUCCESS){
for (int i=0; i<num_msg; i++){
! if (resp[i]->resp==0) continue;
! free(resp[i]->resp);
! resp[i]->resp=0;
};
free(*resp);
*resp=0;
--- 89,97 ----
}
if (result!=PAM_SUCCESS){
for (int i=0; i<num_msg; i++){
! if ((*resp)[i].resp==0) continue;
! free((*resp)[i].resp);
! (*resp)[i].resp=0;
};
free(*resp);
*resp=0;

20
pkgs/applications/display-managers/slim/pam2.patch
View File

@ -1,20 +0,0 @@
diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp
*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200
--- slim-1.3.1/app.cpp 2009-08-17 02:59:37.000000000 +0200
***************
*** 226,232 ****
pam.start("slim");
pam.set_item(PAM::Authenticator::TTY, DisplayName);
pam.set_item(PAM::Authenticator::Requestor, "root");
! pam.set_item(PAM::Authenticator::Host, "localhost");
}
catch(PAM::Exception& e){
--- 226,232 ----
pam.start("slim");
pam.set_item(PAM::Authenticator::TTY, DisplayName);
pam.set_item(PAM::Authenticator::Requestor, "root");
! pam.set_item(PAM::Authenticator::Host, "");
}
catch(PAM::Exception& e){

26
pkgs/applications/editors/emacs-modes/color-theme/default.nix Normal file
View File

@ -0,0 +1,26 @@
{stdenv, fetchurl, emacs}:
stdenv.mkDerivation rec {
name = "color-theme-6.6.0";
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz";
sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn";
};
# patches from http://aur.archlinux.org/packages.php?ID=54883
patches = [ ./fix-build.patch ./gnus-bug.diff ];
buildInputs = [ emacs ];
installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ];
installTargets = "install-bin";
meta = {
description = "An emacs-lisp mode for skinning your emacs.";
homepage = http://www.nongnu.org/color-theme;
license = "GPLv2+";
platforms = stdenv.lib.platforms.all;
};
}

19
pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/Makefile 2009-05-15 18:22:49.000000000 +0200
+++ b/Makefile 2009-05-16 08:59:36.000000000 +0200
@@ -15,6 +15,7 @@
TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
MANUAL = color-theme
MISC = AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in
+LOADPATH = "$(shell pwd)" "$(shell pwd)/themes"
#AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
#ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
#ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi
@@ -47,7 +48,7 @@
%.elc: %.el
@$(EMACS) $(OPTIONCOMPILE) \
- --eval '(setq load-path (cons "." load-path))' \
+ --eval '(setq load-path (append load-path (list $(LOADPATH))))' \
-f batch-byte-compile $<
%.info: %.texi

28
pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff Normal file
View File

@ -0,0 +1,28 @@
diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el
--- color-theme-6.6.0.orig/color-theme.el 2011-11-18 01:17:29.000000000 +0100
+++ color-theme-6.6.0.new/color-theme.el 2011-11-18 01:24:07.000000000 +0100
@@ -73,9 +73,10 @@
"Non-nil if running XEmacs.")
;; Add this since it appears to miss in emacs-2x
-(or (fboundp 'replace-in-string)
- (defun replace-in-string (target old new)
- (replace-regexp-in-string old new target)))
+(if (fboundp 'replace-in-string)
+ (defalias 'color-theme-replace-in-string 'replace-in-string)
+ (defsubst color-theme-replace-in-string (target old new &optional literal)
+ (replace-regexp-in-string old new target nil literal)))
;; face-attr-construct has a problem in Emacs 20.7 and older when
;; dealing with inverse-video faces. Here is a short test to check
@@ -1626,8 +1627,8 @@
(add-to-list 'color-themes
(list ',n
(upcase-initials
- (replace-in-string
- (replace-in-string
+ (color-theme-replace-in-string
+ (color-theme-replace-in-string
(symbol-name ',n) "^color-theme-" "") "-" " "))
,author))
(defun ,n ()

30
pkgs/applications/editors/emacs-modes/jade/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchgit, emacs }:
stdenv.mkDerivation {
name = "jade-mode-0-20120802";
src = fetchgit {
url = "https://github.com/brianc/jade-mode.git";
rev = "275ab149edb0f6bcfae6ac17ba456f3351191604";
sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs --batch -L . -f batch-byte-compile *.el
'';
installPhase = ''
mkdir -p $out/share/emacs/site-lisp
cp *.el *.elc $out/share/emacs/site-lisp/
'';
meta = {
description = "Emacs major mode for jade and stylus.";
homepage = https://github.com/brianc/jade-mode;
license = "GPLv2+";
platforms = stdenv.lib.platforms.all;
};
}

32
pkgs/applications/editors/emacs-modes/rect-mark/default.nix Normal file
View File

@ -0,0 +1,32 @@
{stdenv, fetchurl, emacs}:
stdenv.mkDerivation rec {
name = "rect-mark-1.4";
src = fetchurl {
url = "http://emacswiki.org/emacs/download/rect-mark.el";
sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8";
};
phases = [ "buildPhase" "installPhase"];
buildInputs = [ emacs ];
buildPhase = ''
cp $src rect-mark.el
emacs --batch -f batch-byte-compile rect-mark.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install rect-mark.el* $out/share/emacs/site-lisp
'';
meta = {
description = "Mark a rectangle of text with highlighting.";
homepage = http://emacswiki.org/emacs/RectangleMark;
license = "GPLv2+";
platforms = stdenv.lib.platforms.all;
};
}

32
pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix Normal file
View File

@ -0,0 +1,32 @@
{stdenv, fetchurl, emacs}:
stdenv.mkDerivation rec {
name = "sunrise-commander-6";
src = fetchurl {
url = "http://www.emacswiki.org/emacs/download/sunrise-commander.el";
sha256 = "1bbpm00nc7ry0f2k4zaqbvp6w9py31asfcr9hddggc138pnfajvq";
};
phases = [ "buildPhase" "installPhase"];
buildInputs = [ emacs ];
buildPhase = ''
cp $src sunrise-commander.el
emacs --batch -f batch-byte-compile sunrise-commander.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install sunrise-commander.el* $out/share/emacs/site-lisp
'';
meta = {
description = "Two-pane file manager for Emacs based on Dired and inspired by MC.";
homepage = http://www.emacswiki.org/emacs/Sunrise_Commander;
license = "GPLv3+";
platforms = stdenv.lib.platforms.all;
};
}

8
pkgs/applications/graphics/gimp/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk, freetype
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22
}:
stdenv.mkDerivation rec {
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig gtk freetype fontconfig
libart_lgpl libtiff libjpeg libpng libexif zlib perl
perlXMLParser python pygtk gettext intltool babl gegl
libart_lgpl libtiff libjpeg libpng12 libexif zlib perl
perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22
];
passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?

26
pkgs/applications/misc/gpsbabel/default.nix
View File

@ -1,15 +1,19 @@
{ fetchurl, stdenv, zlib, expat }:
{ fetchurl, stdenv, zlib, expat, which }:
stdenv.mkDerivation rec {
name = "gpsbabel-1.3.6";
let version = "1.4.3"; in
stdenv.mkDerivation {
name = "gpsbabel-${version}";
src = fetchurl {
url = "http://www.gpsbabel.org/plan9.php?dl=${name}.tar.gz";
name = "${name}.tar.gz";
sha256 = "1dm9lpcdsj0vz699zz932xc1vphvap627wl0qp61izlkzh25vg88";
# gpgbabel.org makes it hard to get the source tarball automatically, so
# get it from elsewhere.
url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
sha256 = "1s31xa36ivf836h89m1f3qiaz3c3znvqjdm0bnh8vr2jjlrz9jdi";
};
buildInputs = [ zlib expat ];
# FIXME: Would need libxml2 for one of the tests, but that in turns require
# network access for the XML schemas.
buildInputs = [ zlib expat which ];
/* FIXME: Building the documentation, with "make doc", requires this:
@ -17,7 +21,10 @@ stdenv.mkDerivation rec {
But FOP isn't packaged yet. */
configureFlags = "--with-zlib=system";
preConfigure = "cd gpsbabel";
configureFlags = [ "--with-zlib=system" ];
doCheck = true;
meta = {
description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs";
@ -44,5 +51,8 @@ stdenv.mkDerivation rec {
homepage = http://www.gpsbabel.org/;
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

24
pkgs/applications/misc/gxneur/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }:
stdenv.mkDerivation {
name = "gxneur-0.13.0";
src = fetchurl {
url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2;
sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
};
buildInputs = [
xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
libglade GConf pcre
];
preConfigure = ''
sed -e 's@-Werror@@' -i configure
sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c
'';
meta = {
description = "GUI for XNEUR keyboard layout switcher";
};
}

4
pkgs/applications/misc/xpdf/default.nix
View File

@ -1,4 +1,4 @@
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? true
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null
, base14Fonts ? null
}:
@ -7,6 +7,8 @@ assert enableGUI -> x11 != null && motif != null && freetype != null;
assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null;
assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities
stdenv.mkDerivation {
name = "xpdf-3.03";

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -32,7 +32,7 @@ let
channel = "stable";
selinux = false;
nacl = false;
openssl = true;
openssl = false;
gnome = false;
gnomeKeyring = false;
proprietaryCodecs = true;
@ -59,7 +59,7 @@ let
use_system_libpng = true;
use_system_libxml = true;
use_system_speex = true;
use_system_ssl = true;
use_system_ssl = config.openssl;
use_system_stlport = true;
use_system_xdg_utils = true;
use_system_yasm = true;

19
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -1,19 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
# VHASH: c9500486764a2433d0f059134a981eb9adccd3546a6f779bc0e05cdcb26d2ae6
{
dev = {
version = "22.0.1221.1";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1221.1.tar.bz2";
sha256 = "08cx2im0ng1dg83mk8jlx4in7v8f5vsf9y2ild0i22jb20c7h31s";
version = "22.0.1229.8";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.8.tar.bz2";
sha256 = "0gaa4mqvd0v4y587y6mri2f3b0rc8npmcbs9bfs4wwb8n1cp8kw0";
};
beta = {
version = "21.0.1180.57";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.57.tar.bz2";
sha256 = "0idimvkrhs09x93hl8p7rddyb0ymk9f8i5jm6m3lg6ga959aj6ri";
version = "21.0.1180.79";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.79.tar.bz2";
sha256 = "1jscpibv02pyqpcj6djcx0d1qwq8hcxampfqbsz8dicgjprp22c8";
};
stable = {
version = "21.0.1180.57";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.57.tar.bz2";
sha256 = "0idimvkrhs09x93hl8p7rddyb0ymk9f8i5jm6m3lg6ga959aj6ri";
version = "21.0.1180.79";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.79.tar.bz2";
sha256 = "1jscpibv02pyqpcj6djcx0d1qwq8hcxampfqbsz8dicgjprp22c8";
};
}

103
pkgs/applications/networking/browsers/chromium/update.sh
View File

@ -4,16 +4,92 @@ channels_url="http://omahaproxy.appspot.com/";
bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/";
output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix";
get_channels()
nix_getattr()
{
input_file="$1";
attr="$2";
var="$(nix-instantiate --eval-only -A "$attr" "$output_file")";
echo "$var" | tr -d '\\"';
}
### poor mans key/value-store :-) ###
ver_sha_table=""; # list of version:sha256
sha_lookup()
{
version="$1";
for ver_sha in $ver_sha_table;
do
if [ "x${ver_sha%:*}" = "x$version" ];
then
echo "${ver_sha##*:}";
return 0;
fi;
done;
return 1;
}
sha_insert()
{
version="$1";
sha256="$2";
ver_sha_table="$ver_sha_table $version:$sha256";
}
if [ -e "$output_file" ];
then
get_sha256()
{
channel="$1";
version="$2";
url="$3";
oldver="$(nix_getattr "$output_file" "$channel.version")";
echo -n "Checking if $oldver ($channel) is up to date..." >&2;
if [ "x$version" != "x$oldver" ];
then
echo " no, getting sha256 for new version $version:" >&2;
sha256="$(nix-prefetch-url "$url")";
else
echo " yes, keeping old sha256." >&2;
sha256="$(nix_getattr "$output_file" "$channel.sha256")";
fi;
sha_insert "$version" "$sha256"
echo "$sha256";
}
else
get_sha256()
{
nix-prefetch-url "$url";
}
fi;
get_channel_exprs()
{
for chline in $(echo "$1" | cut -d, -f-2);
do
channel="${chline%%,*}";
version="${chline##*,}";
url="${bucket_url%/}/chromium-$version.tar.bz2";
sha256="$(nix-prefetch-url "$url")";
echo -n "Checking if sha256 of version $version is cached..." >&2;
if sha256="$(sha_lookup "$version")";
then
echo "yes: $sha256" >&2;
else
echo "no." >&2;
sha256="$(get_sha256 "$channel" "$version" "$url")";
fi;
sha_insert "$version" "$sha256";
echo " $channel = {";
echo " version = \"$version\";";
@ -25,26 +101,13 @@ get_channels()
cd "$(dirname "$0")";
versions="$(curl -s "$channels_url" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')";
if [ -e "$output_file" ];
then
vhash="$(echo "$versions" | sha256sum | cut -d' ' -f1)";
old_vhash="$(sed -n 's/# *VHASH: *//p' "$output_file")";
if [ "x$vhash" = "x$old_vhash" ];
then
echo "$output_file is already up to date, bailing out." >&2;
exit 1;
fi;
fi;
channels="$(get_channels "$versions")";
omaha="$(curl -s "$channels_url")";
versions="$(echo "$omaha" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')";
channel_exprs="$(get_channel_exprs "$versions")";
cat > "$output_file" <<-EOF
# This file is autogenerated from update.sh in the same directory.
# VHASH: $vhash
{
$channels
$channel_exprs
}
EOF

6
pkgs/applications/networking/browsers/firefox/12.0.nix
View File

@ -33,7 +33,7 @@ rec {
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
# "--with-system-nss"
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
@ -54,7 +54,7 @@ rec {
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto
xlibs.libXext xlibs.xextproto sqlite unzip
];
@ -129,7 +129,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip
];

6
pkgs/applications/networking/browsers/firefox/13.0.nix
View File

@ -33,7 +33,7 @@ rec {
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
# "--with-system-nss"
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
@ -54,7 +54,7 @@ rec {
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
@ -136,7 +136,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip
];

6
pkgs/applications/networking/browsers/firefox/3.6.nix
View File

@ -31,7 +31,7 @@ rec {
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
#"--with-system-nss"
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
"--enable-system-cairo"
#"--enable-system-sqlite" # <-- this seems to be discouraged
@ -59,7 +59,7 @@ rec {
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr /* nss */ libnotify xlibs.pixman
alsaLib nspr nss libnotify xlibs.pixman
];
preConfigure = if stdenv.isMips then ''
@ -118,7 +118,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman
];

51
pkgs/applications/networking/cluster/hadoop/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ stdenv, fetchurl, makeWrapper, which, jre, bash }:
stdenv.mkDerivation rec {
name = "hadoop-2.0.1-alpha";
src = fetchurl {
url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz";
sha256 = "4e5f4fa1574ee58fd6d59a220b66578fc2cf62c229120eeed07f2880c86f0e59";
};
buildInputs = [ makeWrapper ];
buildPhase = ''
for n in "bin/"* "sbin/"*; do
sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|"
done
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" bin/container-executor
'';
installPhase = ''
mkdir -p $out
mv *.txt share/doc/hadoop/
mv * $out
for n in $out/{bin,sbin}"/"*; do
wrapProgram $n --prefix PATH : "${which}/bin:${jre}/bin:${bash}/bin" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"
done
'';
meta = {
homepage = "http://hadoop.apache.org/";
description = "framework for distributed processing of large data sets across clusters of computers";
license = stdenv.lib.licenses.asl20;
longDescription = ''
The Apache Hadoop software library is a framework that allows for
the distributed processing of large data sets across clusters of
computers using a simple programming model. It is designed to
scale up from single servers to thousands of machines, each
offering local computation and storage. Rather than rely on
hardware to deliver high-avaiability, the library itself is
designed to detect and handle failures at the application layer,
so delivering a highly-availabile service on top of a cluster of
computers, each of which may be prone to failures.
'';
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

4
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "notmuch-0.12";
name = "notmuch-0.13.2";
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "1dbbbbba3567df9c67ecc642d1e63269a527952c557f6b0c8bafcd4e37893992";
sha256 = "75ec5f5d04bb7e3a8cc6224859b691f704a2a35f2f6027ffb674e829268f1d68";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];

2
pkgs/applications/office/openoffice/libreoffice.nix
View File

@ -144,6 +144,8 @@ stdenv.mkDerivation rec {
"--without-system-nss"
"--without-system-sampleicc"
"--without-system-libexttextcat"
"--with-java-target-version=1.6" # The default 1.7 not supported
];
buildInputs = [

69
pkgs/applications/science/logic/coq/8.3.nix Normal file
View File

@ -0,0 +1,69 @@
# - coqide compilation can be disabled by setting lablgtk to null;
{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
let
version = "8.3pl4";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
idePatch = if buildIde then ''
substituteInPlace scripts/coqmktop.ml --replace \
"\"-I\"; \"+lablgtk2\"" \
"\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
'' else "";
in
stdenv.mkDerivation {
name = "coq-${version}";
src = fetchurl {
url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";
};
buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
prefixKey = "-prefix ";
preConfigure = ''
configureFlagsArray=(
-opt
-camldir ${ocaml}/bin
-camlp5dir $(ocamlfind query camlp5)
${ideFlags}
)
'';
buildFlags = "world"; # Debug with "world VERBOSE=1";
patches = [ ./configure.8.3.patch ];
postPatch = ''
UNAME=$(type -tp uname)
RM=$(type -tp rm)
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
${idePatch}
'';
# This post install step is needed to build ssrcoqide from the ssreflect package
# It could be made optional, but I see little harm in including it in the default
# distribution -- roconnor
# This will likely no longer be necessary for coq >= 8.4. -- roconnor
postInstall = if buildIde then ''
cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
'' else "";
meta = {
description = "Coq proof assistant";
longDescription = ''
Coq is a formal proof management system. It provides a formal language
to write mathematical definitions, executable algorithms and theorems
together with an environment for semi-interactive development of
machine-checked proofs.
'';
homepage = "http://coq.inria.fr";
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.roconnor ];
};
}

1112
pkgs/applications/science/logic/coq/configure.8.3.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1101
pkgs/applications/science/logic/coq/configure.patch
View File

File diff suppressed because it is too large Load Diff

50
pkgs/applications/science/logic/coq/default.nix
View File

@ -1,15 +1,13 @@
# - coqide compilation can be disabled by setting lablgtk to null;
{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
let
version = "8.3pl4";
version = "8.4";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
idePatch = if buildIde then ''
substituteInPlace scripts/coqmktop.ml --replace \
"\"-I\"; \"+lablgtk2\"" \
"\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
idePath = if buildIde then ''
CAML_LD_LIBRARY_PATH=${lablgtk}/lib/ocaml/3.12.1/site-lib/stublibs
'' else "";
in
@ -17,24 +15,11 @@ stdenv.mkDerivation {
name = "coq-${version}";
src = fetchurl {
url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";
url = "http://pauillac.inria.fr/~herbelin/coq/distrib/V${version}/files/coq-${version}.tar.gz";
sha256 = "0ka2lak9il4hlblk461awf0hbi3mxqhc1wz6kllxradyy2vfaspl";
};
buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
prefixKey = "-prefix ";
preConfigure = ''
configureFlagsArray=(
-opt
-camldir ${ocaml}/bin
-camlp5dir $(ocamlfind query camlp5)
${ideFlags}
)
'';
buildFlags = "world"; # Debug with "world VERBOSE=1";
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
patches = [ ./configure.patch ];
@ -43,16 +28,21 @@ stdenv.mkDerivation {
RM=$(type -tp rm)
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
${idePatch}
'';
# This post install step is needed to build ssrcoqide from the ssreflect package
# It could be made optional, but I see little harm in including it in the default
# distribution -- roconnor
# This will likely no longer be necessary for coq >= 8.4. -- roconnor
postInstall = if buildIde then ''
cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
'' else "";
preConfigure = ''
buildFlagsArray=(${idePath})
configureFlagsArray=(
-opt
-camldir ${ocaml}/bin
-camlp5dir $(ocamlfind query camlp5)
${ideFlags}
)
'';
prefixKey = "-prefix ";
buildFlags = "revision coq coqide";
meta = {
description = "Coq proof assistant";

18
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -69,22 +69,8 @@ rec {
inherit stdenv fetchurl unzip;
};
tig = stdenv.mkDerivation {
name = "tig-0.16";
src = fetchurl {
url = "http://jonas.nitro.dk/tig/releases/tig-0.16.tar.gz";
sha256 = "167kak44n66wqjj6jrv8q4ijjac07cw22rlpqjqz3brlhx4cb3ix";
};
buildInputs = [ncurses asciidoc xmlto docbook_xsl];
installPhase = ''
make install
make install-doc
'';
meta = {
description = "console git repository browser that additionally can act as a pager for output from various git commands";
homepage = http://jonas.nitro.dk/tig/;
license = "GPLv2";
};
tig = import ./tig {
inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl;
};
gitFastExport = import ./fast-export {

19
pkgs/applications/version-management/git-and-tools/tig/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl }:
stdenv.mkDerivation {
name = "tig-1.0";
src = fetchurl {
url = "http://jonas.nitro.dk/tig/releases/tig-1.0.tar.gz";
md5 = "a2d414d1cebbc9cd4f3d545bc6f225c6";
};
buildInputs = [ncurses asciidoc xmlto docbook_xsl];
installPhase = ''
make install
make install-doc
'';
meta = {
description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands";
homepage = "http://jonas.nitro.dk/tig/";
license = "GPLv2";
};
}

72
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -8,21 +8,38 @@
with stdenv.lib;
let version = "4.1.18"; in
let
stdenv.mkDerivation {
version = "4.1.20";
forEachModule = action: ''
for mod in \
$sourcedir/out/linux.*/release/bin/src/vboxdrv \
$sourcedir/out/linux.*/release/bin/src/vboxpci \
$sourcedir/out/linux.*/release/bin/src/vboxnetadp \
$sourcedir/out/linux.*/release/bin/src/vboxnetflt
do
if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ]
then
cp -v $sourcedir/out/linux.*/release/bin/src/vboxdrv/Module.symvers \
"$mod/Module.symvers"
fi
INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \
make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod ${action}
done
'';
in stdenv.mkDerivation {
name = "virtualbox-${version}-${kernel.version}";
NIX_CFLAGS_COMPILE="-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7";
sha256 = "b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb";
};
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
libcap glib kernel python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ]
++ optional javaBindings jdk
++ optional pythonBindings python;
@ -34,18 +51,19 @@ stdenv.mkDerivation {
-e 's@MKISOFS --version@MKISOFS -version@' \
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
-i configure
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
find . -type f | xargs sed 's/depmod -a/true/' -i
export USER=nix
set +x
'';
configurePhase = ''
sourcedir="$(pwd)"
./configure --with-qt4-dir=${qt4} \
${optionalString (!javaBindings) "--disable-java"} \
${optionalString (!pythonBindings) "--disable-python"} \
--disable-pulse --disable-hardening \
--disable-pulse --disable-hardening --disable-kmods \
--with-mkisofs=${xorriso}/bin/xorrisofs
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-i AutoConfig.kmk
@ -55,7 +73,9 @@ stdenv.mkDerivation {
cat >> AutoConfig.kmk << END_PATHS
VBOX_PATH_APP_PRIVATE := $out
VBOX_PATH_APP_DOCS := $out/doc
VBOX_JAVA_HOME := ${jdk}
${optionalString javaBindings ''
VBOX_JAVA_HOME := ${jdk}
''}
END_PATHS
echo "VBOX_WITH_DOCS :=" >> LocalConfig.kmk
echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk
@ -63,51 +83,35 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
preBuild = ''
buildPhase = ''
source env.sh
kmk
cd out/linux.*/release/bin/src
export KERN_DIR=${kernel}/lib/modules/*/build
${forEachModule "modules"}
'';
postBuild = ''
cd ../../../../..
'';
installPhase = ''
libexec=$out/libexec/virtualbox
# Install VirtualBox files
cd out/linux.*/release/bin
mkdir -p $libexec
cp -av * $libexec
# Install kernel module
cd src
kernelVersion=$(cd ${kernel}/lib/modules; ls)
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
# Remove root ownership stuff, since this does not work in a chroot environment
for i in `find . -name Makefile`; do
sed -i -e "s|-o root||g" \
-e "s|-g root||g" $i
done
# Install kernel modules
make install
${forEachModule "modules_install"}
# Create wrapper script
mkdir -p $out/bin
for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do
ln -s "$libexec/$file" $out/bin/$file
done
# Create and fix desktop item
mkdir -p $out/share/applications
sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop
ln -sfv $libexec/virtualbox.desktop $out/share/applications
'';
meta = {
description = "PC emulator";
homepage = http://www.virtualbox.org/;

63
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -17,16 +17,16 @@ stdenv.mkDerivation {
cp -r install/* $out
'';
buildCommand = ''
${if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
chmod 755 ./VBoxLinuxAdditions.run
./VBoxLinuxAdditions.run --noexec --keep
./VBoxLinuxAdditions.run --noexec --keep
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
# Unpack files
cd install
${if stdenv.system == "i686-linux" then ''
@ -38,31 +38,31 @@ stdenv.mkDerivation {
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
# Build kernel modules
cd src
# Build kernel modules
cd src
for i in *
do
cd $i
find . -type f | xargs sed 's/depmod -a/true/' -i
make
cd ..
cd $i
find . -type f | xargs sed 's/depmod -a/true/' -i
make
cd ..
done
cd ..
# Change the interpreter for various binaries
for i in sbin/VBoxService bin/{VBoxClient,VBoxControl}
do
${if stdenv.system == "i686-linux" then ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
''
else if stdenv.system == "x86_64-linux" then ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
''
else if stdenv.system == "x86_64-linux" then ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
done
# Change rpath for various binaries and libraries
@ -72,11 +72,11 @@ stdenv.mkDerivation {
do
patchelf --set-rpath $out/lib $i
done
# Remove references to /usr from various scripts and files
sed -i -e "s|/usr/bin|$out/bin|" share/VBoxGuestAdditions/vboxclient.desktop
sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
# Install binaries
mkdir -p $out/sbin
install -m 755 sbin/VBoxService $out/sbin
@ -94,7 +94,7 @@ stdenv.mkDerivation {
cp -v lib/VBoxOGL*.so $out/lib
mkdir -p $out/lib/dri
ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so
# Install desktop file
mkdir -p $out/share/autostart
cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart
@ -103,23 +103,23 @@ stdenv.mkDerivation {
mkdir -p $out/lib/xorg/modules/{drivers,input}
install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
# There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever?
# install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
#install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
# Install kernel modules
cd src
for i in *
do
cd $i
kernelVersion=$(cd ${kernel}/lib/modules; ls)
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
find . -type f | xargs sed -i -e "s|-o root||g" \
-e "s|-g root||g"
make install
cd ..
done
'';
kernelVersion=$(cd ${kernel}/lib/modules; ls)
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
find . -type f | xargs sed -i -e "s|-o root||g" \
-e "s|-g root||g"
make install
cd ..
done
''; # */
meta = {
description = "Guest additions for VirtualBox";
longDescriptions = ''
@ -129,5 +129,6 @@ stdenv.mkDerivation {
'';
license = "GPL";
maintainers = [ lib.maintainers.sander ];
platforms = lib.platforms.linux;
};
}

32
pkgs/build-support/fetchurl/default.nix
View File

@ -22,6 +22,21 @@ let
then builtins.attrNames mirrors
else [] /* backwards compatibility */;
impureEnvVars = [
# We borrow these environment variables from the caller to allow
# easy proxy configuration. This is impure, but a fixed-output
# derivation like fetchurl is allowed to do so since its result is
# by definition pure.
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
# This variable allows the user to pass additional options to curl
"NIX_CURL_FLAGS"
# This variable allows the user to override hashedMirrors from the
# command-line.
"NIX_HASHED_MIRRORS"
] ++ (map (site: "NIX_MIRRORS_${site}") sites);
in
{ # URL to fetch.
@ -83,23 +98,8 @@ stdenv.mkDerivation {
if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
outputHash = if outputHash != "" then outputHash else
if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
impureEnvVars = [
# We borrow these environment variables from the caller to allow
# easy proxy configuration. This is impure, but a fixed-output
# derivation like fetchurl is allowed to do so since its result is
# by definition pure.
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
# This variable allows the user to pass additional options to curl
"NIX_CURL_FLAGS"
# This variable allows the user to override hashedMirrors from the
# command-line.
"NIX_HASHED_MIRRORS"
] ++ (map (site: "NIX_MIRRORS_${site}") sites);
inherit showURLs mirrorsFile;
inherit showURLs mirrorsFile impureEnvVars;
# Doing the download on a remote machine just duplicates network
# traffic, so don't do that.

6
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -24,9 +24,6 @@ rec {
# GNU (http://www.gnu.org/prep/ftp.html).
gnu = [
# This one is the master repository, and thus it's always up-to-date.
http://ftp.gnu.org/pub/gnu/
# This one redirects to a (supposedly) nearby and (supposedly) up-to-date
# mirror.
http://ftpmirror.gnu.org/
@ -37,6 +34,9 @@ rec {
ftp://ftp.cs.tu-berlin.de/pub/gnu/
ftp://ftp.chg.ru/pub/gnu/
ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/
# This one is the master repository, and thus it's always up-to-date.
http://ftp.gnu.org/pub/gnu/
];
# GCC.

4
pkgs/build-support/release/ant-build.nix
View File

@ -8,8 +8,8 @@
, antProperties ? []
, antBuildInputs ? []
, buildfile ? "build.xml"
, ant ? pkgs.ant
, jre ? pkgs.jre
, ant ? pkgs.apacheAntOpenJDK
, jre ? pkgs.openjdk
, hydraAntLogger ? pkgs.hydraAntLogger
, ... } @ args:

1
pkgs/build-support/vm/default.nix
View File

@ -250,6 +250,7 @@ rec {
path = $TMPDIR/xchg
read only = no
guest ok = yes
$EXTRA_SAMBA_CONF
SMB
rm -f ./samba

4
pkgs/data/documentation/man-pages/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "man-pages-3.41";
name = "man-pages-3.42";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
sha256 = "1fldlsw51al9cvmz8dixrfv2j80bamjd5bzxsa66cvhc48n8p2nf";
sha256 = "11kh0ifzqbxk797lq037ixqhpf6h90w9xxygzh796mddg4rr4s9j";
};
preBuild =

1
pkgs/data/misc/hicolor-icon-theme/default.nix
View File

@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Default fallback theme used by implementations of the icon theme specification";
homepage = http://icon-theme.freedesktop.org/releases/;
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/desktops/xfce-4.8/support/gvfs.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }:
{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse }:
stdenv.mkDerivation rec {
name = "gvfs-1.8.2";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
};
buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ];
buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu fuse ];
meta = {
description = "Virtual Filesystem support library (for Xfce)";

2
pkgs/development/compilers/gcc/4.5/default.nix
View File

@ -40,7 +40,7 @@ assert libelf != null -> zlib != null;
with stdenv.lib;
with builtins;
let version = "4.5.3";
let version = "4.5.4";
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
# `configure' time.

14
pkgs/development/compilers/gcc/4.5/sources.nix
View File

@ -1,26 +1,26 @@
/* Automatically generated by `update-gcc.sh', do not edit.
For GCC 4.5.3. */
For GCC 4.5.4. */
{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
assert version == "4.5.3";
assert version == "4.5.4";
optional /* langC */ true (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
sha256 = "fef7ef1396d41f4af2dacbea8826a895060a8a72d9f05546c091085b036f1f87";
sha256 = "894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a";
}) ++
optional langCC (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
sha256 = "e088b9fe0016070da921f353ef8c0c2f81fd11d21e3aeb09210ab7bad080804b";
sha256 = "f7e3bab5e22713fbce46c2acb35fb727748473a34a942ce00393d75e1b09b6b9";
}) ++
optional langFortran (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
sha256 = "618e8a2334eb3e2baf00891e9b2da47f32e797520e230acddb5f02fada0006cd";
sha256 = "cf0803b4f5334a526dd8da1b2171d6724f50c17346b2d5c509b6abc973d2ef34";
}) ++
optional langJava (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
sha256 = "c687198d4882c9d505eeb406595dad041602a5b6c67da5cf15d4941b34d20144";
sha256 = "c98398da6f8c4c7d1758e291089d99853fdd27112cd3f146b7a8c26e6d762a23";
}) ++
optional langAda (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
sha256 = "686a6d2453bc325f32ddc90edf86502dc68320c7cd6948d60d93d0b0f5965b8f";
sha256 = "8abddae15be65572b4d639bd9818057019bb4a45da4decfc6451511c8d580c5e";
}) ++
[]

2
pkgs/development/compilers/gcc/4.7/default.nix
View File

@ -163,7 +163,7 @@ stdenv.mkDerivation ({
builder = ./builder.sh;
src = fetchurl {
url = "http://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2";
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n";
};

46
pkgs/development/compilers/ghc/7.6.1.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.6.0.20120810";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/7.6.1-rc1/${name}-src.tar.bz2";
sha256 = "04m8ms3a58590s4p8x6qma25rdanz0iai8rcla78ka798612pvjd";
};
buildInputs = [ ghc perl gmp ncurses ];
enableParallelBuilding = true;
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
'';
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags=[
"--with-gcc=${stdenv.gcc}/bin/gcc"
];
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags=["-S" "--keep-file-symbols"];
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
};
}

34
pkgs/development/compilers/jdk/builder.sh
View File

@ -1,34 +0,0 @@
buildInputs="$unzip"
source $stdenv/setup
unzip $src || true
mkdir -p $out
mv $dirname/* $out/
# Remove crap in the root directory.
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done
# Set the dynamic linker.
rpath=
for i in $libraries; do
rpath=$rpath${rpath:+:}$i/lib
done
find $out -type f -perm +100 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
# Unpack .pack files.
for i in $(find $out -name "*.pack"); do
echo "unpacking $i..."
$out/bin/unpack200 "$i" "$(dirname $i)/$(basename $i .pack).jar"
rm "$i"
done
# Put the *_md.h files in the right place.
cd $out/include && ln -s */*_md.h .

9
pkgs/development/compilers/jdk/default-1.4.nix
View File

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
if stdenv.system == "i686-linux"
then
(import ./j2sdk-1.4.x-sun-linux.nix) {
inherit stdenv fetchurl;
}
else
abort "the Java 2 SDK is not supported on this platform"

9
pkgs/development/compilers/jdk/default-5.nix
View File

@ -1,9 +0,0 @@
{stdenv, fetchurl, unzip, requireFile}:
if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
then
(import ./jdk5-oracle-linux.nix) {
inherit stdenv fetchurl unzip requireFile;
}
else
abort "the Java 5 SDK is not supported on this platform"

2
pkgs/development/compilers/jdk/default.nix
View File

@ -2,8 +2,6 @@ args:
if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" then
(import ./jdk6-linux.nix) ( removeAttrs args ["cabextract"] )
else if args.stdenv.system == "powerpc-linux" then
(import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "cabextract"])
else if args.stdenv.system == "i686-cygwin" then
(import ./jdk6-cygwin.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "xlibs"])
else

29
pkgs/development/compilers/jdk/ibm-builder.sh
View File

@ -1,29 +0,0 @@
source $stdenv/setup
if ! test -e "$pathname"; then
echo ""
echo "SORRY!"
echo "You should download \`$(basename $pathname)' from IBM and place it in $(dirname $pathname)."
echo "Blame IBM, not us."
echo ""
exit 1
fi
actual=$(md5sum -b $pathname | cut -c1-32)
if test "$actual" != "$md5"; then
echo "hash is $actual, expected $md5"
exit 1
fi
tar zxf $pathname || true
mkdir -p $out
mv $dirname/* $out/
# Remove crap in the root directory.
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done

24
pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix
View File

@ -1,24 +0,0 @@
/**
* This Nix expression requires the user to download the j2sdk
* distribution to /tmp. Please obtain j2sdk-1_4_2_03-linux-i586.bin
* from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
*
* Note that this is not necessary if someone has already pushed a
* binary.
*
* @author Martin Bravenboer <martin@cs.uu.nl>
*/
{stdenv, fetchurl}:
assert stdenv.system == "i686-linux";
derivation {
name = "j2sdk-1.4.2";
filename = "j2sdk-1.4.2_05";
dirname = "j2sdk1.4.2_05";
system = stdenv.system;
builder = ./builder.sh;
pathname = "/tmp/j2sdk-1_4_2_05-linux-i586.bin";
md5 = "825ff134f3e370f6e677638d32962082";
stdenv = stdenv;
}

17
pkgs/development/compilers/jdk/jdk5-ibm-powerpc-linux.nix
View File

@ -1,17 +0,0 @@
{ swingSupport ? true
, stdenv, fetchurl, unzip, makeWrapper, libX11 ? null, libXext ? null
}:
assert stdenv.system == "powerpc-linux";
assert swingSupport -> libX11 != null && libXext != null;
(stdenv.mkDerivation {
name = "jdk-1.5.0";
builder = ./ibm-builder.sh;
dirname = "ibm-java2-ppc-50";
pathname = "/tmp/ibm-java2-sdk-50-linux-ppc.tgz";
md5 = "6bed4ae0b24d3eea2914f2f6dcc0ceb4";
libraries =
(if swingSupport then [libX11 libXext] else []);
} // {inherit swingSupport;})

36
pkgs/development/compilers/jdk/jdk5-oracle-linux.nix
View File

@ -1,36 +0,0 @@
/**
* This Nix expression requires the user to download the Java 5.0 JDK
* distribution to /tmp. Please obtain jdk-1_5_0_22-linux-i586.bin for
* 32-bit systems or jdk-1_5_0_22-linux-amd64.bin for 64-bit systems
* from java.sun.com (look for archived software downloads)
* by hand and place it in /tmp. Blame Oracle, not me.
*
* Note that this is not necessary if someone has already pushed a
* binary.
*/
{stdenv, fetchurl, unzip, requireFile}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "jdk-1_5_0_22";
dirname = "jdk1.5.0_22";
builder = ./builder.sh;
src = requireFile {
message = ''
SORRY!
We may not download the needed binary distribution automatically.
You should download ${distfilename} from Sun and add it to store.
For example, "nix-prefetch-url file:///\$PWD/${distfilename}" in the
directory where you saved it is OK.
Blame Sun, not us.
'';
name = distfilename;
sha256 = if stdenv.system == "x86_64-linux" then
"1h63gigvg8id95igcj8xw7qvxs4p2y9hvx4xbvkwg8bji3ifb0sk"
else "0655n2q1y023zzwbk6gs9vwsnb29jc0m3bg3x3xdw623qgb4k6px";
};
distfilename = if stdenv.system == "x86_64-linux" then "${name}-linux-amd64.bin" else "${name}-linux-i586.bin";
inherit unzip stdenv;
}

4
pkgs/development/compilers/jdk/jdk6-cygwin.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
name = "jdk-1.6.0_20";
src = fetchurl {
url = file:///tmp/jdk-6u20-windows-i586.exe ;
url = file:///tmp/jdk-6u20-windows-i586.exe;
sha256 = "0w4afz8a9gi1iyhh47gvhiy59dfrzx0fnmywdff3v5cx696w25fh";
};
@ -43,4 +43,6 @@ stdenv.mkDerivation rec {
./jre/lib/ext/localedata.pack \
./lib/tools.pack
'';
meta.license = "unfree";
}

4
pkgs/development/compilers/jdk/jdk6-linux.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation {
inherit installjdk;
buildInputs = [unzip makeWrapper];
/**
* libXt is only needed on amd64
*/
@ -67,4 +67,6 @@ stdenv.mkDerivation {
inherit (xlibs) libX11;
mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
meta.license = "unfree";
}

12
pkgs/development/compilers/julia/default.nix
View File

@ -7,14 +7,14 @@ let
in
stdenv.mkDerivation rec {
pname = "julia";
date = "20120801";
date = "20120818";
name = "${pname}-git-${date}";
grisu_ver = "1.1.1";
dsfmt_ver = "2.1";
openblas_ver = "v0.2.2";
lapack_ver = "3.4.1";
arpack_ver = "3.1.1";
arpack_ver = "3.1.2";
clp_ver = "1.14.5";
lighttpd_ver = "1.4.29";
@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e";
};
arpack_src = fetchurl {
url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/417/get/";
url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/497/get/";
name = "arpack-ng_${arpack_ver}.tar.gz";
sha256 = "be250947a7d6eac7dff8c058102fce9922c524aa06be2a090b6e0bb2d1e228cd";
sha256 = "1wk06bdjgap4hshx0lswzi7vxy2lrdx353y1k7yvm97mpsjvsf4k";
};
lapack_src = fetchurl {
url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "3b413ec24957e400c984002f7cdf6232f5391a7e";
sha256 = "c019b724df9203899a1da5815f85d79291778191bbffc1361d2213ff7d2bbc1d";
rev = "4f692899688f500c77d768f67748f4b7335c90eb";
sha256 = "a60e684a5283e80619f28ec8ff16fdc76c549e8463059507b0819db09dae6688";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline

21
pkgs/development/compilers/openjdk/bootstrap.nix Normal file
View File

@ -0,0 +1,21 @@
{ runCommand, glibc, fetchurl }:
let
# !!! These should be on nixos.org
src = if glibc.system == "x86_64-linux" then
fetchurl {
url = http://nixos.org/tarballs/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz;
sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32";
}
else if glibc.system == "i686-linux" then
fetchurl {
url = http://nixos.org/tarballs/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz;
sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206";
}
else throw "No bootstrap for system";
in
runCommand "openjdk-bootstrap" {} ''
xz -dc ${src} | sed "s/e*-glibc-[^/]*/$(basename ${glibc})/g" | tar xv
mv openjdk-bootstrap $out
''

1
pkgs/development/compilers/openjdk/default.nix
View File

@ -107,6 +107,7 @@ stdenv.mkDerivation rec {
"UNIXCOMMAND_PATH="
"BOOTDIR=${jdk}"
"DROPS_DIR=$(DROPS_PATH)"
"SKIP_BOOT_CYCLE=false"
];
configurePhase = ''

26
pkgs/development/compilers/openjdk/make-bootstrap.nix Normal file
View File

@ -0,0 +1,26 @@
{ runCommand, openjdk, nukeReferences }:
let arch = if openjdk.system == "x86_64-linux" then "amd64" else "i386"; in
runCommand "${openjdk.name}-bootstrap.tar.xz" {} ''
mkdir -p openjdk-bootstrap/bin
mkdir -p openjdk-bootstrap/lib
mkdir -p openjdk-bootstrap/jre/lib/{security,ext,${arch}/{jli,server,client,headless}}
cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} openjdk-bootstrap/bin
cp ${openjdk}/lib/tools.jar openjdk-bootstrap/lib
cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} openjdk-bootstrap/jre/lib
cp ${openjdk}/jre/lib/security/java.security openjdk-bootstrap/jre/lib/security
cp ${openjdk}/jre/lib/ext/{meta-index,sunjce_provider.jar} openjdk-bootstrap/jre/lib/ext
cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} openjdk-bootstrap/jre/lib/${arch}
cp ${openjdk}/jre/lib/${arch}/jli/libjli.so openjdk-bootstrap/jre/lib/${arch}/jli
cp ${openjdk}/jre/lib/${arch}/server/libjvm.so openjdk-bootstrap/jre/lib/${arch}/server
cp ${openjdk}/jre/lib/${arch}/client/libjvm.so openjdk-bootstrap/jre/lib/${arch}/client ||
rmdir openjdk-bootstrap/jre/lib/${arch}/client
cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so openjdk-bootstrap/jre/lib/${arch}/headless
cp -a ${openjdk}/include openjdk-bootstrap
chmod -R +w openjdk-bootstrap
find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs
tar cv openjdk-bootstrap | xz > $out
''

6
pkgs/development/compilers/scala/default.nix
View File

@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
rm bin/*.bat
rm "bin/"*.bat
mv * $out
'';
phases = "unpackPhase installPhase";
meta = {
description = "Scala is a general purpose programming language";
longDescription = ''
@ -25,7 +23,7 @@ stdenv.mkDerivation rec {
common programming patterns in a concise, elegant, and type-safe way.
It smoothly integrates features of object-oriented and functional
languages, enabling Java and other programmers to be more productive.
Code sizes are typically reduced by a factor of two to three when
Code sizes are typically reduced by a factor of two to three when
compared to an equivalent Java application.
'';
homepage = http://www.scala-lang.org/;

6
pkgs/development/compilers/urweb/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "urweb";
version = "20120110";
version = "20120807";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.impredicative.com/ur/${name}.tgz";
sha256 = "1f67nj2akji9dh3n2hwmcrrwd61zlrnb0xh841fpb3n20ycjzg6j";
sha256 = "15g1cz108dkzlp433cg56x76f20y6zcs9sbgxgdniyfakmn4ld6l";
};
buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.impredicative.com/ur/;
license = "bsd";
license = stdenv.lib.licenses.bsd3;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

8
pkgs/development/eclipse/ecj/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, unzip, ant, gcj }:
let
version = "3.6.1";
date = "201009090800";
version = "3.7.2";
date = "201202080800";
isGCJ = stdenv.lib.strings.substring 0 3 gcj.name == "gcj";
javaExec = if isGCJ then "gij" else "java";
javaFlags = if isGCJ then "--cp" else "-cp";
@ -11,8 +11,8 @@ in
name = "ecj-${version}";
src = fetchurl {
url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.zip";
sha256 = "0xfsig2pzd9wy524wp11s7pc7cj81s28g1485995b44d9qbi17h8";
url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar";
sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm";
};
buildInputs = [ unzip ant gcj ];

16
pkgs/development/libraries/babl/0_0_22.nix Normal file
View File

@ -0,0 +1,16 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "babl-0.0.22";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2;
sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s";
};
meta = {
description = "Image pixel format conversion library";
homepage = http://gegl.org/babl/;
license = "GPL3";
};
}

21
pkgs/development/libraries/gegl/0_0_22.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg
, librsvg, pango, gtk }:
stdenv.mkDerivation {
name = "gegl-0.0.22";
src = fetchurl {
url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
};
configureFlags = "--disable-docs"; # needs fonts otherwise don't know how to pass them
buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ];
meta = {
description = "Graph-based image processing framework";
homepage = http://www.gegl.org;
license = "GPL3";
};
}

8
pkgs/development/libraries/glib/2.30.x.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi
, python, pcre }:
# TODO:
@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
};
# configure script looks for d-bus but it is only needed for tests
buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
buildInputs = [ pcre ]
++ (if libiconvOrNull != null
then [ libiconvOrNull ]
else []);
buildNativeInputs = [ perl pkgconfig gettext python ];
propagatedBuildInputs = [ zlib libffi ];

4
pkgs/development/libraries/gnutls/default.nix
View File

@ -29,7 +29,9 @@ stdenv.mkDerivation (rec {
propagatedBuildInputs = [ nettle libtasn1 ];
doCheck = true;
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD);
meta = {
description = "The GNU Transport Layer Security Library";

4
pkgs/development/libraries/haskell/ListLike/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ListLike";
version = "3.1.5";
sha256 = "0hxpjmj5qdyb55wda2bgd3crkg9q6dklhj2kff7qz6wkx5fdbvjs";
version = "3.1.6";
sha256 = "0ij6yb80dv841zn23lp6251avzmljzmy4j25r7w6h55y32y7gq46";
isLibrary = true;
isExecutable = true;
meta = {

4
pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "MonadCatchIO-mtl";
version = "0.3.0.4";
sha256 = "0wzdrfplwa4v9miv88rg3jvf7l6gphc29lpdp5qjm5873y57jxm7";
version = "0.3.0.5";
sha256 = "01c2xif4aly2lmg2qkri791ignq3r2qg4xbc8m06cdm6gh5a2dqp";
buildDepends = [ extensibleExceptions mtl ];
meta = {
homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl";

4
pkgs/development/libraries/haskell/RepLib/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "RepLib";
version = "0.5.3";
sha256 = "1kpd4qli6fclrr3i21kmdwbpa0la7ssi9pgagzclr3yj2ca2hsgw";
version = "0.5.3.1";
sha256 = "0lc1ma6h5wdfl4crnvg1vyvlx4xvps4l2nwb9dl6nyspmpjad807";
buildDepends = [ mtl typeEquality ];
meta = {
homepage = "http://code.google.com/p/replib/";

2
pkgs/development/libraries/haskell/accelerate-examples/default.nix
View File

@ -22,7 +22,7 @@ cabal.mkDerivation (self: {
homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/";
description = "Examples using the Accelerate library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
platforms = self.stdenv.lib.platforms.none;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/libraries/haskell/async/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "async";
version = "2.0.1.1";
sha256 = "132xr0sb3j02s134my4p7khj95d3v3jlpxqjrgn6h8brw0gp6wcq";
version = "2.0.1.2";
sha256 = "03mmrs1xrw91pv9xpas8acxvrh4j6bq5l24bqk4vmaq2pdy9snn3";
buildDepends = [ stm ];
meta = {
homepage = "https://github.com/simonmar/async";

4
pkgs/development/libraries/haskell/attoparsec/enumerator.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec-enumerator";
version = "0.3";
sha256 = "1sfqcr1mvny9gf0zzggwvs2b20knxrbb208rzaa86ay0b5b5jw5v";
version = "0.3.1";
sha256 = "10h6i23vhcishp599s4lbp0c46wcba99w6iv4ickdr1avrm9z2m7";
buildDepends = [ attoparsec enumerator text ];
meta = {
homepage = "https://john-millikin.com/software/attoparsec-enumerator/";

4
pkgs/development/libraries/haskell/authenticate/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "authenticate";
version = "1.3.0.1";
sha256 = "12s1ri2k0hmaws1rnr4s8ck1wa14lhcih0pzi89hjh7jh8si3dl3";
version = "1.3.1";
sha256 = "1ad3vzfa7nvp8h8wk5370d2qyri0nywq1wjdvqas2mg4iv7v7271";
buildDepends = [
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
conduit httpConduit httpTypes monadControl network resourcet

4
pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder-enumerator";
version = "0.2.0.4";
sha256 = "1zwp9hcjsmy5p5i436ajvl86zl1z4pzcfp6c57sj8vfr08rrrkq9";
version = "0.2.0.5";
sha256 = "0bbbv9wwzw9ss3d02mszdzxzhg6pcrnpwir9bvby7xkmfqpyffaa";
buildDepends = [ blazeBuilder enumerator transformers ];
meta = {
homepage = "https://github.com/meiersi/blaze-builder-enumerator";

4
pkgs/development/libraries/haskell/case-insensitive/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "case-insensitive";
version = "0.4.0.1";
sha256 = "15wcpzmj1ppl27p8hph9y8nxkjkd4yrvamxi3gk0ahfnb47chaq7";
version = "0.4.0.3";
sha256 = "1lpfxfwfxiimvh5nxqrnjqj2687dp7rmv9wkrpmw2zm5wkxwcmzf";
buildDepends = [ hashable text ];
meta = {
homepage = "https://github.com/basvandijk/case-insensitive";

4
pkgs/development/libraries/haskell/certificate/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
version = "1.2.4";
sha256 = "079364567cshfj2bc0lbj933jcgdqisvv8m0czlyscb4hd10vfg7";
version = "1.2.5";
sha256 = "1zxi1hflq973m7a1c9wvxdx8aqapx1kqy8j7nn7k67l9gpjb1jbc";
isLibrary = true;
isExecutable = true;
buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ];

3
pkgs/development/libraries/haskell/clientsession/default.nix
View File

@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
skein tagged
];
patchPhase = ''
sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' clientsession.cabal
'';
meta = {
homepage = "http://github.com/yesodweb/clientsession/tree/master";
description = "Securely store session data in a client-side cookie";

4
pkgs/development/libraries/haskell/cmdargs/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cmdargs";
version = "0.9.6";
sha256 = "0xmzx7iglygks11qmnwz9jjj0jim2sjq7x3xf39symzs986pswlk";
version = "0.9.7";
sha256 = "0w3y94hjq5w1i2vcj45jfdbi1iadib2nsv0pa3w9dmqvn9wxlvz4";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath transformers ];

4
pkgs/development/libraries/haskell/comonad/3.0.0.1.nix → pkgs/development/libraries/haskell/comonad/3.0.0.2.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "comonad";
version = "3.0.0.1";
sha256 = "03xslpfil96v1qgk2g29vi46mb7l0fafy446ng1p4xgq9ddb2yaz";
version = "3.0.0.2";
sha256 = "01q71b446mdbdj81qjrxjl5bshbg4bjih5zpw9fd4y5431bclfhi";
buildDepends = [ semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/comonad/";

4
pkgs/development/libraries/haskell/criterion/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "criterion";
version = "0.6.0.1";
sha256 = "0k6ip41w5h1z8gl67a8vsb6c3md5nc4yh1vd6dysp9fqgn0vky0a";
version = "0.6.1.1";
sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw";
buildDepends = [
aeson deepseq filepath hastache mtl mwcRandom parsec statistics
time transformers vector vectorAlgorithms

2
pkgs/development/libraries/haskell/cuda/default.nix
View File

@ -37,7 +37,7 @@ cabal.mkDerivation (self: {
meta = {
description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
platforms = self.stdenv.lib.platforms.none;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/libraries/haskell/fast-logger/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fast-logger";
version = "0.2.1";
sha256 = "12avan85dkwipp8hqsya8yslirykz2yvqmns3wjhwl9j30idj7r3";
version = "0.2.2";
sha256 = "1r1fk0lqmh49v24wnx236x9cz122c8806y9mrxnaihxggw4anj0x";
buildDepends = [ blazeBuilder filepath text unixTime ];
meta = {
description = "A fast logging system";

4
pkgs/development/libraries/haskell/fclabels/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fclabels";
version = "1.1.4";
sha256 = "0b15nvnsxckw75q7dgrfxnnjc93ah140gi3s5wpb41q0fnvl9npz";
version = "1.1.4.1";
sha256 = "09k601kijdflazmrxygwwd8lmxr9vx2bzc25qiwcc9id2rp43asm";
buildDepends = [ mtl transformers ];
meta = {
description = "First class accessor labels";

3
pkgs/development/libraries/haskell/filestore/default.nix
View File

@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
buildDepends = [
Diff filepath HUnit mtl parsec split time utf8String xml
];
patchPhase = ''
sed -i -e 's|split.*,|split,|' filestore.cabal
'';
noHaddock = true;
meta = {
description = "Interface for versioning file stores";

4
pkgs/development/libraries/haskell/glpk-hs/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "glpk-hs";
version = "0.3.2";
sha256 = "0y7imgzcnh6x36m5f6mns5ay1xhxy5p6i5nh16p2ywzjj0padcg8";
version = "0.3.3";
sha256 = "1pnq0v5va7f40ky9xb8c4z9wcmmnny2vk4afasz5pwivbxh42mfl";
buildDepends = [ deepseq mtl ];
extraLibraries = [ glpk ];
meta = {

4
pkgs/development/libraries/haskell/hamlet/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
version = "1.1.0.1";
sha256 = "14qlpdfnj90ilgcgll96rrpc4cjc218q7p7kc6y391rkf393453p";
version = "1.1.0.2";
sha256 = "0knkc43ldz3jhn3pmsysqbzlsp8akh9kiyy2jncra9y0xhminpqy";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
];

3
pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
View File

@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
version = "7.0.1";
sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n";
buildDepends = [ hamlet happstackServer text ];
patchPhase = ''
sed -i -e 's|hamlet .*,|hamlet,|' happstack-hamlet.cabal
'';
meta = {
homepage = "http://www.happstack.com/";
description = "Support for Hamlet HTML templates in Happstack";

3
pkgs/development/libraries/haskell/happstack/happstack-server.nix
View File

@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
html monadControl mtl network parsec sendfile syb systemFilepath
text time transformers transformersBase utf8String xhtml zlib
];
patchPhase = ''
sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' happstack-server.cabal
'';
meta = {
homepage = "http://happstack.com";
description = "Web related tools and services";

4
pkgs/development/libraries/haskell/hashable/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hashable";
version = "1.1.2.3";
sha256 = "19v94b34c2j6f9d9xii2hg0mjxdkq51aifkcqw6hbicn97kfcxls";
version = "1.1.2.5";
sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z";
buildDepends = [ text ];
meta = {
homepage = "http://github.com/tibbe/hashable";

4
pkgs/development/libraries/haskell/highlighting-kate/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.1";
sha256 = "0l0g71rg7cs9rm4i04h88fm20868s0kf2da89297xlrm58zfv0jj";
version = "0.5.2";
sha256 = "1a3aifknbxm3v0lvqisdc6zqgki9x9z12jdrmijxmxq1riwwalr2";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ];

3
pkgs/development/libraries/haskell/hledger-lib/default.nix
View File

@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText
split time transformers utf8String
];
patchPhase = ''
sed -i -e 's|,split.*|,split|' hledger-lib.cabal
'';
meta = {
homepage = "http://hledger.org";
description = "Core data types, parsers and utilities for the hledger accounting tool";

3
pkgs/development/libraries/haskell/hledger/default.nix
View File

@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec
regexpr safe shakespeareText split text time utf8String
];
patchPhase = ''
sed -i -e 's|,split.*|,split|' hledger.cabal
'';
meta = {
homepage = "http://hledger.org";
description = "The main command-line interface for the hledger accounting tool";

4
pkgs/development/libraries/haskell/hoogle/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hoogle";
version = "4.2.12";
sha256 = "1j726bm8sx4qamaib6l14s4a4jz4z6szhj1vk8n5b6f3g38s7hwy";
version = "4.2.13";
sha256 = "0asw9lr22d8jxr58b7w2j5hgllxhw2w8kllh5aq5jjs272hjiy9i";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.5.0.3";
sha256 = "1l00wyisb5jkq1c2ikzq0iwhjx6s66bz5s8gricfbrr15bdx1iay";
version = "1.6.0";
sha256 = "1vr4kglmlqn6s31ks231qx4b8034p6yi0501h3zswpqyf5cimhl7";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie

4
pkgs/development/libraries/haskell/http-types/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-types";
version = "0.7.1";
sha256 = "1vfaffraiqdsjbw4b0xwk8h8d4pl94mbxlwyqk8ry786v9aafyqx";
version = "0.7.3";
sha256 = "1s2y2fl9l75xd6fls9ajasn37i7cqxfw772rkw50d3vxvk2fdxjh";
buildDepends = [ blazeBuilder caseInsensitive text ];
meta = {
homepage = "https://github.com/aristidb/http-types";

4
pkgs/development/libraries/haskell/io-choice/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "io-choice";
version = "0.0.1";
sha256 = "0jwxqs65g88q9l0w4xzllj7svz3qr2zgiaq2fyq5jmh33lz74r63";
version = "0.0.2";
sha256 = "0kxn357cc31gvaajg41h6xwpivq049dl1zd551xfvrvzndvy061f";
buildDepends = [
liftedBase monadControl transformers transformersBase
];

4
pkgs/development/libraries/haskell/lifted-base/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
version = "0.1.1.1";
sha256 = "1cfk3n12qhyrrfvw410gfydbgmb7r9y65fsjp2r3c4ilcyd5li70";
version = "0.1.2";
sha256 = "0js94dlfy2wjl026jcj2l399ly4zgw0cgxkmil6lsm34gcy9vrvq";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];

3
pkgs/development/libraries/haskell/mime-mail/default.nix
View File

@ -7,6 +7,9 @@ cabal.mkDerivation (self: {
buildDepends = [
base64Bytestring blazeBuilder filepath random text
];
patchPhase = ''
sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' mime-mail.cabal
'';
meta = {
homepage = "http://github.com/snoyberg/mime-mail";
description = "Compose MIME email messages";

4
pkgs/development/libraries/haskell/mwc-random/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "mwc-random";
version = "0.12.0.0";
sha256 = "0c1gzf5nkcbfi2zlhh7ly8b4g2gcr0c1b76awk38g9as9qibgivr";
version = "0.12.0.1";
sha256 = "1sq4yxi231ka8rzwsihqziibs7amvl27ycr018wymm3yz36vsy7c";
buildDepends = [ primitive time vector ];
meta = {
homepage = "https://github.com/bos/mwc-random";

4
pkgs/development/libraries/haskell/network/2.3.0.14.nix → pkgs/development/libraries/haskell/network/2.3.1.0.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "network";
version = "2.3.0.14";
sha256 = "0naqg7ai50m3p093mi342w2z0flaagarf9n9smkn1dqvq8jg75x5";
version = "2.3.1.0";
sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l";
buildDepends = [ parsec ];
meta = {
homepage = "http://github.com/haskell/network";

3
pkgs/development/libraries/haskell/pandoc/default.nix
View File

@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
highlightingKate HTTP json mtl network pandocTypes parsec random
syb tagsoup temporary texmath time utf8String xml zipArchive zlib
];
patchPhase = ''
sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' pandoc.cabal
'';
meta = {
homepage = "http://johnmacfarlane.net/pandoc";
description = "Conversion between markup formats";

4
pkgs/development/libraries/haskell/postgresql-libpq/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "postgresql-libpq";
version = "0.8.2";
sha256 = "10i3yc5fxlmnrb8j9p2a9w7h49p3ain36qpshlb34chdk9xh3l7g";
version = "0.8.2.1";
sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d";
extraLibraries = [ postgresql ];
meta = {
homepage = "http://github.com/lpsmith/postgresql-libpq";

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