forked from mirrors/nixpkgs
stdenv-updates: merge updates from 'master' branch
This commit is contained in:
Peter Simons
commit
d5677fe6c7
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
*~
|
||||
,*
|
||||
|
|
@ -18,10 +18,10 @@ such as Perl or Haskell. These are described in this chapter.</para>
|
|||
<para>Nixpkgs provides a function <varname>buildPerlPackage</varname>,
|
||||
a generic package builder function for any Perl package that has a
|
||||
standard <varname>Makefile.PL</varname>. It’s implemented in <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
|
||||
|
||||
<para>Perl packages from CPAN are defined in <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></link>,
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></link>,
|
||||
rather than <filename>pkgs/all-packages.nix</filename>. Most Perl
|
||||
packages are so straight-forward to build that they are defined here
|
||||
directly, rather than having a separate function for each package
|
||||
|
|
@ -162,7 +162,7 @@ ClassC3Componentised = buildPerlPackage rec {
|
|||
which many Python packages do nowadays, can be built very simply using
|
||||
the <varname>buildPythonPackage</varname> function. This function is
|
||||
implemented
|
||||
in <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/python-modules/generic/default.nix"><filename>pkgs/development/python-modules/generic/default.nix</filename></link>
|
||||
in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix"><filename>pkgs/development/python-modules/generic/default.nix</filename></link>
|
||||
and works similarly to <varname>buildPerlPackage</varname>. (See
|
||||
<xref linkend="ssec-language-perl"/> for details.)
|
||||
</para>
|
||||
|
|
@ -170,7 +170,7 @@ ClassC3Componentised = buildPerlPackage rec {
|
|||
<para>
|
||||
Python packages that use <varname>buildPythonPackage</varname> are
|
||||
defined
|
||||
in <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>.
|
||||
in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>.
|
||||
Most of them are simple. For example:
|
||||
|
||||
<programlisting>
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ interpretation:</para>
|
|||
<alice@example.org>" "Bob <bob@example.com>"]</literal>. If
|
||||
you are the maintainer of multiple packages, you may want to add
|
||||
yourself to <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/lib/maintainers.nix"><filename>pkgs/lib/maintainers.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/lib/maintainers.nix"><filename>pkgs/lib/maintainers.nix</filename></link>
|
||||
and write something like <literal>[stdenv.lib.maintainers.alice
|
||||
stdenv.lib.maintainers.bob]</literal>.</para></listitem>
|
||||
</varlistentry>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Linux kernel or X.org.</para>
|
|||
<title>Linux kernel</title>
|
||||
|
||||
<para>The Nix expressions to build the Linux kernel are in <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.</para>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.</para>
|
||||
|
||||
<para>The function that builds the kernel has an argument
|
||||
<varname>kernelPatches</varname> which should be a list of
|
||||
|
|
@ -49,7 +49,7 @@ modulesTree = [kernel]
|
|||
<orderedlist>
|
||||
|
||||
<listitem>
|
||||
<para>Copy (<command>svn cp</command>) the old Nix expression
|
||||
<para>Copy the old Nix expression
|
||||
(e.g. <filename>linux-2.6.21.nix</filename>) to the new one
|
||||
(e.g. <filename>linux-2.6.22.nix</filename>) and update it.</para>
|
||||
</listitem>
|
||||
|
|
@ -69,7 +69,7 @@ modulesTree = [kernel]
|
|||
<orderedlist>
|
||||
|
||||
<listitem>
|
||||
<para>Make an <command>svn copy</command> from the old
|
||||
<para>Make an copy from the old
|
||||
config (e.g. <filename>config-2.6.21-i686-smp</filename>) to
|
||||
the new one
|
||||
(e.g. <filename>config-2.6.22-i686-smp</filename>).</para>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<para>Checkout the Nixpkgs source tree:
|
||||
|
||||
<screen>
|
||||
$ svn checkout https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
|
||||
$ git clone git://github.com/NixOS/nixpkgs.git
|
||||
$ cd nixpkgs</screen>
|
||||
|
||||
</para>
|
||||
|
|
@ -29,7 +29,7 @@ $ cd nixpkgs</screen>
|
|||
organisation. Create a directory for your package, e.g.
|
||||
|
||||
<screen>
|
||||
$ svn mkdir pkgs/development/libraries/libfoo</screen>
|
||||
$ mkdir pkgs/development/libraries/libfoo</screen>
|
||||
|
||||
</para>
|
||||
</listitem>
|
||||
|
|
@ -44,7 +44,7 @@ $ svn mkdir pkgs/development/libraries/libfoo</screen>
|
|||
|
||||
<screen>
|
||||
$ emacs pkgs/development/libraries/libfoo/default.nix
|
||||
$ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
||||
$ git add pkgs/development/libraries/libfoo/default.nix</screen>
|
||||
|
||||
</para>
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>GNU cpio: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
|
||||
The simplest possible package. The generic builder in
|
||||
<varname>stdenv</varname> does everything for you. It has
|
||||
no dependencies beyond <varname>stdenv</varname>.</para>
|
||||
|
|
@ -64,21 +64,21 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>GNU Hello: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
|
||||
Also trivial, but it specifies some <varname>meta</varname>
|
||||
attributes which is good practice.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>GNU Multiple Precision arithmetic library (GMP): <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/libraries/gmp/default.nix"><filename>pkgs/development/libraries/gmp/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/default.nix"><filename>pkgs/development/libraries/gmp/default.nix</filename></link>.
|
||||
Also done by the generic builder, but has a dependency on
|
||||
<varname>m4</varname>.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Pan, a GTK-based newsreader: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
|
||||
Has an optional dependency on <varname>gtkspell</varname>,
|
||||
which is only built if <varname>spellCheck</varname> is
|
||||
<literal>true</literal>.</para>
|
||||
|
|
@ -86,7 +86,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>Apache HTTPD: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix"><filename>pkgs/servers/http/apache-httpd/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/default.nix"><filename>pkgs/servers/http/apache-httpd/default.nix</filename></link>.
|
||||
A bunch of optional features, variable substitutions in the
|
||||
configure flags, a post-install hook, and miscellaneous
|
||||
hackery.</para>
|
||||
|
|
@ -94,9 +94,9 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>BitTorrent (wxPython-based): <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></link>.
|
||||
Uses an external <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
|
||||
script</link>, which can be useful if you have lots of code
|
||||
that you don’t want cluttering up the Nix expression. But
|
||||
external builders are mostly obsolete.
|
||||
|
|
@ -105,22 +105,22 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>Thunderbird: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/3.x.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/3.x.nix</filename></link>.
|
||||
Lots of dependencies.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>JDiskReport, a Java utility: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
|
||||
(and the <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
|
||||
Nixpkgs doesn’t have a decent <varname>stdenv</varname> for
|
||||
Java yet so this is pretty ad-hoc.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>XML::Simple, a Perl module: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
|
||||
(search for the <varname>XMLSimple</varname> attribute).
|
||||
Most Perl modules are so simple to build that they are
|
||||
defined directly in <filename>perl-packages.nix</filename>;
|
||||
|
|
@ -129,10 +129,10 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>Adobe Reader: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
|
||||
Shows how binary-only packages can be supported. In
|
||||
particular the <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
|
||||
uses <command>patchelf</command> to set the RUNPATH and ELF
|
||||
interpreter of the executables so that the right libraries
|
||||
are found at runtime.</para>
|
||||
|
|
@ -163,7 +163,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
<listitem>
|
||||
<para>A list of schemes for <literal>mirror://</literal>
|
||||
URLs can be found in <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
|
||||
</listitem>
|
||||
|
||||
</itemizedlist>
|
||||
|
|
@ -181,7 +181,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
<listitem>
|
||||
<para>Add a call to the function defined in the previous step to
|
||||
<link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
|
||||
with some descriptive name for the variable,
|
||||
e.g. <varname>libfoo</varname>.
|
||||
|
||||
|
|
@ -220,8 +220,7 @@ $ nix-env -f . -iA libfoo</screen>
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Optionally commit the new package (<command>svn
|
||||
ci</command>) or send a patch to
|
||||
<para>Optionally commit the new package, or send a patch to
|
||||
<literal>nix-dev@cs.uu.nl</literal>.</para>
|
||||
</listitem>
|
||||
|
||||
|
|
@ -230,7 +229,7 @@ $ nix-env -f . -iA libfoo</screen>
|
|||
package and make them available in the <link
|
||||
xlink:href="http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/"><literal>nixpkgs</literal>
|
||||
channel</link>, add it to <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
|
||||
</listitem>
|
||||
|
||||
</orderedlist>
|
||||
|
|
|
|||
|
|
@ -1,28 +1,30 @@
|
|||
{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
|
||||
, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
|
||||
, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
|
||||
, strigi, soprano }:
|
||||
, strigi, soprano, qjson, ffmpeg, libofa }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
pname = "amarok";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
|
||||
sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y";
|
||||
sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9";
|
||||
};
|
||||
|
||||
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
|
||||
patches = ./find-mysql.patch;
|
||||
buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl
|
||||
libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
|
||||
soprano qca2 libmtp liblastfm libgpod pkgconfig ];
|
||||
soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Popular music player for KDE";
|
||||
license = "GPL";
|
||||
|
|
|
|||
46
pkgs/applications/audio/amarok/find-mysql.patch
Normal file
46
pkgs/applications/audio/amarok/find-mysql.patch
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
commit 9979970f05f25329100168d85a5c4cdc8c084b7a
|
||||
Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
|
||||
Date: Thu Aug 30 12:32:53 2012 +0400
|
||||
|
||||
FindMySQLAmarok.cmake: use PATH_SUFFIXES
|
||||
|
||||
diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake
|
||||
index 910b434..4c8b8e8 100644
|
||||
--- a/cmake/modules/FindMySQLAmarok.cmake
|
||||
+++ b/cmake/modules/FindMySQLAmarok.cmake
|
||||
@@ -13,18 +13,17 @@
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
if(NOT WIN32)
|
||||
- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin)
|
||||
+ find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR})
|
||||
endif(NOT WIN32)
|
||||
|
||||
find_path(MYSQL_INCLUDE_DIR mysql.h
|
||||
- /opt/local/include/mysql5/mysql
|
||||
+ PATHS
|
||||
+ /opt/local/include
|
||||
/opt/mysql/mysql/include
|
||||
- /opt/mysqle/include/mysql
|
||||
- /opt/ports/include/mysql5/mysql
|
||||
- /usr/include/mysql
|
||||
- /usr/local/include/mysql
|
||||
- /usr/mysql/include/mysql
|
||||
- ~/usr/include/mysql
|
||||
+ /opt/mysqle/include
|
||||
+ /opt/ports/include
|
||||
+ /usr/mysql/include
|
||||
+ PATH_SUFFIXES mysql mysql5/mysql
|
||||
)
|
||||
|
||||
if(MYSQLCONFIG_EXECUTABLE)
|
||||
@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE)
|
||||
|
||||
find_library(MYSQLD_PIC_SEPARATE
|
||||
mysqld_pic
|
||||
- PATHS
|
||||
- /usr/lib/mysql
|
||||
+ PATH_SUFFIXES mysql
|
||||
)
|
||||
|
||||
if(MYSQLD_PIC_SEPARATE)
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
, fftwSinglePrec, flac, glib, glibmm, gtk, gtkmm, jackaudio
|
||||
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
|
||||
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
|
||||
, libusb, libuuid, libxml2, libxslt, makeWrapper, pango, perl, pkgconfig
|
||||
, python }:
|
||||
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
|
||||
, perl, pkgconfig, python, serd, sord, sratom, suil }:
|
||||
|
||||
let
|
||||
# Ardour 3 Beta 4a
|
||||
rev = "12406";
|
||||
# Ardour 3 Beta 5
|
||||
rev = "13072";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -16,14 +16,17 @@ stdenv.mkDerivation {
|
|||
src = fetchsvn {
|
||||
url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
|
||||
inherit rev;
|
||||
sha256 = "0a68xb3l36m5908y3airxw1b3bymhrjrf1l492mgcvviq6pn7pmk";
|
||||
sha256 = "17k990kdb5q17z6jcz5b60imvvfbjw9zfxzy9fk0vg8gd6yq7736";
|
||||
};
|
||||
|
||||
buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec
|
||||
flac glib glibmm gtk gtkmm jackaudio libgnomecanvas
|
||||
libgnomecanvasmm liblo libmad libogg librdf librdf_raptor
|
||||
librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid
|
||||
libxml2 libxslt pango perl pkgconfig python ];
|
||||
buildInputs =
|
||||
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec
|
||||
flac glib glibmm gtk gtkmm jackaudio libgnomecanvas
|
||||
libgnomecanvasmm liblo libmad libogg librdf librdf_raptor
|
||||
librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid
|
||||
libxml2 libxslt lilv lv2 pango perl pkgconfig python serd sord
|
||||
sratom suil
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc
|
||||
|
|
|
|||
22
pkgs/applications/audio/calf/default.nix
Normal file
22
pkgs/applications/audio/calf/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH
|
||||
, libglade, lv2, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calf-${version}";
|
||||
version = "0.0.18.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/calf/${name}.tar.gz";
|
||||
sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://calf.sourceforge.net;
|
||||
description = "A set of high quality open source audio plugins for musicians";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
{stdenv, fetchurl, unzip, portaudio }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "espeak-1.44.03";
|
||||
name = "espeak-1.46.02";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/espeak/espeak-1.44.03-source.zip;
|
||||
sha256 = "0lnv89xmsq3bax0qpabd0z2adaag7mdl973bkw3gdszidafmfyx4";
|
||||
url = mirror://sourceforge/espeak/espeak-1.46.02-source.zip;
|
||||
sha256 = "1fjlv5fm0gzvr5wzy1dp4nspw04k0bqv3jymha2p2qfjbfifp2zg";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip portaudio ];
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
|||
|
||||
configurePhase = ''
|
||||
cd src
|
||||
makeFlags="PREFIX=$out"
|
||||
makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
31
pkgs/applications/audio/espeak/edit.nix
Normal file
31
pkgs/applications/audio/espeak/edit.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{stdenv, fetchurl, unzip, portaudio, wxGTK}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "espeakedit-1.46.02";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/espeak/espeakedit-1.46.02.zip;
|
||||
sha256 = "1cc5r89sn8zz7b8wj4grx9xb7aqyi0ybj0li9hpy7hd67r56kqkl";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip portaudio wxGTK ];
|
||||
|
||||
patchPhase = if portaudio.api_version == 19 then ''
|
||||
cp src/portaudio19.h src/portaudio.h
|
||||
'' else "";
|
||||
|
||||
buildPhase = ''
|
||||
cd src
|
||||
gcc -o espeakedit *.cpp `wx-config --cxxflags --libs`
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp espeakedit $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Phoneme editor for espeak";
|
||||
homepage = http://espeak.sourceforge.net/;
|
||||
license = "GPLv3+";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,24 +1,25 @@
|
|||
{stdenv, fetchurl, libogg}:
|
||||
{ stdenv, fetchurl, libogg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flac-1.2.1";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/flac/flac-1.2.1.tar.gz;
|
||||
sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn";
|
||||
};
|
||||
|
||||
buildInputs = [libogg];
|
||||
buildInputs = [ libogg ];
|
||||
|
||||
patches =
|
||||
[ # Fix for building on GCC 4.3.
|
||||
(fetchurl {
|
||||
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
|
||||
sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
|
||||
})
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix for building on GCC 4.3.
|
||||
(fetchurl {
|
||||
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
|
||||
sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://flac.sourceforge.net;
|
||||
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
28
pkgs/applications/audio/jack-capture/default.nix
Normal file
28
pkgs/applications/audio/jack-capture/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jack_capture-${version}";
|
||||
version = "0.9.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz";
|
||||
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
|
||||
};
|
||||
|
||||
buildInputs = [ jackaudio libsndfile pkgconfig ];
|
||||
|
||||
buildPhase = "PREFIX=$out make jack_capture";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp jack_capture $out/bin/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A program for recording soundfiles with jack";
|
||||
homepage = http://archive.notam02.no/arkiv/src;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
29
pkgs/applications/audio/lastwatch/default.nix
Normal file
29
pkgs/applications/audio/lastwatch/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchgit, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "lastwatch-${version}";
|
||||
namePrefix = "";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/aszlig/LastWatch.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "c43f0fd87e9f3daafc7e8676daf2e89c8e21fbabc278eb1455e28d2997587a92";
|
||||
};
|
||||
|
||||
pythonPath = [
|
||||
pythonPackages.pyinotify
|
||||
pythonPackages.pylast
|
||||
pythonPackages.mutagen
|
||||
];
|
||||
|
||||
propagatedBuildInputs = pythonPath;
|
||||
|
||||
installCommand = "python setup.py install --prefix=$out";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/aszlig/LastWatch";
|
||||
description = "An inotify-based last.fm audio scrobbler";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
|
||||
, jackaudio, libgig, libsndfile, libtool , pkgconfig }:
|
||||
, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "linuxsampler-svn-${version}";
|
||||
|
|
@ -11,13 +11,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
|
||||
};
|
||||
|
||||
patchPhase = "sed -e 's/which/type -P/g' -i scripts/generate_parser.sh";
|
||||
patches = ./linuxsampler_lv2_sfz_fix.diff;
|
||||
|
||||
preConfigure = "make -f Makefile.cvs";
|
||||
preConfigure = ''
|
||||
sed -e 's/which/type -P/g' -i scripts/generate_parser.sh
|
||||
make -f Makefile.cvs
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
alsaLib asio autoconf automake bison jackaudio libgig libsndfile
|
||||
libtool pkgconfig
|
||||
libtool lv2 pkgconfig
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -34,7 +37,8 @@ stdenv.mkDerivation rec {
|
|||
have questions on the subject, that are not yet covered by the
|
||||
FAQ, please contact us.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
license = licenses.proprietary;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp
|
||||
===================================================================
|
||||
--- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359)
|
||||
+++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy)
|
||||
@@ -18,6 +18,8 @@
|
||||
* MA 02110-1301 USA *
|
||||
***************************************************************************/
|
||||
|
||||
+#define _BSD_SOURCE 1 /* for realpath() */
|
||||
+
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <cstdio>
|
||||
@@ -118,6 +120,23 @@
|
||||
dmsg(2, ("linuxsampler: Deactivate\n"));
|
||||
}
|
||||
|
||||
+ static String RealPath(const String& path)
|
||||
+ {
|
||||
+ String out = path;
|
||||
+ char* cpath = NULL;
|
||||
+#ifdef _WIN32
|
||||
+ cpath = (char*)malloc(MAX_PATH);
|
||||
+ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL);
|
||||
+#else
|
||||
+ cpath = realpath(path.c_str(), NULL);
|
||||
+#endif
|
||||
+ if (cpath) {
|
||||
+ out = cpath;
|
||||
+ free(cpath);
|
||||
+ }
|
||||
+ return out;
|
||||
+ }
|
||||
+
|
||||
String PluginLv2::PathToState(const String& path) {
|
||||
if (MapPath) {
|
||||
char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str());
|
||||
@@ -131,9 +150,10 @@
|
||||
String PluginLv2::PathFromState(const String& path) {
|
||||
if (MapPath) {
|
||||
char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str());
|
||||
- const String abstract_path(cstr);
|
||||
+ // Resolve symbolic links so SFZ sample paths load correctly
|
||||
+ const String absolute_path(RealPath(cstr));
|
||||
free(cstr);
|
||||
- return abstract_path;
|
||||
+ return absolute_path;
|
||||
}
|
||||
return path;
|
||||
}
|
||||
19
pkgs/applications/audio/mikmod/default.nix
Normal file
19
pkgs/applications/audio/mikmod/default.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ stdenv, fetchurl, libmikmod, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mikmod-3.2.2";
|
||||
src = fetchurl {
|
||||
url = "http://mikmod.shlomifish.org/files/${name}.tar.gz";
|
||||
sha256 = "105vl1kyah588wpbpq6ck1wlr0jj55l2ps72q5i01gs9px8ncmp8";
|
||||
};
|
||||
|
||||
buildInputs = [ libmikmod ncurses ];
|
||||
|
||||
meta = {
|
||||
description = "Tracker music player for the terminal";
|
||||
homepage = http://mikmod.shlomifish.org/;
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [ viric ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
name = "ncmpcpp-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2";
|
||||
url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2";
|
||||
sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx";
|
||||
};
|
||||
|
||||
|
|
|
|||
46
pkgs/applications/audio/picard/default.nix
Normal file
46
pkgs/applications/audio/picard/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ stdenv, fetchurl, pythonPackages, gettext, pyqt4
|
||||
, pkgconfig, libdiscid, libofa, ffmpeg }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "picard-${version}";
|
||||
namePrefix = "";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz";
|
||||
md5 = "57abb76632a423760f336ac11da5c149";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig
|
||||
ffmpeg
|
||||
libofa
|
||||
gettext
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pythonPackages.mutagen
|
||||
pyqt4
|
||||
libdiscid
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
python setup.py config
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
python setup.py build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
python setup.py install --prefix="$out"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
|
||||
description = "The official MusicBrainz tagger";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
26
pkgs/applications/audio/praat/default.nix
Normal file
26
pkgs/applications/audio/praat/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "praat-5323";
|
||||
src = fetchurl {
|
||||
url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz;
|
||||
sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
cp makefiles/makefile.defs.linux makefile.defs
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp praat $out/bin
|
||||
'';
|
||||
|
||||
buildInputs = [ alsaLib gtk pkgconfig ];
|
||||
|
||||
meta = {
|
||||
description = "Doing phonetics by computer";
|
||||
homepage = http://www.fon.hum.uva.nl/praat/;
|
||||
license = "GPLv2+"; # Has some 3rd-party code in it though
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +1,33 @@
|
|||
{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
|
||||
, fontconfig, freetype, pam, consolekit, dbus_libs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "slim-1.3.2";
|
||||
name = "slim-1.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.berlios.de/slim/${name}.tar.gz";
|
||||
sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi";
|
||||
sha256 = "00fmrg2v41jnqhx0yc1kv97xxh5gai18n0i4as9g1fcq1i32cp0m";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Allow the paths of the configuration file and theme directory to
|
||||
# be set at runtime.
|
||||
./runtime-paths.patch
|
||||
|
||||
# Fix a bug in slim's PAM support: the "resp" argument to the
|
||||
# conversation function is a pointer to a pointer to an array of
|
||||
# pam_response structures, not a pointer to an array of pointers to
|
||||
# pam_response structures. Of course C can't tell the difference...
|
||||
./pam.patch
|
||||
|
||||
# Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
|
||||
# (which assumes that a non-empty string means a remote session).
|
||||
./pam2.patch
|
||||
];
|
||||
|
||||
buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
|
||||
buildInputs =
|
||||
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
|
||||
pam dbus_libs
|
||||
] ++ stdenv.lib.optional (consolekit != null) consolekit;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
|
||||
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace Makefile --replace /usr /no-such-path
|
||||
makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc USE_PAM=1)
|
||||
'';
|
||||
cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1";
|
||||
|
||||
NIX_CFLAGS_LINK = "-lXmu";
|
||||
|
||||
meta = {
|
||||
homepage = http://slim.berlios.de;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,89 +0,0 @@
|
|||
diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp
|
||||
*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200
|
||||
--- slim-1.3.1/app.cpp 2009-02-17 19:50:06.000000000 +0100
|
||||
***************
|
||||
*** 41,48 ****
|
||||
Panel* panel = *static_cast<Panel**>(appdata_ptr);
|
||||
int result = PAM_SUCCESS;
|
||||
for (int i=0; i<num_msg; i++){
|
||||
! resp[i]->resp=0;
|
||||
! resp[i]->resp_retcode=0;
|
||||
switch(msg[i]->msg_style){
|
||||
case PAM_PROMPT_ECHO_ON:
|
||||
// We assume PAM is asking for the username
|
||||
--- 41,48 ----
|
||||
Panel* panel = *static_cast<Panel**>(appdata_ptr);
|
||||
int result = PAM_SUCCESS;
|
||||
for (int i=0; i<num_msg; i++){
|
||||
! (*resp)[i].resp=0;
|
||||
! (*resp)[i].resp_retcode=0;
|
||||
switch(msg[i]->msg_style){
|
||||
case PAM_PROMPT_ECHO_ON:
|
||||
// We assume PAM is asking for the username
|
||||
***************
|
||||
*** 51,63 ****
|
||||
case Panel::Suspend:
|
||||
case Panel::Halt:
|
||||
case Panel::Reboot:
|
||||
! resp[i]->resp=strdup("root");
|
||||
break;
|
||||
|
||||
case Panel::Console:
|
||||
case Panel::Exit:
|
||||
case Panel::Login:
|
||||
! resp[i]->resp=strdup(panel->GetName().c_str());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
--- 51,63 ----
|
||||
case Panel::Suspend:
|
||||
case Panel::Halt:
|
||||
case Panel::Reboot:
|
||||
! (*resp)[i].resp=strdup("root");
|
||||
break;
|
||||
|
||||
case Panel::Console:
|
||||
case Panel::Exit:
|
||||
case Panel::Login:
|
||||
! (*resp)[i].resp=strdup(panel->GetName().c_str());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
***************
|
||||
*** 73,79 ****
|
||||
|
||||
default:
|
||||
panel->EventHandler(Panel::Get_Passwd);
|
||||
! resp[i]->resp=strdup(panel->GetPasswd().c_str());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
--- 73,79 ----
|
||||
|
||||
default:
|
||||
panel->EventHandler(Panel::Get_Passwd);
|
||||
! (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
***************
|
||||
*** 89,97 ****
|
||||
}
|
||||
if (result!=PAM_SUCCESS){
|
||||
for (int i=0; i<num_msg; i++){
|
||||
! if (resp[i]->resp==0) continue;
|
||||
! free(resp[i]->resp);
|
||||
! resp[i]->resp=0;
|
||||
};
|
||||
free(*resp);
|
||||
*resp=0;
|
||||
--- 89,97 ----
|
||||
}
|
||||
if (result!=PAM_SUCCESS){
|
||||
for (int i=0; i<num_msg; i++){
|
||||
! if ((*resp)[i].resp==0) continue;
|
||||
! free((*resp)[i].resp);
|
||||
! (*resp)[i].resp=0;
|
||||
};
|
||||
free(*resp);
|
||||
*resp=0;
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp
|
||||
*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200
|
||||
--- slim-1.3.1/app.cpp 2009-08-17 02:59:37.000000000 +0200
|
||||
***************
|
||||
*** 226,232 ****
|
||||
pam.start("slim");
|
||||
pam.set_item(PAM::Authenticator::TTY, DisplayName);
|
||||
pam.set_item(PAM::Authenticator::Requestor, "root");
|
||||
! pam.set_item(PAM::Authenticator::Host, "localhost");
|
||||
|
||||
}
|
||||
catch(PAM::Exception& e){
|
||||
--- 226,232 ----
|
||||
pam.start("slim");
|
||||
pam.set_item(PAM::Authenticator::TTY, DisplayName);
|
||||
pam.set_item(PAM::Authenticator::Requestor, "root");
|
||||
! pam.set_item(PAM::Authenticator::Host, "");
|
||||
|
||||
}
|
||||
catch(PAM::Exception& e){
|
||||
|
|
@ -158,6 +158,20 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
eclipse_sdk_42 = buildEclipse {
|
||||
name = "eclipse-sdk-4.2";
|
||||
description = "Eclipse Classic";
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-SDK-4.2-linux-gtk-x86_64.tar.gz;
|
||||
sha256 = "1vcr49qm6rsbgzi9d43ggmby68pdigqcy55l5vy1gmixqks3g6s0";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-SDK-4.2-linux-gtk.tar.gz;
|
||||
sha256 = "1zlv80idkkdda05ks4biknbkczp24b2xki81ik5nygrjg29jqgnz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ assert (libXft != null) -> libpng != null; # probably a bug
|
|||
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emacs-24.1";
|
||||
name = "emacs-24.2";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${name}.tar.bz2";
|
||||
sha256 = "eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c";
|
||||
sha256 = "13wbjfjmz13qpjwssy44nw2230lllmkkgjsy0rqfm6am2cf87n3k";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "auto-complete-1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cx4a.org/pub/auto-complete/${name}.tar.bz2";
|
||||
sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
preInstall = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
installFlags = "DIR=$(out)/share/emacs/site-lisp";
|
||||
|
||||
postInstall = ''
|
||||
ln -s javascript-mode $out/share/emacs/site-lisp/ac-dict/js2-mode
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Auto-complete extension for Emacs";
|
||||
homepage = http://cx4a.org/software/auto-complete/;
|
||||
license = "GPLv3+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
30
pkgs/applications/editors/emacs-modes/coffee/default.nix
Normal file
30
pkgs/applications/editors/emacs-modes/coffee/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchgit, emacs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coffee-mode-0.4.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/defunkt/coffee-mode.git";
|
||||
rev = "c45c5f7a529363bc7aa57db0f3df26389fd233d8";
|
||||
sha256 = "36a7792b5ffbcc5a580e8d5b2425494c60a8015cfde0e3f8a946a685da231ce2";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs --batch -f batch-byte-compile coffee-mode.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install coffee-mode.el coffee-mode.elc $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An Emacs major mode for CoffeeScript, unfancy JavaScript.";
|
||||
homepage = https://github.com/defunkt/coffee-mode;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{stdenv, fetchurl, emacs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "color-theme-6.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz";
|
||||
sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn";
|
||||
};
|
||||
|
||||
# patches from http://aur.archlinux.org/packages.php?ID=54883
|
||||
patches = [ ./fix-build.patch ./gnus-bug.diff ];
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ];
|
||||
installTargets = "install-bin";
|
||||
|
||||
meta = {
|
||||
description = "An emacs-lisp mode for skinning your emacs.";
|
||||
homepage = http://www.nongnu.org/color-theme;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
--- a/Makefile 2009-05-15 18:22:49.000000000 +0200
|
||||
+++ b/Makefile 2009-05-16 08:59:36.000000000 +0200
|
||||
@@ -15,6 +15,7 @@
|
||||
TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
|
||||
MANUAL = color-theme
|
||||
MISC = AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in
|
||||
+LOADPATH = "$(shell pwd)" "$(shell pwd)/themes"
|
||||
#AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
|
||||
#ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
|
||||
#ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi
|
||||
@@ -47,7 +48,7 @@
|
||||
|
||||
%.elc: %.el
|
||||
@$(EMACS) $(OPTIONCOMPILE) \
|
||||
- --eval '(setq load-path (cons "." load-path))' \
|
||||
+ --eval '(setq load-path (append load-path (list $(LOADPATH))))' \
|
||||
-f batch-byte-compile $<
|
||||
|
||||
%.info: %.texi
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el
|
||||
--- color-theme-6.6.0.orig/color-theme.el 2011-11-18 01:17:29.000000000 +0100
|
||||
+++ color-theme-6.6.0.new/color-theme.el 2011-11-18 01:24:07.000000000 +0100
|
||||
@@ -73,9 +73,10 @@
|
||||
"Non-nil if running XEmacs.")
|
||||
|
||||
;; Add this since it appears to miss in emacs-2x
|
||||
-(or (fboundp 'replace-in-string)
|
||||
- (defun replace-in-string (target old new)
|
||||
- (replace-regexp-in-string old new target)))
|
||||
+(if (fboundp 'replace-in-string)
|
||||
+ (defalias 'color-theme-replace-in-string 'replace-in-string)
|
||||
+ (defsubst color-theme-replace-in-string (target old new &optional literal)
|
||||
+ (replace-regexp-in-string old new target nil literal)))
|
||||
|
||||
;; face-attr-construct has a problem in Emacs 20.7 and older when
|
||||
;; dealing with inverse-video faces. Here is a short test to check
|
||||
@@ -1626,8 +1627,8 @@
|
||||
(add-to-list 'color-themes
|
||||
(list ',n
|
||||
(upcase-initials
|
||||
- (replace-in-string
|
||||
- (replace-in-string
|
||||
+ (color-theme-replace-in-string
|
||||
+ (color-theme-replace-in-string
|
||||
(symbol-name ',n) "^color-theme-" "") "-" " "))
|
||||
,author))
|
||||
(defun ,n ()
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flymake-cursor-0.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
|
||||
sha256 = "1wxqqmn2fk2b778nksvgn1mi7ajarcpc5lla90xx9jwz47d9hx02";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase"];
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp $src flymake-cursor.el
|
||||
emacs --batch -f batch-byte-compile flymake-cursor.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install flymake-cursor.el flymake-cursor.elc $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Displays flymake error msg in minibuffer after delay.";
|
||||
homepage = http://www.emacswiki.org/emacs/flymake-cursor.el;
|
||||
license = stdenv.lib.licenses.publicDomain;
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
31
pkgs/applications/editors/emacs-modes/gh/default.nix
Normal file
31
pkgs/applications/editors/emacs-modes/gh/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, fetchgit, emacs, pcache, logito }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gh-0.5.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sigma/gh.el.git";
|
||||
rev = "ef03b63d063ec22f03af449aa955c98dfad7f80e";
|
||||
sha256 = "efa231e0091e8c7785385149dc97b2d8dc24aba65f4b0974b8ed7f62b7596ad3";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
propagatedUserEnvPkgs = [ pcache logito ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i Makefile \
|
||||
-e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \
|
||||
-e "s|/usr/local|$out|" \
|
||||
-e "s|/site-lisp/\$(PKGNAME)|/site-lisp|"
|
||||
'';
|
||||
|
||||
buildPhase = "make lisp";
|
||||
|
||||
meta = {
|
||||
description = "A (very early) GitHub client library for Emacs";
|
||||
homepage = https://github.com/sigma/gh.el;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
36
pkgs/applications/editors/emacs-modes/gist/default.nix
Normal file
36
pkgs/applications/editors/emacs-modes/gist/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ stdenv, fetchgit, emacs, gh, pcache, logito }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gist-1.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sigma/gist.el.git";
|
||||
rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed";
|
||||
sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs -L ${gh}/share/emacs/site-lisp \
|
||||
-L ${pcache}/share/emacs/site-lisp \
|
||||
-L ${logito}/share/emacs/site-lisp \
|
||||
--eval '(setq user-emacs-directory "./")' \
|
||||
--batch -f batch-byte-compile gist.el
|
||||
'';
|
||||
|
||||
propagatedUserEnvPkgs = [ gh pcache logito ];
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install gist.el gist.elc $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Emacs integration for gist.github.com";
|
||||
homepage = https://github.com/sigma/gist.el;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchgit, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "haskell-mode-2.8.0.29-g7682f99";
|
||||
name = "haskell-mode-2.8.0.29-gae3e4499d2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://github.com/haskell/haskell-mode.git";
|
||||
rev = "7682f991acd63d9400597d5f4980f62d7b1c4c0b";
|
||||
sha256 = "f4508a11fa65ece237c9ee9f623bc4e9ad3d3d58ab2fcacc8ddb080c29aac717";
|
||||
rev = "ae3e4499d27a1468bdf88ffe0ce15cd7e4bb9f2a";
|
||||
sha256 = "29a1725da620c13ff2b3b56906e76dd9f19317eee92bd5750b3aa9a4264effae";
|
||||
};
|
||||
|
||||
buildInputs = [emacs];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "htmlize-1.37";
|
||||
name = "htmlize-1.40";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
|
||||
sha256 = "70cf41a2ea6a478a45143a8cd672381c01ed894448200e602531acbf2b1fd160";
|
||||
sha256 = "1v7pzif5b7dr6iyllqvzka8i6s23rsjdnmilnma054gv8d4shw6a";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
30
pkgs/applications/editors/emacs-modes/jade/default.nix
Normal file
30
pkgs/applications/editors/emacs-modes/jade/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchgit, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "jade-mode-0-20120802";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/brianc/jade-mode.git";
|
||||
rev = "275ab149edb0f6bcfae6ac17ba456f3351191604";
|
||||
sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs --batch -L . -f batch-byte-compile *.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
cp *.el *.elc $out/share/emacs/site-lisp/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Emacs major mode for jade and stylus.";
|
||||
homepage = https://github.com/brianc/jade-mode;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchgit, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "js2-mode-0-20120601";
|
||||
name = "js2-mode-0-20120712";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/mooz/js2-mode.git";
|
||||
rev = "81bcbf7df7077db27facf0470cf9e31c18b8333e";
|
||||
sha256 = "1bec62816ec9d5f5882832902020573d95d038fff25b17bf1975b84a3ab535c3";
|
||||
rev = "f8cb9c52614e0a8e477f1ac557585ed950246c9b";
|
||||
sha256 = "37055b7e8c1d9eee6b86f6b9b9d74ad196cc43701bc2263ffd539a3e44025047";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
|
|
|||
30
pkgs/applications/editors/emacs-modes/logito/default.nix
Normal file
30
pkgs/applications/editors/emacs-modes/logito/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchgit, emacs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "logito-0.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sigma/logito.git";
|
||||
rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052";
|
||||
sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs --batch -f batch-byte-compile logito.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install logito.el logito.elc $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "tiny logging framework for Emacs";
|
||||
homepage = https://github.com/sigma/logito;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lorem-ipsum-0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.emacswiki.org/emacs/download/lorem-ipsum.el";
|
||||
sha256 = "122d0z3xqfaikgk34l7bh989mfxddin2ljinysp2lqw8djfi7jsl";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase"];
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp $src lorem-ipsum.el
|
||||
emacs --batch -f batch-byte-compile lorem-ipsum.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install lorem-ipsum.el lorem-ipsum.elc $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Insert dummy pseudo Latin text for emacs.";
|
||||
homepage = http://www.emacswiki.org/emacs/LoremIpsum;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +1,24 @@
|
|||
{ fetchurl, stdenv, emacs, texinfo, which }:
|
||||
{ fetchurl, stdenv, emacs, texinfo, which, texLive }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "org-7.8.03";
|
||||
name = "org-7.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/${name}.tar.gz";
|
||||
sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958";
|
||||
sha256 = "0kz1dnzfpmmslwal150z9rxrnddjpaw2glx26qihpxzs0zzpw201";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs texinfo ];
|
||||
|
||||
patchPhase =
|
||||
'' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g'
|
||||
'';
|
||||
buildInputs = [ emacs ];
|
||||
buildNativeInputs = [ texinfo texLive ];
|
||||
|
||||
configurePhase =
|
||||
'' sed -i Makefile \
|
||||
-e "s|^prefix=.*$|prefix=$out|g"
|
||||
'' sed -i mk/default.mk \
|
||||
-e "s|^prefix\t=.*$|prefix=$out|g"
|
||||
'';
|
||||
|
||||
#XXX: fails because of missing UTILITIES/manfull.pl, currently not
|
||||
# included in the release tarball, but git.
|
||||
|
||||
#postBuild =
|
||||
# '' make doc
|
||||
# '';
|
||||
postBuild =
|
||||
'' make doc
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
'' make install install-info
|
||||
|
|
|
|||
31
pkgs/applications/editors/emacs-modes/org2blog/default.nix
Normal file
31
pkgs/applications/editors/emacs-modes/org2blog/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, fetchgit, emacs, xmlRpc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "org2blog-0.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/punchagan/org2blog.git;
|
||||
rev = "338abe30e9bc89684f8384f8deaf826b63844da6";
|
||||
sha256 = "46ab31e90d0d54071c126b7d5599a3e82062baa79ddf26b988bcb88d306d6827";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
propagatedUserEnvPkgs = [ xmlRpc ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el* $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A tool to publish directly from Emacs’ org-mode to WordPress blogs.";
|
||||
homepage = https://github.com/punchagan/org2blog;
|
||||
license = "GPLv3+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
30
pkgs/applications/editors/emacs-modes/pcache/default.nix
Normal file
30
pkgs/applications/editors/emacs-modes/pcache/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchgit, emacs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pcache-0.2.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sigma/pcache.git";
|
||||
rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6";
|
||||
sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs --batch -f batch-byte-compile pcache.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install pcache.el pcache.elc $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Persistent caching for Emacs";
|
||||
homepage = https://github.com/sigma/pcache.el;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
32
pkgs/applications/editors/emacs-modes/rect-mark/default.nix
Normal file
32
pkgs/applications/editors/emacs-modes/rect-mark/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{stdenv, fetchurl, emacs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rect-mark-1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://emacswiki.org/emacs/download/rect-mark.el";
|
||||
sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase"];
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp $src rect-mark.el
|
||||
emacs --batch -f batch-byte-compile rect-mark.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install rect-mark.el* $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mark a rectangle of text with highlighting.";
|
||||
homepage = http://emacswiki.org/emacs/RectangleMark;
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
{stdenv, fetchgit, emacs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sunrise-commander-6r435";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/escherdragon/sunrise-commander.git;
|
||||
rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1";
|
||||
sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el* $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Two-pane file manager for Emacs based on Dired and inspired by MC.";
|
||||
homepage = http://www.emacswiki.org/emacs/Sunrise_Commander;
|
||||
license = "GPLv3+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
32
pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
Normal file
32
pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{stdenv, fetchurl, emacs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xml-rpc-1.6.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://launchpadlibrarian.net/40270196/xml-rpc.el;
|
||||
sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase"];
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp $src xml-rpc.el
|
||||
emacs --batch -f batch-byte-compile xml-rpc.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install xml-rpc.el* $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An elisp implementation of clientside XML-RPC.";
|
||||
homepage = https://launchpad.net/xml-rpc-el;
|
||||
license = "GPLv3+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
{stdenv, fetchurl} :
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "joe-3.3";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "joe-3.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/joe-editor/joe-3.3.tar.gz;
|
||||
md5 = "02221716679c039c5da00c275d61dbf4";
|
||||
url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
|
||||
sha256 = "0vqhffdjn3xwsfa383i6kdrpfwilq8b382ljjhy1v32smphmdr6a";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -3,18 +3,26 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
pname = "kdevelop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
|
||||
sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
|
||||
sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs";
|
||||
};
|
||||
|
||||
buildInputs = [ kdevplatform kdebase_workspace okteta ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
|
||||
|
||||
patches =
|
||||
[ ( fetchurl {
|
||||
url = https://git.reviewboard.kde.org/r/105211/diff/raw/;
|
||||
name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x
|
||||
sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0";
|
||||
} )
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
|
||||
perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
|
||||
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
|
||||
mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :
|
||||
mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cinepaint-1.0";
|
||||
|
|
@ -12,15 +12,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng
|
||||
buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
|
||||
libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
|
||||
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
|
||||
libXext libXpm libXxf86vm pixman libpthreadstubs
|
||||
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
|
||||
];
|
||||
|
||||
patches = [ ./install.patch ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I.";
|
||||
NIX_LDFLAGS = "-llcms -ljpeg";
|
||||
|
||||
# NIX_CFLAGS_COMPILE = "-I.";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.cinepaint.org/;
|
||||
|
|
|
|||
24
pkgs/applications/graphics/cinepaint/install.patch
Normal file
24
pkgs/applications/graphics/cinepaint/install.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index dfb182f..5adaaa5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX})
|
||||
# Note that for MacOS this needs to be revised
|
||||
# for the @OSX_ICC...@ variables
|
||||
ADD_CUSTOM_COMMAND(
|
||||
- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
|
||||
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc
|
||||
COMMAND sed -e s/\@platform\@//g
|
||||
-e s/\@prefix\@/${ESCAPEDPREFIX}/g
|
||||
-e s/\@exec_prefix\@/\${prefix}/g
|
||||
@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND(
|
||||
|
||||
ADD_CUSTOM_TARGET(RCFile ALL echo
|
||||
""
|
||||
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
|
||||
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/gimprc
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, freetype
|
||||
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
|
||||
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
|
||||
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl
|
||||
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
pkgconfig gtk freetype fontconfig
|
||||
libart_lgpl libtiff libjpeg libpng libexif zlib perl
|
||||
perlXMLParser python pygtk gettext intltool babl gegl
|
||||
libart_lgpl libtiff libjpeg libpng12 libexif zlib perl
|
||||
perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22
|
||||
];
|
||||
|
||||
passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "meshlab-1.2.3a";
|
||||
name = "meshlab-1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/meshlab/MeshLabSrc_AllInc_v123a.tgz;
|
||||
sha256 = "09w42q0x1yjr7l9ng952lic7vkb1arsvqg1fld5s297zwzfmsl9v";
|
||||
url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz";
|
||||
sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1";
|
||||
};
|
||||
|
||||
# I don't know why I need this; without this, the rpath set at the beginning of the
|
||||
|
|
@ -13,13 +13,16 @@ stdenv.mkDerivation rec {
|
|||
dontPatchELF = true;
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p "$out/include"
|
||||
cp -r vcglib "$out/include"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include/vcglib"
|
||||
export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS"
|
||||
cd meshlab/src
|
||||
pushd external
|
||||
qmake -recursive external.pro
|
||||
make
|
||||
popd
|
||||
qmake -recursive meshlabv12.pro
|
||||
qmake -recursive meshlab_full.pro
|
||||
make
|
||||
'';
|
||||
|
||||
|
|
@ -31,6 +34,8 @@ stdenv.mkDerivation rec {
|
|||
ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
|
||||
'';
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
buildInputs = [ qt unzip ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
26
pkgs/applications/graphics/rapcad/default.nix
Normal file
26
pkgs/applications/graphics/rapcad/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{stdenv, fetchgit, qt4, cgal, boost, gmp, mpfr, flex, bison, dxflib}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.0";
|
||||
name = "rapcad-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.rapcad.org/rapcad";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7";
|
||||
};
|
||||
|
||||
buildInputs = [qt4 cgal boost gmp mpfr flex bison dxflib];
|
||||
|
||||
configurePhase = ''
|
||||
qmake;
|
||||
sed -e "s@/usr/@$out/@g" -i $(find . -name Makefile)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [raskin];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
description = ''Constructive solid geometry package'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,35 +1,23 @@
|
|||
{ stdenv, fetchsvn, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau,
|
||||
libXdmcp, lcms, libiptcdata
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
|
||||
, libXdmcp, lcms2, libiptcdata
|
||||
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rawtherapee-svn-25";
|
||||
name = "rawtherapee-4.0.9";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://rawtherapee.googlecode.com/svn/trunk";
|
||||
rev = 25;
|
||||
sha256 = "09jg47rs09lly70x1zlrb3qcwi2rry1m7gjzs39iqzp53hi9j9mh";
|
||||
src = fetchurl {
|
||||
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz;
|
||||
sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
|
||||
lcms libiptcdata ];
|
||||
|
||||
# Rawtherapee died if the default setting for the icc directory pointed to a
|
||||
# non existant place
|
||||
patchPhase = ''
|
||||
sed -i s,/usr/share/color/icc,/tmp/, rtgui/options.cc
|
||||
'';
|
||||
lcms2 libiptcdata mercurial ];
|
||||
|
||||
# Disable the use of the RAWZOR propietary libraries
|
||||
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
cp rtgui/rt $out/bin
|
||||
# Weird kind of path reference
|
||||
cp -r ../release/* $out/bin
|
||||
cp rtengine/*.so $out/lib
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "RAW converter and digital photo processing software";
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
|
|||
python, zlib, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "blender-2.62";
|
||||
name = "blender-2.63a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
||||
sha256 = "19xfr5vx66p4p3hnqpglpky6f4bh3ay484mdgh7zg6j9f80dp53q";
|
||||
sha256 = "c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
|
||||
|
||||
meta = {
|
||||
meta = {
|
||||
description = "3D Creation/Animation/Publishing System";
|
||||
homepage = http://www.blender.org;
|
||||
# They comment two licenses: GPLv2 and Blender License, but they
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, libX11, libXinerama}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dmenu-4.4.1";
|
||||
name = "dmenu-4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/tools/${name}.tar.gz";
|
||||
sha256 = "0l25vdnzlslk0r4m6hjkzxdygh3wpq04b9mr8zc9h3b1md2icr3d";
|
||||
sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXinerama ];
|
||||
|
|
@ -20,3 +20,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = with stdenv.lib.platforms; all;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "eaglemode-0.83.0";
|
||||
name = "eaglemode-0.84.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
|
||||
sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3";
|
||||
url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2;
|
||||
sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs";
|
||||
};
|
||||
|
||||
buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig
|
||||
|
|
@ -14,9 +14,12 @@ stdenv.mkDerivation {
|
|||
|
||||
# The program tries to dlopen both Xxf86vm and Xext, so we use the
|
||||
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.
|
||||
# I use 'yes y' to skip a build error linking with xineLib,
|
||||
# because xine stopped exporting "_x_vo_new_port"
|
||||
# http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
|
||||
buildPhase = ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
|
||||
yes n | perl make.pl build
|
||||
yes y | perl make.pl build
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
|
|
|||
26
pkgs/applications/misc/girara/default.nix
Normal file
26
pkgs/applications/misc/girara/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "girara-0.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
|
||||
sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk gettext ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
meta = {
|
||||
homepage = http://pwmt.org/projects/girara/;
|
||||
description = "User interface library";
|
||||
longDescription = ''
|
||||
girara is a library that implements a GTK+ based VIM-like user interface
|
||||
that focuses on simplicity and minimalism.
|
||||
'';
|
||||
license = "free";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,15 +1,19 @@
|
|||
{ fetchurl, stdenv, zlib, expat }:
|
||||
{ fetchurl, stdenv, zlib, expat, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpsbabel-1.3.6";
|
||||
let version = "1.4.3"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "gpsbabel-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.gpsbabel.org/plan9.php?dl=${name}.tar.gz";
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "1dm9lpcdsj0vz699zz932xc1vphvap627wl0qp61izlkzh25vg88";
|
||||
# gpgbabel.org makes it hard to get the source tarball automatically, so
|
||||
# get it from elsewhere.
|
||||
url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
|
||||
sha256 = "1s31xa36ivf836h89m1f3qiaz3c3znvqjdm0bnh8vr2jjlrz9jdi";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib expat ];
|
||||
# FIXME: Would need libxml2 for one of the tests, but that in turns require
|
||||
# network access for the XML schemas.
|
||||
buildInputs = [ zlib expat which ];
|
||||
|
||||
/* FIXME: Building the documentation, with "make doc", requires this:
|
||||
|
||||
|
|
@ -17,7 +21,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
But FOP isn't packaged yet. */
|
||||
|
||||
configureFlags = "--with-zlib=system";
|
||||
preConfigure = "cd gpsbabel";
|
||||
configureFlags = [ "--with-zlib=system" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs";
|
||||
|
|
@ -44,5 +51,8 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.gpsbabel.org/;
|
||||
|
||||
license = "GPLv2+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
|
|
|
|||
24
pkgs/applications/misc/gxneur/default.nix
Normal file
24
pkgs/applications/misc/gxneur/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gxneur-0.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2;
|
||||
sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
|
||||
libglade GConf pcre
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
sed -e 's@-Werror@@' -i configure
|
||||
sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GUI for XNEUR keyboard layout switcher";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hello-2.7";
|
||||
name = "hello-2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/hello/${name}.tar.gz";
|
||||
sha256 = "1h17p5lgg47lbr2cnp4qqkr0q0f0rpffyzmvs7bvc6vdrxdknngx";
|
||||
sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,32 +1,51 @@
|
|||
{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML
|
||||
{ stdenv, fetchurl, perl, gettext, makeWrapper, PerlMagick, YAML
|
||||
, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate
|
||||
, CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
|
||||
, YAMLLibYAML
|
||||
, YAMLLibYAML, which, HTMLTree, AuthenPassphrase, NetOpenIDConsumer
|
||||
, LWPxParanoidAgent, CryptSSLeay
|
||||
, gitSupport ? false, git ? null
|
||||
, docutilsSupport ? false, python ? null, docutils ? null
|
||||
, monotoneSupport ? false, monotone ? null
|
||||
, bazaarSupport ? false, bazaar ? null
|
||||
, cvsSupport ? false, cvs ? null, cvsps ? null, Filechdir ? null
|
||||
, subversionSupport ? false, subversion ? null
|
||||
, mercurialSupport ? false, mercurial ? null
|
||||
, extraUtils ? []
|
||||
}:
|
||||
|
||||
assert docutilsSupport -> (python != null && docutils != null);
|
||||
assert gitSupport -> (git != null);
|
||||
assert monotoneSupport -> (monotone != null);
|
||||
assert bazaarSupport -> (bazaar != null);
|
||||
assert cvsSupport -> (cvs != null && cvsps != null && Filechdir != null);
|
||||
assert subversionSupport -> (subversion != null);
|
||||
assert mercurialSupport -> (mercurial != null);
|
||||
|
||||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20120516";
|
||||
version = "3.20120725";
|
||||
|
||||
lib = stdenv.lib;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
|
||||
sha256 = "b75097d4f4db79a16f8b74bc4e7f824a586e0e150ecf18103888bbe553a41eb0";
|
||||
sha256 = "b600096a77b17e4a9e8a9552c4d36e01ed9217a0f8ff8a4f15110cf80e7adfad";
|
||||
};
|
||||
|
||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
|
||||
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML ]
|
||||
++ stdenv.lib.optionals gitSupport [git]
|
||||
++ stdenv.lib.optionals monotoneSupport [monotone];
|
||||
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase
|
||||
NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]
|
||||
++ lib.optionals docutilsSupport [python docutils]
|
||||
++ lib.optionals gitSupport [git]
|
||||
++ lib.optionals monotoneSupport [monotone]
|
||||
++ lib.optionals bazaarSupport [bazaar]
|
||||
++ lib.optionals cvsSupport [cvs cvsps Filechdir]
|
||||
++ lib.optionals subversionSupport [subversion]
|
||||
++ lib.optionals mercurialSupport [mercurial];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
|
||||
|
|
@ -42,17 +61,31 @@ stdenv.mkDerivation {
|
|||
postInstall = ''
|
||||
for a in "$out/bin/"*; do
|
||||
wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
|
||||
${lib.optionalString gitSupport
|
||||
''--prefix PATH : ${git}/bin \''}
|
||||
${lib.optionalString monotoneSupport
|
||||
''--prefix PATH : ${monotone}/bin \''}
|
||||
${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''}
|
||||
${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''}
|
||||
${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''}
|
||||
${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
|
||||
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
|
||||
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion}/bin \''}
|
||||
${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''}
|
||||
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
|
||||
done
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Git needs some help figuring this out during test suite run.
|
||||
export EMAIL="nobody@example.org"
|
||||
'';
|
||||
|
||||
checkTarget = "test";
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Wiki compiler, storing pages and history in a RCS";
|
||||
homepage = http://ikiwiki.info/;
|
||||
homepage = "http://ikiwiki.info/";
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,27 @@
|
|||
# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
|
||||
{ fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig
|
||||
, libX11, qt
|
||||
, libX11, qt4, enchant #, mythes, boost
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
name = "lyx-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
|
||||
sha256 = "1j2sl22w41h4vrgnxv2n0s7d11k6zchjbggjw3ai9yxcahvrj72f";
|
||||
sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8";
|
||||
};
|
||||
|
||||
buildInputs = [texLive qt python makeWrapper pkgconfig ];
|
||||
configureFlags = [
|
||||
#"--without-included-boost"
|
||||
/* Boost is a huge dependency from which 1.4 MB of libs would be used.
|
||||
Using internal boost stuff only increases executable by around 0.2 MB. */
|
||||
#"--without-included-mythes" # such a small library isn't worth a split package
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
texLive qt4 python makeWrapper pkgconfig
|
||||
enchant # mythes boost
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{ cabal, ConfigFile, filepath, HStringTemplate, HUnit, pandoc
|
||||
, pandocTypes, SHA, testFramework, testFrameworkHunit, time
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mathblog";
|
||||
version = "0.5";
|
||||
sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA
|
||||
testFramework testFrameworkHunit time
|
||||
];
|
||||
meta = {
|
||||
description = "A program for creating and managing a static weblog with LaTeX math and function graphs";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
23
pkgs/applications/misc/st/default.nix
Normal file
23
pkgs/applications/misc/st/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl, libX11, ncurses}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "st-0.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://hg.suckless.org/st/archive/0.2.1.tar.gz;
|
||||
sha256 = "15yqyys69ifjc4vrzvamrg7x0pwa60mnjpi0kap4y9ykhds83xab";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ncurses ];
|
||||
|
||||
installPhase = ''
|
||||
TERMINFO=$out/share/terminfo make install PREFIX=$out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://st.suckless.org/;
|
||||
license = "MIT";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "surf-${version}";
|
||||
version="0.4.1";
|
||||
version="0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
|
||||
sha256 = "0im5psjw0r8av3zjyy2wqcl6y5ylwnrab5kfcwc23bsbx2irnw4k";
|
||||
sha256 = "19qfkwdk6p5hcwnnplscp1kmypz74mga7x6iqy6w3g18s221f2mx";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk webkit pkgconfig glib libsoup ];
|
||||
|
|
|
|||
|
|
@ -1,19 +1,27 @@
|
|||
{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl
|
||||
, gpsd, bc, file }:
|
||||
, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
|
||||
, docbook_xml_dtd_412 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "viking-0.9.8";
|
||||
let version = "1.3"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "viking-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/viking/${name}.tar.gz";
|
||||
sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d";
|
||||
url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz";
|
||||
sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./test-bc.patch ./gpsdclient.patch ./implicit-declaration.patch
|
||||
];
|
||||
buildInputs =
|
||||
[ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
|
||||
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412
|
||||
];
|
||||
|
||||
buildInputs = [ pkgconfig intltool gettext gtk expat curl gpsd bc file ];
|
||||
configureFlags = [ "--disable-scrollkeeper" ];
|
||||
|
||||
preBuild =
|
||||
'' sed -i help/Makefile \
|
||||
-e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
Debian patch that allows compilation with libgps (from `gpsd').
|
||||
Failing to apply this patch, we get the following error:
|
||||
|
||||
vikgpslayer.c:237: error: field 'realtime_gpsd_unit' has incomplete type
|
||||
vikgpslayer.c: In function 'vik_gps_layer_new':
|
||||
vikgpslayer.c:473: warning: implicit declaration of function 'gpsd_units'
|
||||
vikgpslayer.c: In function 'rt_gpsd_try_connect':
|
||||
vikgpslayer.c:1321: warning: passing argument 2 of 'gps_set_raw_hook' from incompatible pointer type
|
||||
|
||||
diff -urNad trunk~/src/gpsdclient.h trunk/src/gpsdclient.h
|
||||
--- trunk~/src/gpsdclient.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ trunk/src/gpsdclient.h 2009-04-15 14:30:22.000000000 +0200
|
||||
@@ -0,0 +1,25 @@
|
||||
+/* $Id: gpsdclient.h 5330 2009-03-03 04:05:42Z ckuethe $ */
|
||||
+/* gpsdclient.h -- common functions for GPSD clients */
|
||||
+
|
||||
+#ifndef _GPSD_GPSDCLIENT_H_
|
||||
+#define _GPSD_GPSDCLIENT_H_
|
||||
+struct fixsource_t
|
||||
+/* describe a data source */
|
||||
+{
|
||||
+ char *spec; /* pointer to actual storage */
|
||||
+ char *server;
|
||||
+ char *port;
|
||||
+ char *device;
|
||||
+};
|
||||
+
|
||||
+enum unit {unspecified, imperial, nautical, metric};
|
||||
+enum unit gpsd_units(void);
|
||||
+enum deg_str_type { deg_dd, deg_ddmm, deg_ddmmss };
|
||||
+
|
||||
+extern /*@observer@*/ char *deg_to_str( enum deg_str_type type, double f);
|
||||
+
|
||||
+extern void gpsd_source_spec(/*@null@*/const char *fromstring,
|
||||
+ /*@out@*/struct fixsource_t *source);
|
||||
+
|
||||
+#endif /* _GPSDCLIENT_H_ */
|
||||
+/* gpsdclient.h ends here */
|
||||
diff -urNad trunk~/src/vikgpslayer.c trunk/src/vikgpslayer.c
|
||||
--- trunk~/src/vikgpslayer.c 2009-02-08 14:47:01.000000000 +0100
|
||||
+++ trunk/src/vikgpslayer.c 2009-04-15 14:30:55.000000000 +0200
|
||||
@@ -39,6 +39,9 @@
|
||||
#include <glib/gi18n.h>
|
||||
#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
|
||||
#include <gps.h>
|
||||
+#ifndef gpsd_units
|
||||
+#include "gpsdclient.h"
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#if ! GLIB_CHECK_VERSION(2,14,0)
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
Debian patch that fixes an implicat declaration.
|
||||
|
||||
diff -urNad trunk~/src/util.c trunk/src/util.c
|
||||
--- trunk~/src/util.c 2009-02-08 14:47:01.000000000 +0100
|
||||
+++ trunk/src/util.c 2009-04-15 17:23:44.000000000 +0200
|
||||
@@ -26,6 +26,7 @@
|
||||
#endif
|
||||
|
||||
#include <glib/gi18n.h>
|
||||
+#include <glib/gprintf.h>
|
||||
|
||||
#include "dialog.h"
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
For some reason, `bc -l' yields no output.
|
||||
|
||||
--- viking-0.9.8/test/check_degrees_conversions.sh 2008-03-15 23:01:48.000000000 +0100
|
||||
+++ viking-0.9.8/test/check_degrees_conversions.sh 2009-05-30 23:23:27.000000000 +0200
|
||||
@@ -7,7 +7,7 @@ function check_success()
|
||||
for value in "$@"
|
||||
do
|
||||
result=`./degrees_converter "$value" | cut -d' ' -f3`
|
||||
- diff=`echo "$result - $expected" | bc -l`
|
||||
+ diff=`echo "$result - $expected" | bc`
|
||||
if [ $diff != 0 ]
|
||||
then
|
||||
echo "$value -> $result != $expected"
|
||||
@@ -23,7 +23,7 @@ function check_failure()
|
||||
for value in "$@"
|
||||
do
|
||||
result=`./degrees_converter "$value" | cut -d' ' -f3`
|
||||
- diff=`echo "$result - $expected" | bc -l`
|
||||
+ diff=`echo "$result - $expected" | bc`
|
||||
if [ $diff = 0 ]
|
||||
then
|
||||
echo "$value -> $result = $expected"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? true
|
||||
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
|
||||
, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null
|
||||
, base14Fonts ? null
|
||||
}:
|
||||
|
|
@ -7,6 +7,8 @@ assert enableGUI -> x11 != null && motif != null && freetype != null;
|
|||
assert enablePDFtoPPM -> freetype != null;
|
||||
assert useT1Lib -> t1lib != null;
|
||||
|
||||
assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xpdf-3.03";
|
||||
|
||||
|
|
|
|||
11
pkgs/applications/misc/zathura/builder.sh
Normal file
11
pkgs/applications/misc/zathura/builder.sh
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
source $stdenv/setup
|
||||
|
||||
mkdir -pv $out/bin/
|
||||
|
||||
cat > $out/bin/zathura <<EOF
|
||||
#!/bin/sh
|
||||
exec $zathura --plugins-dir=$plugins_path "\$@"
|
||||
EOF
|
||||
|
||||
chmod 755 $out/bin/zathura
|
||||
|
||||
29
pkgs/applications/misc/zathura/core/default.nix
Normal file
29
pkgs/applications/misc/zathura/core/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "0.1.2";
|
||||
|
||||
name = "zathura-core-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
|
||||
sha256 = "a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk girara gettext ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
meta = {
|
||||
homepage = http://pwmt.org/projects/zathura/;
|
||||
description = "A core component for zathura PDF viewer";
|
||||
license = "free";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
# Set lower priority in order to provide user with a wrapper script called
|
||||
# 'zathura' instead of real zathura executable. The wrapper will build
|
||||
# plugin path argument before executing the original.
|
||||
priority = 1;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,27 +1,41 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, poppler }:
|
||||
{ callPackage, pkgs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zathura-0.0.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/download/${name}.tar.gz";
|
||||
sha256 = "03iq6n7bpgrkq3l8b2ab3flcfxrqpxc1f3ycn31xr2b6bjwi72qn";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk poppler ];
|
||||
rec {
|
||||
inherit (pkgs) stdenv;
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
meta = {
|
||||
homepage = https://pwmt.org/zathura/;
|
||||
description = "A highly customizable and functional PDF viewer";
|
||||
longDescription = ''
|
||||
Zathura is a highly customizable and functional PDF viewer based on the
|
||||
poppler rendering library and the gtk+ toolkit. The idea behind zathura
|
||||
is an application that provides a minimalistic and space saving interface
|
||||
as well as an easy usage that mainly focuses on keyboard interaction.
|
||||
'';
|
||||
license = "free";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
zathura_core = callPackage ./core { };
|
||||
|
||||
zathura_pdf_poppler = callPackage ./pdf-poppler { };
|
||||
|
||||
zathura_djvu = callPackage ./djvu { };
|
||||
|
||||
zathura_ps = callPackage ./ps { };
|
||||
|
||||
zathuraWrapper = stdenv.mkDerivation rec {
|
||||
|
||||
name = "zathura-0.1.2";
|
||||
|
||||
plugins_path = stdenv.lib.makeSearchPath "lib" [
|
||||
zathura_pdf_poppler
|
||||
zathura_djvu
|
||||
zathura_ps
|
||||
];
|
||||
|
||||
zathura = "${zathura_core}/bin/zathura";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
meta = {
|
||||
homepage = http://pwmt.org/projects/zathura/;
|
||||
description = "A highly customizable and functional PDF viewer";
|
||||
longDescription = ''
|
||||
Zathura is a highly customizable and functional PDF viewer based on the
|
||||
poppler rendering library and the gtk+ toolkit. The idea behind zathura
|
||||
is an application that provides a minimalistic and space saving interface
|
||||
as well as an easy usage that mainly focuses on keyboard interaction.
|
||||
'';
|
||||
license = "free";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
28
pkgs/applications/misc/zathura/djvu/default.nix
Normal file
28
pkgs/applications/misc/zathura/djvu/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zathura-djvu-0.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
|
||||
sha256 = "04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];
|
||||
|
||||
patches = [ ./gtkflags.patch ];
|
||||
|
||||
makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
|
||||
|
||||
meta = {
|
||||
homepage = http://pwmt.org/projects/zathura/;
|
||||
description = "A zathura DJVU plugin";
|
||||
longDescription = ''
|
||||
The zathura-djvu plugin adds DjVu support to zathura by using the
|
||||
djvulibre library.
|
||||
'';
|
||||
license = "free";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
23
pkgs/applications/misc/zathura/djvu/gtkflags.patch
Normal file
23
pkgs/applications/misc/zathura/djvu/gtkflags.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
--- a/config.mk 2012-05-14 01:13:09.009740082 +0400
|
||||
+++ b/config.mk 2012-05-14 01:13:50.400525700 +0400
|
||||
@@ -11,6 +11,9 @@
|
||||
LIBDIR ?= ${PREFIX}/lib
|
||||
|
||||
# libs
|
||||
+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
|
||||
+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0)
|
||||
+
|
||||
CAIRO_INC ?= $(shell pkg-config --cflags cairo)
|
||||
CAIRO_LIB ?= $(shell pkg-config --libs cairo)
|
||||
|
||||
@@ -29,8 +32,8 @@
|
||||
PLUGINDIR = ${LIBDIR}/zathura
|
||||
endif
|
||||
|
||||
-INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC}
|
||||
-LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB}
|
||||
+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC} ${GTK_INC}
|
||||
+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${GTK_LIB}
|
||||
|
||||
# flags
|
||||
CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
|
||||
25
pkgs/applications/misc/zathura/pdf-poppler/default.nix
Normal file
25
pkgs/applications/misc/zathura/pdf-poppler/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zathura-pdf-poppler-0.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
|
||||
sha256 = "bec5fee721fcaee9f4b53d3882908b19efa82815393aa8c3619ff948b909d4a7";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
|
||||
|
||||
makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
|
||||
|
||||
meta = {
|
||||
homepage = http://pwmt.org/projects/zathura/;
|
||||
description = "A zathura PDF plugin";
|
||||
longDescription = ''
|
||||
The zathura-pdf-poppler plugin adds PDF support to zathura by
|
||||
using the poppler rendering engine.
|
||||
'';
|
||||
license = "free";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
28
pkgs/applications/misc/zathura/ps/default.nix
Normal file
28
pkgs/applications/misc/zathura/ps/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zathura-ps-0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
|
||||
sha256 = "1669fd11e436636cdedb2cde206b562f4f9c666cea9773f6f2014e765fd62789";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ];
|
||||
|
||||
patches = [ ./gtkflags.patch ];
|
||||
|
||||
makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
|
||||
|
||||
meta = {
|
||||
homepage = http://pwmt.org/projects/zathura/;
|
||||
description = "A zathura PS plugin";
|
||||
longDescription = ''
|
||||
The zathura-ps plugin adds PS support to zathura by using the
|
||||
libspectre library.
|
||||
'';
|
||||
license = "free";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
25
pkgs/applications/misc/zathura/ps/gtkflags.patch
Normal file
25
pkgs/applications/misc/zathura/ps/gtkflags.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/config.mk b/config.mk.new
|
||||
index c3a7b37..0cbce67 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -10,6 +10,9 @@ ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERS
|
||||
PREFIX ?= /usr
|
||||
|
||||
# libs
|
||||
+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
|
||||
+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0)
|
||||
+
|
||||
CAIRO_INC ?= $(shell pkg-config --cflags cairo)
|
||||
CAIRO_LIB ?= $(shell pkg-config --libs cairo)
|
||||
|
||||
@@ -26,8 +29,8 @@ ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
|
||||
PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
|
||||
PLUGINDIR ?= ${PREFIX}/lib/zathura
|
||||
|
||||
-INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC}
|
||||
-LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB}
|
||||
+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} ${GTK_INC}
|
||||
+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${GTK_LIB}
|
||||
|
||||
# flags
|
||||
CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
|
||||
|
|
@ -26,9 +26,10 @@ let
|
|||
mkConfigurable = stdenv.lib.mapAttrs (flag: default: getConfig ["chromium" flag] default);
|
||||
|
||||
config = mkConfigurable {
|
||||
channel = "stable";
|
||||
selinux = false;
|
||||
nacl = false;
|
||||
openssl = true;
|
||||
openssl = false;
|
||||
gnome = false;
|
||||
gnomeKeyring = false;
|
||||
proprietaryCodecs = true;
|
||||
|
|
@ -36,7 +37,7 @@ let
|
|||
pulseaudio = getConfig ["pulseaudio"] true;
|
||||
};
|
||||
|
||||
sourceInfo = import ./source.nix;
|
||||
sourceInfo = builtins.getAttr config.channel (import ./sources.nix);
|
||||
|
||||
mkGypFlags = with stdenv.lib; let
|
||||
sanitize = value:
|
||||
|
|
@ -55,7 +56,7 @@ let
|
|||
use_system_libpng = true;
|
||||
use_system_libxml = true;
|
||||
use_system_speex = true;
|
||||
use_system_ssl = true;
|
||||
use_system_ssl = config.openssl;
|
||||
use_system_stlport = true;
|
||||
use_system_xdg_utils = true;
|
||||
use_system_yasm = true;
|
||||
|
|
@ -76,6 +77,22 @@ let
|
|||
xdg_utils yasm zlib
|
||||
];
|
||||
|
||||
seccompPatch = let
|
||||
pre22 = stdenv.lib.versionOlder sourceInfo.version "22.0.0.0";
|
||||
in if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch;
|
||||
|
||||
# XXX: this reverts r151720 to prevent http://crbug.com/143623
|
||||
maybeRevertZlibChanges = let
|
||||
below22 = stdenv.lib.versionOlder sourceInfo.version "22.0.0.0";
|
||||
patch = fetchurl {
|
||||
name = "revert-r151720";
|
||||
url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;"
|
||||
+ "hp=4419ec6414b33b6b19bb2e380b4998ed5193ecab;"
|
||||
+ "h=0fabb4fda7059a8757422e8a44e70deeab28e698";
|
||||
sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf";
|
||||
};
|
||||
in stdenv.lib.optional (!below22) patch;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${packageName}-${version}";
|
||||
packageName = "chromium";
|
||||
|
|
@ -107,9 +124,10 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
prePatch = "patchShebangs .";
|
||||
|
||||
patches = stdenv.lib.optional (!config.selinux) ./enable_seccomp.patch
|
||||
patches = stdenv.lib.optional (!config.selinux) seccompPatch
|
||||
++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch
|
||||
++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch;
|
||||
++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch
|
||||
++ maybeRevertZlibChanges;
|
||||
|
||||
postPatch = stdenv.lib.optionalString config.openssl ''
|
||||
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
|
||||
|
|
@ -166,6 +184,7 @@ in stdenv.mkDerivation rec {
|
|||
mkdir -vp "$out/libexec/${packageName}"
|
||||
cp -v "out/${buildType}/"*.pak "$out/libexec/${packageName}/"
|
||||
cp -vR "out/${buildType}/locales" "out/${buildType}/resources" "$out/libexec/${packageName}/"
|
||||
cp -v out/${buildType}/libffmpegsumo.so "$out/libexec/${packageName}/"
|
||||
|
||||
cp -v "out/${buildType}/chrome" "$out/libexec/${packageName}/${packageName}"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc
|
||||
index d4618e5..108f846 100644
|
||||
--- a/content/common/sandbox_linux.cc
|
||||
+++ b/content/common/sandbox_linux.cc
|
||||
@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) {
|
||||
// Implement the command line enabling logic for seccomp-legacy.
|
||||
bool IsSeccompLegacyDesired() {
|
||||
#if defined(SECCOMP_SANDBOX)
|
||||
-#if defined(NDEBUG)
|
||||
- // Off by default; allow turning on with a switch.
|
||||
- return CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
- switches::kEnableSeccompSandbox);
|
||||
-#else
|
||||
// On by default; allow turning off with a switch.
|
||||
return !CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
switches::kDisableSeccompSandbox);
|
||||
-#endif // NDEBUG
|
||||
#endif // SECCOMP_SANDBOX
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
version = "21.0.1179.1";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1179.1.tar.bz2";
|
||||
sha256 = "1ynm1dv8nwjg6a0absid1g3r62y0mpb74pmal8g9nmqb92rlkdnc";
|
||||
}
|
||||
18
pkgs/applications/networking/browsers/chromium/sources.nix
Normal file
18
pkgs/applications/networking/browsers/chromium/sources.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
dev = {
|
||||
version = "23.0.1255.0";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1255.0.tar.bz2";
|
||||
sha256 = "12ks55mn6nahdzd5kgiwi9m2cfivb0pwj963g8d4kmdbw5bg017g";
|
||||
};
|
||||
beta = {
|
||||
version = "22.0.1229.39";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.39.tar.bz2";
|
||||
sha256 = "0v0yz9lkr9xdzh6660y9n2z8m1075ls2r3svafcfa80pq18chzfd";
|
||||
};
|
||||
stable = {
|
||||
version = "21.0.1180.89";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.89.tar.bz2";
|
||||
sha256 = "1i9mjbjj3aywg03hd59m9j5gq5b5fl8nvw56g47q8s9k1bcsik0n";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,34 +1,113 @@
|
|||
#!/bin/sh
|
||||
|
||||
channels_url="http://omahaproxy.appspot.com/";
|
||||
bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/";
|
||||
output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix";
|
||||
|
||||
get_newest_version()
|
||||
nix_getattr()
|
||||
{
|
||||
curl -s "$bucket_url" | sed -ne ' H;/<[Kk][Ee][Yy]>chromium-[^<]*</h;${
|
||||
g;s/^.*<Key>chromium-\([^<.]\+\(\.[^<.]\+\)\+\)\.tar\.bz2<.*$/\1/p
|
||||
}';
|
||||
input_file="$1";
|
||||
attr="$2";
|
||||
|
||||
var="$(nix-instantiate --eval-only -A "$attr" "$output_file")";
|
||||
echo "$var" | tr -d '\\"';
|
||||
}
|
||||
|
||||
### poor mans key/value-store :-) ###
|
||||
|
||||
ver_sha_table=""; # list of version:sha256
|
||||
|
||||
sha_lookup()
|
||||
{
|
||||
version="$1";
|
||||
|
||||
for ver_sha in $ver_sha_table;
|
||||
do
|
||||
if [ "x${ver_sha%:*}" = "x$version" ];
|
||||
then
|
||||
echo "${ver_sha##*:}";
|
||||
return 0;
|
||||
fi;
|
||||
done;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
sha_insert()
|
||||
{
|
||||
version="$1";
|
||||
sha256="$2";
|
||||
|
||||
ver_sha_table="$ver_sha_table $version:$sha256";
|
||||
}
|
||||
|
||||
if [ -e "$output_file" ];
|
||||
then
|
||||
get_sha256()
|
||||
{
|
||||
channel="$1";
|
||||
version="$2";
|
||||
url="$3";
|
||||
|
||||
oldver="$(nix_getattr "$output_file" "$channel.version")";
|
||||
|
||||
echo -n "Checking if $oldver ($channel) is up to date..." >&2;
|
||||
|
||||
if [ "x$version" != "x$oldver" ];
|
||||
then
|
||||
echo " no, getting sha256 for new version $version:" >&2;
|
||||
sha256="$(nix-prefetch-url "$url")";
|
||||
else
|
||||
echo " yes, keeping old sha256." >&2;
|
||||
sha256="$(nix_getattr "$output_file" "$channel.sha256")";
|
||||
fi;
|
||||
|
||||
sha_insert "$version" "$sha256"
|
||||
echo "$sha256";
|
||||
}
|
||||
else
|
||||
get_sha256()
|
||||
{
|
||||
nix-prefetch-url "$url";
|
||||
}
|
||||
fi;
|
||||
|
||||
get_channel_exprs()
|
||||
{
|
||||
for chline in $(echo "$1" | cut -d, -f-2);
|
||||
do
|
||||
channel="${chline%%,*}";
|
||||
version="${chline##*,}";
|
||||
url="${bucket_url%/}/chromium-$version.tar.bz2";
|
||||
|
||||
echo -n "Checking if sha256 of version $version is cached..." >&2;
|
||||
if sha256="$(sha_lookup "$version")";
|
||||
then
|
||||
echo " yes: $sha256" >&2;
|
||||
else
|
||||
echo " no." >&2;
|
||||
sha256="$(get_sha256 "$channel" "$version" "$url")";
|
||||
fi;
|
||||
|
||||
sha_insert "$version" "$sha256";
|
||||
|
||||
echo " $channel = {";
|
||||
echo " version = \"$version\";";
|
||||
echo " url = \"$url\";";
|
||||
echo " sha256 = \"$sha256\";";
|
||||
echo " };";
|
||||
done;
|
||||
}
|
||||
|
||||
cd "$(dirname "$0")";
|
||||
|
||||
version="$(get_newest_version)";
|
||||
omaha="$(curl -s "$channels_url")";
|
||||
versions="$(echo "$omaha" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')";
|
||||
channel_exprs="$(get_channel_exprs "$versions")";
|
||||
|
||||
if [ -e source.nix ]; then
|
||||
oldver="$(sed -n 's/^ *version *= *"\([^"]\+\)".*$/\1/p' source.nix)";
|
||||
if [ "x$oldver" = "x$version" ]; then
|
||||
echo "Already the newest version: $version" >&2;
|
||||
exit 1;
|
||||
fi;
|
||||
fi;
|
||||
|
||||
url="${bucket_url%/}/chromium-$version.tar.bz2";
|
||||
|
||||
sha256="$(nix-prefetch-url "$url")";
|
||||
|
||||
cat > source.nix <<EOF
|
||||
cat > "$output_file" <<-EOF
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
version = "$version";
|
||||
url = "$url";
|
||||
sha256 = "$sha256";
|
||||
$channel_exprs
|
||||
}
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ rec {
|
|||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
# "--with-system-nss"
|
||||
"--with-system-nss"
|
||||
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
|
||||
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
|
||||
"--enable-system-sqlite"
|
||||
|
|
@ -54,7 +54,7 @@ rec {
|
|||
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
|
||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip
|
||||
];
|
||||
|
|
@ -129,7 +129,7 @@ rec {
|
|||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
||||
xlibs.pixman yasm mesa sqlite file unzip
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ rec {
|
|||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
# "--with-system-nss"
|
||||
"--with-system-nss"
|
||||
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
|
||||
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
|
||||
"--enable-system-sqlite"
|
||||
|
|
@ -54,7 +54,7 @@ rec {
|
|||
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
|
||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||
];
|
||||
|
|
@ -136,7 +136,7 @@ rec {
|
|||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
||||
xlibs.pixman yasm mesa sqlite file unzip
|
||||
];
|
||||
|
||||
|
|
|
|||
179
pkgs/applications/networking/browsers/firefox/15.0.nix
Normal file
179
pkgs/applications/networking/browsers/firefox/15.0.nix
Normal file
|
|
@ -0,0 +1,179 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
|
||||
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
|
||||
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||
|
||||
, # If you want the resulting program to call itself "Firefox" instead
|
||||
# of "Shiretoko" or whatever, enable this option. However, those
|
||||
# binaries may not be distributed without permission from the
|
||||
# Mozilla Foundation, see
|
||||
# http://www.mozilla.org/foundation/trademarks/.
|
||||
enableOfficialBranding ? false
|
||||
}:
|
||||
|
||||
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
||||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "15.0";
|
||||
|
||||
xulVersion = "15.0"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha256 = "12f7dgcksb9d79hj0a8lxn3s81id6l2gd1pb7ls4d60kmgbg05jl";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
[ "--enable-optimize"
|
||||
"--disable-debug"
|
||||
"--enable-strip"
|
||||
"--with-system-jpeg"
|
||||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
"--with-system-nss"
|
||||
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
|
||||
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
|
||||
"--enable-system-sqlite"
|
||||
"--disable-crashreporter"
|
||||
"--disable-tests"
|
||||
"--disable-necko-wifi" # maybe we want to enable this at some point
|
||||
"--disable-installer"
|
||||
"--disable-updater"
|
||||
];
|
||||
|
||||
|
||||
xulrunner = stdenv.mkDerivation rec {
|
||||
name = "xulrunner-${xulVersion}";
|
||||
|
||||
inherit src;
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=xulrunner"
|
||||
"--disable-javaxpcom"
|
||||
] ++ commonConfigureFlags;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
|
||||
|
||||
mkdir ../objdir
|
||||
cd ../objdir
|
||||
configureScript=../mozilla-release/configure
|
||||
''; # */
|
||||
|
||||
#installFlags = "SKIP_GRE_REGISTRATION=1";
|
||||
|
||||
postInstall = ''
|
||||
# Fix run-mozilla.sh search
|
||||
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
|
||||
echo libDir: $libDir
|
||||
test -n "$libDir"
|
||||
cd $out/bin
|
||||
rm xulrunner
|
||||
|
||||
for i in $out/lib/$libDir/*; do
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
|
||||
chmod a+x "$out/bin/$(basename "$i")";
|
||||
fi;
|
||||
done
|
||||
for i in $out/lib/$libDir/*.so; do
|
||||
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
|
||||
done
|
||||
for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
|
||||
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
|
||||
done
|
||||
rm -f $out/bin/run-mozilla.sh
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Firefox XUL runner";
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
};
|
||||
|
||||
passthru = { inherit gtk; version = xulVersion; };
|
||||
};
|
||||
|
||||
|
||||
firefox = stdenv.mkDerivation rec {
|
||||
name = "firefox-${firefoxVersion}";
|
||||
|
||||
inherit src;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
||||
xlibs.pixman yasm mesa sqlite file unzip pysqlite
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [xulrunner];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=browser"
|
||||
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
|
||||
"--enable-chrome-format=jar"
|
||||
"--disable-elf-hack"
|
||||
]
|
||||
++ commonConfigureFlags
|
||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
||||
|
||||
makeFlags = [
|
||||
"SYSTEM_LIBXUL=1"
|
||||
];
|
||||
|
||||
# Hack to work around make's idea of -lbz2 dependency
|
||||
preConfigure =
|
||||
''
|
||||
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
|
||||
stdenv.lib.concatStringsSep ":"
|
||||
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
|
||||
}' ';'
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
|
||||
for j in $out/bin/*; do
|
||||
i="$(readlink "$j")";
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
rm "$out/bin/$(basename "$i")"
|
||||
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
|
||||
chmod a+x "$out/bin/$(basename "$i")"
|
||||
fi;
|
||||
done;
|
||||
cd "$out/lib/"firefox-*
|
||||
rm firefox
|
||||
echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
|
||||
chmod a+x firefox
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Firefox - the browser, reloaded";
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit gtk xulrunner nspr;
|
||||
isFirefox3Like = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -31,7 +31,7 @@ rec {
|
|||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
#"--with-system-nss"
|
||||
"--with-system-nss"
|
||||
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
|
||||
"--enable-system-cairo"
|
||||
#"--enable-system-sqlite" # <-- this seems to be discouraged
|
||||
|
|
@ -59,7 +59,7 @@ rec {
|
|||
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr /* nss */ libnotify xlibs.pixman
|
||||
alsaLib nspr nss libnotify xlibs.pixman
|
||||
];
|
||||
|
||||
preConfigure = if stdenv.isMips then ''
|
||||
|
|
@ -118,7 +118,7 @@ rec {
|
|||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
||||
xlibs.pixman
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
|
||||
, libpng12, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
|
||||
, dbus_glib, alsaLib, pulseaudio, udev
|
||||
, dbus_glib, alsaLib, pulseaudio, udev, pango
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin";
|
||||
|
||||
rpathPlugin = makeLibraryPath
|
||||
[ mesa
|
||||
xorg.libXt
|
||||
|
|
@ -35,32 +37,32 @@ let
|
|||
dbus_glib
|
||||
udev
|
||||
curl
|
||||
pango
|
||||
cairo
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "google-talk-plugin-2.9.10.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "google-talk-plugin-${version}";
|
||||
version = "3.5.1.0";
|
||||
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
|
||||
sha256 = "1dma067h7qj8rbcnm0n7wy3wd1clkysq9xj4kaxijbb5zrw06k3q";
|
||||
url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
|
||||
sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm";
|
||||
sha256 = "02ymhhbfby0sn9132cvdr6jp9c7sk6hfg0jwg1fc3kzjg7q3y7fs";
|
||||
url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
|
||||
sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57";
|
||||
}
|
||||
else throw "Google Talk does not support your platform.";
|
||||
|
||||
buildInputs = [ rpm cpio ];
|
||||
|
||||
unpackPhase =
|
||||
''
|
||||
rpm2cpio $src | cpio -i --make-directories -v
|
||||
'';
|
||||
unpackPhase = ''
|
||||
ar p "$src" data.tar.gz | tar xz
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
''
|
||||
|
|
|
|||
|
|
@ -9,22 +9,22 @@
|
|||
assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null;
|
||||
|
||||
let
|
||||
mirror = ftp://ftp.ussg.iu.edu/pub/opera;
|
||||
mirror = http://get.geo.opera.com/pub/opera;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opera-11.64-1403";
|
||||
name = "opera-12.00-1467";
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "${mirror}/linux/1164/${name}.i386.linux.tar.xz";
|
||||
sha256 = "8b7998586b1b3f8f5722beef7ebb621c0f15915c260b096249e9db5973e30d82";
|
||||
url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz";
|
||||
sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "${mirror}/linux/1164/${name}.x86_64.linux.tar.xz";
|
||||
sha256 = "3b2012cbab826a04417deb56b85d8d31f9c17130071304736bcfa572f78b4c69";
|
||||
url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz";
|
||||
sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051";
|
||||
}
|
||||
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ stdenv, fetchurl, kdelibs, gettext, pkgconfig }:
|
||||
{ stdenv, fetchurl, kdelibs, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rekonq-0.9.0-1";
|
||||
name = "rekonq-1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sf/rekonq/${name}.tar.bz2";
|
||||
sha256 = "0vri6wdxxi7qkcjpgvscwa7m3ysy62jns924d07arvy8bmg5whc5";
|
||||
url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
|
||||
sha256 = "1bs733mwyfb7bxnial8n49b82ip04sark2mxwlq7ixxsbgq7972l";
|
||||
};
|
||||
|
||||
buildInputs = [ kdelibs ];
|
||||
buildInputs = [ kdelibs qca2 qoauth ];
|
||||
|
||||
buildNativeInputs = [ gettext pkgconfig ];
|
||||
buildNativeInputs = [ gettext pkgconfig shared_desktop_ontologies ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
{ stdenv, fetchurl
|
||||
, sslSupport ? true
|
||||
, graphicsSupport ? false
|
||||
, mouseSupport ? false
|
||||
, ncurses, openssl ? null, boehmgc, gettext, zlib
|
||||
, imlib2 ? null, x11 ? null
|
||||
, imlib2 ? null, x11 ? null, fbcon ? null
|
||||
, gpm ? null
|
||||
}:
|
||||
|
||||
assert sslSupport -> openssl != null;
|
||||
assert graphicsSupport -> x11 != null;
|
||||
assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);
|
||||
assert mouseSupport -> gpm != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "w3m-0.5.3";
|
||||
|
|
@ -22,11 +25,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ncurses boehmgc gettext zlib]
|
||||
++ stdenv.lib.optional sslSupport openssl
|
||||
++ stdenv.lib.optionals graphicsSupport [imlib2 x11];
|
||||
++ stdenv.lib.optional mouseSupport gpm
|
||||
++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];
|
||||
|
||||
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}";
|
||||
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
|
||||
+ stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path
|
||||
substituteInPlace ./configure --replace /usr /no-such-path
|
||||
'';
|
||||
|
||||
|
|
|
|||
51
pkgs/applications/networking/cluster/hadoop/default.nix
Normal file
51
pkgs/applications/networking/cluster/hadoop/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ stdenv, fetchurl, makeWrapper, which, jre, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "hadoop-2.0.1-alpha";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz";
|
||||
sha256 = "4e5f4fa1574ee58fd6d59a220b66578fc2cf62c229120eeed07f2880c86f0e59";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
buildPhase = ''
|
||||
for n in "bin/"* "sbin/"*; do
|
||||
sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|"
|
||||
done
|
||||
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" bin/container-executor
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mv *.txt share/doc/hadoop/
|
||||
mv * $out
|
||||
|
||||
for n in $out/{bin,sbin}"/"*; do
|
||||
wrapProgram $n --prefix PATH : "${which}/bin:${jre}/bin:${bash}/bin" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://hadoop.apache.org/";
|
||||
description = "framework for distributed processing of large data sets across clusters of computers";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
|
||||
longDescription = ''
|
||||
The Apache Hadoop software library is a framework that allows for
|
||||
the distributed processing of large data sets across clusters of
|
||||
computers using a simple programming model. It is designed to
|
||||
scale up from single servers to thousands of machines, each
|
||||
offering local computation and storage. Rather than rely on
|
||||
hardware to deliver high-avaiability, the library itself is
|
||||
designed to detect and handle failures at the application layer,
|
||||
so delivering a highly-availabile service on top of a cluster of
|
||||
computers, each of which may be prone to failures.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, openssl, curl }:
|
||||
{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "esniper-2.27.0";
|
||||
|
|
@ -10,8 +10,12 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [openssl curl];
|
||||
|
||||
# Add support for CURL_CA_BUNDLE variable.
|
||||
patches = [ ./find-ca-bundle.patch ];
|
||||
|
||||
postInstall = ''
|
||||
sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe"
|
||||
sed <"frontends/snipe" >"$out/bin/snipe" \
|
||||
-e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin:${which}/bin:\$PATH\""
|
||||
chmod 555 "$out/bin/snipe"
|
||||
'';
|
||||
|
||||
|
|
@ -24,5 +28,3 @@ stdenv.mkDerivation {
|
|||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
26
pkgs/applications/networking/esniper/find-ca-bundle.patch
Normal file
26
pkgs/applications/networking/esniper/find-ca-bundle.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff -ubr '--exclude=*.o' esniper-2-27-0-orig/http.c esniper-2-27-0-patched/http.c
|
||||
--- esniper-2-27-0-orig/http.c 2012-02-06 22:04:06.000000000 +0100
|
||||
+++ esniper-2-27-0-patched/http.c 2012-07-27 10:54:20.893054646 +0200
|
||||
@@ -200,6 +200,9 @@
|
||||
int
|
||||
initCurlStuff(void)
|
||||
{
|
||||
+ /* Path to OpenSSL bundle file. */
|
||||
+ const char *ssl_capath=NULL;
|
||||
+
|
||||
/* list for custom headers */
|
||||
struct curl_slist *slist=NULL;
|
||||
|
||||
@@ -241,6 +244,12 @@
|
||||
if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, "")))
|
||||
return initCurlStuffFailed();
|
||||
|
||||
+ /* If the environment variable CURL_CA_BUNDLE is set, pass through its
|
||||
+ * contents to curl. */
|
||||
+ if ((ssl_capath = getenv("CURL_CA_BUNDLE")))
|
||||
+ if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_CAINFO, ssl_capath)))
|
||||
+ return initCurlStuffFailed();
|
||||
+
|
||||
slist = curl_slist_append(slist, "Accept: text/*");
|
||||
slist = curl_slist_append(slist, "Accept-Language: en");
|
||||
slist = curl_slist_append(slist, "Accept-Charset: iso-8859-1,*,utf-8");
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, tkabber}:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tkabber-plugins-${version}";
|
||||
|
|
@ -10,9 +10,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
configurePhase = ''
|
||||
mkdir -p $out/bin
|
||||
sed -e "s@/usr/local@$out@" -i Makefile
|
||||
'';
|
||||
|
||||
buildInputs = [tkabber];
|
||||
meta = {
|
||||
homepage = "http://tkabber.jabber.ru/tkabber-plugins";
|
||||
description = "Plugins for the Tkabber instant messenger";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, bwidget, cacert, makeWrapper, x11 }:
|
||||
{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
|
||||
, bwidget, makeWrapper, x11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
tclLibraries = [ bwidget tcllib tcltls tclgpg ];
|
||||
|
||||
getTclLibPath = p: "${p}/lib/${p.libPrefix}";
|
||||
|
||||
tclLibPaths = stdenv.lib.concatStringsSep " "
|
||||
(map getTclLibPath tclLibraries);
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "tkabber-0.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -13,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
patchPhase = ''
|
||||
substituteInPlace login.tcl --replace \
|
||||
"custom::defvar loginconf(sslcacertstore) \"\"" \
|
||||
"custom::defvar loginconf(sslcacertstore) \"${cacert}/etc/ca-bundle.crt\""
|
||||
"custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)"
|
||||
|
||||
sed -i '/^if.*load_default_xrdb/,/^}$/ {
|
||||
s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@
|
||||
|
|
@ -26,13 +35,16 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/tcltk\ ${tcllib}/lib/tcllib${tcllib.version}\ ${tcltls}/lib/tls${tcltls.version}"
|
||||
wrapProgram $out/bin/tkabber \
|
||||
--set TCLLIBPATH '"${tclLibPaths}"' \
|
||||
--set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins'
|
||||
'';
|
||||
|
||||
buildInputs = [tcl tk tcllib tcltls bwidget x11 makeWrapper];
|
||||
buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries;
|
||||
|
||||
meta = {
|
||||
homepage = "http://tkabber.jabber.ru/";
|
||||
description = "A GUI client for the XMPP (Jabber) instant messaging protocol";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ let
|
|||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
version="1.1.2";
|
||||
version="1.2.0";
|
||||
baseName="vacuum-im";
|
||||
name="${baseName}-${version}";
|
||||
url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz";
|
||||
hash="451dde9b3587503b035fa1ddd2c99f2052a0b17a603491c59e8c47a8bcd4746d";
|
||||
hash="55a2c27aaaf79c7a4de127c22d3845ede35970283d35ee57fd5ceca581b085fc";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
|
|
|
|||
20
pkgs/applications/networking/irc/ii/default.nix
Normal file
20
pkgs/applications/networking/irc/ii/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ii-1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/tools/${name}.tar.gz";
|
||||
sha256 = "0afccbcm7i9lfch5mwzs3l1ax79dg3g6rrw0z8rb7d2kn8wsckvr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
make install PREFIX=$out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://tools.suckless.org/ii/;
|
||||
license = "MIT";
|
||||
description = "Irc it, simple FIFO based irc client";
|
||||
};
|
||||
}
|
||||
|
|
@ -3,15 +3,15 @@
|
|||
|
||||
let
|
||||
pn = "konversation";
|
||||
v = "1.3.1";
|
||||
v = "1.4";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pn}-${v}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.bz2";
|
||||
sha256 = "0wigcvi6lscy14dhm5nh1mkhfx7xxdq9g163pwpd0xndvybrfhfl";
|
||||
url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz";
|
||||
sha256 = "030vsbb18dlzsnjl3fzyd1m9wvvksiyc1lm45abi4q6x4xd60knv";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
name = "weechat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://weechat.org/files/src/${name}.tar.gz";
|
||||
sha256 = "1bphyhx5rnirga5l42z4lijw68qx724gffic1z60jdwfxc5dxknl";
|
||||
sha256 = "4293eb9d29f11b8ee8c301049d57e535acbea677bc1dc41ab12fe1bb8af0f10e";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue