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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/modular-python/; revision=26586
This commit is contained in:
Eelco Dolstra 2011-03-28 20:22:30 +00:00
commit 1439ae44be
325 changed files with 3001 additions and 1444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

712
maintainers/scripts/gnu/gnupdate.scm
View File

@ -1,712 +0,0 @@
;;; GNUpdate -- Update GNU packages in Nixpkgs. -*- coding: utf-8; -*-
;;; Copyright (C) 2010 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This program is free software: you can redistribute it and/or modify
;;; it under the terms of the GNU General Public License as published by
;;; the Free Software Foundation, either version 3 of the License, or
;;; (at your option) any later version.
;;;
;;; This program is distributed in the hope that it will be useful,
;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(cond-expand (guile-2 #t)
(else (error "GNU Guile 2.0 is required")))
(use-modules (sxml ssax)
(ice-9 popen)
(ice-9 match)
(ice-9 rdelim)
(ice-9 regex)
(ice-9 vlist)
(srfi srfi-1)
(srfi srfi-9)
(srfi srfi-11)
(srfi srfi-37)
(system foreign)
(rnrs bytevectors))
;;;
;;; SNix.
;;;
(define-record-type <location>
(make-location file line column)
location?
(file location-file)
(line location-line)
(column location-column))
(define (->loc line column path)
(and line column path
(make-location path (string->number line) (string->number column))))
;; XXX: Hack to add missing exports from `(sxml ssax)' as of 1.9.10.
(let ((ssax (resolve-module '(sxml ssax))))
(for-each (lambda (sym)
(module-add! (current-module) sym
(module-variable ssax sym)))
'(ssax:warn ssax:skip-pi nl)))
;; Nix object types visible in the XML output of `nix-instantiate' and
;; mapping to S-expressions (we map to sexps, not records, so that we
;; can do pattern matching):
;;
;; at (at varpat attrspat)
;; attr (attribute loc name value)
;; attrs (attribute-set attributes)
;; attrspat (attribute-set-pattern patterns)
;; bool #f|#t
;; derivation (derivation drv-path out-path attributes)
;; ellipsis '...
;; expr (snix loc body ...)
;; function (function loc at|attrspat|varpat)
;; int int
;; list list
;; null 'null
;; path string
;; string string
;; unevaluated 'unevaluated
;; varpat (varpat name)
;;
;; Initially ATTRIBUTES in `derivation' and `attribute-set' was a promise;
;; however, handling `repeated' nodes makes it impossible to do anything
;; lazily because the whole SXML tree has to be traversed to maintain the
;; list of known derivations.
(define (xml-element->snix elem attributes body derivations)
;; Return an SNix element corresponding to XML element ELEM.
(define (loc)
(->loc (assq-ref attributes 'line)
(assq-ref attributes 'column)
(assq-ref attributes 'path)))
(case elem
((at)
(values `(at ,(car body) ,(cadr body)) derivations))
((attr)
(let ((name (assq-ref attributes 'name)))
(cond ((null? body)
(values `(attribute-pattern ,name) derivations))
((and (pair? body) (null? (cdr body)))
(values `(attribute ,(loc) ,name ,(car body))
derivations))
(else
(error "invalid attribute body" name (loc) body)))))
((attrs)
(values `(attribute-set ,(reverse body)) derivations))
((attrspat)
(values `(attribute-set-pattern ,body) derivations))
((bool)
(values (string-ci=? "true" (assq-ref attributes 'value))
derivations))
((derivation)
(let ((drv-path (assq-ref attributes 'drvPath))
(out-path (assq-ref attributes 'outPath)))
(if (equal? body '(repeated))
(let ((body (vhash-assoc drv-path derivations)))
(if (pair? body)
(values `(derivation ,drv-path ,out-path ,(cdr body))
derivations)
(error "no previous occurrence of derivation"
drv-path)))
(values `(derivation ,drv-path ,out-path ,body)
(vhash-cons drv-path body derivations)))))
((ellipsis)
(values '... derivations))
((expr)
(values `(snix ,(loc) ,@body) derivations))
((function)
(values `(function ,(loc) ,body) derivations))
((int)
(values (string->number (assq-ref attributes 'value))
derivations))
((list)
(values body derivations))
((null)
(values 'null derivations))
((path)
(values (assq-ref attributes 'value) derivations))
((repeated)
(values 'repeated derivations))
((string)
(values (assq-ref attributes 'value) derivations))
((unevaluated)
(values 'unevaluated derivations))
((varpat)
(values `(varpat ,(assq-ref attributes 'name)) derivations))
(else (error "unhandled Nix XML element" elem))))
(define xml->snix
;; Return the SNix represention of TREE, an SXML tree as returned by
;; parsing the XML output of `nix-instantiate' on Nixpkgs.
(let ((parse
(ssax:make-parser NEW-LEVEL-SEED
(lambda (elem-gi attributes namespaces expected-content
seed)
(cons '() (cdr seed)))
FINISH-ELEMENT
(lambda (elem-gi attributes namespaces parent-seed
seed)
(let ((snix (car seed))
(derivations (cdr seed)))
(let-values (((snix derivations)
(xml-element->snix elem-gi
attributes
snix
derivations)))
(cons (cons snix (car parent-seed))
derivations))))
CHAR-DATA-HANDLER
(lambda (string1 string2 seed)
;; Discard inter-node strings, which are blanks.
seed))))
(lambda (port)
;; Discard the second value returned by the parser (the derivation
;; vhash).
(caar (parse port (cons '() vlist-null))))))
(define (call-with-package snix proc)
(match snix
(('attribute _ (and attribute-name (? string?))
('derivation _ _ body))
;; Ugly pattern matching.
(let ((meta
(any (lambda (attr)
(match attr
(('attribute _ "meta" ('attribute-set metas)) metas)
(_ #f)))
body))
(package-name
(any (lambda (attr)
(match attr
(('attribute _ "name" (and name (? string?)))
name)
(_ #f)))
body))
(location
(any (lambda (attr)
(match attr
(('attribute loc "name" (? string?))
loc)
(_ #f)))
body))
(src
(any (lambda (attr)
(match attr
(('attribute _ "src" src)
src)
(_ #f)))
body)))
(proc attribute-name package-name location meta src)))))
(define (call-with-src snix proc)
;; Assume SNIX contains the SNix expression for the value of an `src'
;; attribute, as returned by `call-with-package', and call PROC with the
;; relevant SRC information, or #f if SNIX doesn't match.
(match snix
(('derivation _ _ body)
(let ((name
(any (lambda (attr)
(match attr
(('attribute _ "name" (and name (? string?)))
name)
(_ #f)))
body))
(output-hash
(any (lambda (attr)
(match attr
(('attribute _ "outputHash" (and hash (? string?)))
hash)
(_ #f)))
body))
(urls
(any (lambda (attr)
(match attr
(('attribute _ "urls" (and urls (? pair?)))
urls)
(_ #f)))
body)))
(proc name output-hash urls)))
(_ (proc #f #f #f))))
(define (src->values snix)
(call-with-src snix values))
(define (open-nixpkgs nixpkgs)
(let ((script (string-append nixpkgs
"/maintainers/scripts/eval-release.nix")))
(open-pipe* OPEN_READ "nix-instantiate"
"--strict" "--eval-only" "--xml"
script)))
(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)))
(close-pipe pipe)
(if (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 (eof-object? path)
(values #f #f)
(values (string-trim-both hash) (string-trim-both path)))))))
(define (update-nix-expression file
old-version old-hash
new-version new-hash)
;; Modify FILE in-place. Ugly: we call out to sed(1).
(let ((cmd (format #f "sed -i \"~a\" -e 's/~A/~a/g ; s/~A/~A/g'"
file
(regexp-quote old-version) new-version
old-hash
(or new-hash "new hash not available, check the log"))))
(format #t "running `~A'...~%" cmd)
(system cmd)))
;;;
;;; FTP client.
;;;
(define-record-type <ftp-connection>
(%make-ftp-connection socket addrinfo)
ftp-connection?
(socket ftp-connection-socket)
(addrinfo ftp-connection-addrinfo))
(define %ftp-ready-rx
(make-regexp "^([0-9]{3}) (.+)$"))
(define (%ftp-listen port)
(let loop ((line (read-line port)))
(cond ((eof-object? line) (values line #f))
((regexp-exec %ftp-ready-rx line)
=>
(lambda (match)
(values (string->number (match:substring match 1))
(match:substring match 2))))
(else
(loop (read-line port))))))
(define (%ftp-command command expected-code port)
(format port "~A~A~A" command (string #\return) (string #\newline))
(let-values (((code message) (%ftp-listen port)))
(if (eqv? code expected-code)
message
(throw 'ftp-error port command code message))))
(define (%ftp-login user pass port)
(let ((command (string-append "USER " user (string #\newline))))
(display command port)
(let-values (((code message) (%ftp-listen port)))
(case code
((230) #t)
((331) (%ftp-command (string-append "PASS " pass) 230 port))
(else (throw 'ftp-error port command code message))))))
(define (ftp-open host)
(catch 'getaddrinfo-error
(lambda ()
(let* ((ai (car (getaddrinfo host "ftp")))
(s (socket (addrinfo:fam ai) (addrinfo:socktype ai)
(addrinfo:protocol ai))))
(connect s (addrinfo:addr ai))
(setvbuf s _IOLBF)
(let-values (((code message) (%ftp-listen s)))
(if (eqv? code 220)
(begin
;(%ftp-command "OPTS UTF8 ON" 200 s)
(%ftp-login "anonymous" "ludo@example.com" s)
(%make-ftp-connection s ai))
(begin
(format (current-error-port) "FTP to `~a' failed: ~A: ~A~%"
host code message)
(close s)
#f)))))
(lambda (key errcode)
(format (current-error-port) "failed to resolve `~a': ~a~%"
host (gai-strerror errcode))
#f)))
(define (ftp-close conn)
(close (ftp-connection-socket conn)))
(define (ftp-chdir conn dir)
(%ftp-command (string-append "CWD " dir) 250
(ftp-connection-socket conn)))
(define (ftp-pasv conn)
(define %pasv-rx
(make-regexp "([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)"))
(let ((message (%ftp-command "PASV" 227 (ftp-connection-socket conn))))
(cond ((regexp-exec %pasv-rx message)
=>
(lambda (match)
(+ (* (string->number (match:substring match 5)) 256)
(string->number (match:substring match 6)))))
(else
(throw 'ftp-error conn "PASV" 227 message)))))
(define* (ftp-list conn #:optional directory)
(define (address-with-port sa port)
(let ((fam (sockaddr:fam sa))
(addr (sockaddr:addr sa)))
(cond ((= fam AF_INET)
(make-socket-address fam addr port))
((= fam AF_INET6)
(make-socket-address fam addr port
(sockaddr:flowinfo sa)
(sockaddr:scopeid sa)))
(else #f))))
(if directory
(ftp-chdir conn directory))
(let* ((port (ftp-pasv conn))
(ai (ftp-connection-addrinfo conn))
(s (socket (addrinfo:fam ai) (addrinfo:socktype ai)
(addrinfo:protocol ai))))
(connect s (address-with-port (addrinfo:addr ai) port))
(setvbuf s _IOLBF)
(dynamic-wind
(lambda () #t)
(lambda ()
(%ftp-command "LIST" 150 (ftp-connection-socket conn))
(let loop ((line (read-line s))
(result '()))
(cond ((eof-object? line) (reverse result))
((regexp-exec %ftp-ready-rx line)
=>
(lambda (match)
(let ((code (string->number (match:substring match 1))))
(if (= 126 code)
(reverse result)
(throw 'ftp-error conn "LIST" code)))))
(else
(loop (read-line s)
(let ((file (car (reverse (string-tokenize line)))))
(cons file result)))))))
(lambda ()
(close s)
(let-values (((code message) (%ftp-listen (ftp-connection-socket conn))))
(or (eqv? code 226)
(throw 'ftp-error conn "LIST" code message)))))))
;;;
;;; GNU.
;;;
(define %ignored-package-attributes
;; Attribute name of packages to be ignored.
'("bash" "bashReal" "bashInteractive" ;; the full versioned name is incorrect
"autoconf213"
"automake17x"
"automake19x"
"automake110x"
"automake" ;; = 1.10.x
"bison1875"
"bison23"
"bison" ;; = 2.3
"emacs22"
"emacsSnapshot"
"gcc295"
"gcc33"
"gcc34"
"gcc40"
"gcc41"
"gcc42"
"gcc43"
"glibc25"
"glibc27"
"glibc29"
"guile_1_9"
))
(define (gnu? package)
;; Return true if PACKAGE (a snix expression) is a GNU package (according
;; to a simple heuristic.) Otherwise return #f.
(match package
(('attribute _ attribute-name ('derivation _ _ body))
(any (lambda (attr)
(match attr
(('attribute _ "meta" ('attribute-set metas))
(any (lambda (attr)
(match attr
(('attribute _ "description" value)
(string-prefix? "GNU" value))
(('attribute _ "homepage" value)
(string-contains value "www.gnu.org"))
(_ #f)))
metas))
(_ #f)))
body))
(_ #f)))
(define (gnu-packages packages)
(fold (lambda (package gnu)
(match package
(('attribute _ "emacs23Packages" emacs-packages)
;; XXX: Should prepend `emacs23Packages.' to attribute names.
(append (gnu-packages emacs-packages) gnu))
(('attribute _ attribute-name ('derivation _ _ body))
(if (member attribute-name %ignored-package-attributes)
gnu
(if (gnu? package)
(cons package gnu)
gnu)))
(_ gnu)))
'()
packages))
(define (ftp-server/directory project)
(define quirks
'(("commoncpp2" "ftp.gnu.org" "/gnu/commoncpp" #f)
("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t)
("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
("gnupg" "ftp.gnupg.org" "/gcrypt" #t)
("gnu-ghostscript" "ftp.gnu.org" "/ghostscript" #f)
("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f)
("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg")
("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f)
("TeXmacs" "ftp.texmacs.org" "/TeXmacs/targz" #f)))
(let ((quirk (assoc project quirks)))
(match quirk
((_ server directory subdir?)
(values server (if (not subdir?)
directory
(string-append directory "/" project))))
(else
(values "ftp.gnu.org" (string-append "/gnu/" project))))))
(define (nixpkgs->gnu-name project)
(define quirks
'(("gcc-wrapper" . "gcc")
("ghostscript" . "gnu-ghostscript") ;; ../ghostscript/gnu-ghoscript-X.Y.tar.gz
("gnum4" . "m4")
("gnugrep" . "grep")
("gnused" . "sed")
("gnutar" . "tar")
("gnunet" . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
("mitscheme" . "mit-scheme")
("texmacs" . "TeXmacs")))
(or (assoc-ref quirks project) project))
(define (releases project)
;; TODO: Handle project release trees like that of IceCat and MyServer.
(define release-rx
(make-regexp (string-append "^" project "-[0-9].*\\.tar\\.")))
(catch #t
(lambda ()
(let-values (((server directory) (ftp-server/directory project)))
(let* ((conn (ftp-open server))
(files (ftp-list conn directory)))
(ftp-close conn)
(map (lambda (tarball)
(let ((end (string-contains tarball ".tar")))
(substring tarball 0 end)))
;; Filter out signatures, deltas, and files which are potentially
;; not releases of PROJECT (e.g., in /gnu/guile, filter out
;; guile-oops and guile-www).
(filter (lambda (file)
(and (not (string-suffix? ".sig" file))
(regexp-exec release-rx file)))
files)))))
(lambda (key subr message . args)
(format (current-error-port)
"failed to get release list for `~A': ~A ~A~%"
project message args)
'())))
(define version-string>?
(let ((strverscmp
(let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
(error "could not find `strverscmp' (from GNU libc)"))))
(make-foreign-function int sym (list '* '*))))
(string->null-terminated-utf8
(lambda (s)
(let* ((utf8 (string->utf8 s))
(len (bytevector-length utf8))
(nts (make-bytevector (+ len 1))))
(bytevector-copy! utf8 0 nts 0 len)
(bytevector-u8-set! nts len 0)
nts))))
(lambda (a b)
(let ((a (bytevector->foreign (string->null-terminated-utf8 a)))
(b (bytevector->foreign (string->null-terminated-utf8 b))))
(> (strverscmp a b) 0)))))
(define (latest-release project)
;; Return "FOO-X.Y" or #f.
(let ((releases (releases project)))
(and (not (null? releases))
(fold (lambda (release latest)
(if (version-string>? release latest)
release
latest))
""
releases))))
(define (package/version name+version)
(let ((hyphen (string-rindex name+version #\-)))
(if (not hyphen)
(values name+version #f)
(let ((name (substring name+version 0 hyphen))
(version (substring name+version (+ hyphen 1)
(string-length name+version))))
(values name version)))))
(define (file-extension file)
(let ((dot (string-rindex file #\.)))
(and dot (substring file (+ 1 dot) (string-length file)))))
(define (packages-to-update gnu-packages)
(fold (lambda (pkg result)
(call-with-package pkg
(lambda (attribute name+version location meta src)
(let-values (((name old-version)
(package/version name+version)))
(let ((latest (latest-release (nixpkgs->gnu-name name))))
(cond ((not latest)
(format #t "~A [unknown latest version]~%"
name+version)
result)
((string=? name+version latest)
(format #t "~A [up to date]~%" name+version)
result)
(else
(let-values (((project new-version)
(package/version latest))
((old-name old-hash old-urls)
(src->values src)))
(format #t "~A -> ~A [~A]~%" name+version latest
(and (pair? old-urls) (car old-urls)))
(let* ((url (and (pair? old-urls)
(car old-urls)))
(new-hash (fetch-gnu project new-version
(if url
(file-extension url)
"gz"))))
(cons (list name attribute
old-version old-hash
new-version new-hash
location)
result))))))))))
'()
gnu-packages))
(define (fetch-gnu project version archive-type)
(let-values (((server directory)
(ftp-server/directory project)))
(let* ((base (string-append project "-" version ".tar." archive-type))
(url (string-append "ftp://" server "/" directory "/" base))
(sig (string-append base ".sig"))
(sig-url (string-append url ".sig")))
(let-values (((hash path) (nix-prefetch-url url)))
(pk 'prefetch-url url hash path)
(and hash path
(begin
(false-if-exception (delete-file sig))
(system* "wget" sig-url)
(if (file-exists? sig)
(let ((ret (system* "gpg" "--verify" sig path)))
(false-if-exception (delete-file sig))
(if (and ret (= 0 (status:exit-val ret)))
hash
(begin
(format (current-error-port)
"signature verification failed for `~a'~%"
base)
(format (current-error-port)
"(could be because the public key is not in your keyring)~%")
#f)))
(begin
(format (current-error-port)
"no signature for `~a'~%" base)
hash))))))))
;;;
;;; Main program.
;;;
(define %options
;; Specifications of the command-line options.
(list (option '(#\h "help") #f #f
(lambda (opt name arg result)
(format #t "Usage: gnupdate [OPTIONS...]~%")
(format #t "GNUpdate -- update Nix expressions of GNU packages in Nixpkgs~%")
(format #t "~%")
(format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%")
(format #t " from FILE.~%")
(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 '(#\d "dry-run") #f #f
(lambda (opt name arg result)
(alist-cons 'dry-run #t result)))
(option '(#\x "xml") #t #f
(lambda (opt name arg result)
(alist-cons 'xml-file arg result)))))
(define-public (main . args)
;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
(let* ((opts (args-fold args %options
(lambda (opt name arg result)
(error "unrecognized option `~A'" name))
(lambda (operand result)
(error "extraneous argument `~A'" operand))
'()))
(home (getenv "HOME"))
(path (or (getenv "NIXPKGS")
(string-append home "/src/nixpkgs")))
(snix (begin
(format (current-error-port) "parsing XML...~%")
(xml->snix
(or (and=> (assoc-ref opts 'xml-file) open-input-file)
(open-nixpkgs path)))))
(packages (match snix
(('snix _ ('attribute-set attributes))
attributes)
(else #f)))
(gnu (gnu-packages packages))
(updates (packages-to-update gnu)))
(format #t "~%~A packages to update...~%" (length updates))
(for-each (lambda (update)
(match update
((name attribute
old-version old-hash
new-version new-hash
location)
(if (assoc-ref opts 'dry-run)
(format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%"
name old-version new-version
old-hash new-hash)
(update-nix-expression (location-file location)
old-version old-hash
new-version new-hash)))
(_ #f)))
updates)
#t))

4
pkgs/applications/audio/amarok/default.nix
View File

@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "amarok"; pname = "amarok";
version = "2.3.2"; version = "2.4.0";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "0dw2928vkd42h3d8nsb8i4xhp8qfj1zsfc1m9wrzrsxl0vd6j9c4"; sha256 = "52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c";
}; };
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";

6
pkgs/applications/audio/bmp-plugins/musepack/builder.sh
View File

@ -1,6 +0,0 @@
source $stdenv/setup
ensureDir "$out/lib/bmp/Input"
installFlags="install libdir=$out/lib/bmp/Input"
genericBuild

11
pkgs/applications/audio/bmp-plugins/musepack/default.nix
View File

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, bmp, libmpcdec, taglib}:
stdenv.mkDerivation {
name = "bmp-plugin-musepack-1.2";
builder = ./builder.sh;
src = fetchurl {
url = http://files2.musepack.net/linux/plugins/bmp-musepack-1.2.tar.bz2;
md5 = "5fe0c9d341ca37d05c780a478f829a5f";
};
buildInputs = [pkgconfig bmp libmpcdec taglib];
}

19
pkgs/applications/audio/bmp-plugins/wma/default.nix
View File

@ -1,19 +0,0 @@
{stdenv, fetchurl, pkgconfig, bmp}:
stdenv.mkDerivation {
name = "bmp-plugin-wma-1.0.5";
src = fetchurl {
url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2;
md5 = "5d62a0f969617aeb40096362c7a8a506";
};
buildInputs = [pkgconfig bmp];
buildFlags = "-f Makefile.bmp";
installPhase = ''
ensureDir "$out/lib/bmp/Input"
cp libwma.so "$out/lib/bmp/Input"
'';
}

21
pkgs/applications/audio/bmp/default.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, esound, libogg, libvorbis, id3lib
, glib, gtk, libglade
}:
stdenv.mkDerivation {
name = "bmp-0.9.7.1";
src = fetchurl {
url = mirror://sourceforge/beepmp/bmp-0.9.7.1.tar.gz;
md5 = "c25d5a8d49cc5851d13d525a20023c4c";
};
buildInputs = [
pkgconfig alsaLib esound libogg libvorbis id3lib libglade
];
meta = {
description = "Beep Media Player, an XMMS fork";
};
propagatedBuildInputs = [glib gtk];
}

13
pkgs/applications/editors/emacs-modes/magit/default.nix
View File

@ -1,20 +1,25 @@
{ stdenv, fetchurl, emacs, texinfo }: { stdenv, fetchurl, emacs, texinfo }:
let let
version = "0.8.2"; version = "1.0.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "magit-${version}"; name = "magit-${version}";
src = fetchurl { src = fetchurl {
url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz"; url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz";
sha256 = "fc02c23e3e8994e9c3e3299d560d0cbfed888dcc66088f06b8cea3bc89cd6ae8"; sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq";
}; };
buildInputs = [emacs texinfo]; buildInputs = [emacs texinfo];
configurePhase =
'' sed -i Makefile \
-e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|"
'';
meta = { meta = {
description = "An an interface to Git, implemented as an extension to Emacs."; description = "Magit, an Emacs interface to Git";
longDescription = '' longDescription = ''
With Magit, you can inspect and modify your Git repositories with With Magit, you can inspect and modify your Git repositories with
@ -31,6 +36,6 @@ stdenv.mkDerivation {
license = "GPLv3+"; license = "GPLv3+";
homepage = "http://github.com/philjackson/magit"; homepage = "http://github.com/philjackson/magit";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons ludo ];
}; };
} }

4
pkgs/applications/editors/zile/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, ncurses, help2man }: { fetchurl, stdenv, ncurses, help2man }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zile-2.3.22"; name = "zile-2.3.23";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz"; url = "mirror://gnu/zile/${name}.tar.gz";
sha256 = "0zkmym5vpb653c5gmzic8588v4ksidnhh33s4pjvr24n7vgj9biy"; sha256 = "01vh7mar2m5p3rmfidl5g2vs86kb3iyljm345cqqh1h6bynqmbc6";
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];

16
pkgs/applications/misc/adobe-reader/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, libX11, cups, glib, pango, atk, gtk, zlib, libxml2 }: { stdenv, fetchurl, libX11, cups, gtkLibs, zlib, libxml2 }:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "adobe-reader-9.4-1"; name = "adobe-reader-9.4.2-1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.0/enu/AdbeRdr9.4-1_i486linux_enu.tar.bz2; url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2;
sha256 = "093msw0b5k3ab0vv7bh4n81fxp51s2lynvsm076i5jvlp71l8adf"; sha256 = "0xm8ngr7lslhxli9ly1g2w7ichip88vpf7lfx1ma0liaw4m2gv0h";
}; };
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
@ -17,7 +17,13 @@ stdenv.mkDerivation {
# versions. # versions.
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.gcc.gcc libX11 glib pango atk gtk zlib libxml2 cups ]; [ stdenv.gcc.gcc libX11 zlib libxml2 cups
gtkLibs.pango
gtkLibs.atk
gtkLibs.gtk
gtkLibs.glib
gtkLibs.gdk_pixbuf
];
meta = { meta = {
description = "Adobe Reader, a viewer for PDF documents"; description = "Adobe Reader, a viewer for PDF documents";

50
pkgs/applications/misc/bitcoin/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK }:
stdenv.mkDerivation rec {
version = "0.3.20.2";
name = "bitcoin-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/bitcoin/Bitcoin/bitcoin-0.3.20/bitcoin-0.3.20.2-linux.tar.gz";
sha256 = "1maq75myqkyngfi9ngaw6kv6nfia5wsjj2zjhns75k3wxhmvgpw5";
};
buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK ];
preConfigure = ''
cd src
mkdir obj
mkdir obj/nogui
substituteInPlace makefile.unix \
--replace "-Wl,-Bstatic" "" \
--replace "-Wl,-Bdynamic" "" \
--replace "-mt \\" " \\" \
--replace "-l wx_gtk2ud-2.9" "-l wx_gtk2u_core-2.9 -l wx_gtk2u_html-2.9 -l wx_gtk2u_adv-2.9" \
--replace "DEBUGFLAGS=-g -D__WXDEBUG__" "DEBUGFLAGS=" \
--replace "/usr/local/include/wx-2.9" "${wxGTK}/include/wx-2.9" \
--replace "/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9" "${wxGTK}/lib/wx/include/gtk2-unicode-release-2.9"
'';
makefile = "makefile.unix";
buildFlags = "bitcoin bitcoind";
installPhase = ''
ensureDir $out/bin
cp bitcoin $out/bin
cp bitcoind $out/bin
'';
meta = {
description = "Bitcoin is a peer-to-peer currency";
longDescription=''
Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
'';
homepage = "http://www.bitcoin.org/";
maintainers = [ stdenv.lib.maintainers.roconnor ];
license = "MIT";
};
}

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte { stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
, curl, cdparanoia, libid3tag }: , curl, cdparanoia, libid3tag, ncurses }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "grip-3.2.0"; name = "grip-3.2.0";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas"; sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
}; };
buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ]; buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ncurses ];
meta = { meta = {
description = "GTK+-based audio CD player/ripper"; description = "GTK+-based audio CD player/ripper";

11
pkgs/applications/misc/k3b/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext , ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
, kdelibs, kdemultimedia, cdrdao, cdrtools, dvdplusrwtools , kdelibs, kdemultimedia, automoc4, phonon, makeWrapper
, automoc4, phonon, makeWrapper
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,14 +12,10 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib
ffmpeg flac libsamplerate libdvdread lame libsndfile ffmpeg flac libsamplerate libdvdread lame libsndfile
libmad gettext stdenv.gcc.libc cdrdao cdrtools libmad gettext stdenv.gcc.libc
kdelibs kdemultimedia automoc4 phonon dvdplusrwtools kdelibs kdemultimedia automoc4 phonon
makeWrapper ]; makeWrapper ];
postInstall = ''
wrapProgram $out/bin/k3b --suffix PATH : "${cdrdao}/bin:${dvdplusrwtools}/bin:${cdrtools}/bin"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "CD/DVD Burning Application for KDE"; description = "CD/DVD Burning Application for KDE";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

10
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext { stdenv, fetchurl, makeWrapper, boost, file, gettext
, glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade , glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql , libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
@ -6,22 +6,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mysql-workbench"; pname = "mysql-workbench";
version = "5.2.31a"; version = "5.2.33";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz"; url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
sha256 = "0mvjpin2qmnr8ksiknpcmlqjh5r3mafjcjdrnzbccyxc6r55xiy3"; sha256 = "193iikz0wfm3yvazficxfiqb84f34psq0bcasp3l41n9dygbgldc";
}; };
buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool buildInputs = [ boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
preConfigure = '' preConfigure = ''
substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv" substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
./autogen.sh --prefix=$out
''; '';
postInstall = '' postInstall = ''

14
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl }: { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
fontconfig, freetype, pkgconfig, libXrender }:
let let
name = "rxvt-unicode"; name = "rxvt-unicode";
version = "9.07"; version = "9.10";
n = "${name}-${version}"; n = "${name}-${version}";
in in
@ -11,18 +12,21 @@ stdenv.mkDerivation (rec {
name = "${n}${if perlSupport then "-with-perl" else ""}"; name = "${n}${if perlSupport then "-with-perl" else ""}";
src = fetchurl { src = fetchurl {
url = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.07.tar.bz2"; url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
sha256 = "18y5mb3cm1gawjm723q5r7yk37s9drzg39kna036i694m2667865"; sha256 = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a";
}; };
buildInputs = buildInputs =
[ libX11 libXt libXft ncurses /* required to build the terminfo file */ ] [ libX11 libXt libXft ncurses /* required to build the terminfo file */
fontconfig freetype pkgconfig libXrender ]
++ stdenv.lib.optional perlSupport perl; ++ stdenv.lib.optional perlSupport perl;
preConfigure = preConfigure =
'' ''
configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}"; configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender "
'' ''
# make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+ stdenv.lib.optionalString perlSupport '' + stdenv.lib.optionalString perlSupport ''

6
pkgs/applications/misc/xchm/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, wxGTK, chmlib}: {stdenv, fetchurl, wxGTK, chmlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xchm-1.17"; name = "xchm-1.18";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/xchm/xchm-1.17.tar.gz; url = mirror://sourceforge/xchm/xchm-1.18.tar.gz;
sha256 = "0yizisn4833nnpd4apallyg8iv334y00hv3awbsbc0ks2zf93x0n"; sha256 = "1wvvyzqbmj3c6i46x4vpxkawjwmmp276r84ifvlzaj5q4b52g5gw";
}; };
buildInputs = [wxGTK chmlib]; buildInputs = [wxGTK chmlib];

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

@ -1,24 +1,24 @@
{ GConf, alsaLib, atk, bzip2, cairo, cups, dbus, dbus_glib, expat, { GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
fetchurl, ffmpeg, fontconfig, freetype, glib, gtk, libX11, , fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst, , libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, pango, patchelf, , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
stdenv, unzip, zlib }: , stdenv, unzip, zlib, pam }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chrome-${version}"; name = "chrome-${version}";
version = "75853"; version = "78873";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-02-23/${version}/chrome-linux.zip"; url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-03-21/${version}/chrome-linux.zip";
sha256 = "1bh507j1pm3qrkj8afzhmqicza5nms6f4dc9848xjgcvj9x2qii7"; sha256 = "04jmk4hfj305iyc6mi26iy617q4hd8341vfnl830qy02cp8pwf03";
} }
else if stdenv.system == "i686-linux" then else if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "http://build.chromium.org/f/chromium/continuous/linux/2011-02-23/${version}/chrome-linux.zip"; url = "http://build.chromium.org/f/chromium/continuous/linux/2011-03-21/${version}/chrome-linux.zip";
sha256 = "0rq888yvw5zsh0c3jnp115y4sl1q5kn4pz8flnwhrh35ca15lchn"; sha256 = "0jilfj5kk6zwr02m6982ss7xxnalmny8ml6m5k91h6gnlsrgi808";
} }
else throw "Chromium is not supported on this platform."; else throw "Chromium is not supported on this platform.";
@ -28,10 +28,13 @@ stdenv.mkDerivation rec {
libPath = libPath =
stdenv.lib.makeLibraryPath stdenv.lib.makeLibraryPath
[ GConf alsaLib atk bzip2 cairo cups dbus dbus_glib expat [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
ffmpeg fontconfig freetype glib gtk libX11 libXScrnSaver ffmpeg fontconfig freetype libX11 libXScrnSaver
libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
libpng nspr nss pango stdenv.gcc.gcc zlib stdenv.gcc.libc ]; libpng nspr nss stdenv.gcc.gcc zlib stdenv.gcc.libc
gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
pam
];
installPhase = '' installPhase = ''
ensureDir $out/bin ensureDir $out/bin

138
pkgs/applications/networking/browsers/firefox/3.5.nix
View File

@ -1,138 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
rec {
firefoxVersion = "3.5.10";
xulVersion = "1.9.1.10"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "9e84dee03f003eaf79df12de9d13ac8f6c4cd9b1";
};
commonConfigureFlags =
[ "--enable-optimize"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
#"--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
"--disable-crashreporter"
"--disable-tests"
];
xulrunner = stdenv.mkDerivation {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ 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 */
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
# !!! Temporary hack.
preBuild = ''
export NIX_ENFORCE_PURITY=
'';
installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix some references to /bin paths in the Xulrunner shell script.
substituteInPlace $out/bin/xulrunner \
--replace /bin/pwd "$(type -tP pwd)" \
--replace /bin/ls "$(type -tP ls)"
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
mv xulrunner ../lib/$libDir/
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
ln -s $i $out/bin
fi;
done;
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
postInstall = ''
libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
test -n "$libDir"
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
# Register extensions etc. !!! is this needed anymore?
echo "running firefox -register..."
$out/bin/firefox -register
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

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

@ -12,14 +12,14 @@
rec { rec {
firefoxVersion = "3.6.15"; firefoxVersion = "3.6.16";
xulVersion = "1.9.2.15"; # this attribute is used by other packages xulVersion = "1.9.2.16"; # this attribute is used by other packages
src = fetchurl { src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "bfb69ae49b2def7482543d4d982fa58993a458e9"; sha1 = "38124597440b7d60aa568adeef23659575841e92";
}; };

13
pkgs/applications/networking/browsers/firefox/4.0.nix
View File

@ -11,16 +11,18 @@
enableOfficialBranding ? false enableOfficialBranding ? false
}: }:
assert stdenv.gcc ? libc;
rec { rec {
firefoxVersion = "4.0b7"; firefoxVersion = "4.0";
xulVersion = "2.0b7"; # this attribute is used by other packages xulVersion = "2.0"; # this attribute is used by other packages
src = fetchurl { src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha256 = "02cc466a92af828ff3bc563d4515bd98064cf5f136b5871e072b9408fb4db128"; sha1 = "403da9dd65662e5c4dd34299214e04cb6f80575e";
}; };
commonConfigureFlags = commonConfigureFlags =
@ -60,6 +62,8 @@ rec {
"--disable-javaxpcom" "--disable-javaxpcom"
] ++ commonConfigureFlags; ] ++ commonConfigureFlags;
enableParallelBuilding = true;
# !!! Temporary hack. # !!! Temporary hack.
preBuild = '' preBuild = ''
export NIX_ENFORCE_PURITY= export NIX_ENFORCE_PURITY=
@ -111,6 +115,8 @@ rec {
inherit src; inherit src;
enableParallelBuilding = true;
buildInputs = buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python [ 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 libnotify
@ -122,6 +128,7 @@ rec {
configureFlags = configureFlags =
[ "--enable-application=browser" [ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
] ]
++ commonConfigureFlags ++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";

23
pkgs/applications/networking/browsers/firefox/writable-copies.patch
View File

@ -1,23 +0,0 @@
diff -rc mozilla-orig/xpcom/io/nsLocalFileUnix.cpp mozilla/xpcom/io/nsLocalFileUnix.cpp
*** mozilla-orig/xpcom/io/nsLocalFileUnix.cpp 2004-04-03 01:48:18.000000000 +0200
--- mozilla/xpcom/io/nsLocalFileUnix.cpp 2004-10-05 19:48:04.000000000 +0200
***************
*** 634,639 ****
--- 634,640 ----
// get the dirs old permissions
if (NS_FAILED(rv = GetPermissions(&oldPerms)))
return rv;
+ oldPerms |= 0200;
if (NS_FAILED(rv = newParent->Create(DIRECTORY_TYPE, oldPerms)))
return rv;
} else { // dir exists lets try to use leaf
***************
*** 758,763 ****
--- 759,765 ----
// get the old permissions
PRUint32 myPerms;
GetPermissions(&myPerms);
+ myPerms |= 0200;
// Create the new file with the old file's permissions, even if write
// permission is missing. We can't create with write permission and

10
pkgs/applications/networking/browsers/firefox/xlibs.patch
View File

@ -1,10 +0,0 @@
--- mozilla/layout/build/Makefile.in.orig 2007-01-13 14:23:19.000000000 -0200
+++ mozilla/layout/build/Makefile.in 2007-01-13 14:24:55.000000000 -0200
@@ -282,5 +282,6 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
endif
endif
+LDFLAGS += -lX11 -lXrender
export:: $(BUILD_DATE)

4
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
View File

@ -52,9 +52,9 @@ let
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz; url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc"; sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
} else { } else {
version = "10.1.102.64"; version = "10.2.152.27";
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
sha256 = "1jfk9va3id0m6q6csg6gfycmryvi7kylbb7dswpsh6zh1zv00s62"; sha256 = "1xfa0m1h02lvl5an225z4n2l4rv4s35x7a4w3rc413jbggbd0f6k";
} }
else throw "flashplayer is not supported on this platform"; else throw "flashplayer is not supported on this platform";

10
pkgs/applications/networking/instant-messengers/vacuum/default.nix
View File

@ -1,6 +1,6 @@
x@{builderDefsPackage x@{builderDefsPackage
, qt4, openssl , qt4, openssl
, xproto, libX11 , xproto, libX11, libXScrnSaver, scrnsaverproto
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
@ -11,11 +11,11 @@ let
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { sourceInfo = rec {
version="1.0.2"; version="1.1.0";
baseName="vacuum"; baseName="vacuum";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="http://vacuum-im.googlecode.com/files/${name}-source.tar.gz"; url="http://vacuum-im.googlecode.com/files/${name}.tar.gz";
hash="01ndwxpgr8911f2nfyb6i7avmmlwfikn031q1s60js4lgbqdq3b7"; hash="c956b0cf5cc0a1acee47a96f0b0e7ab5d716e48cac4a7fcbca496f901a219dcc";
}; };
in in
rec { rec {
@ -35,8 +35,6 @@ rec {
sed -re 's/qHash[(][a-z ]*QUrl/vacuum_obsolete_&/' -i src/plugins/dataforms/dataforms.cpp sed -re 's/qHash[(][a-z ]*QUrl/vacuum_obsolete_&/' -i src/plugins/dataforms/dataforms.cpp
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
goSrcDir = ''cd vacuum-*/'';
doQMake = a.fullDepEntry ('' doQMake = a.fullDepEntry (''
qmake INSTALL_PREFIX=$out -recursive vacuum.pro qmake INSTALL_PREFIX=$out -recursive vacuum.pro
'') ["doUnpack" "addInputs"]; '') ["doUnpack" "addInputs"];

4
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -11,11 +11,11 @@ let
in with stdenv; mkDerivation rec { in with stdenv; mkDerivation rec {
name = "quassel-0.6.1"; name = "quassel-0.7.1";
src = fetchurl { src = fetchurl {
url = "http://quassel-irc.org/pub/${name}.tar.bz2"; url = "http://quassel-irc.org/pub/${name}.tar.bz2";
sha256 = "1v5mxligfygn7r7hm3b9by38qxigncfkp6w4n8ypp8ww6n8ml6z0"; sha256 = "1kby1yikiv5bpzkdri5dq39pxnsj9gjrcv1gigvy2jzy3g99qjli";
}; };
buildInputs = [ cmake qt4 ] buildInputs = [ cmake qt4 ]

4
pkgs/applications/office/homebank/default.nix
View File

@ -2,7 +2,7 @@
let let
download_root = "http://homebank.free.fr/public/"; download_root = "http://homebank.free.fr/public/";
name = "homebank-4.3"; name = "homebank-4.4";
lastrelease = download_root + name + ".tar.gz"; lastrelease = download_root + name + ".tar.gz";
oldrelease = download_root + "old/" + name + ".tar.gz"; oldrelease = download_root + "old/" + name + ".tar.gz";
in in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
urls = [ lastrelease oldrelease ]; urls = [ lastrelease oldrelease ];
sha256 = "1r4bvyc2wnizjjc27hap6b4b01zjfp1x0rygylvi5n29jy6r2fn6"; sha256 = "1lp7vhimn7aa2b4ik857w7d7rbbqcwlsffk8s8lw4fjyaxrr7f0k";
}; };
buildInputs = [ pkgconfig gtk libofx intltool ]; buildInputs = [ pkgconfig gtk libofx intltool ];

4
pkgs/applications/science/electronics/gtkwave/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} : {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkwave-3.3.11"; name = "gtkwave-3.3.20";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
sha256 = "1krhxdpzj2ma3xisbk0d9yzhlk1i60hgkkfycc2nsqqirqrvdpbr"; sha256 = "0r2yh8a5rrxjzvykdmqlb098wws5c9k255saf2bsdchnigs8il3n";
}; };
buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy]; buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];

17
pkgs/applications/science/math/jags/default.nix Normal file
View File

@ -0,0 +1,17 @@
{stdenv, fetchurl, gfortran, liblapack, blas}:
stdenv.mkDerivation rec {
name = "JAGS-2.2.0";
src = fetchurl {
url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
sha256 = "016xml4k99lmdwwjiabxin95k9p3q2zh4pcci8wwcqwlq5y205b6";
};
buildInputs = [gfortran liblapack blas];
meta = {
description = "JAGS: Just Another Gibbs Sampler";
license = "GPL2";
homepage = http://www-ice.iarc.fr/~martyn/software/jags/;
maintainers = [stdenv.lib.maintainers.andres];
};
}

37
pkgs/applications/taxes/aangifte-2010/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
stdenv.mkDerivation {
name = "aangifte2010-1";
src = fetchurl {
url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz;
sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h";
};
dontStrip = true;
dontPatchELF = true;
buildInputs = [ makeWrapper ];
buildPhase =
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
$i
done
'';
installPhase =
''
ensureDir $out
cp -prvd * $out/
wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin
'';
meta = {
description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)";
url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
};
}

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

@ -42,6 +42,11 @@ rec {
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
}; };
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl;
inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight;
};
qgit = import ./qgit { qgit = import ./qgit {
inherit fetchurl stdenv; inherit fetchurl stdenv;
inherit (xlibs) libXext libX11; inherit (xlibs) libXext libX11;
@ -59,34 +64,8 @@ rec {
inherit fetchurl stdenv python git; inherit fetchurl stdenv python git;
}; };
topGit = stdenv.mkDerivation rec { topGit = lib.makeOverridable (import ./topgit) {
name = "topgit-0.8-32-g8b0f1f9"; inherit stdenv fetchurl unzip;
src = fetchurl {
url = "http://repo.or.cz/w/topgit.git/snapshot/${name}.zip";
sha256 = "0v3binh7wc2di57w6rdnlww30ryszzsklfdmm61sl1ildyl1klk4";
};
buildInputs = [unzip];
configurePhase = "export prefix=$out";
postInstall = ''
mkdir -p "$out/share/doc/${name}"
cp -v README "$out/share/doc/${name}"
mkdir -p $out/etc/bash_completion.d
make prefix=$out \
install
mv contrib/tg-completion.bash $out/etc/bash_completion.d
'';
meta = {
description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
homepage = http://repo.or.cz/w/topgit.git;
license = "GPLv2";
platforms = stdenv.lib.platforms.unix;
};
}; };
tig = stdenv.mkDerivation { tig = stdenv.mkDerivation {

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

@ -0,0 +1,46 @@
{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String, QuickCheck2, pcreLight }:
let
version = "0.20110320";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
sha256 = "1waq9kx8yzyhaf3yib2adz91vqs2csa3lyxm5w7kvyqdq2yymhs4";
};
buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight];
preConfigure = ''
makeFlagsArray=( PREFIX=$out )
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
'';
meta = {
description = "Manage files with git, without checking the file contents into git";
longDescription = ''
Git-annex allows managing files with git, without checking the
file contents into git. While that may seem paradoxical, it is
useful when dealing with files larger than git can currently
easily handle, whether due to limitations in memory, checksumming
time, or disk space.
Even without file content tracking, being able to manage files
with git, move files around and delete files with versioned
directory trees, and use branches and distributed clones, are all
very handy reasons to use git. And annexed files can co-exist in
the same git repository with regularly versioned files, which is
convenient for maintaining documents, Makefiles, etc that are
associated with annexed files but that benefit from full revision
control.
'';
license = "GPLv3+";
homepage = "http://git-annex.branchable.com/";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

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

@ -0,0 +1,33 @@
{ stdenv, fetchurl, unzip }:
let
version = "0.8-45-gd279e29";
lib = stdenv.lib;
in
stdenv.mkDerivation {
name = "topgit-${version}";
src = fetchurl {
url = "http://repo.or.cz/w/topgit.git/snapshot/topgit-${version}.zip";
sha256 = "0vzrng1w2k7m4z0x9h6zbrcf33dx08ly8fnbxzz3ms2k2dbsmpl6";
};
buildInputs = [unzip];
configurePhase = "export prefix=$out";
postInstall = ''
ensureDir "$out/share/doc/topgit-${version}"
cp README "$out/share/doc/topgit-${version}/"
ensureDir "$out/etc/bash_completion.d"
make prefix="$out" install
mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/"
'';
meta = {
description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
homepage = http://repo.or.cz/w/topgit.git;
license = "GPLv2";
platforms = stdenv.lib.platforms.unix;
};
}

8
pkgs/applications/version-management/mercurial/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, python, makeWrapper { stdenv, fetchurl, python, makeWrapper, docutils
, guiSupport ? false, tk ? null, ssl }: , guiSupport ? false, tk ? null, ssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mercurial-1.6.4"; name = "mercurial-1.7.5";
src = fetchurl { src = fetchurl {
url = "http://www.selenic.com/mercurial/release/${name}.tar.gz"; url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";
sha256 = "04c8vj942ys71dn0bjga33i0qi5hybjjhq087xd0jp29ijzxp3hy"; sha256 = "14849n52vladjmzp0s3nc8q31rkjxswg7l2f2v3j7a9h7n4czbfz";
}; };
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git
buildInputs = [ python makeWrapper ]; buildInputs = [ python makeWrapper docutils ];
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out)";

2
pkgs/applications/version-management/veracity/default.nix
View File

@ -27,7 +27,7 @@ rec {
sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f) sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
mkdir pseudo-home mkdir pseudo-home
export HOME=$PWD/pseudo-home export HOME=$PWD/pseudo-home
echo make test make test || true
'' ["doMake" "minInit"]; '' ["doMake" "minInit"];
prepare_sgneeds = a.fullDepEntry ('' prepare_sgneeds = a.fullDepEntry (''

8
pkgs/applications/version-management/veracity/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec { rec {
version="0.5.7.10397"; version="0.7.0.10414";
name="veracity-0.5.7.10397"; name="veracity-0.7.0.10414";
hash="09w1qj4wklaf7mw0vavzyqpagcd0cwqppdl8vaqqi0irddgivnq8"; hash="0kaqh2d1zh2vskwz9fw2yrx396knhbjq63h4r72y7cc2izgly21j";
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz"; url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10397.tar.gz"; advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.7.0.10414.tar.gz";
} }

4
pkgs/applications/video/bangarang/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, kdemultimedia, taglib, glibc, gettext }: { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, kdemultimedia, taglib, glibc, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bangarang-1.0.1"; name = "bangarang-2.0";
src = fetchurl { src = fetchurl {
url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz"; url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz";
sha256 = "0a89w6zqyzcb34vp3qmyp1mdm2k0igm71b5sh11xnikjvs3k7c33"; sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz";
}; };
buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano kdemultimedia taglib glibc gettext ]; buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano kdemultimedia taglib glibc gettext ];

29
pkgs/applications/video/gnash/default.nix
View File

@ -3,19 +3,21 @@
, gstFfmpeg, speex , gstFfmpeg, speex
, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
, boost, freetype, agg, dbus, curl, pkgconfig, gettext , boost, freetype, agg, dbus, curl, pkgconfig, gettext
, glib, gtk, gtkglext, x11, ming, dejagnu, python , glib, gtk, gtkglext, x11, ming, dejagnu, python, perl
, lib, makeWrapper }: , freefont_ttf, haxe, swftools
, lib, makeWrapper
, xulrunner }:
assert stdenv ? glibc; assert stdenv ? glibc;
let version = "0.8.8"; in let version = "0.8.9"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnash-${version}"; name = "gnash-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gnash/${version}/${name}.tar.bz2"; url = "mirror://gnu/gnash/${version}/${name}.tar.bz2";
sha256 = "0872qrgzpy76lxq5b2xigyzaghn53xrpqba2qp3nrk8yz20lpb6w"; sha256 = "1ga8khwaympj4fphhpyqx6ddcikv0zmcpnlykcipny1xy33bs3gr";
}; };
patchPhase = '' patchPhase = ''
@ -32,19 +34,27 @@ stdenv.mkDerivation rec {
do do
sed -i "$file" -es'|/tmp/|$TMPDIR/|g' sed -i "$file" -es'|/tmp/|$TMPDIR/|g'
done done
# Provide a default font.
sed -i "configure" \
-e 's|/usr/share/fonts/truetype/freefont/|${freefont_ttf}/share/fonts/truetype/|g'
''; '';
enableParallelBuilding = true;
# XXX: KDE is supported as well so we could make it available optionally. # XXX: KDE is supported as well so we could make it available optionally.
buildInputs = [ buildInputs = [
gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood
gstFfmpeg speex libtool gstFfmpeg speex libtool
libogg libxml2 libjpeg mesa libpng libungif boost freetype agg libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
dbus curl pkgconfig glib gtk gtkglext dbus curl pkgconfig glib gtk gtkglext
xulrunner
makeWrapper makeWrapper
]
# For the test suite ++ (stdenv.lib.optionals doCheck [
ming dejagnu python ming dejagnu python perl haxe swftools
]; ]);
preConfigure = preConfigure =
'' configureFlags=" \ '' configureFlags=" \
@ -58,12 +68,15 @@ stdenv.mkDerivation rec {
# Work around this using GCC's $CPATH variable. # Work around this using GCC's $CPATH variable.
export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10" export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10"
echo "\$CPATH set to \`$CPATH'" echo "\$CPATH set to \`$CPATH'"
echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
''; '';
# Make sure `gtk-gnash' gets `libXext' in its `RPATH'. # Make sure `gtk-gnash' gets `libXext' in its `RPATH'.
NIX_LDFLAGS="-lX11 -lXext"; NIX_LDFLAGS="-lX11 -lXext";
doCheck = true; # XXX: Tests currently fail.
doCheck = false;
preInstall = ''ensureDir $out/plugins''; preInstall = ''ensureDir $out/plugins'';
postInstall = '' postInstall = ''

5
pkgs/applications/video/kdenlive/default.nix
View File

@ -8,6 +8,11 @@ stdenv.mkDerivation {
sha256 = "10bwmhh3kzdbq1nzq8s5ln7ydrzg41d1rihj5kdmf5hb91az8mvx"; sha256 = "10bwmhh3kzdbq1nzq8s5ln7ydrzg41d1rihj5kdmf5hb91az8mvx";
}; };
prePatch = ''
# For Qt47 compatibility.
sed -i 's@class QImage@#include <QImage>@' src/colorcorrection/vectorscopegenerator.h
'';
buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext
shared_mime_info soprano ]; shared_mime_info soprano ];

11
pkgs/applications/window-managers/jwm/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft }: { stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft, freetype,
fontconfig }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "jwm-2.0.1"; name = "jwm-2.0.1";
@ -8,7 +9,13 @@ stdenv.mkDerivation {
sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw"; sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw";
}; };
buildInputs = [ libX11 libXext libXinerama libXpm libXft ]; buildInputs = [ libX11 libXext libXinerama libXpm libXft freetype
fontconfig ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2 "
export NIX_LDFLAGS="$NIX_LDFLAGS -lXft -lfreetype -lfontconfig "
'';
postInstall = postInstall =
'' ''

20
pkgs/data/documentation/man-pages-posix/default.nix Normal file
View File

@ -0,0 +1,20 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "man-pages-posix-2003a";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.bz2";
sha256 = "1sj97lbj27w935f9ia91ih1mwlz4j3qcr3d3nkvcxm6cpfvv2mg3";
};
preBuild =
''
makeFlagsArray=(MANDIR=$out/share/man)
'';
meta = {
description = "POSIX man-pages (0p, 1p, 3p)";
homepage = http://kernel.org/pub/linux/docs/manpages/;
};
}

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

@ -7,14 +7,14 @@
{ fetchurl, stdenv, perl }: { fetchurl, stdenv, perl }:
let version = "2.3.6"; let version = "2.5";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pthread-man-pages-${version}"; name = "pthread-man-pages-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/glibc/glibc-linuxthreads-${version}.tar.bz2"; url = "mirror://gnu/glibc/glibc-linuxthreads-${version}.tar.bz2";
sha256 = "0f56msimlyfmragqa69jd39rb47h09l9b0agn67k1rfi8yic8fvc"; sha256 = "0b5xg7ba64d1gbqw4k1qk96qgy7h2y4qksr0qx8v7a14c6xaw9zf";
}; };
buildInputs = [ perl ]; buildInputs = [ perl ];

6
pkgs/desktops/gnome-2.28/default.nix
View File

@ -189,6 +189,12 @@ pkgs.makeOverridable
inherit GConf gnome_keyring; inherit GConf gnome_keyring;
}; };
libsoup_2_33 = import ./desktop/libsoup/2.33.nix {
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl;
inherit (pkgs.gtkLibs) glib;
inherit GConf gnome_keyring;
};
libwnck = import ./desktop/libwnck { libwnck = import ./desktop/libwnck {
inherit (pkgs) stdenv fetchurl pkgconfig; inherit (pkgs) stdenv fetchurl pkgconfig;
inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libX11;

12
pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix Normal file
View File

@ -0,0 +1,12 @@
{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl,
glib, GConf, gnome_keyring}:
stdenv.mkDerivation rec {
name = "libsoup-2.33.6";
src = fetchurl {
url = "mirror://gnome/sources/libsoup/2.33/${name}.tar.bz2";
sha256 = "988f7897fe125a77a5946b2fd6d47d7374fd94a1406e810482cfff6a52a6a923";
};
buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl
glib GConf gnome_keyring ];
}

14
pkgs/development/compilers/ghc/7.0.2.nix
View File

@ -1,19 +1,16 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses}: {stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.0.2"; version = "7.0.2";
name = "ghc-${version}"; name = "ghc-${version}";
# TODO: Does this have to be here, or can it go to meta?
homepage = "http://haskell.org/ghc";
src = fetchurl { src = fetchurl {
url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668"; sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
}; };
buildInputs = [ghc perl gmp ncurses]; buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildMK = '' buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@ -22,6 +19,7 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
echo "${buildMK}" > mk/build.mk echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
''; '';
configureFlags=[ configureFlags=[
@ -33,13 +31,13 @@ stdenv.mkDerivation rec {
stripDebugFlags=["-S" "--keep-file-symbols"]; stripDebugFlags=["-S" "--keep-file-symbols"];
meta = { meta = {
inherit homepage; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
maintainers = [ maintainers = [
stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres stdenv.lib.maintainers.andres
]; ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
}; };
} }

81
pkgs/development/compilers/pakcs/default.nix Normal file
View File

@ -0,0 +1,81 @@
{ stdenv, fetchurl, ghc, swiProlog, syb, mtl, makeWrapper, rlwrap, tk }:
stdenv.mkDerivation rec {
pname = "pakcs";
version = "1.9.2";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.informatik.uni-kiel.de/~pakcs/download/pakcs_src.tar.gz";
sha256 = "1sa6k4s5avn3qvica3a5zvb6q9vnawpp00zviqjwncwwd4a9bcwm";
};
buildInputs = [ ghc swiProlog syb mtl makeWrapper rlwrap tk ];
prePatch = ''
# Remove copying pakcsrc into $HOME.
sed -i '/update-pakcsrc/d' Makefile
# Remove copying pakcsinitrc into $HOME
sed -i '68d' configure-pakcs
'';
preConfigure = ''
# Path to GHC and SWI Prolog
sed -i 's@GHC=@GHC=${ghc}/bin/ghc@' bin/.pakcs_variables
sed -i 's@SWIPROLOG=@SWIPROLOG=${swiProlog}/bin/swipl@' bin/.pakcs_variables
'';
postInstall = ''
cp pakcsrc $out/
cp update-pakcsrc $out/
cp -r bin/ $out/
cp -r cpns/ $out/
cp -r curry2prolog/ $out/
cp -r docs/ $out/
cp -r examples/ $out/
cp -r include/ $out/
cp -r lib/ $out/
cp -r mccparser/ $out/
cp -r tools/ $out/
cp -r www/ $out/
# The Prolog sources must be built in their final directory.
(cd $out/curry2prolog/ ; make)
ensureDir $out/share/emacs/site-lisp/curry-pakcs
for e in $out/tools/emacs/*.el ; do
ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/;
done
sed -i 's@which@type -P@' $out/bin/.pakcs_wrapper
# Get the program name from the environment instead of the calling wrapper (for rlwrap).
sed -i 's@progname=`basename "$0"`@progname=$PAKCS_PROGNAME@' $out/bin/.pakcs_wrapper
wrapProgram $out/bin/.pakcs_wrapper \
--prefix PATH ":" "${rlwrap}/bin" \
--prefix PATH ":" "${tk}/bin" \
--run 'export PAKCS_PROGNAME=`basename "$0"`'
'';
meta = {
description = "PAKCS is an implementation of the multi-paradigm declarative language Curry.";
longDescription = ''
PAKCS is an implementation of the multi-paradigm declarative language
Curry jointly developed by the Portland State University, the Aachen
University of Technology, and the University of Kiel. Although this is
not a highly optimized implementation but based on a high-level
compilation of Curry programs into Prolog programs, it is not a toy
implementation but has been used for a variety of applications (e.g.,
graphical programming environments, an object-oriented front-end for
Curry, partial evaluators, database applications, HTML programming
with dynamic web pages, prototyping embedded systems).
'';
homepage = http://www.informatik.uni-kiel.de/~pakcs/;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.kkallio ];
platforms = stdenv.lib.platforms.linux;
};
}

11
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, libXinerama, libXft, libXpm, libSM, libXt }: { stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib,
libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig,
fontconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.10.2"; version = "5.10.2";
@ -9,10 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "1a3ebbcd649f429a41b64561d38423692e00524c29227432d0eb5a0e24e2a4c9"; sha256 = "1a3ebbcd649f429a41b64561d38423692e00524c29227432d0eb5a0e24e2a4c9";
}; };
buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama libXft libXpm libSM libXt zlib]; buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig];
configureFlags = "--with-world --enable-gmp --enable-shared"; configureFlags = "--with-world --enable-gmp --enable-shared";
makeFlags = "world"; makeFlags = "world";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
'';
meta = { meta = {
homepage = http://www.swi-prolog.org/; homepage = http://www.swi-prolog.org/;
description = "A Prolog compiler and interpreter"; description = "A Prolog compiler and interpreter";

9
pkgs/development/guile-modules/guile-lib/default.nix
View File

@ -1,17 +1,22 @@
{stdenv, fetchurl, guile, texinfo}: {stdenv, fetchurl, guile, texinfo}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "guile-lib-0.1.9"; name = "guile-lib-0.2.0";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/guile-lib/${name}.tar.gz"; url = "mirror://savannah/guile-lib/${name}.tar.gz";
sha256 = "13sc2x9x0rmfgfa69wabyhajc70yiywih9ibszjmkhxcm2zx0gan"; sha256 = "14acyznc0xgjd33fb9ngil102nvbhx12bvxi4hd25pl66i2d6izc";
}; };
buildInputs = [guile texinfo]; buildInputs = [guile texinfo];
doCheck = true; doCheck = true;
preCheck =
# Make `libgcc_s.so' visible for `pthread_cancel'.
'' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
'';
meta = { meta = {
description = "Guile-Library, a collection of useful Guile Scheme modules"; description = "Guile-Library, a collection of useful Guile Scheme modules";
homepage = http://www.nongnu.org/guile-lib/; homepage = http://www.nongnu.org/guile-lib/;

81
pkgs/development/interpreters/j/default.nix Normal file
View File

@ -0,0 +1,81 @@
x@{builderDefsPackage
, readline
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="j";
version="701_b";
name="${baseName}-${version}";
url="http://www.jsoftware.com/download/${baseName}${version}_source.tar.gz";
hash="1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doUnpack" "doBuildJ" "doDeploy"];
bits = if a.stdenv.system == "i686-linux" then
"32"
else if a.stdenv.system == "x86_64-linux" then
"64"
else
throw "Oops, unknown system: ${a.stdenv.system}";
doBuildJ = a.fullDepEntry ''
sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@'
sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@'
touch *.c *.h
sh bin/build_jconsole
sh bin/build_libj
sh bin/build_defs
sh bin/build_tsdll
sed -i j/bin/profile.ijs -e "s@userx=[.] *'.j'@userx=. '/.j'@;
s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ;
/install=./ainstall=. install,'/share/j'
"
'' ["doUnpack" "addInputs" "minInit"];
doDeploy = a.fullDepEntry ''
ensureDir "$out"
cp -r j/bin "$out/bin"
rm "$out/bin/profilex_template.ijs"
ensureDir "$out/share/j"
cp -r docs j/addons j/system "$out/share/j"
'' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"];
meta = {
description = "J programming language, an ASCII-based APL successor";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl3Plus;
};
passthru = {
updateInfo = {
downloadPage = "http://jsoftware.com/source.htm";
};
};
}) x

66
pkgs/development/interpreters/picolisp/default.nix Normal file
View File

@ -0,0 +1,66 @@
x@{builderDefsPackage
, jdk /* only used in bootstrap */
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="picolisp";
tarballBaseName="picoLisp";
version="3.0.5";
name="${baseName}-${version}";
tarballName="${tarballBaseName}-${version}";
extension="tgz";
url="http://www.software-lab.de/${tarballName}.${extension}";
hash="07w2aygllkmnfcnby3dy88n9giqsas35s77rp2lr2ll5yy2hkc0x";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doMake" "doDeploy"];
goSrcDir = if a.stdenv.system == "x86_64-linux" then
"cd src64" else "cd src";
makeFlags = [''PREFIX=$out''];
doDeploy = a.fullDepEntry (''
cd ..
sed -e "s@/usr/@$out/@g" -i bin/pil
ensureDir "$out/share/picolisp" "$out/lib" "$out/bin"
cp -r . "$out/share/picolisp/build-dir"
ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
'') ["minInit" "defEnsureDir" "doMake"];
meta = {
description = "An interpreter for a small Lisp dialect with builtin DB";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.mit;
};
passthru = {
updateInfo = {
downloadPage = "http://www.software-lab.de/down.html";
};
};
}) x

7
pkgs/development/libraries/SDL_gfx/default.nix
View File

@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-mmx"; configureFlags = "--disable-mmx";
postInstall = "ln -s $out/include/SDL/*.h $out/include/"; postInstall = ''
sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
$out/include/SDL/*.h
ln -s $out/include/SDL/*.h $out/include/;
'';
meta = { meta = {
description = "SDL graphics drawing primitives and support functions"; description = "SDL graphics drawing primitives and support functions";

10
pkgs/development/libraries/SDL_image/default.nix
View File

@ -13,7 +13,15 @@ stdenv.mkDerivation rec {
buildInputs = [SDL libpng libjpeg libtiff libungif libXpm]; buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
postInstall = "ln -sv $out/include/SDL/SDL_image.h $out/include/"; postInstall = ''
sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
-e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
-e 's,"begin_code.h",<SDL/begin_code.h>,' \
-e 's,"close_code.h",<SDL/close_code.h>,' \
$out/include/SDL/SDL_image.h
ln -sv $out/include/SDL/SDL_image.h $out/include/
'';
meta = { meta = {
description = "SDL image library"; description = "SDL image library";

2
pkgs/development/libraries/allegro/default.nix
View File

@ -1,7 +1,7 @@
x@{builderDefsPackage x@{builderDefsPackage
, texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
, alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
, xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :

20
pkgs/development/libraries/asio/default.nix Normal file
View File

@ -0,0 +1,20 @@
{stdenv, fetchurl, boost, openssl}:
stdenv.mkDerivation rec {
name = "asio-1.5.3";
src = fetchurl {
url = "mirror://sourceforge/asio/${name}.tar.bz2";
sha256 = "08fdsv1zhwbfwlx3r3dzl1371lxy5gw92ms0kqcscxqn0ycf3rlj";
};
propagatedBuildInputs = [ boost ];
buildInputs = [ openssl ];
meta = {
homepage = http://asio.sourceforge.net/;
description = "Cross-platform C++ library for network and low-level I/O programming";
license = "boost";
};
}

10
pkgs/development/libraries/boost/default.nix
View File

@ -59,6 +59,16 @@ stdenv.mkDerivation {
installPhase = ":"; installPhase = ":";
patches = [
# Patch to get rid of following error, experienced by some packages like encfs, bitcoin:
# terminate called after throwing an instance of 'std::runtime_error'
# what(): locale::facet::_S_create_c_locale name not valid
(fetchurl {
url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d";
})
];
crossAttrs = rec { crossAttrs = rec {
buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to

18
pkgs/development/libraries/db4/db4-4.7.nix Normal file
View File

@ -0,0 +1,18 @@
{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
stdenv.mkDerivation {
name = "db4-4.7.25";
builder = ./builder.sh;
src = fetchurl {
url = http://download-east.oracle.com/berkeley-db/db-4.7.25.tar.gz;
sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
};
configureFlags = [
(if cxxSupport then "--enable-cxx" else "--disable-cxx")
(if compat185 then "--enable-compat185" else "--disable-compat185")
];
}

18
pkgs/development/libraries/db4/db4-4.8.nix Normal file
View File

@ -0,0 +1,18 @@
{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
stdenv.mkDerivation {
name = "db4-4.8.26";
builder = ./builder.sh;
src = fetchurl {
url = http://download-east.oracle.com/berkeley-db/db-4.8.26.tar.gz;
sha256 = "0hcxh0kb6m0wk3apjhs57p7b171zzn63rg4l3nkcavygg5gx2mgp";
};
configureFlags = [
(if cxxSupport then "--enable-cxx" else "--disable-cxx")
(if compat185 then "--enable-compat185" else "--disable-compat185")
];
}

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

@ -1,11 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "enet-1.3.0"; name = "enet-1.3.1";
src = fetchurl { src = fetchurl {
url = "http://enet.bespin.org/download/${name}.tar.gz"; url = "http://enet.bespin.org/download/${name}.tar.gz";
sha256 = "0b6nv3q546mr1vr74jccd4nsad9zkmjn17kdrqxxnyc944djf310"; sha256 = "1faszy5jvxcbjvnqzxaxpcm0rh8xib52pgn2zm1vyc9gg957hw99";
}; };
meta = { meta = {

7
pkgs/development/libraries/freeimage/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, fetchurl, unzip}: {stdenv, fetchurl, unzip}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "freeimage-3.14.1"; name = "freeimage-3.15.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/freeimage/FreeImage3141.zip; url = mirror://sourceforge/freeimage/FreeImage3150.zip;
sha256 = "0rgzdjwzd64z5z9j4bq075h3kfqjk8ab2dwswy0lnzw9jvmbbifm"; sha256 = "0diyj862sdqwjqb7v2nccf8cl6886v937jkw6dgszp86qpwsfx3n";
}; };
buildInputs = [ unzip ]; buildInputs = [ unzip ];
prePatch = '' prePatch = ''
@ -12,7 +12,6 @@ stdenv.mkDerivation {
-e 's@ldconfig@echo not running ldconfig@' \ -e 's@ldconfig@echo not running ldconfig@' \
-i Makefile.gnu -i Makefile.gnu
''; '';
patches = [ ./memset.patch ];
preInstall = "mkdir -p $out/include $out/lib"; preInstall = "mkdir -p $out/include $out/lib";
meta = { meta = {

11
pkgs/development/libraries/freeimage/memset.patch
View File

@ -1,11 +0,0 @@
diff -urN a/Source/OpenEXR/Imath/ImathMatrix.h b/Source/OpenEXR/Imath/ImathMatrix.h
--- a/Source/OpenEXR/Imath/ImathMatrix.h 2010-07-17 12:48:40.000000000 +0200
+++ b/Source/OpenEXR/Imath/ImathMatrix.h 2010-09-03 18:38:37.138598422 +0200
@@ -49,6 +49,7 @@
#include "ImathVec.h"
#include "ImathShear.h"
+#include <string.h>
#include <iostream>
#include <iomanip>

9
pkgs/development/libraries/fribidi/default.nix
View File

@ -1,11 +1,12 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "fribidi-0.10.9"; name = "fribidi-${version}";
version = "0.19.2";
src = fetchurl { src = fetchurl {
url = http://fribidi.org/download/fribidi-0.10.9.tar.gz; url = "http://fribidi.org/download/${name}.tar.gz";
sha256 = "1d479wbygqmxcsyg3g7d6nmzlaa3wngy21ci5qcc5nhbyn97bz5q"; sha256 = "0xs1yr22zw9a1qq9ygsrqam0vzqdvb0ndzvjb3i2zda8drc93ks9";
}; };
meta = { meta = {

2
pkgs/development/libraries/gstreamer/gstreamer/default.nix
View File

@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
# Hm, apparently --disable-gtk-doc is ignored... # Hm, apparently --disable-gtk-doc is ignored...
postInstall = "rm -rf $out/share/gtk-doc"; postInstall = "rm -rf $out/share/gtk-doc";
setupHook = ./setup-hook.sh;
meta = { meta = {
homepage = http://gstreamer.freedesktop.org; homepage = http://gstreamer.freedesktop.org;

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

@ -0,0 +1,17 @@
{cabal, mtl}:
cabal.mkDerivation (self : {
pname = "MonadPrompt";
version = "1.0.0.2";
sha256 = "01inbw0lfjrsgs68fvak1rxi76nhwsiyarfwl1g5mis4glmh4w4c";
propagatedBuildInputs = [mtl];
preConfigure = ''
sed -i 's|base<=4|base >= 3 \&\& < 5|' ${self.pname}.cabal
'';
meta = {
description = "MonadPrompt, implementation & examples";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

5
pkgs/development/libraries/haskell/X11-xft/default.nix
View File

@ -1,10 +1,11 @@
{ ghc, cabal, X11, utf8String, pkgconfig, libXft }: { ghc, cabal, X11, utf8String, pkgconfig, libXft, freetype, fontconfig }:
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "X11-xft"; pname = "X11-xft";
version = "0.3"; version = "0.3";
sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d"; sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
buildInputs = [ ghc pkgconfig libXft ]; buildInputs = [ ghc pkgconfig libXft freetype fontconfig ];
propagatedBuildInputs = [ X11 utf8String ]; propagatedBuildInputs = [ X11 utf8String ];
configureFlags=["--extra-include-dirs=${freetype}/include/freetype2"];
meta = { meta = {
homepage = http://hackage.haskell.org/package/X11-xft; homepage = http://hackage.haskell.org/package/X11-xft;
description = "Haskell bindings to the Xft and some Xrender parts"; description = "Haskell bindings to the Xft and some Xrender parts";

13
pkgs/development/libraries/haskell/data-default/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "data-default";
version = "0.2.0.1";
sha256 = "0hhrzaykwybqpig0kss4iq1i93ygb80g8i1chpr84akmvdr07w0i";
meta = {
description = "A class for types with a default value";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

13
pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "mersenne-random-pure64";
version = "0.2.0.3";
sha256 = "0cyjfdl17n5al04vliykx0m7zncqh3201vn9b9fqfqqpmm61grqz";
meta = {
description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

13
pkgs/development/libraries/haskell/monad-loops/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "monad-loops";
version = "0.3.1.1";
sha256 = "086aqd1x1xc6irp24z1lwhzrknw9r2wbs8fnxz6vyi75m3rqvdcv";
meta = {
description = "Monadic loops";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

13
pkgs/development/libraries/haskell/pathtype/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal, QuickCheck2}:
cabal.mkDerivation (self : {
pname = "pathtype";
version = "0.5.2";
sha256 = "0rbmq6kzz2l07q9a5k888scpn62hnw2hmzz4ysprhfgdnn5b2cvi";
propagatedBuildInputs = [QuickCheck2];
meta = {
license = "BSD";
description = "Type-safe file path manipulations";
maintainer = [self.stdenv.lib.maintainers.simons];
};
})

17
pkgs/development/libraries/haskell/random-fu/default.nix Normal file
View File

@ -0,0 +1,17 @@
{cabal, erf, mtl, mersenneRandomPure64, monadLoops, MonadPrompt,
mwcRandom, randomShuffle, stateref, tagged, vector, syb}:
cabal.mkDerivation (self : {
pname = "random-fu";
version = "0.1.3";
sha256 = "1l7czlll6y02m5xzdky95m78806gnj5y3nk3cxs5zqgxwskq73bk";
propagatedBuildInputs =
[erf mtl mersenneRandomPure64 monadLoops MonadPrompt
mwcRandom randomShuffle stateref tagged vector syb];
meta = {
description = "Random number generation";
license = "Public Domain";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

13
pkgs/development/libraries/haskell/random-shuffle/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "random-shuffle";
version = "0.0.2";
sha256 = "1csq0ffsqbbv6ymf707nzfb7c9bmykwk9bcgj21mxmh6khlqn9jp";
meta = {
description = "Random shuffle implementation";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

14
pkgs/development/libraries/haskell/stateref/default.nix Normal file
View File

@ -0,0 +1,14 @@
{cabal, mtl}:
cabal.mkDerivation (self : {
pname = "stateref";
version = "0.3";
sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
propagatedBuildInputs = [mtl];
meta = {
description = "Abstraction for things that work like IORef";
license = "Public Domain";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

14
pkgs/development/libraries/haskell/tagged/default.nix Normal file
View File

@ -0,0 +1,14 @@
{cabal, dataDefault}:
cabal.mkDerivation (self : {
pname = "tagged";
version = "0.2";
sha256 = "0hwc0hhq5pzihx6danxvgs4k1z0nqcrwf3ji0w2i1gx3298cwrz5";
propagatedBuildInputs = [dataDefault];
meta = {
description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

28
pkgs/development/libraries/hawknl/default.nix Normal file
View File

@ -0,0 +1,28 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation {
name = "hawknl-1.34";
src = fetchurl {
url = http://hawksoft.com/download/files/HawkNL168src.zip;
sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
};
buildInputs = [ unzip ];
makefile = "makefile.linux";
patchPhase = ''
sed -i s/soname,NL/soname,libNL/ src/makefile.linux
'';
preInstall = ''
sed -i s,/usr/local,$out, src/makefile.linux
ensureDir $out/lib $out/include
'';
meta = {
homepage = http://hawksoft.com/hawknl/;
description = "Free, open source, game oriented network API";
license = "LGPLv2+";
};
}

3
pkgs/development/libraries/libarchive/default.nix
View File

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a";
}; };
propagatedBuildInputs = [acl libxml2 zlib bzip2 e2fsprogs xz attr openssl]; propagatedBuildInputs = [libxml2 zlib bzip2 xz openssl] ++
(if stdenv.isLinux then [e2fsprogs attr acl] else []);
buildInputs = [sharutils]; buildInputs = [sharutils];

6
pkgs/development/libraries/libssh/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, cmake, zlib, openssl}: {stdenv, fetchurl, cmake, zlib, openssl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libssh-0.4.1"; name = "libssh-0.4.8";
src = fetchurl { src = fetchurl {
url = http://www.libssh.org/files/libssh-0.4.1.tar.gz; url = http://www.libssh.org/files/0.4/libssh-0.4.8.tar.gz;
sha256 = "0f12iyzwc2w5m5y1b6jzr08516vpfwwwrqqd4dkb6b0q2a1axlm6"; sha256 = "05d8i8hwya2gry3lky9pmjpvr9f4wvggszqjjzgxvyy74sj3khhm";
}; };
buildInputs = [ cmake zlib openssl ]; buildInputs = [ cmake zlib openssl ];
meta = { meta = {

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

@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
meta = { meta = {
description = "MPC, a library for multiprecision complex arithmetic with exact rounding"; description = "GNU MPC, a library for multiprecision complex arithmetic with exact rounding";
longDescription = longDescription =
'' MPC is a C library for the arithmetic of complex numbers with '' GNU MPC is a C library for the arithmetic of complex numbers with
arbitrarily high precision and correct rounding of the result. It is arbitrarily high precision and correct rounding of the result. It is
built upon and follows the same principles as GNU MPFR. built upon and follows the same principles as GNU MPFR.
''; '';

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
let version = "4.8.6"; in let version = "4.8.7"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nspr-${version}"; name = "nspr-${version}";
src = fetchurl { src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "0vcz39784bw42kv9f81dnfb9ciga66l4yg223j467yin2nq0n16r"; sha256 = "eb9459c31d43d1000fb1304f1e0cedab0bdac3c54c71988259c1ac10c1fe16a3";
}; };
preConfigure = "cd mozilla/nsprpub"; preConfigure = "cd mozilla/nsprpub";

23
pkgs/development/libraries/sfml/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchsvn, cmake, mesa, libX11, freetype, libjpeg, openal, libsndfile
, glew, libXrandr, libXrender
}:
stdenv.mkDerivation rec {
name = "sfml-svn-${version}";
version = "1808";
src = fetchsvn {
url = "https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2";
rev = version;
};
buildInputs = [ cmake mesa libX11 freetype libjpeg openal libsndfile glew
libXrandr libXrender
];
patchPhase = "
substituteInPlace CMakeLists.txt --replace '\${CMAKE_ROOT}/Modules' 'share/cmake-2.8/Modules'
";
meta = with stdenv.lib; {
homepage = http://www.sfml-dev.org/;
description = "A multimedia C++ API that provides access to graphics, input, audio, etc.";
license = licenses.zlib;
maintainers = [ maintainers.astsmtl ];
};
}

34
pkgs/development/libraries/smpeg/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa }:
stdenv.mkDerivation rec {
name = "smpeg-svn-${version}";
version = "390";
src = fetchsvn {
url = svn://svn.icculus.org/smpeg/trunk;
rev = version;
sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
};
buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ];
preConfigure = ''
touch NEWS AUTHORS ChangeLog
autoreconf -fvi -I acinclude
'';
postInstall = ''
sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
-e 's,"SDL_mutex.h",<SDL/SDL_mutex.h>,' \
-e 's,"SDL_audio.h",<SDL/SDL_audio.h>,' \
-e 's,"SDL_thread.h",<SDL/SDL_thread.h>,' \
-e 's,"SDL_types.h",<SDL/SDL_types.h>,' \
$out/include/smpeg/*.h
'';
meta = {
homepage = http://icculus.org/smpeg/;
description = "MPEG decoding library";
license = "GPLv2+";
};
}

6
pkgs/development/libraries/taglib/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, zlib, cmake}: {stdenv, fetchurl, zlib, cmake}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "taglib-1.6.3"; name = "taglib-1.7.0";
src = fetchurl { src = fetchurl {
url = "http://developer.kde.org/~wheeler/files/src/${name}.tar.gz"; url = "https://github.com/downloads/taglib/taglib/taglib-1.7.tar.gz";
sha256 = "0jr8ixqr2q0rwcmf4n58vrwbibmd3kijsjdddck6vln6qaf0ifm9"; sha256 = "0gvpmfrrh4wgdpyc14zq9mk3hivp8kbmfdxjk8bi2nf3py6zpph9";
}; };
cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";

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

@ -1,11 +1,11 @@
{ fetchurl, stdenv, gnutls, pkgconfig, zlib }: { fetchurl, stdenv, gnutls, pkgconfig, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ucommon-4.1.7"; name = "ucommon-4.2.0";
src = fetchurl { src = fetchurl {
url = mirror://gnu/commoncpp/ucommon-4.1.7.tar.gz; url = mirror://gnu/commoncpp/ucommon-4.2.0.tar.gz;
sha256 = "1qbfhi3gfzjs44ilaipv0ynjvilxk06897g0zk974g0fgk98dd7i"; sha256 = "0w2695rf9hw407jhl1rxr2ika9syyhvd3il2g9jm1z1yk8zkl1jr";
}; };
buildInputs = [ pkgconfig gnutls zlib ]; buildInputs = [ pkgconfig gnutls zlib ];

24
pkgs/development/libraries/ustr/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, glibc }:
stdenv.mkDerivation rec {
name = "ustr-${version}";
version = "1.0.4";
src = fetchurl {
url = "http://www.and.org/ustr/${version}/${name}.tar.bz2";
sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
};
prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc}/include/";
makeFlags = "DESTDIR=$(out) prefix= LDCONFIG=echo";
configurePhase = "make ustr-import";
buildInputs = [ glibc ];
meta = with stdenv.lib; {
homepage = http://www.and.org/ustr/;
description = "Micro String API for C language";
license = licenses.bsd2;
maintainers = [ maintainers.phreedom ];
};
}

46
pkgs/development/libraries/wxGTK-2.9/2.9.0.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, mesa, compat24 ? false, compat26 ? true, unicode ? true,
}:
assert pkgconfig != null && gtk != null;
assert gtk.libtiff != null;
assert gtk.libjpeg != null;
assert gtk.libpng != null;
assert gtk.libpng.zlib != null;
stdenv.mkDerivation {
name = "wxwidgets-2.9.0";
src = fetchurl {
url = mirror://sourceforge/wxwindows/wxWidgets-2.9.0.tar.bz2;
sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
};
buildInputs = [
pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
libXinerama libSM libXxf86vm xf86vidmodeproto mesa
];
configureFlags = [
"--enable-gtk2"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26")
"--disable-precomp-headers"
(if unicode then "--enable-unicode" else "")
"--with-opengl"
];
SEARCH_LIB = "${mesa}/lib";
preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace /usr /no-such-path
";
postInstall = "
(cd $out/include && ln -s wx-*/* .)
";
passthru = {inherit gtk compat24 compat26 unicode;};
}

46
pkgs/development/libraries/wxGTK-2.9/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, mesa, compat24 ? false, compat26 ? true, unicode ? true,
}:
assert pkgconfig != null && gtk != null;
assert gtk.libtiff != null;
assert gtk.libjpeg != null;
assert gtk.libpng != null;
assert gtk.libpng.zlib != null;
stdenv.mkDerivation {
name = "wxwidgets-2.9.1";
src = fetchurl {
url = mirror://sourceforge/wxwindows/wxWidgets-2.9.1.tar.bz2;
sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
};
buildInputs = [
pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
libXinerama libSM libXxf86vm xf86vidmodeproto mesa
];
configureFlags = [
"--enable-gtk2"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26")
"--disable-precomp-headers"
(if unicode then "--enable-unicode" else "")
"--with-opengl"
];
SEARCH_LIB = "${mesa}/lib";
preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace /usr /no-such-path
";
postInstall = "
(cd $out/include && ln -s wx-*/* .)
";
passthru = {inherit gtk compat24 compat26 unicode;};
}

6
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -1,5 +1,6 @@
{fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive {fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
, useNcurses ? false, ncurses, useQt4 ? false, qt4}: , useNcurses ? false, ncurses, useQt4 ? false, qt4
, darwinInstallNameToolUtility}:
let let
os = stdenv.lib.optionalString; os = stdenv.lib.optionalString;
@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ curl expat zlib bzip2 libarchive ] buildInputs = [ curl expat zlib bzip2 libarchive ]
++ optional stdenv.isDarwin darwinInstallNameToolUtility
++ optional useNcurses ncurses ++ optional useNcurses ncurses
++ optional useQt4 qt4; ++ optional useQt4 qt4;
@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.cmake.org/; homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator"; description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else (with stdenv.lib.platforms; linux ++ freebsd); platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.urkud ]; maintainers = [ stdenv.lib.maintainers.urkud ];
}; };
} }

27
pkgs/games/btanks/default.nix Normal file
View File

@ -0,0 +1,27 @@
{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib, smpeg, SDL_image, libvorbis, lua5, zip }:
stdenv.mkDerivation rec {
name = "battle-tanks-0.9.8083";
src = fetchurl {
url = mirror://sourceforge/btanks/btanks-0.9.8083.tar.bz2;
sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz";
};
buildInputs = [ scons pkgconfig SDL mesa zlib smpeg SDL_image libvorbis lua5
zip ];
buildPhase = ''
scons prefix=$out
'';
installPhase = ''
scons install
'';
meta = {
homepage = http://sourceforge.net/projects/btanks/;
description = "Fast 2d tank arcade game";
license = "GPLv2+";
};
}

18
pkgs/games/bzflag/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ fetchurl, stdenv, curl, SDL, mesa, glew, ncurses }:
stdenv.mkDerivation rec {
name = "bzflag-2.0.16";
src = fetchurl {
url = mirror://sourceforge/bzflag/bzflag-2.0.16.tar.bz2;
sha256 = "13v0ibiyq59j3xf23yf7s8blkmacagl8w48v2580k5bzkswa0vzy";
};
buildInputs = [ curl SDL mesa glew ncurses ];
meta = {
description = "Multiplayer 3D Tank game";
homepage = http://bzflag.org/;
license = "LGPLv2.1+";
};
}

8
pkgs/games/liquidwar/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec { rec {
version="0.0.8beta"; version="0.0.9beta";
name="liquidwar-0.0.8beta"; name="liquidwar-0.0.9beta";
hash="1qcwms44i9x2s38hy64w7xxjkb2j0bh7ril9hldkjy3z208s3wff"; hash="1a4yqh79y6s3f6dv5kkwjdqzi62y3qbwrx6420fqpvdn1694ycr9";
url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz"; url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz";
advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.8beta/liquidwar6-0.0.8beta.tar.gz"; advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.9beta/liquidwar6-0.0.9beta.tar.gz";
} }

30
pkgs/games/mars/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, cmake, mesa, sfml_svn, fribidi, taglib }:
stdenv.mkDerivation rec {
name = "mars-${version}";
version = "0.7.1";
src = fetchurl {
url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz";
sha256 = "050li9adkkr2br5b4r5iq4prg4qklxnmf1i34aw6qkpw89qafzha";
};
buildInputs = [ cmake mesa sfml_svn fribidi taglib ];
installPhase = ''
cd ..
find -name '*.svn' -exec rm -rf {} \;
ensureDir "$out/share/mars/"
ensureDir "$out/bin/"
cp -rv data resources credits.txt license.txt "$out/share/mars/"
cp -v mars "$out/bin/mars.bin"
cat << EOF > "$out/bin/mars"
#! /bin/sh
cd "$out/share/mars/"
exec "$out/bin/mars.bin" "\$@"
EOF
chmod +x "$out/bin/mars"
'';
meta = with stdenv.lib; {
homepage = http://mars-game.sourceforge.net/;
description = "A game about fighting with ships in a 2D space setting";
license = licenses.gpl3Plus;
maintainers = [ maintainers.astsmtl ];
};
}

24
pkgs/games/njam/default.nix Normal file
View File

@ -0,0 +1,24 @@
{stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }:
stdenv.mkDerivation rec {
name = "njam-1.25";
src = fetchurl {
url = mirror://sourceforge/njam/njam-1.25-src.tar.gz;
sha256 = "0ysvqw017xkvddj957pdfmbmji7qi20nyr7f0zxvcvm6c7d3cc7s";
};
preBuild = ''
rm src/*.o
'';
buildInputs = [ SDL SDL_image SDL_mixer SDL_net ];
patches = [ ./logfile.patch ];
meta = {
homepage = http://trackballs.sourceforge.net/;
description = "Cross-platform pacman-like game";
license = "GPLv2+";
};
}

22
pkgs/games/njam/logfile.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/src/njamedit.cpp b/src/njamedit.cpp
index a895ca9..38477db 100644
--- a/src/njamedit.cpp
+++ b/src/njamedit.cpp
@@ -114,7 +114,7 @@ void NjamEngine::LevelEditor()
key = SDLK_a;
else if (CheckForSave())
{
- LogFile::LogFile("Saving maps");
+ LogFile("Saving maps");
m_Maps.Save(filename);
level_type_was = level_type;
changed = false;
@@ -139,7 +139,7 @@ void NjamEngine::LevelEditor()
"levels/%s.%s",
#endif
filename, types[level_type]);
- LogFile::LogFile("Saving maps");
+ LogFile("Saving maps");
m_Maps.Save(buf);
level_type_was = level_type;
changed = false;

30
pkgs/games/racer/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ fetchurl, stdenv, allegro, libjpeg, makeWrapper }:
stdenv.mkDerivation rec {
name = "racer-1.1";
src = if stdenv.system == "i686-linux" then fetchurl {
url = http://hippo.nipax.cz/src/racer-1.1.tar.gz;
sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9";
} else if stdenv.system == "x86_64-linux" then fetchurl {
url = http://hippo.nipax.cz/src/racer-1.1.64.tar.gz;
sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0";
} else
throw "System not supported";
buildInputs = [ allegro libjpeg makeWrapper ];
prePatch = ''
sed -i s,/usr/local,$out, Makefile src/HGFX.cpp src/STDH.cpp
sed -i s,/usr/share,$out/share, src/HGFX.cpp src/STDH.cpp
'';
patches = [ ./mkdir.patch ];
meta = {
description = "Car racing game";
homepage = http://hippo.nipax.cz/download.en.php;
license = "GPLv2+";
};
}

13
pkgs/games/racer/mkdir.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/STDH.cpp b/src/STDH.cpp
index 5f78473..47c3f8b 100644
--- a/src/STDH.cpp
+++ b/src/STDH.cpp
@@ -5,6 +5,8 @@
#include "player.h"
#include "drivers.h"
#include "cup.h"
+#include <sys/stat.h>
+#include <sys/types.h>
HScreen hscreen;

78
pkgs/games/simutrans/default.nix Normal file
View File

@ -0,0 +1,78 @@
{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer } :
let
# This is the default "pakset" of objects, images, text, music, etc.
pak64 = fetchurl {
url = http://sourceforge.net/projects/simutrans/files/pak64/110-0-1/simupak64-110-0-1.zip/download;
name = "pak64.zip";
sha256 = "0gs6k9dbbhh60g2smsx2jza65vyss616bpngwpvilrvb5rzzrxcq";
};
# The source distribution seems to be missing some text files.
# So we will get them from the binary Linux release (which apparently has them).
langtab = fetchurl {
url = http://sourceforge.net/projects/simutrans/files/simutrans/110-0-1/simulinux-110-0-1.zip/download;
name = "simulinux-110-0-1.zip";
sha256 = "15z13kazdzhfzwxry7a766xkkdzaidvscylzrjkx3nnbcq6461s4";
};
in
stdenv.mkDerivation rec {
pname = "simutrans";
version = "110.0.1";
name = "${pname}-${version}";
src = fetchurl {
url = "http://github.com/aburch/simutrans/tarball/v110.0.1";
name = "${name}.tar.gz";
sha256 = "ab0e42e5013d6d2fd5d3176b39dc45e482583b3bad178aac1188bf2ec88feb51";
};
buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ];
prePatch = ''
# Use ~/.simutrans instead of ~/simutrans
sed -i 's@%s/simutrans@%s/.simutrans@' simsys_s.cc
'';
preConfigure = ''
# Configuration as per the readme.txt
sed -i 's@#BACKEND = sdl@BACKEND = sdl@' config.template
sed -i 's@#COLOUR_DEPTH = 16@COLOUR_DEPTH = 16@' config.template
sed -i 's@#OSTYPE = linux@OSTYPE = linux@' config.template
sed -i 's@#OPTIMISE = 1@OPTIMISE = 1@' config.template
cp config.template config.default
'';
installPhase = ''
# Erase the source distribution object definitions, will be replaced with langtab.
rm -r simutrans
# Default pakset and binary release core objects.
unzip ${pak64}
unzip ${langtab}
mv sim simutrans/
ensureDir $out/simutrans
cp -r simutrans $out
ensureDir $out/bin
ln -s $out/simutrans/sim $out/bin/simutrans
'';
meta = {
description = "Simutrans is a simulation game in which the player strives to run a successful transport system.";
longDescription = ''
Simutrans is a cross-platform simulation game in which the
player strives to run a successful transport system by
transporting goods, passengers, and mail between
places. Simutrans is an open source remake of Transport Tycoon.
'';
homepage = http://www.simutrans.com/;
license = "Artistic";
maintainers = [ stdenv.lib.maintainers.kkallio ];
platforms = stdenv.lib.platforms.linux;
};
}

28
pkgs/games/vdrift/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis,
asio, boost, SDL_gfx }:
stdenv.mkDerivation rec {
name = "vdrift-2010-06-30";
src = fetchurl {
url = "mirror://sourceforge/vdrift/${name}.tar.bz2";
sha256 = "1zbh62363gx4ayyx4wcsp5di4f16qqfg2ajwkgw71kss6j7lk71j";
};
buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost
SDL_gfx ];
buildPhase = ''
sed -i -e s,/usr/local,$out, SConstruct
scons
'';
installPhase = "scons install";
meta = {
description = "Car racing game";
homepage = http://vdrift.net/;
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

44
pkgs/games/zod/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer,
mysql, makeWrapper }:
stdenv.mkDerivation rec {
name = "zod-engine-2011-03-18";
src = fetchurl {
url = "mirror://sourceforge/zod/zod_src-2011-03-18.zip";
sha256 = "00ny7a1yfn9zgl7q1ys27qafwc92dzxv07wjxl8nxa4f98al2g4n";
};
srcAssets = fetchurl {
url = "mirror://sourceforge/zod/zod_assets-2011-03-12.rar";
sha256 = "0gmg4ppr4y6ck04mandlp2fmdcyssmck999m012jx5v1rm57g2hn";
};
unpackPhase = ''
mkdir src
pushd src
unzip $src
popd
sourceRoot=`pwd`/src
'';
buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql
makeWrapper ];
NIX_LDFLAGS="-L${mysql}/lib/mysql";
installPhase = ''
ensureDir $out/bin $out/share/zod
pushd $out/share/zod
unrar x $srcAssets
popd
cp zod $out/bin
wrapProgram $out/bin/zod --run "cd $out/share/zod"
'';
meta = {
description = "Multiplayer remake of ZED";
homepage = http://zod.sourceforge.net/;
license = "GPLv3+"; /* Says the web */
};
}

28
pkgs/misc/emulators/darcnes/default.nix Normal file
View File

@ -0,0 +1,28 @@
{stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "darcnes-9b0401";
src = fetchurl {
url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz;
sha256 = "05a7mh51rg7ydb414m3p5mm05p4nz2bgvspqzwm3bhbj7zz543k3";
};
buildInputs = [ libX11 libXt libXext libXaw ];
installPhase = ''
ensureDir $out/bin
cp darcnes $out/bin
'';
patches = [ ./label.patch ];
meta = {
homepage = http://www.dridus.com/~nyef/darcnes/;
description = "Multi-System emulator, specially for NES";
/* Prohibited commercial use, credit required. */
license = "free";
};
}

13
pkgs/misc/emulators/darcnes/label.patch Normal file
View File

@ -0,0 +1,13 @@
http://gentoo-overlays.zugaina.org/funtoo/portage/games-emulation/darcnes/files/darcnes-0401-exec-stack.patch
diff -Naur old/video_x.c new/video_x.c
--- old/video_x.c 2004-09-04 01:26:41.102187277 +0200
+++ new/video_x.c 2004-09-04 01:27:51.586427427 +0200
@@ -366,6 +366,7 @@
}
default:
+ break;
}
}

84
pkgs/misc/emulators/fakenes/build.patch Normal file
View File

@ -0,0 +1,84 @@
diff --git a/build/openal.cbd b/build/openal.cbd
index d18e62d..74af061 100644
--- a/build/openal.cbd
+++ b/build/openal.cbd
@@ -23,7 +23,7 @@ CFLAGS += ' -DUSE_OPENAL'
# --
do ifplat unix
- LDFLAGS += ' `openal-config --libs`'
+ LDFLAGS += ' -lopenal'
else
LDFLAGS += ' -lOpenAL32'
done
diff --git a/build/alleggl.cbd b/build/alleggl.cbd
index e2708ff..e826371 100644
--- a/build/alleggl.cbd
+++ b/build/alleggl.cbd
@@ -22,7 +22,7 @@ CFLAGS += ' -DUSE_ALLEGROGL'
# --
-LIBAGL = agl
+LIBAGL = alleggl
ifopt debug LIBAGL = 'agld'
diff --git a/src/apu.cpp b/src/apu.cpp
index af59f1c..893a798 100644
--- a/src/apu.cpp
+++ b/src/apu.cpp
@@ -1930,7 +1930,7 @@ static void amplify(real& sample)
gain -= releaseRate;
}
- real output = (1.0 / max(gain, EPSILON));
+ real output = (1.0 / MAX(gain, EPSILON));
output = fixf(output, apu_agc_gain_floor, apu_agc_gain_ceiling);
sample *= output;
}
diff --git a/src/audio.cpp b/src/audio.cpp
index b9650dc..c21c05e 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -7,6 +7,7 @@
You must read and accept the license prior to use. */
#include <allegro.h>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <vector>
@@ -234,7 +235,7 @@ void audio_update(void)
const unsigned queuedFrames = (audioQueue.size() / audio_channels);
if(queuedFrames > 0) {
// Determine how many frames we want to make room for.
- const unsigned framesToAdd = min(queuedFrames, audio_buffer_size_frames);
+ const unsigned framesToAdd = MIN(queuedFrames, audio_buffer_size_frames);
// Make room for the frames in the buffer.
const unsigned framesToMove = (audioBufferedFrames - framesToAdd);
if(framesToMove > 0) {
@@ -258,7 +259,7 @@ void audio_update(void)
// Determine how many frames are available in the buffer.
const unsigned bufferableFrames = (audio_buffer_size_frames - audioBufferedFrames);
// Determine the number of frames to copy to the buffer.
- const unsigned framesToCopy = min(queuedFrames, bufferableFrames);
+ const unsigned framesToCopy = MIN(queuedFrames, bufferableFrames);
// Copy frames to the buffer.
for(unsigned frame = 0; frame < framesToCopy; frame++) {
diff --git a/src/include/common.h b/src/include/common.h
index be28795..e2d21d1 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -41,8 +41,10 @@ extern "C" {
#define true TRUE
#define false FALSE
+/*
#define min(x,y) MIN((x),(y))
#define max(x,y) MAX((x),(y))
+*/
#define true_or_false(x) ((x) ? true : false)

28
pkgs/misc/emulators/fakenes/default.nix Normal file
View File

@ -0,0 +1,28 @@
{stdenv, fetchurl, allegro, openal, mesa, zlib, hawknl, freeglut, libX11,
libXxf86vm, libXcursor, libXpm }:
stdenv.mkDerivation {
name = "fakenes-0.5.9b3";
src = fetchurl {
url = mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz;
sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4";
};
buildInputs = [ allegro openal mesa zlib hawknl freeglut libX11
libXxf86vm libXcursor libXpm ];
installPhase = ''
ensureDir $out/bin
cp fakenes $out/bin
'';
NIX_LDFLAGS = "-lX11 -lXxf86vm -lXcursor -lXpm";
patches = [ ./build.patch ];
meta = {
homepage = http://fakenes.sourceforge.net/;
license = "GPLv2+";
description = "Portable Open Source NES Emulator";
};
}

4
pkgs/misc/my-env/default.nix
View File

@ -45,7 +45,7 @@ mkDerivation {
# the buildNativeInputs environment variable. # the buildNativeInputs environment variable.
buildNativeInputs = [ ] ++ buildInputs ; buildNativeInputs = [ ] ++ buildInputs ;
name = "env-${name}"; name = "env-${name}";
phases = "buildPhase"; phases = [ "buildPhase" ];
setupNew = substituteAll { setupNew = substituteAll {
src = ../../stdenv/generic/setup.sh; src = ../../stdenv/generic/setup.sh;
preHook=""; preHook="";
@ -53,6 +53,7 @@ mkDerivation {
initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; }; initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; };
gcc = stdenv.gcc; gcc = stdenv.gcc;
}; };
buildPhase = '' buildPhase = ''
set -x set -x
mkdir -p "$out/dev-envs" "$out/nix-support" mkdir -p "$out/dev-envs" "$out/nix-support"
@ -110,5 +111,6 @@ mkDerivation {
export PATH export PATH
echo $name loaded echo $name loaded
EOF EOF
exit 0
''; '';
} }

2
pkgs/misc/tex/nix/default.nix
View File

@ -53,7 +53,7 @@ rec {
# The type denotes the kind of dependency, which determines # The type denotes the kind of dependency, which determines
# what extensions we use to look for it. # what extensions we use to look for it.
deps = import (pkgs.runCommand "latex-includes" deps = import (pkgs.runCommand "latex-includes"
{ src = key; } { rootFile = baseNameOf (toString rootFile); src = key; }
"${pkgs.perl}/bin/perl ${./find-includes.pl}"); "${pkgs.perl}/bin/perl ${./find-includes.pl}");
# Look for the dependencies of `key', trying various # Look for the dependencies of `key', trying various

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