* Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26347
This commit is contained in:
Eelco Dolstra
commit
b3667a1e8f
@ -5,7 +5,7 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
-c "(apply $main (command-line))" "$@"
|
||||
!#
|
||||
;;; GNUpdate -- Update GNU packages in Nixpkgs.
|
||||
;;; Copyright (C) 2010 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright (C) 2010, 2011 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
|
||||
@ -277,18 +277,27 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
"--strict" "--eval-only" "--xml"
|
||||
script)))
|
||||
|
||||
(define (pipe-failed? pipe)
|
||||
"Close pipe and return its status if it failed."
|
||||
(let ((status (close-pipe pipe)))
|
||||
(if (or (status:term-sig status)
|
||||
(not (= (status:exit-val status) 0)))
|
||||
status
|
||||
#f)))
|
||||
|
||||
(define (nix-prefetch-url url)
|
||||
;; Download URL in the Nix store and return the base32-encoded SHA256 hash
|
||||
;; of the file at URL
|
||||
(let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
|
||||
(hash (read-line pipe)))
|
||||
(close-pipe pipe)
|
||||
(if (eof-object? hash)
|
||||
(if (or (pipe-failed? pipe)
|
||||
(eof-object? hash))
|
||||
(values #f #f)
|
||||
(let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
|
||||
"sha256" hash (basename url)))
|
||||
"sha256" hash (basename url)))
|
||||
(path (read-line pipe)))
|
||||
(if (eof-object? path)
|
||||
(if (or (pipe-failed? pipe)
|
||||
(eof-object? path))
|
||||
(values #f #f)
|
||||
(values (string-trim-both hash) (string-trim-both path)))))))
|
||||
|
||||
@ -478,8 +487,14 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
(throw 'ftp-error conn "LIST" code)))))
|
||||
(else
|
||||
(loop (read-line s)
|
||||
(let ((file (car (reverse (string-tokenize line)))))
|
||||
(cons file result)))))))
|
||||
(match (reverse (string-tokenize line))
|
||||
((file _ ... permissions)
|
||||
(let ((type (case (string-ref permissions 0)
|
||||
((#\d) 'directory)
|
||||
(else 'file))))
|
||||
(cons (list file type) result)))
|
||||
((file _ ...)
|
||||
(cons (cons file 'file) result))))))))
|
||||
(lambda ()
|
||||
(close s)
|
||||
(let-values (((code message) (%ftp-listen (ftp-connection-socket conn))))
|
||||
@ -498,7 +513,6 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
"automake17x"
|
||||
"automake19x"
|
||||
"automake110x"
|
||||
"automake" ;; = 1.10.x
|
||||
"bison1875"
|
||||
"bison23"
|
||||
"bison" ;; = 2.3
|
||||
@ -513,10 +527,15 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
"gcc43"
|
||||
"gcc44"
|
||||
"gcc45"
|
||||
"gcc45_real"
|
||||
"gcc45_realCross"
|
||||
"glibc25"
|
||||
"glibc27"
|
||||
"glibc29"
|
||||
"guile_1_9"
|
||||
"guile_1_8"
|
||||
"icecat3Xul" ;; redundant with `icecat'
|
||||
"icecatWrapper"
|
||||
"icecatXulrunner3"
|
||||
))
|
||||
|
||||
(define (gnu? package)
|
||||
@ -558,6 +577,9 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
(define (ftp-server/directory project)
|
||||
(define quirks
|
||||
'(("commoncpp2" "ftp.gnu.org" "/gnu/commoncpp" #f)
|
||||
("ucommon" "ftp.gnu.org" "/gnu/commoncpp" #f)
|
||||
("libzrtpcpp" "ftp.gnu.org" "/gnu/ccrtp" #f)
|
||||
("libosip2" "ftp.gnu.org" "/gnu/osip" #f)
|
||||
("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
|
||||
("freefont-ttf" "ftp.gnu.org" "/gnu/freefont" #f)
|
||||
@ -565,8 +587,9 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
("gnu-ghostscript" "ftp.gnu.org" "/gnu/ghostscript" #f)
|
||||
("grub" "alpha.gnu.org" "/gnu" #t)
|
||||
("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f)
|
||||
("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg")
|
||||
("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f)
|
||||
("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f)
|
||||
("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f)
|
||||
("TeXmacs" "ftp.texmacs.org" "/TeXmacs/targz" #f)))
|
||||
|
||||
(let ((quirk (assoc project quirks)))
|
||||
@ -594,40 +617,65 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
(or (assoc-ref quirks project) project))
|
||||
|
||||
(define (releases project)
|
||||
;; TODO: Handle project release trees like that of IceCat and MyServer.
|
||||
"Return the list of releases of PROJECT as a list of release name/directory
|
||||
pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). "
|
||||
;; TODO: Parse something like fencepost.gnu.org:/gd/gnuorg/packages-ftp.
|
||||
(define release-rx
|
||||
(make-regexp (string-append "^" project "-[0-9].*\\.tar\\.")))
|
||||
(make-regexp (string-append "^" project
|
||||
"-([0-9]|[^-])*(-src)?\\.tar\\.")))
|
||||
|
||||
(catch #t
|
||||
(define alpha-rx
|
||||
(make-regexp "^.*-.*[0-9](-|~)?(alpha|beta|rc|cvs|svn|git)-?[0-9\\.]*\\.tar\\."))
|
||||
|
||||
(define (sans-extension tarball)
|
||||
(let ((end (string-contains tarball ".tar")))
|
||||
(substring tarball 0 end)))
|
||||
|
||||
(catch 'ftp-error
|
||||
(lambda ()
|
||||
(let-values (((server directory) (ftp-server/directory project)))
|
||||
(let* ((conn (ftp-open server))
|
||||
(files (ftp-list conn directory)))
|
||||
(ftp-close conn)
|
||||
(map (lambda (tarball)
|
||||
(let ((end (string-contains tarball ".tar")))
|
||||
(substring tarball 0 end)))
|
||||
(define conn (ftp-open server))
|
||||
|
||||
;; 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)))))
|
||||
(let loop ((directories (list directory))
|
||||
(result '()))
|
||||
(if (null? directories)
|
||||
(begin
|
||||
(ftp-close conn)
|
||||
result)
|
||||
(let* ((directory (car directories))
|
||||
(files (ftp-list conn directory))
|
||||
(subdirs (filter-map (lambda (file)
|
||||
(match file
|
||||
((name 'directory . _) name)
|
||||
(_ #f)))
|
||||
files)))
|
||||
(loop (append (map (cut string-append directory "/" <>)
|
||||
subdirs)
|
||||
(cdr directories))
|
||||
(append
|
||||
;; 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; in mit-scheme, filter out
|
||||
;; binaries).
|
||||
(filter-map (lambda (file)
|
||||
(match file
|
||||
((file 'file . _)
|
||||
(and (not (string-suffix? ".sig" file))
|
||||
(regexp-exec release-rx file)
|
||||
(not (regexp-exec alpha-rx file))
|
||||
(let ((s (sans-extension file)))
|
||||
(and (regexp-exec
|
||||
%package-name-rx s)
|
||||
(cons s directory)))))
|
||||
(_ #f)))
|
||||
files)
|
||||
result)))))))
|
||||
(lambda (key subr message . args)
|
||||
(format (current-error-port)
|
||||
"failed to get release list for `~A': ~A ~A~%"
|
||||
"failed to get release list for `~A': ~S ~S~%"
|
||||
project message args)
|
||||
'())))
|
||||
|
||||
(define pointer->procedure
|
||||
;; Compatibility hack for Guile up to 1.9.12 included.
|
||||
(if (defined? 'pointer->procedure)
|
||||
pointer->procedure
|
||||
make-foreign-function))
|
||||
|
||||
(define version-string>?
|
||||
(let ((strverscmp
|
||||
(let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
|
||||
@ -637,53 +685,64 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
(> (strverscmp (string->pointer a) (string->pointer b)) 0))))
|
||||
|
||||
(define (latest-release project)
|
||||
;; Return "FOO-X.Y" or #f.
|
||||
"Return (\"FOO-X.Y\" . \"/bar/foo\") or #f."
|
||||
(let ((releases (releases project)))
|
||||
(and (not (null? releases))
|
||||
(fold (lambda (release latest)
|
||||
(if (version-string>? release latest)
|
||||
(if (version-string>? (car release) (car latest))
|
||||
release
|
||||
latest))
|
||||
""
|
||||
'("" . "")
|
||||
releases))))
|
||||
|
||||
(define %package-name-rx
|
||||
;; Regexp for a package name, e.g., "foo-X.Y". Since TeXmacs uses
|
||||
;; "TeXmacs-X.Y-src", the `-src' suffix is allowed.
|
||||
(make-regexp "^(.*)-(([0-9]|\\.)+)(-src)?"))
|
||||
|
||||
(define (package/version name+version)
|
||||
(let ((hyphen (string-rindex name+version #\-)))
|
||||
(if (not hyphen)
|
||||
"Return the package name and version number extracted from NAME+VERSION."
|
||||
(let ((match (regexp-exec %package-name-rx name+version)))
|
||||
(if (not match)
|
||||
(values name+version #f)
|
||||
(let ((name (substring name+version 0 hyphen))
|
||||
(version (substring name+version (+ hyphen 1)
|
||||
(string-length name+version))))
|
||||
(values name version)))))
|
||||
(values (match:substring match 1) (match:substring match 2)))))
|
||||
|
||||
(define (file-extension file)
|
||||
(let ((dot (string-rindex file #\.)))
|
||||
(and dot (substring file (+ 1 dot) (string-length file)))))
|
||||
|
||||
(define (packages-to-update gnu-packages)
|
||||
(define (unpack latest)
|
||||
(call-with-values (lambda ()
|
||||
(package/version (car latest)))
|
||||
(lambda (name version)
|
||||
(list name version (cdr latest)))))
|
||||
|
||||
(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)
|
||||
(if (not latest)
|
||||
(begin
|
||||
(format #t "~A [unknown latest version]~%"
|
||||
name+version)
|
||||
result)
|
||||
(match (unpack latest)
|
||||
((_ (? (cut string=? old-version <>)) _)
|
||||
(format #t "~A [up to date]~%" name+version)
|
||||
result)
|
||||
(else
|
||||
(let-values (((project new-version)
|
||||
(package/version latest))
|
||||
((old-name old-hash old-urls)
|
||||
((project new-version directory)
|
||||
(let-values (((old-name old-hash old-urls)
|
||||
(src->values src)))
|
||||
(format #t "~A -> ~A [~A]~%" name+version latest
|
||||
(format #t "~A -> ~A [~A]~%"
|
||||
name+version (car latest)
|
||||
(and (pair? old-urls) (car old-urls)))
|
||||
(let* ((url (and (pair? old-urls)
|
||||
(car old-urls)))
|
||||
(new-hash (fetch-gnu project new-version
|
||||
(new-hash (fetch-gnu project directory
|
||||
new-version
|
||||
(if url
|
||||
(file-extension url)
|
||||
"gz"))))
|
||||
@ -691,39 +750,38 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
old-version old-hash
|
||||
new-version new-hash
|
||||
location)
|
||||
result))))))))))
|
||||
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))))))))
|
||||
(define (fetch-gnu project directory version archive-type)
|
||||
(let* ((server (ftp-server/directory project))
|
||||
(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)))))))
|
||||
|
||||
|
||||
;;;
|
||||
@ -769,20 +827,31 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
|
||||
(define (gnupdate . args)
|
||||
;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
|
||||
|
||||
(define (nixpkgs->snix xml-file)
|
||||
(format (current-error-port) "evaluating Nixpkgs...~%")
|
||||
(let* ((home (getenv "HOME"))
|
||||
(xml (if xml-file
|
||||
(open-input-file xml-file)
|
||||
(open-nixpkgs (or (getenv "NIXPKGS")
|
||||
(string-append home "/src/nixpkgs")))))
|
||||
(snix (xml->snix xml)))
|
||||
(if (not xml-file)
|
||||
(let ((status (pipe-failed? xml)))
|
||||
(if status
|
||||
(begin
|
||||
(format (current-error-port) "`nix-instantiate' failed: ~A~%"
|
||||
status)
|
||||
(exit 1)))))
|
||||
snix))
|
||||
|
||||
(let* ((opts (args-fold (cdr args) %options
|
||||
(lambda (opt name arg result)
|
||||
(error "unrecognized option `~A'" name))
|
||||
(lambda (operand result)
|
||||
(error "extraneous argument `~A'" operand))
|
||||
'()))
|
||||
(home (getenv "HOME"))
|
||||
(path (or (getenv "NIXPKGS")
|
||||
(string-append home "/src/nixpkgs")))
|
||||
(snix (begin
|
||||
(format (current-error-port) "parsing XML...~%")
|
||||
(xml->snix
|
||||
(or (and=> (assoc-ref opts 'xml-file) open-input-file)
|
||||
(open-nixpkgs path)))))
|
||||
(snix (nixpkgs->snix (assoc-ref opts 'xml-file)))
|
||||
(packages (match snix
|
||||
(('snix _ ('attribute-set attributes))
|
||||
attributes)
|
||||
@ -826,3 +895,7 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
(_ #f)))
|
||||
updates)
|
||||
#t))
|
||||
|
||||
;;; Local Variables:
|
||||
;;; eval: (put 'call-with-package 'scheme-indent-function 1)
|
||||
;;; End:
|
||||
|
||||
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Sound editor with graphical UI";
|
||||
homepage = http://audacity.sourceforge.net;
|
||||
license = "GPLv2+";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
35
pkgs/applications/audio/gmu/default.nix
Normal file
35
pkgs/applications/audio/gmu/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod
|
||||
, speex
|
||||
, keymap ? "newdefault"
|
||||
, conf ? "unknown"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gmu-0.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://wejp.k.vu/files/gmu-0.7.2.tar.gz;
|
||||
sha256 = "0gvhwhhlj64lc425wqch4g6v59ldd5i3rxll3zdcrdgk2vkh8nys";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ];
|
||||
|
||||
NIX_LDFLAGS = "-lgcc_s";
|
||||
|
||||
preBuild = ''
|
||||
makeFlags="$makeFlags PREFIX=$out"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp ${keymap}.keymap $out/share/gmu/default.keymap
|
||||
cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf
|
||||
ensureDir $out/etc/gmu
|
||||
cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://wejp.k.vu/projects/gmu;
|
||||
description = "Open source music player for portable gaming consoles and handhelds";
|
||||
license = "GPLv2";
|
||||
};
|
||||
}
|
||||
63
pkgs/applications/audio/spotify/default.nix
Normal file
63
pkgs/applications/audio/spotify/default.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper }:
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
let version = "0.4.9.302"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "spotify-${version}";
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g604b4fb-1_i386.deb";
|
||||
sha256 = "1kw3jfvz8a9v6zl3yh6f51vsick35kmcf7vkbjb6wl0nk1a8q8gg";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g604b4fb-1_amd64.deb";
|
||||
sha256 = "1cghs3hwmqnd7g62g1h2bf3yvxgjq8b94vzhp1w9ysb5rswyjkyv";
|
||||
}
|
||||
else throw "Spotify not supported on this platform.";
|
||||
|
||||
buildInputs = [ dpkg makeWrapper ];
|
||||
|
||||
unpackPhase = "true";
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out
|
||||
dpkg-deb -x $src $out
|
||||
mv $out/usr/* $out/
|
||||
rmdir $out/usr
|
||||
|
||||
patchelf \
|
||||
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||
--set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
|
||||
$out/bin/spotify
|
||||
|
||||
preload=$out/libexec/spotify/libpreload.so
|
||||
mkdir -p $out/libexec/spotify
|
||||
gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
|
||||
|
||||
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload
|
||||
''; # */
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
meta = {
|
||||
homepage = https://www.spotify.com/download/previews/;
|
||||
description = "Spotify for Linux allows you to play music from the Spotify music service";
|
||||
license = "unfree";
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
|
||||
longDescription =
|
||||
''
|
||||
Spotify is a digital music streaming service. This package
|
||||
provides the Spotify client for Linux. At present, it does not
|
||||
work with free Spotify accounts; it requires a Premium or
|
||||
Unlimited account.
|
||||
'';
|
||||
};
|
||||
}
|
||||
59
pkgs/applications/audio/spotify/preload.c
Normal file
59
pkgs/applications/audio/spotify/preload.c
Normal file
@ -0,0 +1,59 @@
|
||||
/* Spotify looks for its theme data in /usr/share/spotify/theme. This
|
||||
LD_PRELOAD library intercepts open() and stat() calls to redirect
|
||||
them to the corresponding location in $out. */
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <dlfcn.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <limits.h>
|
||||
|
||||
char themeDir [] = "/usr/share/spotify/theme";
|
||||
char realThemeDir [] = OUT "/share/spotify/theme";
|
||||
|
||||
const char * rewrite(const char * path, char * buf)
|
||||
{
|
||||
if (strncmp(path, themeDir, sizeof(themeDir) - 1) != 0) return path;
|
||||
if (snprintf(buf, PATH_MAX, "%s%s", realThemeDir, path + sizeof(themeDir) - 1) >= PATH_MAX)
|
||||
abort();
|
||||
return buf;
|
||||
}
|
||||
|
||||
int open(const char *path, int flags, ...)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
|
||||
mode_t mode = 0;
|
||||
if (flags & O_CREAT) {
|
||||
va_list ap;
|
||||
va_start(ap, flags);
|
||||
mode = va_arg(ap, mode_t);
|
||||
va_end(ap);
|
||||
}
|
||||
return _open(rewrite(path, buf), flags, mode);
|
||||
}
|
||||
|
||||
int open64(const char *path, int flags, ...)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
|
||||
mode_t mode = 0;
|
||||
if (flags & O_CREAT) {
|
||||
va_list ap;
|
||||
va_start(ap, flags);
|
||||
mode = va_arg(ap, mode_t);
|
||||
va_end(ap);
|
||||
}
|
||||
return _open64(rewrite(path, buf), flags, mode);
|
||||
}
|
||||
|
||||
int __xstat64(int ver, const char *path, struct stat64 *st)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
int (*___xstat64) (int ver, const char *, struct stat64 *) = dlsym(RTLD_NEXT, "__xstat64");
|
||||
return ___xstat64(ver, rewrite(path, buf), st);
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "slim-1.3.1";
|
||||
name = "slim-1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.berlios.de/slim/${name}.tar.gz";
|
||||
sha256 = "0xqgzvg6h1bd29140mcgg9r16vcmskz7zmym7i7jlz7x9c1a9mxc";
|
||||
sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
|
||||
# Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
|
||||
# (which assumes that a non-empty string means a remote session).
|
||||
./pam2.patch
|
||||
|
||||
./slim-1.3.1-gcc4.4.patch
|
||||
];
|
||||
|
||||
buildInputs = [x11 libjpeg libpng libXmu freetype pam];
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
Patch to allow compilation with gcc-4.4
|
||||
|
||||
Notified by Daniel J. - from Debian bug tracker
|
||||
|
||||
http://bugs.gentoo.org/252745
|
||||
|
||||
--- a/switchuser.h 2008-11-11 19:40:18.000000000 +0000
|
||||
+++ a/switchuser.h 2008-11-11 19:40:28.000000000 +0000
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
#include <paths.h>
|
||||
+#include <cstdio>
|
||||
#include <iostream>
|
||||
#include "const.h"
|
||||
#include "cfg.h"
|
||||
|
||||
@ -8,22 +8,28 @@ assert (libXft != null) -> libpng != null; # probably a bug
|
||||
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emacs-23.2";
|
||||
name = "emacs-23.3";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${name}.tar.bz2";
|
||||
sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z";
|
||||
sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif
|
||||
libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf
|
||||
];
|
||||
buildInputs =
|
||||
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
|
||||
libtiff librsvg libXft gconf
|
||||
]
|
||||
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
|
||||
++ stdenv.lib.optional stdenv.isLinux dbus;
|
||||
|
||||
configureFlags =
|
||||
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ];
|
||||
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"]
|
||||
|
||||
# On NixOS, help Emacs find `crt*.o'.
|
||||
++ stdenv.lib.optional (stdenv ? glibc)
|
||||
[ "--with-crt-dir=${stdenv.glibc}/lib" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, emacs, texinfo, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "org-7.01f";
|
||||
name = "org-7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/${name}.tar.gz";
|
||||
sha256 = "1db7s57g8gh8w0464n18lxpcz270x9ns63b2blhkz8wrdnk57fia";
|
||||
sha256 = "0fpzfq6jynggyw62ai1cjvdmik9jnglfwrwj3nwcmy3g8j8i86fg";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs texinfo ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, guile, libX11, libXext, xmodmap, which, makeWrapper,
|
||||
{stdenv, fetchurl, guile, libX11, libXext, xmodmap, which, makeWrapper, freetype,
|
||||
tex ? null,
|
||||
aspell ? null,
|
||||
ghostscriptX ? null,
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
pname = "TeXmacs";
|
||||
version = "1.0.7.6";
|
||||
version = "1.0.7.10";
|
||||
extraFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
|
||||
sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
|
||||
@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz";
|
||||
sha256 = "0x4qy3ai9nmz1i90mbqi1n2vgwyllxwmlpllfwcz0fad7yby7msh";
|
||||
sha256 = "02gqalr775r4xyfy4bq3qq1h3pkarsxjb6ami7lgxfgmyg6ca5kn";
|
||||
};
|
||||
|
||||
buildInputs = [ guile libX11 libXext makeWrapper ];
|
||||
buildInputs = [ guile libX11 libXext makeWrapper ghostscriptX freetype ];
|
||||
|
||||
patchPhase = (if tex == null then ''
|
||||
gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, ncurses, help2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zile-2.3.21";
|
||||
name = "zile-2.3.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/zile/${name}.tar.gz";
|
||||
sha256 = "1cmw98khpyk0yv3fn94506fm7589adfbs57czrdsm4q8xf2xrj4i";
|
||||
sha256 = "0zkmym5vpb653c5gmzic8588v4ksidnhh33s4pjvr24n7vgj9biy";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
27
pkgs/applications/graphics/darktable/default.nix
Normal file
27
pkgs/applications/graphics/darktable/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchurl,
|
||||
GConf, cairo, curl, dbus_glib, exiv2, gnome_keyring, gphoto2, gtk,
|
||||
intltool, lcms, lensfun, libexif, libglade, libgphoto2, libjpeg,
|
||||
libpng, libraw1394, librsvg, libtiff, openexr, pkgconfig, sqlite, }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.1";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
|
||||
sha256 = "080gvf5gp3rb0vlsvdgnzrzky9dfpqw5cwnj6z1k8lvryd9fzahm";
|
||||
};
|
||||
|
||||
patches = [ ./exif.patch ];
|
||||
|
||||
buildInputs = [ GConf cairo curl dbus_glib exiv2 gnome_keyring gtk
|
||||
intltool lcms lensfun libexif libglade
|
||||
libgphoto2 libjpeg libpng libraw1394 librsvg
|
||||
libtiff openexr pkgconfig sqlite ];
|
||||
|
||||
meta = {
|
||||
description = "a virtual lighttable and darkroom for photographers";
|
||||
homepage = http://darktable.sourceforge.net;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
11
pkgs/applications/graphics/darktable/exif.patch
Normal file
11
pkgs/applications/graphics/darktable/exif.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- darktable-0.7.1/src/common/exif.cc 2011-01-01 12:08:36.000000000 +0100
|
||||
+++ darktable-0.7.1/src/common/exif.cc 2011-01-01 12:09:27.000000000 +0100
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <exiv2/error.hpp>
|
||||
#include <exiv2/image.hpp>
|
||||
#include <exiv2/exif.hpp>
|
||||
-#include <exiv2/canonmn.hpp>
|
||||
+#include <exiv2/exiv2.hpp>
|
||||
#include <sqlite3.h>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
@ -9,6 +9,10 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [djvulibre qt4];
|
||||
|
||||
passthru = {
|
||||
mozillaPlugin = "/lib/netscape/plugins";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://djvu.sourceforge.net/djview4.html;
|
||||
description = "A new portable DjVu viewer and browser plugin";
|
||||
|
||||
@ -1,34 +1,33 @@
|
||||
a :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
{ stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng
|
||||
, pkgconfig, freetype, fontconfig
|
||||
}:
|
||||
|
||||
version = a.lib.attrByPath ["version"] "2.07" a;
|
||||
buildInputs = with a; [
|
||||
libjpeg libexif giflib libtiff libpng
|
||||
imagemagick ghostscript which curl
|
||||
pkgconfig freetype fontconfig
|
||||
];
|
||||
in
|
||||
rec {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fbida-2.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz";
|
||||
url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
|
||||
sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435";
|
||||
};
|
||||
|
||||
inherit buildInputs;
|
||||
configureFlags = [];
|
||||
makeFlags = [
|
||||
"prefix=$out"
|
||||
"verbose=yes"
|
||||
];
|
||||
preBuild =
|
||||
''
|
||||
# Fetch a segfault in exiftran (http://bugs.gentoo.org/284753).
|
||||
# `fbida' contains a copy of some internal libjpeg source files.
|
||||
# If these do not match with the actual libjpeg, exiftran may
|
||||
# fail.
|
||||
tar xvf ${libjpeg.src}
|
||||
for i in jpegint.h jpeglib.h jinclude.h transupp.c transupp.h; do
|
||||
cp jpeg-*/$i jpeg/
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig libexif libjpeg giflib libpng giflib freetype fontconfig ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" "verbose=yes" ];
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doMakeInstall" (a.doPatchShebangs "$out/bin")];
|
||||
|
||||
name = "fbida-" + version;
|
||||
meta = {
|
||||
description = "Framebuffer image viewing programs";
|
||||
maintainers = [
|
||||
];
|
||||
description = "Image viewing and manipulation programs";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, libXinerama }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "feh-1.6.1";
|
||||
name = "feh-1.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.chaosdorf.de/~derf/feh/feh-1.6.1.tar.bz2;
|
||||
sha256 = "1mv09b34ar0dx4wl22xak2g554xgpylicqy5zbnk3bh66vn9pxz2";
|
||||
url = http://www.chaosdorf.de/~derf/feh/feh-1.11.1.tar.bz2;
|
||||
sha256 = "1rxi0hjp8w1rga48qvq3sgsbsgs4d5q1sq59ld1f7rih1knm2v45";
|
||||
};
|
||||
|
||||
buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama];
|
||||
|
||||
55
pkgs/applications/graphics/freecad/cmakeinstall.patch
Normal file
55
pkgs/applications/graphics/freecad/cmakeinstall.patch
Normal file
@ -0,0 +1,55 @@
|
||||
Index: src/3rdParty/salomesmesh/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/src/3rdParty/salomesmesh/CMakeLists.txt (revision 4193)
|
||||
+++ a/src/3rdParty/salomesmesh/CMakeLists.txt (working copy)
|
||||
@@ -191,7 +191,7 @@
|
||||
INCLUDE_DIRECTORIES(src/StdMeshers)
|
||||
|
||||
ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files})
|
||||
-TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c)
|
||||
+TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c gfortran)
|
||||
SET(StdMeshers_CFLAGS "")
|
||||
IF(WIN32)
|
||||
SET(StdMeshers_CFLAGS "-DSTDMESHERS_EXPORTS -DMEFISTO2D_EXPORTS")
|
||||
@@ -218,9 +218,9 @@
|
||||
# Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7
|
||||
INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV
|
||||
SMESHDS SMESH StdMeshers
|
||||
- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME})
|
||||
+ DESTINATION lib)
|
||||
# Headers are installed by default in /usr/local/include/SMESH-5.1.2.7
|
||||
INSTALL(DIRECTORY inc/
|
||||
- DESTINATION /usr/local/include/${INSTALL_PATH_NAME}
|
||||
+ DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h*")
|
||||
ENDIF(UNIX)
|
||||
Index: src/3rdParty/Pivy-0.5/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/src/3rdParty/Pivy-0.5/CMakeLists.txt (revision 4193)
|
||||
+++ a/src/3rdParty/Pivy-0.5/CMakeLists.txt (working copy)
|
||||
@@ -56,6 +56,7 @@
|
||||
set_target_properties(coin PROPERTIES OUTPUT_NAME "_coin")
|
||||
set_target_properties(coin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy)
|
||||
set_target_properties(coin PROPERTIES PREFIX "")
|
||||
+ install(TARGETS coin DESTINATION bin/pivy)
|
||||
endif(MSVC)
|
||||
|
||||
fc_copy_sources_outpath("bin/pivy" "coin"
|
||||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/CMakeLists.txt (revision 4193)
|
||||
+++ a/CMakeLists.txt (working copy)
|
||||
@@ -57,13 +57,6 @@
|
||||
|
||||
# ================================================================================
|
||||
|
||||
-
|
||||
-if(WIN32)
|
||||
- SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
|
||||
-else(WIN32)
|
||||
- SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad")
|
||||
-endif(WIN32)
|
||||
-
|
||||
# ================================================================================
|
||||
# == Win32 is default behaviour use the LibPack copied in Source tree ============
|
||||
if(MSVC)
|
||||
47
pkgs/applications/graphics/freecad/default.nix
Normal file
47
pkgs/applications/graphics/freecad/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ fetchsvn, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
|
||||
boost, zlib,
|
||||
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
|
||||
|
||||
# It builds but fails to install
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "freecad-${version}";
|
||||
version = "svn-${src.rev}";
|
||||
|
||||
src = fetchsvn {
|
||||
url = https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk;
|
||||
rev = "4184";
|
||||
sha256 = "26bd8407ce38f070b81ef39145aed093eed3c200d165a605b8169162d66568ce";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
|
||||
zlib python swig gfortran soqt libf2c pyqt4 makeWrapper ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# The freecad people are used to boost 1.42, and we have newer boost that
|
||||
# require the -DBOOST_FILESYSTEM_VERSION=2 for freecad to build
|
||||
# For zlib to build in i686-linux, as g++ plus glibc defines _LARGEFILE64_SOURCE,
|
||||
# we need the -D-FILE_OFFSET_BITS=64 indication for zlib headers to work.
|
||||
NIX_CFLAGS_COMPILE = "-DBOOST_FILESYSTEM_VERSION=2 -D_FILE_OFFSET_BITS=64";
|
||||
|
||||
# This should work on both x86_64, and i686 linux
|
||||
preBuild = ''
|
||||
export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS";
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \
|
||||
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
|
||||
'';
|
||||
|
||||
patches = [ ./cmakeinstall.patch ./pythonpath.patch ];
|
||||
|
||||
meta = {
|
||||
homepage = http://free-cad.sourceforge.net/;
|
||||
license = [ "GPLv2+" "LGPLv2+" ];
|
||||
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
19
pkgs/applications/graphics/freecad/pythonpath.patch
Normal file
19
pkgs/applications/graphics/freecad/pythonpath.patch
Normal file
@ -0,0 +1,19 @@
|
||||
http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=847&p=6364
|
||||
|
||||
Index: src/Main/MainGui.cpp
|
||||
===================================================================
|
||||
--- a/src/Main/MainGui.cpp (revision 4193)
|
||||
+++ a/src/Main/MainGui.cpp (working copy)
|
||||
@@ -149,10 +149,10 @@
|
||||
// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846
|
||||
putenv("LANG=C");
|
||||
putenv("LC_ALL=C");
|
||||
- putenv("PYTHONPATH=");
|
||||
+ //putenv("PYTHONPATH=");
|
||||
#else
|
||||
setlocale(LC_NUMERIC, "C");
|
||||
- _putenv("PYTHONPATH=");
|
||||
+ //_putenv("PYTHONPATH=");
|
||||
#endif
|
||||
|
||||
// Name and Version of the Application
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
|
||||
, intltool, gettext, libchamplain }:
|
||||
, intltool, gettext, libchamplain, fbida }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geeqie-1.0";
|
||||
@ -23,6 +23,14 @@ stdenv.mkDerivation rec {
|
||||
libchamplain
|
||||
];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
# Allow geeqie to find exiv2 and exiftran, necessary to
|
||||
# losslessly rotate JPEG images.
|
||||
sed -i $out/lib/geeqie/geeqie-rotate \
|
||||
-e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Geeqie, a lightweight GTK+ based image viewer";
|
||||
|
||||
|
||||
34
pkgs/applications/graphics/ocrad/default.nix
Normal file
34
pkgs/applications/graphics/ocrad/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocrad-0.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/ocrad/${name}.tar.gz";
|
||||
sha256 = "1k58ha70r0cqahssx67hfgyzia9ymf691yay06n7nrkbklii3isf";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "GNU Ocrad, optical character recognition (OCR) program & library";
|
||||
|
||||
longDescription =
|
||||
'' GNU Ocrad is an OCR (Optical Character Recognition) program based on
|
||||
a feature extraction method. It reads images in pbm (bitmap), pgm
|
||||
(greyscale) or ppm (color) formats and produces text in byte (8-bit)
|
||||
or UTF-8 formats.
|
||||
|
||||
Also includes a layout analyser able to separate the columns or
|
||||
blocks of text normally found on printed pages.
|
||||
|
||||
Ocrad can be used as a stand-alone console application, or as a
|
||||
backend to other programs.
|
||||
'';
|
||||
|
||||
license = "GPLv3+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,8 @@
|
||||
{ stdenv, fetchurl, pkgconfig, bc, perl, pam
|
||||
, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
|
||||
, libXxf86misc
|
||||
, libjpeg, mesa, gtk , libxml2, libglade}:
|
||||
, libjpeg, mesa, gtk, libxml2, libglade
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.12";
|
||||
@ -14,17 +15,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
|
||||
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
|
||||
libXxf86misc ];
|
||||
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
|
||||
libXxf86misc
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
[
|
||||
"--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
|
||||
|
||||
[ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
|
||||
"--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
|
||||
"--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
|
||||
"--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
|
||||
|
||||
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
|
||||
];
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv,
|
||||
libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4,
|
||||
zlib }:
|
||||
{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv
|
||||
, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
|
||||
, zlib, fontconfig }:
|
||||
|
||||
/* I haven't found any x86_64 package from them */
|
||||
assert stdenv.system == "i686-linux";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "googleearth-5.2.0001";
|
||||
name = "googleearth-6.0.1.2032";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
|
||||
sha256 = "2e6fcbd2384446e2a6eed8ca23173e32c5f3f9ae4d1168e2e348c3924fd2bf30";
|
||||
sha256 = "15bcr379bsdg0flvrgaiyjccx07b4a48z9v3pl006ywm6gp3jbfm";
|
||||
};
|
||||
|
||||
buildNativeInputs = [
|
||||
@ -32,6 +32,7 @@ stdenv.mkDerivation {
|
||||
libX11
|
||||
qt4
|
||||
zlib
|
||||
fontconfig
|
||||
];
|
||||
|
||||
phases = "unpackPhase installPhase";
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "k3b-2.0.1";
|
||||
name = "k3b-2.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/k3b/${name}.tar.bz2";
|
||||
sha256 = "1dyd3i2hqd5xs9rz4f8k74zca91j9sp72lhl0zws2cvqc474ccc6";
|
||||
sha256 = "1kdpylz3w9bg02jg4mjhqz8bq1yb4xi4fqfl9139qcyjq4lny5xg";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib
|
||||
|
||||
20
pkgs/applications/misc/kde-wacomtablet/default.nix
Normal file
20
pkgs/applications/misc/kde-wacomtablet/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl, automoc4, cmake, kdelibs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wacomtablet-1.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz";
|
||||
sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf";
|
||||
};
|
||||
|
||||
buildInputs = [ automoc4 cmake kdelibs ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "KDE Wacom graphic tablet configuration tool";
|
||||
license = "GPLv2";
|
||||
homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.goibhniu maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
@ -4,12 +4,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.5";
|
||||
version = "1.6.9";
|
||||
name = "lyx-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2";
|
||||
sha256 = "0xxj37l4ghaa2ij5nfxlg90rfw0znipigjlh271mfmwjw9ykcw1n";
|
||||
sha256 = "c5b3602c58db385be5c52ba958f52239c5fd090320ec99d79b7eb861c1597709";
|
||||
};
|
||||
|
||||
buildInputs = [texLive qt python makeWrapper ];
|
||||
|
||||
23
pkgs/applications/misc/makeself/default.nix
Normal file
23
pkgs/applications/misc/makeself/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "makeself-2.1.5";
|
||||
src = fetchurl {
|
||||
url = "http://megastep.org/makeself/makeself.run";
|
||||
sha256 = "0khs19xpid4ng0igrjyz3vsi6a5xyixrrrhgdxpdhd2wnf5nc9w2";
|
||||
};
|
||||
unpackPhase = "sh ${src}";
|
||||
installPhase = ''
|
||||
cd ${name}
|
||||
ensureDir $out/{bin,share/{${name},man/man1}}
|
||||
mv makeself.lsm README $out/share/${name}
|
||||
mv makeself.sh $out/bin/makeself
|
||||
mv makeself.1 $out/share/man/man1/
|
||||
mv makeself-header.sh $out/share/${name}
|
||||
sed -e 's|HEADER=`dirname $0`/makeself-header.sh|HEADER=`dirname $0`/../share/${name}/makeself-header.sh|' -i $out/bin/makeself
|
||||
'';
|
||||
meta = {
|
||||
homepage = http://megastep.org/makeself;
|
||||
description = "Utility to create self-extracting packages";
|
||||
};
|
||||
}
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mysql-workbench";
|
||||
version = "5.2.30";
|
||||
version = "5.2.31a";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
|
||||
sha256 = "0dlhnq7pv2ccgm0d7a3hzf9jxa09jzw36h0ljs9vw9q5nyd5kq71";
|
||||
sha256 = "0mvjpin2qmnr8ksiknpcmlqjh5r3mafjcjdrnzbccyxc6r55xiy3";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
|
||||
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
|
||||
--prefix LD_LIBRARY_PATH : "${python}/lib" \
|
||||
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64" \
|
||||
--prefix PATH : "${gnome_keyring}/bin" \
|
||||
--prefix PATH : "${python}/bin" \
|
||||
--set PYTHONPATH $PYTHONPATH \
|
||||
--run '
|
||||
# The gnome-keyring-daemon must be running. To allow for environments like
|
||||
|
||||
28
pkgs/applications/misc/redshift/default.nix
Normal file
28
pkgs/applications/misc/redshift/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ fetchurl, stdenv,
|
||||
libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python,
|
||||
randrproto, xcbutil, xf86vidmodeproto }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "redshift";
|
||||
version = "1.6";
|
||||
src = fetchurl {
|
||||
url = "http://launchpad.net/${name}/trunk/${version}/+download/${name}-${version}.tar.bz2";
|
||||
sha256 = "0g46zhqnx3y2fssmyjgaardzhjw1j29l1dbc2kmccw9wxqfla1wi";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXrandr libXxf86vm libxcb pkgconfig python
|
||||
randrproto xcbutil xf86vidmodeproto ];
|
||||
|
||||
meta = {
|
||||
description = "changes the color temperature of your screen gradually";
|
||||
longDescription = ''
|
||||
The color temperature is set according to the position of the
|
||||
sun. A different color temperature is set during night and
|
||||
daytime. During twilight and early morning, the color
|
||||
temperature transitions smoothly from night to daytime
|
||||
temperature to allow your eyes to slowly adapt.
|
||||
'';
|
||||
license = "GPLv3+";
|
||||
homepage = "http://jonls.dk/redshift";
|
||||
};
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
rec {
|
||||
version="0.11.1";
|
||||
name="xneur-0.11.1";
|
||||
hash="12r2wv1glnx3ilqkrypff9r3mxzk1m3yma3khmam1b0z32lfbxxx";
|
||||
version="0.12.0";
|
||||
name="xneur-0.12.0";
|
||||
hash="09rkr65ajq049x733qj918035kjrmkzqyifbpx7y938kdwq609ln";
|
||||
url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2";
|
||||
advertisedUrl="http://dists.xneur.ru/release-0.11.1/tgz/xneur-0.11.1.tar.bz2";
|
||||
advertisedUrl="http://dists.xneur.ru/release-0.12.0/tgz/xneur-0.12.0.tar.bz2";
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ assert enablePDFtoPPM -> freetype != null;
|
||||
assert useT1Lib -> t1lib != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xpdf-3.02pl4";
|
||||
name = "xpdf-3.02pl5";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
|
||||
@ -36,6 +36,10 @@ stdenv.mkDerivation {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch;
|
||||
sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h";
|
||||
})
|
||||
(fetchurl {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl5.patch;
|
||||
sha256 = "1fki66pw56yr6aw38f6amrx7wxwcxbx4704pjqq7pqqr784b7z4j";
|
||||
})
|
||||
./xpdf-3.02-protection.patch
|
||||
];
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-231";
|
||||
name = "xterm-268";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://invisible-island.net/xterm/${name}.tgz";
|
||||
sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr";
|
||||
sha256 = "1hr886mgr74k146fjppnq1pmg6f95l00v88cfwac3rms5lx7ckap";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
|
||||
--enable-mini-luit --with-tty-group=tty
|
||||
'';
|
||||
|
||||
# Work around broken "plink.sh".
|
||||
NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11";
|
||||
|
||||
# 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,
|
||||
|
||||
@ -8,17 +8,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chrome-${version}";
|
||||
version = "70357";
|
||||
version = "75853";
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = http://build.chromium.org/f/chromium/continuous/linux64/2011-01-02/70375/chrome-linux.zip;
|
||||
sha256 = "0zz9pl1ksiwk5kcsa5isviacg8awzs2gmirg8n36qni07dj5wiq8";
|
||||
url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-02-23/${version}/chrome-linux.zip";
|
||||
sha256 = "1bh507j1pm3qrkj8afzhmqicza5nms6f4dc9848xjgcvj9x2qii7";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = http://build.chromium.org/f/chromium/continuous/linux/2011-01-02/70375/chrome-linux.zip;
|
||||
sha256 = "1i7sb6wgf19zr97r2s5n0p4543i736n8c2hnhk483hjzikg2j55i";
|
||||
url = "http://build.chromium.org/f/chromium/continuous/linux/2011-02-23/${version}/chrome-linux.zip";
|
||||
sha256 = "0rq888yvw5zsh0c3jnp115y4sl1q5kn4pz8flnwhrh35ca15lchn";
|
||||
}
|
||||
else throw "Chromium is not supported on this platform.";
|
||||
|
||||
@ -51,7 +51,10 @@ stdenv.mkDerivation rec {
|
||||
ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Chromium, an open source web browser";
|
||||
homepage = http://www.chromium.org/;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "3.6.13";
|
||||
firefoxVersion = "3.6.15";
|
||||
|
||||
xulVersion = "1.9.2.13"; # this attribute is used by other packages
|
||||
xulVersion = "1.9.2.15"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha1 = "1d1bc70d651bce4006687f5762638563c0494267";
|
||||
sha1 = "bfb69ae49b2def7482543d4d982fa58993a458e9";
|
||||
};
|
||||
|
||||
|
||||
@ -97,6 +97,8 @@ rec {
|
||||
rm -f $out/bin/run-mozilla.sh
|
||||
''; # */
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Firefox XUL runner";
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
|
||||
#assert stdenv.isLinux -> (wirelesstools != null);
|
||||
|
||||
let version = "3.6.9"; in
|
||||
let version = "3.6.15"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "icecat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
|
||||
sha256 = "041rdhhcaak0w0lg0wd1fdl9vlk9a466sh6y17dfz389nswyy8wr";
|
||||
sha256 = "1px018bd81c81a4hbz0qgf89pkshkbhg4abwq1d26dwy8128cxwg";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -15,7 +15,7 @@ unpackPhase() {
|
||||
|
||||
installPhase() {
|
||||
ensureDir $out/lib/mozilla/plugins
|
||||
cp -p libflashplayer.so $out/lib/mozilla/plugins
|
||||
cp -pv libflashplayer.so $out/lib/mozilla/plugins
|
||||
patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
|
||||
}
|
||||
|
||||
|
||||
31
pkgs/applications/networking/esniper/default.nix
Normal file
31
pkgs/applications/networking/esniper/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchurl, openssl, curl }:
|
||||
|
||||
let
|
||||
name = "esniper";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-2.24.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/${name}-2-24-0.tgz";
|
||||
sha256 = "0h3nlw64x2dczfd4nmz890pk9372iwfzwyyb8zyhiaymb34z5c52";
|
||||
};
|
||||
|
||||
buildInputs = [openssl curl];
|
||||
|
||||
postInstall = ''
|
||||
sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe"
|
||||
chmod 555 "$out/bin/snipe"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple, lightweight tool for sniping eBay auctions";
|
||||
homepage = "http://esnipe.rsourceforge.net";
|
||||
license = "GPLv2";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
{ stdenv, fetchbzr, gnutls, glib, pkgconfig, libotr, libgcrypt
|
||||
, libxslt, xmlto, docbook_xsl, docbook_xml_dtd_42, perl }:
|
||||
|
||||
let revision = "369"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bitlbee-otr-r${revision}";
|
||||
src = fetchbzr {
|
||||
url = "http://khjk.org/~pesco/bitlbee-otr";
|
||||
sha256 = "0fb7987ec4a321e07f22690ed6617db9f377fdf4e65a531d8da28a950817074f";
|
||||
inherit revision;
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
# Both OTR and GnuTLS depend on libgcrypt, but for some reason, `bitlbee'
|
||||
# must be explicitly linked against it.
|
||||
sed -i "configure" -e "s|-f \$""{i}/lib/libotr.a|0 -eq 0|g ;
|
||||
s|otrprefix=\$""{i}|otrprefix=\"${libotr}\"|g ;
|
||||
s|-lotr|-lotr -L${libgcrypt} -lgcrypt|g";
|
||||
'';
|
||||
|
||||
buildInputs = [ gnutls glib pkgconfig libotr libgcrypt
|
||||
libxslt xmlto docbook_xsl docbook_xml_dtd_42 perl
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = ''BitlBee, an IRC to other chat networks gateway.'';
|
||||
|
||||
longDescription = ''
|
||||
This unofficial version adds support for communication encryption
|
||||
and authentication via the OTR (off-the-record) library.
|
||||
'';
|
||||
|
||||
# See also http://bugs.bitlbee.org/bitlbee/ticket/115 .
|
||||
homepage = http://khjk.org/bitlbee-otr/;
|
||||
|
||||
license = "GPL";
|
||||
};
|
||||
}
|
||||
@ -1,16 +1,19 @@
|
||||
{ fetchurl, stdenv, gnutls, glib, pkgconfig, check }:
|
||||
{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bitlbee-1.2.8";
|
||||
name = "bitlbee-3.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://bitlbee/src/${name}.tar.gz";
|
||||
sha256 = "11lfxvra46mwcnlxvhnywv6xbp7zl3h27hsbfwdh16b6fy41n1is";
|
||||
sha256 = "027n5f0phjr5fcrphbcflqv8hlkv5qnrpc1xgr09qjyv6mxp72j0";
|
||||
};
|
||||
|
||||
buildInputs = [ gnutls glib pkgconfig ]
|
||||
buildInputs = [ gnutls glib pkgconfig libotr ]
|
||||
++ stdenv.lib.optional doCheck check;
|
||||
|
||||
configureFlags = [ "--otr=1" ];
|
||||
|
||||
preCheck = "mkdir tests/.depend";
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -19,6 +19,12 @@ stdenv.mkDerivation {
|
||||
prePatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./includes.patch
|
||||
];
|
||||
|
||||
NIX_LDFLAGS="-lX11";
|
||||
|
||||
meta = {
|
||||
description = "An instance messanger client for the gadu-gadu network (most popular polish IM network)";
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
--- kadu/kadu-core/main.cpp 2011-01-27 22:58:22.000000000 +0100
|
||||
+++ kadu/kadu-core/main.cpp 2011-01-27 22:58:28.000000000 +0100
|
||||
@@ -20,10 +20,8 @@
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
#endif
|
||||
-#ifdef Q_OS_BSD4
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
-#endif
|
||||
|
||||
#include "config_file.h"
|
||||
#include "debug.h"
|
||||
@ -21,10 +21,10 @@
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pidgin-2.7.8";
|
||||
name = "pidgin-2.7.9";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/pidgin/pidgin-2.7.8.tar.bz2;
|
||||
sha256 = "1ci173g1xshfi4pl9wqv9g3fwxyqvdz5v61bgqpfij0hl1ss9k4c";
|
||||
url = mirror://sourceforge/pidgin/pidgin-2.7.9.tar.bz2;
|
||||
sha256 = "17p1lcdxh241nsaz8xxbr8l5r7a0v5qg500cj0llww56k7qxf8lp";
|
||||
};
|
||||
|
||||
inherit nss ncurses;
|
||||
|
||||
20
pkgs/applications/networking/linphone/default.nix
Normal file
20
pkgs/applications/networking/linphone/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip, speex,
|
||||
readline, ffmpeg, alsaLib, SDL, libv4l, libtheora }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "linphone-3.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.savannah.gnu.org/releases/linphone/3.3.x/sources/linphone-3.3.2.tar.gz;
|
||||
sha256 = "0plxqs6v2jz6s7ig8wfzg2ivjvdjja5xhqvrcsv644zl3b4igax7";
|
||||
};
|
||||
|
||||
buildInputs = [ intltool pkgconfig gtk libglade libosip libexosip speex readline
|
||||
ffmpeg alsaLib SDL libv4l libtheora ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.linphone.org/;
|
||||
description = "Open Source video SIP softphone";
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
24
pkgs/applications/networking/mailreaders/notmuch/default.nix
Normal file
24
pkgs/applications/networking/mailreaders/notmuch/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ fetchgit, stdenv, emacs, glib, gmime, pkgconfig, talloc, xapian }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "notmuch-0.5-20110203";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://notmuchmail.org/git/notmuch";
|
||||
rev = "62725a5b59625c164512465af5b3912396b61e8b";
|
||||
sha256 = "39b339f47cee1938d76e046cccfd7c3e5e5d37a578e40007a5d43adfc4cd41ce";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs glib gmime pkgconfig talloc xapian ];
|
||||
|
||||
meta = {
|
||||
description = "Notmuch -- The mail indexer";
|
||||
|
||||
longDescription = "";
|
||||
|
||||
license = "GPLv3";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.chaoflow ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
}:
|
||||
|
||||
let version = "3.1.6"; in
|
||||
let version = "3.1.7"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "thunderbird-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
|
||||
sha1 = "d9c089c64cc7a784e128d9c594ef649a35babe30";
|
||||
sha1 = "c2d6cdedfe399c1ab41c00045e4fce835cc0b36f";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
31
pkgs/applications/networking/mumble/default.nix
Normal file
31
pkgs/applications/networking/mumble/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
|
||||
avahi, dbus, libcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mumble-" + version;
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mumble/${name}.tar.gz";
|
||||
sha256 = "1s4vlkdfmyzx7h3i4060q0sf2xywl9sm6dpjhaa150blbcylwmic";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -e s/qt_ja_JP.qm// -i src/mumble/mumble.pro src/mumble11x/mumble11x.pro
|
||||
sed -e /qt_ja_JP.qm/d -i src/mumble/mumble_qt.qrc src/mumble11x/mumble_qt.qrc
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
qmake PREFIX=$out CONFIG+=no-g15 CONFIG+=no-update \
|
||||
CONFIG+=no-embed-qt-translations CONFIG+=no-ice
|
||||
'';
|
||||
|
||||
buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
|
||||
libcap ];
|
||||
|
||||
meta = {
|
||||
homepage = http://mumble.sourceforge.net/;
|
||||
description = "Low-latency, high quality voice chat software";
|
||||
license = "BSD";
|
||||
};
|
||||
}
|
||||
@ -1,29 +1,25 @@
|
||||
{ spellChecking ? true
|
||||
, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null
|
||||
, perl, pcre, gmime, gettext
|
||||
, perl, pcre, gmime, gettext, intltool
|
||||
}:
|
||||
|
||||
assert spellChecking -> gtkspell != null;
|
||||
|
||||
let version = "0.134"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pan-0.133";
|
||||
name = "pan-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://pan.rebelbase.com/download/releases/0.133/source/pan-0.133.tar.bz2;
|
||||
sha1 = "a0bd98ea1ba174800896611e3305a6b6d8dbde2f";
|
||||
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
|
||||
sha1 = "7ef9385e59edf7d511ad3de6c39482297c820685";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ # Build on GCC 4.4.
|
||||
(fetchurl {
|
||||
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-nntp/pan/files/pan-0.133-gcc44.patch?rev=1.1";
|
||||
sha256 = "05xmgvcpl1gjcfab8xsdy400p55j59hp52fwa4qbwlqy3c35qv1v";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [pkgconfig gtk perl pcre gmime gettext]
|
||||
buildInputs = [ pkgconfig gtk perl gmime gettext intltool ]
|
||||
++ stdenv.lib.optional spellChecking gtkspell;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A GTK+-based Usenet newsreader good at both text and binaries";
|
||||
homepage = http://pan.rebelbase.com/;
|
||||
|
||||
29
pkgs/applications/networking/offrss/default.nix
Normal file
29
pkgs/applications/networking/offrss/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{stdenv, fetchurl, curl, libmrss}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "offrss-0.9";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp offrss $out/bin
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
makeFlags = "CC=${stdenv.cross.config}-gcc";
|
||||
};
|
||||
|
||||
buildInputs = [ curl libmrss ];
|
||||
|
||||
src = fetchurl {
|
||||
url = http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-0.9.tar.gz;
|
||||
sha256 = "1mpnsfakcpqzf76dicm21nc7sj7qacazb3rbcmlhz1zhbrw5kszj";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss";
|
||||
description = "Offline RSS/Atom reader";
|
||||
license="AGPLv3+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
};
|
||||
}
|
||||
30
pkgs/applications/networking/pjsip/default.nix
Normal file
30
pkgs/applications/networking/pjsip/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{stdenv, fetchurl, openssl, libsamplerate}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pjsip-1.8.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.pjsip.org/release/1.8.10/pjproject-1.8.10.tar.bz2;
|
||||
sha256 = "1v2mgbgzn7d3msb406jmg69ms97a0rqg58asykx71dmjipbaiqc0";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl libsamplerate ];
|
||||
|
||||
postInstall = ''
|
||||
ensureDir $out/bin
|
||||
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
|
||||
ensureDir $out/share/${name}/samples
|
||||
cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples
|
||||
'';
|
||||
|
||||
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
|
||||
dontPatchELF = true;
|
||||
|
||||
meta = {
|
||||
description = "SIP stack and media stack for presence, im, and multimedia communication";
|
||||
homepage = http://pjsip.org/;
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
19
pkgs/applications/networking/siproxd/default.nix
Normal file
19
pkgs/applications/networking/siproxd/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ stdenv, fetchurl, libosip }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "siproxd-0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/siproxd/siproxd-0.8.0.tar.gz;
|
||||
sha256 = "0hl51z33cf68ki707jkrrjjc3a5vpaf49gbrsz3g4rfxypdhc0qs";
|
||||
};
|
||||
|
||||
buildInputs = [ libosip ];
|
||||
|
||||
meta = {
|
||||
homepage = http://siproxd.sourceforge.net/;
|
||||
description = "A masquerading SIP Proxy Server";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
16
pkgs/applications/networking/sync/akunambol/default.nix
Normal file
16
pkgs/applications/networking/sync/akunambol/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ stdenv, fetchgit, cmake, kdelibs, kdepimlibs, automoc4, funambol,liblikeback }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "akunambol-20110304";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://anongit.kde.org/akunambol.git;
|
||||
rev = "1d832bbbce84f474e3f1e5d2f9fa8a4079b0c8e5";
|
||||
sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake automoc4 kdelibs kdepimlibs funambol liblikeback ];
|
||||
KDEDIRS = liblikeback;
|
||||
|
||||
patches = [ ./non-latin.diff ];
|
||||
}
|
||||
17
pkgs/applications/networking/sync/akunambol/non-latin.diff
Normal file
17
pkgs/applications/networking/sync/akunambol/non-latin.diff
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/qtgui/standardsourcesettings.cpp b/qtgui/standardsourcesettings.cpp
|
||||
index a14a737..5d4712e 100644
|
||||
--- a/qtgui/standardsourcesettings.cpp
|
||||
+++ b/qtgui/standardsourcesettings.cpp
|
||||
@@ -83,9 +83,9 @@ void StandardSourceSettings::populateCollections()
|
||||
foreach( const Collection &collection, colls ) {
|
||||
if (collection.contentMimeTypes().contains(source->getAkonadiMimeType())) {
|
||||
i++;
|
||||
- const char* dn = collection.name().toUtf8();
|
||||
- LOG.debug("Adding collection id %lld named %s", collection.id(), dn);
|
||||
- collections->addItem(dn);
|
||||
+ LOG.debug("Adding collection id %lld named %s", collection.id(),
|
||||
+ collection.name().toLocal8Bit().data());
|
||||
+ collections->addItem(collection.name());
|
||||
idList.append(collection.id());
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,9 @@
|
||||
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper}:
|
||||
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
|
||||
, enableX11 ? true}:
|
||||
|
||||
let
|
||||
nativeCode = if stdenv.system == "armv5tel-linux" then false else true;
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
name = "unison-2.32.52";
|
||||
@ -8,19 +12,25 @@ stdenv.mkDerivation (rec {
|
||||
sha256 = "11844yh1gpjjapn8pvc14hla7g70spwqy6h61qk2is83mpafahhm";
|
||||
};
|
||||
|
||||
buildInputs = [ocaml makeWrapper];
|
||||
buildInputs = [ ocaml makeWrapper ncurses ];
|
||||
|
||||
preBuild = ''
|
||||
preBuild = if enableX11 then ''
|
||||
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml
|
||||
'';
|
||||
makeFlags = "UISTYLE=gtk2 INSTALLDIR=$(out)/bin/";
|
||||
'' else "";
|
||||
|
||||
makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "")
|
||||
+ (if ! nativeCode then " NATIVE=false" else "");
|
||||
|
||||
preInstall = "ensureDir $out/bin";
|
||||
postInstall = ''
|
||||
|
||||
postInstall = if enableX11 then ''
|
||||
for i in $(cd $out/bin && ls); do
|
||||
wrapProgram $out/bin/$i \
|
||||
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
|
||||
done
|
||||
'';
|
||||
'' else "";
|
||||
|
||||
dontStrip = if ! nativeCode then true else false;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.cis.upenn.edu/~bcpierce/unison/;
|
||||
|
||||
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "11h4rxdrv5vakym5786vr4bysi4627m53qqvk1vhxf3rkawvcafj";
|
||||
})
|
||||
./wpd.patch
|
||||
./krita-exiv-0.21.diff
|
||||
];
|
||||
|
||||
buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew
|
||||
|
||||
81
pkgs/applications/office/koffice/krita-exiv-0.21.diff
Normal file
81
pkgs/applications/office/koffice/krita-exiv-0.21.diff
Normal file
@ -0,0 +1,81 @@
|
||||
commit 7f6b2f2b9b2be1e4f257582a04b194c69f705bc7
|
||||
Author: Casper Boemann <cbr@boemann.dk>
|
||||
Date: Sat Dec 4 10:44:02 2010 +0000
|
||||
|
||||
------------------------------------------------------------------------
|
||||
r1203267 | rempt | 2010-12-03 14:20:03 +0100 (Fri, 03 Dec 2010) | 1 line
|
||||
Changed paths:
|
||||
M /trunk/koffice/krita/ui/kis_aboutdata.h
|
||||
|
||||
correct url for animtim
|
||||
|
||||
------------------------------------------------------------------------
|
||||
r1203281 | uzak | 2010-12-03 14:43:32 +0100 (Fri, 03 Dec 2010) | 2 lines
|
||||
Changed paths:
|
||||
M /trunk/koffice/filters/kpresenter/powerpoint/pptstyle.cpp
|
||||
|
||||
PPT: Fine tuned processing of the TextCFException structure for MS Office 2007.
|
||||
|
||||
|
||||
------------------------------------------------------------------------
|
||||
r1203296 | danders | 2010-12-03 15:44:01 +0100 (Fri, 03 Dec 2010) | 3 lines
|
||||
Changed paths:
|
||||
M /trunk/koffice/kplato/libs/kernel/kptaccount.cpp
|
||||
|
||||
Fix data loss on xml load.
|
||||
BUG: 258685
|
||||
|
||||
|
||||
------------------------------------------------------------------------
|
||||
r1203344 | bero | 2010-12-03 18:08:24 +0100 (Fri, 03 Dec 2010) | 2 lines
|
||||
Changed paths:
|
||||
M /trunk/koffice/krita/ui/kisexiv2/kis_exif_io.cpp
|
||||
|
||||
Fix build with exiv2 0.21
|
||||
|
||||
|
||||
|
||||
svn path=/branches/work/koffice-essen/; revision=1203491
|
||||
|
||||
diff krita/ui/kisexiv2/kis_exif_io.cpp krita/ui/kisexiv2/kis_exif_io.cpp
|
||||
index 6eb7f30..c85da65 100644
|
||||
--- krita/ui/kisexiv2/kis_exif_io.cpp
|
||||
+++ krita/ui/kisexiv2/kis_exif_io.cpp
|
||||
@@ -406,7 +406,11 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
|
||||
v = kmdIntOrderedArrayToExifArray(entry.value());
|
||||
} else if (exivKey == "Exif.Image.Artist") { // load as dc:creator
|
||||
KisMetaData::Value creator = entry.value().asArray()[0];
|
||||
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
|
||||
v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
|
||||
+#else
|
||||
+ v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
|
||||
+#endif
|
||||
} else if (exivKey == "Exif.Photo.OECF") {
|
||||
v = kmdOECFStructureToExifOECF(entry.value());
|
||||
} else if (exivKey == "Exif.Photo.DeviceSettingDescription") {
|
||||
@@ -419,13 +423,25 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
|
||||
Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
|
||||
QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
|
||||
if (langArr.contains("x-default")) {
|
||||
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
|
||||
v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
|
||||
+#else
|
||||
+ v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
|
||||
+#endif
|
||||
} else if (langArr.size() > 0) {
|
||||
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
|
||||
v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
|
||||
+#else
|
||||
+ v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
|
||||
+#endif
|
||||
}
|
||||
} else {
|
||||
dbgFile << exifKey.tag();
|
||||
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
|
||||
v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
|
||||
+#else
|
||||
+ v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
|
||||
+#endif
|
||||
}
|
||||
if (v && v->typeId() != Exiv2::invalidTypeId) {
|
||||
dbgFile << "Saving key" << exivKey; // << " of KMD value" << entry.value();
|
||||
@ -5,7 +5,7 @@
|
||||
let
|
||||
|
||||
pname = "ledger";
|
||||
version = "2.6.1";
|
||||
version = "2.6.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
in
|
||||
@ -14,8 +14,8 @@ stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
|
||||
sha256 = "96830d77d3aa6bf6c5778f5dd52169f9b5203fb7daad0e12831abeb35b14f27a";
|
||||
url = "https://github.com/downloads/jwiegley/ledger/ledger-${version}.tar.gz";
|
||||
sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs gmp pcre ];
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
}:
|
||||
|
||||
let version = "3.2.1"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openoffice.org-${version}";
|
||||
builder = ./builder.sh;
|
||||
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
|
||||
};
|
||||
|
||||
patches = [ ./oo.patch ./root-required.patch ];
|
||||
patches = [ ./oo.patch ./root-required.patch ./xlib.patch ];
|
||||
|
||||
postPatch =
|
||||
/* Compiling with GCC 4.5 fails:
|
||||
|
||||
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
sed '/-x $WGET/d' -i download
|
||||
./download
|
||||
|
||||
# Needed to find genccode
|
||||
PATH=$PATH:${icu}/sbin
|
||||
|
||||
@ -53,6 +54,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
set -x
|
||||
pushd build/${tag}
|
||||
|
||||
patch -p1 < ${./xlib.patch}
|
||||
|
||||
# Fix svtools: hardcoded jpeg path
|
||||
sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk
|
||||
# Fix sysui: wants to create a tar for root
|
||||
@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
|
||||
# Fix redland: wants to set rpath to /usr/local/lib
|
||||
sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \
|
||||
redland/raptor/makefile.mk redland/rasqal/makefile.mk
|
||||
|
||||
popd
|
||||
|
||||
set +x
|
||||
|
||||
22
pkgs/applications/office/openoffice/xlib.patch
Normal file
22
pkgs/applications/office/openoffice/xlib.patch
Normal file
@ -0,0 +1,22 @@
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=31322
|
||||
|
||||
diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx
|
||||
*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200
|
||||
--- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100
|
||||
***************
|
||||
*** 36,42 ****
|
||||
class SalDisplay;
|
||||
class AllSettings;
|
||||
|
||||
! #ifndef _XLIB_H_
|
||||
// forwards from X
|
||||
struct Display;
|
||||
struct XEvent;
|
||||
--- 36,42 ----
|
||||
class SalDisplay;
|
||||
class AllSettings;
|
||||
|
||||
! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
|
||||
// forwards from X
|
||||
struct Display;
|
||||
struct XEvent;
|
||||
@ -1,22 +1,22 @@
|
||||
{ stdenv, fetchurl, clisp }:
|
||||
{ stdenv, fetchurl, clisp, texinfo, perl }:
|
||||
|
||||
let
|
||||
name = "maxima";
|
||||
version = "5.22.1";
|
||||
version = "5.23.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
|
||||
sha256 = "0sdrv3lra6j3ylaqsblnd3x7rq4ybafyj7rb114ycadpx2qf06lq";
|
||||
sha256 = "0x6fl7lm2jmybd5n3l5qpyvcj9f5zfwizk7wkbpgkjimh58n5skv";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="--infodir=$out/share/info --mandir=$out/share/man"
|
||||
'';
|
||||
|
||||
buildInputs = [clisp];
|
||||
buildInputs = [clisp texinfo perl];
|
||||
|
||||
meta = {
|
||||
description = "Maxima computer algebra system";
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
let
|
||||
name = "wxmaxima";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz";
|
||||
sha256 = "09w6gai0jfhl959yrdcdikz5l9kdjshasjk404vl19nfnivdbj9f";
|
||||
sha256 = "0ms141rgkccwf2xfc56km972gl4ga61pk9iz7f7fcsl64zmr5rs0";
|
||||
};
|
||||
|
||||
buildInputs = [maxima wxGTK];
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "darcs";
|
||||
name = self.fname;
|
||||
version = "2.5";
|
||||
sha256 = "0i99z3wsfc1hhr0a0ax7254gj3i69yg8cb9lhp55wl6lfqvpzcnh";
|
||||
version = "2.5.1";
|
||||
sha256 = "0h7i2nw1fkmdrvwgzccqvbbfx8bdhn0h9d5rd98ayjs207dnvrj8";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
curl html parsec regexCompat haskeline hashedStorage zlib tar text
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, zlib, openssl, tcl}:
|
||||
|
||||
let
|
||||
version = "20110101030647";
|
||||
version = "20110301190432";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
|
||||
sha256 = "17kv8cv1v1lsymyhjrpl3nhs3mbrnpc3asp6da9smkgf6gsrnjca";
|
||||
sha256 = "1dvccfqyrxihsj376m2dk4ygrajk8nlrp9di5s49azv0vkzrpp38";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
||||
@ -12,11 +12,11 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "git-1.7.3.2";
|
||||
name = "git-1.7.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
|
||||
sha256 = "0w9yappfl0jb88fk28vv680p33c2j4b0afzl1q2mcq0igjygck5w";
|
||||
sha256 = "06ydc1dr8ndiqc7rkh0xxiffyfq22gwfdzdds7cbqsprr30szic5";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ];
|
||||
@ -84,16 +84,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
+ (if guiSupport then ''
|
||||
# Wrap Tcl/Tk programs
|
||||
for prog in bin/gitk libexec/git-core/git-gui
|
||||
do
|
||||
wrapProgram "$out/$prog" \
|
||||
--set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" \
|
||||
--prefix PATH : "${tk}/bin"
|
||||
for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
|
||||
sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
|
||||
-e "s|exec wish|exec '${tk}/bin/wish'|g" \
|
||||
"$out/$prog"
|
||||
done
|
||||
'' else ''
|
||||
# Don't wrap Tcl/Tk, replace them by notification scripts
|
||||
for prog in bin/gitk libexec/git-core/git-gui
|
||||
do
|
||||
# Don't wrap Tcl/Tk, replace them by notification scripts
|
||||
for prog in bin/gitk libexec/git-core/git-gui; do
|
||||
notSupported "$out/$prog" \
|
||||
"reinstall with config git = { guiSupport = true; } set"
|
||||
done
|
||||
@ -107,18 +105,19 @@ stdenv.mkDerivation rec {
|
||||
# multiple times into $out so replace duplicates by symlinks because I
|
||||
# haven't tested whether the nix distribution system can handle hardlinks.
|
||||
# This reduces the size of $out from 115MB down to 13MB on x86_64-linux!
|
||||
+ ''#
|
||||
+ ''
|
||||
declare -A seen
|
||||
find $out -type f | while read f; do
|
||||
shopt -s globstar
|
||||
for f in "$out/"**; do
|
||||
test -f "$f" || continue
|
||||
sum=$(md5sum "$f");
|
||||
sum=''\${sum/ */}
|
||||
if [ -z "''\${seen["$sum"]}" ]; then
|
||||
seen["$sum"]="$f"
|
||||
else
|
||||
rm "$f"; ln -s "''\${seen["$sum"]}" "$f"
|
||||
rm "$f"; ln -v -s "''\${seen["$sum"]}" "$f"
|
||||
fi
|
||||
done
|
||||
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,18 +1,23 @@
|
||||
{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
|
||||
|
||||
let
|
||||
minor = "1.5";
|
||||
version = "${minor}.0";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "meld-1.3.1";
|
||||
name = "meld-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://ftp.gnome.org/pub/gnome/sources/meld/1.3/meld-1.3.1.tar.bz2;
|
||||
sha256 = "0iqnj3qb9l7z12akgmf64fr2xqirsqxflvj60xqcqr5vd5c763nn";
|
||||
url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.bz2";
|
||||
sha256 = "1kf0k3813nfmahn2l2lbs6n9zg2902gixypsf656m6mqyyrmxrrm";
|
||||
};
|
||||
|
||||
buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -e s,/usr/local,$out, -i INSTALL
|
||||
sed -e 's,#!.*,#!${python}/bin/python,' -i meld
|
||||
sed -e 's,#!.*,#!${python}/bin/python,' -i bin/meld
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,22 +1,30 @@
|
||||
{stdenv, fetchurl, boost, zlib, botan, libidn,
|
||||
lua, pcre, sqlite, perl, pkgconfig}:
|
||||
{ stdenv, fetchurl, boost, zlib, botan, libidn
|
||||
, lua, pcre, sqlite, perl, pkgconfig }:
|
||||
|
||||
let
|
||||
version = "0.99.1";
|
||||
perlVersion = builtins.substring 5 10 perl.name;
|
||||
in stdenv.mkDerivation rec {
|
||||
perlVersion = (builtins.parseDrvName perl.name).version;
|
||||
in
|
||||
|
||||
assert perlVersion != "";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "monotone-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz";
|
||||
sha256 = "189h5f6gqd4ng0qmzi3xwnj17nnpxm2vzras216ar6b5yc9bnki0";
|
||||
};
|
||||
|
||||
buildInputs = [boost zlib botan libidn lua pcre sqlite pkgconfig];
|
||||
|
||||
postInstall = ''
|
||||
ensureDir $out/share/${name}
|
||||
cp -rv contrib/ $out/share/${name}/contrib
|
||||
ensureDir $out/lib/perl5/site_perl/${perlVersion}
|
||||
cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/${perlVersion}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A free distributed version control system";
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
|
||||
@ -19,12 +19,21 @@ rec {
|
||||
inherit (s) name;
|
||||
inherit buildInputs;
|
||||
|
||||
phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doDeploy"];
|
||||
phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doTest" "doDeploy"];
|
||||
|
||||
dump0 = (a.doDump "0");
|
||||
|
||||
doTest = a.fullDepEntry ''
|
||||
sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
|
||||
mkdir pseudo-home
|
||||
export HOME=$PWD/pseudo-home
|
||||
echo make test
|
||||
'' ["doMake" "minInit"];
|
||||
|
||||
prepare_sgneeds = a.fullDepEntry (''
|
||||
ensureDir "$out/sgneeds/include/spidermonkey"
|
||||
for d in bin include lib; do
|
||||
ensureDir "$out/sgneeds/$d"
|
||||
ensureDir "$out/sgneeds/$d"
|
||||
for p in "${spidermonkey_1_8_0rc1}"; do
|
||||
for f in "$p"/"$d"/*; do
|
||||
@ -32,6 +41,11 @@ rec {
|
||||
done
|
||||
done
|
||||
done
|
||||
for p in "${spidermonkey_1_8_0rc1}/include" "${spidermonkey_1_8_0rc1}/include/js"; do
|
||||
for f in "$p"/*; do
|
||||
ln -sf "$f" "$out"/sgneeds/include/spidermonkey/
|
||||
done
|
||||
done
|
||||
|
||||
ensureDir "$out/sgneeds/include/sgbrings"
|
||||
ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
|
||||
@ -41,6 +55,9 @@ rec {
|
||||
done
|
||||
|
||||
export SGNEEDS_DIR="$out"/sgneeds/
|
||||
export VVTHIRDPARTY="$out"/sgneeds/
|
||||
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/sgneeds/include"
|
||||
'') ["minInit" "defEnsureDir"];
|
||||
|
||||
prepareMakefiles = a.fullDepEntry ''
|
||||
@ -48,7 +65,7 @@ rec {
|
||||
mkdir build
|
||||
cd build
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
|
||||
cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" ../veracity*
|
||||
cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
|
||||
'' ["minInit" "addInputs" "doUnpack"];
|
||||
|
||||
doDeploy = a.fullDepEntry ''
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
rec {
|
||||
version="0.5.5.10358";
|
||||
name="veracity-0.5.5.10358";
|
||||
hash="01ngr6bibspjdvwhkbm0qg4282rr0zjysbzgm9d68gn691b68qlb";
|
||||
version="0.5.7.10397";
|
||||
name="veracity-0.5.7.10397";
|
||||
hash="09w1qj4wklaf7mw0vavzyqpagcd0cwqppdl8vaqqi0irddgivnq8";
|
||||
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
|
||||
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.5.10358.tar.gz";
|
||||
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10397.tar.gz";
|
||||
|
||||
|
||||
}
|
||||
|
||||
40
pkgs/applications/video/mkvtoolnix/default.nix
Normal file
40
pkgs/applications/video/mkvtoolnix/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ stdenv, fetchurl
|
||||
, libmatroska
|
||||
, flac
|
||||
, libvorbis
|
||||
, file
|
||||
, boost
|
||||
, lzo
|
||||
, xdg_utils
|
||||
, expat
|
||||
, wxGTK
|
||||
, zlib
|
||||
, ruby
|
||||
, gettext
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mkvtoolnix-4.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2";
|
||||
sha256 = "0apgmah1d4dh5x1phr4n5vgwmy0w1nym9pydzh4kdgcs167l8n6l";
|
||||
};
|
||||
|
||||
buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext ];
|
||||
|
||||
configureFlags = "--with-boost-libdir=${boost}/lib";
|
||||
buildPhase = ''
|
||||
ruby ./drake
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ruby ./drake install
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform tools for Matroska";
|
||||
homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,31 +2,38 @@
|
||||
, zlib, a52dec, libmad, faad2, ffmpeg, alsa
|
||||
, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
|
||||
, libvorbis, libtheora, speex, lua, libgcrypt, libupnp
|
||||
, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
|
||||
, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
|
||||
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
|
||||
, libass
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "vlc-1.1.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vlc-${version}";
|
||||
version = "1.1.5";
|
||||
|
||||
patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure'';
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.videolan.org/pub/videolan/vlc/1.1.0/vlc-1.1.0.tar.bz2;
|
||||
sha256 = "1j7icg7a2lr99kpc3sjjdp3z7128y6afnvxsafxlnih0qif2ryx9";
|
||||
url = "mirror://sourceforge/vlc/${name}.tar.bz2";
|
||||
sha256 = "09nawmvw5zs6hywk5xkqn2iyvrh4r5d7z6rbpaaydckz66fazqzq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg
|
||||
alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4
|
||||
libvorbis libtheora speex lua libgcrypt libupnp
|
||||
];
|
||||
perl zlib a52dec libmad faad2 ffmpeg alsa libdvdnav libdvdnav.libdvdread
|
||||
pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt
|
||||
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
|
||||
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
|
||||
libkate libtiger libv4l samba liboggz libass
|
||||
]
|
||||
++ (with xlibs; [ xlibs.xlibs libXv libXpm xcbutil ]);
|
||||
|
||||
configureFlags = [ "--enable-alsa"
|
||||
"--disable-glx"
|
||||
"--disable-remoteosd"
|
||||
"--enable-faad"
|
||||
"--enable-theora"
|
||||
"--enable-vorbis"
|
||||
"--enable-speex"
|
||||
"--disable-dbus"
|
||||
"--disable-dbus-control"
|
||||
"--with-kde-solid=$out/share/apps/solid/actions"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchurl, python, setuptools, pythonPackages }:
|
||||
|
||||
let version = "2011.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "openstack-compute-2011.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://launchpad.net/nova/bexar/2011.1/+download/nova-2011.1.tar.gz;
|
||||
sha256 = "1g8f75mzjpkzhqk91hga5wpjh8d0kbc9fxxjk0px0qjk20qrmb45";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ python setuptools pythonPackages.gflags pythonPackages.netaddr pythonPackages.eventlet
|
||||
];
|
||||
|
||||
preConfigure = "export HOME=$(pwd)";
|
||||
|
||||
buildPhase = "python setup.py build";
|
||||
|
||||
installPhase =
|
||||
''
|
||||
p=$(toPythonPath $out)
|
||||
export PYTHONPATH=$p:$PYTHONPATH
|
||||
mkdir -p $p
|
||||
python setup.py install --prefix=$out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://nova.openstack.org/;
|
||||
description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller";
|
||||
};
|
||||
}
|
||||
50
pkgs/applications/virtualization/virt-viewer/default.nix
Normal file
50
pkgs/applications/virtualization/virt-viewer/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
x@{builderDefsPackage
|
||||
, gnome, gtk, glib, libxml2, pkgconfig, libvirt, gtkvnc, cyrus_sasl, libtasn1
|
||||
, gnupg, libgcrypt, perl
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
["gnome"];
|
||||
|
||||
buildInputs = (map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames)))
|
||||
++ [gnome.libglade];
|
||||
sourceInfo = rec {
|
||||
baseName="virt-viewer";
|
||||
version="0.2.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
|
||||
hash="0lhkmp4kn0s2z8241lqf2fdi55jg9iclr5hjw3m4wzaznpiajwlp";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
src = a.fetchurl {
|
||||
url = sourceInfo.url;
|
||||
sha256 = sourceInfo.hash;
|
||||
};
|
||||
|
||||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
|
||||
meta = {
|
||||
description = "A viewer for remote virtual machines";
|
||||
maintainers = with a.lib.maintainers;
|
||||
[
|
||||
raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
license = a.lib.licenses.gpl2;
|
||||
};
|
||||
passthru = {
|
||||
updateInfo = {
|
||||
downloadPage = "http://virt-manager.org/download.html";
|
||||
};
|
||||
};
|
||||
}) x
|
||||
|
||||
@ -1,22 +1,24 @@
|
||||
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
|
||||
, libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
|
||||
, python, which, alsaLib, curl, gawk
|
||||
, xorriso, makeself, perl, jdk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "virtualbox-3.2.10-${kernel.version}";
|
||||
name = "virtualbox-4.0.2-${kernel.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.virtualbox.org/virtualbox/3.2.10/VirtualBox-3.2.10-OSE.tar.bz2;
|
||||
sha256 = "06abkv8lsh6b0z21ialdhxyw5qg1r2x07qwwkn2b9akx8ab5pcjd";
|
||||
url = http://download.virtualbox.org/virtualbox/4.0.2/VirtualBox-4.0.2.tar.bz2;
|
||||
sha256 = "3dbb3303a6237b8a3732c0bb12abc89ae3ad5c804579bc1390325713c741c568";
|
||||
};
|
||||
|
||||
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam];
|
||||
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ];
|
||||
|
||||
patchPhase = "
|
||||
set -x
|
||||
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
|
||||
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
|
||||
-e 's@MKISOFS --version@MKISOFS -version@' \\
|
||||
-i configure
|
||||
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
|
||||
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
|
||||
@ -25,7 +27,7 @@ stdenv.mkDerivation {
|
||||
";
|
||||
|
||||
configurePhase = ''
|
||||
./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening
|
||||
./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs
|
||||
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
|
||||
-i AutoConfig.kmk
|
||||
sed -e 's@arch/x86/@@' \
|
||||
@ -34,7 +36,9 @@ stdenv.mkDerivation {
|
||||
cat >> AutoConfig.kmk << END_PATHS
|
||||
VBOX_PATH_APP_PRIVATE := $out
|
||||
VBOX_PATH_APP_DOCS := $out/doc
|
||||
VBOX_JAVA_HOME := ${jdk}
|
||||
END_PATHS
|
||||
echo "VBOX_WITH_DOCS :=" >> LocalConfig.kmk
|
||||
echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk
|
||||
'';
|
||||
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "VirtualBox-GuestAdditions-3.2.8";
|
||||
name = "VirtualBox-GuestAdditions-4.0.2";
|
||||
src = fetchurl {
|
||||
url = http://download.virtualbox.org/virtualbox/3.2.8/VBoxGuestAdditions_3.2.8.iso;
|
||||
sha256 = "1pyfgrcdmw6zf3yxgzcd8c5qzqqn62bz4085ka453gfmi9d65lys";
|
||||
url = http://download.virtualbox.org/virtualbox/4.0.2/VBoxGuestAdditions_4.0.2.iso;
|
||||
sha256 = "4c8726f70d4202747d35e1ad715ca9dcd29be1fe74720492097d7fb83cae7988";
|
||||
};
|
||||
KERN_DIR = "${kernel}/lib/modules/*/build";
|
||||
buildInputs = [ patchelf cdrkit makeWrapper ];
|
||||
@ -17,22 +17,25 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
buildCommand = ''
|
||||
${if stdenv.system == "i686-linux" then ''
|
||||
isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run
|
||||
chmod 755 ./VBoxLinuxAdditions-x86.run
|
||||
./VBoxLinuxAdditions-x86.run --noexec --keep
|
||||
''
|
||||
else if stdenv.system == "x86_64-linux" then ''
|
||||
isoinfo -J -i $src -x /VBoxLinuxAdditions-amd64.run > ./VBoxLinuxAdditions-amd64.run
|
||||
chmod 755 ./VBoxLinuxAdditions-amd64.run
|
||||
./VBoxLinuxAdditions-amd64.run --noexec --keep
|
||||
${if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
|
||||
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
|
||||
chmod 755 ./VBoxLinuxAdditions.run
|
||||
./VBoxLinuxAdditions.run --noexec --keep
|
||||
''
|
||||
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
|
||||
}
|
||||
|
||||
# Unpack files
|
||||
cd install
|
||||
tar xfvj VBoxGuestAdditions.tar.bz2
|
||||
${if stdenv.system == "i686-linux" then ''
|
||||
tar xfvj VBoxGuestAdditions-x86.tar.bz2
|
||||
''
|
||||
else if stdenv.system == "x86_64-linux" then ''
|
||||
tar xfvj VBoxGuestAdditions-amd64.tar.bz2
|
||||
''
|
||||
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
|
||||
}
|
||||
|
||||
|
||||
# Build kernel modules
|
||||
cd src
|
||||
@ -41,9 +44,11 @@ stdenv.mkDerivation {
|
||||
do
|
||||
cd $i
|
||||
sed -i -e "s/depmod/echo/g" Makefile
|
||||
sed -i -e "s/depmod/echo/g" */Makefile
|
||||
make
|
||||
cd ..
|
||||
done
|
||||
|
||||
cd ..
|
||||
|
||||
# Change the interpreter for various binaries
|
||||
|
||||
40
pkgs/applications/window-managers/awesome/cmake284.patch
Normal file
40
pkgs/applications/window-managers/awesome/cmake284.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Moschny <thomas.moschny@gmx.de>
|
||||
Date: Mon, 21 Feb 2011 17:58:04 +0100
|
||||
Subject: [PATCH] Normalize icon path names (fixes #869).
|
||||
|
||||
The elements in ${icon_sources}, as returned by file(GLOB ...) contain
|
||||
double slashes, could be a bug in cmake. This causes building with
|
||||
cmake 2.8.4 to fail, due to dependency problems lateron.
|
||||
|
||||
This patch works around the issue by normalizing all path names in
|
||||
${icon_sources} while appending them to ${ALL_ICONS}, thereby removing
|
||||
the double slashes.
|
||||
---
|
||||
CMakeLists.txt | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 64be9b9..472bec2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -244,14 +244,15 @@ endif()
|
||||
|
||||
# {{{ Theme icons
|
||||
file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
|
||||
-set(ALL_ICONS ${icon_sources})
|
||||
|
||||
foreach(icon ${icon_sources})
|
||||
# Copy all icons to the build dir to simplify the following code.
|
||||
# Source paths are interpreted relative to ${SOURCE_DIR}, target paths
|
||||
# relative to ${BUILD_DIR}.
|
||||
get_filename_component(icon_path ${icon} PATH)
|
||||
+ get_filename_component(icon_name ${icon} NAME)
|
||||
file(COPY ${icon} DESTINATION ${icon_path})
|
||||
+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
|
||||
endforeach()
|
||||
|
||||
macro(a_icon_convert match replacement input)
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -3,12 +3,16 @@
|
||||
, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
|
||||
, docbook_xml_dtd_45, libxslt, coreutils}:
|
||||
|
||||
let
|
||||
version = "3.4.9";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "awesome-3.4.8";
|
||||
name = "awesome-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://awesome.naquadah.org/download/awesome-3.4.8.tar.xz;
|
||||
sha256 = "1mrdk8q0kj1p7zp5mchr2zl3cnja4z4ir0wx3yz5y361py5bjy78";
|
||||
url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
|
||||
sha256 = "0382v482904xv295l0gvhwzc64b7631miiv8wyq7jxmwqf2vfbp7";
|
||||
};
|
||||
|
||||
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
|
||||
@ -18,13 +22,15 @@ stdenv.mkDerivation rec {
|
||||
# We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
|
||||
# the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as
|
||||
# dependencies.
|
||||
patchPhase = ''
|
||||
prePatch = ''
|
||||
# Fix the tab completion (supporting bash or zsh)
|
||||
sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
|
||||
# Remove the 'root' PATH override (I don't know why they have that)
|
||||
sed /WHOAMI/d -i utils/awsetbg
|
||||
'';
|
||||
|
||||
patches = [ ./cmake284.patch ];
|
||||
|
||||
# Somehow libev does not get into the rpath, although it should.
|
||||
# Something may be wrong in the gcc wrapper.
|
||||
preBuild = ''
|
||||
@ -38,5 +44,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://awesome.naquadah.org/;
|
||||
description = "Highly configurable, dynamic window manager for X";
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,6 +16,9 @@ stdenv.mkDerivation {
|
||||
# directories to be overriden through $COMPIZ_PLUGINDIR and
|
||||
# $COMPIZ_METADATADIR, respectively.
|
||||
./plugindir-core.patch
|
||||
|
||||
# Fix compilation with recent GTK versions.
|
||||
./gdk-deprecated.patch
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c
|
||||
--- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200
|
||||
+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100
|
||||
@@ -31,10 +31,6 @@
|
||||
#include <X11/extensions/Xrender.h>
|
||||
#include <X11/Xregion.h>
|
||||
|
||||
-#ifndef GDK_DISABLE_DEPRECATED
|
||||
-#define GDK_DISABLE_DEPRECATED
|
||||
-#endif
|
||||
-
|
||||
#ifndef GTK_DISABLE_DEPRECATED
|
||||
#define GTK_DISABLE_DEPRECATED
|
||||
#endif
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib, xlibs, automake, pkgconfig,
|
||||
gtk }:
|
||||
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib
|
||||
, xlibs, automake, pkgconfig, gtk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "icewm-1.3.6";
|
||||
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1pr7rc10rddwvy4ncng4mf5fpxd1nqjsw34xba9ngsg32rg57b91";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lfontconfig";
|
||||
|
||||
# The fuloong2f is not supported by 1.3.6 still
|
||||
preConfigure = ''
|
||||
cp ${automake}/share/automake*/config.{sub,guess} .
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig
|
||||
, libXtst, xextproto, readline, libXi, pkgconfig, autoconf, automake }:
|
||||
{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig, freetype
|
||||
, libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ratpoison-1.4.5";
|
||||
@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = "autoreconf -vf";
|
||||
preConfigure = "autoreconf -vf"; # needed because of the patch above
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh
|
||||
|
||||
buildInputs =
|
||||
[ libX11 inputproto libXt
|
||||
libXpm libXft fontconfig libXtst
|
||||
xextproto readline libXi pkgconfig
|
||||
autoconf automake # needed because of the patch above
|
||||
[ libX11 inputproto libXt libXpm libXft fontconfig freetype libXtst
|
||||
xextproto readline libXi pkgconfig perl autoconf automake
|
||||
];
|
||||
|
||||
meta = {
|
||||
@ -46,8 +46,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = http://www.nongnu.org/ratpoison/;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
{cabal, X11, mtl, xmessage}:
|
||||
{cabal, X11, mtl, xmessage, syb}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "xmonad";
|
||||
name = "${self.fname}";
|
||||
version = "0.9.1";
|
||||
sha256 = "014201200e8a521ee3a0d8c0727392916a7549207b91064fb456f8c660609927";
|
||||
propagatedBuildInputs = [X11 mtl];
|
||||
version = "0.9.2";
|
||||
sha256 = "07w5k3pqmybjn0zh2nr1glp69685xg2fhj3z9zxb37x5nzss7kdd";
|
||||
noHaddock = true;
|
||||
propagatedBuildInputs = [X11 mtl syb];
|
||||
meta = {
|
||||
description = "xmonad is a tiling window manager for X";
|
||||
homepage = http://xmonad.org/;
|
||||
|
||||
@ -2,9 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "xmonad-contrib";
|
||||
name = "${self.fname}";
|
||||
version = "0.9.1";
|
||||
sha256 = "b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47";
|
||||
version = "0.9.2";
|
||||
sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p";
|
||||
propagatedBuildInputs = [X11 xmonad utf8String X11Xft];
|
||||
meta = {
|
||||
description = "a huge extension library for xmonad";
|
||||
|
||||
79
pkgs/build-support/fetchbzr/nix-prefetch-bzr
Executable file
79
pkgs/build-support/fetchbzr/nix-prefetch-bzr
Executable file
@ -0,0 +1,79 @@
|
||||
#! /bin/sh -e
|
||||
|
||||
url=$1
|
||||
rev=$2
|
||||
expHash=$3
|
||||
|
||||
hashType=$NIX_HASH_ALGO
|
||||
if test -z "$hashType"; then
|
||||
hashType=sha256
|
||||
fi
|
||||
if test -z "$hashFormat"; then
|
||||
hashFormat=--base32
|
||||
fi
|
||||
|
||||
if test -z "$url"; then
|
||||
echo "syntax: nix-prefetch-bzr URL [REVISION [EXPECTED-HASH]]" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
revarg="-r $rev"
|
||||
test -n "$rev" || revarg=""
|
||||
|
||||
repoName=$(echo $url | sed '
|
||||
s,.*/\([^/]\+\)/trunk/*$,\1,;t
|
||||
s,.*/\([^/]\+\)/branches/\([^/]\+\)/*$,\1-\2,;t
|
||||
s,.*/\([^/]\+\)/tags/\([^/]\+\)/*$,\1-\2,;t
|
||||
s,.*/\([^/]\+\)/*$,\1,;t
|
||||
')
|
||||
dstFile=$repoName-r$rev
|
||||
test -n "$rev" || dstFile=$repoName
|
||||
|
||||
# If the hash was given, a file with that hash may already be in the
|
||||
# store.
|
||||
if test -n "$expHash"; then
|
||||
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" $dstFile)
|
||||
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
|
||||
finalPath=
|
||||
fi
|
||||
hash=$expHash
|
||||
fi
|
||||
|
||||
|
||||
# If we don't know the hash or a path with that hash doesn't exist,
|
||||
# download the file and add it to the store.
|
||||
if test -z "$finalPath"; then
|
||||
tmpPath=/tmp/bzr-checkout-tmp-$$
|
||||
tmpFile=$tmpPath/$dstFile
|
||||
mkdir $tmpPath
|
||||
|
||||
trap "rm -rf $tmpPath" EXIT
|
||||
|
||||
# Perform the checkout.
|
||||
if test "$NIX_PREFETCH_BZR_LEAVE_DOT_BZR" != 1
|
||||
then
|
||||
bzr export $revarg "$tmpFile" "$url" >&2
|
||||
else
|
||||
bzr checkout --lightweight $revarg "$url" "$tmpFile" >&2
|
||||
fi
|
||||
|
||||
# Compute the hash.
|
||||
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
|
||||
if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
|
||||
|
||||
# Add the downloaded file to the Nix store.
|
||||
finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile)
|
||||
|
||||
if test -n "$expHash" -a "$expHash" != "$hash"; then
|
||||
echo "hash mismatch for URL \`$url'"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
|
||||
|
||||
echo $hash
|
||||
|
||||
if test -n "$PRINT_PATH"; then
|
||||
echo $finalPath
|
||||
fi
|
||||
@ -120,6 +120,17 @@ clone(){
|
||||
# Checkout linked sources.
|
||||
init_submodules;
|
||||
|
||||
if [ -f .topdeps ]; then
|
||||
if tg help 2>&1 > /dev/null
|
||||
then
|
||||
echo "populating TopGit branches..."
|
||||
tg remote --populate origin
|
||||
else
|
||||
echo "WARNING: would populate TopGit branches but TopGit is not available" >&2
|
||||
echo "WARNING: install TopGit to fix the problem" >&2
|
||||
fi
|
||||
fi
|
||||
|
||||
cd $top;
|
||||
}
|
||||
|
||||
|
||||
@ -2,10 +2,6 @@ source $stdenv/setup
|
||||
|
||||
source $mirrorsFile
|
||||
|
||||
if test -n "$showURLs"; then
|
||||
header "downloading file $name with $outputHashAlgo hash $outputHash..."
|
||||
fi
|
||||
|
||||
|
||||
# Curl flags to handle redirects, not use EPSV, handle cookies for
|
||||
# servers to need them during redirects, and work on SSL without a
|
||||
|
||||
@ -10,6 +10,7 @@ rec {
|
||||
|
||||
# SourceForge.
|
||||
sourceforge = [
|
||||
http://prdownloads.sourceforge.net/
|
||||
http://heanet.dl.sourceforge.net/sourceforge/
|
||||
http://surfnet.dl.sourceforge.net/sourceforge/
|
||||
http://dfn.dl.sourceforge.net/sourceforge/
|
||||
@ -17,7 +18,6 @@ rec {
|
||||
http://ovh.dl.sourceforge.net/sourceforge/
|
||||
http://osdn.dl.sourceforge.net/sourceforge/
|
||||
http://kent.dl.sourceforge.net/sourceforge/
|
||||
http://prdownloads.sourceforge.net/
|
||||
];
|
||||
|
||||
sf = sourceforge;
|
||||
@ -101,6 +101,7 @@ rec {
|
||||
|
||||
# Mirrors of ftp://ftp.kde.org/pub/kde/.
|
||||
kde = [
|
||||
"http://download.kde.org/download.php?url="
|
||||
http://ftp.gwdg.de/pub/x11/kde/
|
||||
ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
|
||||
ftp://ftp.kde.org/pub/kde/
|
||||
|
||||
@ -53,6 +53,7 @@ elsif ($ENV{"printRegistration"} eq "1") {
|
||||
foreach my $storePath (sort (keys %storePaths)) {
|
||||
print "$storePath\n";
|
||||
print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix
|
||||
print "0\n"; # !!! fix
|
||||
print "\n"; # don't care about preserving the deriver
|
||||
print scalar(@{$refs{$storePath}}), "\n";
|
||||
foreach my $ref (@{$refs{$storePath}}) {
|
||||
|
||||
@ -47,6 +47,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
||||
'';
|
||||
|
||||
sysInfoPhase = ''
|
||||
[ ! -f /etc/lsb-release ] || (source /etc/lsb-release; echo "OS release: $DISTRIB_DESCRIPTION")
|
||||
echo "System/kernel: $(uname -a)"
|
||||
if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi
|
||||
header "installed Debian packages"
|
||||
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation (
|
||||
KEEPBUILDDIR="$out/`basename $TMPDIR`"
|
||||
header "Copying build directory to $KEEPBUILDDIR"
|
||||
ensureDir $KEEPBUILDDIR
|
||||
cp -vR $TMPDIR/* $KEEPBUILDDIR
|
||||
cp -R $TMPDIR/* $KEEPBUILDDIR
|
||||
stopNest
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -68,6 +68,18 @@ stdenv.mkDerivation (
|
||||
|
||||
eval "$postAutoconf"
|
||||
'';
|
||||
|
||||
failureHook = ''
|
||||
if test -n "$succeedOnFailure"; then
|
||||
if test -n "$keepBuildDirectory"; then
|
||||
KEEPBUILDDIR="$out/`basename $TMPDIR`"
|
||||
header "Copying build directory to $KEEPBUILDDIR"
|
||||
ensureDir $KEEPBUILDDIR
|
||||
cp -R $TMPDIR/* $KEEPBUILDDIR
|
||||
stopNest
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
}
|
||||
|
||||
# Then, the caller-supplied attributes.
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
{ pkgs }:
|
||||
{ pkgs
|
||||
, linuxKernel ? pkgs.linux
|
||||
, img ? "bzImage"
|
||||
, rootModules ? [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" "unix" ]
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
|
||||
@ -7,16 +11,13 @@ rec {
|
||||
# The 15 second CIFS timeout is too short if the host if heavily
|
||||
# loaded (e.g., in the Hydra build farm when it's running many jobs
|
||||
# in parallel). So apply a patch to increase the timeout to 120s.
|
||||
kernel = assert pkgs.linux.features.cifsTimeout; pkgs.linux;
|
||||
kernel = assert pkgs.linux.features.cifsTimeout; linuxKernel;
|
||||
|
||||
kvm = pkgs.qemu_kvm;
|
||||
|
||||
|
||||
modulesClosure = makeModulesClosure {
|
||||
inherit kernel;
|
||||
rootModules =
|
||||
[ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
|
||||
"nls_utf8" "ext2" "ext3" "unix" ];
|
||||
inherit kernel rootModules;
|
||||
};
|
||||
|
||||
|
||||
@ -217,8 +218,8 @@ rec {
|
||||
-net nic,model=virtio \
|
||||
-chardev socket,id=samba,path=./samba \
|
||||
-net user,guestfwd=tcp:10.0.2.4:445-chardev:samba \
|
||||
-drive file=$diskImage,if=virtio,boot=on,cache=writeback,werror=report \
|
||||
-kernel ${kernel}/bzImage \
|
||||
-drive file=$diskImage,if=virtio,cache=writeback,werror=report \
|
||||
-kernel ${kernel}/${img} \
|
||||
-initrd ${initrd}/initrd \
|
||||
-append "console=ttyS0 panic=1 command=${stage2Init} tmpDir=$TMPDIR out=$out mountDisk=$mountDisk" \
|
||||
$QEMU_OPTS
|
||||
@ -342,6 +343,56 @@ rec {
|
||||
QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
|
||||
});
|
||||
|
||||
extractFs = {file, fs ? null} :
|
||||
with pkgs; runInLinuxVM (
|
||||
stdenv.mkDerivation {
|
||||
name = "extract-file";
|
||||
buildInputs = [utillinuxng];
|
||||
buildCommand = ''
|
||||
ln -s ${linux}/lib /lib
|
||||
${module_init_tools}/sbin/modprobe loop
|
||||
${module_init_tools}/sbin/modprobe ext4
|
||||
${module_init_tools}/sbin/modprobe hfs
|
||||
${module_init_tools}/sbin/modprobe hfsplus
|
||||
${module_init_tools}/sbin/modprobe squashfs
|
||||
${module_init_tools}/sbin/modprobe iso9660
|
||||
${module_init_tools}/sbin/modprobe ufs
|
||||
${module_init_tools}/sbin/modprobe cramfs
|
||||
mknod /dev/loop0 b 7 0
|
||||
|
||||
ensureDir $out
|
||||
ensureDir tmp
|
||||
mount -o loop,ro,ufstype=44bsd ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp ||
|
||||
mount -o loop,ro ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp
|
||||
cp -Rv tmp/* $out/ || exit 0
|
||||
'';
|
||||
});
|
||||
|
||||
extractMTDfs = {file, fs ? null} :
|
||||
with pkgs; runInLinuxVM (
|
||||
stdenv.mkDerivation {
|
||||
name = "extract-file-mtd";
|
||||
buildInputs = [utillinuxng mtdutils];
|
||||
buildCommand = ''
|
||||
ln -s ${linux}/lib /lib
|
||||
${module_init_tools}/sbin/modprobe mtd
|
||||
${module_init_tools}/sbin/modprobe mtdram total_size=131072
|
||||
${module_init_tools}/sbin/modprobe mtdchar
|
||||
${module_init_tools}/sbin/modprobe mtdblock
|
||||
${module_init_tools}/sbin/modprobe jffs2
|
||||
${module_init_tools}/sbin/modprobe zlib
|
||||
mknod /dev/mtd0 c 90 0
|
||||
mknod /dev/mtdblock0 b 31 0
|
||||
|
||||
ensureDir $out
|
||||
ensureDir tmp
|
||||
|
||||
dd if=${file} of=/dev/mtd0
|
||||
mount ${lib.optionalString (fs != null) "-t ${fs} "}/dev/mtdblock0 tmp
|
||||
|
||||
cp -R tmp/* $out/
|
||||
'';
|
||||
});
|
||||
|
||||
qemuCommandGeneric = ''
|
||||
${kvm}/bin/qemu-system-x86_64 \
|
||||
@ -629,7 +680,7 @@ rec {
|
||||
done
|
||||
chroot=$(type -tP chroot)
|
||||
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
|
||||
/usr/bin/dpkg --install --force-all $debs < /dev/null
|
||||
/usr/bin/dpkg --install --force-all $debs < /dev/null || true
|
||||
done
|
||||
|
||||
echo "running post-install script..."
|
||||
@ -1054,7 +1105,7 @@ rec {
|
||||
sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7";
|
||||
};
|
||||
urlPrefix = mirror://ubuntu;
|
||||
packages = commonDebPackages ++ [ "diff" ];
|
||||
packages = commonDebPackages ++ [ "diff" "mktemp" ];
|
||||
};
|
||||
|
||||
ubuntu910x86_64 = {
|
||||
@ -1065,7 +1116,7 @@ rec {
|
||||
sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40";
|
||||
};
|
||||
urlPrefix = mirror://ubuntu;
|
||||
packages = commonDebPackages ++ [ "diff" ];
|
||||
packages = commonDebPackages ++ [ "diff" "mktemp" ];
|
||||
};
|
||||
|
||||
ubuntu1004i386 = {
|
||||
@ -1076,7 +1127,7 @@ rec {
|
||||
sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa";
|
||||
};
|
||||
urlPrefix = mirror://ubuntu;
|
||||
packages = commonDebPackages ++ [ "diffutils" ];
|
||||
packages = commonDebPackages ++ [ "diffutils" "mktemp" ];
|
||||
};
|
||||
|
||||
ubuntu1004x86_64 = {
|
||||
@ -1087,6 +1138,28 @@ rec {
|
||||
sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0";
|
||||
};
|
||||
urlPrefix = mirror://ubuntu;
|
||||
packages = commonDebPackages ++ [ "diffutils" "mktemp" ];
|
||||
};
|
||||
|
||||
ubuntu1010i386 = {
|
||||
name = "ubuntu-10.04-maverick-i386";
|
||||
fullName = "Ubuntu 10.04 Maverick (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2;
|
||||
sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0";
|
||||
};
|
||||
urlPrefix = mirror://ubuntu;
|
||||
packages = commonDebPackages ++ [ "diffutils" ];
|
||||
};
|
||||
|
||||
ubuntu1010x86_64 = {
|
||||
name = "ubuntu-10.04-maverick-amd64";
|
||||
fullName = "Ubuntu 10.04 Maverick (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2;
|
||||
sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc";
|
||||
};
|
||||
urlPrefix = mirror://ubuntu;
|
||||
packages = commonDebPackages ++ [ "diffutils" ];
|
||||
};
|
||||
|
||||
@ -1113,22 +1186,44 @@ rec {
|
||||
};
|
||||
|
||||
debian50i386 = {
|
||||
name = "debian-5.0.5-lenny-i386";
|
||||
fullName = "Debian 5.0.5 Lenny (i386)";
|
||||
name = "debian-5.0.8-lenny-i386";
|
||||
fullName = "Debian 5.0.8 Lenny (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
|
||||
sha256 = "1nzd0r44lnvw2bmshqpbhghs84fxbcr1jkg55d37v4d09gsdmln0";
|
||||
sha256 = "0dcvd8ivn71dwln7mx5dbqj30v4cqmc61lj21ry05karkglb5scg";
|
||||
};
|
||||
urlPrefix = mirror://debian;
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian50x86_64 = {
|
||||
name = "debian-5.0.5-lenny-amd64";
|
||||
fullName = "Debian 5.0.5 Lenny (amd64)";
|
||||
name = "debian-5.0.8-lenny-amd64";
|
||||
fullName = "Debian 5.0.8 Lenny (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
|
||||
sha256 = "04hab4ybjilppr1hwnl4k50vr5y88w7zn6v22phfrsrxf23nrlv3";
|
||||
sha256 = "1wrqjfcqfs7q5i7jnr8115zsjlhzxxm2x41agp546d3wpj68k938";
|
||||
};
|
||||
urlPrefix = mirror://debian;
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian60i386 = {
|
||||
name = "debian-6.0-squeeze-i386";
|
||||
fullName = "Debian 6.0 Squeeze (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
|
||||
sha256 = "1c1faz7ig9jvx3a2d2crp6fx0gynh5s4xw1vv1mn14rzkx86l59i";
|
||||
};
|
||||
urlPrefix = mirror://debian;
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian60x86_64 = {
|
||||
name = "debian-6.0-squeeze-amd64";
|
||||
fullName = "Debian 6.0 Squeeze (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
|
||||
sha256 = "1c1n16q0hrimrnmv6shrr0z82xjqfjhm17salry8xi984c5fprwd";
|
||||
};
|
||||
urlPrefix = mirror://debian;
|
||||
packages = commonDebianPackages;
|
||||
@ -1211,11 +1306,9 @@ rec {
|
||||
# Needed because it provides /etc/login.defs, whose absence causes
|
||||
# the "passwd" post-installs script to fail.
|
||||
"login"
|
||||
# For shutting up some messages during some post-install scripts:
|
||||
"mktemp"
|
||||
];
|
||||
|
||||
commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" ];
|
||||
commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ];
|
||||
|
||||
|
||||
/* A set of functions that build the Linux distributions specified
|
||||
|
||||
@ -32,7 +32,7 @@ rec {
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
/*
|
||||
testFreeBSD = runInGenericVM {
|
||||
name = "aterm-freebsd";
|
||||
src = aterm242fixes.src;
|
||||
@ -65,6 +65,6 @@ rec {
|
||||
make install
|
||||
'';
|
||||
};
|
||||
|
||||
*/
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl}:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "man-pages-3.25";
|
||||
name = "man-pages-3.32";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
|
||||
sha256 = "1cq3zijmbsnjshkm78kffgqrdsxgg7ypvcf2digdyy0s9himnvwc";
|
||||
sha256 = "1qr1k6kgx7i4gni9w2h610k2aa2bqdk7p08bmqslfwrzpmkkiawn";
|
||||
};
|
||||
|
||||
preBuild =
|
||||
|
||||
@ -6,5 +6,6 @@ stdenv.mkDerivation {
|
||||
url = mirror://gnome/sources/librsvg/2.26/librsvg-2.26.0.tar.bz2;
|
||||
sha256 = "1sivagvlyr58hxgazr6pyq3yfxbg0wrv7rgzsk5xi631v3qbbjpx";
|
||||
};
|
||||
buildInputs = [ pkgconfig libxml2 libgsf bzip2 glib gtk libcroco ];
|
||||
buildInputs = [ pkgconfig libxml2 libgsf bzip2 libcroco ];
|
||||
propagatedBuildInputs = [ glib gtk ];
|
||||
}
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
{stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeaccessibility-4.4.5";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.5/src/kdeaccessibility-4.4.5.tar.bz2;
|
||||
sha256 = "1j8ndr7hjkqka64kyy7whxg9vzxyym0a6pd1wbr6hp1a99mhz4jv";
|
||||
};
|
||||
# Missing: speechd, I was too lazy to implement this
|
||||
buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];
|
||||
meta = {
|
||||
description = "KDE accessibility tools";
|
||||
license = "GPL";
|
||||
homepage = http://www.kde.org;
|
||||
inherit (kdelibs.meta) maintainers platforms;
|
||||
};
|
||||
}
|
||||
@ -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
|
||||
@ -1,28 +0,0 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python
|
||||
, sip, pyqt4, pycups, rhpl, system_config_printer
|
||||
, kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeadmin-4.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.5/src/kdeadmin-4.4.5.tar.bz2;
|
||||
sha256 = "1jmjvjjpkcjqdxyxc4n5z3l3p4hy8par06n7xicbzx9a1mzj71wy";
|
||||
};
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
inherit system_config_printer;
|
||||
|
||||
PYTHONPATH = "${pycups}/lib/python2.6/site-packages";
|
||||
|
||||
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
|
||||
kdelibs kdepimlibs kdebindings automoc4 phonon ];
|
||||
|
||||
meta = {
|
||||
description = "KDE Administration Utilities";
|
||||
license = "GPL";
|
||||
homepage = http://www.kde.org;
|
||||
inherit (kdelibs.meta) maintainers platforms;
|
||||
};
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver
|
||||
, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeartwork-4.4.5";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.5/src/kdeartwork-4.4.5.tar.bz2;
|
||||
sha256 = "1m12rj83wp36a3ii8frx52jk7hi7g8rb451n4g9hg5rdbllcfs93";
|
||||
};
|
||||
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;
|
||||
inherit (kdelibs.meta) maintainers platforms;
|
||||
};
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
{ stdenv, fetchurl, lib, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, shared_mime_info, exiv2, libssh
|
||||
, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica, virtuoso, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdebase-runtime-4.4.5";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.5/src/kdebase-runtime-4.4.5.tar.bz2;
|
||||
sha256 = "0a0lg0vkdq8v3rydg6n6nk3gqc3vn3sz2rn5gzm0vd2k5wyy8frx";
|
||||
};
|
||||
|
||||
/* CLUCENE_HOME=cluceneCore;*/
|
||||
buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info exiv2 libssh
|
||||
kdelibs automoc4 phonon strigi soprano cluceneCore attica makeWrapper];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
|
||||
--prefix PATH : "${virtuoso}/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "KDE runtime";
|
||||
longDescription = "Libraries and tools which supports running KDE desktop applications";
|
||||
license = "LGPL";
|
||||
homepage = http://www.kde.org;
|
||||
inherit (kdelibs.meta) maintainers platforms;
|
||||
};
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
{ stdenv, fetchurl, lib, cmake, perl, python, pam, consolekit
|
||||
, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
|
||||
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
|
||||
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
|
||||
, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt
|
||||
, bluez
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdebase-workspace-4.4.5";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.4.5/src/kdebase-workspace-4.4.5.tar.bz2;
|
||||
sha256 = "1ri0ghvbnjflpqzwgyhs3bl17gh2cvjffkcd6w0yymarv6n5sisk";
|
||||
};
|
||||
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
|
||||
kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
|
||||
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
|
||||
phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs bluez ];
|
||||
patchPhase=''
|
||||
sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
|
||||
plasma/generic/scriptengines/python/CMakeLists.txt
|
||||
'';
|
||||
meta = {
|
||||
description = "KDE Workspace";
|
||||
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
|
||||
license = "GPL";
|
||||
inherit (kdelibs.meta) maintainers platforms;
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user