mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
This commit is contained in:
Lluís Batlle i Rossell
commit
fca582bff0
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, emacs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "haskell-mode-2.7.0";
|
||||
name = "haskell-mode-2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz";
|
||||
sha256 = "8b45c55ed5f2b498529a6d7e01b77fea899c1de93e24653cab188cb3a4f495bc";
|
||||
sha256 = "1065g4xy3ca72xhqh6hfxs5j3mls82bli8w5rhz1npzyfwlwhkb1";
|
||||
};
|
||||
|
||||
buildInputs = [emacs];
|
||||
@ -14,4 +14,12 @@ stdenv.mkDerivation rec {
|
||||
ensureDir "$out/share/emacs/site-lisp"
|
||||
cp *.el *.elc *.hs "$out/share/emacs/site-lisp/"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/haskellmode-emacs/";
|
||||
description = "Haskell mode package for Emacs";
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
||||
31
pkgs/applications/editors/gobby/default.nix
Normal file
31
pkgs/applications/editors/gobby/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ avahiSupport ? false # build support for Avahi in libinfinity
|
||||
, gnomeSupport ? false # build support for Gnome(gnome-vfs)
|
||||
, stdenv, fetchurl, pkgconfig
|
||||
, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
|
||||
, gnomevfs ? null}:
|
||||
|
||||
let
|
||||
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
name = "gobby-0.4.93";
|
||||
src = fetchurl {
|
||||
url = "http://releases.0x539.de/gobby/${name}.tar.gz";
|
||||
sha256 = "1zk6p0kdp9vcvrr3kx0kw106ln309hd7bbsq8li1g0pcnkgrf4q4";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]
|
||||
++ stdenv.lib.optional gnomeSupport gnomevfs;
|
||||
|
||||
configureFlags = ''
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://gobby.0x539.de/;
|
||||
description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat";
|
||||
license = "GPLv2+";
|
||||
maintainers = [ maintainers.phreedom ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,13 @@
|
||||
kdebase_workspace, gettext, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kdevelop-4.0.0";
|
||||
name = "${pname}-${version}";
|
||||
version = "4.0.2";
|
||||
pname = "kdevelop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2";
|
||||
sha256 = "0cnwhfk71iksip17cjzf3g68n751k8fz2acin6qb27k7sh71pdfp";
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
|
||||
sha256 = "1y8ydx0fcmsab31qf5id5r5fcmp3j2l8mibvbbjfy66xgxarmnpc";
|
||||
};
|
||||
|
||||
buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info
|
||||
95
pkgs/applications/editors/texmacs/default.nix
Normal file
95
pkgs/applications/editors/texmacs/default.nix
Normal file
@ -0,0 +1,95 @@
|
||||
{stdenv, fetchurl, guile, libX11, libXext, xmodmap, which, makeWrapper,
|
||||
tex ? null,
|
||||
aspell ? null,
|
||||
ghostscriptX ? null,
|
||||
extraFonts ? false,
|
||||
chineseFonts ? false,
|
||||
japaneseFonts ? false,
|
||||
koreanFonts ? false }:
|
||||
|
||||
let
|
||||
pname = "TeXmacs";
|
||||
version = "1.0.7";
|
||||
extraFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
|
||||
sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
|
||||
};
|
||||
|
||||
fullFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz";
|
||||
sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f";
|
||||
};
|
||||
|
||||
chineseFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz";
|
||||
sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp";
|
||||
};
|
||||
|
||||
japaneseFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz";
|
||||
sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn";
|
||||
};
|
||||
|
||||
koreanFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz";
|
||||
sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz";
|
||||
sha256 = "1jdynapwc4fnp4ff71whq7l2jv0v3zwq2v2w463ppxm9cbi3bm5v";
|
||||
};
|
||||
|
||||
buildInputs = [ guile libX11 libXext makeWrapper ];
|
||||
|
||||
patchPhase = (if tex == null then ''
|
||||
gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else if extraFonts then ''
|
||||
gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else "") +
|
||||
(if chineseFonts then ''
|
||||
gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else "") +
|
||||
(if japaneseFonts then ''
|
||||
gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else "") +
|
||||
(if koreanFonts then ''
|
||||
gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else "");
|
||||
|
||||
postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
|
||||
(if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
|
||||
(if aspell == null then "" else "${aspell}/bin:") +
|
||||
(if tex == null then "" else "${tex}/bin:") +
|
||||
"${xmodmap}/bin:${which}/bin";
|
||||
|
||||
meta = {
|
||||
description = "GNU TeXmacs, a free WYSIWYW editing platform with special features for scientists";
|
||||
longDescription =
|
||||
'' GNU TeXmacs is a free wysiwyw (what you see is what you want)
|
||||
editing platform with special features for scientists. The software
|
||||
aims to provide a unified and user friendly framework for editing
|
||||
structured documents with different types of content (text,
|
||||
graphics, mathematics, interactive content, etc.). The rendering
|
||||
engine uses high-quality typesetting algorithms so as to produce
|
||||
professionally looking documents, which can either be printed out or
|
||||
presented from a laptop.
|
||||
|
||||
The software includes a text editor with support for mathematical
|
||||
formulas, a small technical picture editor and a tool for making
|
||||
presentations from a laptop. Moreover, TeXmacs can be used as an
|
||||
interface for many external systems for computer algebra, numerical
|
||||
analysis, statistics, etc. New presentation styles can be written
|
||||
by the user and new features can be added to the editor using the
|
||||
Scheme extension language. A native spreadsheet and tools for
|
||||
collaborative authoring are planned for later.
|
||||
'';
|
||||
homepage = http://texmacs.org/;
|
||||
license = "GPLv2+";
|
||||
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.roconnor ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
@ -1,23 +1,24 @@
|
||||
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
|
||||
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
|
||||
liblqr1, lensfun }:
|
||||
liblqr1, lensfun, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "digikam-1.2.0";
|
||||
name = "digikam-1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
|
||||
sha256 = "01hjcdm3l5rxz8wb7rvsplysy8hw2b3hcggg9dgk9bskpfskj1ck";
|
||||
sha256 = "1fky4jkji9fkhzzvw7wic6xy7vkj9g39hx1xm76qxxq8i2nzlynk";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
|
||||
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun ];
|
||||
cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
|
||||
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
|
||||
pkgconfig ];
|
||||
|
||||
meta = {
|
||||
description = "Photo Management Program";
|
||||
license = "GPL";
|
||||
homepage = http://www.digikam.org;
|
||||
maintainers = [ stdenv.lib.maintainers.viric ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
|
||||
inherit (kdelibs.meta) platforms;
|
||||
};
|
||||
}
|
||||
26
pkgs/applications/graphics/kipi-plugins/default.nix
Normal file
26
pkgs/applications/graphics/kipi-plugins/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2,
|
||||
kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kipi-plugins-1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/kipi/${name}.tar.bz2";
|
||||
sha256 = "1ybxhp4rs6c5xlrs0q765vrx4mvw4k0kq6n42dyk3kxvmcb9iq34";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs
|
||||
libxml2 libxslt gettext opencv libgpod gtk ];
|
||||
|
||||
KDEDIRS = kdegraphics;
|
||||
|
||||
patches = [ ./find-gdk.patch ];
|
||||
|
||||
meta = {
|
||||
description = "Photo Management Program";
|
||||
license = "GPL";
|
||||
homepage = http://www.kipi-plugins.org;
|
||||
inherit (kdelibs.meta) platforms;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
|
||||
};
|
||||
}
|
||||
16
pkgs/applications/graphics/kipi-plugins/find-gdk.patch
Normal file
16
pkgs/applications/graphics/kipi-plugins/find-gdk.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/cmake/modules/FindGdk.cmake b/cmake/modules/FindGdk.cmake
|
||||
index 033959a..ff61961 100644
|
||||
--- a/cmake/modules/FindGdk.cmake
|
||||
+++ b/cmake/modules/FindGdk.cmake
|
||||
@@ -23,8 +23,9 @@ else (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
|
||||
set(GDK_DEFINITIONS ${_GDKCflags})
|
||||
endif(NOT WIN32)
|
||||
|
||||
- FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0
|
||||
- ${_GDKIncDir}
|
||||
+ FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h
|
||||
+ HINTS ${_GDKIncDir}
|
||||
+ PATH_SUFFIXES gtk-2.0
|
||||
)
|
||||
|
||||
FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
|
||||
sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk";
|
||||
};
|
||||
|
||||
|
||||
buildInputs =
|
||||
(if enableGUI then [x11 motif] else []) ++
|
||||
(if useT1Lib then [t1lib] else []);
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation {
|
||||
})
|
||||
./xpdf-3.02-protection.patch
|
||||
];
|
||||
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-a4-paper" ] /* We obey ISO standards! */
|
||||
++ (if enablePDFtoPPM then [
|
||||
@ -53,4 +53,12 @@ stdenv.mkDerivation {
|
||||
--replace '#displayFontT1' displayFontT1
|
||||
fi
|
||||
";
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.foolabs.com/xpdf/";
|
||||
description = "viewer for Portable Document Format (PDF) files";
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
{ fetchurl, stdenv, gnutls, glib, pkgconfig }:
|
||||
{ fetchurl, stdenv, gnutls, glib, pkgconfig, check }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bitlbee-1.2.4";
|
||||
name = "bitlbee-1.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://bitlbee/src/" + name + ".tar.gz";
|
||||
sha256 = "1lwcjh1r81xqf6fxjwd2a2hv8dq9g0iyc8dnbr1pgas4vmjg9xf2";
|
||||
url = "mirror://bitlbee/src/${name}.tar.gz";
|
||||
sha256 = "11lfxvra46mwcnlxvhnywv6xbp7zl3h27hsbfwdh16b6fy41n1is";
|
||||
};
|
||||
|
||||
buildInputs = [ gnutls glib pkgconfig ];
|
||||
buildInputs = [ gnutls glib pkgconfig ]
|
||||
++ stdenv.lib.optional doCheck check;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "BitlBee, an IRC to other chat networks gateway";
|
||||
@ -26,5 +29,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = http://www.bitlbee.org/;
|
||||
license = "GPLv2+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, cmake, qt, libgadu, bash, libXScrnSaver, libsndfile, qca2, wget, libX11, alsaLib }:
|
||||
{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2
|
||||
, libX11, alsaLib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -10,19 +11,13 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
cmake qt libgadu bash libXScrnSaver libsndfile qca2 wget libX11 alsaLib
|
||||
cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib
|
||||
];
|
||||
|
||||
cmakeFlags = "-Wno-dev";
|
||||
cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF";
|
||||
|
||||
NIX_LDFLAGS="-lX11";
|
||||
|
||||
patches = [ ./more-icons.patch ];
|
||||
|
||||
patchPhase = ''
|
||||
unset patchPhase; patchPhase
|
||||
sed 's=/bin/bash=/${stdenv.shell}=g' -i \
|
||||
`find -type f -name '*.sh' -or -name 'autodownload'`
|
||||
prePatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
{ monolithic ? true # build monolithic Quassel
|
||||
, daemon ? false # build Quassel daemon
|
||||
, client ? false # build Quassel client
|
||||
, kde ? true # enable KDE integration
|
||||
, withKDE ? true # enable KDE integration
|
||||
, ssl ? true # enable SSL support
|
||||
, previews ? false # enable webpage previews on hovering over URLs
|
||||
, stdenv, fetchurl, cmake, qt4, kdelibs ? null, automoc4 ? null, phonon ? null }:
|
||||
|
||||
assert kde -> kdelibs != null && automoc4 != null && phonon != null;
|
||||
, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
|
||||
|
||||
let
|
||||
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
|
||||
@ -21,9 +19,9 @@ in with stdenv; mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 ]
|
||||
++ lib.optional kde kdelibs
|
||||
++ lib.optional kde automoc4
|
||||
++ lib.optional kde phonon;
|
||||
++ lib.optional withKDE kdelibs
|
||||
++ lib.optional withKDE automoc4
|
||||
++ lib.optional withKDE phonon;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_DBUS=OFF"
|
||||
@ -34,7 +32,7 @@ in with stdenv; mkDerivation rec {
|
||||
++ edf monolithic "WANT_MONO"
|
||||
++ edf daemon "WANT_CORE"
|
||||
++ edf client "WANT_QTCLIENT"
|
||||
++ edf kde "WITH_KDE"
|
||||
++ edf withKDE "WITH_KDE"
|
||||
++ edf ssl "WITH_OPENSSL"
|
||||
++ edf previews "WITH_WEBKIT" ;
|
||||
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wireshark-1.4.0rc2";
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.0";
|
||||
name = "wireshark-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://www.wireshark.org/download/src/wireshark-1.4.0rc2.tar.bz2";
|
||||
sha256 = "16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79";
|
||||
url = "http://www.wireshark.org/download/src/${name}.tar.bz2";
|
||||
sha256 = "1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743";
|
||||
};
|
||||
configureFlags = "--with-pcap=${libpcap}";
|
||||
buildInputs = [perl pkgconfig gtk libpcap flex bison];
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
{ fetchurl, stdenv, texLive, guile, libX11, libXext }:
|
||||
|
||||
let version = "1.0.7"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "texmacs-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${version}-src.tar.gz";
|
||||
sha256 = "1jdynapwc4fnp4ff71whq7l2jv0v3zwq2v2w463ppxm9cbi3bm5v";
|
||||
};
|
||||
|
||||
buildInputs = [ texLive guile libX11 libXext ];
|
||||
|
||||
meta = {
|
||||
description = "GNU TeXmacs, a WYSIWYW editing platform with special features for scientists";
|
||||
|
||||
longDescription =
|
||||
'' GNU TeXmacs is a free wysiwyw (what you see is what you want)
|
||||
editing platform with special features for scientists. The software
|
||||
aims to provide a unified and user friendly framework for editing
|
||||
structured documents with different types of content (text,
|
||||
graphics, mathematics, interactive content, etc.). The rendering
|
||||
engine uses high-quality typesetting algorithms so as to produce
|
||||
professionally looking documents, which can either be printed out or
|
||||
presented from a laptop.
|
||||
|
||||
The software includes a text editor with support for mathematical
|
||||
formulas, a small technical picture editor and a tool for making
|
||||
presentations from a laptop. Moreover, TeXmacs can be used as an
|
||||
interface for many external systems for computer algebra, numerical
|
||||
analysis, statistics, etc. New presentation styles can be written
|
||||
by the user and new features can be added to the editor using the
|
||||
Scheme extension language. A native spreadsheet and tools for
|
||||
collaborative authoring are planned for later.
|
||||
'';
|
||||
|
||||
homepage = http://texmacs.org/;
|
||||
|
||||
license = "GPLv2+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
@ -20,4 +20,12 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
buildInputs = [ nano ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://cvs.nongnu.org";
|
||||
description = "Concurrent Versions System - a source control system";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, zlib, openssl}:
|
||||
|
||||
let
|
||||
version = "20100918155143";
|
||||
version = "20101005035549";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
|
||||
sha256 = "1xkk5girwvhayl54fmya48k4akzpsdcg2qllgp1c6ckv169kggb9";
|
||||
sha256 = "14d7sibz9vfmb96xsaia5x6x0059xpn09x3la0xph0ym9gjqp8kb";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, guiSupport ? false, tk ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mercurial-1.5.1";
|
||||
name = "mercurial-1.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";
|
||||
sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569";
|
||||
sha256 = "04c8vj942ys71dn0bjga33i0qi5hybjjhq087xd0jp29ijzxp3hy";
|
||||
};
|
||||
|
||||
inherit python; # pass it so that the same version can be used in hg2git
|
||||
@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
|
||||
--prefix PYTHONPATH : "$(toPythonPath $out)" \
|
||||
$WRAP_TK
|
||||
done
|
||||
|
||||
# copy hgweb.cgi to allow use in apache
|
||||
ensureDir $out/share/cgi-bin
|
||||
cp -v hgweb.cgi $out/share/cgi-bin
|
||||
chmod u+x $out/share/cgi-bin/hgweb.cgi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
rec {
|
||||
version="0.3.1.10298";
|
||||
name="veracity-0.3.1.10298";
|
||||
hash="1mqlmh01qv6y1sd9zc89caig4j8b8h7lbrqsm4d171fq4qzgq5s5";
|
||||
version="0.3.1.10304";
|
||||
name="veracity-0.3.1.10304";
|
||||
hash="0izbs3v7incy9799sh6idfy7r2mchq2v152k8qc1k5l2r1jq4vik";
|
||||
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
|
||||
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10298.tar.gz";
|
||||
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10304.tar.gz";
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
|
||||
{ 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
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "virtualbox-3.1.8-${kernel.version}";
|
||||
name = "virtualbox-3.2.8-${kernel.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.virtualbox.org/virtualbox/3.1.8/VirtualBox-3.1.8-OSE.tar.bz2;
|
||||
sha256 = "118y12k9kv8nfhgnzn3z4d8v75jz6nvy7y1il84cj09lnkkqlz5p";
|
||||
url = http://download.virtualbox.org/virtualbox/3.2.8/VirtualBox-3.2.8-OSE.tar.bz2;
|
||||
sha256 = "00qvgaqg4gsabrc0rba5rh0jxqrjzk2vn6qbkc6nlxvngha95klh";
|
||||
};
|
||||
|
||||
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl];
|
||||
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam];
|
||||
|
||||
patchPhase = "
|
||||
set -x
|
||||
|
||||
@ -1,8 +1,36 @@
|
||||
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python
|
||||
, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz
|
||||
, lvm2, utillinux, procps }:
|
||||
, lvm2, utillinux, procps, texinfo, perl }:
|
||||
|
||||
let version = "4.0.1"; in
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
version = "4.0.1";
|
||||
|
||||
libDir = if stdenv.is64bit then "lib64" else "lib";
|
||||
|
||||
# Sources needed to build the stubdoms.
|
||||
|
||||
stubdomSrcs =
|
||||
[ { url = http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz;
|
||||
sha256 = "13wlr85s1hnvia6a698qpryyy12lvmqw0a05xmjnd0h71ralsbkp";
|
||||
}
|
||||
{ url = http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz;
|
||||
sha256 = "0pmh8kifb6sfkqfxc23wqp3f2wzk69sl80yz7w8p8cd4cz8cg58p";
|
||||
}
|
||||
{ url = http://xenbits.xensource.com/xen-extfiles/newlib-1.16.0.tar.gz;
|
||||
sha256 = "01rxk9js833mwadq92jx0flvk9jyjrnwrq93j39c2j2wjsa66hnv";
|
||||
}
|
||||
{ url = http://xenbits.xensource.com/xen-extfiles/grub-0.97.tar.gz;
|
||||
sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af";
|
||||
}
|
||||
{ url = http://xenbits.xensource.com/xen-extfiles/pciutils-2.2.9.tar.bz2;
|
||||
sha256 = "092v4q478i1gc7f3s2wz6p4xlf1wb4gs5shbkn21vnnmzcffc2pn";
|
||||
}
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xen-${version}";
|
||||
@ -20,12 +48,12 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs =
|
||||
[ which zlib pkgconfig SDL openssl python libuuid gettext ncurses
|
||||
dev86 iasl pciutils bzip2 xz
|
||||
dev86 iasl pciutils bzip2 xz texinfo perl
|
||||
];
|
||||
|
||||
makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
|
||||
|
||||
buildFlags = "xen tools";
|
||||
buildFlags = "xen tools stubdom";
|
||||
|
||||
preBuild =
|
||||
''
|
||||
@ -55,6 +83,29 @@ stdenv.mkDerivation {
|
||||
|
||||
substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \
|
||||
--replace /usr/sbin/qcow-create $out/sbin/qcow-create
|
||||
|
||||
substituteInPlace tools/python/xen/remus/save.py \
|
||||
--replace /usr/lib/xen/bin/xc_save $out/${libDir}/xen/bin/xc_save
|
||||
|
||||
substituteInPlace tools/python/xen/remus/device.py \
|
||||
--replace /usr/lib/xen/bin/imqebt $out/${libDir}/xen/bin/imqebt
|
||||
|
||||
# Allow the location of the xendomains config file to be
|
||||
# overriden at runtime.
|
||||
substituteInPlace tools/hotplug/Linux/init.d/xendomains \
|
||||
--replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
|
||||
--replace /bin/ls ls
|
||||
|
||||
# Xen's stubdoms need various sources that it usually fetches at
|
||||
# build time using wget. We can't have that.
|
||||
${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in ''
|
||||
cp ${src} stubdom/${src.name}
|
||||
'')}
|
||||
'';
|
||||
|
||||
postBuild =
|
||||
''
|
||||
make -C docs man-pages
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
@ -62,6 +113,7 @@ stdenv.mkDerivation {
|
||||
cp -prvd dist/install/nix/store/* $out
|
||||
cp -prvd dist/install/boot $out/boot
|
||||
cp -prvd dist/install/etc $out/etc
|
||||
cp -dR docs/man1 docs/man5 $out/share/man/
|
||||
''; # */
|
||||
|
||||
postFixup =
|
||||
@ -80,5 +132,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = http://www.xen.org/;
|
||||
description = "Xen hypervisor and management tools for Dom0";
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
, docbook_xml_dtd_45, libxslt, coreutils}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "awesome-3.4.7";
|
||||
name = "awesome-3.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://awesome.naquadah.org/download/awesome-3.4.7.tar.xz;
|
||||
sha256 = "1l5c730y17wxqm6p9fybjg84nk01jpg30wg14qjpc7xs5pd11993";
|
||||
url = http://awesome.naquadah.org/download/awesome-3.4.8.tar.xz;
|
||||
sha256 = "1mrdk8q0kj1p7zp5mchr2zl3cnja4z4ir0wx3yz5y361py5bjy78";
|
||||
};
|
||||
|
||||
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
|
||||
|
||||
@ -185,7 +185,6 @@ rec {
|
||||
# since SUSE actually delete their old distributions (see
|
||||
# ftp://ftp.suse.com/pub/suse/discontinued/deleted-20070817/README.txt).
|
||||
oldsuse = [
|
||||
http://ftp.hosteurope.de/pub/linux/suse/discontinued/i386/
|
||||
ftp://ftp.gmd.de/ftp.suse.com-discontinued/
|
||||
];
|
||||
|
||||
@ -193,8 +192,12 @@ rec {
|
||||
opensuse = [
|
||||
http://opensuse.hro.nl/opensuse/distribution/
|
||||
http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/
|
||||
http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/
|
||||
http://ftp.uni-kassel.de/opensuse/distribution/
|
||||
http://ftp.opensuse.org/pub/opensuse/distribution/
|
||||
http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/
|
||||
http://opensuse.mirror.server4you.net/distribution/
|
||||
http://ftp.nsysu.edu.tw/Linux/OpenSuSE/distribution/
|
||||
];
|
||||
|
||||
# Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS).
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
pkgs:
|
||||
|
||||
pkgs.recurseIntoAttrs (rec {
|
||||
inherit (pkgs) qt4;
|
||||
inherit (pkgs) qt4 stdenv;
|
||||
|
||||
### SUPPORT
|
||||
automoc4 = import ./support/automoc4 {
|
||||
@ -216,78 +216,6 @@ pkgs.recurseIntoAttrs (rec {
|
||||
|
||||
#### EXTRA GEAR
|
||||
|
||||
digikam = import ./extragear/digikam {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext
|
||||
liblqr1 lensfun;
|
||||
inherit kdelibs kdepimlibs kdegraphics kdeedu;
|
||||
inherit automoc4 phonon qimageblitz qca2 eigen soprano;
|
||||
};
|
||||
|
||||
filelight = import ./extragear/filelight {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
|
||||
inherit kdelibs kdebase_workspace;
|
||||
inherit automoc4 phonon qimageblitz;
|
||||
};
|
||||
|
||||
kdenlive = import ./extragear/kdenlive {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl mlt gettext shared_mime_info;
|
||||
inherit kdelibs soprano;
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
kdevelop = import ./extragear/kdevelop {
|
||||
inherit (pkgs) stdenv fetchurl cmake pkgconfig shared_mime_info gettext perl;
|
||||
inherit kdevplatform automoc4 kdebase_workspace;
|
||||
};
|
||||
|
||||
kdevplatform = import ./extragear/kdevplatform {
|
||||
inherit (pkgs) stdenv fetchurl cmake subversion qt4 perl gettext pkgconfig
|
||||
apr aprutil boost;
|
||||
inherit kdelibs automoc4 phonon;
|
||||
};
|
||||
|
||||
kdesvn = import ./extragear/kdesvn {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4;
|
||||
inherit kdelibs;
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
kdiff3 = import ./extragear/kdiff3 {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 gettext perl;
|
||||
inherit kdelibs kdebase;
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
kipiplugins = import ./extragear/kipi-plugins {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext;
|
||||
inherit kdelibs kdepimlibs kdegraphics;
|
||||
inherit automoc4 phonon qimageblitz qca2;
|
||||
};
|
||||
|
||||
kmplayer = import ./extragear/kmplayer {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib;
|
||||
inherit (pkgs.gtkLibs) pango gtk;
|
||||
inherit kdelibs;
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
krusader = import ./extragear/krusader {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext;
|
||||
inherit kdelibs;
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
inherit (pkgs) konversation yakuake ktorrent koffice amarok;
|
||||
|
||||
gtk_qt_engine = import ./extragear/gtk-qt-engine {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
|
||||
inherit (pkgs.xlibs) libX11;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
inherit (pkgs.gnome) libbonoboui;
|
||||
inherit kdelibs;
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
k3b = import ./extragear/k3b {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl shared_mime_info libvorbis taglib gettext;
|
||||
inherit (pkgs) ffmpeg flac libsamplerate libdvdread lame libsndfile libmad;
|
||||
@ -295,12 +223,6 @@ pkgs.recurseIntoAttrs (rec {
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
konqPlugins = import ./extragear/konq-plugins {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 gettext;
|
||||
inherit kdelibs automoc4 phonon kdebase;
|
||||
};
|
||||
### LOCALIZATION
|
||||
|
||||
l10n = pkgs.recurseIntoAttrs (import ./l10n {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext;
|
||||
inherit kdelibs;
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
cmakeFlags="-DINSTALL_PATH_GTK_ENGINES=$out/lib/gtk-2.0/2.10.0/engines -DINSTALL_PATH_GTK_THEMES=$out/share/themes -DINSTALL_PATH_KCONTROL_MODULES=$out/lib";
|
||||
|
||||
myPatchPhase()
|
||||
{
|
||||
sed -i -e "s|\${KDE4_INCLUDE_DIR}|\${KDE4_INCLUDE_DIR} ../build/kcm_gtk|" kcm_gtk/CMakeLists.txt
|
||||
sed -i -e "s|\*.po|../../\*.po|" po/CMakeLists.txt
|
||||
}
|
||||
patchPhase=myPatchPhase
|
||||
genericBuild
|
||||
@ -1,11 +0,0 @@
|
||||
{stdenv, fetchurl, cmake, qt4, perl, libX11, gtk, libbonoboui, gettext, kdelibs, automoc4, phonon}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gtk-qt-engine-1.1";
|
||||
src = fetchurl {
|
||||
url = http://gtk-qt-engine.googlecode.com/files/gtk-qt-engine-1.1.tar.bz2;
|
||||
sha256 = "4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl libX11 gtk libbonoboui gettext kdelibs automoc4 phonon ];
|
||||
builder = ./builder.sh;
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2,
|
||||
kdegraphics, kdepimlibs, libxml2, libxslt, gettext}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kipi-plugins-1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/kipi/${name}.tar.bz2";
|
||||
sha256 = "0vclb906g2jgzfl9f2qapaxcqq412j01yn7686682xx8iwrxm2cy";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs
|
||||
libxml2 libxslt gettext ];
|
||||
cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
|
||||
meta = {
|
||||
description = "Photo Management Program";
|
||||
license = "GPL";
|
||||
homepage = http://www.kipi-plugins.org;
|
||||
maintainers = [ lib.maintainers.viric ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -3,15 +3,13 @@
|
||||
{
|
||||
recurseForRelease = true;
|
||||
|
||||
inherit callPackage;
|
||||
inherit callPackage stdenv;
|
||||
|
||||
qt4 = qt47;
|
||||
|
||||
phonon = null;
|
||||
|
||||
kde = import ./kde-package {
|
||||
inherit stdenv fetchurl;
|
||||
};
|
||||
kde = callPackage ./kde-package { };
|
||||
|
||||
### SUPPORT
|
||||
akonadi = callPackage ./support/akonadi { };
|
||||
|
||||
@ -14,11 +14,6 @@
|
||||
version = "4.5.1";
|
||||
sha256 = "0097sk50cf1cq6wnah3kiab8vkh68snzahcng2blk63gw908yfvx";
|
||||
}
|
||||
{
|
||||
lang = "ca@valencia";
|
||||
version = "4.5.1";
|
||||
sha256 = "1nfj4pgh4k7ld42arlw8vkh646mar615x7r0av02gskdgmixzqm8";
|
||||
}
|
||||
{
|
||||
lang = "cs";
|
||||
version = "4.5.1";
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
rec {
|
||||
version="1.0.42";
|
||||
name="sbcl-1.0.42";
|
||||
hash="0j699rb3nw7akcmpqjlzwsrc0yg6kj6nf9bzfhnw19q1m4kl4pm5";
|
||||
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.42/sbcl-1.0.42-source.tar.bz2";
|
||||
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.42/sbcl-1.0.42-source.tar.bz2";
|
||||
version="1.0.43";
|
||||
name="sbcl-1.0.43";
|
||||
hash="0csykjcmy0gjlvxx7pg7kd2b7h610zpys3xla85qjj9ngjzpmbcq";
|
||||
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.43/sbcl-1.0.43-source.tar.bz2";
|
||||
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.43/sbcl-1.0.43-source.tar.bz2";
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"'';
|
||||
|
||||
doCheck = true;
|
||||
# The test suite is known to fail on Darwin. If maude is ever updated to a
|
||||
# new version, this exception ought to be removed again.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
postInstall =
|
||||
''
|
||||
|
||||
@ -1,20 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, cairo
|
||||
, coreutils
|
||||
, file
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtool
|
||||
, libXaw
|
||||
, libXext
|
||||
, libXft
|
||||
, libXrender
|
||||
, libXt
|
||||
, libXmu
|
||||
, mesa
|
||||
, pkgconfig
|
||||
, which } :
|
||||
{ stdenv, fetchurl, cairo, file, libjpeg
|
||||
, libpng, libtool, libXaw, libXext, libXft, libXrender
|
||||
, libXt, libXmu, mesa, pkgconfig, which } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "racket";
|
||||
@ -27,7 +13,6 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ cairo
|
||||
coreutils
|
||||
file
|
||||
libjpeg
|
||||
libpng
|
||||
@ -64,7 +49,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
homepage = http://racket-lang.org/;
|
||||
license = "LGPL";
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
license = stdenv.lib.licenses.lgpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.kkallio ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,10 +5,11 @@
|
||||
assert qt4Support -> qt4 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "avahi-0.6.27";
|
||||
name = "avahi-0.6.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/download/${name}.tar.gz";
|
||||
sha256 = "112yqh5k4ph5f1fsd98q1035477wmzq5nm2jrkivz5fnn3hgabf2";
|
||||
sha256 = "14gw611d3srn2r18a6g4y04r571w3l4lihiiaffryar1i2n0mn50";
|
||||
};
|
||||
|
||||
patches = [ ./no-mkdir-localstatedir.patch ];
|
||||
|
||||
30
pkgs/development/libraries/check/default.nix
Normal file
30
pkgs/development/libraries/check/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ fetchurl, stdenv }:
|
||||
|
||||
let version = "0.9.8"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "check-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz";
|
||||
sha256 = "0zvak7vx0zq344x174yg9vkw6fg9kycda15zlbz4yn07pdbgkb42";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Check, a unit testing framework for C";
|
||||
|
||||
longDescription =
|
||||
'' Check is a unit testing framework for C. It features a simple
|
||||
interface for defining unit tests, putting little in the way of the
|
||||
developer. Tests are run in a separate address space, so Check can
|
||||
catch both assertion failures and code errors that cause
|
||||
segmentation faults or other signals. The output from unit tests
|
||||
can be used within source code editors and IDEs.
|
||||
'';
|
||||
|
||||
homepage = http://check.sourceforge.net/;
|
||||
|
||||
license = "LGPLv2+";
|
||||
};
|
||||
}
|
||||
@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "gnutls-2.10.1";
|
||||
name = "gnutls-2.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnutls/${name}.tar.bz2";
|
||||
sha256 = "1vh2qc2pk6srlqk4ag0v7ba41jmy9816a2mj8yx1253626y7h43k";
|
||||
sha256 = "09479y0qy91qg20kkq9j0yy4agnpi4knb8ciq83cq0lvqqzplbp8";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "cairo";
|
||||
version = "0.11.0";
|
||||
sha256 = "f7971180bbd40c2a19b2e97fe40bd4a296b3aaf3edcf6621009780d723405c5a";
|
||||
version = "0.11.1";
|
||||
sha256 = "6d7209bcdb92b09437980c51646c324f501edd2893393e48aa185462dfc07b58";
|
||||
extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools];
|
||||
propagatedBuildInputs = [mtl];
|
||||
meta = {
|
||||
|
||||
13
pkgs/development/libraries/haskell/ghc-events/default.nix
Normal file
13
pkgs/development/libraries/haskell/ghc-events/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{cabal, binary, mtl}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "ghc-events";
|
||||
version = "0.2.0.1";
|
||||
sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6";
|
||||
propagatedBuildInputs = [binary mtl];
|
||||
meta = {
|
||||
description = "Library and tool for parsing .eventlog files from GHC";
|
||||
license = "BSD";
|
||||
maintainers = [self.stdenv.lib.maintainers.andres];
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/glade/default.nix
Normal file
14
pkgs/development/libraries/haskell/glade/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{cabal, cairo, glib, gtk, mtl, pango, gtk2hsBuildtools, pkgconfig, gnome, glibc}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "glade";
|
||||
version = "0.11.1";
|
||||
sha256 = "0d96a8576f89a81aa1ecdaf172e42e9eb1e7b40ce1b23cff36ab473165832c6a";
|
||||
extraBuildInputs = [pkgconfig gtk2hsBuildtools gnome.libglade gnome.gtk glibc];
|
||||
propagatedBuildInputs = [cairo glib gtk mtl pango];
|
||||
meta = {
|
||||
description = "Binding to the glade library";
|
||||
license = "LGPLv2+";
|
||||
maintainers = [self.stdenv.lib.maintainers.andres];
|
||||
};
|
||||
})
|
||||
13
pkgs/development/libraries/haskell/glib/default.nix
Normal file
13
pkgs/development/libraries/haskell/glib/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{cabal, gtk2hsBuildtools, pkgconfig, glib, glibc}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "glib";
|
||||
version = "0.11.2";
|
||||
sha256 = "e0fb5f3c22701807db364dff86d55f2a33a57d8a4e58d37a80d367bca50b3dbb";
|
||||
extraBuildInputs = [pkgconfig glib glibc gtk2hsBuildtools];
|
||||
meta = {
|
||||
description = "Binding to the GLIB library for Gtk2Hs";
|
||||
license = "LGPLv2+";
|
||||
maintainers = [self.stdenv.lib.maintainers.andres];
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/gtk/default.nix
Normal file
14
pkgs/development/libraries/haskell/gtk/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{cabal, cairo, glib, mtl, pango, gtk2hsBuildtools, pkgconfig, gtk, glibc}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "gtk";
|
||||
version = "0.11.2";
|
||||
sha256 = "c9de86278780badbd874fb75ef01ca12a70364a9985b75f98957ba940df27aa6";
|
||||
extraBuildInputs = [pkgconfig gtk2hsBuildtools gtk glibc];
|
||||
propagatedBuildInputs = [cairo glib mtl pango];
|
||||
meta = {
|
||||
description = "Binding to the Gtk+ graphical user interface library";
|
||||
license = "LGPLv2+";
|
||||
maintainers = [self.stdenv.lib.maintainers.andres];
|
||||
};
|
||||
})
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "gtk2hs-buildtools";
|
||||
version = "0.9";
|
||||
sha256 = "2586c419394601c1840d827d32cdb9d76bc94d71c03fdfa23c8d04cba99c6b20";
|
||||
version = "0.11.2";
|
||||
sha256 = "330c52830358966bcff308f58a570e84bb0b4d6004b6f01107d55dd88faa54ad";
|
||||
extraBuildInputs = [alex happy];
|
||||
meta = {
|
||||
description = "Tools to build the Gtk2Hs suite of User Interface libraries";
|
||||
|
||||
14
pkgs/development/libraries/haskell/pango/default.nix
Normal file
14
pkgs/development/libraries/haskell/pango/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{cabal, cairo, glib, mtl, gtk2hsBuildtools, pkgconfig, pango, glibc}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "pango";
|
||||
version = "0.11.2";
|
||||
sha256 = "fb7f5dc303d3d49a330aaa3acf29560f78746edb9c67f6191756baa1b08fb504";
|
||||
extraBuildInputs = [pkgconfig gtk2hsBuildtools pango glibc];
|
||||
propagatedBuildInputs = [cairo glib mtl];
|
||||
meta = {
|
||||
description = "Binding to the Pango text rendering engine";
|
||||
license = "LGPLv2+";
|
||||
maintainers = [self.stdenv.lib.maintainers.andres];
|
||||
};
|
||||
})
|
||||
@ -2,11 +2,11 @@
|
||||
gettext, pkgconfig, apr, aprutil, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kdevplatform-1.0.0";
|
||||
name = "kdevplatform-1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2";
|
||||
sha256 = "05qgi5hwvzqzysihd5nrn28kiz0l6rp9dbxlf25jcjs5dml3dza6";
|
||||
url = "mirror://kde/stable/kdevelop/4.0.2/src/${name}.tar.bz2";
|
||||
sha256 = "0yn4v3jx1dks84nvi7s40a1pmnvipqx5hlbvbmdgqhhpqik5y9qg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ kdelibs subversion qt4 phonon ];
|
||||
@ -17,11 +17,13 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "1vdyj6xvwkisrc222i84mq93gasywad4i0ismafdjq2wapxn30r6";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib libxml2 gnutls gsasl ]
|
||||
buildInputs = [ pkgconfig glib libxml2 gsasl ]
|
||||
++ optional gtkWidgets gtk
|
||||
++ optional documentation gtkdoc
|
||||
++ optional avahiSupport avahi
|
||||
++ optional daemon libdaemon;
|
||||
|
||||
propagatedBuildInputs = [ gnutls ];
|
||||
|
||||
configureFlags = ''
|
||||
${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtasn1-2.7";
|
||||
name = "libtasn1-2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libtasn1/${name}.tar.gz";
|
||||
sha256 = "0rhyg043cqhajrmk30ylfvpk4dfig4djgy1j3q957vj5pqg7zzqh";
|
||||
sha256 = "0njl5l9h48v2ikfim96yxpnwjhhfwfmszz4i08psw60bn7s78z9b";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1hgpw9lld0k6z34kxrapz8dxf3cbgnnhkx6himnvw9ax3qf7p5gk";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libxml2 glibmm perl ];
|
||||
buildInputs = [ pkgconfig glibmm perl ];
|
||||
|
||||
propagatedBuildInputs = [ libxml2 ];
|
||||
|
||||
configureFlags = "--disable-documentation"; #doesn't build without this for some reason
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pango-1.28.1";
|
||||
name = "pango-1.28.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/pango/1.28/${name}.tar.bz2";
|
||||
sha256 = "8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2";
|
||||
sha256 = "0ch640zmf159gr9qp3i4a5mh1ib2s9h3660g4w0bpiqc8g4qn9sy";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext;
|
||||
buildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin gettext;
|
||||
|
||||
propagatedBuildInputs = [ x11 glib cairo libpng ];
|
||||
|
||||
|
||||
@ -13,10 +13,9 @@ stdenv.mkDerivation {
|
||||
# problem. In case we ever update the Darwin GCC version, the exception for
|
||||
# that platform ought to be removed.
|
||||
configureFlags = ''
|
||||
CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"}
|
||||
${if unicodeSupport then "--enable-unicode-properties" else ""}
|
||||
${if !cplusplusSupport then "--disable-cpp" else ""}
|
||||
'';
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
{ stdenv, fetchurl, python, setuptools, ... }:
|
||||
|
||||
rec {
|
||||
name = "flup-1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
|
||||
sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab";
|
||||
};
|
||||
|
||||
buildInputs = [ python setuptools ];
|
||||
|
||||
phaseNames = ["addInputs" "createPythonInstallationTarget" "installPythonPackage"];
|
||||
|
||||
meta = {
|
||||
description = "FastCGI Python module set";
|
||||
};
|
||||
}
|
||||
14
pkgs/development/tools/haskell/threadscope/default.nix
Normal file
14
pkgs/development/tools/haskell/threadscope/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{cabal, binary, cairo, ghcEvents, glade, gtk, mtl}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "threadscope";
|
||||
version = "0.1.2";
|
||||
sha256 = "ce1116016f6b2d38e6063ba3dd147f38147a9c4399160f37aba9c50c96d00a90";
|
||||
propagatedBuildInputs = [binary cairo ghcEvents glade gtk mtl];
|
||||
meta = {
|
||||
description = "A graphical thread profiler";
|
||||
license = "BSD";
|
||||
maintainers = [self.stdenv.lib.maintainers.andres];
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, m4, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "autoconf-2.67";
|
||||
name = "autoconf-2.68";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/autoconf/${name}.tar.bz2";
|
||||
sha256 = "1vwalyqzgk1liyinblbc78isxa5qa4fvs5bx2fkjd7crfhhdkph0";
|
||||
sha256 = "1j1j8d2p3r9mzx8b2hnmfqy2683r2wyyvki6bs9cmm6n7wkzp4f4";
|
||||
};
|
||||
|
||||
buildInputs = [ m4 perl ];
|
||||
|
||||
@ -1,5 +1,15 @@
|
||||
{stdenv, fetchurl, libftdi}:
|
||||
|
||||
let
|
||||
# The "GuruPlug installer" from Marvell. See
|
||||
# <http://www.plugcomputer.org/index.php/us/resources/downloads?func=select&id=16>,
|
||||
# linked from <http://www.globalscaletechnologies.com/t-downloads.aspx>.
|
||||
guruplug_installer = fetchurl {
|
||||
url = "http://www.plugcomputer.org/index.php/us/resources/downloads?func=download&id=65&chk=d6878f4bf86070f7b4f7bc93317fcb0f&no_html=1";
|
||||
sha256 = "1nps9li9k1kxb31f9x6d114hh0a3bx886abvgh8vg004ni996hlv";
|
||||
name = "guruplug-installer.tar.gz";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "openocd-0.4.0";
|
||||
|
||||
@ -8,15 +18,37 @@ stdenv.mkDerivation {
|
||||
sha256 = "1c9j8s3mqgw5spv6nd4lqfkd1l9jmjipi0ya054vnjfsy2617kzv";
|
||||
};
|
||||
|
||||
|
||||
configureFlags = [ "--enable-ft2232_libftdi" "--disable-werror" ];
|
||||
|
||||
buildInputs = [ libftdi ];
|
||||
|
||||
# Copy the GuruPlug stuff.
|
||||
# XXX: Unfortunately, these files were written for OpenOCD 0.2.0 and don't
|
||||
# work with 0.4.0.
|
||||
# postInstall =
|
||||
# '' tar xf "${guruplug_installer}"
|
||||
# for dir in interface target board
|
||||
# do
|
||||
# cp -v "guruplug-installer/openocd/$dir/"* \
|
||||
# "$out/share/openocd/scripts/$dir/"
|
||||
# done
|
||||
# '';
|
||||
|
||||
meta = {
|
||||
homepage = http://openocd.berlios.de;
|
||||
description = "Open On Chip Debugger";
|
||||
license = "GPLv2";
|
||||
description = "OpenOCD, an on-chip debugger";
|
||||
|
||||
longDescription =
|
||||
'' OpenOCD provides on-chip programming and debugging support with a
|
||||
layered architecture of JTAG interface and TAP support, debug target
|
||||
support (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND,
|
||||
etc.). Several network interfaces are available for interactiving
|
||||
with OpenOCD: HTTP, telnet, TCL, and GDB. The GDB server enables
|
||||
OpenOCD to function as a "remote target" for source-level debugging
|
||||
of embedded systems using the GNU GDB program.
|
||||
'';
|
||||
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
|
||||
pierron = "Nicolas B. Pierron <nixos@nbp.name>";
|
||||
raskin = "Michael Raskin <7c6f434c@mail.ru>";
|
||||
roconnor = "Russell O'Connor <roconnor@theorem.ca>";
|
||||
sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
|
||||
simons = "Peter Simons <simons@cryp.to>";
|
||||
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
|
||||
freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
|
||||
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
|
||||
xlibs.libXcursor xlibs.libXcomposite
|
||||
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
|
||||
openssl gnutls
|
||||
];
|
||||
|
||||
@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = "install -D ${gecko} $out/share/wine/gecko/wine_gecko-1.1.0-x86.cab";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.winehq.org/";
|
||||
license = "LGPL";
|
||||
|
||||
48
pkgs/misc/uboot/guruplug-file-systems.patch
Normal file
48
pkgs/misc/uboot/guruplug-file-systems.patch
Normal file
@ -0,0 +1,48 @@
|
||||
Add support for the various file systems as found in `sheevaplug.h'.
|
||||
As for the SheevaPlug, the increase in size means that the environment
|
||||
must be pushed further away.
|
||||
|
||||
In addition, increase the malloc area size to allow compilation of UbiFS.
|
||||
|
||||
--- u-boot/include/configs/guruplug.h 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ u-boot/include/configs/guruplug.h 2010-09-29 18:59:52.000000000 +0200
|
||||
@@ -123,8 +123,8 @@
|
||||
* it has to be rounded to sector size
|
||||
*/
|
||||
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
|
||||
-#define CONFIG_ENV_ADDR 0x40000
|
||||
-#define CONFIG_ENV_OFFSET 0x40000 /* env starts here */
|
||||
+#define CONFIG_ENV_ADDR 0x60000
|
||||
+#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
|
||||
|
||||
/*
|
||||
* Default environment variables
|
||||
@@ -145,7 +145,7 @@
|
||||
/*
|
||||
* Size of malloc() pool
|
||||
*/
|
||||
-#define CONFIG_SYS_MALLOC_LEN (1024 * 128) /* 128kB for malloc() */
|
||||
+#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* 1 MiB for malloc() */
|
||||
/* size in bytes reserved for initial data */
|
||||
#define CONFIG_SYS_GBL_DATA_SIZE 128
|
||||
|
||||
@@ -195,4 +195,18 @@
|
||||
|
||||
#define CONFIG_SYS_ALT_MEMTEST
|
||||
|
||||
+/*
|
||||
+ * File system
|
||||
+ */
|
||||
+#define CONFIG_CMD_EXT2
|
||||
+#define CONFIG_CMD_FAT
|
||||
+#define CONFIG_CMD_JFFS2
|
||||
+#define CONFIG_CMD_UBI
|
||||
+#define CONFIG_CMD_UBIFS
|
||||
+#define CONFIG_RBTREE
|
||||
+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
|
||||
+#define CONFIG_MTD_PARTITIONS
|
||||
+#define CONFIG_CMD_MTDPARTS
|
||||
+#define CONFIG_LZO
|
||||
+
|
||||
#endif /* _CONFIG_GURUPLUG_H */
|
||||
|
||||
106
pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
Normal file
106
pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
Normal file
@ -0,0 +1,106 @@
|
||||
The GuruPlug's microSD card reader is a USB mass storage device that
|
||||
has two logical units (LUNs), i.e., two "SCSI disks". This patch
|
||||
adds multi-LUN support to the USB MSD driver.
|
||||
|
||||
See the thread at <http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/85425>.
|
||||
|
||||
--- u-boot/common/usb_storage.c 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ u-boot/common/usb_storage.c 2010-10-02 00:38:15.000000000 +0200
|
||||
@@ -204,6 +204,22 @@ int usb_stor_info(void)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+static unsigned int usb_get_max_lun(struct us_data *us)
|
||||
+{
|
||||
+ int len;
|
||||
+ unsigned char result;
|
||||
+ len = usb_control_msg(us->pusb_dev,
|
||||
+ usb_rcvctrlpipe(us->pusb_dev, 0),
|
||||
+ US_BBB_GET_MAX_LUN,
|
||||
+ USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
|
||||
+ 0, us->ifnum,
|
||||
+ &result, sizeof(result),
|
||||
+ USB_CNTL_TIMEOUT * 5);
|
||||
+ USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n",
|
||||
+ len, (int) result);
|
||||
+ return (len > 0) ? result : 0;
|
||||
+}
|
||||
+
|
||||
/*******************************************************************************
|
||||
* scan the usb and reports device info
|
||||
* to the user if mode = 1
|
||||
@@ -241,13 +257,21 @@ int usb_stor_scan(int mode)
|
||||
break; /* no more devices avaiable */
|
||||
|
||||
if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
|
||||
- /* ok, it is a storage devices
|
||||
- * get info and fill it in
|
||||
- */
|
||||
- if (usb_stor_get_info(dev, &usb_stor[usb_max_devs],
|
||||
- &usb_dev_desc[usb_max_devs]) == 1)
|
||||
+ /* OK, it's a storage device. Iterate over its LUNs
|
||||
+ * and populate `usb_dev_desc'. */
|
||||
+ int lun, max_lun, start = usb_max_devs;
|
||||
+
|
||||
+ max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]);
|
||||
+ for (lun = 0;
|
||||
+ lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV;
|
||||
+ lun++) {
|
||||
+ usb_dev_desc[usb_max_devs].lun = lun;
|
||||
+ if (usb_stor_get_info(dev, &usb_stor[start],
|
||||
+ &usb_dev_desc[usb_max_devs]) == 1) {
|
||||
usb_max_devs++;
|
||||
}
|
||||
+ }
|
||||
+ }
|
||||
/* if storage device */
|
||||
if (usb_max_devs == USB_MAX_STOR_DEV) {
|
||||
printf("max USB Storage Device reached: %d stopping\n",
|
||||
@@ -882,6 +906,7 @@ static int usb_inquiry(ccb *srb, struct
|
||||
do {
|
||||
memset(&srb->cmd[0], 0, 12);
|
||||
srb->cmd[0] = SCSI_INQUIRY;
|
||||
+ srb->cmd[1] = srb->lun << 5;
|
||||
srb->cmd[4] = 36;
|
||||
srb->datalen = 36;
|
||||
srb->cmdlen = 12;
|
||||
@@ -905,6 +930,7 @@ static int usb_request_sense(ccb *srb, s
|
||||
ptr = (char *)srb->pdata;
|
||||
memset(&srb->cmd[0], 0, 12);
|
||||
srb->cmd[0] = SCSI_REQ_SENSE;
|
||||
+ srb->cmd[1] = srb->lun << 5;
|
||||
srb->cmd[4] = 18;
|
||||
srb->datalen = 18;
|
||||
srb->pdata = &srb->sense_buf[0];
|
||||
@@ -924,6 +950,7 @@ static int usb_test_unit_ready(ccb *srb,
|
||||
do {
|
||||
memset(&srb->cmd[0], 0, 12);
|
||||
srb->cmd[0] = SCSI_TST_U_RDY;
|
||||
+ srb->cmd[1] = srb->lun << 5;
|
||||
srb->datalen = 0;
|
||||
srb->cmdlen = 12;
|
||||
if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
|
||||
@@ -943,6 +970,7 @@ static int usb_read_capacity(ccb *srb, s
|
||||
do {
|
||||
memset(&srb->cmd[0], 0, 12);
|
||||
srb->cmd[0] = SCSI_RD_CAPAC;
|
||||
+ srb->cmd[1] = srb->lun << 5;
|
||||
srb->datalen = 8;
|
||||
srb->cmdlen = 12;
|
||||
if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
|
||||
@@ -957,6 +985,7 @@ static int usb_read_10(ccb *srb, struct
|
||||
{
|
||||
memset(&srb->cmd[0], 0, 12);
|
||||
srb->cmd[0] = SCSI_READ10;
|
||||
+ srb->cmd[1] = srb->lun << 5;
|
||||
srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
|
||||
srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
|
||||
srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
|
||||
@@ -973,6 +1002,7 @@ static int usb_write_10(ccb *srb, struct
|
||||
{
|
||||
memset(&srb->cmd[0], 0, 12);
|
||||
srb->cmd[0] = SCSI_WRITE10;
|
||||
+ srb->cmd[1] = srb->lun << 5;
|
||||
srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
|
||||
srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
|
||||
srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
|
||||
54
pkgs/misc/uboot/guruplug.nix
Normal file
54
pkgs/misc/uboot/guruplug.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{stdenv, fetchgit, unzip}:
|
||||
|
||||
# Marvell's branch of U-Boot for the GuruPlug.
|
||||
|
||||
let
|
||||
# Aug 2010 revision of the `testing' branch of Marvell's U-Boot repository.
|
||||
# See
|
||||
# <http://www.openplug.org/plugwiki/index.php/Re-building_the_kernel_and_U-Boot>
|
||||
# for details.
|
||||
rev = "f106056095049c2c748c2a2797e5353295240e04";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "uboot-guruplug-0.0pre${rev}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.denx.de/u-boot-marvell.git";
|
||||
sha256 = "18gwyj16vml7aja9cyan51jwfcysy4cs062z7wmgdc0l9bha6iw7";
|
||||
inherit rev;
|
||||
};
|
||||
|
||||
patches =
|
||||
[ ./guruplug-file-systems.patch ./guruplug-usb-msd-multi-lun.patch ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Remove the cross compiler prefix.
|
||||
configurePhase = ''
|
||||
make mrproper
|
||||
make guruplug_config
|
||||
sed -i /CROSS_COMPILE/d include/config.mk
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
unset src
|
||||
if test -z "$crossConfig"; then
|
||||
make all u-boot.kwb
|
||||
else
|
||||
make all u-boot.kwb ARCH=arm CROSS_COMPILE=$crossConfig-
|
||||
fi
|
||||
'';
|
||||
|
||||
buildNativeInputs = [ unzip ];
|
||||
|
||||
dontStrip = true;
|
||||
NIX_STRIP_DEBUG = false;
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out
|
||||
cp -v u-boot u-boot.{kwb,map} $out
|
||||
|
||||
ensureDir $out/bin
|
||||
cp tools/{envcrc,mkimage} $out/bin
|
||||
'';
|
||||
}
|
||||
@ -202,11 +202,12 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "2.6.32.21-xen-2968b25";
|
||||
version = "2.6.32.24-xen-179eca5";
|
||||
localVersion = "-xen-179eca5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/tarballs/linux-${version}.tar.bz2";
|
||||
sha256 = "06dxwchyxvfwg35y78bs0bm91ah6jlb6pjkqwgdnsgfjnxhibfx9";
|
||||
sha256 = "09a7xh4hvw0hzq67dqdxn8p4rkd907937xvshx30rg4ab6717scf";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -198,11 +198,11 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "2.6.32.23";
|
||||
version = "2.6.32.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
||||
sha256 = "0xhxcdrxd6v21zjwf16m1bc0zrpy1scgxdp7xby2yhg63abh97nr";
|
||||
sha256 = "0girs793499ig4p4rp1pi3fdigbdv4h2slavxs8jlj9kxd2x19y7";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -190,11 +190,11 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "2.6.35.6";
|
||||
version = "2.6.35.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
||||
sha256 = "1mz0sk7flyr115dcqwqmrzwk845v6pghmlp7j133p8z3jii49c8r";
|
||||
sha256 = "f19c830e52d97fe35e9e32e1911de238e75b1cd29ca779de0d83f0906073ee2c";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -1,15 +1,23 @@
|
||||
{stdenv, fetchurl, jdk}:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
let version = "6.0.29"; in
|
||||
|
||||
name = "apache-tomcat-6.0.26";
|
||||
|
||||
builder = ./builder-6.0.sh;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apache-tomcat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://apache.proserve.nl/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz;
|
||||
sha256 = "0rxaz7wkw6xas9f2jslb6kp1prllhpqmq7c3h0ig19j146mrjbls";
|
||||
url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
|
||||
sha256 = "0v96wmd4fnk3qskw32k8mb77f7yssqqinsrf9sir672l5ggmmcjc";
|
||||
};
|
||||
|
||||
inherit jdk;
|
||||
installPhase =
|
||||
''
|
||||
mkdir $out
|
||||
mv * $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://tomcat.apache.org/;
|
||||
description = "An implementation of the Java Servlet and JavaServer Pages technologies";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
tar zxf $src
|
||||
|
||||
mkdir $out
|
||||
mv apache-tomcat-*/* $out
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bzip2-1.0.5";
|
||||
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz;
|
||||
sha256 = "08py2s9vw6dgw457lbklh1vsr3b8x8dlv7d8ygdfaxlx61l57gzp";
|
||||
@ -26,8 +26,12 @@ stdenv.mkDerivation {
|
||||
makeFlags = if linkStatic then "LDFLAGS=-static" else "";
|
||||
|
||||
inherit linkStatic;
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = http://www.bzip.org;
|
||||
homepage = "http://www.bzip.org";
|
||||
description = "high-quality data compression program";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,20 +1,23 @@
|
||||
{stdenv, fetchurl, flex, readline}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bc-1.0.6";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bc-1.06";
|
||||
src = fetchurl {
|
||||
url = mirror://gnu/bc/bc-1.06.tar.gz;
|
||||
md5 = "d44b5dddebd8a7a7309aea6c36fda117";
|
||||
url = "mirror://gnu/bc/${name}.tar.gz";
|
||||
sha256 = "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf";
|
||||
};
|
||||
|
||||
patches = [ ./readlinefix.patch ];
|
||||
|
||||
configureFlags = "--with-readline";
|
||||
configureFlags = [ "--with-readline" ];
|
||||
|
||||
buildInputs = [flex readline];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "GNU software calculator";
|
||||
homepage = http://www.gnu.org/software/bc/;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "parallel-20100906";
|
||||
name = "parallel-20100922";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/${name}.tar.bz2";
|
||||
sha256 = "1h27ffq0hk2dlnffsk377lpp65l2zmvija7r831lpvdfssklmxvw";
|
||||
sha256 = "0bn1pka242pgm5dm0wkd4zf63rwv0wxxb0fjdjivlxyid72r7g8d";
|
||||
};
|
||||
|
||||
patchPhase =
|
||||
|
||||
@ -8,4 +8,12 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ncurses];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.gnu.org/software/screen/";
|
||||
description = "Full-screen window manager that multiplexes a physical terminal";
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,25 +1,24 @@
|
||||
{ fetchurl, stdenv, avahi }:
|
||||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nss-mdns-0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz";
|
||||
sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y";
|
||||
};
|
||||
|
||||
configureFlags = "--enable-avahi";
|
||||
|
||||
# Note: Although `nss-mdns' works by talking to `avahi-daemon', it
|
||||
# doesn't depend on the Avahi libraries. Instead, it contains
|
||||
# hand-written D-Bus code to talk to the Avahi daemon.
|
||||
|
||||
buildInput = [ avahi ];
|
||||
configureFlags =
|
||||
[ # Try to use the Avahi daemon before resolving on our own.
|
||||
"--enable-avahi"
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace "src/Makefile.in" \
|
||||
--replace 'AVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"' \
|
||||
'AVAHI_SOCKET=\"${avahi}/var/run/avahi-daemon/socket\"'
|
||||
'';
|
||||
# Connect to the daemon at `/var/run/avahi-daemon/socket'.
|
||||
"--localstatedir=/var"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "The mDNS Name Service Switch (NSS) plug-in";
|
||||
@ -33,5 +32,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = http://0pointer.de/lennart/projects/nss-mdns/;
|
||||
license = "LGPLv2+";
|
||||
|
||||
# Supports both the GNU and FreeBSD NSS.
|
||||
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
assert stdenv.isLinux -> libcap != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ntp-4.2.6";
|
||||
name = "ntp-4.2.6p2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
|
||||
sha256 = "04cam5l804ws6cs0ihlmx26n39vpap5wb39i1vxfff01mri4q38b";
|
||||
sha256 = "1n79scfvgjk8hn1fr4q2kkk6xm83k68r4p488ai09nm20dwqp2a2";
|
||||
};
|
||||
|
||||
configureFlags = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "x11-ssh-askpass-1.2.4.1";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz;
|
||||
sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7";
|
||||
@ -15,4 +15,12 @@ stdenv.mkDerivation {
|
||||
buildPhase = "xmkmf; make includes; make";
|
||||
|
||||
buildInputs = [x11 imake];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/";
|
||||
description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -373,12 +373,12 @@ let
|
||||
monolithic = false;
|
||||
daemon = true;
|
||||
};
|
||||
|
||||
|
||||
amuleGui = amule.override {
|
||||
monolithic = false;
|
||||
client = true;
|
||||
};
|
||||
|
||||
|
||||
aria = builderDefsPackage (import ../tools/networking/aria) {
|
||||
};
|
||||
|
||||
@ -781,6 +781,8 @@ let
|
||||
|
||||
jwhois = callPackage ../tools/networking/jwhois { };
|
||||
|
||||
kdiff3 = newScope pkgs.kde4 ../tools/text/kdiff3 { };
|
||||
|
||||
keychain = callPackage ../tools/misc/keychain { };
|
||||
|
||||
kismet = callPackage ../applications/networking/sniffers/kismet { };
|
||||
@ -946,6 +948,7 @@ let
|
||||
|
||||
openjade = callPackage ../tools/text/sgml/openjade {
|
||||
stdenv = overrideGCC stdenv gcc33;
|
||||
opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; };
|
||||
};
|
||||
|
||||
openobex = callPackage ../tools/bluetooth/openobex { };
|
||||
@ -1201,7 +1204,10 @@ let
|
||||
|
||||
telnet = callPackage ../tools/networking/telnet { };
|
||||
|
||||
texmacs = callPackage ../applications/office/texmacs { };
|
||||
texmacs = callPackage ../applications/editors/texmacs {
|
||||
tex = texLive; /* tetex is also an option */
|
||||
extraFonts = true;
|
||||
};
|
||||
|
||||
tor = callPackage ../tools/security/tor { };
|
||||
|
||||
@ -1219,7 +1225,7 @@ let
|
||||
unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
|
||||
|
||||
upx = callPackage ../tools/compression/upx { };
|
||||
|
||||
|
||||
usbmuxd = callPackage ../tools/misc/usbmuxd {};
|
||||
|
||||
vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
|
||||
@ -2249,7 +2255,7 @@ let
|
||||
antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ;
|
||||
|
||||
ant = apacheAnt;
|
||||
|
||||
|
||||
apacheAnt = callPackage ../development/tools/build-managers/apache-ant {
|
||||
name = "ant-" + jdk.name;
|
||||
};
|
||||
@ -2621,6 +2627,8 @@ let
|
||||
|
||||
ccrtp = callPackage ../development/libraries/ccrtp { };
|
||||
|
||||
check = callPackage ../development/libraries/check { };
|
||||
|
||||
chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) {
|
||||
inherit cmake freeglut mesa;
|
||||
inherit (xlibs) libX11 xproto inputproto libXi libXmu;
|
||||
@ -3140,6 +3148,8 @@ let
|
||||
|
||||
judy = callPackage ../development/libraries/judy { };
|
||||
|
||||
kdevplatform = newScope pkgs.kde4 ../development/libraries/kdevplatform { };
|
||||
|
||||
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
|
||||
|
||||
lablgtk = callPackage ../development/libraries/lablgtk {
|
||||
@ -3736,12 +3746,12 @@ let
|
||||
monolithic = false;
|
||||
daemon = true;
|
||||
};
|
||||
|
||||
|
||||
quasselClient = quassel.override {
|
||||
monolithic = false;
|
||||
client = true;
|
||||
};
|
||||
|
||||
|
||||
quesoglc = callPackage ../development/libraries/quesoglc { };
|
||||
|
||||
readline = readline6;
|
||||
@ -3834,7 +3844,7 @@ let
|
||||
t1lib = callPackage ../development/libraries/t1lib { };
|
||||
|
||||
taglib = callPackage ../development/libraries/taglib { };
|
||||
|
||||
|
||||
taglib17 = callPackage ../development/libraries/taglib/1.7.nix { };
|
||||
|
||||
taglib_extras = callPackage ../development/libraries/taglib-extras { };
|
||||
@ -3895,7 +3905,7 @@ let
|
||||
};
|
||||
|
||||
wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
|
||||
inherit (gtkLibs216) gtk;
|
||||
inherit (gtkLibs) gtk;
|
||||
};
|
||||
|
||||
wtk = callPackage ../development/libraries/wtk { };
|
||||
@ -4070,10 +4080,6 @@ let
|
||||
|
||||
bsddb3 = callPackage ../development/python-modules/bsddb3 { };
|
||||
|
||||
flup = builderDefsPackage ../development/python-modules/flup {
|
||||
inherit fetchurl stdenv python setuptools;
|
||||
};
|
||||
|
||||
numeric = callPackage ../development/python-modules/numeric { };
|
||||
|
||||
pil = callPackage ../development/python-modules/pil { };
|
||||
@ -4263,7 +4269,7 @@ let
|
||||
});
|
||||
squid = squids.squid3Beta; # has ipv6 support
|
||||
|
||||
tomcat5 = callPackage ../servers/http/tomcat { };
|
||||
tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
|
||||
|
||||
tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
|
||||
|
||||
@ -4983,6 +4989,8 @@ let
|
||||
|
||||
ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
|
||||
|
||||
ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
|
||||
|
||||
uclibc = callPackage ../os-specific/linux/uclibc { };
|
||||
|
||||
uclibcCross = import ../os-specific/linux/uclibc {
|
||||
@ -5411,6 +5419,8 @@ let
|
||||
|
||||
dia = callPackage ../applications/graphics/dia { };
|
||||
|
||||
digikam = newScope pkgs.kde4 ../applications/graphics/digikam { };
|
||||
|
||||
djvulibre = callPackage ../applications/misc/djvulibre { };
|
||||
|
||||
djview4 = callPackage ../applications/graphics/djview { };
|
||||
@ -5586,6 +5596,8 @@ let
|
||||
|
||||
feh = callPackage ../applications/graphics/feh { };
|
||||
|
||||
filelight = newScope pkgs.kde4 ../applications/misc/filelight { };
|
||||
|
||||
firefox = firefox36Pkgs.firefox;
|
||||
firefoxWrapper = firefox36Wrapper;
|
||||
|
||||
@ -5683,6 +5695,11 @@ let
|
||||
|
||||
gocr = callPackage ../applications/graphics/gocr { };
|
||||
|
||||
gobby5 = callPackage ../applications/editors/gobby {
|
||||
inherit (gtkLibs) gtkmm;
|
||||
inherit (gnome) gtksourceview;
|
||||
};
|
||||
|
||||
gphoto2 = callPackage ../applications/misc/gphoto2 { };
|
||||
|
||||
gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
|
||||
@ -5823,15 +5840,16 @@ let
|
||||
|
||||
jwm = callPackage ../applications/window-managers/jwm { };
|
||||
|
||||
kadu = callPackage ../applications/networking/instant-messengers/kadu {
|
||||
qt = qt4;
|
||||
inherit fetchurl cmake libgadu bash libsndfile wget alsaLib;
|
||||
inherit (xlibs) libXScrnSaver libX11;
|
||||
inherit (kde45) qca2;
|
||||
};
|
||||
kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { };
|
||||
|
||||
kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
|
||||
|
||||
kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { };
|
||||
|
||||
kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { };
|
||||
|
||||
kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { };
|
||||
|
||||
kermit = callPackage ../tools/misc/kermit { };
|
||||
|
||||
kino = import ../applications/video/kino {
|
||||
@ -5842,12 +5860,22 @@ let
|
||||
inherit (xlibs) libXv libX11;
|
||||
};
|
||||
|
||||
kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { };
|
||||
|
||||
kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer {
|
||||
inherit (pkgs.gtkLibs) pango;
|
||||
};
|
||||
|
||||
koffice = newScope pkgs.kde4 ../applications/office/koffice { };
|
||||
|
||||
konq_plugins = newScope pkgs.kde4 ../applications/networking/browsers/konq-plugins { };
|
||||
|
||||
konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
|
||||
|
||||
krename = newScope pkgs.kde4 ../applications/misc/krename { };
|
||||
|
||||
krusader = newScope pkgs.kde4 ../applications/misc/krusader { };
|
||||
|
||||
ktorrent = newScope pkgs.kde4 ../applications/networking/ktorrent { };
|
||||
|
||||
lame = callPackage ../applications/audio/lame { };
|
||||
@ -6259,9 +6287,9 @@ let
|
||||
|
||||
viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
|
||||
{
|
||||
inherit
|
||||
monotone flup cheetahTemplate highlight ctags
|
||||
inherit monotone cheetahTemplate highlight ctags
|
||||
makeWrapper graphviz which python;
|
||||
flup = pythonPackages.flup;
|
||||
};
|
||||
|
||||
vim = callPackage ../applications/editors/vim { };
|
||||
@ -7003,7 +7031,7 @@ let
|
||||
tex = tetex;
|
||||
};
|
||||
|
||||
mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
|
||||
mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
|
||||
lua = lua5;
|
||||
inherit (pythonPackages) pexpect paramiko;
|
||||
};
|
||||
|
||||
@ -137,6 +137,8 @@ rec {
|
||||
|
||||
ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
|
||||
|
||||
ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
|
||||
|
||||
ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
|
||||
|
||||
ghcPaths_0_1_0_6 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {};
|
||||
@ -151,6 +153,14 @@ rec {
|
||||
network = network_2_2_1_7;
|
||||
};
|
||||
|
||||
glade = callPackage ../development/libraries/haskell/glade {
|
||||
inherit (pkgs) pkgconfig gnome glibc;
|
||||
};
|
||||
|
||||
glib = callPackage ../development/libraries/haskell/glib {
|
||||
inherit (pkgs) pkgconfig glib glibc;
|
||||
};
|
||||
|
||||
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
|
||||
|
||||
GLUT2121 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {
|
||||
@ -166,6 +176,11 @@ rec {
|
||||
inherit (pkgs.xlibs) libSM libICE libXmu libXi;
|
||||
};
|
||||
|
||||
gtk = callPackage ../development/libraries/haskell/gtk {
|
||||
inherit (pkgs) pkgconfig glibc;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
gtk2hs = callPackage ../development/libraries/haskell/gtk2hs {
|
||||
inherit (pkgs) pkgconfig gnome cairo;
|
||||
};
|
||||
@ -417,6 +432,11 @@ rec {
|
||||
random = random_newtime;
|
||||
};
|
||||
|
||||
pango = callPackage ../development/libraries/haskell/pango {
|
||||
inherit (pkgs) pkgconfig glibc;
|
||||
inherit (pkgs.gtkLibs) pango;
|
||||
};
|
||||
|
||||
parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {};
|
||||
|
||||
parallel = callPackage ../development/libraries/haskell/parallel {};
|
||||
@ -732,6 +752,8 @@ rec {
|
||||
|
||||
tar = callPackage ../development/tools/haskell/tar {};
|
||||
|
||||
threadscope = callPackage ../development/tools/haskell/threadscope {};
|
||||
|
||||
uuagc = callPackage ../development/tools/haskell/uuagc {};
|
||||
|
||||
# Applications.
|
||||
|
||||
@ -171,6 +171,20 @@ rec {
|
||||
};
|
||||
});
|
||||
|
||||
flup = buildPythonPackage (rec {
|
||||
name = "flup-1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
|
||||
sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "http://trac.saddi.com/flup";
|
||||
description = "FastCGI Python module set";
|
||||
};
|
||||
});
|
||||
|
||||
foolscap = buildPythonPackage (rec {
|
||||
name = "foolscap-0.5.1";
|
||||
|
||||
|
||||
@ -449,22 +449,6 @@ with (import ./release-lib.nix);
|
||||
kile = linux;
|
||||
};
|
||||
|
||||
kde44 = {
|
||||
krusader = linux;
|
||||
kmplayer = linux;
|
||||
ktorrent = linux;
|
||||
koffice = linux;
|
||||
konversation = linux;
|
||||
kdesvn = linux;
|
||||
amarok = linux;
|
||||
k3b = linux;
|
||||
l10n.ca = linux;
|
||||
l10n.de = linux;
|
||||
l10n.fr = linux;
|
||||
l10n.nl = linux;
|
||||
l10n.ru = linux;
|
||||
};
|
||||
|
||||
linuxPackages_2_6_27 = {
|
||||
aufs = linux;
|
||||
kernel = linux;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user