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

Merging from trunk.

Browse Source 
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
This commit is contained in:
Lluís Batlle i Rossell 2010-04-22 21:44:33 +00:00
commit 6f2fac6466
413 changed files with 119110 additions and 6314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/scripts/gnu/gnupdate Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
exec "${GUILE:-guile}" $GUILE_FLAGS -L . -l gnupdate.scm \
-e '(apply main (cdr (command-line)))' -- "$@"

720
maintainers/scripts/gnu/gnupdate.scm Normal file
View File

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

1227
maintainers/scripts/gnu/sxml-match.scm Normal file
View File

File diff suppressed because it is too large Load Diff

54
pkgs/applications/audio/audacious/default.nix Normal file
View File

@ -0,0 +1,54 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli, libmcs
, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg
, libvorbis, libcdio, libcddb, flac, ffmpeg
}:
stdenv.mkDerivation rec {
name = "audacious-2.3";
src = fetchurl {
url = "http://distfiles.atheme.org/${name}.tgz";
sha256 = "0vs16y1vrlkzcbaw8imc36b9lncva69zkdkp38ikbidssiskm6xi";
};
pluginsSrc = fetchurl {
url = "http://distfiles.atheme.org/audacious-plugins-2.3.tgz";
sha256 = "0hdami52qpiyim3nz3qnml85wgjzpmx6g2wahfnsdvncmhm4v93x";
};
# `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
configureFlags = "--enable-amidiplug";
buildInputs =
[ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib
libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio
libcddb ffmpeg
];
# Here we build bouth audacious and audacious-plugins in one
# derivations, since they really expect to be in the same prefix.
# This is slighly tricky.
builder = builtins.toFile "builder.sh"
''
# First build audacious.
(
source $stdenv/setup
genericBuild
)
# Then build the plugins.
(
buildNativeInputs="$out $buildNativeInputs" # to find audacious
source $stdenv/setup
rm -rfv audacious-*
src=$pluginsSrc
genericBuild
)
'';
meta = {
description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
homepage = http://audacious-media-player.org/;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

32
pkgs/applications/audio/audacious/player.nix
View File

@ -1,32 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli
, libglade, libmcs, gettext, xlibs, dbus_glib
}:
stdenv.mkDerivation {
name = "audacious-1.5.1";
src = fetchurl {
url = http://distfiles.atheme.org/audacious-1.5.1.tbz2;
sha256 = "1s32pdgx85qkrq15wwmvdw7wbcbxcf3nrhqxi6y72aijqm6fjwnz";
};
buildInputs = [pkgconfig libglade libmcs gettext dbus_glib];
propagatedBuildInputs = [glib gtk libmowgli libmcs];
NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib";
# Otherwise we barf with "libgcc_s.so.1 must be installed for
# pthread_cancel to work" on exit, as it tries to find libgcc_s
# dynamically.
dontPatchELF = true;
preBuild = ''
ensureDir $out/lib
'';
meta = {
description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
homepage = http://audacious-media-player.org/;
};
}

33
pkgs/applications/audio/audacious/plugins.nix
View File

@ -1,33 +0,0 @@
{ stdenv, fetchurl, pkgconfig, audacious, dbus_glib, gettext
, libmad, xlibs, alsaLib, taglib, libmpcdec, libogg, libvorbis
, libcdio, libcddb, libxml2
}:
stdenv.mkDerivation {
name = "audacious-plugins-1.5.1";
src = fetchurl {
url = http://distfiles.atheme.org/audacious-plugins-1.5.1.tbz2;
sha256 = "1ki5bd50g4vi4d0qzxynyrgaq2n4cwhbsxln9rwk8ppphvk9pawc";
};
buildInputs = [
pkgconfig audacious dbus_glib gettext libmad
xlibs.libXcomposite alsaLib taglib libmpcdec
libogg libvorbis libcdio libcddb libxml2
];
preBuild = ''
makeFlagsArray=(pluginlibdir=$out/lib/audacious)
'';
NIX_LDFLAGS = "-L${audacious}/lib/audacious"; # needed because we override pluginlibdir
# `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
configureFlags = "--enable-amidiplug";
meta = {
description = "Plugins for the Audacious media player";
homepage = http://audacious-media-player.org/;
};
}

10
pkgs/applications/editors/eclipse/default.nix
View File

@ -6,18 +6,18 @@
assert stdenv ? glibc; assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "eclipse-3.5.1"; name = "eclipse-3.5.2";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { 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; 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;
sha256 = "132zd7q9q29h978wnlsfbrlszc85r1wj30yqs2aqbv3l5xgny1kk"; md5 = "54e2ce0660b2b1b0eb4267acf70ea66d";
} }
else else
fetchurl { 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; url = http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56"; md5 = "bde55a2354dc224cf5f26e5320e72dac";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {

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

@ -1,14 +1,19 @@
{stdenv, fetchurl, emacs, texinfo}: {stdenv, fetchurl, emacs, texinfo, autoconf, automake}:
let
version = "0.7-109-g0fc3980";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "magit-0.7"; name = "magit-${version}";
src = fetchurl { src = fetchurl {
url = "http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz"; url = "http://cryp.to/magit-mainline-${version}.tar.gz";
sha256 = "0qry1vj41pycwkf71sqrz3zgzh85zdg5acq26asscq4s7jksrjiz"; sha256 = "0jyx57znvn49xm0h92kh8iywn44ip130dpflzq2ns2k6gspg36b6";
}; };
unpackCmd = "tar xf $src";
preConfigure = "./autogen.sh";
buildInputs = [emacs texinfo]; buildInputs = [emacs texinfo autoconf automake];
meta = { meta = {
description = "An an interface to Git, implemented as an extension to Emacs."; description = "An an interface to Git, implemented as an extension to Emacs.";

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

@ -1,13 +1,13 @@
args: with args; args: with args;
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "nano"; pname = "nano";
version = "2.2.1"; version = "2.2.3";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.gz"; url = "mirror://gnu/nano/${name}.tar.gz";
sha256 = "1xqldl7ipsmz5x8q3fw9s6yshxfp39kly96kb15l1kawng1wfcfq"; sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2";
}; };
buildInputs = [ncurses gettext]; buildInputs = [ncurses gettext];
# configureFlags = "--enable-tiny"; # configureFlags = "--enable-tiny";

25
pkgs/applications/graphics/digikam/default.nix
View File

@ -1,25 +0,0 @@
{stdenv, fetchurl, kdelibs, exiv2, libXt, libXext, zlib, libjpeg, perl, qt3,
libpng, expat, cmake }:
stdenv.mkDerivation {
name = "digikam-1.0.0";
src = fetchurl {
url = mirror://sourceforge/digikam/digikam-1.0.0.tar.bz2;
sha256 = "0qblqyjn0vas8hyqn5s9rr401d93cagk53y3j8kch0mr0bk706bk";
};
/*
configurePhase = ''
LDFLAGS="$LDFLAGS -ljpeg" ./configure --without-arts --prefix=$out
'';
*/
buildInputs = [ kdelibs exiv2 libXt libXext zlib libjpeg perl qt3 libpng expat cmake ];
meta = {
homepage = http://digikam.sourceforge.net/;
description = "KDE 3.x photo viewer";
# license = "GPLv2+";
};
}

23
pkgs/applications/graphics/gwenview/default.nix
View File

@ -1,23 +0,0 @@
{stdenv, fetchurl, kdelibs, exiv2, libXt, libXext, zlib, libjpeg, perl, qt3,
libpng, expat }:
stdenv.mkDerivation {
name = "gwenview-1.4.2";
src = fetchurl {
url = mirror://sourceforge/gwenview/gwenview-1.4.2.tar.bz2;
sha256 = "26ec1a3f3ac7cce9584b44e6090402776fb84df3fc5f9e5aadbe66e9887851fd";
};
configurePhase = ''
LDFLAGS="$LDFLAGS -ljpeg" ./configure --without-arts --prefix=$out
'';
buildInputs = [ kdelibs exiv2 libXt libXext zlib libjpeg perl qt3 libpng expat ];
meta = {
homepage = http://gwenview.sourceforge.net/;
description = "KDE photo viewer";
license = "GPLv2+";
};
}

19
pkgs/applications/misc/calibre/default.nix
View File

@ -1,20 +1,23 @@
{stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng, { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil, , imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil
pil, cssutils, beautifulsoap, makeWrapper, unrar}: , pil, cssutils, beautifulsoap, makeWrapper, unrar, chmlib
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calibre-0.6.43"; name = "calibre-0.6.47";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.gz"; url = "mirror://sourceforge/calibre/${name}.tar.gz";
sha256 = "1fqrishm5na2h0jh46w1gj7gvav335fixwrk6y7l7l4a6argjslr"; sha256 = "16s5rqlwbyq4al8xl5qr8ha6nyhcyd8q9gzm8pbi3q0ksda2k2qi";
}; };
inherit python; inherit python;
buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick buildInputs =
libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper cssutils [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
beautifulsoap ]; fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper
cssutils beautifulsoap chmlib
];
installPhase = '' installPhase = ''
export HOME=$TMPDIR/fakehome export HOME=$TMPDIR/fakehome

7
pkgs/applications/misc/djvulibre/default.nix
View File

@ -1,4 +1,5 @@
args: with args; { stdenv, fetchurl, lib, useQt3 ? true, libjpeg, libtiff, libpng, ghostscript
, libungif, zlib, x11, libX11, mesa, qt3 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "djvulibre-3.5.22"; name = "djvulibre-3.5.22";
@ -8,10 +9,12 @@ stdenv.mkDerivation {
sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix"; sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix";
}; };
buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa]; buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
stdenv.lib.optionals useQt3 [qt3 libX11 x11 mesa];
meta = { meta = {
description = "A library and viewer for the DJVU file format for scanned images"; description = "A library and viewer for the DJVU file format for scanned images";
homepage = http://djvu.sourceforge.net; homepage = http://djvu.sourceforge.net;
maintainers = [ lib.maintainers.urkud ];
}; };
} }

8
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -1,21 +1,21 @@
{stdenv, fetchurl, perl, gettext, makeWrapper, lib, {stdenv, fetchurl, perl, gettext, makeWrapper, lib,
TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
CGISession, CGIFormBuilder, DBFile CGISession, CGIFormBuilder, DBFile, LocaleGettext
, git ? null , git ? null
, monotone ? null , monotone ? null
, extraUtils ? [] , extraUtils ? []
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ikiwiki_3.20100102.3"; name = "ikiwiki_3.20100312";
src = fetchurl { src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz"; url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz";
sha256 = "0vb54z7hwb6iwd0j96vhr8ypzwc8l4hd98wbp5wsxkx5bgc38nsp"; sha256 = "1pzjl4iplizzspsl237996j1ma6yp9jagbqf3d43kbhv1ai0v3ci";
}; };
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ] TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext ]
++ ++
(lib.optional (monotone != null) monotone) (lib.optional (monotone != null) monotone)
; ;

17
pkgs/applications/misc/lyx/default.nix
View File

@ -1,15 +1,24 @@
# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc # I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
args: with args; { fetchurl, stdenv, texLive, python, makeWrapper
, libX11, qt
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6.4"; version = "1.6.5";
name = "lyx-${version}"; name = "lyx-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2"; url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2";
sha256 = "1b56e53e6884a9f1417811c03e5c986d79955444e8169244a2b80b0709223d15"; sha256 = "0xxj37l4ghaa2ij5nfxlg90rfw0znipigjlh271mfmwjw9ykcw1n";
}; };
buildInputs = [texLive qt python]; buildInputs = [texLive qt python makeWrapper ];
# don't ask me why it can't find libX11.so.6
postInstall = ''
wrapProgram $out/bin/lyx \
--prefix LD_LIBRARY_PATH ":" ${libX11}/lib
'';
meta = { meta = {
description = "WYSIWYM frontend for LaTeX, DocBook, etc."; description = "WYSIWYM frontend for LaTeX, DocBook, etc.";

8
pkgs/applications/misc/xneur/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec { rec {
version="0.9.6"; version="0.9.8";
name="xneur-0.9.6"; name="xneur-0.9.8";
hash="0xxyj2w5ckk2pnqsx853zgs6s2lq1cb101px472rccpixcbdfs47"; hash="11xpw5vj4yccyq54jnx63kv6lkxa3fqr3kjncmgdc8xqk1pa7jmd";
url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2";
advertisedUrl="http://dists.xneur.ru/release-0.9.6/tgz/xneur-0.9.6.tar.bz2"; advertisedUrl="http://dists.xneur.ru/release-0.9.8/tgz/xneur-0.9.8.tar.bz2";
} }

2
pkgs/applications/misc/xneur/src-info-for-default.nix
View File

@ -1,5 +1,5 @@
{ {
downloadPage = "http://xneur.ru/wiki/Downloads"; downloadPage = "http://xneur.ru/downloads";
baseName = "xneur"; baseName = "xneur";
versionReferenceCreator = "$(replaceAllVersionOccurences)"; versionReferenceCreator = "$(replaceAllVersionOccurences)";
} }

15
pkgs/applications/misc/xterm/default.nix
View File

@ -10,10 +10,21 @@ stdenv.mkDerivation rec {
freetype pkgconfig libXft luit]; freetype pkgconfig libXft luit];
configureFlags = "--enable-wide-chars --enable-256-color configureFlags = "--enable-wide-chars --enable-256-color
--enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
--enable-mini-luit"; --enable-mini-luit --with-tty-group=tty";
# Hack to get xterm built with the feature of releasing a possible setgid of 'utmp',
# decided by the sysadmin to allow the xterm reporting to /var/run/utmp
# If we used the configure option, that would have affected the xterm installation,
# (setgid with the given group set), and at build time the environment even doesn't have
# groups, and the builder will end up removing any setgid.
postConfigure = ''
echo '#define USE_UTMP_SETGID 1'
'';
meta = { meta = {
homepage = http://invisible-island.net/xterm; homepage = http://invisible-island.net/xterm;
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
}; };
} }

10
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -1,14 +1,14 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "elinks-0.11.3"; name = "elinks-0.12pre5";
src = fetchurl { src = fetchurl {
url = http://elinks.or.cz/download/elinks-0.11.3.tar.bz2; url = http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2;
sha256 = "c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1"; sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
}; };
buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile]; buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm];
configureFlags = "--enable-finger --enable-html-highlight --with-guile configureFlags = "--enable-finger --enable-html-highlight --with-guile
--with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
--enable-nntp --with-openssl=${openssl}"; --enable-nntp --with-openssl=${openssl}";

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

@ -12,14 +12,14 @@
rec { rec {
firefoxVersion = "3.5.8"; firefoxVersion = "3.5.9";
xulVersion = "1.9.1.8"; # this attribute is used by other packages xulVersion = "1.9.1.9"; # this attribute is used by other packages
src = fetchurl { src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "4bfb9a274113fb9ee590c00da69d995dc500d4cc"; sha1 = "f20f06a783ee81ec1d7d6f7a75b38a25dc58f0e1";
}; };

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

@ -12,14 +12,14 @@
rec { rec {
firefoxVersion = "3.6"; firefoxVersion = "3.6.3";
xulVersion = "1.9.2"; # this attribute is used by other packages xulVersion = "1.9.2.3"; # this attribute is used by other packages
src = fetchurl { src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "33226b45a0bcd795545a980cab475c5492f0ea69"; sha256 = "1l5290l1jrglvih0957iv8xn5sxmqklx67kqqnv059dsg5fv781m";
}; };

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

@ -30,33 +30,41 @@
}: }:
stdenv.mkDerivation ({ let
name = "flashplayer-10.0.32.18";
builder = ./builder.sh;
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl (
if debug then if debug then
# no plans to provide a x86_64 version: # no plans to provide a x86_64 version:
# http://labs.adobe.com/technologies/flashplayer10/faq.html # http://labs.adobe.com/technologies/flashplayer10/faq.html
throw "no x86_64 debugging version available" throw "no x86_64 debugging version available"
else { else {
# -> http://labs.adobe.com/downloads/flashplayer10_64bit.html # -> http://labs.adobe.com/downloads/flashplayer10_64bit.html
version = "10.0.45.2";
url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz; url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz;
sha256 = "1mkl02cplcl9dygmgzzwic0r7kkdgfkmpfzvk76l665pgf5bbazf"; sha256 = "1mkl02cplcl9dygmgzzwic0r7kkdgfkmpfzvk76l665pgf5bbazf";
} }
) else if stdenv.system == "i686-linux" then
else if debug then {
fetchurl ( if debug then {
# The debug version also contains a player # The debug version also contains a player
version = "10.1pre2-debug-121709";
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_debug_linux_121709.tar.gz; url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_debug_linux_121709.tar.gz;
sha256 = "162cnzn8sfdvr8mwyggsxi2bcl7zzi1nrl61bw481hhhpwnrjdx4"; sha256 = "162cnzn8sfdvr8mwyggsxi2bcl7zzi1nrl61bw481hhhpwnrjdx4";
} else { } else {
version = "10.1pre2-121709";
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_linux_121709.tar.gz; url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_linux_121709.tar.gz;
sha256 = "1mzxcp7y5zxjnjdqmzq9dzg1jqs9lwb4j2njfhwiw2jifffjw2fw"; sha256 = "1mzxcp7y5zxjnjdqmzq9dzg1jqs9lwb4j2njfhwiw2jifffjw2fw";
}); }
else throw "flashplayer is not supported on this platform";
in
stdenv.mkDerivation {
name = "flashplayer-${src.version}";
builder = ./builder.sh;
src = fetchurl { inherit (src) url sha256; };
inherit zlib alsaLib; inherit zlib alsaLib;
@ -64,15 +72,18 @@ stdenv.mkDerivation ({
mozillaPlugin = "/lib/mozilla/plugins"; mozillaPlugin = "/lib/mozilla/plugins";
}; };
rpath = stdenv.lib.makeLibraryPath [zlib alsaLib curl nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ; rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
libXext libXrender libXt gtk glib pango atk
];
buildPhase = stdenv.lib.optionalString debug
''
tar xfz plugin/debugger/libflashplayer.so.tar.gz
'';
meta = { meta = {
description = "Adobe Flash Player browser plugin"; description = "Adobe Flash Player browser plugin";
homepage = http://www.adobe.com/products/flashplayer/; homepage = http://www.adobe.com/products/flashplayer/;
}; };
} // (if debug then { }
buildPhase = ''
pwd;ls -l .
tar xfz plugin/debugger/libflashplayer.so.tar.gz
'';
} else {} ) )

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
View File

@ -3,6 +3,8 @@ source $stdenv/setup
dontStrip=1 dontStrip=1
dontPatchELF=1 dontPatchELF=1
sourceRoot=.
installPhase() { installPhase() {
ensureDir $out/lib/mozilla/plugins ensureDir $out/lib/mozilla/plugins
cp -p libflashplayer.so $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins

13
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
View File

@ -15,6 +15,8 @@
, glib , glib
, pango , pango
, atk , atk
, customSrc ? null
}: }:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -23,10 +25,12 @@ stdenv.mkDerivation {
name = "flashplayer-9.0.124.0"; name = "flashplayer-9.0.124.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = if customSrc == null then
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz; fetchurl {
sha256 = "16p98jf3y9041p8fk6cq7dqj7s4l4m7g9nhvc3dmhmld0075qagl"; url = http://download.macromedia.com/pub/flashplayer/installers/current/9/install_flash_player_9.tar.gz;
}; sha256 = "1cnsjgmy7rwj3spzb5mmpmvzxjp435jisl0dd8s4rf4xskyy6d6r";
}
else customSrc;
inherit zlib alsaLib; inherit zlib alsaLib;
@ -40,5 +44,4 @@ stdenv.mkDerivation {
description = "Adobe Flash Player browser plugin"; description = "Adobe Flash Player browser plugin";
homepage = http://www.adobe.com/products/flashplayer/; homepage = http://www.adobe.com/products/flashplayer/;
}; };
} }

18
pkgs/applications/networking/irc/konversation/default.nix
View File

@ -1,18 +0,0 @@
{stdenv, fetchurl, libX11, libXt, libXext, libXrender, libXft,
arts, qt, kdelibs, zlib, libpng, libjpeg, perl, expat}:
stdenv.mkDerivation {
name = "konversation-1.1";
src = fetchurl {
url = http://download.berlios.de/konversation/konversation-1.1.tar.bz2;
sha256 = "3ef15e7a46c10a11aa369ff80dd33b3e2feb54834dfc036d3609c1ed94476d33";
};
buildInputs = [ arts qt kdelibs libX11 libXt libXext libXrender libXft
zlib libpng libjpeg perl expat ];
meta = {
description = "An IRC client for KDE";
homepage = http://konversation.kde.org/;
license = "GPLv2";
};
}

11
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -2,12 +2,15 @@
, sslSupport ? true , sslSupport ? true
, imapSupport ? true , imapSupport ? true
, headerCache ? true , headerCache ? true
, saslSupport ? true
, gdbm ? null , gdbm ? null
, openssl ? null , openssl ? null
, cyrus_sasl ? null
}: }:
assert headerCache -> gdbm != null; assert headerCache -> gdbm != null;
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
assert saslSupport -> cyrus_sasl != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mutt-1.5.20"; name = "mutt-1.5.20";
@ -19,12 +22,18 @@ stdenv.mkDerivation {
ncurses which perl ncurses which perl
(if headerCache then gdbm else null) (if headerCache then gdbm else null)
(if sslSupport then openssl else null) (if sslSupport then openssl else null)
(if saslSupport then cyrus_sasl else null)
]; ];
configureFlags = [ configureFlags = [
"--with-mailpath=" "--with-mailpath=" "--enable-smtp"
# The next allows building mutt without having anything setgid
# set by the installer, and removing the need for the group 'mail'
# I set the value 'mailbox' because it is a default in the configure script
"--with-homespool=mailbox"
(if headerCache then "--enable-hcache" else "--disable-hcache") (if headerCache then "--enable-hcache" else "--disable-hcache")
(if sslSupport then "--with-ssl" else "--without-ssl") (if sslSupport then "--with-ssl" else "--without-ssl")
(if imapSupport then "--enable-imap" else "--disable-imap") (if imapSupport then "--enable-imap" else "--disable-imap")
(if saslSupport then "--with-sasl" else "--without-imap")
]; ];
meta = { meta = {

4
pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
View File

@ -10,14 +10,14 @@
}: }:
let version = "3.0"; in let version = "3.0.4"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "thunderbird-${version}"; name = "thunderbird-${version}";
src = fetchurl { src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
sha1 = "7a8a08f011901b4c0b737de2d7a226242935543d"; sha1 = "5a6e89096da61a520e5cecb61f8afeb981f90412";
}; };
buildInputs = buildInputs =

28
pkgs/applications/networking/p2p/transmission/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, gtkClient ? true, gtk }:
stdenv.mkDerivation rec {
name = "transmission-1.92";
src = fetchurl {
url = "http://mirrors.m0k.org/transmission/files/${name}.tar.bz2";
sha256 = "1vdvl3aza5cip4skhd2y4ip2vjci7q3y3qi3008ykk28ga93gw6s";
};
buildInputs = [ pkgconfig openssl curl intltool ] ++ stdenv.lib.optional gtkClient gtk;
configureFlags = if gtkClient then "--enable-gtk" else "--disable-gtk";
meta = {
description = "A fast, easy and free BitTorrent client.";
longDescription = ''
Transmission is a BitTorrent client which features a simple interface
on top of a cross-platform back-end.
Feature spotlight:
* Uses fewer resources than other clients
* Native Mac, GTK+ and Qt GUI clients
* Daemon ideal for servers, embedded systems, and headless use
* All these can be remote controlled by Web and Terminal clients
* Bluetack (PeerGuardian) blocklists with automatic updates
* Full encryption, DHT, and PEX support
'';
homepage = http://www.transmissionbt.com/;
license = [ "GPLv2" ];
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = with stdenv.lib.platforms; linux;
};
}

10
pkgs/applications/networking/sniffers/kismet/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, libpcap, ncurses, expat}: {stdenv, fetchurl, libpcap, ncurses, expat, pcre}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kismet-2008-05-r1"; name = "kismet-2010-01-r1";
src = fetchurl { src = fetchurl {
url = http://www.kismetwireless.net/code/kismet-2008-05-R1.tar.gz; url = http://www.kismetwireless.net/code/kismet-2010-01-R1.tar.gz;
sha256 = "a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3"; sha256 = "106qird64x1v29nz6k5zs9dxxdq6q7fb7d6np0pnwm3dd2p1w7cx";
}; };
buildInputs = [libpcap ncurses expat]; buildInputs = [libpcap ncurses expat pcre];
postConfigure = postConfigure =
"sed -e 's@-o \$(INSTUSR)@@' \\ "sed -e 's@-o \$(INSTUSR)@@' \\
-e 's@-g \$(INSTGRP)@@' \\ -e 's@-g \$(INSTGRP)@@' \\

6
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}: {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wireshark-1.3.2"; name = "wireshark-1.3.4";
src = fetchurl { src = fetchurl {
url = http://www.wireshark.org/download/src/wireshark-1.3.2.tar.gz; url = http://media-2.cacetech.com/wireshark/src/wireshark-1.3.4.tar.bz2;
sha256 = "0sq0mk0iqsgcgd2gqspyfmjiql00d3ghq43qxywd8qb2jxfv1q5r"; sha256 = "00pyr3izg5dg8kr4sayp0fq8q360syfhs2nvj6b4ff1mdal7ra3x";
}; };
configureFlags = "--with-pcap=${libpcap}"; configureFlags = "--with-pcap=${libpcap}";
buildInputs = [perl pkgconfig gtk libpcap flex bison]; buildInputs = [perl pkgconfig gtk libpcap flex bison];

6
pkgs/applications/office/abiword/default.nix
View File

@ -3,10 +3,10 @@ enchant, wv, librsvg, bzip2
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "abiword-2.8.1"; name = "abiword-2.8.4";
src = fetchurl { src = fetchurl {
url = http://www.abisource.org/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz; url = http://www.abisource.org/downloads/abiword/2.8.4/source/abiword-2.8.4.tar.gz;
sha256 = "1v6jkjd5ivaarhv41nkniqycx3k33p9r7q7dyyjn7kq2295n26zm"; sha256 = "1v2f83cc8j6chsyzgjh903s6c8fkr7dy5s10bqigzfrqi9iv990l";
}; };
buildInputs = [pkgconfig gtk libglade librsvg bzip2 buildInputs = [pkgconfig gtk libglade librsvg bzip2

2
pkgs/applications/office/openoffice/builder.sh
View File

@ -10,6 +10,8 @@ postUnpack() {
} }
preConfigure() { preConfigure() {
./configure --help
for i in sysui/desktop/share/makefile.mk; do for i in sysui/desktop/share/makefile.mk; do
substituteInPlace $i --replace /bin/bash $shell substituteInPlace $i --replace /bin/bash $shell
done done

10
pkgs/applications/office/openoffice/default.nix
View File

@ -11,15 +11,19 @@ stdenv.mkDerivation rec {
name = "openoffice.org-${version}"; name = "openoffice.org-${version}";
builder = ./builder.sh; builder = ./builder.sh;
#downloadRoot = "http://download.services.openoffice.org/files/stable";
downloadRoot = "http://www-openoffice.com/source/";
versionDirs = false;
src = fetchurl { src = fetchurl {
url = "http://mirror.kernelerror.net/openoffice/stable/${version}/OOo_${version}_src_core.tar.bz2"; url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2";
sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca"; sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca";
}; };
patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ];
src_system = fetchurl { src_system = fetchurl {
url = "http://mirror.kernelerror.net/openoffice/stable/${version}/OOo_${version}_src_system.tar.bz2"; url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2";
sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a"; sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a";
}; };
@ -57,6 +61,7 @@ stdenv.mkDerivation rec {
--without-system-hunspell --without-system-hunspell
--without-system-altlinuxhyph --without-system-altlinuxhyph
--without-system-lpsolve --without-system-lpsolve
--without-system-graphite
"; ";
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
@ -75,5 +80,6 @@ stdenv.mkDerivation rec {
description = "OpenOffice.org is a multiplatform and multilingual office suite"; description = "OpenOffice.org is a multiplatform and multilingual office suite";
homepage = http://www.openoffice.org/; homepage = http://www.openoffice.org/;
license = "LGPL"; license = "LGPL";
maintainers = [ stdenv.lib.maintainers.raskin ];
}; };
} }

11
pkgs/applications/office/scribus/default.nix
View File

@ -8,17 +8,18 @@ assert stdenv.gcc.gcc != null;
# will be released with the next version of scribus - So don't miss them # will be released with the next version of scribus - So don't miss them
# when upgrading this package # when upgrading this package
let useCairo = true; #let useCairo = true;
let useCairo = false;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "scribus-1.3.3.13"; name = "scribus-1.3.3.14";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/scribus/scribus/1.3.3.13/scribus-1.3.3.13.tar.bz2; url = mirror://sourceforge/scribus/scribus/1.3.3.14/scribus-1.3.3.14.tar.bz2;
sha256 = "06l4ndfsw7ss7mdr6a6km9fbr9p2m3b5idm3n8lpgwk2ss0mw9as"; sha256 = "1ig7x6vxhqgjlpnv6hkzpb6gj4yvxsrx7rw900zlp7g6zxl01iyy";
}; };
cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else ""; cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else "";
@ -40,7 +41,7 @@ stdenv.mkDerivation {
# fix rpath which is removed by cmake.. # fix rpath which is removed by cmake..
postFixup = '' postFixup = ''
for i in $buildInputs ${stdenv.gcc.gcc}; do for i in $buildNativeInputs ${stdenv.gcc.gcc}; do
[ -d "$i/lib" ] && RPATH="$RPATH:$i/lib" [ -d "$i/lib" ] && RPATH="$RPATH:$i/lib"
[ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64" [ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64"
done done

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

@ -1,13 +1,13 @@
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2} : {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz} :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkwave-3.3.2"; name = "gtkwave-3.3.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
sha256 = "0dccyyzk963v5nz6hxfvkcnfwm98m8d8s5x0nw6459r9683pdlri"; sha256 = "0vll02l3g990spc7yzwl16lbw18ybm7s9j3ffjq2v7949wng43l9";
}; };
buildInputs = [ gtk gperf pkgconfig bzip2 ]; buildInputs = [ gtk gperf pkgconfig bzip2 xz ];
meta = { meta = {
description = "Wave viewer for Unix and Win32"; description = "Wave viewer for Unix and Win32";

2
pkgs/applications/science/math/maxima/default.nix
View File

@ -18,4 +18,6 @@ stdenv.mkDerivation {
description = "Maxima computer algebra system"; description = "Maxima computer algebra system";
homepage = http://maxima.sourceforge.net; homepage = http://maxima.sourceforge.net;
}; };
maintainers = [ stdenv.lib.maintainers.simons ];
} }

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

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

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

@ -3,29 +3,25 @@
*/ */
args: with args; with pkgs; args: with args; with pkgs;
let let
inherit (pkgs) stdenv fetchurl getConfig subversion; inherit (pkgs) stdenv fetchurl subversion;
config = getPkgConfig "git";
in in
rec { rec {
git = import ./git { git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext inherit fetchurl stdenv curl openssl zlib expat perl python gettext
asciidoc texinfo xmlto docbook2x asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversion; cpio tcl tk makeWrapper subversion;
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support svnSupport = config "svnSupport" false; # for git-svn support
guiSupport = getConfig ["git" "guiSupport"] false; guiSupport = config "guiSupport" false;
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
}; };
# The full-featured Git. # The full-featured Git.
gitFull = import ./git { gitFull = git.override {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext
asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversion;
svnSupport = true; svnSupport = true;
guiSupport = true; guiSupport = true;
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
}; };
gitGit = import ./git/git-git.nix { gitGit = import ./git/git-git.nix {
@ -33,8 +29,8 @@ rec {
asciidoc texinfo xmlto docbook2x asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversion autoconf; cpio tcl tk makeWrapper subversion autoconf;
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support svnSupport = config "svnSupport" false; # for git-svn support
guiSupport = getConfig ["git" "guiSupport"] false; guiSupport = config "guiSupport" false;
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
}; };

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

@ -3,17 +3,19 @@
, libxslt, tcl, tk, makeWrapper , libxslt, tcl, tk, makeWrapper
, svnSupport, subversion, perlLibs , svnSupport, subversion, perlLibs
, guiSupport , guiSupport
, pythonSupport ? true
}: }:
# `git-svn' support requires Subversion and various Perl libraries. let
assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings); svn = subversion.override { perlBindings = true; };
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "git-1.7.0"; name = "git-1.7.0.5";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
sha256 = "a61e863944381c4f8231841f678f41f56b634bebca486a61005b35e5bcbb7c79"; sha256 = "96b44fcd8652db8a7a30d87096a17200457d3fbcc91aa334cb7644a6da898d53";
}; };
patches = [ ./docbook2texi.patch ]; patches = [ ./docbook2texi.patch ];
@ -24,7 +26,8 @@ stdenv.mkDerivation rec {
docbook_xsl docbook_xml_dtd_45 libxslt ] docbook_xsl docbook_xml_dtd_45 libxslt ]
++ stdenv.lib.optionals guiSupport [tcl tk]; ++ stdenv.lib.optionals guiSupport [tcl tk];
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} PYTHON_PATH=${python}/bin/python"; makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+ (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1");
# FIXME: "make check" requires Sparse; the Makefile must be tweaked # FIXME: "make check" requires Sparse; the Makefile must be tweaked
# so that `SPARSE_FLAGS' corresponds to the current architecture... # so that `SPARSE_FLAGS' corresponds to the current architecture...
@ -47,12 +50,12 @@ stdenv.mkDerivation rec {
''# wrap git-svn ''# wrap git-svn
gitperllib=$out/lib/perl5/site_perl gitperllib=$out/lib/perl5/site_perl
for i in ${builtins.toString perlLibs}; do for i in ${builtins.toString perlLibs} ${svn}; do
gitperllib=$gitperllib:$i/lib/perl5/site_perl gitperllib=$gitperllib:$i/lib/perl5/site_perl
done done
wrapProgram "$out/libexec/git-core/git-svn" \ wrapProgram "$out/libexec/git-core/git-svn" \
--set GITPERLLIB "$gitperllib" \ --set GITPERLLIB "$gitperllib" \
--prefix PATH : "${subversion}/bin" '' --prefix PATH : "${svn}/bin" ''
else '' # replace git-svn by notification script else '' # replace git-svn by notification script
notSupported $out/bin/git-svn "reinstall with config git = { svnSupport = true } set" notSupported $out/bin/git-svn "reinstall with config git = { svnSupport = true } set"
'') '')

27
pkgs/applications/version-management/meld/default.nix Normal file
View File

@ -0,0 +1,27 @@
{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
stdenv.mkDerivation {
name = "meld-1.3.1";
src = fetchurl {
url = http://ftp.gnome.org/pub/gnome/sources/meld/1.3/meld-1.3.1.tar.bz2;
sha256 = "0iqnj3qb9l7z12akgmf64fr2xqirsqxflvj60xqcqr5vd5c763nn";
};
buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
patchPhase = ''
sed -e s,/usr/local,$out, -i INSTALL
sed -e 's,#!.*,#!${python}/bin/python,' -i meld
'';
postInstall = ''
wrapProgram $out/bin/meld --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
'';
meta = {
description = "Visual diff and merge tool";
homepage = http://meld.sourceforge.net;
license = "GPLv2+";
};
}

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

@ -1,10 +1,10 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mercurial-1.4.3"; name = "mercurial-1.5.1";
src = fetchurl { src = fetchurl {
url = "http://www.selenic.com/mercurial/release/${name}.tar.gz"; url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";
sha256 = "091agbxlhansf66ams7n1spwgr3frra0y33dipcqbhx3mjx21j4w"; sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569";
}; };
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git

4
pkgs/applications/version-management/monotone/default.nix
View File

@ -2,13 +2,13 @@
lua, pcre, sqlite, perl, lib}: lua, pcre, sqlite, perl, lib}:
let let
version = "0.46"; version = "0.47";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "monotone-${version}"; name = "monotone-${version}";
inherit perl; inherit perl;
src = fetchurl { src = fetchurl {
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz"; url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz";
sha256 = "1pla2fvkmfbrzfbdqd2jjghldpxl9iq81pwwkwaxa7n57snbvq61"; sha256 = "7a99f1a5e4eb2bb7bf82794ab7fc61435fbc55826b710243243c52f7b10be51b";
}; };
buildInputs = [boost zlib botan libidn lua pcre sqlite]; buildInputs = [boost zlib botan libidn lua pcre sqlite];
preConfigure = '' preConfigure = ''

22
pkgs/applications/version-management/rapidsvn/default.nix Normal file
View File

@ -0,0 +1,22 @@
{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}:
stdenv.mkDerivation {
name = "rapidsvn-0.12";
src = fetchurl {
url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz;
sha256 = "1i3afjmx99ljw1bj54q47fs0g1q9dmxxvr4ciq7ncp5s52shszgg";
};
buildInputs = [ wxGTK subversion apr aprutil python ];
configureFlags = [ "--with-svn-include=${subversion}/include"
"--with-svn-lib=${subversion}/lib" ];
meta = {
description = "Multi-platform GUI front-end for the Subversion revision system";
homepage = http://rapidsvn.tigris.org/;
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.viric ];
};
}

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

@ -19,20 +19,19 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6.9"; version = "1.6.11";
name = "subversion-${version}"; name = "subversion-${version}";
src = fetchurl { src = fetchurl {
url = "http://subversion.tigris.org/downloads/${name}.tar.bz2"; url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
sha1 = "477aa89e60de7974ac0aa921cc369b4c2907693c"; sha256 = "177565kvn9kq3i8xrvh86cwl7098v2ymhmvjq11x6w04wc501gb4";
}; };
buildInputs = [ zlib apr aprutil sqlite ] buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport neon ++ stdenv.lib.optional httpSupport neon
++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional pythonBindings python
++ stdenv.lib.optional perlBindings perl ++ stdenv.lib.optional perlBindings perl;
;
configureFlags = '' configureFlags = ''
--disable-keychain --disable-keychain
@ -72,7 +71,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A version control system intended to be a compelling replacement for CVS in the open source community"; description = "A version control system intended to be a compelling replacement for CVS in the open source community";
homepage = http://subversion.tigris.org/; homepage = http://subversion.apache.org/;
maintainers = [ stdenv.lib.maintainers.eelco ]; maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };

6
pkgs/applications/version-management/tkcvs/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation stdenv.mkDerivation
{ {
name = "tkcvs-8.2"; name = "tkcvs-8.2.1";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/tkcvs/tkcvs_8_2.tar.gz; url = mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz;
sha256 = "0cr2f8jd6k2h1n8mvfv6frrfv4kxd7k3mhplk3ghl6hrgklr7ywr"; sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i";
}; };
buildInputs = [ tcl tk ]; buildInputs = [ tcl tk ];

53
pkgs/applications/video/MPlayer/default.nix
View File

@ -1,10 +1,11 @@
{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false { alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false
, xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true , xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true
, stdenv, fetchurl, x11, freetype, freefont_ttf, zlib , stdenv, fetchurl, x11, freetype, fontconfig, zlib
, alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
, libXinerama ? null, libXrandr ? null, libdvdnav ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null
, cdparanoia ? null, cddaSupport ? true , cdparanoia ? null, cddaSupport ? true
, amrnb ? null, amrwb ? null, amrSupport ? false , amrnb ? null, amrwb ? null, amrSupport ? false
, jackaudioSupport ? false, jackaudio ? null
, mesa, pkgconfig, unzip , mesa, pkgconfig, unzip
}: }:
@ -16,42 +17,37 @@ assert xineramaSupport -> libXinerama != null;
assert randrSupport -> libXrandr != null; assert randrSupport -> libXrandr != null;
assert dvdnavSupport -> libdvdnav != null; assert dvdnavSupport -> libdvdnav != null;
assert cddaSupport -> cdparanoia != null; assert cddaSupport -> cdparanoia != null;
assert jackaudioSupport -> jackaudio != null;
assert amrSupport -> (amrnb != null && amrwb != null); assert amrSupport -> (amrnb != null && amrwb != null);
let let
win32codecs = (import ./win32codecs) { codecs = stdenv.mkDerivation {
inherit stdenv fetchurl; name = "MPlayer-codecs-essential-20071007";
src = fetchurl {
url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2;
sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
}; };
rp9codecs = (import ./rp9codecs) { installPhase = ''
inherit stdenv fetchurl; mkdir $out
}; cp -prv * $out
'';
srcAmr = fetchurl { meta = {
url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-530.zip; license = "unfree";
sha256 = "1qyla52jjymhcnbidhwc6a1vm4v1wl27mj4ygp3cpn33swcmkgd0";
}; };
srcAmrFloat = fetchurl {
url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-540.zip;
sha256 = "1d337h3051w7azipsq7nzf4d25csia2snq3qlhw2sj7282ab042z";
};
srcAmrWBFloat = fetchurl {
url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26204-540.zip;
sha256 = "1mb7g3fy5faz26jjbibxvlbb5b81vwmdsldl3kl8hzg14vcrv1q9";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "MPlayer-1.0rc2-r28450"; name = "MPlayer-1.0-pre-rc4-20100213";
# 1.0_rc2 is outdated according to website - use trunk instead
src = fetchurl { src = fetchurl {
url = mirror://gentoo/distfiles/mplayer-1.0_rc2_p28450.tar.bz2; url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100213.tbz2;
sha256 = "0cbils58mq20nablywgjfpfx2pzjgnhin23sb8k1s5h2rxgvi3vf"; sha256 = "1c5w49vqavs9pnc5av89v502wfa5g7hfn65ffhpx25ddi1irzh2r";
}; };
buildInputs = buildInputs =
@ -64,30 +60,25 @@ stdenv.mkDerivation {
++ stdenv.lib.optional randrSupport libXrandr ++ stdenv.lib.optional randrSupport libXrandr
++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ stdenv.lib.optional cddaSupport cdparanoia ++ stdenv.lib.optional cddaSupport cdparanoia
++ stdenv.lib.optional jackaudioSupport jackaudio
++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]; ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ];
configureFlags = '' configureFlags = ''
${if cacaSupport then "--enable-caca" else "--disable-caca"} ${if cacaSupport then "--enable-caca" else "--disable-caca"}
${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""} ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
--win32codecsdir=${win32codecs} --codecsdir=${codecs}
--realcodecsdir=${rp9codecs}
--enable-runtime-cpudetection --enable-runtime-cpudetection
--enable-x11 --with-extraincdir=${libX11}/include --enable-x11
--disable-xanim --disable-xanim
--disable-ivtv --disable-ivtv
''; '';
NIX_LDFLAGS = "-lX11 -lXext"; NIX_LDFLAGS = "-lX11 -lXext";
# Provide a reasonable standard font. Maybe we should symlink here.
postInstall = ''
ensureDir $out/share/mplayer
cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
'';
meta = { meta = {
description = "A movie player that supports many video formats"; description = "A movie player that supports many video formats";
homepage = "http://mplayerhq.hu"; homepage = "http://mplayerhq.hu";
license = "GPL"; license = "GPL";
maintainers = [ stdenv.lib.maintainers.eelco ];
}; };
} }

15
pkgs/applications/video/MPlayer/rp9codecs/default.nix
View File

@ -1,15 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "MPlayer-rp9codecs-20050115";
src = fetchurl {
url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/rp9codecs-20050115.tar.bz2;
sha256 = "353c22e2c992a1c730bdd5fade66a94e1a058e38063d2ce064a6510b70c39677";
};
installPhase = ''
mkdir $out
cp -prv * $out
'';
}

79
pkgs/applications/video/MPlayer/trunk.nix
View File

@ -1,79 +0,0 @@
# the hompepage even recommends using trunk
{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false
, xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true
, stdenv, fetchurl, x11, freetype, freefont_ttf, zlib
, alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
, libXinerama ? null, libXrandr ? null, libdvdnav ? null, jackaudio ? null
, cdparanoia ? null, cddaSupport ? true, jackaudioSupport ? true
, mesa, pkgconfig
, sourceFromHead
}:
assert alsaSupport -> alsa != null;
assert xvSupport -> libXv != null;
assert theoraSupport -> libtheora != null;
assert cacaSupport -> libcaca != null;
assert xineramaSupport -> libXinerama != null;
assert randrSupport -> libXrandr != null;
assert dvdnavSupport -> libdvdnav != null;
assert cddaSupport -> cdparanoia != null;
assert jackaudioSupport -> jackaudio != null;
let
win32codecs = (import ./win32codecs) {
inherit stdenv fetchurl;
};
rp9codecs = (import ./rp9codecs) {
inherit stdenv fetchurl;
};
in
stdenv.mkDerivation {
name = "mplayer-trunk";
# REGION AUTO UPDATE: { name="MPlayer"; type = "svn"; url="svn://svn.mplayerhq.hu/mplayer/trunk"; }
src= sourceFromHead "MPlayer-29990.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/MPlayer-29990.tar.gz"; sha256 = "8d9ac59e7cc3e2bc9ca46281ac2c268d460e041aceac056b600205c8c5235169"; });
# END
buildInputs =
[x11 libXv freetype zlib mesa pkgconfig]
++ stdenv.lib.optional alsaSupport alsa
++ stdenv.lib.optional xvSupport libXv
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional cacaSupport libcaca
++ stdenv.lib.optional xineramaSupport libXinerama
++ stdenv.lib.optional randrSupport libXrandr
++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread]
++ stdenv.lib.optional cddaSupport cdparanoia
++ stdenv.lib.optional jackaudioSupport jackaudio;
configureFlags = ''
${if cacaSupport then "--enable-caca" else "--disable-caca"}
${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
--win32codecsdir=${win32codecs}
--realcodecsdir=${rp9codecs}
--enable-runtime-cpudetection
--enable-x11
--disable-xanim
--disable-ivtv
'';
NIX_LDFLAGS = "-lX11 -lXext";
# Provide a reasonable standard font. Maybe we should symlink here.
postInstall = ''
ensureDir $out/share/mplayer
cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
'';
meta = {
description = "A movie player that supports many video formats";
homepage = "http://mplayerhq.hu";
license = "GPL";
};
}

19
pkgs/applications/video/MPlayer/win32codecs/default.nix
View File

@ -1,19 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "MPlayer-codecs-essential-20071007";
src = fetchurl {
url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2;
sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
};
installPhase = ''
mkdir $out
cp -prv * $out
'';
meta = {
license = "unfree";
};
}

6
pkgs/applications/video/avidemux/default.nix
View File

@ -5,11 +5,11 @@ alsaLib, lame, faac, faad2, libvorbis }:
assert stdenv ? glibc; assert stdenv ? glibc;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "avidemux-2.5.1"; name = "avidemux-2.5.2";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/avidemux/avidemux_2.5.1.tar.gz; url = mirror://sourceforge/avidemux/avidemux_2.5.2.tar.gz;
sha256 = "14jwrblbli7bswx4i7b85l0s1msx8rxrqb908df3z8jxm6w4cm9g"; sha256 = "1apq5s79ik562xmhyvg6nvkmk2bhm5fcjwsrwrpxwipn6swkfpk8";
}; };
buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv

10
pkgs/applications/video/vlc/default.nix
View File

@ -1,22 +1,24 @@
{ stdenv, fetchurl, perl, xlibs, libdvdnav { stdenv, fetchurl, perl, xlibs, libdvdnav
, zlib, a52dec, libmad, faad2, ffmpeg, alsa , zlib, a52dec, libmad, faad2, ffmpeg, alsa
, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
, libvorbis, libtheora, speex
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "vlc-1.0.4"; name = "vlc-1.0.5";
src = fetchurl { src = fetchurl {
url = http://download.videolan.org/pub/videolan/vlc/1.0.4/vlc-1.0.4.tar.bz2; url = http://download.videolan.org/pub/videolan/vlc/1.0.5/vlc-1.0.5.tar.bz2;
sha256 = "15lqirz99dcghqdqsqlgb8fa2xs45a7r32zxhlzk5930rnh0pzyv"; sha256 = "1kbd43y6sy6lg1xgl1j4mid6rdx6sszkm8c14hwqrfvgjd69kwgp";
}; };
buildInputs = [ buildInputs = [
perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg
alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4 alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4
libvorbis libtheora speex
]; ];
configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad"; configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad --enable-theora --enable-vorbis --enable-speex";
preBuild = '' preBuild = ''
substituteInPlace modules/misc/freetype.c --replace \ substituteInPlace modules/misc/freetype.c --replace \

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

@ -4,11 +4,11 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "virtualbox-3.1.4-${kernel.version}"; name = "virtualbox-3.1.6-${kernel.version}";
src = fetchurl { src = fetchurl {
url = http://download.virtualbox.org/virtualbox/3.1.4/VirtualBox-3.1.4-OSE.tar.bz2; url = http://download.virtualbox.org/virtualbox/3.1.6/VirtualBox-3.1.6-OSE.tar.bz2;
sha256 = "0w6vijjpnww33xahzfzljxfzwcz0d0flmv36dwv7g1vbx2x0m8bf"; sha256 = "05m0gsihvg0fs73a9bcivvlqkwrxvzfnyn2l59nixvy8g7w4h0c4";
}; };
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl]; buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl];

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

@ -2,10 +2,10 @@
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes}: , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-3.1.4"; name = "VirtualBox-GuestAdditions-3.1.6";
src = fetchurl { src = fetchurl {
url = http://download.virtualbox.org/virtualbox/3.1.4/VBoxGuestAdditions_3.1.4.iso; url = http://download.virtualbox.org/virtualbox/3.1.6/VBoxGuestAdditions_3.1.6.iso;
sha256 = "1x976h3vvhmhkyci9125w8v1xvlnrc7l4hgq0ghsn5bx67k5pwx6"; sha256 = "07vylsjs960yqgz2cn57sdhrhs0i3mkb286vnl7p86i7dfl0r08s";
}; };
KERN_DIR = "${kernel}/lib/modules/*/build"; KERN_DIR = "${kernel}/lib/modules/*/build";
buildInputs = [ patchelf cdrkit ]; buildInputs = [ patchelf cdrkit ];

25
pkgs/build-support/buildenv/builder.pl
View File

@ -1,7 +1,7 @@
#! @perl@ -w #! @perl@ -w
use strict; use strict;
use Cwd; use Cwd 'abs_path';
use IO::Handle; use IO::Handle;
use File::Path; use File::Path;
use File::Basename; use File::Basename;
@ -59,6 +59,7 @@ sub createLinks {
$srcFile =~ /\/nix-support$/ || $srcFile =~ /\/nix-support$/ ||
$srcFile =~ /\/perllocal.pod$/ || $srcFile =~ /\/perllocal.pod$/ ||
$srcFile =~ /\/info\/dir$/ || $srcFile =~ /\/info\/dir$/ ||
( $relName2 =~ /^\/share\/mime\// && !( $relName2 =~ /^\/share\/mime\/packages/ ) ) ||
$srcFile =~ /\/log$/) $srcFile =~ /\/log$/)
{ {
# Do nothing. # Do nothing.
@ -96,9 +97,17 @@ sub createLinks {
} }
elsif (-l $dstFile) { elsif (-l $dstFile) {
if (!$ignoreCollisions) { my $oldTarget = readlink $dstFile;
my $target = readlink $dstFile; my $oldTargetReal = abs_path $oldTarget;
die "collission between `$srcFile' and `$target'"; my $newTarget = $srcFile;
my $newTargetReal = abs_path $newTarget;
unless ($newTargetReal eq $oldTargetReal) {
if ($ignoreCollisions) {
warn "collision between `$newTarget' and `$oldTarget'\n";
}
else {
die "collision between `$newTarget' and `$oldTarget'";
}
} }
} }
@ -114,7 +123,7 @@ my %done;
my %postponed; my %postponed;
sub addPkg; sub addPkg;
sub addPkg { sub addPkg($;$) {
my $pkgDir = shift; my $pkgDir = shift;
my $ignoreCollisions = shift; my $ignoreCollisions = shift;
@ -131,6 +140,7 @@ sub addPkg {
close PROP; close PROP;
my @propagated = split ' ', $propagated; my @propagated = split ' ', $propagated;
foreach my $p (@propagated) { foreach my $p (@propagated) {
print "$pkgDir propagates $p\n";
$postponed{$p} = 1 unless defined $done{$p}; $postponed{$p} = 1 unless defined $done{$p};
} }
} }
@ -157,6 +167,11 @@ while (scalar(keys %postponed) > 0) {
} }
} }
if (-x "$out/bin/update-mime-database" && -d "$out/share/mime/packages") {
system("$out/bin/update-mime-database -V $out/share/mime") == 0
or die "Can't update mime-database";
}
print STDERR "created $symlinks symlinks in user environment\n"; print STDERR "created $symlinks symlinks in user environment\n";

7
pkgs/build-support/gcc-cross-wrapper/builder.sh
View File

@ -10,8 +10,11 @@ cflagsCompile="-B$out/bin/"
if test -z "$nativeLibc"; then if test -z "$nativeLibc"; then
cflagsCompile="$cflagsCompile -B$libc/lib/ -isystem $libc/include" cflagsCompile="$cflagsCompile -B$libc/lib/ -isystem $libc/include"
ldflags="$ldflags -L$libc/lib" ldflags="$ldflags -L$libc/lib"
ldflagsBefore="-dynamic-linker $libc/lib/ld-linux.so.?" # Get the proper dynamic linker for glibc and uclibc.
#ldflagsBefore="-dynamic-linker $libc/lib/ld-uClibc.so.0" dlinker=`eval 'echo $libc/lib/ld-*.so.?'`
if [ -n "$dlinker" ]; then
ldflagsBefore="-dynamic-linker $dlinker"
fi
# The same as above, but put into files, useful for the gcc builder. # The same as above, but put into files, useful for the gcc builder.
dynamicLinker="$libc/lib/$dynamicLinker" dynamicLinker="$libc/lib/$dynamicLinker"

72
pkgs/build-support/gcc-wrapper/default2.nix Normal file
View File

@ -0,0 +1,72 @@
# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't
# know where the C library and standard header files are. Therefore
# the compiler produced by that package cannot be installed directly
# in a user environment and used from the command line. This
# stdenv.mkDerivation provides a wrapper that sets up the right environment
# variables so that the compiler and the linker just "work".
{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? ""
, zlib ? null
}:
assert nativeTools -> nativePrefix != "";
assert !nativeTools -> gcc != null && binutils != null && coreutils != null;
assert !nativeLibc -> libc != null;
# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper
assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null;
let
gccVersion = (builtins.parseDrvName gcc.name).version;
gccName = (builtins.parseDrvName gcc.name).name;
in
stdenv.mkDerivation {
name =
(if name != "" then name else gccName + "-wrapper") +
(if gcc != null && gccVersion != "" then "-" + gccVersion else "");
builder = ./builder.sh;
setupHook = ./setup-hook.sh;
gccWrapper = ./gcc-wrapper.sh;
gnatWrapper = ./gnat-wrapper.sh;
gnatlinkWrapper = ./gnatlink-wrapper.sh;
ldWrapper = ./ld-wrapper2.sh;
utils = ./utils.sh;
addFlags = ./add-flags;
inherit nativeTools nativeLibc nativePrefix gcc;
libc = if nativeLibc then null else libc;
binutils = if nativeTools then null else binutils;
# The wrapper scripts use 'cat', so we may need coreutils
coreutils = if nativeTools then null else coreutils;
langC = if nativeTools then true else gcc.langC;
langCC = if nativeTools then true else gcc.langCC;
langFortran = if nativeTools then false else gcc ? langFortran;
langAda = if nativeTools then false else gcc ? langAda && gcc.langAda;
langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl;
zlib = if (gcc != null && gcc ? langVhdl) then zlib else null;
shell = if shell == "" then stdenv.shell else shell;
meta =
let gcc_ = if gcc != null then gcc else {}; in
(if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //
{ description =
stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_
+ " (wrapper script)";
};
# The dynamic linker has different names on different Linux platforms.
dynamicLinker =
if !nativeLibc then
(if stdenv.system == "i686-linux" then "ld-linux.so.2" else
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")
else "";
}

153
pkgs/build-support/gcc-wrapper/ld-wrapper2.sh Normal file
View File

@ -0,0 +1,153 @@
#! @shell@ -e
if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
source "$NIX_LD_WRAPPER_START_HOOK"
fi
if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then
source @out@/nix-support/add-flags.sh
fi
source @out@/nix-support/utils.sh
# Optionally filter out paths not refering to the store.
params=("$@")
if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
-a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then
rest=()
n=0
while test $n -lt ${#params[*]}; do
p=${params[n]}
p2=${params[$((n+1))]}
if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
skip $p
elif test "$p" = "-L" && badPath "$p2"; then
n=$((n + 1)); skip $p2
elif test "$p" = "-rpath" && badPath "$p2"; then
n=$((n + 1)); skip $p2
elif test "$p" = "-dynamic-linker" && badPath "$p2"; then
n=$((n + 1)); skip $p2
elif test "${p:0:1}" = "/" && badPath "$p"; then
# We cannot skip this; barf.
echo "impure path \`$p' used in link" >&2
exit 1
else
rest=("${rest[@]}" "$p")
fi
n=$((n + 1))
done
params=("${rest[@]}")
fi
extra=()
extraBefore=()
if test -z "$NIX_LDFLAGS_SET"; then
extra=(${extra[@]} $NIX_LDFLAGS)
extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE)
fi
# Add all used dynamic libraries to the rpath.
if test "$NIX_DONT_SET_RPATH" != "1"; then
libPath=""
addToLibPath() {
local path="$1"
if test "${path:0:1}" != "/"; then return 0; fi
case "$path" in
*..*|*./*|*/.*|*//*)
local path2
if path2=$(readlink -f "$path"); then
path="$path2"
fi
;;
esac
case $libPath in
*\ $path\ *) return 0 ;;
esac
libPath="$libPath $path "
}
addToRPath() {
# If the path is not in the store, don't add it to the rpath.
# This typically happens for libraries in /tmp that are later
# copied to $out/lib. If not, we're screwed.
if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi
case $rpath in
*\ $1\ *) return 0 ;;
esac
rpath="$rpath $1 "
}
rpath=""
# First, find all -L... switches.
allParams=("${params[@]}" ${extra[@]})
n=0
while test $n -lt ${#allParams[*]}; do
p=${allParams[n]}
p2=${allParams[$((n+1))]}
if test "${p:0:3}" = "-L/"; then
addToLibPath ${p:2}
elif test "$p" = "-L"; then
addToLibPath ${p2}
n=$((n + 1))
elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
# This is a direct reference to a shared library, so add
# its directory to the rpath.
path="$(dirname "$p")";
addToRPath "${path}"
fi
n=$((n + 1))
done
# Second, for each directory in the library search path (-L...),
# 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
break
fi
n=$((n + 1))
done
done
# Finally, add `-rpath' switches.
for i in $rpath; do
extra=(${extra[@]} -rpath $i)
done
fi
# Optionally print debug info.
if test "$NIX_DEBUG" = "1"; then
echo "original flags to @ld@:" >&2
for i in "${params[@]}"; do
echo " $i" >&2
done
echo "extra flags to @ld@:" >&2
for i in ${extra[@]}; do
echo " $i" >&2
done
fi
if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
source "$NIX_LD_WRAPPER_EXEC_HOOK"
fi
exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}

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

@ -41,7 +41,7 @@ stdenv.mkDerivation (
header "Generating jar wrappers" header "Generating jar wrappers"
'' + (stdenv.lib.concatMapStrings (w: '' '' + (stdenv.lib.concatMapStrings (w: ''
cat >> $out/bin/jclasslib <<EOF cat >> $out/bin/${w.name} <<EOF
#! /bin/sh #! /bin/sh
export JAVA_HOME=$jre export JAVA_HOME=$jre
$jre/bin/java ${if w ? mainClass then "-cp $out/lib/java/${w.jar} ${w.mainClass}" else "-jar $out/lib/java/${w.jar}"} \$@ $jre/bin/java ${if w ? mainClass then "-cp $out/lib/java/${w.jar} ${w.mainClass}" else "-jar $out/lib/java/${w.jar}"} \$@

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

@ -18,6 +18,10 @@ rec {
{ inherit stdenv; { inherit stdenv;
} // args); } // args);
mvnBuild = args: import ./maven-build.nix (
{ inherit stdenv;
} // args);
nixBuild = args: import ./nix-build.nix ( nixBuild = args: import ./nix-build.nix (
{ inherit stdenv; { inherit stdenv;
} // args); } // args);

97
pkgs/build-support/release/maven-build.nix Normal file
View File

@ -0,0 +1,97 @@
{ stdenv
, name
, src
, doTest ? true
, doTestCompile ? true
, doJavadoc ? false
, doCheckstyle ? false
, doRelease ? false
, includeTestClasses ? true
, extraMvnFlags ? ""
, ...
} @ args :
let
mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}";
in
stdenv.mkDerivation ( rec {
inherit name src;
phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest mvnCobertura" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
setupPhase = ''
runHook preSetupPhase
ensureDir $out/nix-support
export LANG="en_US.UTF-8"
export LOCALE_ARCHIVE=$glibcLocales/lib/locale/locale-archive
export M2_REPO=$TMPDIR/repository
runHook postSetupPhase
'';
mvnCompile = ''
mvn compile ${mvnFlags}
'';
mvnTestCompile = ''
mvn test-compile ${mvnFlags}
'';
mvnTestJar = ''
mvn jar:test-jar ${mvnFlags}
'';
mvnTest = ''
mvn test ${mvnFlags}
'';
mvnJavadoc = ''
mvn javadoc:javadoc ${mvnFlags}
cp -R target/site/apidocs $out/apidocs
echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products
'';
mvnCobertura = ''
mvn cobertura:cobertura ${mvnFlags}
cp -R target/site/cobertura $out/cobertura
echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products
'';
mvnCheckstyle = ''
mvn checkstyle:checkstyle ${mvnFlags}
ensureDir $out/checkstyle
cp -R target/site/checkstyle.* $out/checkstyle/
cp -R target/site/images $out/checkstyle/images
echo "report checkstyle $out/checkstyle/checkstyle.html" >> $out/nix-support/hydra-build-products
'';
mvnJar = ''
mvn jar:jar ${mvnFlags}
'';
mvnAssembly = ''
mvn assembly:assembly ${mvnFlags}
'';
mvnRelease = ''
ensureDir $out/release
ls -l target/
zip=$(ls target/*.zip| head -1)
releaseName=$(basename $zip .zip)
releaseName="$releaseName-r${toString src.rev}"
cp $zip $out/release/$releaseName.zip
echo "$releaseName" > $out/nix-support/hydra-release-name
${if doRelease then ''
echo "file zip $out/release/$releaseName.zip" >> $out/nix-support/hydra-build-products
'' else ""}
'';
finalPhase = ''
ensureDir $out/site
cp -R src/test/site/* $out/site
'';
} // args
)

2
pkgs/build-support/upstream-updater/snippets.sh
View File

@ -2,7 +2,7 @@
#http://sourceforge.net/projects/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz/download #http://sourceforge.net/projects/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz/download
#http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz #http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz
skipRedirectSF='s@^http://sourceforge.net/projects/@http://downloads.sourceforge.net/@; s@/download$@@' skipRedirectSF='s@sourceforge.net/projects@downloads.sourceforge.net/project@; s@/files@@; s@/download$@@;'
extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@' extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@'
apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@' apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@'
skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@' skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@'

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

@ -1,11 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "man-pages-3.22"; name = "man-pages-3.24";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2"; url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
sha256 = "0b6x5jajbrqls2yvy1xzgr1c4jhs1cp8pid07a34m6wipjr6b5kg"; sha256 = "0038v3ddg0mpg2iakdhgd5bg69xw4625si91nf1b0vrh9791fiz4";
}; };
preBuild = preBuild =

4
pkgs/data/misc/shared-mime-info/default.nix
View File

@ -2,11 +2,11 @@
, libxml2, glib}: , libxml2, glib}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "shared-mime-info-0.51"; name = "shared-mime-info-0.71";
src = fetchurl { src = fetchurl {
url = "http://freedesktop.org/~hadess/${name}.tar.bz2"; url = "http://freedesktop.org/~hadess/${name}.tar.bz2";
sha256 = "1n7fn3vnqdq5c4xjyflwryxdb75cwsmw39hdpjy90swd841pw90w"; sha256 = "1d8f97f17de77ae0d8a3a4ef357280ef444da87f4ce19170392712d0c2f6d04f";
}; };
buildInputs = [ buildInputs = [

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

@ -12,6 +12,7 @@ rec {
# !!! Missing! Need to add these. # !!! Missing! Need to add these.
libgnomeprintui = throw "libgnomeprintui not implemented"; libgnomeprintui = throw "libgnomeprintui not implemented";
gnomepanel = throw "gnomepanel not implemented";
gtksourceview_24 = gtksourceview; gtksourceview_24 = gtksourceview;

2
pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup}: {stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup}:
assert stdenv ? glibc;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libgweather-2.28.0"; name = "libgweather-2.28.0";
src = fetchurl { src = fetchurl {

17
pkgs/desktops/kde-4.3/accessibility/default.nix
View File

@ -1,17 +0,0 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdeaccessibility-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdeaccessibility-4.3.5.tar.bz2;
sha256 = "00h89gnxsl1d01ib4rvszmm8vgbhg6q14bvd5gl3ibssyav5xgwn";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];
meta = {
description = "KDE accessibility tools";
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

13
pkgs/desktops/kde-4.3/admin/builder.sh
View File

@ -1,13 +0,0 @@
source $stdenv/setup
myPatchPhase()
{
for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py
do
sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i
done
sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
}
patchPhase=myPatchPhase
genericBuild

29
pkgs/desktops/kde-4.3/admin/default.nix
View File

@ -1,29 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python
, sip, pyqt4, pycups, system_config_printer
, kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdeadmin-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdeadmin-4.3.5.tar.bz2;
sha256 = "131w41rpxzg96pv0bdxjzvm0jhsziric3gd3fq26by4b8i662r9l";
};
builder = ./builder.sh;
inherit system_config_printer;
includeAllQtDirs=true;
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer
kdelibs kdepimlibs kdebindings automoc4 phonon ];
meta = {
description = "KDE Administration Utilities";
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

20
pkgs/desktops/kde-4.3/artwork/default.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver
, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
stdenv.mkDerivation {
name = "kdeartwork-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdeartwork-4.3.5.tar.bz2;
sha256 = "07s1s5rdy5nmfll6dvnrpv3byx7zvflsqzffhlm7fsx7hy1m4cbq";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl xscreensaver
kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
meta = {
description = "KDE artwork";
longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
license = "LGPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

21
pkgs/desktops/kde-4.3/base-runtime/default.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, lib, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, shared_mime_info
, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore}:
stdenv.mkDerivation {
name = "kdebase-runtime-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdebase-runtime-4.3.5.tar.bz2;
sha256 = "0d73ryfw7pi69mzxaj8jgb3pxgc6ibz79bkr9b5dgg9n1zvadylx";
};
/* CLUCENE_HOME=cluceneCore;*/
includeAllQtDirs=true;
buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info
kdelibs automoc4 phonon strigi soprano cluceneCore ];
meta = {
description = "KDE runtime";
longDescription = "Libraries and tools which supports running KDE desktop applications";
license = "LGPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

11
pkgs/desktops/kde-4.3/base-workspace/builder.sh
View File

@ -1,11 +0,0 @@
source $stdenv/setup
myPatchPhase()
{
for i in plasma/applets/systemtray/CMakeLists.txt plasma/applets/systemtray/notificationitemwatcher/CMakeLists.txt
do
sed -i -e "s|\${KDE4_DBUS_INTERFACES_DIR}|$kdelibs_experimental/share/dbus-1|" $i
done
}
patchPhase=myPatchPhase
genericBuild

26
pkgs/desktops/kde-4.3/base-workspace/default.nix
View File

@ -1,26 +0,0 @@
{ stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit
, qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt
}:
stdenv.mkDerivation {
name = "kdebase-workspace-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdebase-workspace-4.3.5.tar.bz2;
sha256 = "16qlrsbb3bxjdyz9by3v051g8v8r4w8z8gk1ssy8jy7qs57671br";
};
includeAllQtDirs=true;
inherit kdelibs_experimental;
builder = ./builder.sh;
buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental 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 ];
meta = {
description = "KDE Workspace";
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
license = "GPL";
maintainers = [ lib.maintainers.sander ];
};
}

21
pkgs/desktops/kde-4.3/base/default.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, lib, cmake, perl, qt4, kdelibs, pciutils, libraw1394
, kdebase_workspace
, automoc4, phonon, strigi, qimageblitz, soprano}:
stdenv.mkDerivation {
name = "kdebase-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdebase-4.3.5.tar.bz2;
sha256 = "04qm3gfz51iwwl8819fzyyjwyf6lk9nim13cp2l5abnfza0lhb9g";
};
includeAllQtDirs=true;
buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394
kdebase_workspace automoc4 phonon strigi qimageblitz soprano ];
meta = {
description = "KDE Base components";
longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

11
pkgs/desktops/kde-4.3/bindings/builder.sh
View File

@ -1,11 +0,0 @@
source $stdenv/setup
tar xfvj $src
cd kdebindings-*/python/pykde4
python configure.py -d $out/lib/python2.5/site-packages -v $out/share/sip
for i in `find . -name Makefile`
do
sed -i -e "s/-O2/-O0/" $i
done
make
make install

24
pkgs/desktops/kde-4.3/bindings/default.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchurl, lib, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4
, libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}:
# This function will only build the pykde4 module. I don't need the other bindings and
# some bindings are even broken.
stdenv.mkDerivation {
name = "kdebindings-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdebindings-4.3.5.tar.bz2;
sha256 = "1gjkdhrgr0nd1dqwf0v715xssyyazqrcs4zwp6dvb2fybpls7x3z";
};
builder = ./builder.sh;
includeAllQtDirs=true;
buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4
libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ];
meta = {
description = "KDE bindings";
longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
license = "LGPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

296
pkgs/desktops/kde-4.3/default.nix
View File

@ -1,296 +0,0 @@
pkgs:
pkgs.recurseIntoAttrs (rec {
inherit (pkgs) qt4;
### SUPPORT
automoc4 = import ./support/automoc4 {
inherit (pkgs) stdenv fetchurl lib cmake;
inherit (pkgs) qt4;
};
phonon = import ./support/phonon {
inherit (pkgs) stdenv fetchurl lib cmake;
inherit (pkgs) qt4 gst_all xineLib;
inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
inherit automoc4;
};
strigi = import ./support/strigi {
inherit (pkgs) stdenv fetchurl lib cmake perl;
inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
};
soprano = import ./support/soprano {
inherit (pkgs) stdenv fetchurl lib cmake;
inherit (pkgs) qt4 cluceneCore;
redland = pkgs.redland_1_0_8;
};
qimageblitz = import ./support/qimageblitz {
inherit (pkgs) stdenv fetchurl lib cmake qt4;
};
qca2 = import ./support/qca2 {
inherit (pkgs) stdenv fetchurl lib which qt4;
};
akonadi = import ./support/akonadi {
inherit (pkgs) stdenv fetchurl lib cmake qt4 shared_mime_info libxslt boost mysql;
inherit automoc4 soprano;
};
decibel = import ./support/decibel {
inherit (pkgs) stdenv fetchurl lib cmake qt4 tapioca_qt telepathy_qt;
};
eigen = import ./support/eigen {
inherit (pkgs) stdenv fetchurl lib cmake;
};
polkit_qt = import ./support/polkit-qt {
inherit (pkgs) stdenv fetchurl lib cmake qt4 policykit;
inherit automoc4;
};
### LIBS
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;
inherit automoc4 phonon strigi soprano;
};
kdelibs_experimental = import ./libs-experimental {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
inherit automoc4 kdelibs phonon;
};
### BASE
kdebase_workspace = import ./base-workspace {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4;
inherit (pkgs) lm_sensors libxklavier libusb boost ConsoleKit;
inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs;
inherit kdelibs kdelibs_experimental kdepimlibs kdebindings;
inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;
};
kdebase = import ./base {
inherit (pkgs) stdenv fetchurl lib cmake perl qt4 pciutils libraw1394;
inherit kdelibs kdebase_workspace;
inherit automoc4 phonon strigi qimageblitz soprano;
};
kdebase_runtime = import ./base-runtime {
inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4;
inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore;
inherit kdelibs;
inherit automoc4 phonon strigi soprano;
};
oxygen_icons = import ./oxygen-icons {
inherit (pkgs) stdenv fetchurl lib cmake;
};
### ADDITIONAL
kdepimlibs = import ./pimlibs {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl boost cyrus_sasl gpgme;
inherit (pkgs) libical openldap shared_mime_info;
inherit kdelibs;
inherit automoc4 phonon akonadi;
};
kdeadmin = import ./admin {
inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer;
inherit kdelibs kdepimlibs kdebindings;
inherit automoc4 phonon;
};
kdeartwork = import ./artwork {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl xscreensaver;
inherit kdelibs kdebase_workspace;
inherit automoc4 phonon strigi eigen;
};
kdeaccessibility = import ./accessibility {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl alsaLib;
inherit (pkgs.xlibs) libXi libXtst;
inherit kdelibs;
inherit automoc4 phonon;
};
kdeedu = import ./edu {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost;
inherit (pkgs) readline gmm gsl facile ocaml xplanet;
inherit kdelibs;
inherit automoc4 phonon eigen;
};
kdegraphics = import ./graphics {
inherit (pkgs) stdenv fetchurl lib cmake perl qt4 exiv2 lcms saneBackends libgphoto2;
inherit (pkgs) libspectre djvulibre chmlib shared_mime_info;
inherit (pkgs.xlibs) libXxf86vm;
poppler = pkgs.popplerQt4;
inherit kdelibs;
inherit automoc4 phonon strigi qimageblitz soprano qca2;
};
kdemultimedia = import ./multimedia {
inherit (pkgs) stdenv fetchurl lib cmake perl qt4;
inherit (pkgs) alsaLib xineLib libvorbis flac taglib cdparanoia lame;
inherit kdelibs kdelibs_experimental;
inherit automoc4 phonon;
};
kdenetwork = import ./network {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
inherit (pkgs) libidn libvncserver tapioca_qt libmsn;
inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm;
inherit kdelibs kdepimlibs;
inherit automoc4 phonon qca2 soprano qimageblitz strigi;
};
kdepim = import ./pim {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl boost gpgme libassuan libgpgerror libxslt;
inherit (pkgs) shared_mime_info;
inherit (pkgs.xlibs) libXScrnSaver;
inherit kdelibs kdelibs_experimental kdepimlibs;
inherit automoc4 phonon akonadi strigi soprano qca2;
};
kdepim_runtime = import ./pim-runtime {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost;
inherit (pkgs) shared_mime_info;
inherit kdelibs kdelibs_experimental kdepimlibs;
inherit automoc4 phonon akonadi soprano strigi;
};
kdeplasma_addons = import ./plasma-addons {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python shared_mime_info;
inherit kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu;
inherit automoc4 phonon soprano eigen qimageblitz;
};
kdegames = import ./games {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
inherit kdelibs;
inherit automoc4 phonon qca2;
};
kdetoys = import ./toys {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
inherit kdelibs kdebase_workspace;
inherit automoc4 phonon;
};
kdeutils = import ./utils {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer;
inherit kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings;
inherit automoc4 phonon qimageblitz qca2;
};
### DEVELOPMENT
kdebindings = import ./bindings {
inherit (pkgs) stdenv fetchurl lib python sip zlib libpng pyqt4 freetype fontconfig qt4;
inherit (pkgs.xlibs) libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext;
inherit kdelibs;
};
kdesdk = import ./sdk {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost subversion apr aprutil;
inherit kdelibs kdepimlibs;
inherit automoc4 phonon strigi;
};
kdewebdev = import ./webdev {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost;
inherit kdelibs kdepimlibs;
inherit automoc4 phonon;
};
#### EXTRA GEAR
amarok = import ./extragear/amarok {
inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext;
inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth;
inherit kdelibs;
inherit automoc4 phonon strigi soprano qca2;
};
digikam = import ./extragear/digikam {
inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext;
inherit kdelibs kdepimlibs kdegraphics kdeedu;
inherit automoc4 phonon qimageblitz qca2 eigen;
};
filelight = import ./extragear/filelight {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
inherit kdelibs kdebase_workspace;
inherit automoc4 phonon qimageblitz;
};
kdesvn = import ./extragear/kdesvn {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4;
inherit kdelibs;
inherit automoc4 phonon;
};
kipiplugins = import ./extragear/kipi-plugins {
inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext;
inherit kdelibs kdepimlibs kdegraphics;
inherit automoc4 phonon qimageblitz qca2;
};
kmplayer = import ./extragear/kmplayer {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib;
inherit (pkgs.gtkLibs) pango gtk;
inherit kdelibs;
inherit automoc4 phonon;
};
krusader = import ./extragear/krusader {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext;
inherit kdelibs;
inherit automoc4 phonon;
};
koffice = import ./extragear/koffice {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew;
inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd;
inherit kdelibs kdepimlibs;
inherit automoc4 phonon qimageblitz qca2 eigen;
poppler = pkgs.popplerQt4;
};
ktorrent = import ./extragear/ktorrent {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp taglib boost gettext;
inherit kdelibs kdepimlibs kdebase_workspace;
inherit automoc4 phonon qca2;
};
konversation = import ./extragear/konversation {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext;
inherit (pkgs.xlibs) libXScrnSaver;
inherit kdelibs kdepimlibs;
inherit automoc4 phonon qca2;
};
gtk_qt_engine = import ./extragear/gtk-qt-engine {
inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
inherit (pkgs.xlibs) libX11;
inherit (pkgs.gtkLibs) gtk;
inherit (pkgs.gnome) libbonoboui;
inherit kdelibs;
inherit automoc4 phonon;
};
### LOCALIZATION
l10n = pkgs.recurseIntoAttrs (import ./l10n {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext;
inherit kdelibs;
inherit automoc4 phonon;
});
})

20
pkgs/desktops/kde-4.3/edu/default.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
, facile, ocaml, xplanet
, kdelibs, automoc4, phonon, eigen}:
stdenv.mkDerivation {
name = "kdeedu-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdeedu-4.3.5.tar.bz2;
sha256 = "0740wsakzl5aa50d02lank8mdhgrs9fllfd3ykhwd66lasxx55a4";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet
kdelibs automoc4 phonon eigen ];
meta = {
description = "KDE Educative software";
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

9
pkgs/desktops/kde-4.3/extragear/amarok/builder.sh
View File

@ -1,9 +0,0 @@
source $stdenv/setup
myPatchPhase()
{
sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake
sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake
}
patchPhase=myPatchPhase
genericBuild

22
pkgs/desktops/kde-4.3/extragear/amarok/default.nix
View File

@ -1,22 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth
, kdelibs, automoc4, phonon, strigi, soprano, qca2}:
stdenv.mkDerivation {
name = "amarok-2.2.2";
src = fetchurl {
url = mirror://kde/stable/amarok/2.2.2/src/amarok-2.2.2.tar.bz2;
sha256 = "0kg67b9wz2wi1gyn229vzbib4s0wpgqrjyfqy0032yl9fa2k13bn";
};
includeAllQtDirs=true;
inherit mysql loudmouth;
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
builder = ./builder.sh;
buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth
kdelibs automoc4 phonon strigi soprano qca2];
meta = {
description = "Popular music player for KDE";
license = "GPL";
homepage = http://amarok.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

23
pkgs/desktops/kde-4.3/extragear/digikam/default.nix
View File

@ -1,23 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, kdeedu, gettext}:
stdenv.mkDerivation rec {
name = "digikam-1.1.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "13zs5gwrzmqcx29r4vn96csz5hivycczjpa5l1157f5xhcg949kd";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
lcms jasper libgphoto2 kdepimlibs gettext kdeedu ];
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;
};
}

19
pkgs/desktops/kde-4.3/extragear/filelight/default.nix
View File

@ -1,19 +0,0 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, qimageblitz, kdelibs, kdebase_workspace,
automoc4, phonon}:
stdenv.mkDerivation {
name = "filelight-1.9rc3";
src = fetchurl {
url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon
qimageblitz ];
meta = {
description = "Shows disk usage as an interactive map of concentric rings";
license = "GPL";
homepage = http://www.methylblue.com/filelight/;
maintainers = [ lib.maintainers.viric ];
};
}

11
pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/builder.sh
View File

@ -1,11 +0,0 @@
source $stdenv/setup
cmakeFlags="-DINSTALL_PATH_GTK_ENGINES=$out/lib/gtk-2.0/2.10.0/engines -DINSTALL_PATH_GTK_THEMES=$out/share/themes -DINSTALL_PATH_KCONTROL_MODULES=$out/lib";
myPatchPhase()
{
sed -i -e "s|\${KDE4_INCLUDE_DIR}|\${KDE4_INCLUDE_DIR} ../build/kcm_gtk|" kcm_gtk/CMakeLists.txt
sed -i -e "s|\*.po|../../\*.po|" po/CMakeLists.txt
}
patchPhase=myPatchPhase
genericBuild

11
pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/default.nix
View File

@ -1,11 +0,0 @@
{stdenv, fetchurl, cmake, qt4, perl, libX11, gtk, libbonoboui, gettext, kdelibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "gtk-qt-engine-1.1";
src = fetchurl {
url = http://gtk-qt-engine.googlecode.com/files/gtk-qt-engine-1.1.tar.bz2;
sha256 = "4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6";
};
buildInputs = [ cmake qt4 perl libX11 gtk libbonoboui gettext kdelibs automoc4 phonon ];
builder = ./builder.sh;
}

8
pkgs/desktops/kde-4.3/extragear/kdesvn/builder.sh
View File

@ -1,8 +0,0 @@
source $stdenv/setup
myPatchPhase()
{
sed -i -e "s|/usr|$subversion|g" src/svnqt/cmakemodules/FindSubversion.cmake
}
patchPhase=myPatchPhase
genericBuild

20
pkgs/desktops/kde-4.3/extragear/kdesvn/default.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4
, kdelibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdesvn-1.4.1";
src = fetchurl {
url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.4.1.tar.bz2;
sha256 = "1xaankj3zl1wxm1zf9dayb9qwnp9s5xx964p83w7pcsir4h5959z";
};
includeAllQtDirs=true;
builder = ./builder.sh;
inherit subversion;
buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ];
meta = {
description = "KDE SVN front-end";
license = "GPL";
homepage = http://kdesvn.alwins-world.de;
maintainers = [ lib.maintainers.sander ];
};
}

23
pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix
View File

@ -1,23 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2,
kdegraphics, kdepimlibs, libxml2, libxslt, gettext}:
stdenv.mkDerivation rec {
name = "kipi-plugins-1.0.0";
src = fetchurl {
url = "mirror://sourceforge/kipi/${name}.tar.bz2";
sha256 = "1fmjxl41lvyb6zv8wrg8sz0hb1jjynj2pwisynpbffglnxd09fwf";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs
libxml2 libxslt gettext ];
cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
meta = {
description = "Photo Management Program";
license = "GPL";
homepage = http://www.kipi-plugins.org;
maintainers = [ lib.maintainers.viric ];
platforms = with lib.platforms; linux;
};
}

9
pkgs/desktops/kde-4.3/extragear/kmplayer/builder.sh
View File

@ -1,9 +0,0 @@
source $stdenv/setup
myPatchPhase()
{
sed -i -e "s|files.length|files.size|" \
-e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp
}
patchPhase=myPatchPhase
genericBuild

18
pkgs/desktops/kde-4.3/extragear/kmplayer/default.nix
View File

@ -1,18 +0,0 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kmplayer-0.11.1b";
src = fetchurl {
url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.1b.tar.bz2;
sha256 = "04wzxxa83kxfzpsrllbdgl0kd6jj13kzhdkm2w66s7mpylr88lfi";
};
includeAllQtDirs=true;
builder = ./builder.sh;
buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];
meta = {
description = "MPlayer front-end for KDE";
license = "GPL";
homepage = http://kmplayer.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

21
pkgs/desktops/kde-4.3/extragear/koffice/default.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
, shared_mime_info, poppler, gsl, gmm, wv2, libwpd
, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}:
stdenv.mkDerivation {
name = "koffice-2.1.0";
src = fetchurl {
url = mirror://kde/stable/koffice-2.1.0/koffice-2.1.0.tar.bz2;
sha256 = "1jdc2rvj5xqd66d152zmjz2psq44kbraqpl0fq05yjg2wz8kdsln";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info
poppler gsl gmm wv2 libwpd
kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ];
meta = {
description = "KDE integrated Office Suite";
license = "GPL";
homepage = http://www.koffice.org;
maintainers = [ lib.maintainers.sander ];
};
}

22
pkgs/desktops/kde-4.3/extragear/konversation/default.nix
View File

@ -1,22 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, libXScrnSaver
, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
stdenv.mkDerivation {
name = "konversation-1.2.1";
src = fetchurl {
url = mirror://kde/stable/konversation/1.2.1/src/konversation-1.2.1.tar.bz2;
sha256 = "1rx4xgw14cfzkxghgn80np8i2ndq26sbdvv96g46r0s14qkdyq8w";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc libXScrnSaver kdelibs kdepimlibs automoc4 phonon qca2 ];
patchPhase = ''
echo "include_directories(${qt4}/include/QtGui)" > tmp
cp src/CMakeLists.txt src/CMakeLists.bak
cat tmp src/CMakeLists.bak > src/CMakeLists.txt
'';
meta = {
description = "Integrated IRC client for KDE";
license = "GPL";
maintainers = [ lib.maintainers.sander ];
};
}

18
pkgs/desktops/kde-4.3/extragear/krusader/default.nix
View File

@ -1,18 +0,0 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "krusader-2.0.0";
src = fetchurl {
url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz;
sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
patches = [./krusader-gcc44.patch];
meta = {
description = "Norton/Total Commander clone for KDE";
license = "GPL";
homepage = http://www.krusader.org;
maintainers = [ lib.maintainers.sander ];
};
}

10
pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch
View File

@ -1,10 +0,0 @@
--- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp~ 2009-04-29 17:13:43.000000000 +0000
+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp 2009-04-29 17:14:01.000000000 +0000
@@ -37,6 +37,7 @@
#include <kio/jobuidelegate.h>
#include <kio/job.h>
#include <qapplication.h>
+#include <cstdio>
#include <iostream>
#include <klocale.h>
#include "virtualcopyjob.h"

20
pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
View File

@ -1,20 +0,0 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, gmp, taglib, boost, gettext,
kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}:
stdenv.mkDerivation {
name = "ktorrent-3.3.2";
src = fetchurl {
url = http://ktorrent.org/downloads/3.3.2/ktorrent-3.3.2.tar.bz2;
sha256 = "08s67nz6wml5bx595czw2gcvrfb09hw1n1rzbj1n8iprr1abcpz1";
};
includeAllQtDirs=true;
cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ];
meta = {
description = "KDE integrated BitTorrent client";
license = "GPL";
homepage = http://ktorrent.org;
maintainers = [ lib.maintainers.sander ];
};
}

17
pkgs/desktops/kde-4.3/games/default.nix
View File

@ -1,17 +0,0 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}:
stdenv.mkDerivation {
name = "kdegames-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdegames-4.3.5.tar.bz2;
sha256 = "1hl3m51awn6rz3z181sawbjw824d87r9c1rswdy7365szhsr7m66";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ];
meta = {
description = "KDE Games";
homepage = http://www.kde.org;
license = "GPL";
maintainers = [ lib.maintainers.sander ];
};
}

24
pkgs/desktops/kde-4.3/graphics/default.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchurl, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
, libspectre, poppler, djvulibre, chmlib, shared_mime_info, libXxf86vm
, kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
stdenv.mkDerivation {
name = "kdegraphics-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdegraphics-4.3.5.tar.bz2;
sha256 = "1n0gf6hvrd30rjnmk5m5rmyv35n1zp97ys04jrbc81k9yn1qfnma";
};
includeAllQtDirs=true;
buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
shared_mime_info stdenv.gcc.libc libXxf86vm
kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ];
meta = {
description = "KDE graphics utilities";
longDescription = ''
Contains various graphics utilities such as the Gwenview image viewer and
Okular a document reader.
'';
license = "GPL";
maintainers = [ lib.maintainers.sander ];
};
}

379
pkgs/desktops/kde-4.3/l10n/default.nix
View File

@ -1,379 +0,0 @@
# THIS IS A GENERATED FILE. DO NOT EDIT!
{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}:
let
deriv = attr : stdenv.mkDerivation {
name = "kde-l10n-${attr.lang}-4.3.5";
src = fetchurl {
url = attr.url;
sha256 = attr.sha256;
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
cmakeFlagsArray = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
meta = {
description = "KDE l10n for ${attr.lang}";
license = "GPL";
homepage = http://www.kde.org;
};
};
in
{
ar = deriv {
lang = "ar";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ar-4.3.5.tar.bz2";
sha256 = "11781zszchvrp7ac6hhyhhf9n4c87n8x9m4cfc0ndg9scazm7dkg";
};
bg = deriv {
lang = "bg";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-bg-4.3.5.tar.bz2";
sha256 = "139if584x2cpzxwrav2cgjbknclcfk2k67jy8caxikzkjqi6z17q";
};
bn_IN = deriv {
lang = "bn_IN";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-bn_IN-4.3.5.tar.bz2";
sha256 = "0sygvwsc5b7dscpvy21zvvzshk48x81qvkpxrdl02wsd9xzfkk97";
};
ca = deriv {
lang = "ca";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ca-4.3.5.tar.bz2";
sha256 = "05bqqjnlm5xb7rcr4lry8na1znsjcm4gjjdphhlz87g3172h81sr";
};
cs = deriv {
lang = "cs";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-cs-4.3.5.tar.bz2";
sha256 = "13c2vqlfd65ryk1z2x2lx5m56is2sqxmasc2m8kpwxp1sb5cip0n";
};
csb = deriv {
lang = "csb";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-csb-4.3.5.tar.bz2";
sha256 = "1pg15wpiinbizia50cfmhaqyap52jcb1v3ymcz93dzin32s4ksvz";
};
da = deriv {
lang = "da";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-da-4.3.5.tar.bz2";
sha256 = "0inmvn425ykc3a0vq7gcf5igav3c3b9zhchmn440y124alm87zvl";
};
de = deriv {
lang = "de";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-de-4.3.5.tar.bz2";
sha256 = "01cmklxih5di3k1ga2qa690ff4zb1m4j1gnazcqg50c6z9rw8g2y";
};
el = deriv {
lang = "el";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-el-4.3.5.tar.bz2";
sha256 = "0qf3psm57w21sqnb8s8n599d9hp83fzqqwjdgq9xyd7jjsy2amlh";
};
en_GB = deriv {
lang = "en_GB";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-en_GB-4.3.5.tar.bz2";
sha256 = "0lkr64rk4sxszcz998k3xpnaz8hjz0l05gmm2pqrfl5ryi6l88nm";
};
es = deriv {
lang = "es";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-es-4.3.5.tar.bz2";
sha256 = "1aayj0zvw7if8x3qjzg4piyar70pbx5szq38i4h0vqqx4q2cv8ik";
};
et = deriv {
lang = "et";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-et-4.3.5.tar.bz2";
sha256 = "1ww4cgwmzbr23n5ilqjz92a0b3qa20fmyfll36pnphjrp0vmr4vr";
};
eu = deriv {
lang = "eu";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-eu-4.3.5.tar.bz2";
sha256 = "1ckydcs3aw36vfi4ik1qk6kkadl3gm8j7gf8z8wc86sn4hbpb75r";
};
fi = deriv {
lang = "fi";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-fi-4.3.5.tar.bz2";
sha256 = "13lv39vq65n5d2rlfy98512slwl3n0lh43j1la9r5gb7930z8w9j";
};
fr = deriv {
lang = "fr";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-fr-4.3.5.tar.bz2";
sha256 = "1a4rgwisfc7d6g7qvfd19jzkfhlaacf6shvm97af4hmdpb53jd9n";
};
fy = deriv {
lang = "fy";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-fy-4.3.5.tar.bz2";
sha256 = "03hd3m5fn4dp3qnqa6mfp1n6rs4irap3p7by0zg118m06cqpy30v";
};
ga = deriv {
lang = "ga";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ga-4.3.5.tar.bz2";
sha256 = "0hn0q0mc3yyhhl6xhmx8fqrbr1m79z2lv00k1mp11zjd1hpb0z1v";
};
gl = deriv {
lang = "gl";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-gl-4.3.5.tar.bz2";
sha256 = "1xv1zwzrbzc95g6l214yrhpp0ldxi1n2vq89gbp8zl0qf27d7jgd";
};
gu = deriv {
lang = "gu";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-gu-4.3.5.tar.bz2";
sha256 = "16rhzn9gdxnc3vr3l7j16pm249mh35041kfz607klzvifjr6ncpv";
};
he = deriv {
lang = "he";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-he-4.3.5.tar.bz2";
sha256 = "15xmc6i43f1jqmrslg067s28z10618ikfcfbyxxfp4bw02g2mgv8";
};
hi = deriv {
lang = "hi";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-hi-4.3.5.tar.bz2";
sha256 = "1l17rsqilf4r495bfhcxpbz03sxi74h0f5b3xhdl499qxg9c2frc";
};
hne = deriv {
lang = "hne";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-hne-4.3.5.tar.bz2";
sha256 = "0x9qdlgz6p6rqa8r1zgk6hxpq2v4sab4p6bm799qanq0jz50lbqw";
};
hr = deriv {
lang = "hr";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-hr-4.3.5.tar.bz2";
sha256 = "1raxh7w1vg6ic7ic61vl0px3c1jinyygzn1zhm29qn4k9in5b4sm";
};
hu = deriv {
lang = "hu";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-hu-4.3.5.tar.bz2";
sha256 = "08iladzh7ls8nyn1283a0g7phgq1yh0ng78apvhzvjhplpa0y2dk";
};
is = deriv {
lang = "is";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-is-4.3.5.tar.bz2";
sha256 = "0rnni9il5szllfks25jf8xplpv4i2qbqwppi0fimiwg71a1kabh5";
};
it = deriv {
lang = "it";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-it-4.3.5.tar.bz2";
sha256 = "0wpmx4sn9civkc05p6qc4g7yj6ypamipn206lzgdp2vdf2kfaqzc";
};
ja = deriv {
lang = "ja";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ja-4.3.5.tar.bz2";
sha256 = "07vm8lnkif9hry13fi2dqa7hnw384bajyn0p0p4p0yfb8ahf4983";
};
kk = deriv {
lang = "kk";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-kk-4.3.5.tar.bz2";
sha256 = "1bp9zyw6scwc0cmc6zncsj2mvh85llw0ynw2sa5cykhrmjyzmj58";
};
km = deriv {
lang = "km";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-km-4.3.5.tar.bz2";
sha256 = "1azymrqyiyab9w9v9x5csklcawssxqyx1i8ynndh3a9pkh5k7hca";
};
kn = deriv {
lang = "kn";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-kn-4.3.5.tar.bz2";
sha256 = "1yhgp7as9s75565b4b954k20slgrcsydwfjlx1cvlrk11hjj3d1w";
};
ko = deriv {
lang = "ko";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ko-4.3.5.tar.bz2";
sha256 = "09w9v28wxwlg452rff2zglqm8pr2idd2c7p3l20jdi8539skz0cj";
};
ku = deriv {
lang = "ku";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ku-4.3.5.tar.bz2";
sha256 = "0hgi8kabb4z581m10qmc2nj99m1mij9ah4sjmrc605fr65cmj70i";
};
lt = deriv {
lang = "lt";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-lt-4.3.5.tar.bz2";
sha256 = "0mdw5lz0z6qg2wigmxz0kb7png80zbnnwnal101xxa3x1bdyvn2y";
};
lv = deriv {
lang = "lv";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-lv-4.3.5.tar.bz2";
sha256 = "1kf7hw35j0j9fwld6xp7gs9849qxw2wsszshj6q6a7w4fnwkb6ka";
};
mai = deriv {
lang = "mai";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-mai-4.3.5.tar.bz2";
sha256 = "1dy9vryip9qrjdwgk9cqan1xjxw46nz61jnsv982i4x5x7rbv8h4";
};
mk = deriv {
lang = "mk";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-mk-4.3.5.tar.bz2";
sha256 = "1j2mmag8xvm1h37sdvr4n6zsgrhlkx5z6zzca8gb0i14xy79653v";
};
ml = deriv {
lang = "ml";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ml-4.3.5.tar.bz2";
sha256 = "02lcbm1rnv1cwwipx1hacwpc3yd7xi5liy7ibdrfk8b11iqvqizy";
};
mr = deriv {
lang = "mr";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-mr-4.3.5.tar.bz2";
sha256 = "0dh5a16f4rcdz9jl3zs6qn27x3r7b0xicyl8kh95a2qix8s3x7cg";
};
nb = deriv {
lang = "nb";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-nb-4.3.5.tar.bz2";
sha256 = "1g7xpk34lhbsr4qc008dhafs5w9w2wimwf815pwnzpc4phdd6dkf";
};
nds = deriv {
lang = "nds";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-nds-4.3.5.tar.bz2";
sha256 = "0dc7q482jlcxzwkrkkjp1np2mqrhzs0pmambwqcqrpriqk4l6c1i";
};
nl = deriv {
lang = "nl";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-nl-4.3.5.tar.bz2";
sha256 = "0l086ivwanliw841v1wdg3xi68c4dss1bdhg9zi6wy6girv3mld8";
};
nn = deriv {
lang = "nn";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-nn-4.3.5.tar.bz2";
sha256 = "191kvzya9c4yjd4kkrn23skqg1g695n8r4lwvlkzy7lwxl5pg8cf";
};
pa = deriv {
lang = "pa";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-pa-4.3.5.tar.bz2";
sha256 = "02by85vkj8w60q5azqbcif00lcmfa9rg8kkzhh25nh6iqmv7z8g1";
};
pl = deriv {
lang = "pl";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-pl-4.3.5.tar.bz2";
sha256 = "13cj00da6l52zblvvfcv6cxb43qchf20pfmh524fpqy98r2px5lf";
};
pt = deriv {
lang = "pt";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-pt-4.3.5.tar.bz2";
sha256 = "067pgn8w5hr6y049mh9481lwy26ljr11nnpnj6qfyfrh4cqf42ms";
};
pt_BR = deriv {
lang = "pt_BR";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-pt_BR-4.3.5.tar.bz2";
sha256 = "00wv1lzcfqphcn5x57wgd0afzn708mhf3rvwy68rkvnh24vr0731";
};
ro = deriv {
lang = "ro";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ro-4.3.5.tar.bz2";
sha256 = "1x1lcnindcm50ady5v0wfl8xzjvjw146iavd4jf0iv301w7f44jb";
};
ru = deriv {
lang = "ru";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ru-4.3.5.tar.bz2";
sha256 = "0xa27l2wyy8n2ipippm1rcwpcrav08kq4dmjm1j1z9i9bi8d3ply";
};
sk = deriv {
lang = "sk";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-sk-4.3.5.tar.bz2";
sha256 = "0cnf97bc9rx1nwbpmvrgfvfmkh0bm3r4bhyxwl2nqh7ik7h6x3gp";
};
sl = deriv {
lang = "sl";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-sl-4.3.5.tar.bz2";
sha256 = "0snm1hsnnjxdw67qr97ng49jcnfjssdxm2dvfwz3k5ggv5dvrhmb";
};
sr = deriv {
lang = "sr";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-sr-4.3.5.tar.bz2";
sha256 = "0kxg77vdb8nbs3wpczmkwr51gghvzqlc0zpnhg4xqd2h3nwppm41";
};
sv = deriv {
lang = "sv";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-sv-4.3.5.tar.bz2";
sha256 = "1gb7xc7d7dm35znfxxkg42lb5g0i3vh3sz5mv69qdn24j6nzqrxg";
};
tg = deriv {
lang = "tg";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-tg-4.3.5.tar.bz2";
sha256 = "17j9nbimyvgsa3j0bcy4kzlksl64m1wflwmymsl73a0lk0f1djyc";
};
th = deriv {
lang = "th";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-th-4.3.5.tar.bz2";
sha256 = "125w3s0zva8z48a5ni34qqhyppvka81rd840y6q70c9v0n3alw53";
};
tr = deriv {
lang = "tr";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-tr-4.3.5.tar.bz2";
sha256 = "1f9prapy96yxvnl1gmvxbccy5ibjv0mn21a3mf9li7yvnjblpav3";
};
uk = deriv {
lang = "uk";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-uk-4.3.5.tar.bz2";
sha256 = "0gyyb75d0vd841bkkr6n3w3a375qr74yfiz1ccsnsjdkbigpm5x7";
};
wa = deriv {
lang = "wa";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-wa-4.3.5.tar.bz2";
sha256 = "0hq4nnhll53g7kmw2xzg0kj5zg4cg19gfbnxv94s9lkn5djkigaw";
};
zh_CN = deriv {
lang = "zh_CN";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-zh_CN-4.3.5.tar.bz2";
sha256 = "0fgjm04pby0nal85cvjrzxan4nmiqzykfq39b2c3q2ispikra0jr";
};
zh_TW = deriv {
lang = "zh_TW";
url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-zh_TW-4.3.5.tar.bz2";
sha256 = "10gphism03i7xk02afbf2ndr1h5c54slix2b3hvzj4klqxq0ai8p";
};
}

102
pkgs/desktops/kde-4.3/l10n/generate-expr-from-tarballs.pl
View File

@ -1,102 +0,0 @@
#! /usr/bin/perl -w
# Typical command to generate the list of tarballs:
# export i="mirror://kde/stable/4.3.5/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list
# manually update extra.list
# then run: cat tarballs.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
use strict;
my $tmpDir = "/tmp/xorg-unpack";
my %pkgURLs;
my %pkgHashes;
my %pkgNames;
my $downloadCache = "./download-cache";
$ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache;
mkdir $downloadCache, 0755;
while (<>) {
chomp;
my $tarball = "$_";
print "\nDOING TARBALL $tarball\n";
$tarball =~ /\/((?:(?:[A-Za-z0-9_]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/;
die unless defined $1;
my $pkg = $1;
$pkg =~ s/kde-l10n-//g;
$tarball =~ /\/([^\/]*)\.tar\.bz2$/;
my $pkgName = $pkg;
print " $pkg $pkgName\n";
if (defined $pkgNames{$pkg}) {
print " SKIPPING\n";
next;
}
$pkgNames{$pkg} = $pkgName;
$pkgURLs{$pkg} = $tarball;
my ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball'`;
chomp $hash;
chomp $path;
$pkgHashes{$pkg} = $hash;
print "done\n";
}
print "\nWRITE OUT\n";
open OUT, ">default.nix";
print OUT "";
print OUT <<EOF;
# THIS IS A GENERATED FILE. DO NOT EDIT!
{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}:
let
deriv = attr : stdenv.mkDerivation {
name = "kde-l10n-\${attr.lang}-4.3.5";
src = fetchurl {
url = attr.url;
sha256 = attr.sha256;
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
cmakeFlagsArray = [ "-DGETTEXT_INCLUDE_DIR=\${gettext}/include" ];
meta = {
description = "KDE l10n for \${attr.lang}";
license = "GPL";
homepage = http://www.kde.org;
};
};
in
{
EOF
foreach my $pkg (sort (keys %pkgNames)) {
print "$pkg\n";
print OUT <<EOF;
$pkgNames{$pkg} = deriv {
lang = "$pkgNames{$pkg}";
url = "$pkgURLs{$pkg}";
sha256 = "$pkgHashes{$pkg}";
};
EOF
}
print OUT "}\n";
close OUT;

8
pkgs/desktops/kde-4.3/libs-experimental/builder.sh
View File

@ -1,8 +0,0 @@
source $stdenv/setup
myPatchPhase()
{
sed -i -e "s|\${KDE4_DBUS_INTERFACES_DIR}|$out/share/dbus-1|" knotificationitem/CMakeLists.txt
}
patchPhase=myPatchPhase
genericBuild

18
pkgs/desktops/kde-4.3/libs-experimental/default.nix
View File

@ -1,18 +0,0 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, automoc4, kdelibs, phonon}:
stdenv.mkDerivation {
name = "kdelibs-experimental-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdelibs-experimental-4.3.5.tar.bz2;
sha256 = "01sask8wa8067bhjxrvxlrfrxnvczf3w3404vc77l201xp0zsiz7";
};
builder = ./builder.sh;
buildInputs = [ cmake qt4 perl automoc4 kdelibs phonon ];
includeAllQtDirs=true;
meta = {
description = "KDE experimental library";
license = "LGPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

32
pkgs/desktops/kde-4.3/libs/default.nix
View File

@ -1,32 +0,0 @@
{ 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
, automoc4, phonon, strigi, soprano
}:
stdenv.mkDerivation {
name = "kdelibs-4.3.5";
src = fetchurl {
url = mirror://kde/stable/4.3.5/src/kdelibs-4.3.5.tar.bz2;
sha256 = "03mlwj7pn0k4g50j196cfqsiqf2gfwixppgka695gxmlw8s3x0k5";
};
includeAllQtDirs = true;
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
automoc4 phonon strigi soprano
];
# I don't know why cmake does not find the acl files (but finds attr files)
cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ];
meta = {
description = "KDE libraries";
license = "LGPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

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