mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
Merging from trunk (conflict on glibc, I think I resolved it)
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
This commit is contained in:
Lluís Batlle i Rossell
commit
6d88da9a23
@ -17,13 +17,12 @@
|
||||
(cond-expand (guile-2 #t)
|
||||
(else (error "GNU Guile 2.0 is required")))
|
||||
|
||||
(use-modules (sxml simple)
|
||||
(use-modules (sxml ssax)
|
||||
(ice-9 popen)
|
||||
(ice-9 match)
|
||||
(ice-9 rdelim)
|
||||
(ice-9 regex)
|
||||
(ice-9 vlist)
|
||||
(sxml-match)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-9)
|
||||
(srfi srfi-11)
|
||||
@ -47,6 +46,13 @@
|
||||
(and line column path
|
||||
(make-location path (string->number line) (string->number column))))
|
||||
|
||||
;; XXX: Hack to add missing exports from `(sxml ssax)' as of 1.9.10.
|
||||
(let ((ssax (resolve-module '(sxml ssax))))
|
||||
(for-each (lambda (sym)
|
||||
(module-add! (current-module) sym
|
||||
(module-variable ssax sym)))
|
||||
'(ssax:warn ssax:skip-pi nl)))
|
||||
|
||||
;; Nix object types visible in the XML output of `nix-instantiate' and
|
||||
;; mapping to S-expressions (we map to sexps, not records, so that we
|
||||
;; can do pattern matching):
|
||||
@ -58,7 +64,7 @@
|
||||
;; bool #f|#t
|
||||
;; derivation (derivation drv-path out-path attributes)
|
||||
;; ellipsis '...
|
||||
;; expr (expr loc body ...)
|
||||
;; expr (snix loc body ...)
|
||||
;; function (function loc at|attrspat|varpat)
|
||||
;; int int
|
||||
;; list list
|
||||
@ -73,118 +79,100 @@
|
||||
;; lazily because the whole SXML tree has to be traversed to maintain the
|
||||
;; list of known derivations.
|
||||
|
||||
(define (sxml->snix tree)
|
||||
(define (xml-element->snix elem attributes body derivations)
|
||||
;; Return an SNix element corresponding to XML element ELEM.
|
||||
|
||||
(define (loc)
|
||||
(->loc (assq-ref attributes 'line)
|
||||
(assq-ref attributes 'column)
|
||||
(assq-ref attributes 'path)))
|
||||
|
||||
(case elem
|
||||
((at)
|
||||
(values `(at ,(car body) ,(cadr body)) derivations))
|
||||
((attr)
|
||||
(let ((name (assq-ref attributes 'name)))
|
||||
(cond ((null? body)
|
||||
(values `(attribute-pattern ,name) derivations))
|
||||
((and (pair? body) (null? (cdr body)))
|
||||
(values `(attribute ,(loc) ,name ,(car body))
|
||||
derivations))
|
||||
(else
|
||||
(error "invalid attribute body" name (loc) body)))))
|
||||
((attrs)
|
||||
(values `(attribute-set ,(reverse body)) derivations))
|
||||
((attrspat)
|
||||
(values `(attribute-set-pattern ,body) derivations))
|
||||
((bool)
|
||||
(values (string-ci=? "true" (assq-ref attributes 'value))
|
||||
derivations))
|
||||
((derivation)
|
||||
(let ((drv-path (assq-ref attributes 'drvPath))
|
||||
(out-path (assq-ref attributes 'outPath)))
|
||||
(if (equal? body '(repeated))
|
||||
(let ((body (vhash-assoc drv-path derivations)))
|
||||
(if (pair? body)
|
||||
(values `(derivation ,drv-path ,out-path ,(cdr body))
|
||||
derivations)
|
||||
(error "no previous occurrence of derivation"
|
||||
drv-path)))
|
||||
(values `(derivation ,drv-path ,out-path ,body)
|
||||
(vhash-cons drv-path body derivations)))))
|
||||
((ellipsis)
|
||||
(values '... derivations))
|
||||
((expr)
|
||||
(values `(snix ,(loc) ,@body) derivations))
|
||||
((function)
|
||||
(values `(function ,(loc) ,body) derivations))
|
||||
((int)
|
||||
(values (string->number (assq-ref attributes 'value))
|
||||
derivations))
|
||||
((list)
|
||||
(values body derivations))
|
||||
((null)
|
||||
(values 'null derivations))
|
||||
((path)
|
||||
(values (assq-ref attributes 'value) derivations))
|
||||
((repeated)
|
||||
(values 'repeated derivations))
|
||||
((string)
|
||||
(values (assq-ref attributes 'value) derivations))
|
||||
((unevaluated)
|
||||
(values 'unevaluated derivations))
|
||||
((varpat)
|
||||
(values `(varpat ,(assq-ref attributes 'name)) derivations))
|
||||
(else (error "unhandled Nix XML element" elem))))
|
||||
|
||||
(define xml->snix
|
||||
;; Return the SNix represention of TREE, an SXML tree as returned by
|
||||
;; parsing the XML output of `nix-instantiate' on Nixpkgs.
|
||||
(let ((parse
|
||||
(ssax:make-parser NEW-LEVEL-SEED
|
||||
(lambda (elem-gi attributes namespaces expected-content
|
||||
seed)
|
||||
(cons '() (cdr seed)))
|
||||
|
||||
;; FIXME: We should use SSAX to avoid the SXML step otherwise we end up
|
||||
;; eating memory up to the point where fork(2) returns ENOMEM!
|
||||
FINISH-ELEMENT
|
||||
(lambda (elem-gi attributes namespaces parent-seed
|
||||
seed)
|
||||
(let ((snix (car seed))
|
||||
(derivations (cdr seed)))
|
||||
(let-values (((snix derivations)
|
||||
(xml-element->snix elem-gi
|
||||
attributes
|
||||
snix
|
||||
derivations)))
|
||||
(cons (cons snix (car parent-seed))
|
||||
derivations))))
|
||||
|
||||
(define whitespace
|
||||
;; The whitespace marker.
|
||||
(cons 'white 'space))
|
||||
|
||||
(let loop ((node tree)
|
||||
(derivations vlist-null))
|
||||
(define (process-body body)
|
||||
(let ((result+derivations
|
||||
(fold (lambda (node result)
|
||||
(let-values (((out derivations)
|
||||
(loop node (cdr result))))
|
||||
(if (eq? out whitespace)
|
||||
result
|
||||
(cons (cons out (car result))
|
||||
derivations))))
|
||||
(cons '() derivations)
|
||||
body)))
|
||||
(values (reverse (car result+derivations))
|
||||
(cdr result+derivations))))
|
||||
|
||||
(sxml-match node
|
||||
(,x
|
||||
(guard (and (string? x) (string=? (string-trim-both x) "")))
|
||||
(values whitespace derivations))
|
||||
((*TOP* (*PI* ,_ ...) (expr ,body ...))
|
||||
;; The entry/exit point. Of the two values returned, the second one
|
||||
;; is likely to be discarded by the caller (thanks to multiple-value
|
||||
;; truncation).
|
||||
(let-values (((body derivations) (process-body body)))
|
||||
(values (cons* 'snix #f body)
|
||||
derivations)))
|
||||
((at ,body ...)
|
||||
(let-values (((body derivations) (process-body body)))
|
||||
(values (list 'at body) derivations)))
|
||||
((attr (@ (name ,name)
|
||||
(line (,line #f)) (column (,column #f)) (path (,path #f)))
|
||||
,body ...)
|
||||
(let-values (((body derivations) (process-body body)))
|
||||
(values (cons* 'attribute
|
||||
(->loc line column path)
|
||||
name
|
||||
(if (or (null? body)
|
||||
(and (pair? body) (null? (cdr body))))
|
||||
body
|
||||
(error 'sxml->snix "invalid attribute body"
|
||||
body)))
|
||||
derivations)))
|
||||
((attrs ,body ...)
|
||||
(let-values (((body derivations) (process-body body)))
|
||||
(values (list 'attribute-set body)
|
||||
derivations)))
|
||||
((attrspat ,body ...)
|
||||
(let-values (((body derivations) (process-body body)))
|
||||
(values (cons 'attribute-set-pattern body)
|
||||
derivations)))
|
||||
((bool (@ (value ,value)))
|
||||
(values (string-ci=? value "true") derivations))
|
||||
((derivation (@ (drvPath ,drv-path) (outPath ,out-path)) ,body ...)
|
||||
(let-values (((body derivations) (process-body body)))
|
||||
(let ((repeated? (equal? body '(repeated))))
|
||||
(values (list 'derivation drv-path out-path
|
||||
(if repeated?
|
||||
(let ((body (vhash-assoc drv-path derivations)))
|
||||
(if (pair? body)
|
||||
(cdr body)
|
||||
(error "no previous occurrence of derivation"
|
||||
drv-path)))
|
||||
body))
|
||||
(if repeated?
|
||||
derivations
|
||||
(vhash-cons drv-path body derivations))))))
|
||||
((ellipsis)
|
||||
(values '... derivations))
|
||||
((function (@ (line (,line #f)) (column (,column #f)) (path (,path #f)))
|
||||
,body ...)
|
||||
(let-values (((body derivations) (process-body body)))
|
||||
(values (cons* 'function
|
||||
(->loc line column path)
|
||||
(if (and (pair? body) (null? (cdr body)))
|
||||
body
|
||||
(error 'sxml->snix "invalid function body"
|
||||
body)))
|
||||
derivations)))
|
||||
((int (@ (value ,value)))
|
||||
(values (string->number value) derivations))
|
||||
(,x
|
||||
;; We can't use `(list ,body ...)', which has a different meaning,
|
||||
;; hence the guard hack.
|
||||
(guard (and (pair? x) (eq? (car x) 'list)))
|
||||
(process-body (cdr x)))
|
||||
((null)
|
||||
(values 'null derivations))
|
||||
((path (@ (value ,value)))
|
||||
(values value derivations))
|
||||
((repeated)
|
||||
;; This is then handled in `derivation' above.
|
||||
(values 'repeated derivations))
|
||||
((string (@ (value ,value)))
|
||||
(values value derivations))
|
||||
((unevaluated)
|
||||
(values 'unevaluated derivations))
|
||||
((varpat (@ (name ,name)))
|
||||
(values (list 'varpat name) derivations))
|
||||
(,x
|
||||
(error 'sxml->snix "unmatched sxml form" x)))))
|
||||
CHAR-DATA-HANDLER
|
||||
(lambda (string1 string2 seed)
|
||||
;; Discard inter-node strings, which are blanks.
|
||||
seed))))
|
||||
(lambda (port)
|
||||
;; Discard the second value returned by the parser (the derivation
|
||||
;; vhash).
|
||||
(caar (parse port (cons '() vlist-null))))))
|
||||
|
||||
(define (call-with-package snix proc)
|
||||
(match snix
|
||||
@ -319,6 +307,15 @@
|
||||
message
|
||||
(throw 'ftp-error port command code message))))
|
||||
|
||||
(define (%ftp-login user pass port)
|
||||
(let ((command (string-append "USER " user (string #\newline))))
|
||||
(display command port)
|
||||
(let-values (((code message) (%ftp-listen port)))
|
||||
(case code
|
||||
((230) #t)
|
||||
((331) (%ftp-command (string-append "PASS " pass) 230 port))
|
||||
(else (throw 'ftp-error port command code message))))))
|
||||
|
||||
(define (ftp-open host)
|
||||
(catch 'getaddrinfo-error
|
||||
(lambda ()
|
||||
@ -331,8 +328,7 @@
|
||||
(if (eqv? code 220)
|
||||
(begin
|
||||
;(%ftp-command "OPTS UTF8 ON" 200 s)
|
||||
;; FIXME: When `USER' returns 331, we should do a `PASS email'.
|
||||
(%ftp-command "USER anonymous" 230 s)
|
||||
(%ftp-login "anonymous" "ludo@example.com" s)
|
||||
(%make-ftp-connection s ai))
|
||||
(begin
|
||||
(format (current-error-port) "FTP to `~a' failed: ~A: ~A~%"
|
||||
@ -365,7 +361,7 @@
|
||||
(throw 'ftp-error conn "PASV" 227 message)))))
|
||||
|
||||
|
||||
(define (ftp-list conn)
|
||||
(define* (ftp-list conn #:optional directory)
|
||||
(define (address-with-port sa port)
|
||||
(let ((fam (sockaddr:fam sa))
|
||||
(addr (sockaddr:addr sa)))
|
||||
@ -377,6 +373,9 @@
|
||||
(sockaddr:scopeid sa)))
|
||||
(else #f))))
|
||||
|
||||
(if directory
|
||||
(ftp-chdir conn directory))
|
||||
|
||||
(let* ((port (ftp-pasv conn))
|
||||
(ai (ftp-connection-addrinfo conn))
|
||||
(s (socket (addrinfo:fam ai) (addrinfo:socktype ai)
|
||||
@ -452,7 +451,7 @@
|
||||
(match attr
|
||||
(('attribute _ "description" value)
|
||||
(string-prefix? "GNU" value))
|
||||
(('attribute "homepage" value)
|
||||
(('attribute _ "homepage" value)
|
||||
(string-contains value "www.gnu.org"))
|
||||
(_ #f)))
|
||||
metas))
|
||||
@ -478,11 +477,13 @@
|
||||
|
||||
(define (ftp-server/directory project)
|
||||
(define quirks
|
||||
'(("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
'(("commoncpp2" "ftp.gnu.org" "/gnu/commoncpp" #f)
|
||||
("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("gnupg" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("gnu-ghostscript" "ftp.gnu.org" "/ghostscript" #f)
|
||||
("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f)
|
||||
("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg")
|
||||
("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f)
|
||||
("TeXmacs" "ftp.texmacs.org" "/TeXmacs/targz" #f)))
|
||||
|
||||
@ -504,6 +505,7 @@
|
||||
("gnused" . "sed")
|
||||
("gnutar" . "tar")
|
||||
("gnunet" . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
|
||||
("mitscheme" . "mit-scheme")
|
||||
("texmacs" . "TeXmacs")))
|
||||
|
||||
(or (assoc-ref quirks project) project))
|
||||
@ -516,21 +518,20 @@
|
||||
(catch #t
|
||||
(lambda ()
|
||||
(let-values (((server directory) (ftp-server/directory project)))
|
||||
(let ((conn (ftp-open server)))
|
||||
(ftp-chdir conn directory)
|
||||
(let ((files (ftp-list conn)))
|
||||
(ftp-close conn)
|
||||
(map (lambda (tarball)
|
||||
(let ((end (string-contains tarball ".tar")))
|
||||
(substring tarball 0 end)))
|
||||
(let* ((conn (ftp-open server))
|
||||
(files (ftp-list conn directory)))
|
||||
(ftp-close conn)
|
||||
(map (lambda (tarball)
|
||||
(let ((end (string-contains tarball ".tar")))
|
||||
(substring tarball 0 end)))
|
||||
|
||||
;; Filter out signatures, deltas, and files which are potentially
|
||||
;; not releases of PROJECT (e.g., in /gnu/guile, filter out
|
||||
;; guile-oops and guile-www).
|
||||
(filter (lambda (file)
|
||||
(and (not (string-suffix? ".sig" file))
|
||||
(regexp-exec release-rx file)))
|
||||
files))))))
|
||||
;; Filter out signatures, deltas, and files which are potentially
|
||||
;; not releases of PROJECT (e.g., in /gnu/guile, filter out
|
||||
;; guile-oops and guile-www).
|
||||
(filter (lambda (file)
|
||||
(and (not (string-suffix? ".sig" file))
|
||||
(regexp-exec release-rx file)))
|
||||
files)))))
|
||||
(lambda (key subr message . args)
|
||||
(format (current-error-port)
|
||||
"failed to get release list for `~A': ~A ~A~%"
|
||||
@ -658,20 +659,19 @@
|
||||
(format #t "~%")
|
||||
(format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%")
|
||||
(format #t " from FILE.~%")
|
||||
(format #t " -s, --sxml=FILE Read SXML output of `nix-instantiate'~%")
|
||||
(format #t " from FILE.~%")
|
||||
(format #t " -d, --dry-run Don't actually update Nix expressions~%")
|
||||
(format #t " -h, --help Give this help list.~%~%")
|
||||
(format #t "Report bugs to <ludo@gnu.org>~%")
|
||||
(exit 0)))
|
||||
(option '(#\d "dry-run") #f #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'dry-run #t result)))
|
||||
|
||||
(option '(#\x "xml") #t #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'xml-file arg result)))
|
||||
(option '(#\s "sxml") #t #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'sxml-file arg result)))))
|
||||
(alist-cons 'xml-file arg result)))))
|
||||
|
||||
(define (main . args)
|
||||
(define-public (main . args)
|
||||
;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
|
||||
(let* ((opts (args-fold args %options
|
||||
(lambda (opt name arg result)
|
||||
@ -682,24 +682,11 @@
|
||||
(home (getenv "HOME"))
|
||||
(path (or (getenv "NIXPKGS")
|
||||
(string-append home "/src/nixpkgs")))
|
||||
(sxml (or (and=> (assoc-ref opts 'sxml-file)
|
||||
(lambda (input)
|
||||
(format (current-error-port)
|
||||
"reading SXML...~%")
|
||||
(read-disable 'positions) ;; reduce memory usage
|
||||
(with-input-from-file input read)))
|
||||
(begin
|
||||
(format (current-error-port) "parsing XML...~%")
|
||||
(xml->sxml
|
||||
(or (and=> (assoc-ref opts 'xml-file)
|
||||
open-input-file)
|
||||
(open-nixpkgs path))))))
|
||||
(snix (let ((s (begin
|
||||
(format (current-error-port)
|
||||
"producing SNix tree...~%")
|
||||
(sxml->snix sxml))))
|
||||
(set! sxml #f) (gc)
|
||||
s))
|
||||
(snix (begin
|
||||
(format (current-error-port) "parsing XML...~%")
|
||||
(xml->snix
|
||||
(or (and=> (assoc-ref opts 'xml-file) open-input-file)
|
||||
(open-nixpkgs path)))))
|
||||
(packages (match snix
|
||||
(('snix _ ('attribute-set attributes))
|
||||
attributes)
|
||||
@ -713,8 +700,13 @@
|
||||
old-version old-hash
|
||||
new-version new-hash
|
||||
location)
|
||||
(update-nix-expression (location-file location)
|
||||
old-version old-hash
|
||||
new-version new-hash))
|
||||
(if (assoc-ref opts 'dry-run)
|
||||
(format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%"
|
||||
name old-version new-version
|
||||
old-hash new-hash)
|
||||
(update-nix-expression (location-file location)
|
||||
old-version old-hash
|
||||
new-version new-hash)))
|
||||
(_ #f)))
|
||||
updates)))
|
||||
updates)
|
||||
#t))
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl}:
|
||||
{stdenv, fetchurl, nasm}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lame-3.98.2";
|
||||
@ -7,6 +7,10 @@ stdenv.mkDerivation {
|
||||
sha256 = "0cmgr515szd9kd19mpzvwl3cbnpfyjyi47swj4afblcfkmb2hym1";
|
||||
};
|
||||
|
||||
buildInputs = [ nasm ];
|
||||
|
||||
configureFlags = [ "--enable-nasm" ];
|
||||
|
||||
# Either disable static, or fix the rpath of 'lame' for it to point
|
||||
# properly to the libmp3lame shared object.
|
||||
dontDisableStatic = true;
|
||||
|
||||
@ -1,24 +1,104 @@
|
||||
{ stdenv, fetchurl, patchelf, makeDesktopItem, makeWrapper
|
||||
, freetype, fontconfig, libX11, libXext, libXrender, zlib
|
||||
, glib, gtk, libXtst, jre
|
||||
# defaulting to this version because not all installable plugins work with 3.5.2 yet
|
||||
# can also be set to "latest"
|
||||
, version ? "3.5.1"
|
||||
}:
|
||||
|
||||
/*
|
||||
Note: Eclipse stores various Eclipse instance specific data in ~/.eclipse/*-instance/...
|
||||
The '*' depends on the executable location of Eclipse.
|
||||
|
||||
So if an Eclipse dependency such as gtk changes a different Eclipse setup directory will be used and
|
||||
the plugins and update site list and more global settings seem to be gone.
|
||||
|
||||
Staring Eclipse from ~/.nix-profile/bin/eclipse doesn't help.
|
||||
|
||||
So I suggest copying the store path to ~/eclipse and run ~/eclipse/bin/eclipse instead.
|
||||
|
||||
However this still has some drawbacks: If you run nix-collect-garbage the gtk
|
||||
libs the wrapper refers to might be gone. It should be easy for you to
|
||||
replace the imortant lines in the wrapper.
|
||||
|
||||
You can also put this eclipse wrapper script (which was removed from
|
||||
all-packages.nix -r 18458)
|
||||
to your packageOverrides section and use that to run eclipse/eclipse.
|
||||
|
||||
Its parameterized by system because you may want to run both: i686 and x86_64 systems.
|
||||
|
||||
eclipseRunner =
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "nix-eclipse-runner-script-${stdenv.system}";
|
||||
|
||||
phases = "installPhase";
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
target=$out/bin/nix-run-eclipse-${stdenv.system}
|
||||
cat > $target << EOF
|
||||
#!/bin/sh
|
||||
export PATH=${pkgs.jre}/bin:\$PATH
|
||||
export LD_LIBRARY_PATH=${pkgs.gtkLibs216.glib}/lib:${pkgs.gtkLibs216.gtk}/lib:${pkgs.xlibs.libXtst}/lib
|
||||
# If you run out of XX space try these? -vmargs -Xms512m -Xmx2048m -XX:MaxPermSize=256m
|
||||
eclipse="\$1"; shift
|
||||
exec \$eclipse -vmargs -Xms512m -Xmx2048m -XX:MaxPermSize=256m "\$@"
|
||||
EOF
|
||||
chmod +x $target
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "provide environment to run Eclipse";
|
||||
longDescription = ''
|
||||
Is there one distribution providing support for up to date Eclipse installations?
|
||||
There are various reasons why not.
|
||||
Installing binaries just works. Get Eclipse binaries form eclipse.org/downloads
|
||||
install this wrapper then run Eclipse like this:
|
||||
nix-run-eclipse $PATH_TO_ECLIPSE/eclipse/eclipse
|
||||
and be happy. Everything works including update sites.
|
||||
'';
|
||||
maintainers = [pkgs.lib.maintainers.marcweber];
|
||||
platforms = pkgs.lib.platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
*/
|
||||
|
||||
|
||||
let
|
||||
|
||||
v = if version == "latest" then "3.5.2" else version;
|
||||
|
||||
in
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eclipse-3.5.2";
|
||||
name = "eclipse-${v}";
|
||||
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz;
|
||||
md5 = "54e2ce0660b2b1b0eb4267acf70ea66d";
|
||||
if v == "3.5.2" then
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz;
|
||||
md5 = "54e2ce0660b2b1b0eb4267acf70ea66d";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
|
||||
md5 = "bde55a2354dc224cf5f26e5320e72dac";
|
||||
}
|
||||
else if v == "3.5.1" then
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz;
|
||||
sha256 = "132zd7q9q29h978wnlsfbrlszc85r1wj30yqs2aqbv3l5xgny1kk";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz;
|
||||
sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
|
||||
md5 = "bde55a2354dc224cf5f26e5320e72dac";
|
||||
};
|
||||
else throw "no source for eclipse version ${v} known";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Eclipse";
|
||||
@ -55,5 +135,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://www.eclipse.org/;
|
||||
description = "A extensible multi-language software development environment";
|
||||
longDescription = ''
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.gnu.org/software/emacs/;
|
||||
license = "GPLv3+";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux; # GTK & co. are needed.
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,46 +1,29 @@
|
||||
{ xawSupport ? true
|
||||
, xpmSupport ? true
|
||||
, dbusSupport ? true
|
||||
, xaw3dSupport ? false
|
||||
, gtkGUI ? false
|
||||
, xftSupport ? false
|
||||
, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
|
||||
, pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null
|
||||
, libpng, libjpeg, libungif, libtiff, texinfo
|
||||
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
|
||||
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
|
||||
, libtiff, librsvg, texinfo, gconf
|
||||
}:
|
||||
|
||||
assert xawSupport -> libXaw != null;
|
||||
assert xpmSupport -> libXpm != null;
|
||||
assert dbusSupport -> dbus != null;
|
||||
assert xaw3dSupport -> Xaw3d != null;
|
||||
assert gtkGUI -> pkgconfig != null && gtk != null;
|
||||
assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
|
||||
assert stdenv.system == "i686-darwin" -> xawSupport; # fails to link otherwise
|
||||
assert (gtk != null) -> (pkgconfig != null);
|
||||
assert (libXft != null) -> libpng != null; # probably a bug
|
||||
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emacs-23.1";
|
||||
name = "emacs-23.2";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${name}.tar.bz2";
|
||||
sha256 = "076b4ixdp29l4c02bwic26d14gxlj0lcqyam33wyj3ksgi2z8d9b";
|
||||
sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ncurses x11 texinfo
|
||||
(if xawSupport then libXaw else null)
|
||||
(if xpmSupport then libXpm else null)
|
||||
(if dbusSupport then dbus else null)
|
||||
(if xaw3dSupport then Xaw3d else null)
|
||||
libpng libjpeg libungif libtiff # maybe not strictly required?
|
||||
]
|
||||
++ (if gtkGUI then [pkgconfig gtk] else [])
|
||||
++ (if xftSupport then [libXft] else []);
|
||||
ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif
|
||||
libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf
|
||||
];
|
||||
|
||||
configureFlags = "
|
||||
${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft" else ""}
|
||||
";
|
||||
configureFlags =
|
||||
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -67,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.gnu.org/software/emacs/;
|
||||
license = "GPLv3+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.linux; # GTK & co. are needed.
|
||||
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
23
pkgs/applications/editors/emacs-modes/jabber/default.nix
Normal file
23
pkgs/applications/editors/emacs-modes/jabber/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl, emacs }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emacs-jabber";
|
||||
version = "0.8.0";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
|
||||
sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26";
|
||||
};
|
||||
buildInputs = [ emacs ];
|
||||
meta = {
|
||||
description = "A Jabber client for Emacs";
|
||||
longDescription = ''
|
||||
jabber.el is a Jabber client for Emacs. It may seem strange to have a
|
||||
chat client in an editor, but consider that chatting is, after all, just
|
||||
a special case of text editing.
|
||||
'';
|
||||
homepage = http://emacs-jabber.sourceforge.net/;
|
||||
license = [ "GPLv2+" ];
|
||||
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -1,19 +1,17 @@
|
||||
{stdenv, fetchurl, emacs, texinfo, autoconf, automake}:
|
||||
{ stdenv, fetchurl, emacs, texinfo }:
|
||||
|
||||
let
|
||||
version = "0.7-109-g0fc3980";
|
||||
version = "0.8";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "magit-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cryp.to/magit-mainline-${version}.tar.gz";
|
||||
sha256 = "0jyx57znvn49xm0h92kh8iywn44ip130dpflzq2ns2k6gspg36b6";
|
||||
url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz";
|
||||
sha256 = "4d1b55dcb118e506c6b8838acd4a50dbdd5348b1d12edd9789a3109a582e2954";
|
||||
};
|
||||
unpackCmd = "tar xf $src";
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
buildInputs = [emacs texinfo autoconf automake];
|
||||
buildInputs = [emacs texinfo];
|
||||
|
||||
meta = {
|
||||
description = "An an interface to Git, implemented as an extension to Emacs.";
|
||||
@ -31,6 +29,8 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
license = "GPLv3+";
|
||||
homepage = "http://zagadka.vm.bytemark.co.uk/magit/";
|
||||
homepage = "http://github.com/philjackson/magit";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, ncurses, help2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zile-2.3.15";
|
||||
name = "zile-2.3.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/zile/${name}.tar.gz";
|
||||
sha256 = "09argmn5klh5w6nn9xq2msrv1pcc7c11glanlc7ip9kbkbgxlm3w";
|
||||
sha256 = "1lm24sw2ziqsib11sddz7gcqzw5iwfnsx65m1i461kxq218xl59h";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses help2man ];
|
||||
|
||||
@ -1,8 +1,25 @@
|
||||
args: with args;
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, bzip2
|
||||
, freetype
|
||||
, graphviz
|
||||
, ghostscript
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, libxml2
|
||||
, zlib
|
||||
, libtool
|
||||
, jasper
|
||||
, libX11
|
||||
, tetex ? null
|
||||
, librsvg ? null
|
||||
}:
|
||||
|
||||
let version = "6.5.9-1"; in
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
let
|
||||
version = "6.5.9-1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ImageMagick-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
@ -13,22 +30,20 @@ stdenv.mkDerivation (rec {
|
||||
configureFlags = ''
|
||||
--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
|
||||
--with-gslib
|
||||
${if args ? tetex then "--with-frozenpaths" else ""}
|
||||
${if tetex != null then "--with-frozenpaths" else ""}
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ bzip2 freetype ghostscript graphviz libjpeg libpng
|
||||
libtiff libX11 libxml2 zlib libtool
|
||||
]
|
||||
++ stdenv.lib.optional (args ? tetex) args.tetex
|
||||
++ stdenv.lib.optional (args ? librsvg) args.librsvg;
|
||||
[ bzip2 freetype graphviz ghostscript libjpeg libpng
|
||||
libtiff libxml2 zlib tetex librsvg libtool jasper libX11
|
||||
];
|
||||
|
||||
preConfigure = if args ? tetex then
|
||||
preConfigure = if tetex != null then
|
||||
''
|
||||
export DVIDecodeDelegate=${args.tetex}/bin/dvips
|
||||
export DVIDecodeDelegate=${tetex}/bin/dvips
|
||||
'' else "";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.imagemagick.org;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
33
pkgs/applications/misc/blender/2.49.nix
Normal file
33
pkgs/applications/misc/blender/2.49.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL
|
||||
, openexr, libsamplerate, libXi, libtiff, ilmbase, freetype}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "blender-2.49b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
||||
sha256 = "1214fp2asij7l1sci2swh46nfjgpm72gk2qafq70xc0hmas4sm93";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate
|
||||
libXi libtiff ilmbase freetype ];
|
||||
|
||||
cmakeFlags = [ "-DFREETYPE_INC=${freetype}/include" "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF"
|
||||
"-DPYTHON_LIBPATH=${python}/lib" ];
|
||||
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp bin/* $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "3D Creation/Animation/Publishing System";
|
||||
homepage = http://www.blender.org;
|
||||
# They comment two licenses: GPLv2 and Blender License, but they
|
||||
# say: "The BL has not been activated yet."
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
@ -1,50 +1,29 @@
|
||||
args: with args;
|
||||
stdenv.mkDerivation {
|
||||
name = "blender-2.48";
|
||||
{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL
|
||||
, openexr, libsamplerate, libXi, libtiff, ilmbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "blender-2.50a1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.blender.org/source/blender-2.48a.tar.gz;
|
||||
sha256 = "0ijfpy510ls8xq1i8fb6j6wd0vac1jvnzmpiga4g7x1j4fg4s7bq";
|
||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
||||
sha256 = "1cik05fmf9b8z3qpwsm6q9h1ia87w1piz87hxhfs24jw6l5pyiwr";
|
||||
};
|
||||
|
||||
phases="unpackPhase buildPhase";
|
||||
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate
|
||||
libXi libtiff ilmbase ];
|
||||
|
||||
inherit scons SDL freetype openal python openexr mesa;
|
||||
cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF"
|
||||
"-DPYTHON_LIBPATH=${python}/lib" ];
|
||||
|
||||
buildInputs = [python scons
|
||||
gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
|
||||
|
||||
# patch SConstruct so that we can pass on additional include. Either blender
|
||||
# or openEXR is broken. I think OpenEXR should use include "" isntead of <> to
|
||||
# include files beeing in the same directory
|
||||
buildPhase = "
|
||||
cat >> user-config.py << EOF
|
||||
WITH_BF_OPENAL = 'true'
|
||||
WITH_BF_GAMEENGINE='true'
|
||||
WITH_BF_BULLET = 'true'
|
||||
WITH_BF_INTERNATIONAL = 'true'
|
||||
WITH_BF_OPENEXR = 'true'
|
||||
EOF
|
||||
|
||||
sed -i -e \"s=##### END SETUP ##########=env['CPPFLAGS'].append(os.getenv('CPPFLAGS').split(':'))\\n##### END SETUP ##########=\" SConstruct\n"
|
||||
+ " CPPFLAGS=-I$openexr/include/OpenEXR"
|
||||
+ " scons PREFIX=\$out/nix-support"
|
||||
+ " BF_SDL=\$SDL"
|
||||
+ " BF_SDL_LIBPATH=\$SDL/lib"
|
||||
+ " BF_FREETYPE=\$freetype"
|
||||
+ " BF_OPENAL=\$openal"
|
||||
+ " BF_PYTHON=\$python"
|
||||
+ " BF_OPENEXR_INC=\$openexr/include"
|
||||
+ " BF_OPENEXR_LIBPATH=\$openexr/lib"
|
||||
+ " BF_INSTALLDIR=\$out/nix-support/dontLinkThatMuch \n"
|
||||
+ " ensureDir \$out/bin\n"
|
||||
+ " ln -s \$out/nix-support/dontLinkThatMuch/blender \$out/bin/blender"
|
||||
;
|
||||
patches = [ ./python-chmod.patch ];
|
||||
|
||||
meta = {
|
||||
description = "3D Creation/Animation/Publishing System";
|
||||
homepage = http://www.blender.org;
|
||||
license = "GPL-2 BL";
|
||||
};
|
||||
description = "3D Creation/Animation/Publishing System";
|
||||
homepage = http://www.blender.org;
|
||||
# They comment two licenses: GPLv2 and Blender License, but they
|
||||
# say: "We've decided to cancel the BL offering for an indefinite period."
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
|
||||
14
pkgs/applications/misc/blender/python-chmod.patch
Normal file
14
pkgs/applications/misc/blender/python-chmod.patch
Normal file
@ -0,0 +1,14 @@
|
||||
As the code copied from the nix store, the files there do not have the 'writeable' permission.
|
||||
Hence this fix, needed on nix but not on usual LSB linuces.
|
||||
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
|
||||
index 386ef1b..6a180fa 100644
|
||||
--- a/source/creator/CMakeLists.txt
|
||||
+++ b/source/creator/CMakeLists.txt
|
||||
@@ -152,6 +152,7 @@ IF(WITH_INSTALL)
|
||||
COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here
|
||||
COMMAND mkdir ${TARGETDIR}/.blender/python/lib/
|
||||
COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/
|
||||
+ COMMAND chmod -R +w ${TARGETDIR}/.blender/python/lib/
|
||||
|
||||
COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils
|
||||
COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, Xaw3d, ghostscriptX }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gv-3.6.8";
|
||||
name = "gv-3.6.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gv/${name}.tar.gz";
|
||||
sha256 = "1i86a4wfswp908gp4i0f6jbksn8bqqzkfy58r9ishspzkp2fb510";
|
||||
sha256 = "1b7n4xbgbgjvbq9kmacmk12vfwzc443bcs38p8k4yb60m7r7qzkb";
|
||||
};
|
||||
|
||||
buildInputs = [ Xaw3d ghostscriptX ];
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hello-2.5";
|
||||
name = "hello-2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/hello/${name}.tar.gz";
|
||||
sha256 = "0in467phypnis2ify1gkmvc5l2fxyz3s4xss7g74gwk279ylm4r2";
|
||||
sha256 = "1h6fjkkwr7kxv0rl5l61ya0b49imzfaspy7jk9jas1fil31sjykl";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "A program that produces a familiar, friendly greeting";
|
||||
longDescription = ''
|
||||
@ -16,5 +18,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = http://www.gnu.org/software/hello/manual/;
|
||||
license = "GPLv3+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,24 +1,26 @@
|
||||
{stdenv, fetchurl, perl, gettext, makeWrapper, lib,
|
||||
{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
|
||||
TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
|
||||
CGISession, CGIFormBuilder, DBFile, LocaleGettext
|
||||
CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
|
||||
, git ? null
|
||||
, monotone ? null
|
||||
, extraUtils ? []
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ikiwiki_3.20100312";
|
||||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20100515";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz";
|
||||
sha256 = "1pzjl4iplizzspsl237996j1ma6yp9jagbqf3d43kbhv1ai0v3ci";
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
|
||||
sha256 = "143f245196d98ab037a097402420208da14506d6a65793d042daef5dd765ddd7";
|
||||
};
|
||||
|
||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext ]
|
||||
++
|
||||
(lib.optional (monotone != null) monotone)
|
||||
;
|
||||
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
|
||||
RpcXML XMLSimple PerlMagick git monotone];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
|
||||
@ -39,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||
${lib.optionalString (monotone != null)
|
||||
''--prefix PATH : ${monotone}/bin \''}
|
||||
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
|
||||
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
39
pkgs/applications/misc/openjump/default.nix
Normal file
39
pkgs/applications/misc/openjump/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{stdenv, fetchurl, unzip}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "openjump-1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip;
|
||||
sha256 = "0y4z53yx0x7rp3c8rnj028ni3gr47r35apgcpqp3jl7r2di6zgqm";
|
||||
};
|
||||
|
||||
# ln jump.log hack: a different user will probably get a permission denied
|
||||
# error. Still this is better than getting it always.
|
||||
# TODO: build from source and patch this
|
||||
unpackPhase = ''
|
||||
ensureDir $out/bin;
|
||||
cd $out; unzip $src
|
||||
s=$out/bin/OpenJump
|
||||
dir=$(echo $out/openjump-*)
|
||||
cat >> $s << EOF
|
||||
#!/bin/sh
|
||||
cd $dir/bin
|
||||
exec /bin/sh openjump.sh
|
||||
EOF
|
||||
chmod +x $s
|
||||
ln -s /tmp/openjump.log $dir/bin/jump.log
|
||||
'';
|
||||
|
||||
installPhase = ":";
|
||||
|
||||
buildInputs = [unzip];
|
||||
|
||||
meta = {
|
||||
description = "open source Geographic Information System (GIS) written in the Java programming language";
|
||||
homepage = http://www.openjump.org/index.html;
|
||||
license = "GPLv2";
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,15 +1,11 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext }:
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sakura-2.3.6";
|
||||
name = "sakura-2.3.8";
|
||||
src = fetchurl {
|
||||
url = "http://www.pleyades.net/david/projects/sakura/${name}.tar.bz2";
|
||||
sha256 = "0g6v1filixy4zcz1fabjz0zpdicgzxkc8rh06jxfch5pk9dq4x5j";
|
||||
sha256 = "1gfjh1xxqgna0njh0pd4srnbmj67ir4b13slrdri6bm80shfbz8l";
|
||||
};
|
||||
# FIXME
|
||||
patchPhase = ''
|
||||
sed -i "s:INSTALL (FILES sakura.1:#INSTALL (FILES sakura.1:" CMakeLists.txt
|
||||
'';
|
||||
buildInputs = [ cmake pkgconfig gtk vte pixman gettext ];
|
||||
buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ];
|
||||
meta = {
|
||||
homepage = "http://www.pleyades.net/david/sakura.php";
|
||||
description = "A terminal emulator based on GTK and VTE";
|
||||
|
||||
@ -3,7 +3,7 @@ args.stdenv.mkDerivation {
|
||||
name = "thinkingrock-2.2.1-binary";
|
||||
|
||||
src = args.fetchurl {
|
||||
url = mirror://sourceforge/thinkingrock/files/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz;
|
||||
url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz;
|
||||
sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm";
|
||||
};
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ assert enablePDFtoPPM -> freetype != null;
|
||||
assert useT1Lib -> t1lib != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xpdf-3.02pl3";
|
||||
name = "xpdf-3.02pl4";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
|
||||
@ -32,6 +32,10 @@ stdenv.mkDerivation {
|
||||
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";
|
||||
})
|
||||
./xpdf-3.02-protection.patch
|
||||
];
|
||||
|
||||
|
||||
@ -24,23 +24,26 @@
|
||||
, libjpeg
|
||||
, bzip2
|
||||
, libpng
|
||||
, dbus
|
||||
, dbus_glib
|
||||
, patchelf
|
||||
}:
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chrome-${version}";
|
||||
version = "35449";
|
||||
version = "47504";
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
|
||||
sha256 = "0fdm1hs67vcr68r290ami3zlyypcvd88rm059622qyadqz49yvcj";
|
||||
sha256 = "06cwfr02acv9b0sbc14irqx099p4mgyjl9w58g1vja6r7jbb234c";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
|
||||
sha256 = "1indm0s87yz9zsg4archsywvp4yd0ff83azkjbwszj0snggk16pg";
|
||||
sha256 = "1g9m2d5x415gybjd6kvnhbj2sbfcaszv3dzvdwncsrcviic6w634";
|
||||
}
|
||||
else null;
|
||||
|
||||
@ -50,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
libPath =
|
||||
stdenv.lib.makeLibraryPath
|
||||
[ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver] ;
|
||||
[ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib] ;
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
@ -59,8 +62,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cp -R * $out/chrome
|
||||
ln -s $out/chrome/chrome $out/bin/chrome
|
||||
${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome
|
||||
|
||||
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome
|
||||
|
||||
ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
|
||||
ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
|
||||
|
||||
27
pkgs/applications/networking/browsers/conkeror/default.nix
Normal file
27
pkgs/applications/networking/browsers/conkeror/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
stdenv.mkDerivation {
|
||||
name = "conkeror-0.9.2";
|
||||
src = fetchurl {
|
||||
url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.zip;
|
||||
sha256 = "1bkrrskrmhpx2xp90zgi5jrz4akynkxv2nzk5hzg0a17ikdi5ql8";
|
||||
};
|
||||
buildInputs = [ unzip ];
|
||||
installPhase = ''
|
||||
cp -r . $out
|
||||
'';
|
||||
meta = {
|
||||
description = "A keyboard-oriented, customizable, extensible web browser";
|
||||
longDescription = ''
|
||||
Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
|
||||
web browser based on Mozilla XULRunner, written mainly in JavaScript,
|
||||
and inspired by exceptional software such as Emacs and vi. Conkeror
|
||||
features a sophisticated keyboard system, allowing users to run commands
|
||||
and interact with content in powerful and novel ways. It is
|
||||
self-documenting, featuring a powerful interactive help system.
|
||||
'';
|
||||
homepage = http://conkeror.org/;
|
||||
license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ];
|
||||
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,8 @@
|
||||
{stdenv, browser, browserName ? "firefox", nameSuffix ? "", makeDesktopItem, makeWrapper, plugins}:
|
||||
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins
|
||||
, browserName ? "firefox"
|
||||
, desktopName ? "Firefox"
|
||||
, nameSuffix ? ""
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = browser.name + "-with-plugins";
|
||||
@ -8,7 +12,7 @@ stdenv.mkDerivation {
|
||||
exec = browserName;
|
||||
icon = "${browser}/lib/${browser.name}/icons/mozicon128.png";
|
||||
comment = "";
|
||||
desktopName = browserName;
|
||||
desktopName = desktopName;
|
||||
genericName = "Web Browser";
|
||||
categories = "Application;Network;";
|
||||
};
|
||||
|
||||
@ -77,10 +77,7 @@ stdenv.mkDerivation {
|
||||
libXext libXrender libXt gtk glib pango atk
|
||||
];
|
||||
|
||||
buildPhase = stdenv.lib.optionalString debug
|
||||
''
|
||||
tar xfz plugin/debugger/libflashplayer.so.tar.gz
|
||||
'';
|
||||
buildPhase = ":";
|
||||
|
||||
meta = {
|
||||
description = "Adobe Flash Player browser plugin";
|
||||
|
||||
16
pkgs/applications/networking/browsers/rekonq/default.nix
Normal file
16
pkgs/applications/networking/browsers/rekonq/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl
|
||||
, v ? "0.4.0" }:
|
||||
|
||||
stdenv.mkDerivation (
|
||||
builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; })
|
||||
// {
|
||||
buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.urkud ];
|
||||
description = "KDE Webkit browser";
|
||||
homepage = http://rekonq.sourceforge.net;
|
||||
};
|
||||
}
|
||||
)
|
||||
27
pkgs/applications/networking/browsers/rekonq/source.nix
Normal file
27
pkgs/applications/networking/browsers/rekonq/source.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ fetchurl, fetchgit }:
|
||||
|
||||
builtins.listToAttrs
|
||||
[
|
||||
{
|
||||
name = "0.4.0";
|
||||
value = rec {
|
||||
name = "rekonq-0.4.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
|
||||
sha256 = "1dxpzkifqy85kwj94mhazan6f9glxvl7i02c50n3f0a12wiywwvy";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "scm";
|
||||
value = {
|
||||
name = "rekonq-0.4.0-20100514";
|
||||
src = fetchgit {
|
||||
url = git://gitorious.org/rekonq/mainline.git;
|
||||
rev = "6b4f4d69a3c599bc958ccddc5f7ac1c8648a7042";
|
||||
sha256 = "1qcwf7rsrnsbnq62cl44r48bmavc2nysi2wqhy1jxmj2ndwvsxy1";
|
||||
};
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -0,0 +1,22 @@
|
||||
args: with args;
|
||||
|
||||
let
|
||||
version = "1.10.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";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "SIPE plugin for Pidgin IM.";
|
||||
homepage = http://sipe.sourceforge.net/;
|
||||
license = "GPLv2";
|
||||
};
|
||||
|
||||
postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
|
||||
|
||||
buildInputs = [pidgin intltool libxml2];
|
||||
}
|
||||
@ -21,10 +21,10 @@
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pidgin-2.6.6";
|
||||
name = "pidgin-2.7.0";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/pidgin/pidgin-2.6.6.tar.bz2;
|
||||
sha256 = "1n9aggkzvqk9w8pfy90h1l98yrzb9xf8ak2f4jxzwv94779ykfvf";
|
||||
url = mirror://sourceforge/pidgin/pidgin-2.7.0.tar.bz2;
|
||||
sha256 = "0gbq6n36h9a53rp1x41fakrbncxc27y84pn3a0lcz3nvfnpcnnfw";
|
||||
};
|
||||
|
||||
inherit nss ncurses;
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{stdenv, fetchurl, pkgconfig, ncurses, glib, openssl}:
|
||||
{stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "irssi-0.8.14";
|
||||
name = "irssi-0.8.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://irssi.org/files/${name}.tar.bz2";
|
||||
sha256 = "0a6zizpqb4yyk7c9sxvqcj8jx20qrnfr2kwqbsckryz63kmp1sk3";
|
||||
sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1";
|
||||
};
|
||||
|
||||
buildInputs = [pkgconfig ncurses glib openssl];
|
||||
buildInputs = [pkgconfig ncurses glib openssl perl];
|
||||
|
||||
NIX_LDFLAGS = "-lncurses";
|
||||
|
||||
configureFlags = "--with-proxy --with-ncurses --enable-ssl";
|
||||
configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes";
|
||||
|
||||
meta = {
|
||||
homepage = http://irssi.org;
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
tar zxvf $src
|
||||
cd putty-*/unix/
|
||||
|
||||
ensureDir $out/bin
|
||||
ensureDir $out/share/man/man1
|
||||
|
||||
./configure --prefix=$out --with-gtk-prefix=$gtk
|
||||
make
|
||||
make install
|
||||
|
||||
@ -1,22 +1,28 @@
|
||||
{ stdenv, fetchurl, ncurses
|
||||
, gtk
|
||||
}:
|
||||
{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut }:
|
||||
|
||||
let
|
||||
rev = 8934;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "putty-0.60";
|
||||
builder = ./builder.sh;
|
||||
name = "putty-${toString rev}";
|
||||
# builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://the.earth.li/~sgtatham/putty/latest/putty-0.60.tar.gz;
|
||||
sha256 = "b2bbaaf9324997e85cf15d44ed41e8e89539c8215dceac9d6d7272a37dbc2849";
|
||||
preConfigure = ''
|
||||
perl mkfiles.pl
|
||||
( cd doc ; make );
|
||||
cd unix
|
||||
sed '/AM_PATH_GTK(/d' -i configure.ac
|
||||
cp ${automake}/share/automake-*/install-sh .
|
||||
autoreconf -vf
|
||||
'';
|
||||
|
||||
# The hash is going to change on new snapshot.
|
||||
# I don't know of any better URL
|
||||
src = fetchsvn {
|
||||
url = svn://svn.tartarus.org/sgt/putty;
|
||||
rev = rev;
|
||||
sha256 = "1yg5jhk7jp4yrnhpi0lvz71qqaf5gfpcwy8p198qqs8xgd1w51jc";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gtk ncurses
|
||||
];
|
||||
|
||||
#propagatedBuildInputs = [
|
||||
#];
|
||||
|
||||
inherit gtk;
|
||||
buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut ];
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
|
||||
postInstall = ''
|
||||
for i in $(cd $out/bin && ls); do
|
||||
wrapProgram $out/bin/$i \
|
||||
--run "${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\""
|
||||
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
41
pkgs/applications/office/ledger/const.patch
Normal file
41
pkgs/applications/office/ledger/const.patch
Normal file
@ -0,0 +1,41 @@
|
||||
diff --git a/gnucash.cc b/gnucash.cc
|
||||
index 7d31526..c4edd77 100644
|
||||
--- a/gnucash.cc
|
||||
+++ b/gnucash.cc
|
||||
@@ -201,7 +201,7 @@ static amount_t convert_number(const std::string& number,
|
||||
{
|
||||
const char * num = number.c_str();
|
||||
|
||||
- if (char * p = std::strchr(num, '/')) {
|
||||
+ if (const char * p = std::strchr(num, '/')) {
|
||||
std::string numer_str(num, p - num);
|
||||
std::string denom_str(p + 1);
|
||||
|
||||
diff --git a/option.cc b/option.cc
|
||||
index 10c23a7..8f2fead 100644
|
||||
--- a/option.cc
|
||||
+++ b/option.cc
|
||||
@@ -892,7 +892,7 @@ OPT_BEGIN(market, "V") {
|
||||
namespace {
|
||||
void parse_price_setting(const char * optarg)
|
||||
{
|
||||
- char * equals = std::strchr(optarg, '=');
|
||||
+ const char * equals = std::strchr(optarg, '=');
|
||||
if (! equals)
|
||||
return;
|
||||
|
||||
diff --git a/textual.cc b/textual.cc
|
||||
index 2033106..d897368 100644
|
||||
--- a/textual.cc
|
||||
+++ b/textual.cc
|
||||
@@ -298,8 +298,8 @@ transaction_t * parse_transaction(char * line, account_t * account,
|
||||
DEBUG_PRINT("ledger.textual.parse", "line " << linenum << ": " <<
|
||||
"Parsed a note '" << xact->note << "'");
|
||||
|
||||
- if (char * b = std::strchr(xact->note.c_str(), '['))
|
||||
- if (char * e = std::strchr(xact->note.c_str(), ']')) {
|
||||
+ if (const char * b = std::strchr(xact->note.c_str(), '['))
|
||||
+ if (const char * e = std::strchr(xact->note.c_str(), ']')) {
|
||||
char buf[256];
|
||||
std::strncpy(buf, b + 1, e - b - 1);
|
||||
buf[e - b - 1] = '\0';
|
||||
@ -20,6 +20,8 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ emacs gmp pcre ];
|
||||
|
||||
patches = [ ./const.patch ];
|
||||
|
||||
# Something goes wrong with pathelf...
|
||||
# this is a small workaround: adds a small shell script for
|
||||
# setting LD_LIBRARY_PATH
|
||||
|
||||
@ -6,27 +6,30 @@
|
||||
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
|
||||
}:
|
||||
|
||||
let version = "3.1.1"; in
|
||||
let version = "3.2.0"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openoffice.org-${version}";
|
||||
builder = ./builder.sh;
|
||||
|
||||
#downloadRoot = "http://download.services.openoffice.org/files/stable";
|
||||
downloadRoot = "http://www-openoffice.com/source/";
|
||||
versionDirs = false;
|
||||
downloadRoot = "http://download.services.openoffice.org/files/stable";
|
||||
versionDirs = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2";
|
||||
sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca";
|
||||
sha256 = "0jl14rxmvhz86jlhhwqlbr9nfi9p271aknqxada9775qfm6bjjml";
|
||||
};
|
||||
|
||||
patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ];
|
||||
patches = [ ./oo.patch ./root-required.patch ];
|
||||
|
||||
src_system = fetchurl {
|
||||
url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2";
|
||||
sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a";
|
||||
sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
PATH=$PATH:${icu}/sbin
|
||||
'';
|
||||
|
||||
configureFlags = "
|
||||
--with-package-format=native
|
||||
--disable-epm
|
||||
@ -41,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
--with-system-libs
|
||||
--with-system-python
|
||||
--with-system-boost
|
||||
--with-system-db
|
||||
--with-jdk-home=${jdk}
|
||||
--with-ant-home=${ant}
|
||||
--without-afms
|
||||
@ -56,7 +60,6 @@ stdenv.mkDerivation rec {
|
||||
--without-system-xerces
|
||||
--without-system-xml-apis
|
||||
--without-system-xt
|
||||
--without-system-db
|
||||
--without-system-jars
|
||||
--without-system-hunspell
|
||||
--without-system-altlinuxhyph
|
||||
@ -64,6 +67,11 @@ stdenv.mkDerivation rec {
|
||||
--without-system-graphite
|
||||
";
|
||||
|
||||
# Double make - I don't know why a single make reports error, and two, do not.
|
||||
buildPhase = ''
|
||||
make || make
|
||||
'';
|
||||
|
||||
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
|
||||
index 602b9b1..6be8427 100644
|
||||
index 74c64bf..fbf8d21 100644
|
||||
--- a/libtextcat/makefile.mk
|
||||
+++ b/libtextcat/makefile.mk
|
||||
@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \
|
||||
@ -8,46 +8,46 @@ index 602b9b1..6be8427 100644
|
||||
#relative to CONFIGURE_DIR
|
||||
-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
|
||||
+CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR)
|
||||
CONFIGURE_FLAGS=
|
||||
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
|
||||
|
||||
BUILD_ACTION=make
|
||||
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
|
||||
index 0e64d50..547d66b 100644
|
||||
index 0d92de9..aae3b4f 100644
|
||||
--- a/redland/raptor/makefile.mk
|
||||
+++ b/redland/raptor/makefile.mk
|
||||
@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB)
|
||||
|
||||
@@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
|
||||
CONFIGURE_DIR=
|
||||
CONFIGURE_ACTION=.$/configure
|
||||
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
|
||||
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
|
||||
# do not enable grddl parser (#i93768#)
|
||||
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
|
||||
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
|
||||
BUILD_ACTION=$(GNUMAKE)
|
||||
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
|
||||
index 850ee9c..3293a79 100644
|
||||
index fba6460..fc70419 100644
|
||||
--- a/redland/rasqal/makefile.mk
|
||||
+++ b/redland/rasqal/makefile.mk
|
||||
@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB)
|
||||
@@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
|
||||
|
||||
CONFIGURE_DIR=
|
||||
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
|
||||
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
|
||||
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
|
||||
BUILD_ACTION=$(GNUMAKE)
|
||||
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
|
||||
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
|
||||
index 5719272..75c31b7 100644
|
||||
index 710d7d6..dd60f0d 100644
|
||||
--- a/redland/redland/makefile.mk
|
||||
+++ b/redland/redland/makefile.mk
|
||||
@@ -108,7 +108,7 @@ XSLTLIB:=$(XSLTLIB)
|
||||
@@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
|
||||
|
||||
CONFIGURE_DIR=
|
||||
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
|
||||
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
|
||||
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
|
||||
BUILD_ACTION=$(GNUMAKE)
|
||||
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
|
||||
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
|
||||
|
||||
53
pkgs/applications/science/logic/coq/beta.nix
Normal file
53
pkgs/applications/science/logic/coq/beta.nix
Normal file
@ -0,0 +1,53 @@
|
||||
# TODO:
|
||||
# - coqide compilation should be optional or (better) separate;
|
||||
# - coqide libraries are not installed;
|
||||
|
||||
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "coq-8.3-beta0-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://coq.inria.fr/distrib/V8.3-beta0/files/coq-8.3-beta0-1.tar.gz;
|
||||
sha256 = "01m1x0gpzfsiybyqanm82ls8q63q0g2d9vvfs99zf4z1nny7vlf1";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml camlp5 ncurses lablgtk ];
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
preConfigure = ''
|
||||
ARCH=`uname -s`
|
||||
CAMLDIR=`type -p ocamlc`
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
"-arch $ARCH " +
|
||||
"-camldir $CAMLDIR " +
|
||||
"-camldir ${ocaml}/bin " +
|
||||
"-camlp5dir ${camlp5}/lib/ocaml/camlp5 " +
|
||||
"-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " +
|
||||
"-opt -coqide opt";
|
||||
|
||||
buildFlags = "world"; # Debug with "world VERBOSE=1";
|
||||
|
||||
patches = [ ./coq-8.3-beta0-1.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/coqmktop.ml --replace \
|
||||
"\"-I\"; \"+lablgtk2\"" \
|
||||
"\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\""
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Coq proof assistant";
|
||||
longDescription = ''
|
||||
Coq is a formal proof management system. It provides a formal language
|
||||
to write mathematical definitions, executable algorithms and theorems
|
||||
together with an environment for semi-interactive development of
|
||||
machine-checked proofs.
|
||||
'';
|
||||
homepage = "http://coq.inria.fr";
|
||||
license = "LGPL";
|
||||
};
|
||||
}
|
||||
20
pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch
Normal file
20
pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch
Normal file
@ -0,0 +1,20 @@
|
||||
diff -Nurp coq-8.3-beta0-1/configure coq-8.3-beta0-1-nix/configure
|
||||
--- coq-8.3-beta0-1/configure 2010-02-16 12:37:58.000000000 +0100
|
||||
+++ coq-8.3-beta0-1-nix/configure 2010-05-11 17:47:44.000000000 +0200
|
||||
@@ -394,7 +394,6 @@ case $camldir_spec in
|
||||
ocamlyaccexec=$CAMLBIN/ocamlyacc
|
||||
ocamlmktopexec=$CAMLBIN/ocamlmktop
|
||||
ocamlmklibexec=$CAMLBIN/ocamlmklib
|
||||
- camlp4oexec=$CAMLBIN/camlp4o
|
||||
esac
|
||||
|
||||
if test ! -f "$CAMLC" ; then
|
||||
@@ -626,7 +625,7 @@ case $COQIDE in
|
||||
no) LABLGTKLIB=+lablgtk2 # Pour le message
|
||||
LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
|
||||
yes) LABLGTKLIB="$lablgtkdir" # Pour le message
|
||||
- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
|
||||
+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
|
||||
esac;;
|
||||
no) LABLGTKINCLUDES="";;
|
||||
esac
|
||||
@ -1,6 +1,5 @@
|
||||
# TODO:
|
||||
# - coqide compilation should be optional or (better) separate;
|
||||
# - coqide libraries are not installed;
|
||||
|
||||
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
|
||||
|
||||
@ -52,6 +51,10 @@ stdenv.mkDerivation {
|
||||
"\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\""
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Coq proof assistant";
|
||||
longDescription = ''
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
name = "maxima";
|
||||
version = "5.20.1";
|
||||
version = "5.21.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
|
||||
sha256 = "cc2430ad6b895fb730ee2a7b8df4852c2b6d09a5a8bb715bdba783982c470bd9";
|
||||
sha256 = "1dae887e1787871437d699a6b1acc1c1f7428729487492a07c6a31e26bf53a1b";
|
||||
};
|
||||
|
||||
buildInputs = [clisp];
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
description = "Maxima computer algebra system";
|
||||
homepage = http://maxima.sourceforge.net;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
}
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
let
|
||||
name = "wxmaxima";
|
||||
version = "0.8.3";
|
||||
version = "0.8.5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz";
|
||||
sha256 = "829e732e668f13c3153cc2fb67c7678973bf1bc468fb1b9f437fd0c24f59507a";
|
||||
sha256 = "794317fa2a8d0c2e88c3e5d238c5b81a3e11783ec4a692468b51f15bf5d294f2";
|
||||
};
|
||||
|
||||
buildInputs = [maxima wxGTK];
|
||||
|
||||
@ -1,16 +1,20 @@
|
||||
{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage} :
|
||||
{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage, zlib} :
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "darcs";
|
||||
name = self.fname;
|
||||
version = "2.3.1";
|
||||
sha256 = "14821bb2db4975cb4db2c5cc4f085069b936da591b7b71592befc9e07f17d214";
|
||||
version = "2.4.1";
|
||||
sha256 = "6ac0e84d2eca160e6e33755679dfb185d9b5f9f5bdc43f99db326210aabbc4aa";
|
||||
|
||||
extraBuildInputs = [html parsec regexCompat curl haskeline hashedStorage];
|
||||
extraBuildInputs = [
|
||||
html parsec regexCompat curl haskeline hashedStorage zlib
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://darcs.net/;
|
||||
description = "Patch-based version management system";
|
||||
license = "GPL";
|
||||
maintainers = [self.stdenv.lib.maintainers.andres];
|
||||
};
|
||||
|
||||
})
|
||||
|
||||
37
pkgs/applications/version-management/fossil/default.nix
Normal file
37
pkgs/applications/version-management/fossil/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{stdenv, fetchurl, zlib, openssl}:
|
||||
|
||||
let
|
||||
version = "20100318142033";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fossil-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
|
||||
sha256 = "16kd9sg99s8v549n9ggr5ynjrz36i71fvj1r66djdbdclg5sxlxv";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
INSTALLDIR=$out/bin make install
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple, high-reliability, distributed software configuration management.";
|
||||
longDescription = ''
|
||||
Fossil is a software configuration management system. Fossil is
|
||||
software that is designed to control and track the development of a
|
||||
software project and to record the history of the project. There are
|
||||
many such systems in use today. Fossil strives to distinguish itself
|
||||
from the others by being extremely simple to setup and operate.
|
||||
'';
|
||||
homepage = http://www.fossil-scm.org/;
|
||||
license = "GPLv2";
|
||||
maintainers = [ #Add your name here!
|
||||
stdenv.lib.maintainers.z77z
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -15,13 +15,21 @@ rec {
|
||||
cpio tcl tk makeWrapper subversion;
|
||||
svnSupport = config "svnSupport" false; # for git-svn support
|
||||
guiSupport = config "guiSupport" false;
|
||||
sendEmailSupport = config "sendEmailSupport" false;
|
||||
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
|
||||
smtpPerlLibs = [
|
||||
perlPackages.NetSMTP perlPackages.NetSMTPSSL
|
||||
perlPackages.IOSocketSSL perlPackages.NetSSLeay
|
||||
perlPackages.MIMEBase64 perlPackages.AuthenSASL
|
||||
perlPackages.DigestHMAC
|
||||
];
|
||||
};
|
||||
|
||||
# The full-featured Git.
|
||||
gitFull = git.override {
|
||||
svnSupport = true;
|
||||
guiSupport = true;
|
||||
sendEmailSupport = stdenv.isDarwin == false;
|
||||
};
|
||||
|
||||
gitGit = import ./git/git-git.nix {
|
||||
@ -104,4 +112,28 @@ rec {
|
||||
subversion;
|
||||
};
|
||||
|
||||
git2cl = import ./git2cl {
|
||||
inherit fetchgit stdenv perl;
|
||||
};
|
||||
|
||||
gitSubtree = stdenv.mkDerivation {
|
||||
name = "git-subtree-0.3";
|
||||
src = fetchurl {
|
||||
url = "http://github.com/apenwarr/git-subtree/tarball/v0.3";
|
||||
# sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr";
|
||||
sha256 = "f2ccac1e9cff4c35d989dc2a5581133c96b72d96c6a5ed89e51b6446dadac03f";
|
||||
};
|
||||
unpackCmd = "gzip -d < $curSrc | tar xvf -";
|
||||
buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
|
||||
configurePhase = "export prefix=$out";
|
||||
buildPhase = "true";
|
||||
installPhase = ''
|
||||
make install prefix=$out gitdir=$out/bin #work around to deal with a wrong makefile
|
||||
'';
|
||||
meta= {
|
||||
description = "An experimental alternative to the git-submodule command";
|
||||
homepage = http://github.com/apenwarr/git-subtree;
|
||||
license = "GPLv2";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio
|
||||
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
|
||||
, libxslt, tcl, tk, makeWrapper
|
||||
, svnSupport, subversion, perlLibs
|
||||
, svnSupport, subversion, perlLibs, smtpPerlLibs
|
||||
, guiSupport
|
||||
, pythonSupport ? true
|
||||
, sendEmailSupport
|
||||
}:
|
||||
|
||||
let
|
||||
@ -11,11 +12,11 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "git-1.7.0.5";
|
||||
name = "git-1.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
|
||||
sha256 = "96b44fcd8652db8a7a30d87096a17200457d3fbcc91aa334cb7644a6da898d53";
|
||||
sha256 = "bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ];
|
||||
@ -60,6 +61,18 @@ stdenv.mkDerivation rec {
|
||||
notSupported $out/bin/git-svn "reinstall with config git = { svnSupport = true } set"
|
||||
'')
|
||||
|
||||
+ (if sendEmailSupport then
|
||||
''# wrap git-send-email
|
||||
gitperllib=$out/lib/perl5/site_perl
|
||||
for i in ${builtins.toString smtpPerlLibs}; do
|
||||
gitperllib=$gitperllib:$i/lib/perl5/site_perl
|
||||
done
|
||||
wrapProgram "$out/libexec/git-core/git-send-email" \
|
||||
--set GITPERLLIB "$gitperllib" ''
|
||||
else '' # replace git-send-email by notification script
|
||||
notSupported $out/bin/git-send-email "reinstall with config git = { sendEmailSupport = true } set"
|
||||
'')
|
||||
|
||||
+ ''# Install man pages and Info manual
|
||||
make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
|
||||
-C Documentation ''
|
||||
@ -119,6 +132,6 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.maintainers.simons
|
||||
];
|
||||
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
{ fetchgit
|
||||
, stdenv
|
||||
, perl
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "git2cl";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://git.sv.gnu.org/git2cl.git;
|
||||
rev = "8373c9f74993e218a08819cbcdbab3f3564bbeba";
|
||||
sha256 = "b0d39379640c8a12821442431e2121f7908ce1cc88ec8ec6bede218ea8c21f2f";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
ensureDir $out/bin
|
||||
cp ${src}/git2cl $out/bin
|
||||
sed -i 's|/usr/bin/perl|${perl}/bin/perl|' $out/bin/git2cl
|
||||
'';
|
||||
}
|
||||
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||
${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
|
||||
--with-zlib=${zlib}
|
||||
--with-sqlite=${sqlite}
|
||||
--disable-neon-version-check
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
, cdparanoia ? null, cddaSupport ? true
|
||||
, amrnb ? null, amrwb ? null, amrSupport ? false
|
||||
, jackaudioSupport ? false, jackaudio ? null
|
||||
, x264Support ? false, x264 ? null
|
||||
, xvidSupport ? false, xvidcore ? null
|
||||
, mesa, pkgconfig, unzip
|
||||
}:
|
||||
|
||||
@ -43,11 +45,11 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "MPlayer-1.0-pre-rc4-20100213";
|
||||
name = "MPlayer-1.0-pre-rc4-20100506";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100213.tbz2;
|
||||
sha256 = "1c5w49vqavs9pnc5av89v502wfa5g7hfn65ffhpx25ddi1irzh2r";
|
||||
url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100506.tar.bz2;
|
||||
sha256 = "0rhs0mv216iir8cz13xdq0rs88lc48ciiyn0wqzxjrnjb17yajy6";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -61,11 +63,14 @@ stdenv.mkDerivation {
|
||||
++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
|
||||
++ stdenv.lib.optional cddaSupport cdparanoia
|
||||
++ stdenv.lib.optional jackaudioSupport jackaudio
|
||||
++ stdenv.lib.optionals amrSupport [ amrnb amrwb ];
|
||||
++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]
|
||||
++ stdenv.lib.optional x264Support x264
|
||||
++ stdenv.lib.optional xvidSupport xvidcore;
|
||||
|
||||
configureFlags = ''
|
||||
${if cacaSupport then "--enable-caca" else "--disable-caca"}
|
||||
${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
|
||||
${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""}
|
||||
--codecsdir=${codecs}
|
||||
--enable-runtime-cpudetection
|
||||
--enable-x11
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "vlc-1.0.5";
|
||||
name = "vlc-1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.videolan.org/pub/videolan/vlc/1.0.5/vlc-1.0.5.tar.bz2;
|
||||
sha256 = "1kbd43y6sy6lg1xgl1j4mid6rdx6sszkm8c14hwqrfvgjd69kwgp";
|
||||
url = http://download.videolan.org/pub/videolan/vlc/1.0.6/vlc-1.0.6.tar.bz2;
|
||||
sha256 = "0hhqbr0hwm07pimdy4rfmf3k3d6iz6icmrndirnp888hg8z968gm";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "virtualbox-3.1.6-${kernel.version}";
|
||||
name = "virtualbox-3.1.8-${kernel.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.virtualbox.org/virtualbox/3.1.6/VirtualBox-3.1.6-OSE.tar.bz2;
|
||||
sha256 = "05m0gsihvg0fs73a9bcivvlqkwrxvzfnyn2l59nixvy8g7w4h0c4";
|
||||
url = http://download.virtualbox.org/virtualbox/3.1.8/VirtualBox-3.1.8-OSE.tar.bz2;
|
||||
sha256 = "118y12k9kv8nfhgnzn3z4d8v75jz6nvy7y1il84cj09lnkkqlz5p";
|
||||
};
|
||||
|
||||
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl];
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "VirtualBox-GuestAdditions-3.1.6";
|
||||
name = "VirtualBox-GuestAdditions-3.1.8";
|
||||
src = fetchurl {
|
||||
url = http://download.virtualbox.org/virtualbox/3.1.6/VBoxGuestAdditions_3.1.6.iso;
|
||||
sha256 = "07vylsjs960yqgz2cn57sdhrhs0i3mkb286vnl7p86i7dfl0r08s";
|
||||
url = http://download.virtualbox.org/virtualbox/3.1.8/VBoxGuestAdditions_3.1.8.iso;
|
||||
sha256 = "11fn49zxmd7nxmqn9pcakmzj6j9f8kfb38czpl8fhbnl2k4ggj5q";
|
||||
};
|
||||
KERN_DIR = "${kernel}/lib/modules/*/build";
|
||||
buildInputs = [ patchelf cdrkit ];
|
||||
@ -71,7 +71,6 @@ stdenv.mkDerivation {
|
||||
ensureDir $out/bin
|
||||
install -m 755 bin/VBoxClient $out/bin
|
||||
install -m 755 bin/VBoxControl $out/bin
|
||||
install -m 755 bin/VBoxRandR $out/bin
|
||||
install -m 755 bin/VBoxClient-all $out/bin
|
||||
|
||||
# Install OpenGL libraries
|
||||
|
||||
@ -1,20 +1,30 @@
|
||||
{stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
|
||||
, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
|
||||
, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
|
||||
, docbook_xml_dtd_45, libxslt}:
|
||||
, docbook_xml_dtd_45, libxslt, coreutils}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "awesome-3.4.4";
|
||||
name = "awesome-3.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://awesome.naquadah.org/download/awesome-3.4.4.tar.xz;
|
||||
sha256 = "1d1ida8mznn02pzj2kfh6m59mwrz8vk1cy66npgyfpzyrv8a558y";
|
||||
url = http://awesome.naquadah.org/download/awesome-3.4.5.tar.xz;
|
||||
sha256 = "124g6k4n2yf9shw3ig9lj1jdwiysfbj13mnjd38k22hqbj3yhnbi";
|
||||
};
|
||||
|
||||
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
|
||||
imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev
|
||||
asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];
|
||||
|
||||
# We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
|
||||
# the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as
|
||||
# dependencies.
|
||||
patchPhase = ''
|
||||
# Fix the tab completion (supporting bash or zsh)
|
||||
sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
|
||||
# Remove the 'root' PATH override (I don't know why they have that)
|
||||
sed /WHOAMI/d -i utils/awsetbg
|
||||
'';
|
||||
|
||||
# Somehow libev does not get into the rpath, although it should.
|
||||
# Something may be wrong in the gcc wrapper.
|
||||
preBuild = ''
|
||||
|
||||
23
pkgs/applications/window-managers/larswm/default.nix
Normal file
23
pkgs/applications/window-managers/larswm/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{stdenv, fetchurl, imake, libX11, libXext, libXmu}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "larswm-7.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/larswm/larswm-7.5.3.tar.gz;
|
||||
sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v";
|
||||
};
|
||||
|
||||
buildInputs = [ imake libX11 libXext libXmu ];
|
||||
|
||||
configurePhase = ''
|
||||
xmkmf
|
||||
makeFlags="BINDIR=$out/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://larswm.fnurt.net/;
|
||||
description = "9wm-like tiling window manager";
|
||||
license = "free";
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@ args: with args; stdenv.mkDerivation {
|
||||
name = "wmii-20071116";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://code.suckless.org/dl/wmii/wmii-3.6.tar.gz;
|
||||
url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz;
|
||||
sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216";
|
||||
};
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ args: with args; stdenv.mkDerivation {
|
||||
name = "wmiimenu-3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://suckless.org/download/wmii-3.1.tar.gz;
|
||||
url = http://dl.suckless.org/wmii/wmii-3.1.tar.gz;
|
||||
sha256 = "0sviwxbanpsfdm55zvx9hflncw35slkz41xr517y3yfgxx6qlhlk";
|
||||
};
|
||||
|
||||
|
||||
@ -82,6 +82,11 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
|
||||
rpath="$rpath $1 "
|
||||
}
|
||||
|
||||
libs=""
|
||||
addToLibs() {
|
||||
libs="$libs $1"
|
||||
}
|
||||
|
||||
rpath=""
|
||||
|
||||
# First, find all -L... switches.
|
||||
@ -95,6 +100,11 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
|
||||
elif test "$p" = "-L"; then
|
||||
addToLibPath ${p2}
|
||||
n=$((n + 1))
|
||||
elif test "$p" = "-l"; then
|
||||
addToLibs ${p2}
|
||||
n=$((n + 1))
|
||||
elif test "${p:0:2}" = "-l"; then
|
||||
addToLibs ${p:2}
|
||||
elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
|
||||
# This is a direct reference to a shared library, so add
|
||||
# its directory to the rpath.
|
||||
@ -108,22 +118,13 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
|
||||
# see if it contains a dynamic library used by a -l... flag. If
|
||||
# so, add the directory to the rpath.
|
||||
|
||||
for i in $libPath; do
|
||||
n=0
|
||||
while test $n -lt ${#allParams[*]}; do
|
||||
p=${allParams[n]}
|
||||
p2=${allParams[$((n+1))]}
|
||||
if test "${p:0:2}" = "-l" -a -f "$i/lib${p:2}.so"; then
|
||||
addToRPath $i
|
||||
break
|
||||
elif test "$p" = "-l" -a -f "$i/lib${p2}"; then
|
||||
# I haven't seen `-l foo', but you never know...
|
||||
addToRPath $i
|
||||
for i in $libs; do
|
||||
for j in $libPath; do
|
||||
if test -f "$j/lib$i.so"; then
|
||||
addToRPath $j
|
||||
break
|
||||
fi
|
||||
n=$((n + 1))
|
||||
done
|
||||
|
||||
done
|
||||
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
{ doCoverageAnalysis ? false
|
||||
, lcovFilter ? []
|
||||
, lcovExtraTraceFiles ? []
|
||||
, src, stdenv
|
||||
, name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
|
||||
, ... } @ args:
|
||||
@ -73,8 +74,9 @@ stdenv.mkDerivation (
|
||||
${args.lcov}/bin/lcov --remove app.info $lcovFilter > app2.info
|
||||
set +o noglob
|
||||
mv app2.info app.info
|
||||
|
||||
mkdir $out/coverage
|
||||
${args.lcov}/bin/genhtml app.info -o $out/coverage > log
|
||||
${args.lcov}/bin/genhtml app.info $lcovExtraTraceFiles -o $out/coverage > log
|
||||
|
||||
# Grab the overall coverage percentage for use in release overviews.
|
||||
grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate
|
||||
@ -85,6 +87,7 @@ stdenv.mkDerivation (
|
||||
|
||||
lcovFilter = ["/nix/store/*"] ++ lcovFilter;
|
||||
|
||||
inherit lcovExtraTraceFiles;
|
||||
|
||||
meta = (if args ? meta then args.meta else {}) // {
|
||||
description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}";
|
||||
|
||||
@ -73,6 +73,36 @@ rec {
|
||||
linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" +
|
||||
(stdenv.lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));
|
||||
|
||||
# Require file
|
||||
requireFile = {name, sha256, url ? null, message ? null} :
|
||||
assert (message != null) || (url != null);
|
||||
let msg =
|
||||
if message != null then message
|
||||
else ''
|
||||
Unfortunately, we may not download file ${name} automatically.
|
||||
Please, go to ${url}, download it yourself, and add it to the Nix store
|
||||
using either
|
||||
nix-store --add-fixed sha256 ${name}
|
||||
or
|
||||
nix-prefetch-url file://path/to/${name}
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = sha256;
|
||||
builder = writeScript "restrict-message" ''
|
||||
source ${stdenv}/setup
|
||||
cat <<_EOF_
|
||||
|
||||
***
|
||||
${msg}
|
||||
***
|
||||
|
||||
_EOF_
|
||||
'';
|
||||
};
|
||||
|
||||
# Search in the environment if the same program exists with a set uid or
|
||||
# set gid bit. If it exists, run the first program found, otherwise run
|
||||
# the default binary.
|
||||
|
||||
@ -11,7 +11,6 @@ rec {
|
||||
gnomeicontheme = gnome_icon_theme;
|
||||
|
||||
# !!! Missing! Need to add these.
|
||||
libgnomeprintui = throw "libgnomeprintui not implemented";
|
||||
gnomepanel = throw "gnomepanel not implemented";
|
||||
gtksourceview_24 = gtksourceview;
|
||||
|
||||
@ -30,6 +29,7 @@ rec {
|
||||
libIDL = import ./platform/libIDL {
|
||||
inherit (pkgs) stdenv fetchurl flex bison pkgconfig;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null;
|
||||
};
|
||||
|
||||
ORBit2 = import ./platform/ORBit2 {
|
||||
@ -53,6 +53,12 @@ rec {
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
libgnomeprintui = import ./platform/libgnomeprintui {
|
||||
inherit intltool libgnomecanvas libgnomeprint gnomeicontheme;
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig gettext;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
libgnomecups = import ./platform/libgnomecups {
|
||||
inherit intltool libart_lgpl;
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2;
|
||||
|
||||
@ -10,9 +10,10 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia
|
||||
[ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
|
||||
intltool gnome_mime_data
|
||||
];
|
||||
]
|
||||
++ (if stdenv.isLinux then [hal] else []);
|
||||
|
||||
propagatedBuildInputs = [ GConf glib ];
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, flex, bison, pkgconfig, glib}:
|
||||
{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext ? null}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libIDL-0.8.13";
|
||||
@ -6,5 +6,5 @@ stdenv.mkDerivation {
|
||||
url = mirror://gnome/sources/libIDL/0.8/libIDL-0.8.13.tar.bz2;
|
||||
sha256 = "0w9b4q5sllwncz498sj5lmc3ajzc8x74dy0jy27m2yg9v887xk5w";
|
||||
};
|
||||
buildInputs = [ flex bison pkgconfig glib ];
|
||||
buildInputs = [ flex bison pkgconfig glib gettext ];
|
||||
}
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libgnomeprintui-2.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2;
|
||||
sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeaccessibility-4.4.2";
|
||||
name = "kdeaccessibility-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdeaccessibility-4.4.2.tar.bz2;
|
||||
sha256 = "10n08w7x5sna0ilc965yi1041dwm13s5r4fd1valmlx8wcckrj6q";
|
||||
url = mirror://kde/stable/4.4.3/src/kdeaccessibility-4.4.3.tar.bz2;
|
||||
sha256 = "1j1v0bfl6kcapxwqa1ma19z61qx2vd4lx7b9dykkv7z3gq7c5y5m";
|
||||
};
|
||||
# Missing: speechd, I was too lazy to implement this
|
||||
buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
, kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeadmin-4.4.2";
|
||||
name = "kdeadmin-4.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdeadmin-4.4.2.tar.bz2;
|
||||
sha256 = "0qzsfkf0gzhdzyyyfycz652ii8ivgin7zvzbkha3jz7kfbrskg9k";
|
||||
url = mirror://kde/stable/4.4.3/src/kdeadmin-4.4.3.tar.bz2;
|
||||
sha256 = "08s0fagxgdk6p00qxzizrhs9010f6s9rlz7w07ri86m9ps9yd6am";
|
||||
};
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeartwork-4.4.2";
|
||||
name = "kdeartwork-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdeartwork-4.4.2.tar.bz2;
|
||||
sha256 = "1yb9p3nsayzp4vq0sq2ax0svmf6za73g4wzj3jcbs13j0gsvpz70";
|
||||
url = mirror://kde/stable/4.4.3/src/kdeartwork-4.4.3.tar.bz2;
|
||||
sha256 = "0ivfqg9nr5lqa1dppc0p6aw816jy8zqj308dv367jqh1qbapx0cl";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl xscreensaver
|
||||
kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdebase-runtime-4.4.2";
|
||||
name = "kdebase-runtime-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdebase-runtime-4.4.2.tar.bz2;
|
||||
sha256 = "087g05k2zrlwk4n7n14nblflxxm3g28nzyyyx18jr4r2xq9x64b5";
|
||||
url = mirror://kde/stable/4.4.3/src/kdebase-runtime-4.4.3.tar.bz2;
|
||||
sha256 = "1fyg804gl8hqzjicij8xs0gy7qdjnj6n4i8fxybk2wfn8mn5zgm1";
|
||||
};
|
||||
/* CLUCENE_HOME=cluceneCore;*/
|
||||
# Still have to look into Soprano Virtuoso
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
myPatchPhase()
|
||||
{
|
||||
sed -i -e "s|\${PYTHON_SITE_PACKAGES_DIR}|$out/lib/python2.6/site-packages|" plasma/generic/scriptengines/python/CMakeLists.txt
|
||||
}
|
||||
patchPhase=myPatchPhase
|
||||
genericBuild
|
||||
@ -6,15 +6,19 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdebase-workspace-4.4.2";
|
||||
name = "kdebase-workspace-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdebase-workspace-4.4.2.tar.bz2;
|
||||
sha256 = "1g8rnpwpihk6sgvils9cafxz017d23ksg5i9x9275ilydslbsclc";
|
||||
url = mirror://kde/stable/4.4.3/src/kdebase-workspace-4.4.3.tar.bz2;
|
||||
sha256 = "0fcjk6bmswal02lwsywvv44x8qi8vr3vr08rlgp8v9rc5yqv4mkz";
|
||||
};
|
||||
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs kdepimlibs kdebindings libpthreadstubs boost libusb stdenv.gcc.libc
|
||||
libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
|
||||
lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ];
|
||||
builder = ./builder.sh;
|
||||
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
|
||||
kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
|
||||
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
|
||||
phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs ];
|
||||
patchPhase=''
|
||||
sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
|
||||
plasma/generic/scriptengines/python/CMakeLists.txt
|
||||
'';
|
||||
meta = {
|
||||
description = "KDE Workspace";
|
||||
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
, automoc4, phonon, strigi, qimageblitz, soprano}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdebase-4.4.2";
|
||||
name = "kdebase-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdebase-4.4.2.tar.bz2;
|
||||
sha256 = "1bf75y7barmymaf810n66qf47jfrn1vfqpqn5rsls8r8wjcz0j71";
|
||||
url = mirror://kde/stable/4.4.3/src/kdebase-4.4.3.tar.bz2;
|
||||
sha256 = "15adml1rlpsgdy7ynbgzh3rnlzi1ynz42dmbjqz5yrv6l2pbgjag";
|
||||
};
|
||||
buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394
|
||||
kdebase_workspace automoc4 phonon strigi qimageblitz soprano ];
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
# some bindings are even broken.
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdebindings-4.4.2";
|
||||
name = "kdebindings-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdebindings-4.4.2.tar.bz2;
|
||||
sha256 = "0172xbm1mkg9zhbqjqhvc1iizaqiv7vl5d2n6rz3k9b6mpm01jyp";
|
||||
url = mirror://kde/stable/4.4.3/src/kdebindings-4.4.3.tar.bz2;
|
||||
sha256 = "0gna0fwhm05pyxqanz68vvav7ahxzffwh2ry1zadfpzwmq5srnpg";
|
||||
};
|
||||
#builder = ./builder.sh;
|
||||
|
||||
|
||||
@ -10,8 +10,9 @@ pkgs.recurseIntoAttrs (rec {
|
||||
};
|
||||
|
||||
phonon = import ./support/phonon {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake;
|
||||
inherit (pkgs) qt4 gst_all xineLib;
|
||||
inherit (pkgs) stdenv fetchurl cmake pkgconfig;
|
||||
inherit (pkgs) qt4 xineLib pulseaudio;
|
||||
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
|
||||
inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
|
||||
inherit automoc4;
|
||||
};
|
||||
@ -61,7 +62,7 @@ pkgs.recurseIntoAttrs (rec {
|
||||
kdelibs = import ./libs {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
|
||||
inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
|
||||
kerberos acl attr shared_desktop_ontologies;
|
||||
kerberos acl attr shared_desktop_ontologies enchant;
|
||||
inherit (pkgs.xlibs) libXScrnSaver;
|
||||
inherit automoc4 phonon strigi soprano qca2 attica polkit_qt;
|
||||
};
|
||||
@ -122,7 +123,7 @@ pkgs.recurseIntoAttrs (rec {
|
||||
|
||||
kdeedu = import ./edu {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost;
|
||||
inherit (pkgs) readline gmm gsl facile ocaml xplanet;
|
||||
inherit (pkgs) readline gmm gsl xplanet libspectre;
|
||||
inherit kdelibs attica;
|
||||
inherit automoc4 phonon eigen;
|
||||
};
|
||||
@ -145,7 +146,7 @@ pkgs.recurseIntoAttrs (rec {
|
||||
|
||||
kdenetwork = import ./network {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
|
||||
inherit (pkgs) libidn libvncserver libmsn giflib gpgme boost libv4l;
|
||||
inherit (pkgs) libidn libvncserver libmsn giflib gpgme boost libv4l libotr;
|
||||
inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit automoc4 phonon qca2 soprano qimageblitz strigi;
|
||||
@ -220,9 +221,10 @@ pkgs.recurseIntoAttrs (rec {
|
||||
};
|
||||
|
||||
digikam = import ./extragear/digikam {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext;
|
||||
inherit kdelibs kdepimlibs kdegraphics;
|
||||
inherit automoc4 phonon qimageblitz qca2 eigen;
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext
|
||||
liblqr1 lensfun;
|
||||
inherit kdelibs kdepimlibs kdegraphics kdeedu;
|
||||
inherit automoc4 phonon qimageblitz qca2 eigen soprano;
|
||||
};
|
||||
|
||||
filelight = import ./extragear/filelight {
|
||||
@ -231,6 +233,23 @@ pkgs.recurseIntoAttrs (rec {
|
||||
inherit automoc4 phonon qimageblitz;
|
||||
};
|
||||
|
||||
kdenlive = import ./extragear/kdenlive {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl mlt gettext shared_mime_info;
|
||||
inherit kdelibs soprano;
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
kdevelop = import ./extragear/kdevelop {
|
||||
inherit (pkgs) stdenv fetchurl cmake pkgconfig shared_mime_info gettext perl;
|
||||
inherit kdevplatform automoc4 kdebase_workspace;
|
||||
};
|
||||
|
||||
kdevplatform = import ./extragear/kdevplatform {
|
||||
inherit (pkgs) stdenv fetchurl cmake subversion qt4 perl gettext pkgconfig
|
||||
apr aprutil boost;
|
||||
inherit kdelibs automoc4 phonon;
|
||||
};
|
||||
|
||||
kdesvn = import ./extragear/kdesvn {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4;
|
||||
inherit kdelibs;
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
|
||||
, facile, ocaml, xplanet
|
||||
, xplanet, libspectre
|
||||
, kdelibs, automoc4, phonon, eigen, attica}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeedu-4.4.2";
|
||||
name = "kdeedu-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdeedu-4.4.2.tar.bz2;
|
||||
sha256 = "0fgqsizp1vm0yp6nirbqbxj0kvbqvnb8q3wxzav4hhn85r294ps7";
|
||||
url = mirror://kde/stable/4.4.3/src/kdeedu-4.4.3.tar.bz2;
|
||||
sha256 = "17hb1j7dy5ccgmna26cabng0z48qdhl8z0w2grm83a1a9szq2y4x";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet
|
||||
kdelibs automoc4 phonon eigen attica ];
|
||||
#TODO: facile, indi, boost.python, cfitsio, R, qalculate
|
||||
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl xplanet
|
||||
kdelibs automoc4 phonon eigen attica libspectre ];
|
||||
meta = {
|
||||
description = "KDE Educative software";
|
||||
license = "GPL";
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
|
||||
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}:
|
||||
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
|
||||
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
|
||||
liblqr1, lensfun }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "digikam-1.2.0";
|
||||
@ -10,13 +11,13 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
|
||||
lcms jasper libgphoto2 kdepimlibs gettext ];
|
||||
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun ];
|
||||
cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
|
||||
meta = {
|
||||
description = "Photo Management Program";
|
||||
license = "GPL";
|
||||
homepage = http://www.digikam.org;
|
||||
maintainers = [ lib.maintainers.viric ];
|
||||
platforms = with lib.platforms; linux;
|
||||
maintainers = [ stdenv.lib.maintainers.viric ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,5 +14,6 @@ stdenv.mkDerivation {
|
||||
license = "GPL";
|
||||
homepage = http://www.methylblue.com/filelight/;
|
||||
maintainers = [ lib.maintainers.viric ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
21
pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix
Normal file
21
pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext,
|
||||
shared_mime_info, soprano}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdenlive-0.7.7.1";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/kdenlive/kdenlive-0.7.7.1.tar.gz;
|
||||
sha256 = "047kpzfdmipgnnkbdhcpy5c0kqgpg7yn3qhyd7inlplmyd3i1pfx";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext
|
||||
shared_mime_info soprano ];
|
||||
|
||||
meta = {
|
||||
description = "Free and open source video editor";
|
||||
license = "GPLv2+";
|
||||
homepage = http://www.kdenlive.org/;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
29
pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix
Normal file
29
pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
|
||||
kdebase_workspace, gettext, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kdevelop-4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2";
|
||||
sha256 = "0cnwhfk71iksip17cjzf3g68n751k8fz2acin6qb27k7sh71pdfp";
|
||||
};
|
||||
|
||||
buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info
|
||||
kdebase_workspace gettext stdenv.gcc.libc perl ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
maintainers = [ maintainers.urkud ];
|
||||
platforms = platforms.linux;
|
||||
description = "KDE official IDE";
|
||||
longDescription =
|
||||
''
|
||||
A free, opensource IDE (Integrated Development Environment)
|
||||
for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
|
||||
feature-full, plugin extendable IDE for C/C++ and other
|
||||
programing languages. It is based on KDevPlatform, KDE and Qt
|
||||
libraries and is under development since 1998.
|
||||
'';
|
||||
homepage = http://www.kdevelop.org;
|
||||
};
|
||||
}
|
||||
25
pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix
Normal file
25
pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon,
|
||||
gettext, pkgconfig, apr, aprutil, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kdevplatform-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2";
|
||||
sha256 = "05qgi5hwvzqzysihd5nrn28kiz0l6rp9dbxlf25jcjs5dml3dza6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ kdelibs subversion qt4 phonon ];
|
||||
buildInputs = [ cmake automoc4 perl gettext pkgconfig apr aprutil boost stdenv.gcc.libc ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
maintainers = [ maintainers.urkud ];
|
||||
platforms = platforms.linux;
|
||||
description = "KDE libraries for IDE-like programs";
|
||||
longDescription = ''
|
||||
A free, opensource set of libraries that can be used as a foundation for
|
||||
IDE-like programs. It is programing-language independent, and is planned
|
||||
to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -11,4 +11,12 @@ stdenv.mkDerivation {
|
||||
|
||||
# kdebase allows having a konqueror plugin built
|
||||
buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kdebase ];
|
||||
|
||||
meta = {
|
||||
homepage = http://kdiff3.sourceforge.net/;
|
||||
license = "GPLv2+";
|
||||
description = "Compares and merges 2 or 3 files or directories";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, lib, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, phonon, qca2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdegames-4.4.2";
|
||||
name = "kdegames-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdegames-4.4.2.tar.bz2;
|
||||
sha256 = "15qj5nj39fbv0643rk3jr1ygi46jw439qs7zvwqr0w35r3k6kp6w";
|
||||
url = mirror://kde/stable/4.4.3/src/kdegames-4.4.3.tar.bz2;
|
||||
sha256 = "0i14zd0jxbgrvxgpwq80ghfbhcj9awq1rh7g5716j514wl25nqpl";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 phonon qca2 ];
|
||||
meta = {
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
, kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdegraphics-4.4.2";
|
||||
name = "kdegraphics-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdegraphics-4.4.2.tar.bz2;
|
||||
sha256 = "1q4yzi4y0zfjy1avbcax7sykb0g3ib01v12lg6ydxgvf3bvxibmz";
|
||||
url = mirror://kde/stable/4.4.3/src/kdegraphics-4.4.3.tar.bz2;
|
||||
sha256 = "0f7mw91fr2gx5ycdpb4b3c4d382933fqfhpsfvifpphkg1p0hy54";
|
||||
};
|
||||
buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
|
||||
shared_mime_info stdenv.gcc.libc libXxf86vm
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
let
|
||||
|
||||
deriv = attr : stdenv.mkDerivation {
|
||||
name = "kde-l10n-${attr.lang}-4.4.2";
|
||||
name = "kde-l10n-${attr.lang}-4.4.3";
|
||||
src = fetchurl {
|
||||
url = attr.url;
|
||||
sha256 = attr.sha256;
|
||||
@ -23,344 +23,344 @@ in
|
||||
|
||||
ar = deriv {
|
||||
lang = "ar";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ar-4.4.2.tar.bz2";
|
||||
sha256 = "1vx0x08x2xqc0wcyjxnxfvb00vfgn99xzq8jx0408yj7mbm0a7h1";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ar-4.4.3.tar.bz2";
|
||||
sha256 = "1gnrnkkmchfwjdc712fkh6apl17d2nmnyyliim8k935s5nx40469";
|
||||
};
|
||||
|
||||
bg = deriv {
|
||||
lang = "bg";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-bg-4.4.2.tar.bz2";
|
||||
sha256 = "1jfwrl68b36220bffhqqgbj21cqgn7rw777skzn6gvzd6q19848f";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-bg-4.4.3.tar.bz2";
|
||||
sha256 = "1zqb07b77lpbk36xgz9s2hrxjwaayqcmp13apqnpbxdjfi98c40p";
|
||||
};
|
||||
|
||||
ca = deriv {
|
||||
lang = "ca";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ca-4.4.2.tar.bz2";
|
||||
sha256 = "0mvls8fd9qzfj1qhv0lizm3vr22qxzpc0kkdcn77pc2ayrwx2psz";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ca-4.4.3.tar.bz2";
|
||||
sha256 = "1y4kp45mm2bqd7sh4p94q7z737n7d56sfca01l4k2z6if2mfdqyv";
|
||||
};
|
||||
|
||||
cs = deriv {
|
||||
lang = "cs";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-cs-4.4.2.tar.bz2";
|
||||
sha256 = "1x3yglhq3g159w0smrd9zg2blnk6xpc5bqdj6136rd9xh3xhg2m3";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-cs-4.4.3.tar.bz2";
|
||||
sha256 = "01drz8cxaqh6vf1pk6pp18bdv4a5imgc1ajsv6cybc2sa63wff3m";
|
||||
};
|
||||
|
||||
csb = deriv {
|
||||
lang = "csb";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-csb-4.4.2.tar.bz2";
|
||||
sha256 = "1jh3rqm95glz6xbl4fpydz13vhq6z3nys6hqbayvk3x4bygd2zy6";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-csb-4.4.3.tar.bz2";
|
||||
sha256 = "1slii5r0s7s8wgmh3j0lxk5k7crpqyn3cyn0shh3fycpi3dhazlh";
|
||||
};
|
||||
|
||||
da = deriv {
|
||||
lang = "da";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-da-4.4.2.tar.bz2";
|
||||
sha256 = "15y8zp15sb8yqhbck3xkpw6h1aabslsddywcwk6d9y6ipw79vnal";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-da-4.4.3.tar.bz2";
|
||||
sha256 = "17kjf2np54kg0s7gimsf4mh93zjvvs2drasb4ayw9phkdcs4a5b0";
|
||||
};
|
||||
|
||||
de = deriv {
|
||||
lang = "de";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-de-4.4.2.tar.bz2";
|
||||
sha256 = "0xnxm7xlx777y0cx681155nzda68xbnmnf62gjvd6pxpcd40s3hk";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-de-4.4.3.tar.bz2";
|
||||
sha256 = "0v14qf47cvldxg2rlwgakxliamn04x77df48d7g1hzwapvd9s0dd";
|
||||
};
|
||||
|
||||
el = deriv {
|
||||
lang = "el";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-el-4.4.2.tar.bz2";
|
||||
sha256 = "0jn3fwyy22s4nabzpl3pslp5z63yb50l29ca8rg4j7mz46xbsb3w";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-el-4.4.3.tar.bz2";
|
||||
sha256 = "03bf7lrm2bkxq2q0h18c4ksa3pbxr5yv9363z0396px4zy6srn3p";
|
||||
};
|
||||
|
||||
en_GB = deriv {
|
||||
lang = "en_GB";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-en_GB-4.4.2.tar.bz2";
|
||||
sha256 = "1vzlbax5m68xvgwp8ls4i8bj1lvh8bj88jh65wqqpf5w2rj3ndbk";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-en_GB-4.4.3.tar.bz2";
|
||||
sha256 = "0jzvybpq9nnnw8cqp3izj7x804gd05q4mzjl8pxvv56s622zdda4";
|
||||
};
|
||||
|
||||
eo = deriv {
|
||||
lang = "eo";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-eo-4.4.2.tar.bz2";
|
||||
sha256 = "0z3320czlwvsjij5rfv1drv6x4d61aqvxsq1yj876av4w7pys7r9";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-eo-4.4.3.tar.bz2";
|
||||
sha256 = "1br75zkyrl0imk0bnr4prcm4w4xmkg8qnjs2yn6842d8m4ffy2q0";
|
||||
};
|
||||
|
||||
es = deriv {
|
||||
lang = "es";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-es-4.4.2.tar.bz2";
|
||||
sha256 = "0fsqcj809vf2zahkiqlmdxzpxzgwj437267lgfdjp65amsfw2cmd";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-es-4.4.3.tar.bz2";
|
||||
sha256 = "1vxjxgsvb3fr904nv6s84b0a0nbchv7599gfnirwbdklglbla85h";
|
||||
};
|
||||
|
||||
et = deriv {
|
||||
lang = "et";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-et-4.4.2.tar.bz2";
|
||||
sha256 = "189y04kgbjx3pbbp46g1v9i5h9bz02zfgvy4l6nw1v97bnkrkjrr";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-et-4.4.3.tar.bz2";
|
||||
sha256 = "0r6l1b1pfkry45g5wmii4d5ysalg9w8544dkbib374wjn9zm26qc";
|
||||
};
|
||||
|
||||
eu = deriv {
|
||||
lang = "eu";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-eu-4.4.2.tar.bz2";
|
||||
sha256 = "0v41s33lvmyrlsn6cvqj42b8r0d36lci8lins3212g0sw5fkc83p";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-eu-4.4.3.tar.bz2";
|
||||
sha256 = "0rpdalv8bhmvv0cgf4wjdnlqamjqil7sl1brqv74p2dlhlsz03n7";
|
||||
};
|
||||
|
||||
fi = deriv {
|
||||
lang = "fi";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fi-4.4.2.tar.bz2";
|
||||
sha256 = "0j90qd3ll1ycj8d5ms4rmbkbw280cvgx47z5q6byfv4qaq2sq2bv";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fi-4.4.3.tar.bz2";
|
||||
sha256 = "1m5czzfmjg9gvw0jyfa875gb7h33yb179vgissddfjmmhap0yypn";
|
||||
};
|
||||
|
||||
fr = deriv {
|
||||
lang = "fr";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fr-4.4.2.tar.bz2";
|
||||
sha256 = "0sf0fdvmqrv6qxy6bmvb03fq9vdv1y4y28475s6vn6alz94q9ga1";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fr-4.4.3.tar.bz2";
|
||||
sha256 = "1whk3a40cc2yiq7biql5klhl2k9h1bi3pilm0yskl0x6x8cdsn3d";
|
||||
};
|
||||
|
||||
fy = deriv {
|
||||
lang = "fy";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fy-4.4.2.tar.bz2";
|
||||
sha256 = "1jb1mmw08bf9rmm8qipfwc86w9klcs1zynsyjfabc4p38jp4pirn";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fy-4.4.3.tar.bz2";
|
||||
sha256 = "1xwk1jqalj47iky3cda7z053jsihi0hf4k7sh2cdgvy50n5wj8bi";
|
||||
};
|
||||
|
||||
ga = deriv {
|
||||
lang = "ga";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ga-4.4.2.tar.bz2";
|
||||
sha256 = "0pijkmbj0bspwcrncn890ycgf2hxh2yxsayry0fkl9rcxz556bwy";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ga-4.4.3.tar.bz2";
|
||||
sha256 = "0y3p8kj1fm88s5g7md6fwf3hlk5fshaywyw2l5bvx9vrhdv757f1";
|
||||
};
|
||||
|
||||
gl = deriv {
|
||||
lang = "gl";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-gl-4.4.2.tar.bz2";
|
||||
sha256 = "02ccvdabnwp112483k2yb1w3b390cg61a7wl3pw02kkmxx5lcc7n";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-gl-4.4.3.tar.bz2";
|
||||
sha256 = "0j8f4185hq162d4xvk0qzv5drqz1sfx7k2pamqp9vf87js193m1v";
|
||||
};
|
||||
|
||||
gu = deriv {
|
||||
lang = "gu";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-gu-4.4.2.tar.bz2";
|
||||
sha256 = "1dzpmwf7n29w3hfzhbyvj06jbs1mxxn46g9w98mclbis9ign10p1";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-gu-4.4.3.tar.bz2";
|
||||
sha256 = "141gdz79g2g13c36ci0pzk582s9kj7s47brzamidw683ndjvsarq";
|
||||
};
|
||||
|
||||
he = deriv {
|
||||
lang = "he";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-he-4.4.2.tar.bz2";
|
||||
sha256 = "0my1l4nsjpyjgx118jdw5px0pmb621pyns5c4708y9if8pwdv7hv";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-he-4.4.3.tar.bz2";
|
||||
sha256 = "0safk2vzpr3v1kbm236d4ayvqqa4i5zz8jppabr2zbak522sk6nf";
|
||||
};
|
||||
|
||||
hi = deriv {
|
||||
lang = "hi";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hi-4.4.2.tar.bz2";
|
||||
sha256 = "0rj4bny1kv7rwnj01vcjxxa620vsdx5v03va4szhgdv4bm04j011";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hi-4.4.3.tar.bz2";
|
||||
sha256 = "08n1id22k46cnd8jkqczhxp33cz33bay1mkq1zqbwk4nxn9n5b42";
|
||||
};
|
||||
|
||||
hr = deriv {
|
||||
lang = "hr";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hr-4.4.2.tar.bz2";
|
||||
sha256 = "1l7vnjsklqk0dcb4zccifl77gaa9k72j70d0fa3vmw1bf0y7yld7";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hr-4.4.3.tar.bz2";
|
||||
sha256 = "061m5z4fnv7h67g05izdghrpa9bh0f3pk89s7wpk2w41pdpzk98j";
|
||||
};
|
||||
|
||||
hu = deriv {
|
||||
lang = "hu";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hu-4.4.2.tar.bz2";
|
||||
sha256 = "1zwxg38lspan3z3y3an4ypm7wwf1qgv1kz9k7p9jqj661j58g0j8";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hu-4.4.3.tar.bz2";
|
||||
sha256 = "00jk5ccq7ds9gcx4qb08i85cll9qs0wprw949412hbylwwj7c0qm";
|
||||
};
|
||||
|
||||
id = deriv {
|
||||
lang = "id";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-id-4.4.2.tar.bz2";
|
||||
sha256 = "0h59z03q9rv07g8hyzh2km0l0znddvflxz9jb047rgyll1ah96js";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-id-4.4.3.tar.bz2";
|
||||
sha256 = "0c64s38vzwjfdjanljspxqaishmw0c7qz7z2s4gc70bws02dz87b";
|
||||
};
|
||||
|
||||
is = deriv {
|
||||
lang = "is";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-is-4.4.2.tar.bz2";
|
||||
sha256 = "15dz28jrzb38mn19l3wgprh9p2q1xsd08c25m911849fn4kvcs59";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-is-4.4.3.tar.bz2";
|
||||
sha256 = "17kv9lkiy60kfk9v535fpnx3v2v4vvnjyk0qqp0nigyg2sa2ylhl";
|
||||
};
|
||||
|
||||
it = deriv {
|
||||
lang = "it";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-it-4.4.2.tar.bz2";
|
||||
sha256 = "1hqw8k6gns66clfaxyqdvbxmac1p2j2nl5vzabb9dxqxm6i4a6dm";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-it-4.4.3.tar.bz2";
|
||||
sha256 = "17czl01vskisy5fsyk774rdsdrf86pihqqrf6r80flpgd5wf33ym";
|
||||
};
|
||||
|
||||
ja = deriv {
|
||||
lang = "ja";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ja-4.4.2.tar.bz2";
|
||||
sha256 = "0awyr5iad03gjb2agcvyzpiq3hh3jdgar970n9g8d6in5p33jnba";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ja-4.4.3.tar.bz2";
|
||||
sha256 = "0124xnkkwxdjfmpqbascqfsd3v82r2f4vjjp11yzp8fzfz41qqzz";
|
||||
};
|
||||
|
||||
kk = deriv {
|
||||
lang = "kk";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-kk-4.4.2.tar.bz2";
|
||||
sha256 = "173i7f236c55nsfn9m24s3pn63fkp51wylgj2whqi6pl3s2f2iz1";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-kk-4.4.3.tar.bz2";
|
||||
sha256 = "1kyzmw0x7cvhf7bgryvk1c0sqg0cw6qnzalrky451brf82r5k4fk";
|
||||
};
|
||||
|
||||
km = deriv {
|
||||
lang = "km";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-km-4.4.2.tar.bz2";
|
||||
sha256 = "0d9y8hvb2r55gj41g7gpr5iiz1dmayg05ry1yy1w1f800iv5756x";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-km-4.4.3.tar.bz2";
|
||||
sha256 = "0jyc03zw15bynpjn1ddnb8xzjl2vkkf017yb5g5i5a5jxwp04ca4";
|
||||
};
|
||||
|
||||
kn = deriv {
|
||||
lang = "kn";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-kn-4.4.2.tar.bz2";
|
||||
sha256 = "1s1ig0pa804mx59b7sxci3i5pa1gqb4naw123vay8g0mkq3jjnqn";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-kn-4.4.3.tar.bz2";
|
||||
sha256 = "09wkq79g7rayvv3khx3g8hmzqmlq7pa95wzvixyrdnh9fwk0mm36";
|
||||
};
|
||||
|
||||
ko = deriv {
|
||||
lang = "ko";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ko-4.4.2.tar.bz2";
|
||||
sha256 = "0x0gbpa0f21rm2ls2kjyjbz9wl1yj8bsc0qc3bl5g6xk4kr6j634";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ko-4.4.3.tar.bz2";
|
||||
sha256 = "0dhkly119cgrmyil0c7zci77hf5w5k2pjaqgz9xx5g2k9jxf8f9q";
|
||||
};
|
||||
|
||||
lt = deriv {
|
||||
lang = "lt";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-lt-4.4.2.tar.bz2";
|
||||
sha256 = "0jxdwqi7lz9brxw80kfix5wxx1x421n628zf4dkyd7szdl3svxc8";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-lt-4.4.3.tar.bz2";
|
||||
sha256 = "1z4gimw4wdig1x0y8h780a2msdsy8rrpaqh8a5vpskjrx67y0pnh";
|
||||
};
|
||||
|
||||
lv = deriv {
|
||||
lang = "lv";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-lv-4.4.2.tar.bz2";
|
||||
sha256 = "03yi2gj8ckdmz8wyq8dj1kwzl7g8xz5g3ppmw2h4w6xmh0kdbkdy";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-lv-4.4.3.tar.bz2";
|
||||
sha256 = "1gfh2bamgbsxd042gjnw7x41qw6svw8dq6vz842lkkygdfplk679";
|
||||
};
|
||||
|
||||
mai = deriv {
|
||||
lang = "mai";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-mai-4.4.2.tar.bz2";
|
||||
sha256 = "069mx66ib9bwjh0c0ndnsdrj2xlzdbbihz9yc4br1vd3disj1jd2";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-mai-4.4.3.tar.bz2";
|
||||
sha256 = "0bx7wzqm2h3gsinpx0njsmb1x6s1jpj5v6cny5vrjawdm30zbxp4";
|
||||
};
|
||||
|
||||
mk = deriv {
|
||||
lang = "mk";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-mk-4.4.2.tar.bz2";
|
||||
sha256 = "01k1bzmmq8g59xvyn4pxxapbd8x1a85ps2z241zlhlrpmi6faja8";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-mk-4.4.3.tar.bz2";
|
||||
sha256 = "0yjhi7v4xfbcxp6z8ycfxqixx2prmv6d05bvlaas4l83vc4i62w7";
|
||||
};
|
||||
|
||||
ml = deriv {
|
||||
lang = "ml";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ml-4.4.2.tar.bz2";
|
||||
sha256 = "0vpj5i30p6hbabvqyfkzyjcwqblh2qz167bja3589halhdiadhf4";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ml-4.4.3.tar.bz2";
|
||||
sha256 = "1bd4bb5q70w6k5yqnx2ndrchi745jszih9mi9xsj6v6m8zsn285c";
|
||||
};
|
||||
|
||||
nb = deriv {
|
||||
lang = "nb";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nb-4.4.2.tar.bz2";
|
||||
sha256 = "1kh0cwfds7gh5rda4vhccwrjlgmbvcgkwr9gyiy8ssx02absqcz0";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nb-4.4.3.tar.bz2";
|
||||
sha256 = "0l4wab6c5sx10a9scimbw4nsmfy58jm7rgrb94sv2v34awnkysji";
|
||||
};
|
||||
|
||||
nds = deriv {
|
||||
lang = "nds";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nds-4.4.2.tar.bz2";
|
||||
sha256 = "18h7j89dmc95b24fgziixmfz1x8jhxnpwanhq3yb3f243j7rkvmn";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nds-4.4.3.tar.bz2";
|
||||
sha256 = "0njih51wyj21dk2m7z2165w5ywk3v3w6zqdnvjby489q1laqi9hc";
|
||||
};
|
||||
|
||||
nl = deriv {
|
||||
lang = "nl";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nl-4.4.2.tar.bz2";
|
||||
sha256 = "0s2941ywppgpnvafqqbfciliv6qllsjm5migzbqd5pwhpjifjjsl";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nl-4.4.3.tar.bz2";
|
||||
sha256 = "11hwijl2x8m9ianr5sniig1rqfdks7z72xaax9n922qf4i8v6n5g";
|
||||
};
|
||||
|
||||
nn = deriv {
|
||||
lang = "nn";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nn-4.4.2.tar.bz2";
|
||||
sha256 = "1phl56asdsn30wk2k9q6dhy99jvy2n11w2ny680jzdpc7gqp7j1n";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nn-4.4.3.tar.bz2";
|
||||
sha256 = "1wzvaj5im4kwgwxlbig2pdckiijdks3za5ixjc00axk0zkf16604";
|
||||
};
|
||||
|
||||
pa = deriv {
|
||||
lang = "pa";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pa-4.4.2.tar.bz2";
|
||||
sha256 = "0d5nksy2wr0glq5n82knfl4hhc6na55y5dp20q678agvxyz7nq94";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pa-4.4.3.tar.bz2";
|
||||
sha256 = "1zdvzk49x9f1fn87sglw5hm2pfjplx94kxra0qyhvy7v899bmixq";
|
||||
};
|
||||
|
||||
pl = deriv {
|
||||
lang = "pl";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pl-4.4.2.tar.bz2";
|
||||
sha256 = "1jbxbrqcp2cn6wijsm8jpqj925b5dc3s7120jqp4w25lr92gnip1";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pl-4.4.3.tar.bz2";
|
||||
sha256 = "0fwfc1h3iwmzl52b1wk1bpxghvy0a8ipp26c813jpv5pqnds777w";
|
||||
};
|
||||
|
||||
pt = deriv {
|
||||
lang = "pt";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pt-4.4.2.tar.bz2";
|
||||
sha256 = "1c17axsrjxjq101wd0yihf098q3lhwxqii2i4wcjpvi3iarrc5ri";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pt-4.4.3.tar.bz2";
|
||||
sha256 = "0ccswd7lvkpfd2hpzmlvg2dwylzaf1kp0r2dv080308cnji45j28";
|
||||
};
|
||||
|
||||
pt_BR = deriv {
|
||||
lang = "pt_BR";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pt_BR-4.4.2.tar.bz2";
|
||||
sha256 = "0hkrj5kps37xifzsj89d9ky0hq7ddk9jblaccg22bwc4vh3d5vh1";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pt_BR-4.4.3.tar.bz2";
|
||||
sha256 = "1a2fwnlj9pcxjy9fkcciiry42fi7wpdkb5qhim5v1vg1j4ah6zz8";
|
||||
};
|
||||
|
||||
ro = deriv {
|
||||
lang = "ro";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ro-4.4.2.tar.bz2";
|
||||
sha256 = "04qpzdic051xib0xnlg0jw9lnp45wgqc85l91a4pl50w3afcjcx2";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ro-4.4.3.tar.bz2";
|
||||
sha256 = "1f3ikjg19g2lnbrwcryvi4pz0hdy4prq91jw2s1a8cadh3yjr0bz";
|
||||
};
|
||||
|
||||
ru = deriv {
|
||||
lang = "ru";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ru-4.4.2.tar.bz2";
|
||||
sha256 = "0pbmr5pddys3rmsfy4zmynhzb3lc9381k2kw4nw3sqgv888p3xwv";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ru-4.4.3.tar.bz2";
|
||||
sha256 = "0f888p973amz0nfahk48ayp20nc76f2rnxhdf4xr0y6rk3a5q3ah";
|
||||
};
|
||||
|
||||
si = deriv {
|
||||
lang = "si";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-si-4.4.2.tar.bz2";
|
||||
sha256 = "1kw60d4v71vrfpb9fcsvjk0inaws1p2wsd3cw3sr2xnqk9yiwx1l";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-si-4.4.3.tar.bz2";
|
||||
sha256 = "08yfm46abd58fralkyc7mfg20hmk34y5xpnqi09g2xys1ab630bq";
|
||||
};
|
||||
|
||||
sk = deriv {
|
||||
lang = "sk";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sk-4.4.2.tar.bz2";
|
||||
sha256 = "1h3nkgvzifkk456kdnj0fmi4aazn08lz1s4km8699gl15zv6i5zx";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sk-4.4.3.tar.bz2";
|
||||
sha256 = "1nnr8mwz24nlc0cy4jkwam7bvdk71vqd0w4ncfjbqi31p69bq12w";
|
||||
};
|
||||
|
||||
sl = deriv {
|
||||
lang = "sl";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sl-4.4.2.tar.bz2";
|
||||
sha256 = "0671a6crik2wn40kbvfa7dvwxdyznmac3frpvr2g20430g6d58n3";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sl-4.4.3.tar.bz2";
|
||||
sha256 = "06j62vh78a32ygawvb81d5jsz8canw2w973cjay4qi104ibl8x7q";
|
||||
};
|
||||
|
||||
sr = deriv {
|
||||
lang = "sr";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sr-4.4.2.tar.bz2";
|
||||
sha256 = "12pbjyij5dp9y6kxw995zw07fa174yaidc9mxsx0kv34sylnz9yn";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sr-4.4.3.tar.bz2";
|
||||
sha256 = "1yyrqdagfssclj0amw7hnsgdsm1ma3jx03m75kz1xz4dwx044b2q";
|
||||
};
|
||||
|
||||
sv = deriv {
|
||||
lang = "sv";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sv-4.4.2.tar.bz2";
|
||||
sha256 = "1hs8szh09av5900s3cfjrmx8ynyz3ggv7l6gaaxsy4vfvslvd8vc";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sv-4.4.3.tar.bz2";
|
||||
sha256 = "1gynji087fk4iy0410qlh92j1z61mqafbkvw3gy6s82ava77i6i3";
|
||||
};
|
||||
|
||||
tg = deriv {
|
||||
lang = "tg";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-tg-4.4.2.tar.bz2";
|
||||
sha256 = "0mjlq6sbknd8lan9vaj8479a0hd6gk272d5an5n6d3m4q68smsx5";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-tg-4.4.3.tar.bz2";
|
||||
sha256 = "0vg1sfpyvsi81qaiqb0cln21dvvvck7zvbzyic7cb0028a3619wr";
|
||||
};
|
||||
|
||||
tr = deriv {
|
||||
lang = "tr";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-tr-4.4.2.tar.bz2";
|
||||
sha256 = "1g7lr6by3i32x0la20r1dsjbf6z376bd065rnfwdhnibaaidqm2p";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-tr-4.4.3.tar.bz2";
|
||||
sha256 = "0lc8sj6lqidjrhhwipi98kkvc3y0bnn6d04j9dhf2z972bcfpfbp";
|
||||
};
|
||||
|
||||
uk = deriv {
|
||||
lang = "uk";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-uk-4.4.2.tar.bz2";
|
||||
sha256 = "13px5in34hkzwx25525cjbqlnxghqws1rnipm0mhb9q4yww98ccx";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-uk-4.4.3.tar.bz2";
|
||||
sha256 = "1qkpd4qms5gx2lgmciwqbpdrvh251dlgrckzxxd3ch1z8ns2d3xa";
|
||||
};
|
||||
|
||||
wa = deriv {
|
||||
lang = "wa";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-wa-4.4.2.tar.bz2";
|
||||
sha256 = "0g3jy5d5zxp8996i3n3g6fzlnsgkjf828x2xjz9494nx176xqdkk";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-wa-4.4.3.tar.bz2";
|
||||
sha256 = "1f8pm69dlx1wvn56km2skk1xm602jfk0984fzhqhpdkkmji8cijn";
|
||||
};
|
||||
|
||||
zh_CN = deriv {
|
||||
lang = "zh_CN";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-zh_CN-4.4.2.tar.bz2";
|
||||
sha256 = "1yg2wg7pyknrc12fv9h78xh4imcqlzy5xxg266npv4c3n6b90xdh";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-zh_CN-4.4.3.tar.bz2";
|
||||
sha256 = "0103wgjqnw542n1492ll7psmly84rxc7q68r6zmszmd2s6nbhlvm";
|
||||
};
|
||||
|
||||
zh_TW = deriv {
|
||||
lang = "zh_TW";
|
||||
url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-zh_TW-4.4.2.tar.bz2";
|
||||
sha256 = "17q3ymwvrpp81rjw7vz60l3z6yg9mja0h5v37chzlbfnfdhngq39";
|
||||
url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-zh_TW-4.4.3.tar.bz2";
|
||||
sha256 = "08bnljg956948gfm380dlqllj090bv1gpc0y2w7gpq3cd3mqd0xv";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,28 +1,27 @@
|
||||
{ stdenv, fetchurl, cmake, lib, perl
|
||||
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
|
||||
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
|
||||
, automoc4, phonon, strigi, soprano, qca2, attica, polkit_qt
|
||||
, automoc4, phonon, strigi, soprano, qca2, attica, polkit_qt, enchant
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdelibs-4.4.2";
|
||||
name = "kdelibs-4.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdelibs-4.4.2.tar.bz2;
|
||||
sha256 = "02kcw716hmkcvsz7sc823m7lzkmacb526fajkq54gxqa6fc2yr15";
|
||||
url = mirror://kde/stable/4.4.3/src/kdelibs-4.4.3.tar.bz2;
|
||||
sha256 = "0a049wgfl01g029ayg7pvw8fssp74p5d69d94lmfcrlzbwa0zwlk";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt
|
||||
shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
|
||||
libXScrnSaver
|
||||
libXScrnSaver enchant
|
||||
automoc4 phonon strigi soprano qca2 attica polkit_qt
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ shared_desktop_ontologies ];
|
||||
|
||||
|
||||
# I don't know why cmake does not find the acl files (but finds attr files)
|
||||
# cmake fails to find acl.h because of C++-style comment
|
||||
cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, kdelibs, automoc4, phonon}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdemultimedia-4.4.2";
|
||||
name = "kdemultimedia-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdemultimedia-4.4.2.tar.bz2;
|
||||
sha256 = "15qq25ijnv0jsmxpc5fv7hwianxpqsz8i89j460kndm4pyplhdbj";
|
||||
url = mirror://kde/stable/4.4.3/src/kdemultimedia-4.4.3.tar.bz2;
|
||||
sha256 = "0lpwmplwiy6j9rc8vhwp95c64ym7hc8zh6zm41578pvdqgdy6y5j";
|
||||
};
|
||||
buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame
|
||||
kdelibs automoc4 phonon ];
|
||||
|
||||
@ -1,18 +1,19 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
|
||||
, libvncserver, libmsn, giflib, gpgme, boost, libv4l
|
||||
, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
|
||||
, libXi, libXtst, libXdamage, libXxf86vm
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdenetwork-4.4.2";
|
||||
name = "kdenetwork-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdenetwork-4.4.2.tar.bz2;
|
||||
sha256 = "08rlbixv1q3x3zscyfr2jpdr33rgaw54hyszyd92ny6l13g2hf56";
|
||||
url = mirror://kde/stable/4.4.3/src/kdenetwork-4.4.3.tar.bz2;
|
||||
sha256 = "1p2cx7vr811vrx4d0sqchgz5jy195rw2nbg01brk8i0ihiqfqycg";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
|
||||
libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l
|
||||
libXi libXtst libXdamage libXxf86vm
|
||||
libotr libXi libXtst libXdamage libXxf86vm
|
||||
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ];
|
||||
patches = [ ./kget-cve.patch ];
|
||||
meta = {
|
||||
description = "KDE network utilities";
|
||||
longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
|
||||
|
||||
212
pkgs/desktops/kde-4.4/network/kget-cve.patch
Normal file
212
pkgs/desktops/kde-4.4/network/kget-cve.patch
Normal file
@ -0,0 +1,212 @@
|
||||
Index: kget/transfer-plugins/metalink/metalink.cpp
|
||||
===================================================================
|
||||
--- a/kget/transfer-plugins/metalink/metalink.cpp (revision 1124973)
|
||||
+++ b/kget/transfer-plugins/metalink/metalink.cpp (revision 1124974)
|
||||
@@ -99,6 +99,7 @@
|
||||
void Metalink::metalinkInit(const KUrl &src, const QByteArray &data)
|
||||
{
|
||||
kDebug(5001);
|
||||
+
|
||||
bool justDownloaded = !m_localMetalinkLocation.isValid();
|
||||
if (!src.isEmpty())
|
||||
{
|
||||
@@ -121,7 +122,9 @@
|
||||
//error
|
||||
if (!m_metalink.isValid())
|
||||
{
|
||||
- kDebug(5001) << "Unknown error when trying to load the .metalink-file";
|
||||
+ kError(5001) << "Unknown error when trying to load the .metalink-file. Metalink is not valid.";
|
||||
+ setStatus(Job::Aborted);
|
||||
+ setTransferChange(Tc_Status, true);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -202,7 +205,7 @@
|
||||
if (!m_dataSourceFactory.size())
|
||||
{
|
||||
KMessageBox::error(0, i18n("Download failed, no working URLs were found."), i18n("Error"));
|
||||
- setStatus(Job::Aborted, i18n("An error occurred...."), SmallIcon("document-preview"));
|
||||
+ setStatus(Job::Aborted);
|
||||
setTransferChange(Tc_Status, true);
|
||||
return;
|
||||
}
|
||||
@@ -227,16 +230,29 @@
|
||||
ui.treeView->hideColumn(FileItem::SignatureVerified);
|
||||
dialog->setMainWidget(widget);
|
||||
dialog->setCaption(i18n("File Selection"));
|
||||
- dialog->setButtons(KDialog::Ok);
|
||||
- connect(dialog, SIGNAL(finished()), this, SLOT(filesSelected()));
|
||||
+ dialog->setButtons(KDialog::Ok | KDialog::Cancel);
|
||||
+ connect(dialog, SIGNAL(finished(int)), this, SLOT(fileDlgFinished(int)));
|
||||
|
||||
dialog->show();
|
||||
}
|
||||
}
|
||||
|
||||
-void Metalink::filesSelected()
|
||||
+void Metalink::fileDlgFinished(int result)
|
||||
{
|
||||
+ //BEGIN HACK if the dialog was not accepted untick every file, so that the download does not start
|
||||
+ //generally setStatus should do the job as well, but does not as it appears
|
||||
+ if (result != QDialog::Accepted) {
|
||||
+ for (int row = 0; row < fileModel()->rowCount(); ++row) {
|
||||
+ QModelIndex index = fileModel()->index(row, FileItem::File);
|
||||
+ if (index.isValid()) {
|
||||
+ fileModel()->setData(index, Qt::Unchecked, Qt::CheckStateRole);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ //END
|
||||
+
|
||||
QModelIndexList files = fileModel()->fileIndexes(FileItem::File);
|
||||
+ int numFilesSelected = 0;
|
||||
foreach (const QModelIndex &index, files)
|
||||
{
|
||||
const KUrl dest = fileModel()->getUrl(index);
|
||||
@@ -244,6 +260,9 @@
|
||||
if (m_dataSourceFactory.contains(dest))
|
||||
{
|
||||
m_dataSourceFactory[dest]->setDoDownload(doDownload);
|
||||
+ if (doDownload) {
|
||||
+ ++numFilesSelected;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -252,9 +271,15 @@
|
||||
processedSizeChanged();
|
||||
speedChanged();
|
||||
|
||||
+ //no files selected to download or dialog rejected, stop the download
|
||||
+ if (!numFilesSelected || (result != QDialog::Accepted)) {
|
||||
+ setStatus(Job::Stopped);//FIXME
|
||||
+ setTransferChange(Tc_Status, true);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
//some files may be set to download, so start them as long as the transfer is not stopped
|
||||
- if (status() != Job::Stopped)
|
||||
- {
|
||||
+ if (status() != Job::Stopped) {
|
||||
startMetalink();
|
||||
}
|
||||
}
|
||||
Index: kget/transfer-plugins/metalink/metalink.h
|
||||
===================================================================
|
||||
--- a/kget/transfer-plugins/metalink/metalink.h (revision 1124973)
|
||||
+++ b/kget/transfer-plugins/metalink/metalink.h (revision 1124974)
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
private Q_SLOTS:
|
||||
void metalinkInit(const KUrl &url = KUrl(), const QByteArray &data = QByteArray());
|
||||
- void filesSelected();
|
||||
+ void fileDlgFinished(int result);
|
||||
void totalSizeChanged(KIO::filesize_t size);
|
||||
void processedSizeChanged();
|
||||
void speedChanged();
|
||||
Index: kget/ui/metalinkcreator/metalinker.h
|
||||
===================================================================
|
||||
--- a/kget/ui/metalinkcreator/metalinker.h (revision 1124973)
|
||||
+++ b/kget/ui/metalinkcreator/metalinker.h (revision 1124974)
|
||||
@@ -259,6 +259,14 @@
|
||||
KIO::filesize_t size;
|
||||
CommonData data;
|
||||
Resources resources;
|
||||
+
|
||||
+ private:
|
||||
+ /**
|
||||
+ * Controlls if the name attribute is valid, i.e. it is not empty and
|
||||
+ * does not contain any directory traversal directives or information,
|
||||
+ * as described in the Metalink 4.0 specification 4.1.2.1.
|
||||
+ */
|
||||
+ bool isValidNameAttribute() const;
|
||||
};
|
||||
|
||||
class Files
|
||||
Index: kget/ui/metalinkcreator/metalinker.cpp
|
||||
===================================================================
|
||||
--- a/kget/ui/metalinkcreator/metalinker.cpp (revision 1124973)
|
||||
+++ b/kget/ui/metalinkcreator/metalinker.cpp (revision 1124974)
|
||||
@@ -528,14 +528,14 @@
|
||||
|
||||
bool KGetMetalink::File::isValid() const
|
||||
{
|
||||
- return !name.isEmpty() && resources.isValid();
|
||||
+ return isValidNameAttribute() && resources.isValid();
|
||||
}
|
||||
|
||||
void KGetMetalink::File::load(const QDomElement &e)
|
||||
{
|
||||
data.load(e);
|
||||
|
||||
- name = e.attribute("name");
|
||||
+ name = QUrl::fromPercentEncoding(e.attribute("name").toAscii());
|
||||
size = e.firstChildElement("size").text().toULongLong();
|
||||
|
||||
verification.load(e);
|
||||
@@ -575,6 +575,22 @@
|
||||
resources.clear();
|
||||
}
|
||||
|
||||
+
|
||||
+bool KGetMetalink::File::isValidNameAttribute() const
|
||||
+{
|
||||
+ if (name.isEmpty()) {
|
||||
+ kError(5001) << "Name attribute of Metalink::File is empty.";
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ if (name.contains(QRegExp("$(\\.\\.?)?/")) || name.contains("/../") || name.endsWith("/..")) {
|
||||
+ kError(5001) << "Name attribute of Metalink::File contains directory traversal directives:" << name;
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
#ifdef HAVE_NEPOMUK
|
||||
QHash<QUrl, Nepomuk::Variant> KGetMetalink::File::properties() const
|
||||
{
|
||||
@@ -584,13 +600,28 @@
|
||||
|
||||
bool KGetMetalink::Files::isValid() const
|
||||
{
|
||||
- bool isValid = !files.empty();
|
||||
- foreach (const File &file, files)
|
||||
- {
|
||||
- isValid &= file.isValid();
|
||||
+ if (files.isEmpty()) {
|
||||
+ return false;
|
||||
}
|
||||
|
||||
- return isValid;
|
||||
+ QStringList fileNames;
|
||||
+ foreach (const File &file, files) {
|
||||
+ fileNames << file.name;
|
||||
+ if (!file.isValid()) {
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ //The value of name must be unique for each file
|
||||
+ while (!fileNames.isEmpty()) {
|
||||
+ const QString fileName = fileNames.takeFirst();
|
||||
+ if (fileNames.contains(fileName)) {
|
||||
+ kError(5001) << "Metalink::File name" << fileName << "exists multiple times.";
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return true;
|
||||
}
|
||||
|
||||
void KGetMetalink::Files::load(const QDomElement &e)
|
||||
@@ -751,7 +782,7 @@
|
||||
|
||||
for (QDomElement elem = filesElem.firstChildElement("file"); !elem.isNull(); elem = elem.nextSiblingElement("file")) {
|
||||
File file;
|
||||
- file.name = elem.attribute("name");
|
||||
+ file.name = QUrl::fromPercentEncoding(elem.attribute("name").toAscii());
|
||||
file.size = elem.firstChildElement("size").text().toULongLong();
|
||||
|
||||
file.data = parseCommonData(elem);
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, lib, cmake}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "oxygen-icons-4.4.2";
|
||||
name = "oxygen-icons-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/oxygen-icons-4.4.2.tar.bz2;
|
||||
sha256 = "0n0pyf861a5y1j03d9qyb8w7xnn81w2i503pv3lh48bvk1pc0zim";
|
||||
url = mirror://kde/stable/4.4.3/src/oxygen-icons-4.4.3.tar.bz2;
|
||||
sha256 = "1pqz6l8zdijcz4r2qrkx92skcqbijiip90m2j3aiawr1m6rv2l0j";
|
||||
};
|
||||
buildInputs = [ cmake ];
|
||||
meta = {
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
, automoc4, phonon, akonadi, soprano, strigi}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdepim-runtime-4.4.2";
|
||||
name = "kdepim-runtime-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdepim-runtime-4.4.2.tar.bz2;
|
||||
sha256 = "05baz0wslxyvdilwj1lx9gg77xh51pa5ah91855vkfsjlc0qzvcs";
|
||||
url = mirror://kde/stable/4.4.3/src/kdepim-runtime-4.4.3.tar.bz2;
|
||||
sha256 = "128azx9bw2fzc9780kf9pzvf745y8kflyb2vrb7mdwmskbr0gm3g";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
|
||||
kdelibs kdepimlibs
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdepim-4.4.2";
|
||||
name = "kdepim-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdepim-4.4.2.tar.bz2;
|
||||
sha256 = "0dnk0gv3l4ls70jgy1w9z312gvdyv1bvl9w911dyv1qmfg8cc7w4";
|
||||
url = mirror://kde/stable/4.4.3/src/kdepim-4.4.3.tar.bz2;
|
||||
sha256 = "0lpr9q1p89hw22d545yc9ih8m5wmnzc7j7m9cvliyalkk0ys5lqa";
|
||||
};
|
||||
builder = ./builder.sh;
|
||||
buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, kdelibs, automoc4, phonon, akonadi}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdepimlibs-4.4.2";
|
||||
name = "kdepimlibs-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdepimlibs-4.4.2.tar.bz2;
|
||||
sha256 = "071rxf3ym3yf4klzy5dcvrppfm6lm8lhfphidgq97in322g76kl8";
|
||||
url = mirror://kde/stable/4.4.3/src/kdepimlibs-4.4.3.tar.bz2;
|
||||
sha256 = "1q95zwkncady9lviz7bs9pnp1fkqlmnp33vj446m3krwjdh19b4c";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap shared_mime_info
|
||||
kdelibs automoc4 phonon akonadi ];
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
, automoc4, phonon, soprano, eigen, qimageblitz, attica}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeplasma-addons-4.4.2";
|
||||
name = "kdeplasma-addons-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdeplasma-addons-4.4.2.tar.bz2;
|
||||
sha256 = "044xfs4j98wgc0zjfxsml7wlydna3h31zdpxnkv178sq592m1pid";
|
||||
url = mirror://kde/stable/4.4.3/src/kdeplasma-addons-4.4.3.tar.bz2;
|
||||
sha256 = "00pr74x0q88wn7a4v6m35djcd29yw870fd6dgklqp1zs5yrn0p97";
|
||||
};
|
||||
inherit kdebase_workspace;
|
||||
builder = ./builder.sh;
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, strigi}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdesdk-4.4.2";
|
||||
name = "kdesdk-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdesdk-4.4.2.tar.bz2;
|
||||
sha256 = "1cjbk35cqjif1ng8mlb5lcsilcxy9j62iviz8mzrwivdf9sixa1r";
|
||||
url = mirror://kde/stable/4.4.3/src/kdesdk-4.4.3.tar.bz2;
|
||||
sha256 = "01wqyixni9sb4330b1cvaysaf7jsvmy9ijjryv8ixnaam3gkxzs7";
|
||||
};
|
||||
builder=./builder.sh;
|
||||
inherit aprutil;
|
||||
|
||||
@ -1,21 +1,27 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4
|
||||
{ stdenv, fetchurl, cmake, qt4, automoc4, pkgconfig
|
||||
, libXau, libXdmcp, libpthreadstubs
|
||||
, gst_all, xineLib, automoc4}:
|
||||
, gstreamer, gstPluginsBase, xineLib, pulseaudio}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "phonon-4.3.80";
|
||||
let
|
||||
v = "4.4.1";
|
||||
stable = true;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "phonon-${v}";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/unstable/phonon/phonon-4.3.80.tar.bz2;
|
||||
sha256 = "1v4ba2ddphkv0gjki5das5brd1wp4nf5ci73c7r1pnyp8mgjkjw9";
|
||||
url = "mirror://kde/${if stable then "" else "un"}stable/phonon/${v}/${name}.tar.bz2";
|
||||
sha256 = "0xsjbvpiqrsmqvxmhmjkwyhcxkajf1f78pg67kfwidaz9kkv0lla";
|
||||
};
|
||||
includeAllQtDirs=true;
|
||||
NIX_CFLAGS_COMPILE = "-I${gst_all.gstPluginsBase}/include/${gst_all.prefix}";
|
||||
buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ];
|
||||
meta = {
|
||||
patches = [ ./phonon-4.4.1-gst-plugins-include.patch ];
|
||||
buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gstreamer
|
||||
gstPluginsBase xineLib automoc4 pulseaudio pkgconfig ];
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
description = "KDE Multimedia API";
|
||||
longDescription = "KDE Multimedia API which abstracts over various backends such as GStreamer and Xine";
|
||||
license = "LGPL";
|
||||
homepage = http://phonon.kde.org;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
maintainers = [ maintainers.sander maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,263 @@
|
||||
From 1e3a6c25bc258021899c0a31ea9b68ea656d8f6b Mon Sep 17 00:00:00 2001
|
||||
From: Yury G. Kudryashov <urkud.urkud@gmail.com>
|
||||
Date: Sat, 8 May 2010 18:42:35 +0400
|
||||
Subject: [PATCH] Find include directories as well
|
||||
|
||||
Makes it possible to compile phonon if gstreamer and gst-plugins-base are
|
||||
installed into different prefixes. Theoretically, should work even if each
|
||||
plugin is installed into dedicated prefix, but this feature is not tested.
|
||||
---
|
||||
cmake/FindGStreamerPlugins.cmake | 160 +++++++++++++++-----------------------
|
||||
gstreamer/CMakeLists.txt | 4 +-
|
||||
gstreamer/ConfigureChecks.cmake | 10 +-
|
||||
3 files changed, 72 insertions(+), 102 deletions(-)
|
||||
|
||||
diff --git a/cmake/FindGStreamerPlugins.cmake b/cmake/FindGStreamerPlugins.cmake
|
||||
index f6d70d5..9e7a4d0 100644
|
||||
--- a/cmake/FindGStreamerPlugins.cmake
|
||||
+++ b/cmake/FindGStreamerPlugins.cmake
|
||||
@@ -2,19 +2,63 @@
|
||||
# Once done this will define
|
||||
#
|
||||
# GSTREAMERPLUGINSBASE_FOUND - system has GStreamer_Plugins
|
||||
-# GSTREAMERPLUGINSBASE_INCLUDE_DIR - the GStreamer_Plugins include directory
|
||||
+# GSTREAMERPLUGINSBASE_INCLUDE_DIRS - the GStreamer_Plugins include directories
|
||||
# GSTREAMERPLUGINSBASE_LIBRARIES - the libraries needed to use GStreamer_Plugins
|
||||
-# GSTREAMERPLUGINSBASE_DEFINITIONS - Compiler switches required for using GStreamer_Plugins
|
||||
+#
|
||||
+# The following variables are set for each plugin PLUGINNAME:
|
||||
+#
|
||||
+# GSTREAMER_PLUGIN_PLUGINNAME_FOUND - plugin is found
|
||||
+# GSTREAMER_PLUGIN_PLUGINNAME_INCLUDE_DIR - plugin include directory
|
||||
+# GSTREAMER_PLUGIN_PLUGINNAME_LIBRARY - the library needed to use plugin
|
||||
#
|
||||
# (c)2009 Nokia Corporation
|
||||
+# (c)2010 Yury G. Kudryashov <urkud@ya.ru>
|
||||
|
||||
FIND_PACKAGE(PkgConfig REQUIRED)
|
||||
|
||||
IF (NOT WIN32)
|
||||
# don't make this check required - otherwise you can't use macro_optional_find_package on this one
|
||||
- PKG_CHECK_MODULES( PKG_GSTREAMER gstreamer-plugins-base-0.10 )
|
||||
+ PKG_CHECK_MODULES( PKG_GSTREAMER_PLUGINSBASE gstreamer-plugins-base-0.10 )
|
||||
ENDIF (NOT WIN32)
|
||||
|
||||
+MACRO(MACRO_FIND_GSTREAMER_PLUGIN _plugin _header)
|
||||
+ STRING(TOUPPER ${_plugin} _upper)
|
||||
+ IF (NOT WIN32)
|
||||
+ # don't make this check required - otherwise you can't use macro_optional_find_package on this one
|
||||
+ PKG_CHECK_MODULES( PKG_GSTREAMER_${_upper} gstreamer-${_plugin}-0.10 )
|
||||
+ ENDIF (NOT WIN32)
|
||||
+
|
||||
+ FIND_LIBRARY(GSTREAMER_PLUGIN_${_upper}_LIBRARY NAMES gst${_plugin}-0.10
|
||||
+ PATHS
|
||||
+ ${PKG_GSTREAMER_PLUGINSBASE_LIBRARY_DIRS}
|
||||
+ ${PKG_GSTREAMER_${_upper}_LIBRARY_DIRS}
|
||||
+ )
|
||||
+
|
||||
+ FIND_PATH(GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR
|
||||
+ NAMES gst/${_plugin}/${_header}
|
||||
+ PATHS
|
||||
+ ${PKG_GSTREAMER_PLUGINSBASE_INCLUDE_DIRS}
|
||||
+ ${PKG_GSTREAMER_${_upper}_INCLUDE_DIRS}
|
||||
+ )
|
||||
+
|
||||
+ IF(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR)
|
||||
+ SET(GSTREAMER_PLUGIN_${_upper}_FOUND TRUE)
|
||||
+ LIST(APPEND GSTREAMERPLUGINSBASE_INCLUDE_DIRS GSTREAMER_${_upper}_INCLUDE_DIR)
|
||||
+ LIST(APPEND GSTREAMERPLUGINSBASE_LIBRARIES GSTREAMER_${_upper}_LIBRARY)
|
||||
+ ELSE(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR)
|
||||
+ MESSAGE(STATUS "Could not find ${_plugin} plugin")
|
||||
+ MESSAGE(STATUS "${_upper} library: ${GSTREAMER_${_upper}_LIBRARY}")
|
||||
+ MESSAGE(STATUS "${_upper} include dir: ${GSTREAMER_${_upper}_INCLUDE_DIR}")
|
||||
+ SET(GSTREAMER_PLUGIN_${_upper}_FOUND FALSE)
|
||||
+ SET(GSTREAMER_PLUGIN_${_upper}_LIBRARY GSTREAMER_${_upper}_LIBRARY-NOTFOUND)
|
||||
+ SET(GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR GSTREAMER_${_upper}_INCLUDE_DIR-NOTFOUND)
|
||||
+ SET(GSTREAMERPLUGINSBASE_FOUND FALSE)
|
||||
+ ENDIF(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR)
|
||||
+
|
||||
+ MARK_AS_ADVANCED(GSTREAMER_PLUGIN_${_upper}_LIBRARY
|
||||
+ GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR)
|
||||
+ENDMACRO(MACRO_FIND_GSTREAMER_PLUGIN)
|
||||
+
|
||||
#
|
||||
# Base plugins:
|
||||
# audio
|
||||
@@ -31,87 +75,21 @@ ENDIF (NOT WIN32)
|
||||
# The gstinterfaces-0.10 library is found by FindGStreamer.cmake
|
||||
#
|
||||
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_AUDIO_LIBRARIES NAMES gstaudio-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_CDDA_LIBRARIES NAMES gstcdda-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES NAMES gstnetbuffer-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_PBUTILS_LIBRARIES NAMES gstpbutils-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_RIFF_LIBRARIES NAMES gstriff-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_RTP_LIBRARIES NAMES gstrtp-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_RTSP_LIBRARIES NAMES gstrtsp-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_SDP_LIBRARIES NAMES gstsdp-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_TAG_LIBRARIES NAMES gsttag-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-FIND_LIBRARY(GSTREAMER_PLUGIN_VIDEO_LIBRARIES NAMES gstvideo-0.10
|
||||
- PATHS
|
||||
- ${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
- )
|
||||
-
|
||||
-IF (GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_CDDA_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_PBUTILS_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RIFF_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RTP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RTSP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_SDP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_TAG_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_VIDEO_LIBRARIES)
|
||||
- SET(GSTREAMERPLUGINSBASE_FOUND TRUE)
|
||||
-ELSE (GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_CDDA_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_PBUTILS_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RIFF_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RTP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RTSP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_SDP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_TAG_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_VIDEO_LIBRARIES)
|
||||
- SET(GSTREAMERPLUGINSBASE_FOUND FALSE)
|
||||
-ENDIF (GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_CDDA_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_PBUTILS_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RIFF_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RTP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_RTSP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_SDP_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_TAG_LIBRARIES AND
|
||||
- GSTREAMER_PLUGIN_VIDEO_LIBRARIES)
|
||||
+SET(GSTREAMER_PLUGINSBASE_FOUND TRUE)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(audio audio.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(cdda gstcddabasesrc.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(netbuffer gstnetbuffer.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(pbutils pbutils.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(riff riff-ids.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(rtp gstrtpbuffer.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(rtsp gstrtspdefs.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(sdp gstsdp.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(tag tag.h)
|
||||
+MACRO_FIND_GSTREAMER_PLUGIN(video video.h)
|
||||
|
||||
IF (GSTREAMERPLUGINSBASE_FOUND)
|
||||
- SET(GSTREAMERPLUGINS_FOUND TRUE)
|
||||
-ELSE (GSTREAMERPLUGINSBASE_FOUND)
|
||||
- SET(GSTREAMERPLUGINS_FOUND FALSE)
|
||||
-ENDIF (GSTREAMERPLUGINSBASE_FOUND)
|
||||
-
|
||||
-IF (GSTREAMERPLUGINS_FOUND)
|
||||
+ LIST(REMOVE_DUPLICATES GSTREAMERPLUGINSBASE_LIBRARIES)
|
||||
+ LIST(REMOVE_DUPLICATES GSTREAMERPLUGINSBASE_INCLUDE_DIRS)
|
||||
IF (NOT GStreamer_Plugins_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found GStreamer Plugins:
|
||||
${GSTREAMER_PLUGIN_AUDIO_LIBRARIES}
|
||||
@@ -125,20 +103,10 @@ IF (GSTREAMERPLUGINS_FOUND)
|
||||
${GSTREAMER_PLUGIN_TAG_LIBRARIES}
|
||||
${GSTREAMER_PLUGIN_VIDEO_LIBRARIES}")
|
||||
ENDIF (NOT GStreamer_Plugins_FIND_QUIETLY)
|
||||
-ELSE (GSTREAMERPLUGINS_FOUND)
|
||||
+ELSE (GSTREAMERPLUGINSBASE_FOUND)
|
||||
+ SET(GSTREAMERPLUGINSBASE_LIBRARIES GSTREAMERPLUGINSBASE_LIBRARIES-NOTFOUND)
|
||||
+ SET(GSTREAMERPLUGINSBASE_INCLUDE_DIRS GSTREAMERPLUGINSBASE_INCLUDE_DIRS-NOTFOUND)
|
||||
IF (GStreamer_Plugins_FIND_REQUIRED)
|
||||
MESSAGE(SEND_ERROR "Could NOT find GStreamer Plugins")
|
||||
ENDIF (GStreamer_Plugins_FIND_REQUIRED)
|
||||
-ENDIF (GSTREAMERPLUGINS_FOUND)
|
||||
-
|
||||
-MARK_AS_ADVANCED(GSTREAMERPLUGINS_DEFINITIONS
|
||||
- GSTREAMER_PLUGIN_AUDIO_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_CDDA_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_PBUTILS_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_RIFF_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_RTP_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_RTSP_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_SDP_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_TAG_LIBRARIES
|
||||
- GSTREAMER_PLUGIN_VIDEO_LIBRARIES)
|
||||
+ENDIF (GSTREAMERPLUGINSBASE_FOUND)
|
||||
diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt
|
||||
index d529fb6..c42710b 100644
|
||||
--- a/gstreamer/CMakeLists.txt
|
||||
+++ b/gstreamer/CMakeLists.txt
|
||||
@@ -20,6 +20,8 @@ if (BUILD_PHONON_GSTREAMER)
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${GSTREAMER_INCLUDE_DIR}
|
||||
+ ${GSTREAMER_PLUGIN_VIDEO_INCLUDE_DIR}
|
||||
+ ${GSTREAMER_PLUGIN_AUDIO_INCLUDE_DIR}
|
||||
${GLIB2_INCLUDE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${X11_X11_INCLUDE_PATH})
|
||||
@@ -78,7 +80,7 @@ if (BUILD_PHONON_GSTREAMER)
|
||||
${QT_QTOPENGL_LIBRARY}
|
||||
${PHONON_LIBS} ${OPENGL_gl_LIBRARY}
|
||||
${GSTREAMER_LIBRARIES} ${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_INTERFACE_LIBRARY}
|
||||
- ${GSTREAMER_PLUGIN_VIDEO_LIBRARIES} ${GSTREAMER_PLUGIN_AUDIO_LIBRARIES}
|
||||
+ ${GSTREAMER_PLUGIN_VIDEO_LIBRARY} ${GSTREAMER_PLUGIN_AUDIO_LIBRARY}
|
||||
${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES})
|
||||
if(ALSA_FOUND)
|
||||
target_link_libraries(phonon_gstreamer ${ASOUND_LIBRARY})
|
||||
diff --git a/gstreamer/ConfigureChecks.cmake b/gstreamer/ConfigureChecks.cmake
|
||||
index 095a0e9..73616fa 100644
|
||||
--- a/gstreamer/ConfigureChecks.cmake
|
||||
+++ b/gstreamer/ConfigureChecks.cmake
|
||||
@@ -16,8 +16,8 @@ macro_optional_find_package(GStreamer)
|
||||
macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 0.10 is required for the multimedia backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
|
||||
|
||||
macro_optional_find_package(GStreamerPlugins)
|
||||
-macro_log_feature(GSTREAMER_PLUGIN_VIDEO_LIBRARIES "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
|
||||
-macro_log_feature(GSTREAMER_PLUGIN_AUDIO_LIBRARIES "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
|
||||
+macro_log_feature(GSTREAMER_PLUGIN_VIDEO_FOUND "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
|
||||
+macro_log_feature(GSTREAMER_PLUGIN_AUDIO_FOUND "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
|
||||
|
||||
macro_optional_find_package(GLIB2)
|
||||
macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the gstreamer backend for Phonon" "http://www.gtk.org/download/" FALSE)
|
||||
@@ -31,8 +31,8 @@ macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the gs
|
||||
macro_optional_find_package(OpenGL)
|
||||
macro_log_feature(OPENGL_FOUND "OpenGL" "OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE)
|
||||
|
||||
-if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
|
||||
+if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_FOUND AND GSTREAMER_PLUGIN_AUDIO_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
|
||||
set(BUILD_PHONON_GSTREAMER TRUE)
|
||||
-else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
|
||||
+else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_FOUND AND GSTREAMER_PLUGIN_AUDIO_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
|
||||
set(BUILD_PHONON_GSTREAMER FALSE)
|
||||
-endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
|
||||
+endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_FOUND AND GSTREAMER_PLUGIN_AUDIO_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@ -6,7 +6,8 @@ stdenv.mkDerivation {
|
||||
url = mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-0.9.3.tar.bz2;
|
||||
sha256 = "08mz8p98nlxnxy1l751jg1010vgjq2f2d6n4cj27jvihqkpbaixn";
|
||||
};
|
||||
buildInputs = [ cmake qt4 policykit automoc4 ];
|
||||
buildInputs = [ cmake automoc4 ];
|
||||
propagatedBuildInputs = [ qt4 policykit ];
|
||||
meta = {
|
||||
description = "Qt PolicyKit bindings";
|
||||
license = "LGPL";
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
configureFlags="--no-separate-debug-info --with-qca=${qca2}
|
||||
--with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
|
||||
preConfigure=''
|
||||
configureFlags="$configureFlags --plugins-path=$out/plugins"
|
||||
configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
|
||||
'';
|
||||
patches = [ ./ossl-remove-whirlpool.patch ];
|
||||
meta = {
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdetoys-4.4.2";
|
||||
name = "kdetoys-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdetoys-4.4.2.tar.bz2;
|
||||
sha256 = "12yqykbl278w19wxaa6yl9m72ykih81v0rwgnfn0bq3zkwj1z5y0";
|
||||
url = mirror://kde/stable/4.4.3/src/kdetoys-4.4.3.tar.bz2;
|
||||
sha256 = "0x99qkmbbskdnznzidh52sh4hnfzvq8a3363gzs532wmabv1gnl6";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
|
||||
meta = {
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
, kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeutils-4.4.2";
|
||||
name = "kdeutils-4.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdeutils-4.4.2.tar.bz2;
|
||||
sha256 = "13b8ygyaz61h1lq55fa2a4x88439rbaqqagw0syqqr9lmx63xc2j";
|
||||
url = mirror://kde/stable/4.4.3/src/kdeutils-4.4.3.tar.bz2;
|
||||
sha256 = "1yncgljnvw7fvvcazr3f75634czjdzxg0s3kchscvxhfq632p4g5";
|
||||
};
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, kdelibs, kdepimlibs, automoc4, phonon}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdewebdev-4.4.2";
|
||||
name = "kdewebdev-4.4.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.2/src/kdewebdev-4.4.2.tar.bz2;
|
||||
sha256 = "0rc1xbs6daczpxryhch5gqwl95amk1qz9r72k46dv86pbbd9qvl5";
|
||||
url = mirror://kde/stable/4.4.3/src/kdewebdev-4.4.3.tar.bz2;
|
||||
sha256 = "1b1ip3b5lb3z2lrs5rslkzhjl942dh3srjxmkwwcfcg6md8h8ph5";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
|
||||
meta = {
|
||||
|
||||
24
pkgs/desktops/xfce-4/applications/terminal/default.nix
Normal file
24
pkgs/desktops/xfce-4/applications/terminal/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchurl
|
||||
, pkgconfig, ncurses
|
||||
, intltool, vte
|
||||
, libexo, libxfce4util
|
||||
, gtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xfce-terminal-0.4.4";
|
||||
src = fetchurl {
|
||||
url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.4.tar.bz2;
|
||||
sha256 = "1cmkrzgi2j5dgb1jigdqigf7fa84hh9l2bclgxzn17168cwpd1lw";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool libexo gtk vte libxfce4util ncurses ];
|
||||
|
||||
CPPFLAGS = "-I${libexo}/include/exo-0.3 -I{libxfce4util}/include/xfce4";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xfce.org/projects/terminal;
|
||||
description = "A modern terminal emulator primarily for the Xfce desktop environment";
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
23
pkgs/desktops/xfce-4/core/libexo/default.nix
Normal file
23
pkgs/desktops/xfce-4/core/libexo/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl
|
||||
, pkgconfig
|
||||
, intltool
|
||||
, URI
|
||||
, glib, gtk
|
||||
, libxfce4util
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libexo-0.3.106";
|
||||
src = fetchurl {
|
||||
url = http://archive.xfce.org/src/xfce/exo/0.3/exo-0.3.106.tar.bz2;
|
||||
sha256 = "1n823ipqdz47kxq6fwry3zza3j9ap7gikwm4s8169297xcjqd6qb";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool URI glib gtk libxfce4util ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xfce.org/projects/exo;
|
||||
description = "Application library for the Xfce desktop environment";
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
20
pkgs/desktops/xfce-4/core/libxfce4util/default.nix
Normal file
20
pkgs/desktops/xfce-4/core/libxfce4util/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl
|
||||
, pkgconfig
|
||||
, glib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxfce4util-4.6.1";
|
||||
src = fetchurl {
|
||||
url = http://www.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2;
|
||||
sha256 = "0sy1222s0cq8zy2ankrp1747b6fg5jjahxrddih4gxc97iyxrv6f";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xfce.org/;
|
||||
description = "Basic utility non-GUI functions for Xfce";
|
||||
license = "GPLv2";
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user