BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

synchronize with trunk

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
This commit is contained in:
Peter Simons 2011-11-02 10:28:32 +00:00
commit 69488d688d
110 changed files with 830 additions and 520 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
maintainers/scripts/gnu/gnupdate
View file

@ -308,12 +308,17 @@ replaced by the result of their application to DERIVATIONS, a vhash."
;; DERIVATION lacks an "src" attribute.
(and=> (derivation-source derivation) source-output-path))
(define (open-nixpkgs nixpkgs)
(define* (open-nixpkgs nixpkgs #:optional attribute)
;; Return an input pipe to the XML representation of Nixpkgs. When
;; ATTRIBUTE is true, only that attribute is considered.
(let ((script (string-append nixpkgs
"/maintainers/scripts/eval-release.nix")))
(open-pipe* OPEN_READ "nix-instantiate"
"--strict" "--eval-only" "--xml"
script)))
(apply open-pipe* OPEN_READ
"nix-instantiate" "--strict" "--eval-only" "--xml"
`(,@(if attribute
`("-A" ,attribute)
'())
,script))))
(define (pipe-failed? pipe)
"Close pipe and return its status if it failed."
@ -323,21 +328,36 @@ replaced by the result of their application to DERIVATIONS, a vhash."
status
#f)))
(define (nix-prefetch-url url)
;; Download URL in the Nix store and return the base32-encoded SHA256 hash
;; of the file at URL
(let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
(hash (read-line pipe)))
(if (or (pipe-failed? pipe)
(eof-object? hash))
(values #f #f)
(let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
"sha256" hash (basename url)))
(path (read-line pipe)))
(if (or (pipe-failed? pipe)
(eof-object? path))
(values #f #f)
(values (string-trim-both hash) (string-trim-both path)))))))
(define (memoize proc)
"Return a memoizing version of PROC."
(let ((cache (make-hash-table)))
(lambda args
(let ((results (hash-ref cache args)))
(if results
(apply values results)
(let ((results (call-with-values (lambda ()
(apply proc args))
list)))
(hash-set! cache args results)
(apply values results)))))))
(define nix-prefetch-url
(memoize
(lambda (url)
"Download URL in the Nix store and return the base32-encoded SHA256 hash of
the file at URL."
(let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
(hash (read-line pipe)))
(if (or (pipe-failed? pipe)
(eof-object? hash))
(values #f #f)
(let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
"sha256" hash (basename url)))
(path (read-line pipe)))
(if (or (pipe-failed? pipe)
(eof-object? path))
(values #f #f)
(values (string-trim-both hash) (string-trim-both path)))))))))
(define (update-nix-expression file
old-version old-hash
@ -409,8 +429,7 @@ replaced by the result of their application to DERIVATIONS, a vhash."
(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."
"Verify signature SIG for FILE. Return a status s-exp if GnuPG failed."
(define (status-line->sexp line)
;; See file `doc/DETAILS' in GnuPG.
@ -475,9 +494,10 @@ failed."
(let* ((pipe (open-pipe* OPEN_READ %gpg-command "--status-fd=1"
"--verify" sig file))
(status (parse-status pipe)))
(if (pipe-failed? pipe)
#f
status)))
;; Ignore PIPE's exit status since STATUS above should contain all the
;; info we need.
(close-pipe pipe)
status))
(define (gnupg-status-good-signature? status)
"If STATUS, as returned by `gnupg-verify', denotes a good signature, return
@ -716,7 +736,8 @@ Return #t if the signature was good, #f otherwise."
(('attribute _ "description" value)
(string-prefix? "GNU" value))
(('attribute _ "homepage" (? string? value))
(string-contains value "www.gnu.org"))
(or (string-contains value "gnu.org")
(string-contains value "gnupg.org")))
(('attribute _ "homepage" ((? string? value) ...))
(any (cut string-contains <> "www.gnu.org") value))
(_ #f)))
@ -749,6 +770,7 @@ Return #t if the signature was good, #f otherwise."
("libosip2" "ftp.gnu.org" "/gnu/osip" #f)
("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t)
("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
("libassuan" "ftp.gnupg.org" "/gcrypt" #t)
("freefont-ttf" "ftp.gnu.org" "/gnu/freefont" #f)
("gnupg" "ftp.gnupg.org" "/gcrypt" #t)
("gnu-ghostscript" "ftp.gnu.org" "/gnu/ghostscript" #f)
@ -921,6 +943,7 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
gnu-packages))
(define (fetch-gnu project directory version archive-type)
"Download PROJECT's tarball over FTP."
(let* ((server (ftp-server/directory project))
(base (string-append project "-" version ".tar." archive-type))
(url (string-append "ftp://" server "/" directory "/" base))
@ -963,12 +986,18 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
(format #t "~%")
(format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%")
(format #t " from FILE.~%")
(format #t " -A, --attribute=ATTR~%")
(format #t " Update only the package pointed to by attribute~%")
(format #t " ATTR.~%")
(format #t " -s, --select=SET Update only packages from SET, which may~%")
(format #t " be either `all', `stdenv', or `non-stdenv'.~%")
(format #t " -d, --dry-run Don't actually update Nix expressions~%")
(format #t " -h, --help Give this help list.~%~%")
(format #t "Report bugs to <ludo@gnu.org>~%")
(exit 0)))
(option '(#\A "attribute") #t #f
(lambda (opt name arg result)
(alist-cons 'attribute arg result)))
(option '(#\s "select") #t #f
(lambda (opt name arg result)
(cond ((string-ci=? arg "stdenv")
@ -994,13 +1023,14 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
(define (gnupdate . args)
;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
(define (nixpkgs->snix xml-file)
(define (nixpkgs->snix xml-file attribute)
(format (current-error-port) "evaluating Nixpkgs...~%")
(let* ((home (getenv "HOME"))
(xml (if xml-file
(open-input-file xml-file)
(open-nixpkgs (or (getenv "NIXPKGS")
(string-append home "/src/nixpkgs")))))
(string-append home "/src/nixpkgs"))
attribute)))
(snix (xml->snix xml)))
(if (not xml-file)
(let ((status (pipe-failed? xml)))
@ -1009,7 +1039,34 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
(format (current-error-port) "`nix-instantiate' failed: ~A~%"
status)
(exit 1)))))
snix))
;; If we asked for a specific attribute, rewrap the thing in an
;; attribute set to match the expectations of `packages-to-update' & co.
(if attribute
(match snix
(('snix loc ('derivation args ...))
`(snix ,loc
(attribute-set
((attribute #f ,attribute
(derivation ,@args)))))))
snix)))
(define (selected-gnu-packages packages stdenv selection)
;; Return the subset of PACKAGES that are/aren't in STDENV, according to
;; SELECTION. To do that reliably, we check whether their "src"
;; derivation is a requisite of STDENV.
(define gnu
(gnu-packages packages))
(case selection
((stdenv)
gnu)
((non-stdenv)
(filter (lambda (p)
(not (member (package-source-output-path p)
(force stdenv))))
gnu))
(else gnu)))
(let* ((opts (args-fold (cdr args) %options
(lambda (opt name arg result)
@ -1017,7 +1074,8 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
(lambda (operand result)
(error "extraneous argument `~A'" operand))
'()))
(snix (nixpkgs->snix (assoc-ref opts 'xml-file)))
(snix (nixpkgs->snix (assq-ref opts 'xml-file)
(assq-ref opts 'attribute)))
(packages (match snix
(('snix _ ('attribute-set attributes))
attributes)
@ -1026,23 +1084,12 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
;; The source tarballs that make up stdenv.
(filter-map derivation-source-output-path
(package-requisites (stdenv-package packages)))))
(gnu (gnu-packages packages))
(gnu* (case (assoc-ref opts 'filter)
;; Filter out packages that are/aren't in `stdenv'. To
;; do that reliably, we check whether their "src"
;; derivation is a requisite of stdenv.
((stdenv)
(filter (lambda (p)
(member (package-source-output-path p)
(force stdenv)))
gnu))
((non-stdenv)
(filter (lambda (p)
(not (member (package-source-output-path p)
(force stdenv))))
gnu))
(else gnu)))
(updates (packages-to-update gnu*)))
(attribute (assq-ref opts 'attribute))
(selection (assq-ref opts 'filter))
(to-update (if attribute
packages ; already a subset
(selected-gnu-packages packages stdenv selection)))
(updates (packages-to-update to-update)))
(format #t "~%~A packages to update...~%" (length updates))
(for-each (lambda (update)

8
pkgs/applications/editors/zile/default.nix
View file

@ -1,14 +1,14 @@
{ fetchurl, stdenv, ncurses, help2man }:
{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
name = "zile-2.3.24";
name = "zile-2.4.2";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
sha256 = "12by1f5nbk2qcq0f35aqjq5g54nsnajk2rk5060icsjc86pv52r1";
sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k";
};
buildInputs = [ ncurses ];
buildInputs = [ ncurses boehmgc perl ];
buildNativeInputs = [ help2man ];
# Tests can't be run because most of them rely on the ability to

33
pkgs/applications/misc/xpdf/default.nix
View file

@ -8,40 +8,19 @@ assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null;
stdenv.mkDerivation {
name = "xpdf-3.02pl5";
name = "xpdf-3.03";
src = fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk";
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz;
sha256 = "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2";
};
buildInputs =
(if enableGUI then [x11 motif] else []) ++
(if useT1Lib then [t1lib] else []);
patches = [
(fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch;
sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq";
})
(fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch;
sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi";
})
(fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch;
sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r";
})
(fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch;
sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h";
})
(fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl5.patch;
sha256 = "1fki66pw56yr6aw38f6amrx7wxwcxbx4704pjqq7pqqr784b7z4j";
})
./xpdf-3.02-protection.patch
];
# Debian uses '-fpermissive' to bypass some errors on char* constantness.
CXXFLAGS = "-O2 -fpermissive";
configureFlags =
"--infodir=$out/share/info --mandir=$out/share/man --enable-a4-paper"
@ -54,7 +33,7 @@ stdenv.mkDerivation {
if test -n \"${base14Fonts}\"; then
substituteInPlace $out/etc/xpdfrc \\
--replace /usr/local/share/ghostscript/fonts ${base14Fonts} \\
--replace '#displayFontT1' displayFontT1
--replace '#displayFontT1' displayFontT2
fi
";

8
pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
View file

@ -1,17 +1,15 @@
{ stdenv, fetchurl, pidgin, intltool, libxml2 }:
let version = "1.10.0"; in
let version = "1.12.0"; in
stdenv.mkDerivation {
name = "pidgin-sipe-${version}";
src = fetchurl {
url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz";
sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np";
url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
sha256 = "12ki6n360v2ja961fzw4mwpgb8jdp9k21y5mbiab151867c862r6";
};
patches = [ ./fix-2.7.0.patch ];
meta = {
description = "SIPE plugin for Pidgin IM.";
homepage = http://sipe.sourceforge.net/;

27
pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch
View file

@ -1,27 +0,0 @@
From 8ad28171ac5c3fbd1917a2f52e75423c4d357b24 Mon Sep 17 00:00:00 2001
From: David Brown <nix@davidb.org>
Date: Thu, 3 Jun 2010 06:40:04 -0700
Subject: [PATCH] Fix initializer for 2.7.0 release
The release of 2.7.0 of pidgin/purple gained two extra fields in a
structure.
---
src/core/sipe.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/core/sipe.c b/src/core/sipe.c
index 45a9015..19f4237 100644
--- a/src/core/sipe.c
+++ b/src/core/sipe.c
@@ -10683,6 +10683,8 @@ PurplePluginProtocolInfo prpl_info =
NULL, /* get_media_caps */
#if PURPLE_VERSION_CHECK(2,7,0)
NULL, /* get_moods */
+ NULL, /* set_public_alias */
+ NULL, /* get_public_alias */
#endif
#endif
#endif
--
1.7.1

9
pkgs/applications/version-management/subversion/default.nix
View file

@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
version = "1.6.17";
version = "1.7.1";
name = "subversion-${version}";
src = fetchurl {
url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
sha1 = "6e3ed7c87d98fdf5f0a999050ab601dcec6155a1";
url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "4bfaa8e33e9eaf26a504117cd91b23805518071a";
};
buildInputs = [ zlib apr aprutil sqlite ]
@ -48,9 +48,6 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
ensureDir $out/share/emacs/site-lisp
cp contrib/client-side/emacs/[dp]svn*.el $out/share/emacs/site-lisp/
if test -n "$pythonBindings"; then
make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn

2
pkgs/build-support/clang-wrapper/builder.sh
View file

@ -47,7 +47,7 @@ else
# It's unclear if these will ever be provided by an LLVM project
clangCFlags="$clangCFlags -B$basePath"
clangCFlags="$clangCFlags -I$clang/lib/clang/$clangVersion/include"
clangCFlags="$clangCFlags -isystem$clang/lib/clang/$clangVersion/include"
echo "$clangCFlags" > $out/nix-support/clang-cflags
clangPath="$clang/bin"

2
pkgs/build-support/kernel/modules-closure.sh
View file

@ -27,7 +27,7 @@ done
echo "closure:"
ensureDir $out/lib/modules/"$version"
for module in $closure; do
target=$(echo $module | sed "s^/nix/store/.*/lib/modules/^$out/lib/modules/^")
target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^")
if test -e "$target"; then continue; fi
if test \! -e "$module"; then continue; fi # XXX: to avoid error with "cp builtin builtin"
mkdir -p $(dirname $target)

2
pkgs/build-support/nuke-references/builder.sh
View file

@ -5,7 +5,7 @@ cat > $out/bin/nuke-refs <<EOF
#! $SHELL -e
for i in \$*; do
if test ! -L \$i -a -f \$i; then
cat \$i | sed "s|/nix/store/[a-z0-9]*-|/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp
cat \$i | sed "s|$NIX_STORE/[a-z0-9]*-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp
if test -x \$i; then chmod +x \$i.tmp; fi
mv \$i.tmp \$i
fi

2
pkgs/data/documentation/man-pages/default.nix
View file

@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Linux development manual pages";
homepage = http://kernel.org/pub/linux/docs/manpages/;
homepage = http://www.kernel.org/doc/man-pages/;
};
}

33
pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix Normal file
View file

@ -0,0 +1,33 @@
{ stdenv, fetchurl, unzip }:
let
src = fetchurl {
url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip;
sha256 = "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany";
};
isoents = fetchurl {
url = http://www.oasis-open.org/cover/ISOEnts.zip;
sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w";
};
in
stdenv.mkDerivation {
name = "docbook-sgml-4.1";
unpackPhase = "true";
buildInputs = [ unzip ];
installPhase =
''
o=$out/sgml/dtd/docbook-4.1
mkdir -p $o
cd $o
unzip ${src}
unzip ${isoents}
sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat
'';
}

5
pkgs/development/compilers/llvm/clang.nix
View file

@ -46,11 +46,6 @@ stdenv.mkDerivation {
cd tools/clang
'';
postInstall = ''
install -v -m755 tools/scan-build/scan-build $out/bin
install -v -m755 tools/scan-view/scan-view $out/bin
'';
passthru = { gcc = stdenv.gcc.gcc; };
meta = {

46
pkgs/development/compilers/mit-scheme/default.nix
View file

@ -1,7 +1,7 @@
{ fetchurl, stdenv, gnum4 }:
{ fetchurl, stdenv, gnum4, texinfo, texLive, automake }:
let
version = "9.0.1";
version = "9.1";
bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
in
stdenv.mkDerivation {
@ -15,23 +15,47 @@ stdenv.mkDerivation {
if stdenv.isi686
then fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
sha256 = "0cfj3bawjdnpa7cbqh2f23hfpjpmryypmzkhndvdbi79a65fl0n2";
sha256 = "1vqdy9f1lbzflr9bw0gjn4g4w3hdpnjrkiwj5aaah70flif5ndns";
} else if stdenv.isx86_64
then fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
sha256 = "0p188d7n0iqdgvra6qv5apvcsv0z2p97ry7xz5216zkc364i6mmr";
sha256 = "1l4zxqm5r1alc6y1cky62rn8h6i40qyiba081n6phwypwxr5sd0g";
} else fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril";
sha256 = "1661cybycfvjjyq92gb3n1cygxfmfjdhnh3d2ha3vy6xxk9d7za9";
};
preConfigure = "cd src";
buildPhase =
if bootstrapFromC
then "./etc/make-liarc.sh --prefix=$out"
else "make compile-microcode";
configurePhase =
'' cd src
./configure --prefix="$out"
buildInputs = [ gnum4 ];
cd ../doc
./configure --prefix="$out"
cd ..
'';
buildPhase =
'' cd src
${if bootstrapFromC
then "./etc/make-liarc.sh --prefix=$out"
else "make compile-microcode"}
cd ../doc
# Provide a `texinfo.tex'.
export TEXINPUTS="$(echo ${automake}/share/automake-*)"
echo "\$TEXINPUTS is \`$TEXINPUTS'"
make
cd ..
'';
installPhase =
'' make install -C src
make install -C doc
'';
buildNativeInputs = [ gnum4 texinfo texLive automake ];
# XXX: The `check' target doesn't exist.
doCheck = false;

4
pkgs/development/libraries/haskell/ConfigFile/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ConfigFile";
version = "1.1.0";
sha256 = "0m5p56if711qi69lxw78746sb0jr5gqbmip5hdbb7lk4z5drgvhc";
version = "1.1.1";
sha256 = "0w2yhbnqldhmj3d98j720l4lj4d08abqcff751p2slszdm5pw1jm";
isLibrary = true;
isExecutable = true;
buildDepends = [ MissingH mtl parsec ];

6
pkgs/development/libraries/haskell/GLURaw/default.nix
View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "GLURaw";
version = "1.1.0.0";
sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac";
version = "1.1.0.1";
sha256 = "0n2yazdk98ia9j65n4ac7k0lnyp9cmz51d344x0jsi0xyfckm0mq";
buildDepends = [ OpenGLRaw ];
extraLibraries = [ freeglut mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
homepage = "http://www.haskell.org/haskellwiki/Opengl";
description = "A raw binding for the OpenGL graphics system";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

6
pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix → pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
View file

@ -4,12 +4,12 @@
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.2.2.0";
sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx";
version = "2.2.2.1";
sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw";
buildDepends = [ OpenGL StateVar Tensor ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
homepage = "http://www.haskell.org/haskellwiki/Opengl";
description = "A binding for the OpenGL Utility Toolkit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/Hipmunk/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Hipmunk";
version = "5.2.0.4";
sha256 = "0sa0a4hg0xp8l64dy8hnfkhvy2miv79b5550v8gkvrbqcci0qfay";
version = "5.2.0.5";
sha256 = "0zmc1bddpvjg11r5931hfx6va73jk1f3nb8nb1qfh86a4addp9id";
buildDepends = [ StateVar transformers ];
noHaddock = true;
meta = {

6
pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "MonadCatchIO-transformers";
version = "0.2.2.2";
sha256 = "083c0abwja447j0p8q0j15iv7bshchy83rfqw07b2hfy38467h9g";
version = "0.2.2.3";
sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6";
buildDepends = [ extensibleExceptions transformers ];
meta = {
description = "Monad-transformer compatible version of the Control.Exception module";
license = self.stdenv.lib.licenses.publicDomain;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres

6
pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix → pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
View file

@ -4,12 +4,12 @@
cabal.mkDerivation (self: {
pname = "OpenGL";
version = "2.4.0.1";
sha256 = "0xdclf0m7qxp4157053cbsybpy7fqiiiak0g2kyf8awr7a5736n5";
version = "2.4.0.2";
sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6";
buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
extraLibraries = [ libX11 mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
homepage = "http://www.haskell.org/haskellwiki/Opengl";
description = "A binding for the OpenGL graphics system";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

6
pkgs/development/libraries/haskell/OpenGLRaw/default.nix
View file

@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "OpenGLRaw";
version = "1.1.0.1";
sha256 = "0v6zcy4xvjj5g137rwjsh6hs0ni9dfkvsqynxv4bl5s78amppqnf";
version = "1.1.0.2";
sha256 = "0d1rjh2vq0w1pzf3vz0mw6p0w43h3sf6034qsi89m4jkx3125fwf";
extraLibraries = [ mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
homepage = "http://www.haskell.org/haskellwiki/Opengl";
description = "A raw binding for the OpenGL graphics system";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

17
pkgs/development/libraries/haskell/base16-bytestring/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "base16-bytestring";
version = "0.1.1.2";
sha256 = "1isxyl52vh0lg195wq9nkr3hlmbw3d3c9aymxlz8hynz0hh1q1z0";
meta = {
homepage = "http://github.com/mailrank/base16-bytestring";
description = "Fast base16 (hex) encoding and deconding for ByteStrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/cabal-file-th/default.nix
View file

@ -9,5 +9,9 @@ cabal.mkDerivation (self: {
description = "Template Haskell expressions for reading fields from a project's cabal file";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

11
pkgs/development/libraries/haskell/certificate/default.nix
View file

@ -1,12 +1,15 @@
{ cabal, asn1Data, base64Bytestring, mtl, time }:
{ cabal, asn1Data, base64Bytestring, cryptoPubkeyTypes, mtl, time
}:
cabal.mkDerivation (self: {
pname = "certificate";
version = "0.9.5";
sha256 = "0nc50x4pqsrm8q6n4xjp79q4dmmglrqd8rbryza8jmcml8fchvbz";
version = "1.0.0";
sha256 = "1i4s1yvl765cfj7ya5rsvzqnijf307zh4i4pzcgncmr37mlkfjz2";
isLibrary = true;
isExecutable = true;
buildDepends = [ asn1Data base64Bytestring mtl time ];
buildDepends = [
asn1Data base64Bytestring cryptoPubkeyTypes mtl time
];
meta = {
homepage = "http://github.com/vincenthz/hs-certificate";
description = "Certificates and Key Reader/Writer";

4
pkgs/development/libraries/haskell/clientsession/default.nix
View file

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
version = "0.7.3.2";
sha256 = "1ml1f5sarfck39qrv4zjcbk1vwgazn32gnjm78fm047ixczi9340";
version = "0.7.3.3";
sha256 = "0cfj225hzn8fsffwnq5zq55dh9m5av1i58b4njhna7miiz6b4jsq";
buildDepends = [
base64Bytestring cereal cryptoApi cryptocipher skein
];

4
pkgs/development/libraries/haskell/cprng-aes/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cprng-aes";
version = "0.2.2";
sha256 = "0jfa9fb670bqlnkplmscz878hvdbpap47xfxvshgs102iq7rjasf";
version = "0.2.3";
sha256 = "1xyphzb3afvw7kpgq3b0c86b45rp5a8s870gag1lp7h686lhfnn3";
buildDepends = [ cereal cryptoApi cryptocipher entropy random ];
meta = {
homepage = "http://github.com/vincenthz/hs-cprng-aes";

18
pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ cabal, cryptoApi }:
cabal.mkDerivation (self: {
pname = "crypto-pubkey-types";
version = "0.1.0";
sha256 = "1ib5bqxydvv37l53wl6b4j6m6y904rsiamhh144lm6rmqiym26f5";
buildDepends = [ cryptoApi ];
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
description = "Generic cryptography Public keys algorithm types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

12
pkgs/development/libraries/haskell/cryptocipher/default.nix
View file

@ -1,12 +1,16 @@
{ cabal, cereal, cryptoApi, primitive, tagged, vector }:
{ cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive, tagged
, vector
}:
cabal.mkDerivation (self: {
pname = "cryptocipher";
version = "0.2.14";
sha256 = "1r91d9sqc53c628z378fyah7vvmkakvxpwbslam0yhfgp2p0l23z";
version = "0.3.0";
sha256 = "17jbzssdbprspadz5ynyam60l5iw7s809irklfg1ii89x26mlyix";
isLibrary = true;
isExecutable = true;
buildDepends = [ cereal cryptoApi primitive tagged vector ];
buildDepends = [
cereal cryptoApi cryptoPubkeyTypes primitive tagged vector
];
meta = {
homepage = "http://github.com/vincenthz/hs-cryptocipher";
description = "Symmetrical Block, Stream and PubKey Ciphers";

17
pkgs/development/libraries/haskell/curl/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ cabal, curl }:
cabal.mkDerivation (self: {
pname = "curl";
version = "1.3.7";
sha256 = "0i6d7732p5gn1bcvavbxcg4wd18j425mi1yjg0b29zzz3yl0qhgi";
extraLibraries = [ curl ];
meta = {
description = "Haskell binding to libcurl";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

18
pkgs/development/libraries/haskell/download-curl/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ cabal, curl, feed, tagsoup, xml }:
cabal.mkDerivation (self: {
pname = "download-curl";
version = "0.1.3";
sha256 = "17g5dnw4yxi4kf5x71bkk4wx1zl8yjs5dd34k6dgnw9wgkz97qw1";
buildDepends = [ curl feed tagsoup xml ];
meta = {
homepage = "http://code.haskell.org/~dons/code/download-curl";
description = "High-level file download based on URLs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

18
pkgs/development/libraries/haskell/download/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ cabal, feed, tagsoup, xml }:
cabal.mkDerivation (self: {
pname = "download";
version = "0.3.2";
sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3";
buildDepends = [ feed tagsoup xml ];
meta = {
homepage = "http://code.haskell.org/~dons/code/download";
description = "High-level file download based on URLs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

3
pkgs/development/libraries/haskell/gamma/default.nix
View file

@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
version = "0.7.0.1";
sha256 = "0728b5mrzmj9hkaqvikl45jyi2p9hnkl2p6l9yv7wnw557yb0gb2";
buildDepends = [ continuedFractions converge vector ];
preConfigure = ''
sed -i 's|\(vector.*\) && < 0.8|\1|' ${self.pname}.cabal
'';
meta = {
homepage = "https://github.com/mokus0/gamma";
description = "Gamma function and related functions";

4
pkgs/development/libraries/haskell/gloss/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.4.0.1";
sha256 = "0za7imyzfgk3ndh9db55wi7zbxrmpvshws4vywrr35b77b3nabr1";
version = "1.5.0.2";
sha256 = "01fd5yl5wdw09xqslmx8h563k2v8dglc60902kia8b5h62xjr1w6";
buildDepends = [ bmp GLUT OpenGL ];
meta = {
homepage = "http://gloss.ouroborus.net";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
version = "0.10.3";
sha256 = "1xkk8hcmfnn9y14fsrab3cv8xknhf8j6hkv668yshg8bjzz1smva";
version = "0.10.4";
sha256 = "10ik9rbj9srb1f7vavs5siidyybzbr4fpy3akv90qldd2xyifhxa";
buildDepends = [
blazeBuilder blazeHtml failure parsec shakespeare text
];

4
pkgs/development/libraries/haskell/happstack/happstack-server.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "6.2.4";
sha256 = "0lhyjaxw1qkh1pi0v14j7ya2ljrfizmxwahrhqk3sasnf2mrqycp";
version = "6.2.5";
sha256 = "196s8i3v55i10nkapkvzyw048flshw8mlm604548f0qjciynfjmg";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hashable";
version = "1.1.2.1";
sha256 = "1kmx3jr9cmkbapd7gywx7zvyd22nyz2mgs8lnzspp5hi7crx3wcx";
version = "1.1.2.2";
sha256 = "0gfg1cyd468czfv5xfhn7rz0r5s0v378c4xjlm6kkw7n10n2zg8y";
buildDepends = [ text ];
meta = {
homepage = "http://github.com/tibbe/hashable";

4
pkgs/development/libraries/haskell/hledger-web/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "hledger-web";
version = "0.16.4";
sha256 = "1p776fzgan9y7g03g92gsvnassc3k28l6l3gr1vd9v3fcnckg2wj";
version = "0.16.5";
sha256 = "0gqhmyl62jkz156gypzxwj46xrh5as3wrvkwrg04wfmpqrac5n06";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/http-date/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-date";
version = "0.0.0";
sha256 = "0jia05636xk9k70hqjjiny5298pkb8g7mck7zybfwvigi1fppa46";
version = "0.0.1";
sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd";
buildDepends = [ attoparsec ];
meta = {
description = "HTTP Date parser/formatter";

4
pkgs/development/libraries/haskell/http-enumerator/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "http-enumerator";
version = "0.7.1.2";
sha256 = "1jxy017vhmzwq4480r6g45mg3x1d48zckbcyqhsk40bw5i32dfmv";
version = "0.7.1.4";
sha256 = "1dp3hw10wpf8izmp48jai90x7mxws05gbjqx9s24gl7y2m24q2xg";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-types";
version = "0.6.5.1";
sha256 = "1gmf5ghfm8hzifinknyk10m7ayxkn48h1l0mchi2vl6h5rg0nnca";
version = "0.6.6";
sha256 = "1x1jgfh399a88dc3ms6va12lvq9iih1shxmqm08xzz4fly6v4k7r";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeBuilder caseInsensitive text ];

18
pkgs/development/libraries/haskell/network/2.3.0.5.nix
View file

@ -1,18 +0,0 @@
{ cabal, parsec }:
cabal.mkDerivation (self: {
pname = "network";
version = "2.3.0.5";
sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0";
buildDepends = [ parsec ];
meta = {
homepage = "http://github.com/haskell/network";
description = "Low-level networking interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/network/2.3.0.6.nix → pkgs/development/libraries/haskell/network/2.3.0.7.nix
View file

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

4
pkgs/development/libraries/haskell/persistent/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "0.6.3";
sha256 = "0m50z9k941bhh05jjz1268sn1bi7w8i6jzccldgnbjjvsw2xaisx";
version = "0.6.4";
sha256 = "149dk6i6w36rq3z6zzrcmpr0kxpp6hk0qpc43vwj0dm68nrffaqk";
buildDepends = [
blazeHtml dataObject enumerator monadControl mtl pathPieces pool
text time transformers

4
pkgs/development/libraries/haskell/shakespeare/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
version = "0.10.1.1";
sha256 = "1qd5wrcr4ss5zigbb7s6c7y7qbvrnbvgdpwq985yyy71i5hwxv0a";
version = "0.10.2";
sha256 = "173pcdm69w1xg3vm31xh6hs9w1552cmb1pz99ri09h1ajdhf2qwc";
buildDepends = [ parsec text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";

4
pkgs/development/libraries/haskell/simple-sendfile/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "simple-sendfile";
version = "0.1.2";
sha256 = "08w5ria2x41j85z1126kddi918zdqrwmr4vwqczgzh9kdi49wv8j";
version = "0.1.3";
sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8";
buildDepends = [ network ];
meta = {
description = "Cross platform library for the sendfile system call";

4
pkgs/development/libraries/haskell/skein/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "skein";
version = "0.1.0.2";
sha256 = "1ay7ri011vwvl74b9calbnav90d0r08gzqgdk8nvw1qx4slk1ibs";
version = "0.1.0.3";
sha256 = "1lag86db793l7n6zg97kn5wv31dal5sb8wig4sr7kqschxszq44d";
buildDepends = [ cereal cryptoApi tagged ];
meta = {
description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";

24
pkgs/development/libraries/haskell/snap/core.nix
View file

@ -1,19 +1,21 @@
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
, blazeBuilderEnumerator, bytestringMmap, bytestringNums
, caseInsensitive, deepseq, dlist, enumerator
, MonadCatchIOTransformers, mtl, text, time, transformers
, unixCompat, vector, zlibEnum
{ cabal, attoparsec, attoparsecEnumerator, base16Bytestring
, blazeBuilder, blazeBuilderEnumerator, bytestringMmap
, bytestringNums, caseInsensitive, deepseq, dlist, enumerator
, HUnit, MonadCatchIOTransformers, mtl, mwcRandom, regexPosix, text
, time, transformers, unixCompat, unorderedContainers, vector
, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "snap-core";
version = "0.5.5";
sha256 = "1md9n3f11ki87774fh3p7d6bykfdwcqz6b2yrjci4mwf1b1xppkj";
version = "0.6.0.1";
sha256 = "1vcpi56a5cia8z7n3zskhl2b7v9vkqkr87hy8n3hz5lz1lc82kkz";
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
bytestringMmap bytestringNums caseInsensitive deepseq dlist
enumerator MonadCatchIOTransformers mtl text time transformers
unixCompat vector zlibEnum
attoparsec attoparsecEnumerator base16Bytestring blazeBuilder
blazeBuilderEnumerator bytestringMmap bytestringNums
caseInsensitive deepseq dlist enumerator HUnit
MonadCatchIOTransformers mtl mwcRandom regexPosix text time
transformers unixCompat unorderedContainers vector zlibEnum
];
meta = {
homepage = "http://snapframework.com/";

4
pkgs/development/libraries/haskell/snap/server.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "snap-server";
version = "0.5.5";
sha256 = "10b4y5sfgr1bxs48b78nv6hs68v6qhg008rj9qnwwdp8lxgl4hi8";
version = "0.6.0.1";
sha256 = "0df6db841vwakdxmmy375g89pjsgiv0a6nas37b68gaanfcrkch3";
buildDepends = [
attoparsec attoparsecEnumerator binary blazeBuilder
blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree

16
pkgs/development/libraries/haskell/tagsoup/0.10.1nix Normal file
View file

@ -0,0 +1,16 @@
{ cabal, mtl, network }:
cabal.mkDerivation (self: {
pname = "tagsoup";
version = "0.10.1";
sha256 = "0bssfj5r790yj33q23i0lbj83xahzd9rf4jhqs21vgrpn9fqsynl";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl network ];
meta = {
homepage = "http://community.haskell.org/~ndm/tagsoup/";
description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/texmath/0.5.0.1.nix → pkgs/development/libraries/haskell/texmath/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "texmath";
version = "0.5.0.1";
sha256 = "0kw23b1df7456d2h48g2p7k8nvfv80a8a70xgkq4pn7v50vqipdy";
version = "0.5.0.2";
sha256 = "1ysg28q1l33hi6ias5pw0qps46kbys5piczipacrp58b0cm6pvrg";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];

6
pkgs/development/libraries/haskell/text/0.11.1.5.nix → pkgs/development/libraries/haskell/text/0.11.1.7.nix
View file

@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "text";
version = "0.11.1.5";
sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l";
version = "0.11.1.7";
sha256 = "1pjllmqnl4rwa6d2mjcj2kp0w7whwxlb04rsaml7yyyk4dw97a2p";
buildDepends = [ deepseq ];
meta = {
homepage = "https://bitbucket.org/bos/text";
homepage = "https://github.com/bos/text";
description = "An efficient packed Unicode text type";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/time/1.4.nix → pkgs/development/libraries/haskell/time/1.4.0.1.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "time";
version = "1.4";
sha256 = "0y9g7kazch7747x2s4f6yp1b1ys4s0r1r1n7qsvb3dwfbfmv93pz";
version = "1.4.0.1";
sha256 = "046jyz2xnbg2s94d9xhpphgq93mqlky7bc50vss40wdk6l7w8aws";
buildDepends = [ deepseq ];
meta = {
homepage = "http://semantic.org/TimeLib/";

4
pkgs/development/libraries/haskell/tls-extra/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tls-extra";
version = "0.4.0";
sha256 = "1incrrkvzhq7gdcrrqka0l50a7fj7nccdrin00wplm7ljl129d87";
version = "0.4.1";
sha256 = "0yimnq5p89jfbnk5cpa9w30zvfqs9dxxjxy2a86l8jvba5xb8068";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/tls/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tls";
version = "0.8.1";
sha256 = "1qgjzsp9f0mrkwrqzs69279q1dkz72hpazq6qp49p2xfsfzdp7dj";
version = "0.8.2";
sha256 = "0306f7im6dclr2h50wvb7rw9r1zc5492hgqm3m33y1nlci319qx8";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/uu-parsinglib/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uu-parsinglib";
version = "2.7.1.1";
sha256 = "1qn3impl64cvbzyvhc73yxyibgak4dkgl1vkbrzxrxb770kb5r4p";
version = "2.7.2.2";
sha256 = "0na5c2l6q6mzscqha59ma8v5d0j2vh3y5vl51gb7rzwqz4a6hg95";
buildDepends = [ ListLike time ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";

4
pkgs/development/libraries/haskell/vacuum/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vacuum";
version = "1.0.0.1";
sha256 = "172py7nvyv66hvqmhigfm59rjb328bfzv0z11q8qdpf5w1fpvmc5";
version = "1.0.0.2";
sha256 = "1amlzd89952fvw1sbajf9kv3f2s2i6xbqs1zjxw442achg465y7i";
extraLibraries = [ ghcPaths ];
meta = {
homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/";

13
pkgs/development/libraries/haskell/wai-extra/default.nix
View file

@ -1,15 +1,16 @@
{ cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive
, enumerator, httpTypes, network, text, time, transformers, wai
, zlibBindings
, dataDefault, enumerator, httpTypes, network, text, time
, transformers, wai, zlibBindings, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "0.4.3";
sha256 = "07m86khgfyyadjgq8yp9kj3ljlpkvf209b1cfz2x7n5wdq8k2wm9";
version = "0.4.4";
sha256 = "04mzpqa6q3ggk5r0shzc11q5qmmri566nzbsafpv2sbmiwm5s7nd";
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
httpTypes network text time transformers wai zlibBindings
blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault
enumerator httpTypes network text time transformers wai
zlibBindings zlibEnum
];
meta = {
homepage = "http://github.com/yesodweb/wai";

4
pkgs/development/libraries/haskell/yesod-auth/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "0.7.4";
sha256 = "088hhyy7fwga7hwqqwxxn12iqnz6jadq1bc9p8hdv1jy6ib769dl";
version = "0.7.5";
sha256 = "1njs3z01as6mamdflx2686s4qq4qwpkl0xnfdlrhswzgfpn8qqb6";
buildDepends = [
aesonNative authenticate blazeHtml controlMonadAttempt hamlet
httpEnumerator mimeMail persistent persistentTemplate pureMD5

4
pkgs/development/libraries/haskell/yesod-core/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "0.9.3.2";
sha256 = "1h45vgxcn4sraax5rsccksx5yz57k32d7vzpp02prz2s2x5bv3xl";
version = "0.9.3.3";
sha256 = "0qy926x009mci17fhlrcn758vc9lxybzfg16pb69ydzbdr9lqa77";
buildDepends = [
aesonNative blazeBuilder blazeHtml caseInsensitive cereal
clientsession cookie dataObject dataObjectYaml enumerator failure

4
pkgs/development/libraries/haskell/yesod/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "0.9.3";
sha256 = "1w5fml250i63qhlxkn1bidc3sminmxf98zsdzvdi42sfjx8fdkkx";
version = "0.9.3.1";
sha256 = "0af4nyfrpvkyr070fkg1qf4pn783n5443j8hi3wqn4i371vqsmp0";
isLibrary = true;
isExecutable = true;
buildDepends = [

23
pkgs/development/libraries/ldns/default.nix Normal file
View file

@ -0,0 +1,23 @@
{stdenv, fetchurl, openssl, perl}:
stdenv.mkDerivation {
name = "ldns-1.6.11";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.11.tar.gz";
sha256 = "1248c9gkgfmjdmpp3lfd56vvln94ii54kbxa5iykxvcxivmbi4b8";
};
patchPhase = ''
sed -i 's,\$(srcdir)/doc/doxyparse.pl,perl $(srcdir)/doc/doxyparse.pl,' Makefile.in
'';
buildInputs = [ openssl perl ];
configureFlags = [ "--with-ssl=${openssl}" ];
meta = {
description = "Library with the aim of simplifying DNS programming in C";
license = "BSD";
homepage = "http://www.nlnetlabs.nl/projects/ldns/";
};
}

1
pkgs/development/libraries/libassuan/default.nix
View file

@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
homepage = http://gnupg.org;
license = "LGPLv2+";
platforms = stdenv.lib.platforms.all;
};
}

5
pkgs/development/libraries/libgcrypt/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, libgpgerror }:
stdenv.mkDerivation rec {
name = "libgcrypt-1.4.6";
name = "libgcrypt-1.5.0";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "11bbpjlqwp0nh4q76wmsk6z1812anqrj28nh6d9mcyrmdgd30jry";
sha256 = "1ykkh7dm0gyndz7bbpvn3agijj8xb2h02m02f42hm504c18zqqjb";
};
propagatedBuildInputs = [ libgpgerror ];
@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
license = "LGPLv2+";
homepage = http://gnupg.org/;
platforms = stdenv.lib.platforms.all;
};
}

7
pkgs/development/libraries/libgpg-error/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "libgpg-error-1.7";
name = "libgpg-error-1.8";
src = fetchurl {
url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
sha256 = "14as9cpm4k9c6lxm517s9vzqrmjmdpf8i4s41k355xc27qdk6083";
sha256 = "1i88jl2jm8ckjzyzk7iw2dydk7sxcd27zqyl4qnrs8s7f5kz5yxx";
};
doCheck = true;
@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
homepage = http://gnupg.org;
license = "LGPLv2+";
};
platforms = stdenv.lib.platforms.all;
};
}

16
pkgs/development/libraries/libjson/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "libjson-7.4.0";
src = fetchurl {
url = "mirror://sourceforge/libjson/libjson_7.4.0.zip";
sha256 = "0rd6m3r3acm7xq6f0mbyyhc3dnwmiga60cws29yjl6nx2f9h3r0x";
};
buildInputs = [ unzip ];
makeFlags = "prefix=$out";
meta = {
homepage = "http://libjson.sourceforge.net/";
description = "A JSON reader and writer";
longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language.";
};
}

4
pkgs/development/libraries/libtasn1/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libtasn1-2.9";
name = "libtasn1-2.10";
src = fetchurl {
url = "mirror://gnu/libtasn1/${name}.tar.gz";
sha256 = "1i0jnk810hg88jh3bhq63yn0n2cfmpmhrdm1ypv8rc68z9anii7s";
sha256 = "1l0622ysv68k1xazg3000m47h8dd7pbnxhik6v0kf17029ic1r0p";
};
doCheck = true;

4
pkgs/development/libraries/osip/default.nix
View file

@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
version = "3.5.0";
version = "3.6.0";
src = fetchurl {
url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
sha256 = "14csf6z7b802bahxd560ibx3mg2fq3ki734vf3k2vknr4jm5v5fx";
sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
};
name = "libosip2-${version}";

1
pkgs/development/libraries/pth/default.nix
View file

@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
meta = {
description = "The GNU Portable Threads library";
homepage = http://www.gnu.org/software/pth;
platforms = stdenv.lib.platforms.all;
};
}

6
pkgs/development/libraries/ucommon/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
stdenv.mkDerivation rec {
name = "ucommon-5.0.5";
name = "ucommon-5.0.6";
src = fetchurl {
url = mirror://gnu/commoncpp/ucommon-5.0.5.tar.gz;
sha256 = "0rpq6qkhzcsls2rmnf1p1dnf9vyzmgw0cips3hl82mh0w5d70253";
url = mirror://gnu/commoncpp/ucommon-5.0.6.tar.gz;
sha256 = "102djhfzs5jp10r3ajm25p1phs9cxn2dx8vycf0i8vjhmd20yp5c";
};
buildInputs = [ pkgconfig gnutls zlib ];

31
pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
View file

@ -1,8 +1,6 @@
Support OpenStack's DescribeInstancesV6 API call.
diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm
--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm 2010-01-24 02:12:50.000000000 +0100
+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm 2011-06-21 17:19:36.000000000 +0200
diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm
--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm 2011-06-13 19:45:30.000000000 -0400
+++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm 2011-10-27 17:25:29.000000000 -0400
@@ -25,6 +25,10 @@
This element remains empty until the instance enters a
running state.
@ -14,7 +12,7 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.
=item image_id (required)
The image id of the AMI currently running in this instance.
@@ -126,6 +130,7 @@
@@ -134,6 +138,7 @@
has 'ami_launch_index' => ( is => 'ro', isa => 'Str', required => 0 );
has 'dns_name' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
@ -22,10 +20,10 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.
has 'image_id' => ( is => 'ro', isa => 'Str', required => 1 );
has 'kernel_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
has 'ramdisk_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm
--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm 2011-06-16 16:11:53.000000000 +0200
+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm 2011-10-20 20:13:12.585277245 +0200
@@ -1542,6 +1542,7 @@
diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm
--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm 2011-06-13 19:45:30.000000000 -0400
+++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm 2011-10-27 17:25:29.000000000 -0400
@@ -1691,6 +1691,7 @@
my $self = shift;
my %args = validate( @_, {
InstanceId => { type => SCALAR | ARRAYREF, optional => 1 },
@ -33,8 +31,8 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2
});
# If we have a array ref of instances lets split them out into their InstanceId.n format
@@ -1556,7 +1557,8 @@
$args{"InstanceId.1"} = delete $args{InstanceId};
@@ -1703,7 +1704,8 @@
}
}
- my $xml = $self->_sign(Action => 'DescribeInstances', %args);
@ -43,7 +41,7 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2
my $reservations;
if ( grep { defined && length } $xml->{Errors} ) {
@@ -1635,6 +1637,7 @@
@@ -1791,6 +1793,7 @@
my $running_instance = Net::Amazon::EC2::RunningInstances->new(
ami_launch_index => $instance_elem->{amiLaunchIndex},
dns_name => $instance_elem->{dnsName},
@ -51,10 +49,3 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2
image_id => $instance_elem->{imageId},
kernel_id => $instance_elem->{kernelId},
ramdisk_id => $instance_elem->{ramdiskId},
@@ -3866,4 +3869,4 @@
=head1 SEE ALSO
-Amazon EC2 API: L<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/>
\ No newline at end of file
+Amazon EC2 API: L<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/>

4
pkgs/development/tools/misc/cflow/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, gettext, emacs }:
stdenv.mkDerivation rec {
name = "cflow-1.3";
name = "cflow-1.4";
src = fetchurl {
url = "mirror://gnu/cflow/${name}.tar.bz2";
sha256 = "1nlmgcjsy1rl5zpqz9f8mf74faq3rm725hhpf11b8w80sniqgnnk";
sha256 = "1jkbq97ajcf834z68hbn3xfhiz921zhn39gklml1racf0kb3jzh3";
};
patchPhase = ''

4
pkgs/development/tools/misc/gengetopt/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "gengetopt-2.22.4";
name = "gengetopt-2.22.5";
src = fetchurl {
url = "mirror://gnu/gengetopt/${name}.tar.gz";
sha256 = "08a4wmzvin8ljdgw2c0mcz654h4hpzam2p43hsf951c0xhj6ppsf";
sha256 = "0dr1xmlgk9q8za17wnpgghb5ifnbca5vb0w5bc6fpc2j0cjb6vrv";
};
doCheck = true;

4
pkgs/development/tools/misc/global/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, libtool, ncurses }:
stdenv.mkDerivation rec {
name = "global-6.0";
name = "global-6.1";
src = fetchurl {
url = "mirror://gnu/global/${name}.tar.gz";
sha256 = "1nwhlxd97grq8ynw7szv5lcxiqgqifiy1jqaa45664hd6bv1i5xx";
sha256 = "1q305isw1hy2zxcg10jk1g9rmpl8x2r3nkla52jdl4dbydsg6z39";
};
buildInputs = [ libtool ncurses ];

4
pkgs/development/tools/misc/libtool/libtool2.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, m4, perl, lzma }:
stdenv.mkDerivation (rec {
name = "libtool-2.4";
name = "libtool-2.4.2";
src = fetchurl {
url = "mirror://gnu/libtool/${name}.tar.gz";
sha256 = "0bpnvmqryzqpiz184phdg3z38a16ad7dd5bfbmn1jkm9cfmmgpqk";
sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk";
};
buildNativeInputs = [ lzma m4 perl ];

6
pkgs/development/tools/misc/lsof/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "lsof-4.84";
name = "lsof-4.85";
src = fetchurl {
url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.84.tar.bz2;
sha256 = "09f71lrwav31nay3c4nwyslm887psn95dw02jr8vlgs4kcnkm290";
url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2;
sha256 = "1hd1aihbzx2c2p4ps4zll6nldyf9l7js59hllnnmpi1r6pk5iaj9";
};
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";

1
pkgs/lib/types.nix
View file

@ -148,7 +148,6 @@ rec {
}
;
uniq = elemType: mkOptionType {
inherit (elemType) name check iter fold docPath hasOptions;
merge = list:

89
pkgs/os-specific/gnu/default.nix Normal file
View file

@ -0,0 +1,89 @@
# Packages that make up the GNU/Hurd operating system (aka. GNU).
args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
, texinfo, glibcCross, hurdPartedCross, libuuid
, gccCrossStageStatic, gccCrossStageFinal
, forceBuildDrv, callPackage, platform, config, crossSystem }:
with args;
rec {
hurdCross = forceBuildDrv(import ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo machHeaders
mig glibcCross hurdPartedCross;
libuuid = libuuid.hostDrv;
automake = automake111x;
headersOnly = false;
cross = assert crossSystem != null; crossSystem;
gccCross = gccCrossStageFinal;
});
hurdCrossIntermediate = forceBuildDrv(import ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo machHeaders
mig glibcCross;
automake = automake111x;
headersOnly = false;
cross = assert crossSystem != null; crossSystem;
# The "final" GCC needs glibc and the Hurd libraries (libpthread in
# particular) so we first need an intermediate Hurd built with the
# intermediate GCC.
gccCross = gccCrossStageStatic;
# This intermediate Hurd is only needed to build libpthread, which needs
# libihash, and to build Parted, which needs libstore and
# libshouldbeinlibc.
buildTarget = "libihash libstore libshouldbeinlibc";
installTarget = "libihash-install libstore-install libshouldbeinlibc-install";
});
hurdHeaders = callPackage ./hurd {
automake = automake111x;
headersOnly = true;
gccCross = null;
glibcCross = null;
libuuid = null;
hurdPartedCross = null;
};
libpthreadHeaders = callPackage ./libpthread {
headersOnly = true;
hurd = null;
};
libpthreadCross = forceBuildDrv(import ./libpthread {
inherit fetchgit stdenv autoconf automake libtool
machHeaders hurdHeaders glibcCross;
hurd = hurdCrossIntermediate;
gccCross = gccCrossStageStatic;
cross = assert crossSystem != null; crossSystem;
});
# In theory GNU Mach doesn't have to be cross-compiled. However, since it
# has to be built for i586 (it doesn't work on x86_64), one needs a cross
# compiler for that host.
mach = callPackage ./mach {
automake = automake111x;
};
machHeaders = callPackage ./mach {
automake = automake111x;
headersOnly = true;
mig = null;
};
mig = callPackage ./mig
(if stdenv.isLinux
then {
# Build natively, but force use of a 32-bit environment because we're
# targeting `i586-pc-gnu'.
stdenv = (import ../../stdenv {
system = "i686-linux";
stdenvType = "i686-linux";
allPackages = args:
import ../../top-level/all-packages.nix ({ inherit config; } // args);
inherit platform;
}).stdenv;
}
else { });
}

28
pkgs/os-specific/gnu/libpthread/default.nix
View file

@ -1,27 +1,29 @@
{ fetchgit, stdenv, autoconf, automake, libtool
, machHeaders, hurdHeaders, hurd
, machHeaders, hurdHeaders, hurd, headersOnly ? false
, cross ? null, gccCross ? null, glibcCross ? null }:
assert (cross != null) -> (gccCross != null) && (glibcCross != null);
assert (!headersOnly) -> (hurd != null);
let
date = "20100512";
date = "20111020";
# Use the `tschwinge/Peter_Herbolzheimer' branch as prescribed in
# <http://www.gnu.org/software/hurd/hurd/building/cross-compiling.html>.
rev = "c4bb52770f0b6703bef76c5abdd08663b46b4dc9";
rev = "a7b82c3302bf9c47176648eb802a61ae2d9a16f5";
in
stdenv.mkDerivation ({
name = "libpthread-hurd-${date}";
name = "libpthread-hurd-${if headersOnly then "headers-" else ""}${date}";
src = fetchgit {
url = "git://git.sv.gnu.org/hurd/libpthread.git";
sha256 = "1wya9kfmqgn04l995a25p4hxfwddjahfmhdzljb4cribw0bqdizg";
sha256 = "e8300762914d927c0da4168341a5982a1057613e1af363ee68942087b2570b3d";
inherit rev;
};
buildNativeInputs = [ autoconf automake libtool ];
buildInputs = [ machHeaders hurdHeaders hurd ]
buildInputs = [ machHeaders hurdHeaders ]
++ stdenv.lib.optional (!headersOnly) hurd
++ stdenv.lib.optional (gccCross != null) gccCross;
preConfigure = "autoreconf -vfi";
@ -37,6 +39,20 @@ stdenv.mkDerivation ({
//
(if headersOnly
then {
configureFlags =
[ "--build=i586-pc-gnu"
"ac_cv_lib_ihash_hurd_ihash_create=yes"
];
buildPhase = ":";
installPhase = "make install-data-local-headers";
}
else { })
//
(if cross != null
then {
crossConfig = cross.config;

33
pkgs/os-specific/linux/drbd/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ stdenv, fetchurl, flex, udev }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "drbd-8.4.0";
src = fetchurl {
url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz";
sha256 = "096njwxjpwvnl259gxq6cr6n0r6ba0h5aryvgk05hqi95jx927vg";
};
buildInputs = [ flex ];
configureFlags = "--without-distro --without-legacy_utils --without-pacemaker --localstatedir=/var --sysconfdir=/etc";
preConfigure =
''
export PATH=${udev}/sbin:$PATH
substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/
substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm
'';
makeFlags = "SHELL=${stdenv.shell}";
installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d";
meta = {
homepage = http://www.drbd.org/;
description = "Distributed Replicated Block Device, a distributed storage system for Linux";
platforms = stdenv.lib.platforms.linux;
};
}

5
pkgs/os-specific/linux/firmware/bcm43xx/default.nix
View file

@ -22,9 +22,8 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/brcm
for i in ${src1} ${src2}; do
cp -v $i $out/brcm/$(echo $i | sed -r -e 's|.*/[a-z0-9]+-||')
done
cp ${src1} $out/brcm/${src1.name}
cp ${src2} $out/brcm/${src2.name}
'';
meta = {

2
pkgs/os-specific/linux/iproute/default.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "iproute2-2.6.35";
src = fetchurl {
url = "http://devresources.linux-foundation.org/dev/iproute2/download/${name}.tar.bz2";
url = "http://pkgs.fedoraproject.org/repo/pkgs/iproute/iproute2-2.6.35.tar.bz2/b0f281b3124bf04669e18f5fe16d4934/iproute2-2.6.35.tar.bz2";
sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla";
};

3
pkgs/os-specific/linux/kernel/linux-2.6.35.nix
View file

@ -181,6 +181,9 @@ let
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
# Allow up to 128 GiB of RAM in Xen domains.
XEN_MAX_DOMAIN_MEMORY 128
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';

6
pkgs/os-specific/linux/module-init-tools/default.nix
View file

@ -1,8 +1,8 @@
{stdenv, fetchurl, docbook2x}:
{ stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }:
stdenv.mkDerivation {
name = "module-init-tools-3.16";
src = [
(fetchurl {
url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
@ -17,6 +17,8 @@ stdenv.mkDerivation {
})
];
SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat";
patches = [ ./module-dir.patch ./docbook2man.patch ];
postInstall = "rm $out/sbin/insmod.static"; # don't need it

3
pkgs/os-specific/linux/udev/173.nix
View file

@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
rm -frv $out/share/gtk-doc
'';
patches = [ ./custom-rules.patch ];
patches = [ ./custom-rules.patch ] ++
stdenv.lib.optional (stdenv.system == "armv5tel-linux") ./pre-accept4-kernel.patch;
meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;

43
pkgs/os-specific/linux/udev/pre-accept4-kernel.patch Normal file
View file

@ -0,0 +1,43 @@
From:
https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch
diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c
--- a/udev/udev-ctrl.c 2011-10-09 17:10:32.000000000 -0600
+++ b/udev/udev-ctrl.c 2011-10-25 15:11:09.000000000 -0600
@@ -15,6 +15,7 @@
#include <stddef.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
#include <sys/types.h>
#include <sys/poll.h>
#include <sys/socket.h>
@@ -182,6 +183,7 @@
struct ucred ucred;
socklen_t slen;
const int on = 1;
+ int flgs;
conn = calloc(1, sizeof(struct udev_ctrl_connection));
if (conn == NULL)
@@ -189,13 +191,19 @@
conn->refcount = 1;
conn->uctrl = uctrl;
- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
+// conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
+ conn->sock = accept(uctrl->sock, NULL, NULL);
if (conn->sock < 0) {
if (errno != EINTR)
err(uctrl->udev, "unable to receive ctrl connection: %m\n");
goto err;
}
+// Since we don't have accept4
+ flgs = fcntl(conn->sock, F_GETFL, NULL);
+ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
+ fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
+
/* check peer credential of connection */
slen = sizeof(ucred);
if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {

2
pkgs/os-specific/linux/usbutils/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
name = "usbutils-0.86";
src = fetchurl {
url = "mirror://sourceforge/linux-usb/${name}.tar.gz";
url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.gz";
sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk";
};

31
pkgs/servers/http/nginx/default.nix
View file

@ -1,15 +1,12 @@
a :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
openssl zlib pcre libxml2 libxslt
];
in
rec {
src = a.fetchUrlFromSrcInfo s;
{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }:
stdenv.mkDerivation rec {
name = "nginx-1.1.7";
src = fetchurl {
url = "http://nginx.org/download/${name}.tar.gz";
sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51";
};
buildInputs = [ openssl zlib pcre libxml2 libxslt ];
inherit (s) name;
inherit buildInputs;
configureFlags = [
"--with-http_ssl_module"
"--with-http_xslt_module"
@ -21,18 +18,16 @@ rec {
# "--with-http_perl_module"
];
preConfigure = a.fullDepEntry ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libxml2}/include/libxml2"
'' [];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
'';
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
meta = {
description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
maintainers = [
a.lib.maintainers.raskin
stdenv.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
platforms = with stdenv.lib.platforms;
all;
};
}

9
pkgs/servers/http/nginx/src-for-default.nix
View file

@ -1,9 +0,0 @@
rec {
version="1.0.0";
name="nginx-1.0.0";
hash="00f0fjkdqi0xl1kcg6d91zmvj82n8w1znp5w9v152rymxv5ddqrx";
url="http://sysoev.ru/nginx/nginx-${version}.tar.gz";
advertisedUrl="http://sysoev.ru/nginx/nginx-1.0.0.tar.gz";
}

4
pkgs/servers/http/nginx/src-info-for-default.nix
View file

@ -1,4 +0,0 @@
{
downloadPage = "http://sysoev.ru/nginx/download.html";
baseName = "nginx";
}

8
pkgs/servers/mail/dovecot/2.0.nix
View file

@ -1,15 +1,19 @@
{stdenv, fetchurl, openssl, pam}:
{stdenv, fetchurl, openssl, pam, bzip2, zlib}:
stdenv.mkDerivation {
name = "dovecot-2.0.15";
buildInputs = [openssl pam];
buildInputs = [openssl pam bzip2 zlib];
src = fetchurl {
url = http://dovecot.org/releases/2.0/dovecot-2.0.15.tar.gz;
sha256 = "03byp6alxxk65qfjjnqp6kcncs5cdiqgskx90nk9kcnynl1h6r33";
};
# It will hardcode this for /var/lib/dovecot.
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
configureFlags = [ "--localstatedir=/var" ];
meta = {
homepage = http://dovecot.org/;
description = "Open source IMAP and POP3 email server written with security primarily in mind";

4
pkgs/servers/sip/sipwitch/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
stdenv.mkDerivation rec {
name = "sipwitch-1.1.1";
name = "sipwitch-1.1.2";
src = fetchurl {
url = "mirror://gnu/sipwitch/${name}.tar.gz";
sha256 = "14irv1zda6xjsrizc0dvy85fcjx3szbb94jkh3q4s20ywc4s41kx";
sha256 = "1ixbzrpndhx7i0cxx02rlnhv9948pbsbbs5gdsgp6asq42vfz3f2";
};
buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];

4
pkgs/servers/sql/postgresql/8.3.x.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
let version = "8.3.12"; in
let version = "8.3.16"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0w7h09nx8pkpzznmz4wd1zv8dg3f6jv366rr8bf3s5g6vrvxcssr";
sha256 = "0i17da3jz44y2xikp99qs0dac9j84hghr8rg5n7hr86ippi90180";
};
buildInputs = [ zlib ncurses readline ];

4
pkgs/servers/sql/postgresql/8.4.x.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
let version = "8.4.5"; in
let version = "8.4.9"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "1grjazzhk0piwpb0bjmgi71wkzb8hk27h6g9l68h52lr5np2401h";
sha256 = "12n3x2q444hfhy9nbl14yfhd58im86jmlb9b0ihqzbmq1j6wnn0x";
};
buildInputs = [ zlib ncurses readline ];

4
pkgs/servers/sql/postgresql/9.0.x.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, readline }:
let version = "9.0.1"; in
let version = "9.0.5"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "15iid8l7hgpa2zzdsd0msn0ps9qq1mxkzxx0fca5z117054ws42k";
sha256 = "016mnwpcyla49qr3gglgpyjwnq1ljjbs3q0s8vlfmazfkj0fxn2n";
};
buildInputs = [ zlib readline ];

8
pkgs/tools/cd-dvd/unetbootin/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
let version = "485"; in
let version = "563"; in
stdenv.mkDerivation rec {
name = "unetbootin-${version}";
src = fetchurl {
url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
sha256 = "1nyzy1wrql0l6zkmrd1l3qqvbdkv0534axdz6vy3cyksp157jxc8";
sha256 = "1j4ka6rjf5akhcdb4pbfdrka9zflhch97b5i42zk1cf8hd6wx939";
};
sourceRoot = ".";
@ -43,13 +43,13 @@ stdenv.mkDerivation rec {
''
ensureDir $out/bin
cp unetbootin $out/bin
ensureDir $out/share/unetbootin
cp unetbootin_*.qm $out/share/unetbootin
ensureDir $out/share/applications
cp unetbootin.desktop $out/share/applications
wrapProgram $out/bin/unetbootin \
--prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
'';

4
pkgs/tools/cd-dvd/xorriso/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }:
stdenv.mkDerivation rec {
name = "xorriso-1.1.4";
name = "xorriso-1.1.6";
src = fetchurl {
url = "mirror://gnu/xorriso/${name}.tar.gz";
sha256 = "0zxmln5kw5prqrs8bahwz4lhvl914xphsjizlz3nr9y2l39350j8";
sha256 = "0dlavcdx1lblqy9pjlxv4krczvb23650f2zd1phy2hdxhiq6c966";
};
doCheck = true;

2
pkgs/tools/filesystems/ntfs-3g/default.nix
View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "http://tuxera.com/opensource/${name}.tgz";
url = "http://pkgs.fedoraproject.org/repo/pkgs/ntfs-3g/ntfs-3g-2010.10.2.tgz/91405690f25822142cdcb43d03e62d3f/ntfs-3g-2010.10.2.tgz";
sha256 = "0wcyks4nvi1kck8i2dgwfsy5zxhil0v0xam8zbg1p592xbqygiqp";
};

2
pkgs/tools/filesystems/reiserfsprogs/default.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "reiserfsprogs-3.6.21";
src = fetchurl {
url = "http://www.kernel.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2";
url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2";
sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam";
};

4
pkgs/tools/misc/parallel/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl }:
stdenv.mkDerivation rec {
name = "parallel-20110822";
name = "parallel-20111022";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "0ryj97b9w2mzvmnqhkh384s59v62gf0vlyj8qphiy34505x5pznb";
sha256 = "0l9g7lg7avshjm0783abcrcmlmrqkwhzic23lk0jna0nckkd9jhk";
};
patchPhase =

2
pkgs/tools/misc/time/default.nix
View file

@ -8,6 +8,8 @@ stdenv.mkDerivation {
sha256 = "0va9063fcn7xykv658v2s9gilj2fq4rcdxx2mn2mmy1v4ndafzp3";
};
patches = [ ./max-resident.patch ];
meta = {
description = "GNU Time, a tool that runs programs and summarizes the system resources they use";

16
pkgs/tools/misc/time/max-resident.patch Normal file
View file

@ -0,0 +1,16 @@
Fix the "max resident" size reported by ‘time’ being off by a factor of 4.
From http://lists.gnu.org/archive/html/help-gnu-utils/2010-10/msg00002.html
diff -ru -x '*~' time-1.7-orig/time.c time-1.7/time.c
--- time-1.7-orig/time.c 1996-06-13 15:38:21.000000000 -0400
+++ time-1.7/time.c 2011-10-31 10:40:27.000000000 -0400
@@ -392,7 +392,7 @@
ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
break;
case 'M': /* Maximum resident set size. */
- fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
+ fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss);
break;
case 'O': /* Outputs. */
fprintf (fp, "%ld", resp->ru.ru_oublock);

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