mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-03-17 09:32:50 +00:00
Merge trunk into branches/libpng15. No conflicts.
svn path=/nixpkgs/branches/libpng15/; revision=30917
This commit is contained in:
Yury G. Kudryashov
commit
571365c5bd
|
|
@ -308,12 +308,17 @@ replaced by the result of their application to DERIVATIONS, a vhash."
|
|||
;; DERIVATION lacks an "src" attribute.
|
||||
(and=> (derivation-source derivation) source-output-path))
|
||||
|
||||
(define (open-nixpkgs nixpkgs)
|
||||
(define* (open-nixpkgs nixpkgs #:optional attribute)
|
||||
;; Return an input pipe to the XML representation of Nixpkgs. When
|
||||
;; ATTRIBUTE is true, only that attribute is considered.
|
||||
(let ((script (string-append nixpkgs
|
||||
"/maintainers/scripts/eval-release.nix")))
|
||||
(open-pipe* OPEN_READ "nix-instantiate"
|
||||
"--strict" "--eval-only" "--xml"
|
||||
script)))
|
||||
(apply open-pipe* OPEN_READ
|
||||
"nix-instantiate" "--strict" "--eval-only" "--xml"
|
||||
`(,@(if attribute
|
||||
`("-A" ,attribute)
|
||||
'())
|
||||
,script))))
|
||||
|
||||
(define (pipe-failed? pipe)
|
||||
"Close pipe and return its status if it failed."
|
||||
|
|
@ -323,21 +328,36 @@ replaced by the result of their application to DERIVATIONS, a vhash."
|
|||
status
|
||||
#f)))
|
||||
|
||||
(define (nix-prefetch-url url)
|
||||
;; Download URL in the Nix store and return the base32-encoded SHA256 hash
|
||||
;; of the file at URL
|
||||
(let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
|
||||
(hash (read-line pipe)))
|
||||
(if (or (pipe-failed? pipe)
|
||||
(eof-object? hash))
|
||||
(values #f #f)
|
||||
(let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
|
||||
"sha256" hash (basename url)))
|
||||
(path (read-line pipe)))
|
||||
(if (or (pipe-failed? pipe)
|
||||
(eof-object? path))
|
||||
(values #f #f)
|
||||
(values (string-trim-both hash) (string-trim-both path)))))))
|
||||
(define (memoize proc)
|
||||
"Return a memoizing version of PROC."
|
||||
(let ((cache (make-hash-table)))
|
||||
(lambda args
|
||||
(let ((results (hash-ref cache args)))
|
||||
(if results
|
||||
(apply values results)
|
||||
(let ((results (call-with-values (lambda ()
|
||||
(apply proc args))
|
||||
list)))
|
||||
(hash-set! cache args results)
|
||||
(apply values results)))))))
|
||||
|
||||
(define nix-prefetch-url
|
||||
(memoize
|
||||
(lambda (url)
|
||||
"Download URL in the Nix store and return the base32-encoded SHA256 hash of
|
||||
the file at URL."
|
||||
(let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
|
||||
(hash (read-line pipe)))
|
||||
(if (or (pipe-failed? pipe)
|
||||
(eof-object? hash))
|
||||
(values #f #f)
|
||||
(let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
|
||||
"sha256" hash (basename url)))
|
||||
(path (read-line pipe)))
|
||||
(if (or (pipe-failed? pipe)
|
||||
(eof-object? path))
|
||||
(values #f #f)
|
||||
(values (string-trim-both hash) (string-trim-both path)))))))))
|
||||
|
||||
(define (update-nix-expression file
|
||||
old-version old-hash
|
||||
|
|
@ -409,8 +429,7 @@ replaced by the result of their application to DERIVATIONS, a vhash."
|
|||
(define %openpgp-key-server "keys.gnupg.net")
|
||||
|
||||
(define (gnupg-verify sig file)
|
||||
"Verify signature SIG for FILE. Return a status s-exp or #f if GnuPG
|
||||
failed."
|
||||
"Verify signature SIG for FILE. Return a status s-exp if GnuPG failed."
|
||||
|
||||
(define (status-line->sexp line)
|
||||
;; See file `doc/DETAILS' in GnuPG.
|
||||
|
|
@ -422,6 +441,8 @@ failed."
|
|||
(define validsig-rx
|
||||
(make-regexp
|
||||
"^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
|
||||
(define expkeysig-rx ; good signature, but expired key
|
||||
(make-regexp "^\\[GNUPG:\\] EXPKEYSIG ([[:xdigit:]]+) (.*)$"))
|
||||
(define errsig-rx
|
||||
(make-regexp
|
||||
"^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
|
||||
|
|
@ -431,20 +452,25 @@ failed."
|
|||
(lambda (match)
|
||||
`(signature-id ,(match:substring match 1) ; sig id
|
||||
,(match:substring match 2) ; date
|
||||
,(string->number ; timestamp
|
||||
,(string->number ; timestamp
|
||||
(match:substring match 3)))))
|
||||
((regexp-exec goodsig-rx line)
|
||||
=>
|
||||
(lambda (match)
|
||||
`(good-signature ,(match:substring match 1) ; key id
|
||||
`(good-signature ,(match:substring match 1) ; key id
|
||||
,(match:substring match 2)))) ; user name
|
||||
((regexp-exec validsig-rx line)
|
||||
=>
|
||||
(lambda (match)
|
||||
`(valid-signature ,(match:substring match 1) ; fingerprint
|
||||
,(match:substring match 2) ; sig creation date
|
||||
,(string->number ; timestamp
|
||||
,(string->number ; timestamp
|
||||
(match:substring match 3)))))
|
||||
((regexp-exec expkeysig-rx line)
|
||||
=>
|
||||
(lambda (match)
|
||||
`(expired-key-signature ,(match:substring match 1) ; fingerprint
|
||||
,(match:substring match 2)))) ; user name
|
||||
((regexp-exec errsig-rx line)
|
||||
=>
|
||||
(lambda (match)
|
||||
|
|
@ -452,7 +478,7 @@ failed."
|
|||
,(match:substring match 2) ; pubkey algo
|
||||
,(match:substring match 3) ; hash algo
|
||||
,(match:substring match 4) ; sig class
|
||||
,(string->number ; timestamp
|
||||
,(string->number ; timestamp
|
||||
(match:substring match 5))
|
||||
,(let ((rc
|
||||
(string->number ; return code
|
||||
|
|
@ -475,16 +501,17 @@ failed."
|
|||
(let* ((pipe (open-pipe* OPEN_READ %gpg-command "--status-fd=1"
|
||||
"--verify" sig file))
|
||||
(status (parse-status pipe)))
|
||||
(if (pipe-failed? pipe)
|
||||
#f
|
||||
status)))
|
||||
;; Ignore PIPE's exit status since STATUS above should contain all the
|
||||
;; info we need.
|
||||
(close-pipe pipe)
|
||||
status))
|
||||
|
||||
(define (gnupg-status-good-signature? status)
|
||||
"If STATUS, as returned by `gnupg-verify', denotes a good signature, return
|
||||
a key-id/user pair; return #f otherwise."
|
||||
(any (lambda (sexp)
|
||||
(match sexp
|
||||
(('good-signature key-id user)
|
||||
(((or 'good-signature 'expired-key-signature) key-id user)
|
||||
(cons key-id user))
|
||||
(_ #f)))
|
||||
status))
|
||||
|
|
@ -716,7 +743,8 @@ Return #t if the signature was good, #f otherwise."
|
|||
(('attribute _ "description" value)
|
||||
(string-prefix? "GNU" value))
|
||||
(('attribute _ "homepage" (? string? value))
|
||||
(string-contains value "www.gnu.org"))
|
||||
(or (string-contains value "gnu.org")
|
||||
(string-contains value "gnupg.org")))
|
||||
(('attribute _ "homepage" ((? string? value) ...))
|
||||
(any (cut string-contains <> "www.gnu.org") value))
|
||||
(_ #f)))
|
||||
|
|
@ -749,10 +777,10 @@ Return #t if the signature was good, #f otherwise."
|
|||
("libosip2" "ftp.gnu.org" "/gnu/osip" #f)
|
||||
("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("libassuan" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("freefont-ttf" "ftp.gnu.org" "/gnu/freefont" #f)
|
||||
("gnupg" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("gnu-ghostscript" "ftp.gnu.org" "/gnu/ghostscript" #f)
|
||||
("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f)
|
||||
("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f)
|
||||
("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f)
|
||||
("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f)
|
||||
|
|
@ -776,7 +804,6 @@ Return #t if the signature was good, #f otherwise."
|
|||
("gnumake" . "make")
|
||||
("gnused" . "sed")
|
||||
("gnutar" . "tar")
|
||||
("gnunet" . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
|
||||
("mitscheme" . "mit-scheme")
|
||||
("texmacs" . "TeXmacs")))
|
||||
|
||||
|
|
@ -921,6 +948,7 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
|
|||
gnu-packages))
|
||||
|
||||
(define (fetch-gnu project directory version archive-type)
|
||||
"Download PROJECT's tarball over FTP."
|
||||
(let* ((server (ftp-server/directory project))
|
||||
(base (string-append project "-" version ".tar." archive-type))
|
||||
(url (string-append "ftp://" server "/" directory "/" base))
|
||||
|
|
@ -963,12 +991,18 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
|
|||
(format #t "~%")
|
||||
(format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%")
|
||||
(format #t " from FILE.~%")
|
||||
(format #t " -A, --attribute=ATTR~%")
|
||||
(format #t " Update only the package pointed to by attribute~%")
|
||||
(format #t " ATTR.~%")
|
||||
(format #t " -s, --select=SET Update only packages from SET, which may~%")
|
||||
(format #t " be either `all', `stdenv', or `non-stdenv'.~%")
|
||||
(format #t " -d, --dry-run Don't actually update Nix expressions~%")
|
||||
(format #t " -h, --help Give this help list.~%~%")
|
||||
(format #t "Report bugs to <ludo@gnu.org>~%")
|
||||
(exit 0)))
|
||||
(option '(#\A "attribute") #t #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'attribute arg result)))
|
||||
(option '(#\s "select") #t #f
|
||||
(lambda (opt name arg result)
|
||||
(cond ((string-ci=? arg "stdenv")
|
||||
|
|
@ -994,13 +1028,14 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
|
|||
(define (gnupdate . args)
|
||||
;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
|
||||
|
||||
(define (nixpkgs->snix xml-file)
|
||||
(define (nixpkgs->snix xml-file attribute)
|
||||
(format (current-error-port) "evaluating Nixpkgs...~%")
|
||||
(let* ((home (getenv "HOME"))
|
||||
(xml (if xml-file
|
||||
(open-input-file xml-file)
|
||||
(open-nixpkgs (or (getenv "NIXPKGS")
|
||||
(string-append home "/src/nixpkgs")))))
|
||||
(string-append home "/src/nixpkgs"))
|
||||
attribute)))
|
||||
(snix (xml->snix xml)))
|
||||
(if (not xml-file)
|
||||
(let ((status (pipe-failed? xml)))
|
||||
|
|
@ -1009,7 +1044,37 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
|
|||
(format (current-error-port) "`nix-instantiate' failed: ~A~%"
|
||||
status)
|
||||
(exit 1)))))
|
||||
snix))
|
||||
|
||||
;; If we asked for a specific attribute, rewrap the thing in an
|
||||
;; attribute set to match the expectations of `packages-to-update' & co.
|
||||
(if attribute
|
||||
(match snix
|
||||
(('snix loc ('derivation args ...))
|
||||
`(snix ,loc
|
||||
(attribute-set
|
||||
((attribute #f ,attribute
|
||||
(derivation ,@args)))))))
|
||||
snix)))
|
||||
|
||||
(define (selected-gnu-packages packages stdenv selection)
|
||||
;; Return the subset of PACKAGES that are/aren't in STDENV, according to
|
||||
;; SELECTION. To do that reliably, we check whether their "src"
|
||||
;; derivation is a requisite of STDENV.
|
||||
(define gnu
|
||||
(gnu-packages packages))
|
||||
|
||||
(case selection
|
||||
((stdenv)
|
||||
(filter (lambda (p)
|
||||
(member (package-source-output-path p)
|
||||
(force stdenv)))
|
||||
gnu))
|
||||
((non-stdenv)
|
||||
(filter (lambda (p)
|
||||
(not (member (package-source-output-path p)
|
||||
(force stdenv))))
|
||||
gnu))
|
||||
(else gnu)))
|
||||
|
||||
(let* ((opts (args-fold (cdr args) %options
|
||||
(lambda (opt name arg result)
|
||||
|
|
@ -1017,7 +1082,8 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
|
|||
(lambda (operand result)
|
||||
(error "extraneous argument `~A'" operand))
|
||||
'()))
|
||||
(snix (nixpkgs->snix (assoc-ref opts 'xml-file)))
|
||||
(snix (nixpkgs->snix (assq-ref opts 'xml-file)
|
||||
(assq-ref opts 'attribute)))
|
||||
(packages (match snix
|
||||
(('snix _ ('attribute-set attributes))
|
||||
attributes)
|
||||
|
|
@ -1026,23 +1092,12 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
|
|||
;; The source tarballs that make up stdenv.
|
||||
(filter-map derivation-source-output-path
|
||||
(package-requisites (stdenv-package packages)))))
|
||||
(gnu (gnu-packages packages))
|
||||
(gnu* (case (assoc-ref opts 'filter)
|
||||
;; Filter out packages that are/aren't in `stdenv'. To
|
||||
;; do that reliably, we check whether their "src"
|
||||
;; derivation is a requisite of stdenv.
|
||||
((stdenv)
|
||||
(filter (lambda (p)
|
||||
(member (package-source-output-path p)
|
||||
(force stdenv)))
|
||||
gnu))
|
||||
((non-stdenv)
|
||||
(filter (lambda (p)
|
||||
(not (member (package-source-output-path p)
|
||||
(force stdenv))))
|
||||
gnu))
|
||||
(else gnu)))
|
||||
(updates (packages-to-update gnu*)))
|
||||
(attribute (assq-ref opts 'attribute))
|
||||
(selection (assq-ref opts 'filter))
|
||||
(to-update (if attribute
|
||||
packages ; already a subset
|
||||
(selected-gnu-packages packages stdenv selection)))
|
||||
(updates (packages-to-update to-update)))
|
||||
|
||||
(format #t "~%~A packages to update...~%" (length updates))
|
||||
(for-each (lambda (update)
|
||||
|
|
|
|||
21
pkgs/applications/audio/ncmpcpp/default.nix
Normal file
21
pkgs/applications/audio/ncmpcpp/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.8";
|
||||
name = "ncmpcpp-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2";
|
||||
sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];
|
||||
|
||||
meta = {
|
||||
description = "Curses-based interface for MPD (music player daemon)";
|
||||
homepage = http://unkart.ovh.org/ncmpcpp/;
|
||||
license = "GPLv2+";
|
||||
maintainers = [ stdenv.lib.maintainers.mornfall ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
let version = "0.6.1.309"; in
|
||||
let version = "0.6.2.291"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "spotify-${version}";
|
||||
|
|
@ -10,13 +10,13 @@ stdenv.mkDerivation {
|
|||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_i386.deb";
|
||||
sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im";
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb";
|
||||
sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb";
|
||||
sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs";
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb";
|
||||
sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8";
|
||||
}
|
||||
else throw "Spotify not supported on this platform.";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +1,32 @@
|
|||
{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "ProofGeneral-4.0";
|
||||
name = "ProofGeneral-4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.0.tgz;
|
||||
sha256 = "1ang2lsc97vl70fkgypfsr1ivdzsdliq3bkvympj30wnc7ayzbmq";
|
||||
url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz;
|
||||
sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia";
|
||||
};
|
||||
|
||||
sourceRoot = name;
|
||||
|
||||
buildInputs = [ emacs texinfo texLive perl which ];
|
||||
|
||||
patches = [ ./emacs-23.3.patch ];
|
||||
|
||||
postPatch =
|
||||
prePatch =
|
||||
'' sed -i "Makefile" \
|
||||
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
|
||||
s|/sbin/install-info|install-info|g"
|
||||
|
||||
sed -i "bin/proofgeneral" -e's/which/type -p/g'
|
||||
|
||||
# @image{ProofGeneral} fails, so remove it.
|
||||
sed -i '94d' doc/PG-adapting.texi
|
||||
sed -i '101d' doc/ProofGeneral.texi
|
||||
'';
|
||||
|
||||
preBuild = "make clean";
|
||||
preBuild = ''
|
||||
make clean;
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
# Copy `texinfo.tex' in the right place so that `texi2pdf' works.
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-mode.el ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el
|
||||
--- ProofGeneral-4.0/contrib/mmm/mmm-mode.el 2010-10-11 00:56:57.000000000 +0200
|
||||
+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el 2011-05-14 21:55:12.000000000 +0200
|
||||
@@ -160,9 +160,9 @@
|
||||
(mmm-add-hooks)
|
||||
(mmm-fixup-skeleton)
|
||||
(make-local-variable 'font-lock-fontify-region-function)
|
||||
- (make-local-variable 'font-lock-beginning-of-syntax-function)
|
||||
+ (make-local-variable 'syntax-begin-function)
|
||||
(setq font-lock-fontify-region-function 'mmm-fontify-region
|
||||
- font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax)
|
||||
+ syntax-begin-function 'mmm-beginning-of-syntax)
|
||||
(setq mmm-mode t)
|
||||
(condition-case err
|
||||
(mmm-apply-all)
|
||||
@@ -190,7 +190,7 @@
|
||||
(mmm-update-submode-region)
|
||||
(setq font-lock-fontify-region-function
|
||||
(get mmm-primary-mode 'mmm-fontify-region-function)
|
||||
- font-lock-beginning-of-syntax-function
|
||||
+ syntax-begin-function
|
||||
(get mmm-primary-mode 'mmm-beginning-of-syntax-function))
|
||||
(mmm-update-font-lock-buffer)
|
||||
(mmm-refontify-maybe)
|
||||
diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-region.el ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el
|
||||
--- ProofGeneral-4.0/contrib/mmm/mmm-region.el 2010-10-11 00:56:57.000000000 +0200
|
||||
+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el 2011-05-14 21:58:01.000000000 +0200
|
||||
@@ -548,7 +548,7 @@
|
||||
(put mode 'mmm-fontify-region-function
|
||||
font-lock-fontify-region-function))
|
||||
(put mode 'mmm-beginning-of-syntax-function
|
||||
- font-lock-beginning-of-syntax-function))
|
||||
+ syntax-begin-function))
|
||||
;; Get variables
|
||||
(setq global-vars (mmm-get-locals 'global)
|
||||
buffer-vars (mmm-get-locals 'buffer)
|
||||
@@ -768,7 +768,7 @@
|
||||
;; For some reason `font-lock-fontify-block' binds this to nil, thus
|
||||
;; preventing `mmm-beginning-of-syntax' from doing The Right Thing.
|
||||
;; I don't know why it does this, but let's undo it here.
|
||||
- (let ((font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax))
|
||||
+ (let ((syntax-begin-function 'mmm-beginning-of-syntax))
|
||||
(mapc #'(lambda (elt)
|
||||
(when (get (car elt) 'mmm-font-lock-mode)
|
||||
(mmm-fontify-region-list (car elt) (cdr elt))))
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
, gnomeSupport ? false # build support for Gnome(gnome-vfs)
|
||||
, stdenv, fetchurl, pkgconfig
|
||||
, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
|
||||
, gnomevfs ? null}:
|
||||
, gnome_vfs ? null}:
|
||||
|
||||
let
|
||||
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
|
||||
|
|
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]
|
||||
++ stdenv.lib.optional gnomeSupport gnomevfs;
|
||||
++ stdenv.lib.optional gnomeSupport gnome_vfs;
|
||||
|
||||
configureFlags = ''
|
||||
'';
|
||||
|
|
@ -28,4 +28,4 @@ in stdenv.mkDerivation rec {
|
|||
maintainers = [ maintainers.phreedom ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
{stdenv, fetchurl, perl, arts, qt, kdelibs,
|
||||
libX11, libXt, libXext, libXrender, libXft,
|
||||
zlib, libpng, libjpeg, freetype, expat }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kile-2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/kile/kile-2.0.3.tar.bz2;
|
||||
md5 = "f0296547d3e916dd385e0b8913918852";
|
||||
};
|
||||
|
||||
buildInputs = [ perl arts qt kdelibs libX11 libXt libXext libXrender libXft
|
||||
zlib libpng libjpeg freetype expat ];
|
||||
|
||||
meta = {
|
||||
description = "An integrated LaTeX editor for KDE";
|
||||
homepage = http://kile.sourceforge.net;
|
||||
license = "GPLv2";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
|
||||
, gtkmozembedsharp, monodoc
|
||||
, perl, perlXMLParser, pkgconfig
|
||||
, glib, gtk, GConf, gnomevfs, libbonobo, libglade, libgnome
|
||||
, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
|
||||
, mozilla
|
||||
}:
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
|
||||
glib gtk GConf gnomevfs libbonobo libglade libgnome
|
||||
glib gtk GConf gnome_vfs libbonobo libglade libgnome
|
||||
gtkmozembedsharp monodoc
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,23 @@
|
|||
{ fetchurl, stdenv, ncurses, help2man }:
|
||||
{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zile-2.3.24";
|
||||
name = "zile-2.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/zile/${name}.tar.gz";
|
||||
sha256 = "12by1f5nbk2qcq0f35aqjq5g54nsnajk2rk5060icsjc86pv52r1";
|
||||
sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
buildNativeInputs = [ help2man ];
|
||||
buildInputs = [ ncurses boehmgc ];
|
||||
buildNativeInputs = [ help2man perl ];
|
||||
|
||||
# Tests can't be run because most of them rely on the ability to
|
||||
# fiddle with the terminal.
|
||||
doCheck = false;
|
||||
|
||||
# XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
|
||||
preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
|
||||
|
||||
meta = {
|
||||
description = "GNU Zile, a lightweight Emacs clone";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ stdenv, fetchurl,
|
||||
GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib,
|
||||
gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2,
|
||||
lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg,
|
||||
libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb,
|
||||
openexr, pixman, pkgconfig, sqlite}:
|
||||
{ stdenv, fetchurl
|
||||
, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
|
||||
, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
|
||||
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
|
||||
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
|
||||
, openexr, pixman, pkgconfig, sqlite }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.1";
|
||||
|
|
@ -14,11 +16,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
|
||||
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
|
||||
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
|
||||
librsvg libtiff libxcb openexr pixman pkgconfig sqlite];
|
||||
buildInputs =
|
||||
[ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
|
||||
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
|
||||
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
|
||||
librsvg libtiff libxcb openexr pixman pkgconfig sqlite
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, libXinerama, curl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "feh-1.14.2";
|
||||
name = "feh-2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://feh.finalrewind.org/feh-1.14.2.tar.bz2;
|
||||
sha256 = "117g1caihil88a3q0qy9gqj521l3illlsk56cgxhpc2am6ch5nwr";
|
||||
url = http://feh.finalrewind.org/feh-2.0.tar.bz2;
|
||||
sha256 = "0ilrabi0i4gads6b5r4d7svdav00n5vxjcn6h4kbd05d2hz0mjf5";
|
||||
};
|
||||
|
||||
buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
pcre, cfitsio, perl, gob2, vala, libtiff }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "giv-0.9.19";
|
||||
name = "giv-0.9.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/giv/${name}.tar.gz";
|
||||
sha256 = "07sgpp4k27417ymavcvil4waq6ac2mj08g42g1l52l435xm5mnh7";
|
||||
sha256 = "09s659vvv26nw9vaw3a766al8yq6np7p0xb4iw907921j6nbqp7z";
|
||||
};
|
||||
|
||||
# It built code to be put in a shared object without -fPIC
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i s,/usr/local,$out, SConstruct
|
||||
'';
|
||||
|
||||
patches = [ ./build.patch ./union.patch ];
|
||||
patches = [ ./build.patch ];
|
||||
|
||||
buildPhase = "scons";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
Already reported uptream
|
||||
|
||||
diff --git a/src/giv-data.h b/src/giv-data.h
|
||||
index 64e7696..d34bfe4 100644
|
||||
--- a/src/giv-data.h
|
||||
+++ b/src/giv-data.h
|
||||
@@ -88,7 +88,7 @@ typedef struct
|
||||
typedef struct
|
||||
{
|
||||
gint op;
|
||||
- union
|
||||
+ struct
|
||||
{
|
||||
struct
|
||||
{
|
||||
diff --git a/src/giv_types.h b/src/giv_types.h
|
||||
index 02abebe..c3cfb78 100644
|
||||
--- a/src/giv_types.h
|
||||
+++ b/src/giv_types.h
|
||||
@@ -11,13 +11,11 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
gint op;
|
||||
- union {
|
||||
- struct {
|
||||
- gdouble x,y;
|
||||
- } point;
|
||||
- double arc_dev;
|
||||
- text_mark_t *text_object;
|
||||
- } data;
|
||||
+ struct {
|
||||
+ gdouble x,y;
|
||||
+ } point;
|
||||
+ double arc_dev;
|
||||
+ text_mark_t *text_object;
|
||||
} point_t;
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -4,14 +4,14 @@
|
|||
, gsl, python, pyxml, lxml, poppler }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "inkscape-0.48.1";
|
||||
name = "inkscape-0.48.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
|
||||
sha256 = "11mvwil787pj3kx3qvjqvd6z5hlk40i6g95g4vs52hrp2ifs9ga4";
|
||||
sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2";
|
||||
};
|
||||
|
||||
patches = [ ./configure-python-libs.patch ];
|
||||
patches = [ ./configure-python-libs.patch ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# Python is used at run-time to execute scripts, e.g., those from
|
||||
|
|
|
|||
|
|
@ -15,11 +15,22 @@ stdenv.mkDerivation rec {
|
|||
ghostscript atk gtk glib fontconfig freetype
|
||||
libgnomecanvas libgnomeprint libgnomeprintui
|
||||
pango libX11 xproto zlib poppler poppler_data
|
||||
autoconf automake libtool pkgconfig
|
||||
];
|
||||
|
||||
buildNativeInputs = [ autoconf automake libtool pkgconfig ];
|
||||
|
||||
# Build with poppler-0.18.x
|
||||
patchFlags = "-p0";
|
||||
|
||||
patches = [ (fetchurl {
|
||||
url = "https://api.opensuse.org/public/source/X11:Utilities/xournal/xournal-poppler-0.18.patch?rev=eca1c0b24f5bc78111147ab8f4688455";
|
||||
sha256 = "1q565kqb4bklncriq4dlhp1prhidv88wmxr9k3laykiia0qjmfyj";
|
||||
})];
|
||||
|
||||
NIX_LDFLAGS="-lX11 -lz";
|
||||
|
||||
meta = {
|
||||
homepage = http://xournal.sourceforge.net/;
|
||||
description = "note-taking application (supposes stylus)";
|
||||
maintainers = [ stdenv.lib.maintainers.guibert ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,5 +28,6 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "Adobe Reader, a viewer for PDF documents";
|
||||
homepage = http://www.adobe.com/products/reader;
|
||||
license = "unfree";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,30 @@
|
|||
{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK, miniupnpc }:
|
||||
{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.24";
|
||||
version = "0.5.0";
|
||||
name = "bitcoin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-src.tar.gz";
|
||||
sha256 = "18n8i37c478b275m2x82411i1fsw8l34qm1k65ynnw38fpaj4h3r";
|
||||
url = " https://github.com/bitcoin/bitcoin/tarball/v${version}";
|
||||
sha256 = "1i9wnbjf9yrs9rq5jnh9pk1x5j982qh3xpjm05z8dgd3nympgyy8";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK miniupnpc ];
|
||||
buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
|
||||
|
||||
preConfigure = ''
|
||||
unpackCmd = "tar xvf $curSrc";
|
||||
|
||||
buildPhase = ''
|
||||
qmake
|
||||
make
|
||||
cd src
|
||||
substituteInPlace makefile.unix \
|
||||
--replace "-Wl,-Bstatic" "" \
|
||||
--replace "-Wl,-Bdynamic" "" \
|
||||
--replace "DEBUGFLAGS=-g -D__WXDEBUG__" "DEBUGFLAGS=" \
|
||||
make -f makefile.unix
|
||||
cd ..
|
||||
'';
|
||||
|
||||
makefile = "makefile.unix";
|
||||
|
||||
buildFlags = "bitcoin bitcoind";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp bitcoin $out/bin
|
||||
cp bitcoind $out/bin
|
||||
cp bitcoin-qt $out/bin
|
||||
cp src/bitcoind $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
|
||||
, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
|
||||
, pil, makeWrapper, unrar, chmlib, pythonPackages
|
||||
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calibre-0.8.21";
|
||||
name = "calibre-0.8.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/calibre/${name}.tar.gz";
|
||||
sha256 = "173is8qlsm1gbsx5a411c2226kakwyv200wcw97yfs613k7cz256";
|
||||
url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
|
||||
sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282";
|
||||
};
|
||||
|
||||
inherit python;
|
||||
|
||||
buildNativeInputs = [ makeWrapper xz pkgconfig ];
|
||||
|
||||
buildInputs =
|
||||
[ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
|
||||
fontconfig podofo qt4 pil makeWrapper chmlib icu
|
||||
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
|
||||
fontconfig podofo qt4 pil chmlib icu
|
||||
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
|
||||
pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, libX11, libXinerama}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dmenu-4.4";
|
||||
name = "dmenu-4.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/tools/${name}.tar.gz";
|
||||
sha256 = "016hfnmk4kb2n3slxrg4z27p2l8x1awqsig961syssw4p1zybpav";
|
||||
sha256 = "0l25vdnzlslk0r4m6hjkzxdygh3wpq04b9mr8zc9h3b1md2icr3d";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXinerama ];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff, pkgconfig,
|
||||
librsvg, glib, gtk, libXext, libXxf86vm }:
|
||||
librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "eaglemode-0.79.0";
|
||||
name = "eaglemode-0.83.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/eaglemode/eaglemode-0.79.0.tar.bz2;
|
||||
sha256 = "115jydig35dqkrwl3x7fv564bks13nw89vfb46bb5rlr3l4a084s";
|
||||
url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
|
||||
sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3";
|
||||
};
|
||||
|
||||
buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig
|
||||
librsvg glib gtk libXxf86vm libXext ];
|
||||
librsvg glib gtk libXxf86vm libXext poppler ];
|
||||
|
||||
# The program tries to dlopen both Xxf86vm and Xext, so we use the
|
||||
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,11 @@ rec {
|
|||
configureFlags = [];
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"];
|
||||
|
||||
fixCurlIncludes = a.fullDepEntry ''
|
||||
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
|
||||
'' ["minInit" "doUnpack"];
|
||||
|
||||
name = "gosmore-r21657";
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gv-3.7.2";
|
||||
let
|
||||
name = "gv-3.7.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gv/${name}.tar.gz";
|
||||
sha256 = "1cj03rb7xs0l3krax4z2llwnldh876p1h3p5vql4gygcxki8vhk2";
|
||||
sha256 = "ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b";
|
||||
};
|
||||
|
||||
buildInputs = [ Xaw3d ghostscriptX perl ];
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);
|
|||
|
||||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20110715";
|
||||
version = "3.20111107";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
|
||||
sha256 = "ef9cbe5ddf484e6b75de05cc6a5b51dfdff1f5920b1c4c66309b1409266df9c7";
|
||||
sha256 = "5b14370ec9c31138d4937eca4ba9c1f1a74515edd34071cefd0cefa37395565c";
|
||||
};
|
||||
|
||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
|
|
|
|||
|
|
@ -1,21 +1,25 @@
|
|||
{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
|
||||
, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
|
||||
, kdelibs, kdemultimedia, automoc4, phonon, makeWrapper
|
||||
, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
|
||||
, kdelibs, kdemultimedia, automoc4, phonon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "k3b-2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/k3b/${name}.tar.bz2";
|
||||
sha256 = "1kdpylz3w9bg02jg4mjhqz8bq1yb4xi4fqfl9139qcyjq4lny5xg";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib
|
||||
ffmpeg flac libsamplerate libdvdread lame libsndfile
|
||||
libmad gettext stdenv.gcc.libc
|
||||
kdelibs kdemultimedia automoc4 phonon
|
||||
makeWrapper ];
|
||||
buildInputs =
|
||||
[ cmake qt4 perl shared_mime_info libvorbis taglib
|
||||
flac libsamplerate libdvdread lame libsndfile
|
||||
libmad gettext stdenv.gcc.libc
|
||||
kdelibs kdemultimedia automoc4 phonon
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "CD/DVD Burning Application for KDE";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -19,15 +19,26 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ qt3 libpng libXext libX11 ];
|
||||
|
||||
patchPhase = ''
|
||||
prePatch = ''
|
||||
sed -i 's/-pedantic//' mkspecs/defs.pro
|
||||
patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch /* taken from gentoo, fixes amd64 compilation issue */}
|
||||
# patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch }
|
||||
'';
|
||||
patches = [
|
||||
/* taken from gentoo, fixes amd64 compilation issue */
|
||||
./qcad-2.0.4.0-1.src-intptr.patch
|
||||
/* taken from gentoo, fixes gcc 4.3 or above compilation issue */
|
||||
./qcad-2.0.4.0-gcc43.patch
|
||||
];
|
||||
|
||||
# probably there is more to be done. But this seems to work for now (eg see gentoo ebuild)
|
||||
installPhase = ''
|
||||
ensureDir $out/{bin,share}
|
||||
cp -r qcad $out/share
|
||||
|
||||
# The compilation does not fail with error code. But qcad will not exist
|
||||
# if it failed.
|
||||
test -f $out/share/qcad/qcad
|
||||
|
||||
cat >> $out/bin/qcad << EOF
|
||||
#!/bin/sh
|
||||
cd $out/share/qcad
|
||||
|
|
|
|||
45
pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch
Normal file
45
pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp
|
||||
--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp 2004-09-14 16:13:01.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp 2008-04-27 08:35:47.000000000 -0400
|
||||
@@ -30,6 +30,7 @@
|
||||
#endif // _MSC_VER > 1000
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <cstring>
|
||||
|
||||
#include "dl_writer_ascii.h"
|
||||
#include "dl_exception.h"
|
||||
diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h
|
||||
--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h 2004-09-14 16:13:01.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
|
||||
#include <iostream>
|
||||
+#include <cstring>
|
||||
|
||||
#include "dl_attributes.h"
|
||||
|
||||
diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp
|
||||
--- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp 2004-09-14 16:13:03.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "rs_snapper.h"
|
||||
#include "rs_point.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
|
||||
RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container,
|
||||
RS_GraphicView& graphicView)
|
||||
diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h
|
||||
--- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h 2004-09-14 16:13:02.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "rs_line.h"
|
||||
#include "rs_arc.h"
|
||||
|
||||
-
|
||||
+#include <cstdlib>
|
||||
|
||||
/**
|
||||
* Class for getting information about entities. This includes
|
||||
|
|
@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [libX11 pkgconfig libXaw];
|
||||
|
||||
# Without this, it gets Xmu as a dependency, but without rpath entry
|
||||
NIX_LDFLAGS = "-lXmu";
|
||||
|
||||
# This will not make xfontsel find its app-defaults, but at least the $out
|
||||
# directory will contain them.
|
||||
# hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work.
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ cabal, mtl, parsec, stm, time, utf8String, X11, X11Xft }:
|
||||
{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmobar";
|
||||
version = "0.13";
|
||||
sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7";
|
||||
version = "0.14";
|
||||
sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
|
||||
extraLibraries = [ libXrandr ];
|
||||
configureFlags = "-fwith_xft";
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/xmobar/";
|
||||
|
|
|
|||
|
|
@ -8,40 +8,19 @@ assert enablePDFtoPPM -> freetype != null;
|
|||
assert useT1Lib -> t1lib != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xpdf-3.02pl5";
|
||||
name = "xpdf-3.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
|
||||
sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk";
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz;
|
||||
sha256 = "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
(if enableGUI then [x11 motif] else []) ++
|
||||
(if useT1Lib then [t1lib] else []);
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch;
|
||||
sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq";
|
||||
})
|
||||
(fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch;
|
||||
sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi";
|
||||
})
|
||||
(fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch;
|
||||
sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r";
|
||||
})
|
||||
(fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch;
|
||||
sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h";
|
||||
})
|
||||
(fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl5.patch;
|
||||
sha256 = "1fki66pw56yr6aw38f6amrx7wxwcxbx4704pjqq7pqqr784b7z4j";
|
||||
})
|
||||
./xpdf-3.02-protection.patch
|
||||
];
|
||||
# Debian uses '-fpermissive' to bypass some errors on char* constantness.
|
||||
CXXFLAGS = "-O2 -fpermissive";
|
||||
|
||||
configureFlags =
|
||||
"--infodir=$out/share/info --mandir=$out/share/man --enable-a4-paper"
|
||||
|
|
@ -54,7 +33,7 @@ stdenv.mkDerivation {
|
|||
if test -n \"${base14Fonts}\"; then
|
||||
substituteInPlace $out/etc/xpdfrc \\
|
||||
--replace /usr/local/share/ghostscript/fonts ${base14Fonts} \\
|
||||
--replace '#displayFontT1' displayFontT1
|
||||
--replace '#fontFile' fontFile
|
||||
fi
|
||||
";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-268";
|
||||
name = "xterm-276";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://invisible-island.net/xterm/${name}.tgz";
|
||||
sha256 = "1hr886mgr74k146fjppnq1pmg6f95l00v88cfwac3rms5lx7ckap";
|
||||
sha256 = "1k3k025z3vl91sc8i7f5lmnsb1rsblpbijri9vnxgpynw4wgrc7b";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
|
||||
, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
|
||||
, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11, libXfixes
|
||||
, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
|
||||
, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
|
||||
, stdenv, unzip, zlib, pam, pcre }:
|
||||
|
|
@ -7,23 +7,23 @@
|
|||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chromium-16.0.879.0-pre${version}";
|
||||
name = "chromium-17.0.943.0-pre${version}";
|
||||
|
||||
# To determine the latest revision, get
|
||||
# ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
|
||||
# For the version number, see ‘about:config’.
|
||||
version = "100626";
|
||||
version = "110566";
|
||||
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";
|
||||
sha256 = "1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l";
|
||||
sha256 = "0pi2qbcvqy9gn2s0bfqlam3mj5ghnnnkrbxrrjl63737377an7ha";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";
|
||||
sha256 = "0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca";
|
||||
sha256 = "0mk8ikgz97i69qy1cy3cqw4a2ff2ixjzyw5i86fmrq7m1f156yva";
|
||||
}
|
||||
else throw "Chromium is not supported on this platform.";
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
libPath =
|
||||
stdenv.lib.makeLibraryPath
|
||||
[ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
|
||||
ffmpeg fontconfig freetype libX11 libXScrnSaver
|
||||
ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes
|
||||
libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
|
||||
libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
|
||||
gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
|
||||
|
|
|
|||
|
|
@ -1,14 +1,23 @@
|
|||
{ stdenv, fetchurl, unzip }:
|
||||
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "conkeror-1.0pre-20110917";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip;
|
||||
sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2";
|
||||
};
|
||||
buildInputs = [ unzip ];
|
||||
installPhase = ''
|
||||
cp -v -r . $out
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/libexec/conkeror
|
||||
unzip $src -d $out/libexec
|
||||
|
||||
makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \
|
||||
--add-flags $out/libexec/conkeror/application.ini
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A keyboard-oriented, customizable, extensible web browser";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
|
||||
# HG changeset patch
|
||||
# User Chris Coulson <chrisccoulson@ubuntu.com>
|
||||
# Date 1306390403 -7200
|
||||
# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
|
||||
# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e
|
||||
Bug 639554 - Install sdk/bin with make install. r=bsmedberg
|
||||
|
||||
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
|
||||
--- a/toolkit/mozapps/installer/packager.mk
|
||||
+++ b/toolkit/mozapps/installer/packager.mk
|
||||
@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard
|
||||
$(NSINSTALL) -D $(DESTDIR)$(includedir)
|
||||
(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
|
||||
(cd $(DESTDIR)$(includedir) && tar -xf -)
|
||||
$(NSINSTALL) -D $(DESTDIR)$(idldir)
|
||||
(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
|
||||
(cd $(DESTDIR)$(idldir) && tar -xf -)
|
||||
# SDK directory is the libs + a bunch of symlinks
|
||||
$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
|
||||
+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
|
||||
if test -f $(DIST)/include/xpcom-config.h; then \
|
||||
$(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
|
||||
fi
|
||||
(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
|
||||
+ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
|
||||
$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
|
||||
ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
|
||||
ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
|
||||
ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
|
||||
ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
|
||||
endif # INSTALL_SDK
|
||||
|
||||
make-sdk:
|
||||
|
||||
|
|
@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
|||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "7.0";
|
||||
firefoxVersion = "7.0.1";
|
||||
|
||||
xulVersion = "7.0"; # this attribute is used by other packages
|
||||
xulVersion = "7.0.1"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha256 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42";
|
||||
sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
|||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "8.0b1";
|
||||
firefoxVersion = "8.0.1";
|
||||
|
||||
xulVersion = "8.0"; # this attribute is used by other packages
|
||||
xulVersion = "8.0.1"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha256 = "1sdahpawgngvjh4cap2vdg00ngiwji5nkb40dh5kd393wa6c8mpm";
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
|
|
@ -161,7 +161,7 @@ rec {
|
|||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
rm "$out/bin/$(basename "$i")"
|
||||
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
|
||||
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
|
||||
chmod a+x "$out/bin/$(basename "$i")"
|
||||
fi;
|
||||
done;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
|
||||
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
|
||||
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
||||
, yasm, mesa, sqlite
|
||||
, yasm, mesa, sqlite, unzip
|
||||
|
||||
, # If you want the resulting program to call itself "Firefox" instead
|
||||
# of "Shiretoko" or whatever, enable this option. However, those
|
||||
|
|
@ -15,16 +15,15 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
|||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "6.0.2";
|
||||
firefoxVersion = "9.0b1";
|
||||
|
||||
xulVersion = "6.0.2"; # this attribute is used by other packages
|
||||
xulVersion = "9.0"; # 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 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6";
|
||||
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha256 = "0mvm0bjzghqywh54fnk5qhz7fjm5d8y952sf59ypq64bhs5dh009";
|
||||
};
|
||||
|
||||
|
||||
commonConfigureFlags =
|
||||
[ "--enable-optimize"
|
||||
|
|
@ -51,15 +50,13 @@ rec {
|
|||
|
||||
inherit src;
|
||||
|
||||
patches = [ ./6.0-install-sdk-bin.patch ];
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto
|
||||
xlibs.libXext xlibs.xextproto sqlite
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
|
|
@ -76,12 +73,13 @@ rec {
|
|||
stdenv.lib.concatStringsSep ":"
|
||||
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
|
||||
}' ';'
|
||||
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
|
||||
'';
|
||||
|
||||
# !!! Temporary hacks.
|
||||
# !!! Temporary hack.
|
||||
preBuild =
|
||||
''
|
||||
ln -s Linux2.6.mk security/coreconf/Linux3.0.mk
|
||||
export NIX_ENFORCE_PURITY=
|
||||
'';
|
||||
|
||||
|
|
@ -103,15 +101,19 @@ rec {
|
|||
for i in $out/lib/$libDir/*; do
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
ln -s $i $out/bin
|
||||
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
|
||||
chmod a+x "$out/bin/$(basename "$i")";
|
||||
fi;
|
||||
done;
|
||||
for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
|
||||
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
|
||||
done;
|
||||
rm -f $out/bin/run-mozilla.sh
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Firefox XUL runner";
|
||||
homepage = http://www.mozilla.org/firefox/;
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
};
|
||||
|
||||
passthru = { inherit gtk; version = xulVersion; };
|
||||
|
|
@ -128,7 +130,7 @@ rec {
|
|||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
|
||||
xlibs.pixman yasm mesa sqlite
|
||||
xlibs.pixman yasm mesa sqlite file unzip
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [xulrunner];
|
||||
|
|
@ -137,6 +139,7 @@ rec {
|
|||
[ "--enable-application=browser"
|
||||
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
|
||||
"--enable-chrome-format=jar"
|
||||
"--disable-elf-hack"
|
||||
]
|
||||
++ commonConfigureFlags
|
||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
||||
|
|
@ -153,11 +156,20 @@ rec {
|
|||
postInstall =
|
||||
''
|
||||
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
|
||||
for j in $out/bin/*; do
|
||||
i="$(readlink "$j")";
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
rm "$out/bin/$(basename "$i")"
|
||||
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
|
||||
chmod a+x "$out/bin/$(basename "$i")"
|
||||
fi;
|
||||
done;
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Firefox - the browser, reloaded";
|
||||
homepage = http://www.mozilla.org/firefox/;
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins
|
||||
, browserName ? "firefox"
|
||||
, desktopName ? "Firefox"
|
||||
, nameSuffix ? ""
|
||||
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs
|
||||
, browserName, desktopName, nameSuffix, icon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -10,7 +8,7 @@ stdenv.mkDerivation {
|
|||
desktopItem = makeDesktopItem {
|
||||
name = browserName;
|
||||
exec = browserName;
|
||||
icon = "${browser}/lib/${browser.name}/icons/mozicon128.png";
|
||||
icon = icon;
|
||||
comment = "";
|
||||
desktopName = desktopName;
|
||||
genericName = "Web Browser";
|
||||
|
|
@ -29,6 +27,7 @@ stdenv.mkDerivation {
|
|||
makeWrapper "${browser}/bin/${browserName}" \
|
||||
"$out/bin/${browserName}${nameSuffix}" \
|
||||
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
|
||||
--suffix-each LD_LIBRARY_PATH ':' "$libs" \
|
||||
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
|
||||
|
||||
ensureDir $out/share/applications
|
||||
|
|
@ -38,6 +37,7 @@ stdenv.mkDerivation {
|
|||
# Let each plugin tell us (through its `mozillaPlugin') attribute
|
||||
# where to find the plugin in its tree.
|
||||
plugins = map (x: x + x.mozillaPlugin) plugins;
|
||||
libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
|
||||
|
||||
meta = {
|
||||
description =
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
|
||||
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
|
||||
, libnotify, gnomevfs, libgnomeui
|
||||
, libnotify, gnome_vfs, libgnomeui
|
||||
, freetype, fontconfig, wirelesstools ? null, pixman
|
||||
, application ? "browser" }:
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
buildInputs =
|
||||
[ xz libgnomeui libnotify gnomevfs alsaLib
|
||||
[ xz libgnomeui libnotify gnome_vfs alsaLib
|
||||
pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
|
||||
python ply dbus dbus_glib pango freetype fontconfig
|
||||
xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
|
||||
|
|
|
|||
|
|
@ -1,118 +0,0 @@
|
|||
{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
|
||||
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
|
||||
, libnotify, gnomevfs, libgnomeui
|
||||
, freetype, fontconfig, wirelesstools ? null, pixman
|
||||
, application ? "browser" }:
|
||||
|
||||
# Build the WiFi stuff on Linux-based systems.
|
||||
# FIXME: Disable for now until it can actually be built:
|
||||
# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
|
||||
#assert stdenv.isLinux -> (wirelesstools != null);
|
||||
|
||||
let version = "4.0.1.1"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "icecat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
|
||||
sha256 = "1f1y1834pv8f5fmfb5d4d5gj2v7bxsk3k9b9g832bwq0h5203yvg";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ xz libgnomeui libnotify gnomevfs alsaLib
|
||||
pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
|
||||
python ply dbus dbus_glib pango freetype fontconfig
|
||||
xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
|
||||
]
|
||||
++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools);
|
||||
|
||||
patches = [
|
||||
./skip-gre-registration.patch ./rpath-link.patch
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=${application}"
|
||||
"--enable-libxul"
|
||||
"--disable-javaxpcom"
|
||||
|
||||
"--enable-optimize"
|
||||
"--disable-debug"
|
||||
"--enable-strip"
|
||||
"--with-system-jpeg"
|
||||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
# "--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"
|
||||
]
|
||||
++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi");
|
||||
|
||||
postInstall = ''
|
||||
export dontPatchELF=1;
|
||||
|
||||
# Strip some more stuff
|
||||
strip -S "$out/lib/"*"/"* || true
|
||||
|
||||
# This fixes starting IceCat when there already is a running
|
||||
# instance. The `icecat' wrapper script actually expects to be
|
||||
# in the same directory as `run-mozilla.sh', apparently.
|
||||
libDir=$(cd $out/lib && ls -d icecat-[0-9]*)
|
||||
test -n "$libDir"
|
||||
|
||||
if [ -f "$out/bin/icecat" ]
|
||||
then
|
||||
# Fix references to /bin paths in the IceCat shell script.
|
||||
substituteInPlace $out/bin/icecat \
|
||||
--replace /bin/pwd "$(type -tP pwd)" \
|
||||
--replace /bin/ls "$(type -tP ls)"
|
||||
|
||||
cd $out/bin
|
||||
mv icecat ../lib/$libDir/
|
||||
ln -s ../lib/$libDir/icecat .
|
||||
|
||||
# Register extensions etc.
|
||||
echo "running \`icecat -register'..."
|
||||
(cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./icecat-bin -register) || false
|
||||
fi
|
||||
|
||||
if [ -f "$out/lib/$libDir/xpidl" ]
|
||||
then
|
||||
# XulRunner's IDL compiler.
|
||||
echo "linking \`xpidl'..."
|
||||
ln -s "$out/lib/$libDir/xpidl" "$out/bin"
|
||||
fi
|
||||
|
||||
# Put the GNU IceCat icon in the right place.
|
||||
ensureDir "$out/lib/$libDir/chrome/icons/default"
|
||||
ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "GNU IceCat, a free web browser based on Mozilla Firefox";
|
||||
|
||||
longDescription = ''
|
||||
Gnuzilla is the GNU version of the Mozilla suite, and GNU IceCat
|
||||
is the GNU version of the Firefox browser. Its main advantage
|
||||
is an ethical one: it is entirely free software. While the
|
||||
source code from the Mozilla project is free software, the
|
||||
binaries that they release include additional non-free software.
|
||||
Also, they distribute and recommend non-free software as
|
||||
plug-ins. In addition, GNU IceCat includes some privacy
|
||||
protection features.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/gnuzilla/;
|
||||
licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit gtk version;
|
||||
isFirefox3Like = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
Without this patch, IceCat ends up linking with
|
||||
`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'.
|
||||
|
||||
--- icecat-3.5/js/src/configure 2009-07-04 18:03:01.000000000 +0200
|
||||
+++ icecat-3.5/js/src/configure 2009-07-13 18:34:30.000000000 +0200
|
||||
@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)'
|
||||
HOST_AR_FLAGS='$(AR_FLAGS)'
|
||||
|
||||
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
|
||||
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
|
||||
|
||||
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
|
||||
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
Skip "GRE" registration since that assumes write access to `/etc'.
|
||||
|
||||
--- icecat-3.0.1-g1/xulrunner/installer/Makefile.in 2008-07-27 12:52:16.000000000 +0200
|
||||
+++ icecat-3.0.1-g1/xulrunner/installer/Makefile.in 2008-09-08 17:19:17.000000000 +0200
|
||||
@@ -71,6 +71,7 @@ $(MOZILLA_VERSION).system.conf: $(topsrc
|
||||
printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
|
||||
$(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
|
||||
|
||||
+SKIP_GRE_REGISTRATION = yes
|
||||
ifndef SKIP_GRE_REGISTRATION
|
||||
# to register xulrunner per-user, override this with $HOME/.gre.d
|
||||
regdir = /etc/gre.d
|
||||
|
|
@ -53,9 +53,9 @@ let
|
|||
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
|
||||
sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
|
||||
} else {
|
||||
version = "10.3.183.7";
|
||||
version = "10.3.183.10";
|
||||
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
|
||||
sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6";
|
||||
sha256 = "0fj51dg0aa813b44yn8dvmmvw4qwi8vbi0x8n1bcqrcld3sbpmfz";
|
||||
}
|
||||
else throw "Flash Player is not supported on this platform";
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
source $stdenv/setup
|
||||
|
||||
dontStrip=1
|
||||
dontPatchELF=1
|
||||
sourceRoot=$TMPDIR
|
||||
|
||||
unpackPhase() {
|
||||
tar xvzf $src;
|
||||
for a in *; do
|
||||
if [ -d $a ]; then
|
||||
cd $a
|
||||
break
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
installPhase() {
|
||||
ensureDir $out/lib/mozilla/plugins
|
||||
cp -pv libflashplayer.so $out/lib/mozilla/plugins
|
||||
patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
|
||||
}
|
||||
|
||||
genericBuild
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, zlib
|
||||
, alsaLib
|
||||
, curl
|
||||
, nss
|
||||
, nspr
|
||||
, fontconfig
|
||||
, freetype
|
||||
, expat
|
||||
, libX11
|
||||
, libXext
|
||||
, libXrender
|
||||
, libXt
|
||||
, gtk
|
||||
, glib
|
||||
, pango
|
||||
, cairo
|
||||
, atk
|
||||
, gdk_pixbuf
|
||||
, debug ? false
|
||||
|
||||
/* you have to add ~/mm.cfg :
|
||||
|
||||
TraceOutputFileEnable=1
|
||||
ErrorReportingEnable=1
|
||||
MaxWarnings=1
|
||||
|
||||
in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
|
||||
Then FlashBug (a FireFox plugin) shows the log as well
|
||||
*/
|
||||
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
if debug then
|
||||
# no plans to provide a x86_64 version:
|
||||
# http://labs.adobe.com/technologies/flashplayer10/faq.html
|
||||
throw "no x86_64 debugging version available"
|
||||
else {
|
||||
# -> http://labs.adobe.com/downloads/flashplayer10.html
|
||||
version = "11.1.102.55";
|
||||
url = http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz;
|
||||
sha256 = "09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
if debug then {
|
||||
# The debug version also contains a player
|
||||
version = "11.1";
|
||||
url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
|
||||
sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
|
||||
} else {
|
||||
version = "11.1.102.55";
|
||||
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz";
|
||||
sha256 = "08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7";
|
||||
}
|
||||
else throw "Flash Player is not supported on this platform";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "flashplayer-${src.version}";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl { inherit (src) url sha256; };
|
||||
|
||||
inherit zlib alsaLib;
|
||||
|
||||
passthru = {
|
||||
mozillaPlugin = "/lib/mozilla/plugins";
|
||||
};
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath
|
||||
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
|
||||
libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf
|
||||
];
|
||||
|
||||
buildPhase = ":";
|
||||
|
||||
meta = {
|
||||
description = "Adobe Flash Player browser plugin";
|
||||
homepage = http://www.adobe.com/products/flashplayer/;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,6 +10,8 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [openssl curl];
|
||||
|
||||
patches = [ ./fix-build-with-latest-curl.patch ];
|
||||
|
||||
postInstall = ''
|
||||
sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe"
|
||||
chmod 555 "$out/bin/snipe"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
--- esniper-2-26-0/http.c 2011-08-09 21:05:59.000000000 +0200
|
||||
+++ esniper/http.c 2011-08-10 00:24:43.000000000 +0200
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "esniper.h"
|
||||
#include <ctype.h>
|
||||
#include <curl/curl.h>
|
||||
-#include <curl/types.h>
|
||||
#include <curl/easy.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
echo $libstdcpp
|
||||
echo "-L$libstdcpp/lib"
|
||||
LDFLAGS="-L$libstdcpp/lib"
|
||||
CPPFLAGS="-L$libstdcpp/include"
|
||||
CFLAGS="-lm"
|
||||
|
||||
configureFlags="--with-tcl=$tcl/lib --with-tk=$tk/lib --enable-static"
|
||||
|
||||
genericBuild
|
||||
|
|
@ -1,15 +1,19 @@
|
|||
{stdenv, fetchurl, which, tcl, tk, x11, libstdcpp }:
|
||||
{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "amsn-0.96";
|
||||
builder = ./builder.sh;
|
||||
name = "amsn-0.98.4";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/amsn/amsn-0.96.tar.bz2;
|
||||
md5 = "3df6b0d34ef1997a47c0b8af29b2547a";
|
||||
url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz;
|
||||
sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx";
|
||||
};
|
||||
|
||||
inherit tcl tk libstdcpp;
|
||||
buildInputs = [which tcl tk x11 ];
|
||||
configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";
|
||||
|
||||
buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://amsn-project.net;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
{stdenv, fetchurl, ncurses, openssl, tcl, tk}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gtmess-0.96";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/gtmess/gtmess-0.96.tar.gz;
|
||||
sha256 = "0w29wyshx32485c7wazj51lvk2j9k1kn2jmwpf916r4513hwplvm";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses openssl tcl tk];
|
||||
|
||||
patches = [ ./va_list.patch ];
|
||||
|
||||
meta = {
|
||||
description = "Console MSN Messenger client for Linux and other unix systems";
|
||||
homepage = http://gtmess.sourceforge.net/;
|
||||
license = "GPLv2+";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/src/client/screen.c b/src/client/screen.c
|
||||
index e8fa75f..d3842ac 100644
|
||||
--- a/src/client/screen.c
|
||||
+++ b/src/client/screen.c
|
||||
@@ -255,7 +255,7 @@ void msg(int attr, const char *fmt, ...)
|
||||
va_start(ap, fmt);
|
||||
r = vmsg(attr, SML, fmt, ap);
|
||||
va_end(ap);
|
||||
- if (r) vmsg(C_ERR, SML, "msg(): output truncated\n", NULL);
|
||||
+ if (r) msgn(C_ERR, SML, "msg(): output truncated\n");
|
||||
}
|
||||
|
||||
void msgn(int attr, int size, const char *fmt, ...)
|
||||
@@ -266,7 +266,7 @@ void msgn(int attr, int size, const char *fmt, ...)
|
||||
va_start(ap, fmt);
|
||||
r = vmsg(attr, size, fmt, ap);
|
||||
va_end(ap);
|
||||
- if (r) vmsg(C_ERR, SML, "msgn(): output truncated\n", NULL);
|
||||
+ if (r) msgn(C_ERR, SML, "msgn(): output truncated\n");
|
||||
}
|
||||
|
||||
int screen_shut()
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "kadu-0.10.0";
|
||||
name = "kadu-0.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2;
|
||||
sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995";
|
||||
url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2;
|
||||
sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
# because I was not able to get those working
|
||||
patches = [ ./disable_encryption_plugins.patch ];
|
||||
patches = [ ./disable_some_plugins.patch ];
|
||||
|
||||
NIX_LDFLAGS="-lX11";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/Plugins.cmake b/Plugins.cmake
|
||||
index c6906ce..b1284d6 100644
|
||||
--- a/Plugins.cmake
|
||||
+++ b/Plugins.cmake
|
||||
@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
|
||||
|
||||
# encryption
|
||||
# Encrypted chat support
|
||||
- encryption_ng
|
||||
+ # encryption_ng
|
||||
# OpenSSL encrypted chat support
|
||||
- encryption_ng_simlite
|
||||
+ # encryption_ng_simlite
|
||||
|
||||
# docking
|
||||
# Tray icon support (common part of all docking modules)
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
diff --git a/Plugins.cmake b/Plugins.cmake
|
||||
index ad63f20..c14a781 100644
|
||||
--- a/Plugins.cmake
|
||||
+++ b/Plugins.cmake
|
||||
@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
|
||||
|
||||
# encryption
|
||||
# Encrypted chat support
|
||||
- encryption_ng
|
||||
+ # encryption_ng
|
||||
# OpenSSL encrypted chat support
|
||||
- encryption_ng_simlite
|
||||
+ # encryption_ng_simlite
|
||||
|
||||
# docking
|
||||
# Tray icon support (common part of all docking modules)
|
||||
@@ -104,9 +104,9 @@ if (UNIX)
|
||||
|
||||
# mediaplayer
|
||||
# MPD mediaplayer support
|
||||
- mpd_mediaplayer
|
||||
+ # mpd_mediaplayer
|
||||
# MPRIS Media Players support
|
||||
- mprisplayer_mediaplayer
|
||||
+ # mprisplayer_mediaplayer
|
||||
)
|
||||
endif (UNIX)
|
||||
|
||||
|
|
@ -1,17 +1,15 @@
|
|||
{ stdenv, fetchurl, pidgin, intltool, libxml2 }:
|
||||
|
||||
let version = "1.10.0"; in
|
||||
let version = "1.12.0"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pidgin-sipe-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz";
|
||||
sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np";
|
||||
url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
|
||||
sha256 = "12ki6n360v2ja961fzw4mwpgb8jdp9k21y5mbiab151867c862r6";
|
||||
};
|
||||
|
||||
patches = [ ./fix-2.7.0.patch ];
|
||||
|
||||
meta = {
|
||||
description = "SIPE plugin for Pidgin IM.";
|
||||
homepage = http://sipe.sourceforge.net/;
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
From 8ad28171ac5c3fbd1917a2f52e75423c4d357b24 Mon Sep 17 00:00:00 2001
|
||||
From: David Brown <nix@davidb.org>
|
||||
Date: Thu, 3 Jun 2010 06:40:04 -0700
|
||||
Subject: [PATCH] Fix initializer for 2.7.0 release
|
||||
|
||||
The release of 2.7.0 of pidgin/purple gained two extra fields in a
|
||||
structure.
|
||||
---
|
||||
src/core/sipe.c | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/src/core/sipe.c b/src/core/sipe.c
|
||||
index 45a9015..19f4237 100644
|
||||
--- a/src/core/sipe.c
|
||||
+++ b/src/core/sipe.c
|
||||
@@ -10683,6 +10683,8 @@ PurplePluginProtocolInfo prpl_info =
|
||||
NULL, /* get_media_caps */
|
||||
#if PURPLE_VERSION_CHECK(2,7,0)
|
||||
NULL, /* get_moods */
|
||||
+ NULL, /* set_public_alias */
|
||||
+ NULL, /* get_public_alias */
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "torchat-${version}";
|
||||
version = "0.9.9.550";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://torchat.googlecode.com/files/torchat-source-${version}.zip";
|
||||
sha256 = "01z0vrmflcmb146m04b66zihkd22aqnxz2vr4x23z1q5mlwylmq2";
|
||||
};
|
||||
|
||||
buildInputs = [ python unzip wxPython wrapPython ];
|
||||
pythonPath = [ wxPython ];
|
||||
|
||||
preConfigure = "rm portable.txt";
|
||||
preUnpack = "sourceRoot=`pwd`/src";
|
||||
|
||||
installPhase = ''
|
||||
substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f"
|
||||
|
||||
wrapPythonPrograms
|
||||
|
||||
ensureDir $out/lib/torchat
|
||||
cp -rf * $out/lib/torchat
|
||||
makeWrapper ${python}/bin/python $out/bin/torchat \
|
||||
--set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \
|
||||
--run "cd $out/lib/torchat" \
|
||||
--add-flags "-O $out/lib/torchat/torchat.py"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://code.google.com/p/torchat/;
|
||||
description = "instant messaging application on top of the Tor network and it's location hidden services";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.phreedom ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +1,22 @@
|
|||
{ stdenv, fetchurl, unzip }:
|
||||
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chatzilla-0.9.86.1";
|
||||
name = "chatzilla-0.9.87";
|
||||
|
||||
src = fetchurl {
|
||||
# Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
|
||||
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86.1-xr.zip;
|
||||
sha256 = "06s4g0x7hsckd7wr904j8rzksvqhvcrhl9zwga2458rgafcbbghd";
|
||||
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.87-xr.zip;
|
||||
sha256 = "1qwbqngrxyip3k2b71adg271sifvrrxcixkyrsy4vmgl5bwdsl4d";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
ensureDir $out
|
||||
unzip $src -d $out
|
||||
mkdir -p $out/libexec/chatzilla
|
||||
unzip $src -d $out/libexec/chatzilla
|
||||
|
||||
makeWrapper ${xulrunner}/bin/xulrunner $out/bin/chatzilla \
|
||||
--add-flags $out/libexec/chatzilla/application.ini
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
{ stdenv, fetchurl, ncurses, which, perl, gpgme
|
||||
{ stdenv, fetchurl, ncurses, which, perl
|
||||
, sslSupport ? true
|
||||
, imapSupport ? true
|
||||
, headerCache ? true
|
||||
, saslSupport ? true
|
||||
, gpgmeSupport ? true
|
||||
, gdbm ? null
|
||||
, openssl ? null
|
||||
, cyrus_sasl ? null
|
||||
, gpgme ? null
|
||||
}:
|
||||
|
||||
assert headerCache -> gdbm != null;
|
||||
|
|
@ -21,17 +23,20 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
ncurses which perl gpgme
|
||||
ncurses which perl
|
||||
(if headerCache then gdbm else null)
|
||||
(if sslSupport then openssl else null)
|
||||
(if saslSupport then cyrus_sasl else null)
|
||||
(if gpgmeSupport then gpgme else null)
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-mailpath=" "--enable-smtp"
|
||||
|
||||
# This allows calls with "-d N", that output debug info into ~/.muttdebug*
|
||||
"--enable-debug" "--enable-pop" "--enable-imap" "--enable-gpgme"
|
||||
"--enable-debug"
|
||||
|
||||
"--enable-pop" "--enable-imap"
|
||||
|
||||
# The next allows building mutt without having anything setgid
|
||||
# set by the installer, and removing the need for the group 'mail'
|
||||
|
|
@ -41,6 +46,7 @@ stdenv.mkDerivation rec {
|
|||
(if sslSupport then "--with-ssl" else "--without-ssl")
|
||||
(if imapSupport then "--enable-imap" else "--disable-imap")
|
||||
(if saslSupport then "--with-sasl" else "--without-sasl")
|
||||
(if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,75 +1,50 @@
|
|||
{ fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "notmuch-0.8";
|
||||
name = "notmuch-0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://notmuchmail.org/releases/${name}.tar.gz";
|
||||
sha256 = "f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949";
|
||||
sha256 = "e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4";
|
||||
};
|
||||
|
||||
buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ];
|
||||
|
||||
# XXX: Make me a loop
|
||||
patchPhase = ''
|
||||
# substituteInPlace "test/atomicity" \
|
||||
# --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/aggregate-results.sh" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/author-order" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/basic" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/crypto" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/dump-restore" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/emacs" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/emacs-large-search-buffer" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/encoding" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/from-guessing" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/json" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/long-id" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/maildir-sync" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/new" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/notmuch-test" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/raw" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/reply" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/search" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/search-by-folder" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/search-insufficient-from-quoting" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/search-folder-coherence" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/search-output" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/search-position-overlap-bug" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/symbol-hiding" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/test-lib.sh" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/test-verbose" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/thread-naming" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/thread-order" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
substituteInPlace "test/uuencode" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
(cd test && for prg in \
|
||||
aggregate-results.sh \
|
||||
atomicity \
|
||||
author-order \
|
||||
basic \
|
||||
crypto \
|
||||
dump-restore \
|
||||
emacs \
|
||||
emacs-large-search-buffer \
|
||||
encoding \
|
||||
from-guessing \
|
||||
json \
|
||||
long-id \
|
||||
maildir-sync \
|
||||
new \
|
||||
notmuch-test \
|
||||
raw \
|
||||
reply \
|
||||
search \
|
||||
search-by-folder \
|
||||
search-insufficient-from-quoting \
|
||||
search-folder-coherence \
|
||||
search-output \
|
||||
search-position-overlap-bug \
|
||||
symbol-hiding \
|
||||
test-lib.sh \
|
||||
test-verbose \
|
||||
thread-naming \
|
||||
thread-order \
|
||||
uuencode \
|
||||
;do
|
||||
substituteInPlace "$prg" \
|
||||
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
|
||||
done)
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
|
|
@ -78,11 +53,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Notmuch -- The mail indexer";
|
||||
|
||||
longDescription = "";
|
||||
|
||||
license = "GPLv3";
|
||||
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.chaoflow ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi
|
||||
, libjpeg, libpng, zlib, cairo
|
||||
|
||||
, # If you want the resulting program to call itself "Thunderbird"
|
||||
# instead of "Mail", 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
|
||||
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "thunderbird-2.0.0.22";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.22/source/thunderbird-2.0.0.22-source.tar.bz2;
|
||||
sha1 = "a9da470ff090dfd049cae6b0c3b1a4e95c3f2022";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Ugh, inexplicable problem since GTK+ 2.10. Probably a Firefox
|
||||
# bug, but I don't know. See
|
||||
# http://lists.gobolinux.org/pipermail/gobolinux-users/2007-January/004344.html
|
||||
./xlibs.patch
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-application=mail"
|
||||
"--enable-optimize"
|
||||
"--disable-debug"
|
||||
"--enable-xft"
|
||||
"--disable-freetype2"
|
||||
"--enable-svg"
|
||||
"--enable-canvas"
|
||||
"--enable-strip"
|
||||
"--enable-default-toolkit=gtk2"
|
||||
"--with-system-jpeg"
|
||||
"--with-system-png"
|
||||
"--with-system-zlib"
|
||||
"--enable-system-cairo"
|
||||
"--enable-extensions=default"
|
||||
]
|
||||
++ (if enableOfficialBranding then ["--enable-official-branding"] else []);
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Thunderbird, a full-featured email client";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
|
||||
, dbus_glib, bzip2, alsaLib, nspr
|
||||
, libnotify, cairo, pixman, fontconfig
|
||||
|
||||
, # If you want the resulting program to call itself "Thunderbird"
|
||||
# instead of "Shredder", 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
|
||||
|
||||
}:
|
||||
|
||||
let version = "3.1.9"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "thunderbird-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
|
||||
sha1 = "22b153102939430180ae1873ce15ef52286ff08d";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
|
||||
libnotify cairo pixman fontconfig
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lpixman-1";
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=mail"
|
||||
"--enable-optimize"
|
||||
"--disable-debug"
|
||||
"--enable-strip"
|
||||
"--with-system-jpeg"
|
||||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
"--enable-system-cairo"
|
||||
"--disable-crashreporter"
|
||||
"--disable-necko-wifi"
|
||||
"--disable-tests"
|
||||
"--enable-static" # required by `make install'
|
||||
]
|
||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
||||
|
||||
# The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
|
||||
# prefix, and PREFIX in some places where they are not set. In
|
||||
# particular, there are some linker flags like
|
||||
# `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to
|
||||
# `-rpath-link=/bin', the build fails due to the purity checks in
|
||||
# the ld wrapper. So disable the purity check for now.
|
||||
preBuild = "NIX_ENFORCE_PURITY=0";
|
||||
|
||||
# This doesn't work:
|
||||
#makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
|
||||
|
||||
postInstall =
|
||||
''
|
||||
# Fix some references to /bin paths in the Xulrunner shell script.
|
||||
substituteInPlace $out/lib/thunderbird-*/thunderbird \
|
||||
--replace /bin/pwd "$(type -tP pwd)" \
|
||||
--replace /bin/ls "$(type -tP ls)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Thunderbird, a full-featured email client";
|
||||
homepage = http://www.mozilla.org/thunderbird/;
|
||||
};
|
||||
}
|
||||
|
|
@ -11,21 +11,21 @@
|
|||
|
||||
}:
|
||||
|
||||
let version = "5.0"; in
|
||||
let version = "7.0.1"; in
|
||||
|
||||
# from wikipedia: This Release no longer supports versions of Mac OS X
|
||||
# before Mac OS X 10.5 Leopard or Mac computers with PowerPC processors.
|
||||
stdenv.mkDerivation {
|
||||
name = "thunderbird-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
|
||||
sha1 = "392c3e0ef70b62c29a543f88b2b8d5a51bfe69a7";
|
||||
sha1 = "ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
|
||||
libnotify cairo pixman fontconfig yasm mesa nss
|
||||
libnotify cairo pixman fontconfig yasm mesa /* nss */
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
@ -69,6 +69,18 @@ stdenv.mkDerivation {
|
|||
substituteInPlace $out/lib/thunderbird-*/thunderbird \
|
||||
--replace /bin/pwd "$(type -tP pwd)" \
|
||||
--replace /bin/ls "$(type -tP ls)"
|
||||
|
||||
# Create a desktop item.
|
||||
mkdir -p $out/share/applications
|
||||
cat > $out/share/applications/thunderbird.desktop <<EOF
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Exec=$out/bin/thunderbird
|
||||
Icon=$out/lib/thunderbird-${version}/chrome/icons/default/default256.png
|
||||
Name=Thunderbird
|
||||
GenericName=Mail Reader
|
||||
Categories=Application;Network;
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
postInstall() {
|
||||
|
||||
# Strip some more stuff
|
||||
strip -S $out/lib/*/* || true
|
||||
|
||||
# Fix some references to /bin paths in the Thunderbird shell script.
|
||||
substituteInPlace $out/bin/thunderbird \
|
||||
--replace /bin/pwd "$(type -tP pwd)" \
|
||||
--replace /bin/ls "$(type -tP ls)"
|
||||
|
||||
# This fixes starting Thunderbird when there already is a running
|
||||
# instance. The `thunderbird' wrapper script actually expects to
|
||||
# be in the same directory as `run-mozilla.sh', apparently.
|
||||
libDir=$(cd $out/lib && ls -d thunderbird-*)
|
||||
test -n "$libDir"
|
||||
cd $out/bin
|
||||
mv thunderbird ../lib/$libDir/
|
||||
ln -s ../lib/$libDir/thunderbird .
|
||||
|
||||
# Register extensions etc.
|
||||
echo "running thunderbird -register..."
|
||||
(cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./thunderbird-bin -register) || false
|
||||
|
||||
echo "running regxpcom..."
|
||||
(cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false
|
||||
|
||||
# Put the Thunderbird icon in the right place.
|
||||
ensureDir $out/lib/$libDir/chrome/icons/default
|
||||
ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/
|
||||
}
|
||||
|
||||
genericBuild
|
||||
|
|
@ -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)
|
||||
|
||||
11
pkgs/applications/networking/netperf/default.nix
Normal file
11
pkgs/applications/networking/netperf/default.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "netperf-2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.netperf.org/netperf/${name}.tar.bz2";
|
||||
sha256 = "1l06bb99b4wfnmq247b8rvp4kn3w6bh1m46ri4d74z22li7br545";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,30 +1,25 @@
|
|||
{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
|
||||
, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
|
||||
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
|
||||
, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig
|
||||
, libxml2, ncurses, gettext, findutils
|
||||
, autoconf, automake
|
||||
, gtkSupport ? false, gtk ? null, libglade ? null
|
||||
, makeWrapper }:
|
||||
|
||||
assert gtkSupport -> (gtk != null) && (libglade != null);
|
||||
|
||||
let
|
||||
rev = "17000";
|
||||
version = "0.9-svn-${rev}";
|
||||
let version = "0.8.1b";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "gnunet-${version}";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://gnunet.org/svn/gnunet";
|
||||
sha256 = "17nkvykg3xb5m1y86i9lahgsic9jpj6h0nr73ywzpxpp7ql45cm4";
|
||||
inherit rev;
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
|
||||
sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libextractor libmicrohttpd libgcrypt gmp curl libtool
|
||||
zlib adns sqlite libxml2 ncurses
|
||||
zlib guile adns sqlite libxml2 ncurses
|
||||
pkgconfig gettext findutils
|
||||
autoconf automake
|
||||
makeWrapper
|
||||
] ++ (if gtkSupport then [ gtk libglade ] else []);
|
||||
|
||||
|
|
@ -47,8 +42,19 @@ in
|
|||
echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
|
||||
substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
|
||||
done
|
||||
'';
|
||||
|
||||
autoreconf -vfi
|
||||
doCheck = false;
|
||||
|
||||
# 1. Run tests have once GNUnet is installed.
|
||||
# 2. Help programs find the numerous modules that sit under
|
||||
# `$out/lib/GNUnet'.
|
||||
|
||||
# FIXME: `src/transports/test_udp' hangs forever.
|
||||
postInstall = ''
|
||||
#GNUNET_PREFIX="$out" make check
|
||||
wrapProgram "$out/bin/gnunetd" \
|
||||
--prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
@ -1,85 +1,72 @@
|
|||
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
|
||||
, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig
|
||||
, libxml2, ncurses, gettext, findutils
|
||||
, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
|
||||
, libxml2, ncurses, gettext
|
||||
, gtkSupport ? false, gtk ? null, libglade ? null
|
||||
, makeWrapper }:
|
||||
|
||||
assert gtkSupport -> (gtk != null) && (libglade != null);
|
||||
|
||||
let version = "0.8.1b";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "gnunet-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnunet-0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
|
||||
sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw";
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/${name}.tar.gz";
|
||||
sha256 = "1a0faq2j20dxhpdq0lpi8mjhddwmscbaa1bsxk460p5mj8n55i3p";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libextractor libmicrohttpd libgcrypt gmp curl libtool
|
||||
zlib guile adns sqlite libxml2 ncurses
|
||||
pkgconfig gettext findutils
|
||||
makeWrapper
|
||||
] ++ (if gtkSupport then [ gtk libglade ] else []);
|
||||
buildInputs = [
|
||||
libextractor libmicrohttpd libgcrypt gmp curl libtool
|
||||
zlib adns sqlite libxml2 ncurses
|
||||
pkgconfig gettext makeWrapper
|
||||
] ++ (if gtkSupport then [ gtk libglade ] else []);
|
||||
|
||||
preConfigure = ''
|
||||
# Brute force: since nix-worker chroots don't provide
|
||||
# /etc/{resolv.conf,hosts}, replace all references to `localhost'
|
||||
# by their IPv4 equivalent.
|
||||
for i in $(find . \( -name \*.c -or -name \*.conf \) \
|
||||
-exec grep -l localhost {} \;)
|
||||
do
|
||||
echo "$i: substituting \`127.0.0.1' to \`localhost'..."
|
||||
substituteInPlace "$i" --replace "localhost" "127.0.0.1"
|
||||
done
|
||||
preConfigure = ''
|
||||
# Brute force: since nix-worker chroots don't provide
|
||||
# /etc/{resolv.conf,hosts}, replace all references to `localhost'
|
||||
# by their IPv4 equivalent.
|
||||
for i in $(find . \( -name \*.c -or -name \*.conf \) \
|
||||
-exec grep -l '\<localhost\>' {} \;)
|
||||
do
|
||||
echo "$i: substituting \`127.0.0.1' to \`localhost'..."
|
||||
sed -i "$i" -e's/\<localhost\>/127.0.0.1/g'
|
||||
done
|
||||
|
||||
# Make sure the tests don't rely on `/tmp', for the sake of chroot
|
||||
# builds.
|
||||
for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
|
||||
-exec grep -l /tmp {} \;)
|
||||
do
|
||||
echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
|
||||
substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
|
||||
done
|
||||
# Make sure the tests don't rely on `/tmp', for the sake of chroot
|
||||
# builds.
|
||||
for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
|
||||
-exec grep -l /tmp {} \;)
|
||||
do
|
||||
echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
|
||||
substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
|
||||
done
|
||||
'';
|
||||
|
||||
# XXX: There are several test failures, forwarded to bug-gnunet@gnu.org.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
|
||||
|
||||
longDescription = ''
|
||||
GNUnet is a framework for secure peer-to-peer networking that
|
||||
does not use any centralized or otherwise trusted services. A
|
||||
first service implemented on top of the networking layer
|
||||
allows anonymous censorship-resistant file-sharing. Anonymity
|
||||
is provided by making messages originating from a peer
|
||||
indistinguishable from messages that the peer is routing. All
|
||||
peers act as routers and use link-encrypted connections with
|
||||
stable bandwidth utilization to communicate with each other.
|
||||
GNUnet uses a simple, excess-based economic model to allocate
|
||||
resources. Peers in GNUnet monitor each others behavior with
|
||||
respect to resource usage; peers that contribute to the
|
||||
network are rewarded with better service.
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
homepage = http://gnunet.org/;
|
||||
|
||||
# 1. Run tests have once GNUnet is installed.
|
||||
# 2. Help programs find the numerous modules that sit under
|
||||
# `$out/lib/GNUnet'.
|
||||
license = "GPLv2+";
|
||||
|
||||
# FIXME: `src/transports/test_udp' hangs forever.
|
||||
postInstall = ''
|
||||
#GNUNET_PREFIX="$out" make check
|
||||
wrapProgram "$out/bin/gnunetd" \
|
||||
--prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
|
||||
|
||||
longDescription = ''
|
||||
GNUnet is a framework for secure peer-to-peer networking that
|
||||
does not use any centralized or otherwise trusted services. A
|
||||
first service implemented on top of the networking layer
|
||||
allows anonymous censorship-resistant file-sharing. Anonymity
|
||||
is provided by making messages originating from a peer
|
||||
indistinguishable from messages that the peer is routing. All
|
||||
peers act as routers and use link-encrypted connections with
|
||||
stable bandwidth utilization to communicate with each other.
|
||||
GNUnet uses a simple, excess-based economic model to allocate
|
||||
resources. Peers in GNUnet monitor each others behavior with
|
||||
respect to resource usage; peers that contribute to the
|
||||
network are rewarded with better service.
|
||||
'';
|
||||
|
||||
homepage = http://gnunet.org/;
|
||||
|
||||
license = "GPLv2+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
}
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "mldonkey-3.0.7";
|
||||
name = "mldonkey-3.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
|
||||
sha256 = "1m5cfx79jiym93bx789lqc1bmwrkz1b1jilhga7d994jsjcw6c2n";
|
||||
sha256 = "02038nhh6lbb714ariy2xw1vgfycr1w750zplbgwk5pa3cm163zx";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,37 @@
|
|||
{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
|
||||
{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
|
||||
, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
|
||||
, heimdal, python, lynx, lua5
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.2";
|
||||
let
|
||||
version = "1.6.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "wireshark-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.wireshark.org/download/src/${name}.tar.bz2";
|
||||
sha256 = "1cj9n3yhahj6pabx1h1gas6b6dhwsljjz2w3ngky3a4g6bnf3ij4";
|
||||
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
|
||||
sha256 = "0zqy8ws05xz36y49azf5lrwzgfz26h7f8d27xjc89hlqrqagahsk";
|
||||
};
|
||||
|
||||
buildInputs = [perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
|
||||
glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
|
||||
];
|
||||
|
||||
configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
|
||||
|
||||
meta = {
|
||||
homepage = "http://sourceforge.net/projects/wireshark/";
|
||||
description = "a powerful network protocol analyzer";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
|
||||
longDescription = ''
|
||||
Wireshark (formerly known as "Etherreal") is a powerful network
|
||||
protocol analyzer developed by an international team of networking
|
||||
experts. It runs on UNIX, OS X and Windows.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
configureFlags = "--with-pcap=${libpcap}";
|
||||
buildInputs = [perl pkgconfig gtk libpcap flex bison];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
assert enableACLs -> acl != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rsync-3.0.7";
|
||||
|
||||
name = "rsync-3.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.7.tar.gz;
|
||||
sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y";
|
||||
url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
|
||||
sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optional enableACLs acl;
|
||||
|
|
@ -18,5 +18,8 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
homepage = http://samba.anu.edu.au/rsync/;
|
||||
description = "A fast incremental file transfer utility";
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,5 +16,6 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "ftp/sftp client with readline, autocompletion and bookmarks";
|
||||
homepage = http://yafc.sourceforge.net;
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
*/
|
||||
|
||||
let
|
||||
name = "gnucash-2.4.7";
|
||||
name = "gnucash-2.4.8";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
|
||||
sha256 = "eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e";
|
||||
sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,50 +1,22 @@
|
|||
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
|
||||
, libart_lgpl, qt, python, cups, fontconfig, libjpeg
|
||||
, zlib, libpng, xorg, cairo, cmake }:
|
||||
|
||||
assert stdenv.gcc.gcc != null;
|
||||
|
||||
# NOTE: ! If Scribus doesn't render text try another font.
|
||||
|
||||
# a lot of templates, colour palettes, colour profiles or gradients
|
||||
# will be released with the next version of scribus - So don't miss them
|
||||
# when upgrading this package
|
||||
|
||||
let useCairo = false; in
|
||||
|
||||
, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
|
||||
stdenv.mkDerivation {
|
||||
name = "scribus-1.3.3.14";
|
||||
name = "scribus-1.4.0rc6";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/scribus/scribus/1.3.3.14/scribus-1.3.3.14.tar.bz2;
|
||||
sha256 = "1ig7x6vxhqgjlpnv6hkzpb6gj4yvxsrx7rw900zlp7g6zxl01iyy";
|
||||
url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2;
|
||||
sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli";
|
||||
};
|
||||
|
||||
cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else "";
|
||||
|
||||
configurePhase = ''
|
||||
set -x
|
||||
mkdir -p build;
|
||||
cd build
|
||||
eval -- "cmake .. $cmakeFlags"
|
||||
set +x
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt
|
||||
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt
|
||||
python cups fontconfig
|
||||
xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
|
||||
libjpeg zlib libpng
|
||||
] ++ stdenv.lib.optional useCairo cairo;
|
||||
|
||||
# fix rpath which is removed by cmake..
|
||||
postFixup = ''
|
||||
for i in $buildNativeInputs ${stdenv.gcc.gcc}; do
|
||||
[ -d "$i/lib" ] && RPATH="$RPATH:$i/lib"
|
||||
[ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64"
|
||||
done
|
||||
patchelf --set-rpath "''\${RPATH:1}" $out/bin/scribus
|
||||
'';
|
||||
libjpeg zlib libpng podofo aspell cairo
|
||||
];
|
||||
|
||||
meta = {
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
|
|
@ -54,4 +26,3 @@ stdenv.mkDerivation {
|
|||
license = "GPLv2";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
|||
license = "GPLv2";
|
||||
|
||||
longDescription = ''
|
||||
Gravit is a gravity simulator which runs under Linux, Windows and
|
||||
Gravit is a gravity simulator which runs under Linux, Windows and
|
||||
Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body
|
||||
algorithm. Although the main goal of Gravit is to be as accurate
|
||||
as possible, it also creates beautiful looking gravity patterns.
|
||||
|
|
|
|||
|
|
@ -1,19 +1,18 @@
|
|||
{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
|
||||
|
||||
let
|
||||
name = "stellarium-0.11.0";
|
||||
name = "stellarium-0.11.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/stellarium/${name}.tar.gz";
|
||||
sha256 = "dbedf47dd0744fb325d67d63d1279101be7f4259af2a5e8027f1072012dd2587";
|
||||
sha256 = "1lrz52g2li92yjsrnxqqfmgjy2jmcqszwqpaq9rz9319nd1f2zpl";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
|
||||
|
||||
cmakeFlags = "-DINTL_INCLUDE_DIR= -DINTL_LIBRARIES=";
|
||||
preConfigure = ''
|
||||
sed -i -e '/typedef void (\*__GLXextFuncPtr)(void);/d' src/core/external/GLee.h
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkwave-3.3.20";
|
||||
name = "gtkwave-3.3.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
|
||||
sha256 = "0r2yh8a5rrxjzvykdmqlb098wws5c9k255saf2bsdchnigs8il3n";
|
||||
sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hol_light-20110813";
|
||||
name = "hol_light-20111106";
|
||||
src = fetchsvn {
|
||||
url = http://hol-light.googlecode.com/svn/trunk;
|
||||
rev = "102";
|
||||
sha256 = "5b972672db6aa1838dc5d130accd9ab6a62030c6b0c1dc4b69e42088b1ae86c9";
|
||||
rev = "112";
|
||||
sha256 = "6c7b39ea024b2e8042c1a22a01f778caedaaf82189c9f2c1cfa8c08707151129";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib camlp5 ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
|||
inherit name theories;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.cl.cam.ac.uk/research/hvg/${pname}/dist/${name}.tar.gz";
|
||||
url = http://isabelle.in.tum.de/website-Isabelle2011/dist/Isabelle2011.tar.gz;
|
||||
sha256 = "ea85eb2a859891be387f020b2e45f8c9a0bd1d8bbc3902f28a429e9c61cb0b6a";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, ocaml, camlp5, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }:
|
||||
{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }:
|
||||
|
||||
let
|
||||
ocaml_version = (builtins.parseDrvName ocaml.name).version;
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh";
|
||||
};
|
||||
|
||||
buildInputs = [ocaml camlp5 findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ];
|
||||
buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ];
|
||||
|
||||
postPatch = ''
|
||||
BASH=$(type -tp bash)
|
||||
|
|
|
|||
41
pkgs/applications/science/logic/picosat/default.nix
Normal file
41
pkgs/applications/science/logic/picosat/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "936";
|
||||
pname = "picosat";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://fmv.jku.at/picosat/${name}.tar.gz";
|
||||
sha256 = "02hq68fmfjs085216wsj13ff6i1rhc652yscl16w9jzpfqzly91n";
|
||||
};
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
# configureFlags = "--shared"; the ./configure file is broken and doesn't accept this parameter :(
|
||||
patchPhase = ''
|
||||
sed -e 's/^shared=no/shared=yes/' -i configure
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir "$out"/bin
|
||||
cp picomus "$out"/bin
|
||||
cp picosat "$out"/bin
|
||||
ensureDir "$out"/lib
|
||||
cp libpicosat.a "$out"/lib
|
||||
cp libpicosat.so "$out"/lib
|
||||
ensureDir "$out"/include/picosat
|
||||
cp picosat.h "$out"/include/picosat
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://fmv.jku.at/picosat/;
|
||||
description = "SAT solver with proof and core support";
|
||||
license = "MIT";
|
||||
maintainers = [ stdenv.lib.maintainers.roconnor ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
name = "maxima";
|
||||
version = "5.25.0";
|
||||
version = "5.25.1";
|
||||
|
||||
searchPath =
|
||||
stdenv.lib.makeSearchPath "bin"
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
|
||||
sha256 = "49c90fb809f5027787600050503476193db3620fd9517f620b82ad492ba30c0a";
|
||||
sha256 = "8e98ad742151e52edb56337bd62c8a9749f7b598cb6ed4e991980e0e6f89706a";
|
||||
};
|
||||
|
||||
buildInputs = [sbcl texinfo perl makeWrapper];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let
|
||||
name = "wxmaxima";
|
||||
version = "11.04.0";
|
||||
version = "11.08.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz";
|
||||
sha256 = "1dfwh5ka125wr6wxzyiwz16lk8kaf09rb6lldzryjwh8zi7yw8dm";
|
||||
sha256 = "dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df";
|
||||
};
|
||||
|
||||
buildInputs = [wxGTK maxima makeWrapper];
|
||||
|
|
|
|||
51
pkgs/applications/science/misc/boinc/default.nix
Normal file
51
pkgs/applications/science/misc/boinc/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl,
|
||||
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK,
|
||||
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "boinc-6.12.39";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39";
|
||||
rev = 24341;
|
||||
sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb";
|
||||
};
|
||||
|
||||
buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
|
||||
freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ];
|
||||
|
||||
postConfigure = ''
|
||||
sed -i -e s,/etc,$out/etc, client/scripts/Makefile
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
|
||||
preConfigure = ''
|
||||
./_autosetup
|
||||
configureFlags="$configureFlags --sysconfdir=$out/etc"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = "--disable-server --disable-fast-install";
|
||||
|
||||
postInstall = "
|
||||
# Remove a leading rpath to /tmp/... I don't know how it got there
|
||||
# I could not manage to get rid of that through autotools.
|
||||
for a in $out/bin/*; do
|
||||
RPATH=$(patchelf --print-rpath $a)
|
||||
NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://')
|
||||
patchelf --set-rpath $out/lib:$NEWRPATH $a
|
||||
done
|
||||
";
|
||||
|
||||
meta = {
|
||||
description = "Free software for distributed and grid computing";
|
||||
|
||||
homepage = http://boinc.berkeley.edu/;
|
||||
|
||||
license = "LGPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux; # arbitrary choice
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ rec {
|
|||
inherit buildInputs;
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["setVars" "doMake" "doDeploy"];
|
||||
phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
|
||||
setVars = a.noDepEntry ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)"
|
||||
pythonLib="$(echo "${python}"/lib/libpython*.so)"
|
||||
|
|
@ -26,14 +26,6 @@ rec {
|
|||
export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
|
||||
echo "Flags: $NIX_LDFLAGS"
|
||||
'';
|
||||
goSrcDir = ''cd */'';
|
||||
makeFlags = [
|
||||
"-f makefile-gtk"
|
||||
];
|
||||
doDeploy = a.fullDepEntry ''
|
||||
cat < ${./make-install.make} >> makefile-gtk
|
||||
make -f makefile-gtk out="$out" install
|
||||
'' ["minInit" "doMake" "defEnsureDir"];
|
||||
|
||||
meta = {
|
||||
description = "Cellular automata simulation program";
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
|
||||
install_file = echo "\#! /bin/sh" > "$(out)/bin/$(binfile)"; echo "$(out)/share/golly/$(binfile)" >> "$(out)/bin/$(binfile)"; chmod a+x "$(out)/bin/$(binfile)";
|
||||
|
||||
install:
|
||||
mkdir -p "$(out)/share/golly"
|
||||
mkdir -p "$(out)/bin"
|
||||
cp -r $(BINFILES) $(SHAREDFILES) "$(out)/share/golly"
|
||||
$(foreach binfile,$(BINFILES),$(install_file))
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
rec {
|
||||
version="2.1-src";
|
||||
name="golly-2.1-src";
|
||||
hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz";
|
||||
url="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";
|
||||
advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";
|
||||
version="2.3-src";
|
||||
name="golly-2.3-src";
|
||||
hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1";
|
||||
url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
|
||||
advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
downloadPage = "http://sourceforge.net/projects/golly/files/";
|
||||
method="fetchSF";
|
||||
downloadPage = "http://sourceforge.net/projects/golly/files/golly";
|
||||
method="fetchSFdirs";
|
||||
fileSuffix="-src.tar.gz";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,14 @@
|
|||
{stdenv, fetchurl, zlib, openssl, tcl}:
|
||||
|
||||
let
|
||||
version = "1.19";
|
||||
filedate = "20110901182519";
|
||||
in
|
||||
{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fossil-${version}";
|
||||
name = "fossil-1.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
|
||||
sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960";
|
||||
url = http://www.fossil-scm.org/download/fossil-src-20111213135356.tar.gz;
|
||||
sha256 = "07g78sf26v7zr4qzcwky4h4zzaaz8apy33d35bhc5ax63z6md1f9";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
buildInputs = [ zlib openssl readline sqlite ];
|
||||
buildNativeInputs = [ tcl ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
args: with args; with pkgs;
|
||||
let
|
||||
inherit (pkgs) stdenv fetchurl subversion;
|
||||
inherit (pkgs) stdenv fetchgit fetchurl subversion;
|
||||
in
|
||||
rec {
|
||||
|
||||
|
|
@ -48,8 +48,9 @@ rec {
|
|||
gitAnnex = lib.makeOverridable (import ./git-annex) {
|
||||
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
|
||||
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
|
||||
HTTP testpack monadControl hS3 mtl network hslogger hxt json;
|
||||
HTTP testpack hS3 mtl network hslogger hxt json;
|
||||
QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
|
||||
monadControl = haskellPackages.monadControl_OBSOLETE;
|
||||
};
|
||||
|
||||
qgit = import ./qgit {
|
||||
|
|
@ -92,8 +93,7 @@ rec {
|
|||
};
|
||||
|
||||
gitFastExport = import ./fast-export {
|
||||
inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper
|
||||
subversion;
|
||||
inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
|
||||
};
|
||||
|
||||
git2cl = import ./git2cl {
|
||||
|
|
@ -101,7 +101,8 @@ rec {
|
|||
};
|
||||
|
||||
svn2git = import ./svn2git {
|
||||
inherit stdenv fetchgit qt47 subversion apr;
|
||||
inherit stdenv fetchgit ruby makeWrapper;
|
||||
git = gitSVN;
|
||||
};
|
||||
|
||||
gitSubtree = import ./git-subtree {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
args: with args;
|
||||
{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fast-export";
|
||||
|
||||
# REGION AUTO UPDATE: { name="git_fast_export"; type = "git"; url="git://repo.or.cz/hg2git.git"; }
|
||||
src = sourceFromHead "git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"
|
||||
(fetchurl { url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"; sha256 = "c65b8607836794b250f5faeef5ec1bcbf40f0bfaeb39ccb600966deb6a40d755"; });
|
||||
# END
|
||||
src = fetchgit {
|
||||
url = "git://repo.or.cz/fast-export.git";
|
||||
rev = "refs/heads/master";
|
||||
};
|
||||
|
||||
buildInputs =([mercurial.python mercurial makeWrapper subversion]);
|
||||
buildInputs = [mercurial.python mercurial makeWrapper subversion];
|
||||
|
||||
buildPhase="true"; # skip svn for now
|
||||
|
||||
|
|
@ -24,7 +25,7 @@ stdenv.mkDerivation {
|
|||
mv *.py $l
|
||||
for p in $out/bin/*.sh; do
|
||||
wrapProgram $p \
|
||||
--set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" \
|
||||
--prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" \
|
||||
--prefix PATH : "$(dirname $(type -p python))":$l
|
||||
done
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "3.20110915";
|
||||
version = "3.20111203";
|
||||
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 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47";
|
||||
sha256 = "236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,15 +8,15 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.7.8";
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "git-1.7.6";
|
||||
stdenv.mkDerivation {
|
||||
name = "git-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
|
||||
sha256 = "778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082";
|
||||
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
||||
sha256 = "ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ];
|
||||
|
|
|
|||
|
|
@ -1,25 +1,30 @@
|
|||
{ stdenv, fetchgit, qt47, subversion, apr}:
|
||||
{ stdenv, fetchgit, ruby, makeWrapper, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "svn2git";
|
||||
name = "svn2git-2.1.0-20111206";
|
||||
|
||||
src = fetchgit {
|
||||
url = http://git.gitorious.org/svn2git/svn2git.git;
|
||||
rev = "197979b6a641b8b5fa4856c700b1235491c73a41";
|
||||
sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613";
|
||||
url = https://github.com/nirvdrum/svn2git;
|
||||
rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
|
||||
sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
sed -i 's|/bin/cat|cat|' ./src/repository.cpp
|
||||
qmake
|
||||
make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""'
|
||||
'';
|
||||
buildInputs = [ ruby makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp svn-all-fast-export $out/bin
|
||||
'';
|
||||
buildPhase = "true";
|
||||
|
||||
buildInputs = [subversion apr qt47];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out
|
||||
cp -r lib $out/
|
||||
|
||||
mkdir -p $out/bin
|
||||
substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
|
||||
cp bin/svn2git $out/bin/
|
||||
chmod +x $out/bin/svn2git
|
||||
|
||||
wrapProgram $out/bin/svn2git \
|
||||
--set RUBYLIB $out/lib \
|
||||
--prefix PATH : ${git}/bin
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,21 @@
|
|||
{ stdenv, fetchurl, python, makeWrapper, docutils
|
||||
, guiSupport ? false, tk ? null, ssl }:
|
||||
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
|
||||
, guiSupport ? false, tk ? null, ssl, curses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mercurial-1.9";
|
||||
let
|
||||
name = "mercurial-2.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
|
||||
sha256 = "1q1307rv5cyv7qalwkampy1h2f92j4d46v4x9647ljljs8f4n7ki";
|
||||
sha256 = "1565ns768vgvsqx6pn5q9r2670lmvq8y4zy0jwgwfx2h9n5bgymg";
|
||||
};
|
||||
|
||||
inherit python; # pass it so that the same version can be used in hg2git
|
||||
pythonPackages = [ ssl curses ];
|
||||
|
||||
buildInputs = [ python makeWrapper docutils ];
|
||||
buildInputs = [ python makeWrapper docutils unzip ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
|
|
@ -31,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
''
|
||||
for i in $(cd $out/bin && ls); do
|
||||
wrapProgram $out/bin/$i \
|
||||
--prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \
|
||||
--prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
|
||||
$WRAP_TK
|
||||
done
|
||||
|
||||
|
|
@ -41,6 +45,8 @@ stdenv.mkDerivation rec {
|
|||
chmod u+x $out/share/cgi-bin/hgweb.cgi
|
||||
'';
|
||||
|
||||
doCheck = false; # The test suite fails, unfortunately. Not sure why.
|
||||
|
||||
meta = {
|
||||
description = "A fast, lightweight SCM system for very large distributed projects";
|
||||
homepage = http://www.selenic.com/mercurial/;
|
||||
|
|
|
|||
|
|
@ -1,23 +1,28 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rcs-5.7";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rcs-5.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.cs.purdue.edu/pub/RCS/rcs-5.7.tar;
|
||||
md5 = "f7b3f106bf87ff6344df38490f6a02c5";
|
||||
url = "mirror://gnu/rcs/${name}.tar.gz";
|
||||
sha256 = "0q12nlghv4khxw5lk0y4949caghzg4jg0ripddi2h3q75vmfh6vh";
|
||||
};
|
||||
|
||||
patches = [ ./no-root.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
makeFlags="man1dir=$out/share/man/man1 man5dir=$out/share/man/man5";
|
||||
'';
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.cs.purdue.edu/homes/trinkle/RCS/;
|
||||
description = "Revision Control System, a version management system";
|
||||
maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
|
||||
homepage = http://www.gnu.org/software/rcs/;
|
||||
description = "GNU RCS, a revision control system";
|
||||
longDescription =
|
||||
'' The GNU Revision Control System (RCS) manages multiple revisions of
|
||||
files. RCS automates the storing, retrieval, logging,
|
||||
identification, and merging of revisions. RCS is useful for text
|
||||
that is revised frequently, including source code, programs,
|
||||
documentation, graphics, papers, and form letters.
|
||||
'';
|
||||
|
||||
license = "GPLv3+";
|
||||
maintainers = with stdenv.lib.maintainers; [ eelco simons ludo ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "1.6.17";
|
||||
version = "1.7.2";
|
||||
|
||||
name = "subversion-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
|
||||
sha1 = "6e3ed7c87d98fdf5f0a999050ab601dcec6155a1";
|
||||
url = "mirror://apache/subversion//${name}.tar.bz2";
|
||||
sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib apr aprutil sqlite ]
|
||||
|
|
@ -48,9 +48,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
ensureDir $out/share/emacs/site-lisp
|
||||
cp contrib/client-side/emacs/[dp]svn*.el $out/share/emacs/site-lisp/
|
||||
|
||||
if test -n "$pythonBindings"; then
|
||||
make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
|
||||
make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
rec {
|
||||
version="1.0.0.10517";
|
||||
name="veracity-1.0.0.10517";
|
||||
hash="08bka5zzn7i7c3dm3xp57n3szvm9msmi7mq1zynqb6i210qix79g";
|
||||
url="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-${version}.tar.gz";
|
||||
advertisedUrl="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz";
|
||||
version="1.1.0.10565";
|
||||
name="veracity-1.1.0.10565";
|
||||
hash="0sx12zzc60pdvzhf8ax2lisnw0rsrvnrk2500y1vfqhwxh2r04id";
|
||||
url="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-${version}.tar.gz";
|
||||
advertisedUrl="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz";
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, kdemultimedia, taglib, glibc, gettext }:
|
||||
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bangarang-2.0";
|
||||
|
||||
|
|
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano kdemultimedia taglib glibc gettext ];
|
||||
buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies kdemultimedia taglib glibc gettext ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A media player for KDE based on Nepomuk and Phonon";
|
||||
|
|
|
|||
23
pkgs/applications/video/dvb-apps/default.nix
Normal file
23
pkgs/applications/video/dvb-apps/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dvb-apps-7f68f9c8d311";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz";
|
||||
sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
configurePhase = "true"; # skip configure
|
||||
|
||||
installPhase = "make prefix=$out install";
|
||||
|
||||
meta = {
|
||||
description = "Linux DVB API applications and utilities";
|
||||
homepage = http://linuxtv.org/;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = "GPLv2";
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue