dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Conflicts (simple):
	pkgs/os-specific/linux/util-linux/default.nix

It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
This commit is contained in:
Vladimír Čunát 2015-01-13 18:05:43 +01:00
commit 1575bc652e
452 changed files with 143747 additions and 4903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -1,10 +1,18 @@
Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package
manager. Nixpkgs also includes [NixOS](https://nixos.org/nixos/) linux distribution source code.
manager.
[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside `nixos/` folder.
* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation)
* [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language)
* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Continuous build](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Tests](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for 14.12 release](https://hydra.nixos.org/jobset/nixos/release-14.12)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for 14.12 release](https://hydra.nixos.org/job/nixos/release-14.12/tested#tabs-constituents)
Communication:
* [Mailing list](https://lists.science.uu.nl/mailman/listinfo/nix-dev)
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)

4
default.nix
View File

@ -1,6 +1,6 @@
if ! builtins ? nixVersion || builtins.compareVersions "1.7" builtins.nixVersion == 1 then
if ! builtins ? nixVersion || builtins.compareVersions "1.8" builtins.nixVersion == 1 then
abort "This version of Nixpkgs requires Nix >= 1.7, please upgrade!"
abort "This version of Nixpkgs requires Nix >= 1.8, please upgrade!"
else

2
lib/attrsets.nix
View File

@ -1,7 +1,7 @@
# Operations on attribute sets.
with {
inherit (builtins) head tail;
inherit (builtins) head tail length;
inherit (import ./trivial.nix) or;
inherit (import ./default.nix) fold;
inherit (import ./strings.nix) concatStringsSep;

7
lib/customisation.nix
View File

@ -65,6 +65,13 @@ rec {
overrideDerivation = fdrv:
makeOverridable (args: overrideDerivation (f args) fdrv) origArgs;
})
else if builtins.isFunction ff then
{ override = newArgs:
makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
__functor = self: ff;
deepOverride = throw "deepOverride not yet supported for functors";
overrideDerivation = throw "overrideDerivation not yet supported for functors";
}
else ff;
deepOverrider = newArgs: name: x: if builtins.isAttrs x then (

1
lib/maintainers.nix
View File

@ -74,6 +74,7 @@
garbas = "Rok Garbas <rok@garbas.si>";
gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
gridaphobe = "Eric Seidel <eric@seidel.io>";
guibert = "David Guibert <david.guibert@gmail.com>";
henrytill = "Henry Till <henrytill@gmail.com>";
hinton = "Tom Hinton <t@larkery.com>";

25
lib/modules.nix
View File

@ -356,6 +356,31 @@ rec {
mkBefore = mkOrder 500;
mkAfter = mkOrder 1500;
# Convenient property used to transfer all definitions and their
# properties from one option to another. This property is useful for
# renaming options, and also for including properties from another module
# system, including sub-modules.
#
# { config, options, ... }:
#
# {
# # 'bar' might not always be defined in the current module-set.
# config.foo.enable = mkAliasDefinitions (options.bar.enable or {});
#
# # 'barbaz' has to be defined in the current module-set.
# config.foobar.paths = mkAliasDefinitions options.barbaz.paths;
# }
#
# Note, this is different than taking the value of the option and using it
# as a definition, as the new definition will not keep the mkOverride /
# mkDefault properties of the previous option.
#
mkAliasDefinitions = mkAliasAndWrapDefinitions id;
mkAliasAndWrapDefinitions = wrap: option:
mkMerge
(optional (isOption option && option.isDefined)
(wrap (mkMerge option.definitions)));
/* Compatibility. */
fixMergeModules = modules: args: evalModules { inherit modules args; check = false; };

1
lib/options.nix
View File

@ -96,6 +96,7 @@ rec {
declarations = filter (x: x != unknownModule) opt.declarations;
internal = opt.internal or false;
visible = opt.visible or true;
type = opt.type.name or null;
}
// (if opt ? example then { example = scrubOptionValue opt.example; } else {})
// (if opt ? default then { default = scrubOptionValue opt.default; } else {})

5
maintainers/scripts/travis-nox-review-pr.sh
View File

@ -28,12 +28,13 @@ elif [[ $1 == build ]]; then
source $HOME/.nix-profile/etc/profile.d/nix.sh
if [[ $TRAVIS_PULL_REQUEST == false ]]; then
echo "===> Not a pull request, checking evaluation"
nix-build pkgs/top-level/release.nix -A tarball
echo "=== Not a pull request"
else
echo "=== Checking PR"
nox-review pr ${TRAVIS_PULL_REQUEST}
fi
echo "=== Checking tarball creation"
nix-build pkgs/top-level/release.nix -A tarball
else
echo "$0: Unknown option $1" >&2
false

6
nixos/doc/manual/administration/control-groups.xml
View File

@ -58,12 +58,10 @@ controls memory allocation limits; by default, all processes are in
the top-level cgroup, so any service or session can exhaust all
available memory. Per-cgroup memory limits can be specified in
<filename>configuration.nix</filename>; for instance, to limit
<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap)
and 640 MiB of RAM (including swap):
<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):
<programlisting>
systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ];
</programlisting>
</para>
@ -72,4 +70,4 @@ systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.lim
continuously updated list of all cgroups with their CPU and memory
usage.</para>
</chapter>
</chapter>

2
nixos/doc/manual/configuration/summary.xml
View File

@ -60,7 +60,7 @@ manual</link> for the rest.</para>
<entry>A nested set, equivalent to <literal>{ foo = { bar = 1; }; }</literal></entry>
</row>
<row>
<entry><literal>rec { x = "bla"; y = x + "bar"; }</literal></entry>
<entry><literal>rec { x = "foo"; y = x + "bar"; }</literal></entry>
<entry>A recursive set, equivalent to <literal>{ x = "foo"; y = "foobar"; }</literal></entry>
</row>
<row>

3
nixos/doc/manual/default.nix
View File

@ -20,7 +20,8 @@ let
declarations = map (fn: stripPrefix fn) opt.declarations;
}
// optionalAttrs (opt ? example) { example = substFunction opt.example; }
// optionalAttrs (opt ? default) { default = substFunction opt.default; });
// optionalAttrs (opt ? default) { default = substFunction opt.default; }
// optionalAttrs (opt ? type) { type = substFunction opt.type; });
prefix = toString ../../..;

4
nixos/doc/manual/installation/obtaining.xml
View File

@ -8,7 +8,7 @@
<para>NixOS ISO images can be downloaded from the <link
xlink:href="http://nixos.org/nixos/download.html">NixOS
homepage</link>. There are a number of installation options. If
download page</link>. There are a number of installation options. If
you happen to have an optical drive and a spare CD, burning the
image to CD and booting from that is probably the easiest option.
Most people will need to prepare a USB stick to boot from.
@ -27,7 +27,7 @@ running NixOS system through several other means:
<para>Using virtual appliances in Open Virtualization Format (OVF)
that can be imported into VirtualBox. These are available from
the <link xlink:href="http://nixos.org/nixos/download.html">NixOS
homepage</link>.</para>
download page</link>.</para>
</listitem>
<listitem>
<para>Using AMIs for Amazon’s EC2. To find one for your region

36
nixos/doc/manual/installation/upgrading.xml
View File

@ -14,8 +14,8 @@ been built. These channels are:
<itemizedlist>
<listitem>
<para>Stable channels, such as <literal
xlink:href="https://nixos.org/channels/nixos-14.04">nixos-14.04</literal>.
<para><emphasis>Stable channels</emphasis>, such as <literal
xlink:href="https://nixos.org/channels/nixos-14.12">nixos-14.12</literal>.
These only get conservative bug fixes and package upgrades. For
instance, a channel update may cause the Linux kernel on your
system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
@ -23,14 +23,28 @@ been built. These channels are:
3.11.<replaceable>x</replaceable> (a major change that has the
potential to break things). Stable channels are generally
maintained until the next stable branch is created.</para>
<para></para>
</listitem>
<listitem>
<para>The unstable channel, <literal
<para>The <emphasis>unstable channel</emphasis>, <literal
xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
This corresponds to NixOS’s main development branch, and may thus
see radical changes between channel updates. It’s not recommended
for production systems.</para>
</listitem>
<listitem>
<para><emphasis>Small channels</emphasis>, such as <literal
xlink:href="https://nixos.org/channels/nixos-14.12-small">nixos-14.12-small</literal>
or <literal
xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These
are identical to the stable and unstable channels described above,
except that they contain fewer binary packages. This means they
get updated faster than the regular channels (for instance, when a
critical security patch is committed to NixOS’s source tree), but
may require more packages to be built from source than
usual. They’re mostly intended for server environments and as such
contain few GUI applications.</para>
</listitem>
</itemizedlist>
To see what channels are available, go to <link
@ -41,8 +55,8 @@ appliances.)</para>
<para>When you first install NixOS, you’re automatically subscribed to
the NixOS channel that corresponds to your installation source. For
instance, if you installed from a 14.04 ISO, you will be subscribed to
the <literal>nixos-14.04</literal> channel. To see which NixOS
instance, if you installed from a 14.12 ISO, you will be subscribed to
the <literal>nixos-14.12</literal> channel. To see which NixOS
channel you’re subscribed to, run the following as root:
<screen>
@ -57,13 +71,19 @@ $ nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replac
</screen>
(Be sure to include the <literal>nixos</literal> parameter at the
end.) For instance, to use the NixOS 14.04 stable channel:
end.) For instance, to use the NixOS 14.12 stable channel:
<screen>
$ nix-channel --add https://nixos.org/channels/nixos-14.04 nixos
$ nix-channel --add https://nixos.org/channels/nixos-14.12 nixos
</screen>
But if you want to live on the bleeding edge:
If you have a server, you may want to use the “small” channel instead:
<screen>
$ nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos
</screen>
And if you want to live on the bleeding edge:
<screen>
$ nix-channel --add https://nixos.org/channels/nixos-unstable nixos

70
nixos/doc/manual/man-nixos-install.xml
View File

@ -11,12 +11,29 @@
<refnamediv>
<refname><command>nixos-install</command></refname>
<refpurpose>install NixOS</refpurpose>
<refpurpose>install bootloader and NixOS</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>nixos-install</command>
<arg>
<arg choice='plain'><option>-I</option></arg>
<replaceable>path</replaceable>
</arg>
<arg>
<arg choice='plain'><option>--root</option></arg>
<replaceable>root</replaceable>
</arg>
<arg>
<arg choice='plain'><option>--show-trace</option></arg>
</arg>
<arg>
<arg choice='plain'><option>--chroot</option></arg>
</arg>
<arg>
<arg choice='plain'><option>--help</option></arg>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
@ -55,6 +72,56 @@ it.</para>
</refsection>
<refsection><title>Options</title>
<para>This command accepts the following options:</para>
<variablelist>
<varlistentry>
<term><option>--root</option></term>
<listitem>
<para>Defaults to <filename>/mnt</filename>. If this option is given, treat the directory
<replaceable>root</replaceable> as the root of the NixOS installation.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-I</option></term>
<listitem>
<para>Add a path to the Nix expression search path. This option may be given multiple times.
See the NIX_PATH environment variable for information on the semantics of the Nix search path.
Paths added through <replaceable>-I</replaceable> take precedence over NIX_PATH.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--show-trace</option></term>
<listitem>
<para>Causes Nix to print out a stack trace in case of Nix expression evaluation errors.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--chroot</option></term>
<listitem>
<para>Chroot into given installation. Any additional arguments passed are going to be executed inside the chroot.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--help</option></term>
<listitem>
<para>Synonym for <command>man nixos-install</command>.</para>
</listitem>
</varlistentry>
</variablelist>
</refsection>
<refsection><title>Examples</title>
@ -72,6 +139,7 @@ $ mount /dev/sda1 /mnt
$ nixos-generate-config --root /mnt
$ # edit /mnt/etc/nixos/configuration.nix
$ nixos-install
$ reboot
</screen>
</para>

2
nixos/doc/manual/man-pages.xml
View File

@ -15,7 +15,7 @@
</author>
<copyright>
<year>2007-2013</year>
<year>2007-2015</year>
<holder>Eelco Dolstra</holder>
</copyright>

8
nixos/doc/manual/options-to-docbook.xsl
View File

@ -34,6 +34,14 @@
select="attr[@name = 'description']/string/@value" />
</para>
<xsl:if test="attr[@name = 'type']">
<para>
<emphasis>Type:</emphasis>
<xsl:text> </xsl:text>
<xsl:apply-templates select="attr[@name = 'type']" mode="top" />
</para>
</xsl:if>
<xsl:if test="attr[@name = 'default']">
<para>
<emphasis>Default:</emphasis>

150
nixos/doc/manual/release-notes/rl-1412.xml
View File

@ -4,15 +4,14 @@
version="5.0"
xml:id="sec-release-14.12">
<title>Release 14.12 (“Caterpillar”, 2014/12/??)</title>
<title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
<para>In addition to numerous new and upgraded packages, this release has the following highlights:
<itemizedlist>
<listitem><para>Systemd has been updated to version 217, which has numerous
<link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements
.</link></para></listitem>
<link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link></para></listitem>
<listitem><para><link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
Nix has been updated to 1.8.</link></para></listitem>
@ -23,76 +22,81 @@ Nix has been updated to 1.8.</link></para></listitem>
<listitem><para>The default Linux kernel has been updated to 3.14.</para></listitem>
<listitem><para><option>users.mutableUsers</option> set to <literal>true</literal> now respect any changes
made after initial creation of a user or a group.
</para></listitem>
<listitem><para>If <option>users.mutableUsers</option> is enabled (the
default), changes made to the declaration of a user or group will be
correctly realised when running <command>nixos-rebuild</command>. For
instance, removing a user specification from
<filename>configuration.nix</filename> will cause the actual user
account to be deleted. If <option>users.mutableUsers</option> is
disabled, it is no longer necessary to specify UIDs or GIDs; if
omitted, they are allocated dynamically.</para></listitem>
</itemizedlist></para>
<para>Following new services were added since the last release:
<itemizedlist>
<listitem><para>parallels-guest</para></listitem>
<listitem><para>docker</para></listitem>
<listitem><para>lxc</para></listitem>
<listitem><para>openvswitch</para></listitem>
<listitem><para>fluxbox</para></listitem>
<listitem><para>bspwm</para></listitem>
<listitem><para>gdm</para></listitem>
<listitem><para>fcgiwrap</para></listitem>
<listitem><para>peerflix</para></listitem>
<listitem><para>fail2ban</para></listitem>
<listitem><para>chronos</para></listitem>
<listitem><para>znc</para></listitem>
<listitem><para>unifi</para></listitem>
<listitem><para>teamspeak3</para></listitem>
<listitem><para>strongswan</para></listitem>
<listitem><para>seeks</para></listitem>
<listitem><para>radicale</para></listitem>
<listitem><para>prosody</para></listitem>
<listitem><para>polipo</para></listitem>
<listitem><para>openntpd</para></listitem>
<listitem><para>nsd</para></listitem>
<listitem><para>mailpile</para></listitem>
<listitem><para>i2pd</para></listitem>
<listitem><para>dnscrypt-proxy</para></listitem>
<listitem><para>consul</para></listitem>
<listitem><para>atftpd</para></listitem>
<listitem><para>scollector</para></listitem>
<listitem><para>collectd</para></listitem>
<listitem><para>bosun</para></listitem>
<listitem><para>riemann</para></listitem>
<listitem><para>zookeeper</para></listitem>
<listitem><para>uhub</para></listitem>
<listitem><para>siproxd</para></listitem>
<listitem><para>redmine</para></listitem>
<listitem><para>phd</para></listitem>
<listitem><para>mesos</para></listitem>
<listitem><para>gitlab</para></listitem>
<listitem><para>gitolite</para></listitem>
<listitem><para>etcd</para></listitem>
<listitem><para>docker-registry</para></listitem>
<listitem><para>cpuminer-cryptonight</para></listitem>
<listitem><para>thermald</para></listitem>
<listitem><para>mlmmj</para></listitem>
<listitem><para>tcsd</para></listitem>
<listitem><para>gnome3.seahorse</para></listitem>
<listitem><para>gnome3.gvfs</para></listitem>
<listitem><para>gnome3.gnome-online-miners</para></listitem>
<listitem><para>gnome3.gnome-documents</para></listitem>
<listitem><para>geoclue2</para></listitem>
<listitem><para>opentsdb</para></listitem>
<listitem><para>neo4j</para></listitem>
<listitem><para>monetdb</para></listitem>
<listitem><para>influxdb</para></listitem>
<listitem><para>hbase</para></listitem>
<listitem><para>torque/mrom</para></listitem>
<listitem><para>torque/server</para></listitem>
<listitem><para>kubernetes</para></listitem>
<listitem><para>fleet</para></listitem>
<listitem><para>crashplan</para></listitem>
<listitem><para>mopidy</para></listitem>
<listitem><para>liquidsoap</para></listitem>
<listitem><para><literal>atftpd</literal></para></listitem>
<listitem><para><literal>bosun</literal></para></listitem>
<listitem><para><literal>bspwm</literal></para></listitem>
<listitem><para><literal>chronos</literal></para></listitem>
<listitem><para><literal>collectd</literal></para></listitem>
<listitem><para><literal>consul</literal></para></listitem>
<listitem><para><literal>cpuminer-cryptonight</literal></para></listitem>
<listitem><para><literal>crashplan</literal></para></listitem>
<listitem><para><literal>dnscrypt-proxy</literal></para></listitem>
<listitem><para><literal>docker-registry</literal></para></listitem>
<listitem><para><literal>docker</literal></para></listitem>
<listitem><para><literal>etcd</literal></para></listitem>
<listitem><para><literal>fail2ban</literal></para></listitem>
<listitem><para><literal>fcgiwrap</literal></para></listitem>
<listitem><para><literal>fleet</literal></para></listitem>
<listitem><para><literal>fluxbox</literal></para></listitem>
<listitem><para><literal>gdm</literal></para></listitem>
<listitem><para><literal>geoclue2</literal></para></listitem>
<listitem><para><literal>gitlab</literal></para></listitem>
<listitem><para><literal>gitolite</literal></para></listitem>
<listitem><para><literal>gnome3.gnome-documents</literal></para></listitem>
<listitem><para><literal>gnome3.gnome-online-miners</literal></para></listitem>
<listitem><para><literal>gnome3.gvfs</literal></para></listitem>
<listitem><para><literal>gnome3.seahorse</literal></para></listitem>
<listitem><para><literal>hbase</literal></para></listitem>
<listitem><para><literal>i2pd</literal></para></listitem>
<listitem><para><literal>influxdb</literal></para></listitem>
<listitem><para><literal>kubernetes</literal></para></listitem>
<listitem><para><literal>liquidsoap</literal></para></listitem>
<listitem><para><literal>lxc</literal></para></listitem>
<listitem><para><literal>mailpile</literal></para></listitem>
<listitem><para><literal>mesos</literal></para></listitem>
<listitem><para><literal>mlmmj</literal></para></listitem>
<listitem><para><literal>monetdb</literal></para></listitem>
<listitem><para><literal>mopidy</literal></para></listitem>
<listitem><para><literal>neo4j</literal></para></listitem>
<listitem><para><literal>nsd</literal></para></listitem>
<listitem><para><literal>openntpd</literal></para></listitem>
<listitem><para><literal>opentsdb</literal></para></listitem>
<listitem><para><literal>openvswitch</literal></para></listitem>
<listitem><para><literal>parallels-guest</literal></para></listitem>
<listitem><para><literal>peerflix</literal></para></listitem>
<listitem><para><literal>phd</literal></para></listitem>
<listitem><para><literal>polipo</literal></para></listitem>
<listitem><para><literal>prosody</literal></para></listitem>
<listitem><para><literal>radicale</literal></para></listitem>
<listitem><para><literal>redmine</literal></para></listitem>
<listitem><para><literal>riemann</literal></para></listitem>
<listitem><para><literal>scollector</literal></para></listitem>
<listitem><para><literal>seeks</literal></para></listitem>
<listitem><para><literal>siproxd</literal></para></listitem>
<listitem><para><literal>strongswan</literal></para></listitem>
<listitem><para><literal>tcsd</literal></para></listitem>
<listitem><para><literal>teamspeak3</literal></para></listitem>
<listitem><para><literal>thermald</literal></para></listitem>
<listitem><para><literal>torque/mrom</literal></para></listitem>
<listitem><para><literal>torque/server</literal></para></listitem>
<listitem><para><literal>uhub</literal></para></listitem>
<listitem><para><literal>unifi</literal></para></listitem>
<listitem><para><literal>znc</literal></para></listitem>
<listitem><para><literal>zookeeper</literal></para></listitem>
</itemizedlist>
</para>
@ -125,9 +129,11 @@ rather than <literal>c-<replaceable>container-name</replaceable></literal>.</par
<listitem><para>GNOME 3.10 support has been dropped. The default GNOME version is now 3.12.</para></listitem>
<listitem><para>VirtualBox has been upgraded to 4.3.20 release. Users may be required to run
<command>rm -rf /tmp.vbox*</command>. <literal>imports = [ &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal>
is no longer necessary, use <literal>services.virtualboxHost.enable = true</literal> instead.
<listitem><para>VirtualBox has been upgraded to 4.3.20 release. Users
may be required to run <command>rm -rf /tmp/.vbox*</command>. The line
<literal>imports = [ &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is
no longer necessary, use <literal>services.virtualboxHost.enable =
true</literal> instead.
</para>
<para>Also, hardening mode is now enabled by default, which means that unless you want to use
USB support, you no longer need to be a member of the <literal>vboxusers</literal> group.
@ -160,6 +166,10 @@ xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"/>.</pa
the ability to connect to sessions created by older versions of
screen.</para></listitem>
<listitem><para>The Intel GPU driver was updated to the 3.x prerelease
version (used by most distributions) and supports DRI3
now.</para></listitem>
</itemizedlist>
</para>

41
nixos/maintainers/scripts/ec2/create-ebs-amis.py
View File

@ -12,7 +12,7 @@ from nixops.statefile import StateFile, get_default_state_file
parser = argparse.ArgumentParser(description='Create an EBS-backed NixOS AMI')
parser.add_argument('--region', dest='region', required=True, help='EC2 region to create the image in')
parser.add_argument('--channel', dest='channel', default="13.10", help='Channel to use')
parser.add_argument('--channel', dest='channel', default="14.12", help='Channel to use')
parser.add_argument('--keep', dest='keep', action='store_true', help='Keep NixOps machine after use')
parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM image')
parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob")
@ -34,13 +34,13 @@ ebs_size = 20
# Start a NixOS machine in the given region.
f = open("ebs-creator-config.nix", "w")
f.write('''{{
resources.ec2KeyPairs.keypair.accessKeyId = "logicblox-dev";
resources.ec2KeyPairs.keypair.accessKeyId = "lb-nixos";
resources.ec2KeyPairs.keypair.region = "{0}";
machine =
{{ pkgs, ... }}:
{{
deployment.ec2.accessKeyId = "logicblox-dev";
deployment.ec2.accessKeyId = "lb-nixos";
deployment.ec2.region = "{0}";
deployment.ec2.blockDeviceMapping."/dev/xvdg".size = pkgs.lib.mkOverride 10 {1};
}};
@ -54,7 +54,7 @@ try:
except Exception:
depl = db.create_deployment()
depl.name = "ebs-creator"
depl.auto_response = "y"
depl.logger.set_autoresponse("y")
depl.nix_exprs = [os.path.abspath("./ebs-creator.nix"), os.path.abspath("./ebs-creator-config.nix")]
if not args.keep: depl.destroy_resources()
depl.deploy(allow_reboot=True)
@ -140,6 +140,7 @@ common_args = dict(
)
if not args.hvm:
common_args['kernel_id']=aki.id
ami_id = m._conn.register_image(**common_args)
print >> sys.stderr, "registered AMI {0}".format(ami_id)
@ -161,16 +162,16 @@ f.write(
{{
network.description = "NixOS EBS test";
resources.ec2KeyPairs.keypair.accessKeyId = "logicblox-dev";
resources.ec2KeyPairs.keypair.accessKeyId = "lb-nixos";
resources.ec2KeyPairs.keypair.region = "{0}";
machine = {{ config, pkgs, resources, ... }}: {{
deployment.targetEnv = "ec2";
deployment.ec2.accessKeyId = "logicblox-dev";
deployment.ec2.accessKeyId = "lb-nixos";
deployment.ec2.region = "{0}";
deployment.ec2.instanceType = "{2}";
deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
deployment.ec2.securityGroups = [ "admin" ];
deployment.ec2.securityGroups = [ "public-ssh" ];
deployment.ec2.ami = "{1}";
}};
}}
@ -185,23 +186,31 @@ test_depl.deploy(create_only=True)
test_depl.machines['machine'].run_command("nixos-version")
# Log the AMI ID.
f = open("{0}.{1}.ami-id".format(args.region, image_type), "w")
f.write("{0}".format(ami_id))
f.close()
f = open("ec2-amis.nix".format(args.region, image_type), "w")
f.write("{\n")
for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1']:
copy_image = None
if args.region != dest:
print >> sys.stderr, "copying image from region {0} to {1}".format(args.region, dest)
conn = boto.ec2.connect_to_region(dest)
copy_image = conn.copy_image(args.region, ami_id, ami_name, description=None, client_token=None)
try:
print >> sys.stderr, "copying image from region {0} to {1}".format(args.region, dest)
conn = boto.ec2.connect_to_region(dest)
copy_image = conn.copy_image(args.region, ami_id, ami_name, description=None, client_token=None)
except :
print >> sys.stderr, "FAILED!"
# Log the AMI ID.
f = open("{0}.{1}.ami-id".format(dest, image_type), "w")
f.write("{0}".format(copy_image.image_id))
f.close()
if copy_image != None:
f.write(' "{0}"."{1}".{2} = "{3}";\n'.format(args.channel,dest,"hvm" if args.hvm else "ebs",copy_image.image_id))
else:
f.write(' "{0}"."{1}".{2} = "{3}";\n'.format(args.channel,args.region,"hvm" if args.hvm else "ebs",ami_id))
f.write("}\n")
f.close()
if not args.keep:
test_depl.logger.set_autoresponse("y")
test_depl.destroy_resources()
test_depl.delete()

13
nixos/maintainers/scripts/ec2/create-s3-amis.sh
View File

@ -31,17 +31,22 @@ buildAndUploadFor() {
-a "$EC2_ACCESS_KEY" -s "$EC2_SECRET_KEY" --location "$s3location" \
--url http://s3.amazonaws.com
kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.03-$arch*" --region "$region" | cut -f 2)
kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.04-$arch*" --region "$region" | cut -f 2)
echo "using PV-GRUB kernel $kernel"
ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" \
ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" -O "$EC2_ACCESS_KEY" -W "$EC2_SECRET_KEY" \
--region "$region" --kernel "$kernel" | cut -f 2)
echo "AMI ID is $ami"
echo $ami >> $region.s3.ami-id
echo " \"14.12\".\"$region\".s3 = \"$ami\";" >> ec2-amis.nix
ec2-modify-image-attribute --region "$region" "$ami" -l -a all
ec2-modify-image-attribute --region "$region" "$ami" -l -a all -O "$EC2_ACCESS_KEY" -W "$EC2_SECRET_KEY"
for cp_region in us-east-1 us-west-1 us-west-2 eu-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 sa-east-1; do
new_ami=$(aws ec2 copy-image --source-image-id $ami --source-region $region --region $cp_region --name "$name" | json ImageId)
echo " \"14.12\".\"$cp_region\".s3 = \"$new_ami\";" >> ec2-amis.nix
done
done
}

3
nixos/maintainers/scripts/ec2/ebs-creator.nix
View File

@ -5,10 +5,9 @@
{ config, pkgs, resources, ... }:
{ deployment.targetEnv = "ec2";
deployment.ec2.instanceType = "c3.large";
deployment.ec2.securityGroups = [ "admin" ];
deployment.ec2.securityGroups = [ "public-ssh" ];
deployment.ec2.ebsBoot = false;
deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
deployment.ec2.zone = "us-east-1e";
environment.systemPackages = [ pkgs.parted ];
};
}

2
nixos/maintainers/scripts/gce/create-gce.sh
View File

@ -1,6 +1,6 @@
#! /bin/sh -e
BUCKET_NAME=${BUCKET_NAME:-nixos}
BUCKET_NAME=${BUCKET_NAME:-nixos-images}
export NIX_PATH=nixpkgs=../../../..
export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix
export TIMESTAMP=$(date +%Y%m%d%H%M)

27
nixos/modules/config/users-groups.nix
View File

@ -25,6 +25,11 @@ let
options.
'';
hashedPasswordDescription = ''
To generate hashed password install <literal>mkpassword</literal>
package and run <literal>mkpasswd -m sha-512</literal>.
'';
userOpts = { name, config, ... }: {
options = {
@ -165,6 +170,7 @@ let
description = ''
Specifies the hashed password for the user.
${passwordDescription}
${hashedPasswordDescription}
'';
};
@ -202,6 +208,8 @@ let
password can be changed subsequently using the
<command>passwd</command> command. Otherwise, it's
equivalent to setting the <option>password</option> option.
${hashedPasswordDescription}
'';
};
@ -366,21 +374,24 @@ in {
type = types.bool;
default = true;
description = ''
If true, you are free to add new users and groups to the system
If set to <literal>true</literal>, you are free to add new users and groups to the system
with the ordinary <literal>useradd</literal> and
<literal>groupadd</literal> commands. On system activation, the
existing contents of the <literal>/etc/passwd</literal> and
<literal>/etc/group</literal> files will be merged with the
contents generated from the <literal>users.extraUsers</literal> and
<literal>users.extraGroups</literal> options. If
<literal>mutableUsers</literal> is false, the contents of the user and
group files will simply be replaced on system activation. This also
holds for the user passwords; if this option is false, all changed
passwords will be reset according to the
<literal>users.extraUsers</literal> configuration on activation. If
this option is true, the initial password for a user will be set
<literal>users.extraGroups</literal> options.
The initial password for a user will be set
according to <literal>users.extraUsers</literal>, but existing passwords
will not be changed.
<warning><para>
If set to <literal>false</literal>, the contents of the user and
group files will simply be replaced on system activation. This also
holds for the user passwords; all changed
passwords will be reset according to the
<literal>users.extraUsers</literal> configuration on activation.
</para></warning>
'';
};

12
nixos/modules/misc/ids.nix
View File

@ -308,13 +308,15 @@
systemd-resolve = 153;
systemd-timesync = 154;
liquidsoap = 155;
scollector = 156;
bosun = 157;
kubernetes = 158;
fleet = 159;
gitlab = 160;
scollector = 160;
bosun = 161;
kubernetes = 162;
gitlab = 165;
# When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
# uids and gids. Also, don't use gids above 399!
users = 100;
nixbld = 30000;

2
nixos/modules/module-list.nix
View File

@ -254,6 +254,7 @@
./services/networking/kippo.nix
./services/networking/mailpile.nix
./services/networking/minidlna.nix
./services/networking/mstpd.nix
./services/networking/murmur.nix
./services/networking/nat.nix
./services/networking/networkmanager.nix
@ -306,6 +307,7 @@
./services/search/solr.nix
./services/security/clamav.nix
./services/security/fail2ban.nix
./services/security/fprintd.nix
./services/security/fprot.nix
./services/security/frandom.nix
./services/security/haveged.nix

2
nixos/modules/profiles/base.nix
View File

@ -10,6 +10,8 @@
pkgs.w3m # needed for the manual anyway
pkgs.testdisk # useful for repairing boot problems
pkgs.mssys # for writing Microsoft boot sectors / MBRs
pkgs.efibootmgr
pkgs.efivar
pkgs.parted
pkgs.gptfdisk
pkgs.ddrescue

2
nixos/modules/programs/zsh/zsh.nix
View File

@ -100,7 +100,7 @@ in
export HISTSIZE=2000
export HISTFILE=$HOME/.zsh_history
setopt HIST_IGNORE_DUPS SHARE_HISTORY
setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
'';
};

4
nixos/modules/rename.nix
View File

@ -55,8 +55,8 @@ let
apply = x: use (toOf config);
inherit visible;
});
}
{ config = setTo (mkMerge (if (fromOf options).isDefined then [ (define (mkMerge (fromOf options).definitions)) ] else []));
config = setTo (mkAliasAndWrapDefinitions define (fromOf options));
}
];

11
nixos/modules/security/pam.nix
View File

@ -54,6 +54,15 @@ let
'';
};
fprintAuth = mkOption {
default = config.services.fprintd.enable;
type = types.bool;
description = ''
If set, fingerprint reader will be used (if exists and
your fingerprints are enrolled).
'';
};
sshAgentAuth = mkOption {
default = false;
type = types.bool;
@ -179,6 +188,8 @@ let
"auth required pam_tally.so"}
${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth)
"auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
${optionalString cfg.fprintAuth
"auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"}
${optionalString cfg.usbAuth
"auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
${optionalString cfg.unixAuth

4
nixos/modules/security/rngd.nix
View File

@ -20,7 +20,7 @@ with lib;
KERNEL=="random", TAG+="systemd"
SUBSYSTEM=="cpu", ENV{MODALIAS}=="x86cpu:*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
KERNEL=="tmp0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''}
'';
systemd.services.rngd = {
@ -32,8 +32,6 @@ with lib;
serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" +
(if config.services.tcsd.enable then " --no-tpm=1" else "");
restartTriggers = [ pkgs.rng_tools ];
};
};
}

4
nixos/modules/services/databases/postgresql.xml
View File

@ -24,11 +24,11 @@
<programlisting>
services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql93;
services.postgresql.package = pkgs.postgresql94;
</programlisting>
Note that you are required to specify the desired version of
PostgreSQL (e.g. <literal>pkgs.postgresql93</literal>). Since
PostgreSQL (e.g. <literal>pkgs.postgresql94</literal>). Since
upgrading your PostgreSQL version requires a database dump and reload
(see below), NixOS cannot provide a default value for
<option>services.postgresql.package</option> such as the most recent

4
nixos/modules/services/mail/postfix.nix
View File

@ -96,9 +96,9 @@ let
# -o smtpd_sasl_auth_enable=yes
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING
pickup fifo n - n 60 1 pickup
pickup unix n - n 60 1 pickup
cleanup unix n - n - 0 cleanup
qmgr fifo n - n 300 1 qmgr
qmgr unix n - n 300 1 qmgr
tlsmgr unix - - n 1000? 1 tlsmgr
rewrite unix - - n - - trivial-rewrite
bounce unix - - n - 0 bounce

7
nixos/modules/services/misc/nix-daemon.nix
View File

@ -82,9 +82,10 @@ in
description = ''
This option defines the maximum number of concurrent tasks during
one build. It affects, e.g., -j option for make. The default is 1.
Some builds may become non-deterministic with this option; use with
care! Packages will only be affected if enableParallelBuilding is
set for them.
The special value 0 means that the builder should use all
available CPU cores in the system. Some builds may become
non-deterministic with this option; use with care! Packages will
only be affected if enableParallelBuilding is set for them.
'';
};

1
nixos/modules/services/monitoring/dd-agent.nix
View File

@ -140,6 +140,7 @@ in {
Restart = "always";
RestartSec = 2;
};
environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig ];
};

2
nixos/modules/services/monitoring/riemann.nix
View File

@ -17,7 +17,7 @@ let
launcher = writeScriptBin "riemann" ''
#!/bin/sh
exec ${openjdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \
exec ${jdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \
-cp ${classpath} \
riemann.bin ${writeText "riemann-config.clj" riemannConfig}
'';

10
nixos/modules/services/network-filesystems/samba.nix
View File

@ -9,7 +9,7 @@ let
logDir = "/var/log/samba";
privateDir = "/var/samba/private";
inherit (pkgs) samba;
samba = cfg.package;
setupScript =
''
@ -90,6 +90,14 @@ in
";
};
package = mkOption {
default = pkgs.samba;
example = pkgs.samba4;
description = ''
Defines which package should be used for the samba server.
'';
};
syncPasswordsByPam = mkOption {
default = false;
description = "

33
nixos/modules/services/networking/mstpd.nix Normal file
View File

@ -0,0 +1,33 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.mstpd;
in
with lib;
{
options.services.mstpd = {
enable = mkOption {
default = false;
type = types.bool;
description = ''
Whether to enable the multiple spanning tree protocol daemon.
'';
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.mstpd ];
systemd.services.mstpd = {
description = "Multiple Spanning Tree Protocol Daemon";
wantedBy = [ "network.target" ];
unitConfig.ConditionCapability = "CAP_NET_ADMIN";
serviceConfig = {
Type = "forking";
ExecStart = "@${pkgs.mstpd}/bin/mstpd mstpd";
PIDFile = "/run/mstpd.pid";
};
};
};
}

14
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -17,13 +17,11 @@ let
knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
knownHostsFile = pkgs.runCommand "ssh_known_hosts" {} ''
touch "$out"
${flip concatMapStrings knownHosts (h: ''
pubkeyfile=${builtins.toFile "host.pub" (if h.publicKey == null then readFile h.publicKeyFile else h.publicKey)}
${pkgs.gnused}/bin/sed 's/^/${concatStringsSep "," h.hostNames} /' $pubkeyfile >> "$out"
'')}
'';
knownHostsText = flip (concatMapStringsSep "\n") knownHosts
(h:
concatStringsSep "," h.hostNames + " "
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
);
userOptions = {
@ -301,7 +299,7 @@ in
{ source = "${cfgc.package}/etc/ssh/moduli";
target = "ssh/moduli";
}
{ source = knownHostsFile;
{ text = knownHostsText;
target = "ssh/ssh_known_hosts";
}
];

2
nixos/modules/services/networking/unifi.nix
View File

@ -3,7 +3,7 @@ with lib;
let
cfg = config.services.unifi;
stateDir = "/var/lib/unifi";
cmd = "@${pkgs.icedtea7_jre}/bin/java java -jar ${stateDir}/lib/ace.jar";
cmd = "@${pkgs.jre}/bin/java java -jar ${stateDir}/lib/ace.jar";
mountPoints = [
{
what = "${pkgs.unifi}/dl";

4
nixos/modules/services/search/solr.nix
View File

@ -22,7 +22,7 @@ let
cp common/lib/*.jar $out/lib/
ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/
ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/
ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/
ln -s ${pkgs.jdk.home}/lib/tools.jar $out/lib/
'' + optionalString (cfg.extraJars != []) ''
for f in ${concatStringsSep " " cfg.extraJars}; do
cp $f $out/lib
@ -44,7 +44,7 @@ in {
javaPackage = mkOption {
type = types.package;
default = pkgs.openjre;
default = pkgs.jre;
description = ''
Which Java derivation to use for running solr.
'';

53
nixos/modules/services/security/fprintd.nix Normal file
View File

@ -0,0 +1,53 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.fprintd;
in
{
###### interface
options = {
services.fprintd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable fprintd daemon and PAM module for fingerprint readers handling.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
services.dbus.packages = [ pkgs.fprintd ];
environment.systemPackages = [ pkgs.fprintd ];
systemd.services.fprintd = {
description = "Fingerprint Authentication Daemon";
serviceConfig = {
Type = "dbus";
BusName = "net.reactivated.Fprint";
ExecStart = "${pkgs.fprintd}/libexec/fprintd";
};
};
};
}

2
nixos/modules/services/web-servers/winstone.nix
View File

@ -30,7 +30,7 @@ let
javaPackage = mkOption {
type = types.package;
default = pkgs.openjre;
default = pkgs.jre;
description = ''
Which Java derivation to use for running Winstone.
'';

12
nixos/modules/system/boot/systemd.nix
View File

@ -858,6 +858,13 @@ in
description = "Definition of systemd per-user service units.";
};
systemd.user.timers = mkOption {
default = {};
type = types.attrsOf types.optionSet;
options = [ timerOptions unitConfig ];
description = "Definition of systemd per-user timer units.";
};
systemd.user.sockets = mkOption {
default = {};
type = types.attrsOf types.optionSet;
@ -978,8 +985,9 @@ in
// mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.network.networks;
systemd.user.units =
mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets;
mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets
// mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.user.timers;
system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled
[ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET"

18
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -37,6 +37,8 @@ let
ip link del "${i}" 2>/dev/null || true
'';
needsMstpd = any ({ rstp, ... }: rstp) (attrValues cfg.bridges);
in
{
@ -185,13 +187,14 @@ in
in
{ description = "Bridge Interface ${n}";
wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps;
after = [ "network-pre.target" ] ++ deps
bindsTo = deps ++ optional v.rstp "mstpd.service";
partOf = optional v.rstp "mstpd.service";
after = [ "network-pre.target" "mstpd.service" ] ++ deps
++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces;
before = [ "network-interfaces.target" (subsystemDevice n) ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
path = [ pkgs.iproute ] ++ optional v.rstp pkgs.mstpd;
script = ''
# Remove Dead Interfaces
echo "Removing old bridge ${n}..."
@ -206,6 +209,13 @@ in
ip link set "${i}" up
'')}
# Enable rstp on the interface
${optionalString v.rstp ''
echo 1 >/sys/class/net/${n}/bridge/stp_state
mstpctl addbridge "${n}"
mstpctl setforcevers "${n}" rstp
''}
ip link set "${n}" up
'';
postStop = ''
@ -343,6 +353,8 @@ in
KERNEL=="tun", TAG+="systemd"
'';
services.mstpd = mkIf needsMstpd { enable = true; };
};
}

7
nixos/modules/tasks/network-interfaces.nix
View File

@ -368,6 +368,13 @@ in
"The physical network interfaces connected by the bridge.";
};
rstp = mkOption {
example = true;
default = false;
type = types.bool;
description = "Whether the bridge interface should enable rstp.";
};
};
};

10
nixos/modules/virtualisation/containers.nix
View File

@ -111,6 +111,13 @@ in
'';
};
autoStart = mkOption {
type = types.bool;
default = false;
description = ''
Wether the container is automatically started at boot-time.
'';
};
};
config = mkMerge
@ -305,6 +312,9 @@ in
LOCAL_ADDRESS=${cfg.localAddress}
''}
''}
${optionalString cfg.autoStart ''
AUTO_START=1
''}
'';
}) config.containers;

5
nixos/modules/virtualisation/google-compute-image.nix
View File

@ -63,11 +63,12 @@ in
# Register the paths in the Nix database.
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
chroot /mnt ${config.nix.package}/bin/nix-store --load-db
chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
# Create the system profile to allow nixos-rebuild to work.
chroot /mnt ${config.nix.package}/bin/nix-env \
-p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
-p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
--option build-users-group ""
# `nixos-rebuild' requires an /etc/NIXOS.
mkdir -p /mnt/etc

2
nixos/release-small.nix
View File

@ -61,12 +61,12 @@ in rec {
gettext
git
imagemagick
jdk
linux
mysql51
mysql55
nginx
nodejs
openjdk
openssh
php
postgresql92

19
pkgs/applications/audio/faust-compiler/default.nix
View File

@ -1,14 +1,23 @@
{ fetchurl, stdenv, unzip, pkgconfig, makeWrapper, libsndfile, libmicrohttpd, vim }:
{ fetchgit, stdenv, unzip, pkgconfig, makeWrapper, libsndfile, libmicrohttpd, vim }:
stdenv.mkDerivation rec {
version = "0.9.67";
version = "8-1-2015";
name = "faust-compiler-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip";
sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";
src = fetchgit {
url = git://git.code.sf.net/p/faudiostream/code;
rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce";
sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0";
};
# this version has a bug that manifests when doing faust2jack:
/*version = "0.9.67";*/
/*name = "faust-compiler-${version}";*/
/*src = fetchurl {*/
/*url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip";*/
/*sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";*/
/*};*/
buildInputs = [ unzip pkgconfig makeWrapper libsndfile libmicrohttpd vim];

47
pkgs/applications/audio/faust/default.nix
View File

@ -1,21 +1,32 @@
{ fetchurl, stdenv, bash, alsaLib, atk, cairo, faust-compiler, fontconfig, freetype
, gcc, gdk_pixbuf, glib, gtk, makeWrapper, pango, pkgconfig, unzip
{ fetchgit, stdenv, bash, alsaLib, atk, cairo, faust-compiler, fontconfig, freetype
, gcc, gdk_pixbuf, glib, gtk, jack2, makeWrapper, opencv, pango, pkgconfig, unzip
, gtkSupport ? true
, jackaudioSupport ? true
}:
stdenv.mkDerivation rec {
version = "0.9.67";
version = "8-1-2015";
name = "faust-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip";
sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";
src = fetchgit {
url = git://git.code.sf.net/p/faudiostream/code;
rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce";
sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0";
};
# this version has a bug that manifests when doing faust2jack:
/*version = "0.9.67";*/
/*name = "faust-${version}";*/
/*src = fetchurl {*/
/*url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip";*/
/*sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";*/
/*};*/
buildInputs = [ bash unzip faust-compiler gcc makeWrapper pkgconfig ]
++ stdenv.lib.optionals gtkSupport [
alsaLib atk cairo fontconfig freetype gdk_pixbuf glib gtk pango
]
++ stdenv.lib.optional jackaudioSupport jack2
;
makeFlags="PREFIX=$(out)";
@ -24,11 +35,15 @@ stdenv.mkDerivation rec {
phases = [ "unpackPhase installPhase postInstall" ];
installPhase = ''
sed -i 23,24d tools/faust2appls/faust2jack
mkdir $out/bin
install tools/faust2appls/faust2alsaconsole $out/bin
install tools/faust2appls/faustpath $out/bin
install tools/faust2appls/faustoptflags $out/bin
install tools/faust2appls/faust2alsa $out/bin
install tools/faust2appls/faust2jack $out/bin
patchShebangs $out/bin
wrapProgram $out/bin/faust2alsaconsole \
--prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig \
@ -41,17 +56,23 @@ stdenv.mkDerivation rec {
--prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig:$GTK_PKGCONFIG_PATHS \
--set FAUSTLIB ${faust-compiler}/lib/faust \
--set FAUSTINC ${faust-compiler}/include/ \
'' + stdenv.lib.optionalString (!gtkSupport) "rm $out/bin/faust2alsa"
;
wrapProgram $out/bin/faust2jack \
--prefix PKG_CONFIG_PATH : ${jack2}/lib/pkgconfig:${opencv}/lib/pkgconfig:$GTK_PKGCONFIG_PATHS \
--set FAUSTLIB ${faust-compiler}/lib/faust \
--set FAUSTINC ${faust-compiler}/include/ \
''
+ stdenv.lib.optionalString (!gtkSupport) "rm $out/bin/faust2alsa"
+ stdenv.lib.optionalString (!gtkSupport || !jackaudioSupport) "rm $out/bin/faust2jack"
;
postInstall = ''
find $out/bin/ -name "faust2*" -type f | xargs sed "s@/bin/bash@${bash}/bin/bash@g" -i
sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustpath
sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@${faust-compiler}@g" -i $out/bin/faustpath
sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustoptflags
find $out/bin/ -name "faust2*" -type f | xargs sed "s@pkg-config@${pkgconfig}/bin/pkg-config@g" -i
find $out/bin/ -name "faust2*" -type f | xargs sed "s@CXX=g++@CXX=${gcc}/bin/g++@g" -i
find $out/bin/ -name "faust2*" -type f | xargs sed "s@faust -i -a @${faust-compiler}/bin/faust -i -a ${faust-compiler}/lib/faust/@g" -i
find $out/bin/ -name "*faust2*" -type f | xargs sed "s@pkg-config@${pkgconfig}/bin/pkg-config@g" -i
find $out/bin/ -name "*faust2*" -type f | xargs sed "s@CXX=g++@CXX=${gcc}/bin/g++@g" -i
find $out/bin/ -name "*faust2*" -type f | xargs sed "s@faust -i -a @${faust-compiler}/bin/faust -i -a ${faust-compiler}/lib/faust/@g" -i
'';
meta = with stdenv.lib; {

28
pkgs/applications/audio/fmit/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, alsaLib, cmake, fftw, freeglut, jack2, libXmu, qt4 }:
stdenv.mkDerivation rec {
version = "0.99.5";
name = "fmit-${version}";
src = fetchurl {
url = "http://download.gna.org/fmit/${name}-Source.tar.bz2";
sha256 = "1rc84gi27jmq2smhk0y0p2xyypmsz878vi053iqns21k848g1491";
};
# Also update longDescription when adding/removing sound libraries
buildInputs = [ alsaLib cmake fftw freeglut jack2 libXmu qt4 ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Free Musical Instrument Tuner";
longDescription = ''
Software for tuning musical instruments. Uses Qt as GUI library and
ALSA or JACK as sound input library.
'';
homepage = http://home.gna.org/fmit/index.html;
license = with licenses; gpl3Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};
}

4
pkgs/applications/audio/lmms/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "lmms-${version}";
version = "1.0.3";
version = "1.1.0";
src = fetchurl {
url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz";
sha256 = "191mfld3gspnxlgwcszp9kls58kdwrplj0rfw4zqsz90zdbsjnx3";
sha256 = "0kck8aapw1m0jbwd20bwwgbs27z518vv09zs1pjm3v8vnkaxlx65";
};
buildInputs = [

3
pkgs/applications/audio/mp3gain/default.nix
View File

@ -14,8 +14,7 @@ stdenv.mkDerivation {
buildFlags = [ "OSTYPE=linux" ];
installPhase = ''
mkdir -p $out/usr/bin
cp mp3gain $out/usr/bin
install -vD mp3gain "$out/bin/mp3gain"
'';
meta = {

26
pkgs/applications/audio/mpg321/default.nix
View File

@ -1,20 +1,28 @@
{stdenv, fetchurl, libao, libmad, libid3tag, zlib}:
{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}:
stdenv.mkDerivation rec {
name = "mpg321-0.2.13-2";
name = "mpg321-${version}";
version = "0.3.2";
src = fetchurl {
url = "mirror://sourceforge/mpg321/0.2.13/${name}.tar.gz";
sha256 = "0zx9xyr97frlyrwyk2msm9h1sn2b84vqaxcy5drbzcd2n585lwlx";
url = "mirror://sourceforge/mpg321/${version}/mpg321_${version}.orig.tar.gz";
sha256 = "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5";
};
buildInputs = [libao libid3tag libmad zlib];
configureFlags = [
("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no"))
];
meta = {
buildInputs = [libao libid3tag libmad zlib]
++ stdenv.lib.optional stdenv.isLinux alsaLib;
installTargets = "install install-man";
meta = with stdenv.lib; {
description = "Command-line MP3 player";
homepage = http://mpg321.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu;
license = licenses.gpl2;
maintainers = [ maintainers.rycee ];
platforms = platforms.gnu;
};
}

11
pkgs/applications/audio/pianobar/default.nix
View File

@ -1,15 +1,15 @@
{ fetchurl, stdenv, pkgconfig, libao, faad2, libmad, readline, json_c, libgcrypt, gnutls }:
{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, gnutls, libav }:
stdenv.mkDerivation rec {
name = "pianobar-2013.05.19";
name = "pianobar-2014.09.28";
src = fetchurl {
url = "http://6xq.net/projects/pianobar/${name}.tar.bz2";
sha256 = "cf88e82663d2b0aa4d73e761506eac4f3e7bc789b57d92377acd994d785e1046";
sha256 = "6bd10218ad5d68c4c761e02c729627d2581b4a6db559190e7e52dc5df177e68f";
};
buildInputs = [
pkgconfig libao faad2 libmad json_c libgcrypt gnutls
pkgconfig libao json_c libgcrypt gnutls libav
];
makeFlags="PREFIX=$(out)";
@ -17,10 +17,13 @@ stdenv.mkDerivation rec {
CC = "gcc";
CFLAGS = "-std=c99";
configurePhase = "export CC=${CC}";
meta = {
description = "A console front-end for Pandora.com";
homepage = "http://6xq.net/projects/pianobar/";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit; # expat version
maintainers = stdenv.lib.maintainers.eduarrrd;
};
}

4
pkgs/applications/audio/yoshimi/default.nix
View File

@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
sha256 = "1zxblcl6ffwwzxh3d17hw1mp398b73wk5bsagdmx5gph038gdh7y";
sha256 = "1nj71xmjgr0pdqwv6h9kigdvljh8hggy6az9rnd7f64r13nmrphl";
};
buildInputs = [

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

@ -1,6 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXext, libXrender, zlib
, glib, gtk, libXtst, jre
, webkitgtk2 ? null # for internal web browser
}:
assert stdenv ? glibc;
@ -44,7 +45,7 @@ let
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jre}/bin \
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib \
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
# Create desktop item.

13
pkgs/applications/editors/emacs-24/at-fdcwd.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
index 5cdb813..7a272e8 100644
--- a/lib/careadlinkat.h
+++ b/lib/careadlinkat.h
@@ -23,6 +23,8 @@
#include <fcntl.h>
#include <unistd.h>
+#define AT_FDCWD -2
+
struct allocator;
/* Assuming the current directory is FD, get the symbolic link value

5
pkgs/applications/editors/emacs-24/default.nix
View File

@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7";
};
patches = [ ./darwin-new-sections.patch ];
patches = stdenv.lib.optionals stdenv.isDarwin [
./darwin-new-sections.patch
./at-fdcwd.patch
];
buildInputs =
[ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]

32
pkgs/applications/editors/emacs-modes/d/default.nix Normal file
View File

@ -0,0 +1,32 @@
{stdenv, fetchurl, emacs}:
# Note: Don't have a version, using date as fallback.
let version = "20150111";
in stdenv.mkDerivation {
name = "emacs-d-${version}";
src = fetchurl {
url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz";
sha256 = "0vb0za51lc6qf1qgqisap4vzk36caa5k17zajjn034rhjsqfw0w7";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs -L . --batch -f batch-byte-compile *.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install *.el *.elc $out/share/emacs/site-lisp
'';
meta = {
description = "Major mode for editing D code";
homepage = https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
};
}

26
pkgs/applications/editors/idea/default.nix
View File

@ -70,9 +70,7 @@ let
cp -va . "$out/$name"
ln -s "$out/$name/bin/${loName}.png" "$out/share/pixmaps/"
[ -d ${jdk}/lib/openjdk ] \
&& jdk=${jdk}/lib/openjdk \
|| jdk=${jdk}
jdk=${jdk.home}
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \
--prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
@ -204,50 +202,50 @@ in
android-studio = buildAndroidStudio rec {
name = "android-studio-${version}";
version = "1.0.0-rc1";
build = "135.1598475";
version = "1.0.2";
build = "135.1653844";
description = "Android development environment based on IntelliJ IDEA";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
"/android-studio-ide-${build}-linux.zip";
sha256 = "1d0gj9c2hkrcij79xv8i5fy1z8zss1fp8szjp6h7z7zak989rsrf";
sha256 = "0y20gp5444c2lwyzhlppjpkb657qbgpskj31lwyfhx6xyqy83159";
};
};
clion = buildClion rec {
name = "clion";
version = "eap";
build = "140.569.17";
build = "140.1221.2";
description = "C/C++ IDE. New. Intelligent. Cross-platform.";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "http://download.jetbrains.com/cpp/${name}-${build}.tar.gz";
sha256 = "1y4137dxbydf3g5s6c58bf015k2q7dsl8h4n0q2llqj5bprwcr23";
sha256 = "0gf809plnw89dgn47j6hsh5nv0bpdynjnl1rg8wv7jaz2zx9bqcg";
};
};
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "14.0.1";
build = "IC-139.225";
version = "14.0.2";
build = "IC-139.659";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "166m55q33q4jwfvzwxm8mak6ic32h63bvpxdnjd41si6bs19ynvg";
sha256 = "0g8f66bdxdmsbv2r1jc308by5ca92ifczprf0gwy5bs2xsvxxwlf";
};
};
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "14.0.1";
build = "IU-139.225";
version = "14.0.2";
build = "IU-139.659";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "0hh84f3297ak63n2kv76xv1rnf1fhjws9d3b2r5pwzgfd78zja4q";
sha256 = "0swd3lyrlcdlsgp350sa741bkmndlck1ss429f9faf3hm4s2y0k5";
};
};

2
pkgs/applications/editors/jedit/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation {
patch package-files/linux/jedit << EOF
5a6,8
> # specify the correct JAVA_HOME
> JAVA_HOME=${jdk.jre}/lib/openjdk/jre
> JAVA_HOME=${jdk.jre.home}/jre
>
EOF
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit

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

@ -26,8 +26,8 @@ stdenv.mkDerivation {
mkdir -p $out/bin
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
--prefix PATH : ${jdk}/bin:${which}/bin \
--prefix JAVA_HOME : ${jdk}/lib/openjdk \
--add-flags "--jdkhome ${jdk}/lib/openjdk"
--prefix JAVA_HOME : ${jdk.home} \
--add-flags "--jdkhome ${jdk.home}"
# Create desktop item, so we can pick it from the KDE/GNOME menu
mkdir -p $out/share/applications

4
pkgs/applications/graphics/darktable/default.nix
View File

@ -9,12 +9,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.6.0";
version = "1.6.1";
name = "darktable-${version}";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
sha256 = "0zjrcd9a73ikn9g8yx9lixz1ifwbmy2vg2ipc24lnkpqhrbb1y1b";
sha256 = "1iijbrq2chqwvvb8nv744fg1q1c9iflrw8jbc7rhj97jdmdyqwhk";
};
buildInputs =

12
pkgs/applications/graphics/geeqie/default.nix
View File

@ -1,22 +1,20 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gtk, libpng, exiv2
{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2
, lcms, intltool, gettext, libchamplain, fbida
}:
stdenv.mkDerivation rec {
name = "geeqie-${version}";
version = "1.2";
version = "1.1";
src = fetchurl {
url = mirror://debian/pool/main/g/geeqie/geeqie_1.2.orig.tar.gz;
sha256 = "0wkcpyh3f6ig36x1q6h9iqgq225w37visip48m72j8rpghmv1rn3";
url = "mirror://sourceforge/geeqie/${name}.tar.gz";
sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m";
};
configureFlags = [ "--enable-gps" ];
preConfigure = "./autogen.sh";
buildInputs = [
autoconf automake libtool pkgconfig gtk libpng exiv2 lcms intltool gettext
pkgconfig gtk libpng exiv2 lcms intltool gettext
#libchamplain
];

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

@ -10,11 +10,11 @@
with lib;
stdenv.mkDerivation rec {
name = "blender-2.72b";
name = "blender-2.73";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "0ixz8h3c08p4f84x8r85nzddwvc0h5lw1ci8gdg2x3m2mw2cfdj4";
sha256 = "140fcxjb73gim430v08021ls3civ3yghld63ljkgxi5vaww1cq95";
};
patches = [(fetchpatch {
@ -42,6 +42,10 @@ stdenv.mkDerivation rec {
"-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
"-DWITH_INSTALL_PORTABLE=OFF"
"-DWITH_FFTW3=ON"
"-DWITH_SDL=ON"
"-DWITH_GAMEENGINE=ON"
"-DWITH_OPENCOLORIO=ON"
"-DPYTHON_LIBRARY=python${python.majorVersion}m"
"-DPYTHON_LIBPATH=${python}/lib"
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"

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

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-2.13.0";
name = "calibre-2.15.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "0sd9yanl4n1bmbxpvdvl68bisp0bgvfk6naddkvcahy9h7qc6h33";
sha256 = "1gq2d9vkxs9i83zqhn45j33irj13yw873cmpw41ivyplx8kzdh5s";
};
inherit python;

6
pkgs/applications/misc/k3b/default.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "k3b-2.0.2";
name = "k3b-2.0.3a";
src = fetchurl {
url = "mirror://sourceforge/k3b/${name}.tar.bz2";
sha256 = "1kdpylz3w9bg02jg4mjhqz8bq1yb4xi4fqfl9139qcyjq4lny5xg";
url = "http://download.kde.org/stable/k3b/${name}.tar.xz";
sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd";
};
buildInputs =

7
pkgs/applications/misc/mediainfo-gui/default.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
let version = "0.7.71"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
version = "0.7.72";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq";
sha256 = "04sqm2cziqvnghbla89f83vy46bmsfcvlq7f4m4kfcs24bjzfwr1";
};
buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];

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

@ -1,12 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
let version = "0.7.71"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
version = "0.7.72";
name = "mediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq";
sha256 = "04sqm2cziqvnghbla89f83vy46bmsfcvlq7f4m4kfcs24bjzfwr1";
};
buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];

4
pkgs/applications/misc/pgadmin/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pgadmin3-${version}";
version = "1.18.1";
version = "1.20.0";
src = fetchurl {
url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
sha256 = "1h6bqslw53q44vy7z1q7wmxkgqdzxacfs8pfm2fxm8vcd8lkxb17";
sha256 = "133bcbx9a322adldd1498h8bn2wfk45v1sbj9269jylwda1dfwq7";
};
buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qt }:
let
version = "1.08.02";
version = "1.08.03";
in
stdenv.mkDerivation {
name = "qtbitcointrader-${version}";
@ -9,8 +9,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "JulyIGHOR";
repo = "QtBitcoinTrader";
rev = "452db3ee9447b8f9e7d63253f834b31394b23d92";
sha256 = "1l2a021dy2j4sr4nmq7wn27r2zli9nigwbviqzain3nlyzq9fjpg";
rev = "ee30cf158fa8535f2155a387558d3b8994728c28";
sha256 = "0kxb0n11agqid0nyqdspfndm03b8l0nl8x4yx2hsrizs6m5z08h4";
};
buildInputs = [ qt ];
@ -29,7 +29,7 @@ stdenv.mkDerivation {
{ description = "Secure bitcoin trading client";
homepage = https://centrabit.com/;
license = licenses.lgpl3;
platforms = platforms.linux; # arbitrary choice
platforms = qt.meta.platforms;
maintainers = [ maintainers.emery ];
};
}

44
pkgs/applications/misc/workrave/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv, fetchurl, autoconf, automake, gettext, intltool, libtool, pkgconfig,
libXtst, cheetah, libXScrnSaver,
glib, glibmm,
gtk, gtkmm,
atk,
pango, pangomm,
cairo, cairomm,
dbus, dbus_glib,
GConf, gconfmm,
gdome2, gstreamer, libsigcxx }:
stdenv.mkDerivation rec {
version = "v1_10_6";
name = "workrave-${version}";
src = fetchurl {
url = "http://github.com/rcaelers/workrave/archive/${version}.tar.gz";
sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq";
};
buildInputs = [
autoconf automake gettext intltool libtool pkgconfig libXtst cheetah
libXScrnSaver
glib glibmm gtk gtkmm atk pango pangomm cairo cairomm
dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx
];
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
description = "A program to help prevent Repetitive Strain Injury";
longDescription = ''
Workrave is a program that assists in the recovery and prevention of
Repetitive Strain Injury (RSI). The program frequently alerts you to
take micro-pauses, rest breaks and restricts you to your daily limit.
'';
homepage = http://www.workrave.org/;
downloadPage = https://github.com/rcaelers/workrave/releases;
license = licenses.gpl3;
maintainers = with maintainers; [ prikhi ];
platforms = platforms.linux;
};
}

8
pkgs/applications/misc/zathura/core/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon }:
{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite }:
stdenv.mkDerivation rec {
version = "0.3.1";
version = "0.3.2";
name = "zathura-core-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "1wwjj7vnzpkvn83674mapapvl2qsn7y44w17lq63283j1lic00mm";
sha256 = "1qk5s7cyqp4l673yhma5igk9g24p5jyqyy81fdk7q7xjqlym19px";
};
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite ];
makeFlags = [
"PREFIX=$(out)"

6
pkgs/applications/networking/bittorrentsync/default.nix
View File

@ -5,15 +5,15 @@ let
else if stdenv.system == "i686-linux" then "i386"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
sha256 = if stdenv.system == "x86_64-linux" then "0hiapq24y02pm7zi0jvqj4jxwdn5k74yxq9n1jpv8jmgir3iwznn"
else if stdenv.system == "i686-linux" then "0jv3zg0jhdzsc56kkpylwihvhsz73gsl2i2pjmqk3r3x4gwjk8xx"
sha256 = if stdenv.system == "x86_64-linux" then "1prs3r6xcxq31xfdp3w2wdi3d7r6lw5r4d4zay2cwphmp4kpg3qg"
else if stdenv.system == "i686-linux" then "09rn95qvkdwlzqq11hqfq4i5cam6dip7ww1wd5dpyirzn8yw7cfh"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
in
stdenv.mkDerivation rec {
name = "btsync-${version}";
version = "1.4.103";
version = "1.4.106";
src = fetchurl {
url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";

13
pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
View File

@ -272,3 +272,16 @@ index 9345287..2db659e 100644
static const long kSUIDSandboxApiNumber = 1;
static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ";
diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c
index 7410b71..a83593d 100644
--- a/sandbox/linux/suid/sandbox.c
+++ b/sandbox/linux/suid/sandbox.c
@@ -330,7 +330,7 @@ static bool DropRoot() {
return false;
}
- if (setresgid(rgid, rgid, rgid)) {
+ if (egid != rgid && setresgid(rgid, rgid, rgid)) {
perror("setresgid");
return false;
}

4
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper
, gtk3, webkitgtk, librsvg, libnotify
, gtk3, webkitgtk, librsvg, libnotify, sqlite
, glib_networking, gsettings_desktop_schemas
}:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake pkgconfig intltool vala makeWrapper
webkitgtk librsvg libnotify
webkitgtk librsvg libnotify sqlite
];
cmakeFlags = ''

22
pkgs/applications/networking/enhanced-ctorrent/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "dnh3.3.2";
name = "enhanced-ctorrent";
src = fetchurl {
url = "http://www.rahul.net/dholmes/ctorrent/ctorrent-dnh3.3.2.tar.gz";
sha256 = "0qs8waqwllk56i3yy3zhncy7nsnhmf09a494p5siz4vm2k4ncwy8";
};
meta = {
description = "BitTorrent client written in C++";
longDescription = ''
CTorrent, a BitTorrent client implemented in C++, with bugfixes and
performance enhancements.
'';
homepage = http://www.rahul.net/dholmes/ctorrent/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.devhell ];
};
}

4
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@ -4,11 +4,11 @@
, gsm, speex, portaudio, spandsp, libuuid
}:
stdenv.mkDerivation rec {
version = "0.4.11";
version = "0.4.12";
name = "baresip-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
sha256 = "1ql5h9ily9jncp9w302v3b2ldx613kc60zlqv0v0ln8hsm8q6bc5";
sha256 = "0f4jfpyvlgvq47yha3ys3kbrpd6c20yxaqki70hl6b91jbhmq9i2";
};
buildInputs = [zlib openssl libre librem pkgconfig
cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

3
pkgs/applications/networking/instant-messengers/freetalk/default.nix
View File

@ -11,7 +11,7 @@ let
name="${baseName}-${version}";
url="https://github.com/GNUFreetalk/freetalk";
rev = "refs/tags/v${version}";
sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz";
sha256="0vh6snkd66gdzimdiyy9idhsip60d5xc7qh4w48k7n8h93ydrb2b";
};
buildInputs = [
guile pkgconfig glib loudmouth gmp libidn readline libtool
@ -24,7 +24,6 @@ stdenv.mkDerivation {
inherit buildInputs;
src = fetchgit {
inherit (s) url rev sha256;
name = "git-export-${s.name}";
};
preConfigure = ''

6
pkgs/applications/networking/instant-messengers/mcabber/default.nix
View File

@ -1,4 +1,6 @@
{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr}:
{ stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr
, gpgme
}:
stdenv.mkDerivation rec {
name = "mcabber-${version}";
@ -9,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0vgsqw6yn0lzzcnr4fql4ycgf3gwqj6w4p0l4nqnvhkc94w62ikp";
};
buildInputs = [openssl ncurses pkgconfig glib loudmouth libotr];
buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr";

41
pkgs/applications/networking/instant-messengers/profanity/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat
, ncurses, libotr, curl, libstrophe
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
}:
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk_pixbuf != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "profanity-${version}";
version = "0.4.5";
src = fetchurl {
url = "http://www.profanity.im/profanity-${version}.tar.gz";
sha256 = "0qzwqxcxf695z3gf94psd2x619vlp4hkkjmkrpsla1ns0f6v6dkl";
};
buildInputs = [
automake autoconf pkgconfig
glib openssl expat ncurses libotr curl libstrophe
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk_pixbuf ];
preConfigure = "sh bootstrap.sh";
meta = {
description = "A console based XMPP client";
longDescription = ''
Profanity is a console based XMPP client written in C using ncurses and
libstrophe, inspired by Irssi.
'';
homepage = http://profanity.im/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.devhell ];
};
}

7
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
View File

@ -1,15 +1,16 @@
{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }:
stdenv.mkDerivation rec {
name = "${pname}-5.16.2";
name = "${pname}-5.16.3";
pname = "telepathy-mission-control";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
sha256 = "1sk8f9jfaxgbsniz0n5hmrcwvxla3x8axjcnjbppg7nidk9gijrx";
sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi";
};
buildInputs = [ telepathy_glib makeWrapper upower ]; # ToDo: optional stuff missing
buildInputs = [ telepathy_glib makeWrapper /*upower*/ ]; # ToDo: optional stuff missing
# 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it
nativeBuildInputs = [ pkgconfig libxslt ];

5
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr";
};
buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian sphinx python ]
++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
buildInputs = [ bash emacs glib gmime gnupg pkgconfig talloc xapian sphinx python ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames
++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
patchPhase = ''
find test -type f -exec \

3
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -25,7 +25,8 @@ stdenv.mkDerivation {
++ optional sslSupport openssl
++ optional gpgSupport gpgme;
configureFlags = optionalString sslSupport "--enable-ssl";
configureFlags = optional sslSupport "--enable-ssl"
++ optional gpgSupport "--enable-gpgme";
meta = {
homepage = http://sylpheed.sraoss.jp/en/;

12
pkgs/applications/networking/msmtp/default.nix
View File

@ -1,15 +1,21 @@
{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
stdenv.mkDerivation rec {
name = "msmtp-1.4.32";
version = "1.6.1";
name = "msmtp-${version}";
src = fetchurl {
url = "mirror://sourceforge/msmtp/${name}.tar.bz2";
sha256 = "122z38pv4q03w3mbnhrhg4w85a51258sfdg2ips0b6cgwz3wbw1b";
url = "mirror://sourceforge/msmtp/${name}.tar.xz";
sha256 = "1ws6hdpm8vfq4vwxjwgd8xndx5ax1ppnmxn0fhzlwj3pvkr4fpf4";
};
buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
postInstall = ''
cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/
chmod +x $prefix/bin/msmtp-queue $prefix/bin/msmtpq
'';
meta = {
description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
homepage = "http://msmtp.sourceforge.net/";

6
pkgs/applications/networking/mumble/default.nix
View File

@ -4,10 +4,13 @@
, jack2 ? null
, speechdSupport ? false
, speechd ? null
, pulseSupport ? false
, pulseaudio ? null
}:
assert jackSupport -> jack2 != null;
assert speechdSupport -> speechd != null;
assert pulseSupport -> pulseaudio != null;
let
optional = stdenv.lib.optional;
@ -37,7 +40,8 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 boost protobuf libsndfile speex
libopus avahi pkgconfig ]
++ (optional jackSupport jack2)
++ (optional speechdSupport speechd);
++ (optional speechdSupport speechd)
++ (optional pulseSupport pulseaudio);
installPhase = ''
mkdir -p $out

4
pkgs/applications/networking/pond/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, fetchhg, go, trousers }:
{ stdenv, lib, fetchgit, fetchhg, go_1_3, trousers }:
let deps = import ./deps.nix {
inherit stdenv lib fetchgit fetchhg;
@ -7,7 +7,7 @@ let deps = import ./deps.nix {
in stdenv.mkDerivation rec {
name = "pond";
buildInputs = [ go trousers ];
buildInputs = [ go_1_3 trousers ];
unpackPhase = ''
export GOPATH=$PWD

4
pkgs/applications/networking/remote/ssvnc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, imake, zlib, openjdk, libX11, libXt, libXmu
{ stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu
, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d";
};
buildInputs = [ imake zlib openjdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];
buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];
configurePhase = "makeFlags=PREFIX=$out";

4
pkgs/applications/networking/seafile-client/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec
{
version = "3.0.4";
version = "4.0.6";
name = "seafile-client-${version}";
src = fetchurl
{
url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
sha256 = "10iz45y8j5f9smi0srxw62frb97vhr0w938v8w3rsjcw9qq366a2";
sha256 = "0hx8zjmgj4ki2p5fkdyz32fy8db60p6rvi3my9l59j7fslv71k1z";
};
buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];

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

@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null;
with stdenv.lib;
let
version = "1.12.2";
version = "1.12.3";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in
@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2";
sha256 = "14pjkl1r0lcnhrs8994dmrnpmpr4gn3xjkd8wcn694m512s1dbih";
sha256 = "1sikmjslxl68i3psxikghpff0znjfd6mb07nnn10jqqsrffhp5b9";
};
buildInputs = [

19
pkgs/applications/networking/syncthing/default.nix
View File

@ -1,33 +1,28 @@
{ stdenv, fetchurl, fetchgit, go }:
{ stdenv, fetchgit, go }:
stdenv.mkDerivation rec {
name = "syncthing-${version}";
version = "0.8.15";
version = "0.10.19";
src = fetchgit {
url = "git://github.com/calmh/syncthing.git";
url = "git://github.com/syncthing/syncthing.git";
rev = "refs/tags/v${version}";
sha256 = "0xv8kaji60zqxws72srh5hdi9fyvaipdcsawp6gcyahhr3cz0ddq";
sha256 = "e89d618ddbcbab2a4c6d0430b98e792a1780ebd40c19ee6f4644df2fdeea0601";
};
buildInputs = [ go ];
buildPhase = ''
mkdir -p "./dependencies/src/github.com/calmh/syncthing"
for a in auto buffers cid discover files lamport protocol scanner \
logger beacon config xdr upnp model osutil versioner; do
cp -r "./$a" "./dependencies/src/github.com/calmh/syncthing"
done
mkdir -p "./dependencies/src/github.com/syncthing/syncthing"
cp -r internal "./dependencies/src/github.com/syncthing/syncthing"
export GOPATH="`pwd`/Godeps/_workspace:`pwd`/dependencies"
go test -cpu=1,2,4 ./...
go run build.go test
mkdir ./bin
go build -o ./bin/syncthing -ldflags "-w -X main.Version v${version}" ./cmd/syncthing
go build -o ./bin/stcli -ldflags "-w -X main.Version v${version}" ./cmd/stcli
'';
installPhase = ''

18
pkgs/applications/office/calligra/default.nix
View File

@ -3,6 +3,7 @@
, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4
, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular
, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase
, libodfgen, opencolorio, openjpeg, pstoedit, librevenge
}:
stdenv.mkDerivation rec {
@ -15,22 +16,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl pkgconfig ];
# patches = [ ./fix-kde4.10-build.patch ];
# TODO: package Vc, libWPS, OCIO, OpenShiva, QtShiva, Spnav, m2mml
# TODO: not found popplerQt4
# TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers
# not found: xbase, openjpeg(too new)
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl
shared_desktop_ontologies okular
libvisio kactivities mysql postgresql freetds xbase openexr
];
shared_desktop_ontologies okular libodfgen opencolorio openjpeg
libvisio kactivities mysql postgresql freetds xbase openexr pstoedit
librevenge
];
patches = [ ./librevenge.patch ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
meta = {
description = "A Qt/KDE office suite, formely known as koffice";
description = "Calligra Suite is a set of applications written to help you to accomplish your work. Calligra includes efficient and capable office components: Words for text processing, Sheets for computations, Stage for presentations, Plan for planning, Flow for flowcharts, Kexi for database creation, Krita for painting and raster drawing, and Karbon for vector graphics.";
homepage = http://calligra.org;
maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
inherit (kdelibs.meta) platforms;

36
pkgs/applications/office/calligra/fix-kde4.10-build.patch
View File

@ -1,36 +0,0 @@
From: Andre Woebbeking <Woebbeking@kde.org>
Date: Sun, 13 Jan 2013 15:10:38 +0000
Subject: compile with kdelibs 4.10 (tests are enabled by default)
X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=39fdda6757cbbb35480dec98eac419eb1879cb31
---
compile with kdelibs 4.10 (tests are enabled by default)
---
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,11 +96,6 @@
set(SHOULD_BUILD_ACTIVE FALSE)
ENDIF()
-if(KDE4_BUILD_TESTS)
- # only with this definition will the FOO_TEST_EXPORT macro do something
- add_definitions(-DCOMPILING_TESTS)
-endif(KDE4_BUILD_TESTS)
-
########################
#########################
## Look for KDE and Qt ##
@@ -146,6 +141,11 @@
endif(NOT ${KDE_VERSION} VERSION_GREATER 4.6.4)
macro_ensure_out_of_source_build("Compiling Calligra inside the source directory is not possible. Please refer to the build instruction http://community.kde.org/Calligra/Building/Building_Calligra")
+
+if(KDE4_BUILD_TESTS)
+ # only with this definition will the FOO_TEST_EXPORT macro do something
+ add_definitions(-DCOMPILING_TESTS)
+endif(KDE4_BUILD_TESTS)
###########################
############################

882
pkgs/applications/office/calligra/librevenge.patch Normal file
View File

@ -0,0 +1,882 @@
From 8e8f99cc314435f100d367f41c110becd19d3885 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 27 May 2014 16:15:52 +0200
Subject: [PATCH] switch to librevenge-based import libs
---
CMakeLists.txt | 10 ++++++
cmake/modules/FindLibEtonyek.cmake | 6 ++--
cmake/modules/FindLibOdfGen.cmake | 6 ++--
cmake/modules/FindLibRevenge.cmake | 37 +++++++++++++++++++++
cmake/modules/FindLibVisio.cmake | 6 ++--
cmake/modules/FindLibWpd.cmake | 22 +++----------
cmake/modules/FindLibWpg.cmake | 6 ++--
cmake/modules/FindLibWps.cmake | 6 ++--
filters/flow/visio/import/CMakeLists.txt | 3 +-
filters/flow/visio/import/VSDXImport.cpp | 9 ++---
filters/flow/wpg/import/CMakeLists.txt | 3 +-
filters/flow/wpg/import/WPGImport.cpp | 9 ++---
filters/karbon/wpg/CMakeLists.txt | 4 +--
filters/karbon/wpg/WPGImport.cpp | 39 ++++++++--------------
filters/libodfhandler/DiskDocumentHandler.cxx | 13 ++++----
filters/libodfhandler/DiskDocumentHandler.hxx | 8 ++---
filters/libodfhandler/OutputFileHelper.cxx | 6 ++--
filters/libodfhandler/OutputFileHelper.hxx | 9 ++---
filters/libodfhandler/StdOutHandler.cxx | 13 ++++----
filters/libodfhandler/StdOutHandler.hxx | 8 ++---
filters/stage/keynote/import/CMakeLists.txt | 5 +--
filters/stage/keynote/import/KeyImport.cpp | 15 +++++----
filters/words/wordperfect/import/CMakeLists.txt | 3 +-
filters/words/wordperfect/import/WPDImport.cpp | 44 ++++++++++++++-----------
filters/words/works/import/CMakeLists.txt | 3 +-
filters/words/works/import/WPSImport.cpp | 18 +++++-----
26 files changed, 177 insertions(+), 134 deletions(-)
create mode 100644 cmake/modules/FindLibRevenge.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b6b764..c337864 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -697,6 +697,16 @@ macro_optional_find_package(Okular)
macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/" FALSE "" "Required to build the Okular OpenDocument Presenter plugin")
##
+## Test for librevenge
+##
+macro_optional_find_package(LibRevenge)
+macro_log_feature(LIBREVENGE_FOUND "LibRevenge"
+ "A base library for writing document import filters"
+ "http://sf.net/p/libwpd/librevenge/" FALSE ""
+ "Required by various import filters"
+)
+
+##
## Test for libodfgen
##
macro_optional_find_package(LibOdfGen)
diff --git a/cmake/modules/FindLibEtonyek.cmake b/cmake/modules/FindLibEtonyek.cmake
index 5b78964..ad10d79 100644
--- a/cmake/modules/FindLibEtonyek.cmake
+++ b/cmake/modules/FindLibEtonyek.cmake
@@ -10,16 +10,16 @@
include(LibFindMacros)
libfind_package(LIBETONYEK LibWpd)
-libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.0)
+libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.1)
find_path(LIBETONYEK_INCLUDE_DIR
NAMES libetonyek/libetonyek.h
HINTS ${LIBETONYEK_PKGCONF_INCLUDE_DIRS} ${LIBETONYEK_PKGCONF_INCLUDEDIR}
- PATH_SUFFIXES libetonyek-0.0
+ PATH_SUFFIXES libetonyek-0.1
)
find_library(LIBETONYEK_LIBRARY
- NAMES etonyek etonyek-0.0
+ NAMES etonyek etonyek-0.1
HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR}
)
diff --git a/cmake/modules/FindLibOdfGen.cmake b/cmake/modules/FindLibOdfGen.cmake
index 9ab80d1..355c345 100644
--- a/cmake/modules/FindLibOdfGen.cmake
+++ b/cmake/modules/FindLibOdfGen.cmake
@@ -9,16 +9,16 @@
# Redistribution and use is allowed according to the terms of the BSD license.
include(LibFindMacros)
-libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.0)
+libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.1)
find_path(LIBODFGEN_INCLUDE_DIR
NAMES libodfgen/libodfgen.hxx
HINTS ${LIBODFGEN_PKGCONF_INCLUDE_DIRS} ${LIBODFGEN_PKGCONF_INCLUDEDIR}
- PATH_SUFFIXES libodfgen-0.0
+ PATH_SUFFIXES libodfgen-0.1
)
find_library(LIBODFGEN_LIBRARY
- NAMES odfgen-0.0
+ NAMES odfgen-0.1
HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR}
)
diff --git a/cmake/modules/FindLibRevenge.cmake b/cmake/modules/FindLibRevenge.cmake
new file mode 100644
index 0000000..8ed18b1
--- /dev/null
+++ b/cmake/modules/FindLibRevenge.cmake
@@ -0,0 +1,37 @@
+# - Try to find the librevenge
+# Once done this will define
+#
+# LIBREVENGE_FOUND - system has LIBREVENGE
+# LIBREVENGE_INCLUDE_DIRS - the LIBREVENGE include directory
+# LIBREVENGE_LIBRARIES - Link these to use LIBREVENGE
+# LIBREVENGE_DEFINITIONS - Compiler switches required for using LIBREVENGE
+#
+
+include(LibFindMacros)
+libfind_pkg_check_modules(REVENGE_PKGCONF librevenge-0.0)
+
+find_path(REVENGE_INCLUDE_DIR
+ NAMES librevenge/librevenge.h
+ HINTS ${REVENGE_PKGCONF_INCLUDE_DIRS} ${REVENGE_PKGCONF_INCLUDEDIR}
+ PATH_SUFFIXES librevenge-0.0
+)
+
+find_path(REVENGE_STREAM_INCLUDE_DIR
+ NAMES librevenge-stream/librevenge-stream.h
+ HINTS ${REVENGE_STREAM_PKGCONF_INCLUDE_DIRS} ${REVENGE_STREAM_PKGCONF_INCLUDEDIR}
+ PATH_SUFFIXES librevenge-0.0
+)
+
+find_library(REVENGE_LIBRARY
+ NAMES revenge librevenge revenge-0.0 librevenge-0.0
+ HINTS ${REVENGE_STREAM_PKGCONF_LIBRARY_DIRS} ${REVENGE_STREAM_PKGCONF_LIBDIR}
+)
+
+find_library(REVENGE_STREAM_LIBRARY
+ NAMES revenge-stream librevenge-stream revenge-stream-0.0 librevenge-stream-0.0
+ HINTS ${REVENGE_PKGCONF_LIBRARY_DIRS} ${REVENGE_PKGCONF_LIBDIR}
+)
+
+set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY)
+set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR)
+libfind_process(LIBREVENGE)
diff --git a/cmake/modules/FindLibVisio.cmake b/cmake/modules/FindLibVisio.cmake
index a8533ee..49871b3 100644
--- a/cmake/modules/FindLibVisio.cmake
+++ b/cmake/modules/FindLibVisio.cmake
@@ -12,16 +12,16 @@
include(LibFindMacros)
libfind_package(LIBWPD LibWpd)
libfind_package(LIBWPG LibWpg)
-libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.0)
+libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.1)
find_path(LIBVISIO_INCLUDE_DIR
NAMES libvisio/libvisio.h
HINTS ${LIBVISIO_PKGCONF_INCLUDE_DIRS} ${LIBVISIO_PKGCONF_INCLUDEDIR}
- PATH_SUFFIXES libvisio-0.0
+ PATH_SUFFIXES libvisio-0.1
)
find_library(LIBVISIO_LIBRARY
- NAMES visio visio-0.0
+ NAMES visio visio-0.1
HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR}
)
diff --git a/cmake/modules/FindLibWpd.cmake b/cmake/modules/FindLibWpd.cmake
index 2a324cc..ed9bc26 100644
--- a/cmake/modules/FindLibWpd.cmake
+++ b/cmake/modules/FindLibWpd.cmake
@@ -8,31 +8,19 @@
#
include(LibFindMacros)
-libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.9)
-libfind_pkg_check_modules(WPD_STREAM_PKGCONF libwpd-stream-0.9)
+libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.10)
find_path(WPD_INCLUDE_DIR
NAMES libwpd/libwpd.h
HINTS ${WPD_PKGCONF_INCLUDE_DIRS} ${WPD_PKGCONF_INCLUDEDIR}
- PATH_SUFFIXES libwpd-0.9
-)
-
-find_path(WPD_STREAM_INCLUDE_DIR
- NAMES libwpd-stream/libwpd-stream.h
- HINTS ${WPD_STREAM_PKGCONF_INCLUDE_DIRS} ${WPD_STREAM_PKGCONF_INCLUDEDIR}
- PATH_SUFFIXES libwpd-0.9
+ PATH_SUFFIXES libwpd-0.10
)
find_library(WPD_LIBRARY
- NAMES wpd libwpd wpd-0.9 libwpd-0.9
+ NAMES wpd libwpd wpd-0.10 libwpd-0.10
HINTS ${WPD_PKGCONF_LIBRARY_DIRS} ${WPD_PKGCONF_LIBDIR}
)
-find_library(WPD_STREAM_LIBRARY
- NAMES wpd-stream libwpd-stream wpd-stream-0.9 libwpd-stream-0.9
- HINTS ${WPD_STREAM_PKGCONF_LIBRARY_DIRS} ${WPD_STREAM_PKGCONF_LIBDIR}
-)
-
-set(LIBWPD_PROCESS_LIBS WPD_LIBRARY WPD_STREAM_LIBRARY)
-set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR WPD_STREAM_INCLUDE_DIR)
+set(LIBWPD_PROCESS_LIBS WPD_LIBRARY)
+set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR)
libfind_process(LIBWPD)
diff --git a/cmake/modules/FindLibWpg.cmake b/cmake/modules/FindLibWpg.cmake
index 56d9302..16c2a1c 100644
--- a/cmake/modules/FindLibWpg.cmake
+++ b/cmake/modules/FindLibWpg.cmake
@@ -11,16 +11,16 @@
include(LibFindMacros)
libfind_package(LIBWPG LibWpd)
-libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.2)
+libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.3)
find_path(LIBWPG_INCLUDE_DIR
NAMES libwpg/libwpg.h
HINTS ${LIBWPG_PKGCONF_INCLUDE_DIRS} ${LIBWPG_PKGCONF_INCLUDEDIR}
- PATH_SUFFIXES libwpg-0.2
+ PATH_SUFFIXES libwpg-0.3
)
find_library(LIBWPG_LIBRARY
- NAMES wpg wpg-0.2
+ NAMES wpg wpg-0.3
HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR}
)
diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
index 149f34c..f8c8225 100644
--- a/cmake/modules/FindLibWps.cmake
+++ b/cmake/modules/FindLibWps.cmake
@@ -10,16 +10,16 @@
include(LibFindMacros)
libfind_package(LIBWPS LibWpd)
-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.2)
+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
find_path(LIBWPS_INCLUDE_DIR
NAMES libwps/libwps.h
HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
- PATH_SUFFIXES libwps-0.2
+ PATH_SUFFIXES libwps-0.3
)
find_library(LIBWPS_LIBRARY
- NAMES wps wps-0.2
+ NAMES wps wps-0.3
HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
)
diff --git a/filters/flow/visio/import/CMakeLists.txt b/filters/flow/visio/import/CMakeLists.txt
index 1de4385..4c2a391 100644
--- a/filters/flow/visio/import/CMakeLists.txt
+++ b/filters/flow/visio/import/CMakeLists.txt
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
${LIBODFGEN_INCLUDE_DIRS}
+ ${LIBREVENGE_INCLUDE_DIRS}
${LIBVISIO_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
)
@@ -15,7 +16,7 @@ set(vsdx2odg_PART_SRCS
kde4_add_plugin(calligra_filter_vsdx2odg ${vsdx2odg_PART_SRCS})
-target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBVISIO_LIBRARIES})
+target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBVISIO_LIBRARIES})
install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/filters/flow/visio/import/VSDXImport.cpp b/filters/flow/visio/import/VSDXImport.cpp
index 70a54d9..eb3a208 100644
--- a/filters/flow/visio/import/VSDXImport.cpp
+++ b/filters/flow/visio/import/VSDXImport.cpp
@@ -17,7 +17,7 @@
#include "VSDXImport.h"
#include <libvisio/libvisio.h>
-#include <libodfgen/OdgGenerator.hxx>
+#include <libodfgen/libodfgen.hxx>
#include "OutputFileHelper.hxx"
#include <KoFilterChain.h>
@@ -39,7 +39,7 @@ public:
~OdgOutputFileHelper() {}
private:
- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
+ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
{
if (!libvisio::VisioDocument::isSupported(input))
{
@@ -49,9 +49,10 @@ private:
return true;
}
- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
+ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
{
- OdgGenerator exporter(handler, streamType);
+ OdgGenerator exporter;
+ exporter.addDocumentHandler(handler, streamType);
return libvisio::VisioDocument::parse(input, &exporter);
}
};
diff --git a/filters/flow/wpg/import/CMakeLists.txt b/filters/flow/wpg/import/CMakeLists.txt
index 524d1b1..e2ee2a5 100644
--- a/filters/flow/wpg/import/CMakeLists.txt
+++ b/filters/flow/wpg/import/CMakeLists.txt
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
${LIBODFGEN_INCLUDE_DIRS}
+ ${LIBREVENGE_INCLUDE_DIRS}
${LIBVISIO_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
)
@@ -15,7 +16,7 @@ set(wpg2odg_PART_SRCS
kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS})
-target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBWPG_LIBRARIES})
+target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPG_LIBRARIES})
install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/filters/flow/wpg/import/WPGImport.cpp b/filters/flow/wpg/import/WPGImport.cpp
index b4e0fa7..563ae6e 100644
--- a/filters/flow/wpg/import/WPGImport.cpp
+++ b/filters/flow/wpg/import/WPGImport.cpp
@@ -17,7 +17,7 @@
#include "WPGImport.h"
#include <libwpg/libwpg.h>
-#include <libodfgen/OdgGenerator.hxx>
+#include <libodfgen/libodfgen.hxx>
#include "OutputFileHelper.hxx"
#include <KoFilterChain.h>
@@ -39,7 +39,7 @@ public:
~OdgOutputFileHelper() {}
private:
- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
+ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
{
if (!libwpg::WPGraphics::isSupported(input))
{
@@ -49,9 +49,10 @@ private:
return true;
}
- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
+ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
{
- OdgGenerator exporter(handler, streamType);
+ OdgGenerator exporter;
+ exporter.addDocumentHandler(handler, streamType);
return libwpg::WPGraphics::parse(input, &exporter);
}
};
diff --git a/filters/karbon/wpg/CMakeLists.txt b/filters/karbon/wpg/CMakeLists.txt
index 5f578e9..ffa7742 100644
--- a/filters/karbon/wpg/CMakeLists.txt
+++ b/filters/karbon/wpg/CMakeLists.txt
@@ -1,11 +1,11 @@
-include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
+include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBREVENGE_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
set(wpg2svg_PART_SRCS WPGImport.cpp)
kde4_add_plugin(calligra_filter_wpg2svg ${wpg2svg_PART_SRCS})
-target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${LIBWPD_LIBRARIES})
+target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBREVENGE_LIBRARIES})
install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/filters/karbon/wpg/WPGImport.cpp b/filters/karbon/wpg/WPGImport.cpp
index f1852ee..4457bec 100644
--- a/filters/karbon/wpg/WPGImport.cpp
+++ b/filters/karbon/wpg/WPGImport.cpp
@@ -32,14 +32,12 @@
#include <QString>
#include <QFile>
+#include <librevenge/librevenge.h>
+#include <librevenge-stream/librevenge-stream.h>
+
#include <libwpg/libwpg.h>
-#if LIBWPG_VERSION_MINOR<2
-#include <libwpg/WPGStreamImplementation.h>
-#else
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
-#endif
+#include <cassert>
#include <iostream>
K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
@@ -63,39 +61,29 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
if (to != "image/svg+xml")
return KoFilter::NotImplemented;
-#if LIBWPG_VERSION_MINOR<2
- WPXInputStream* input = new libwpg::WPGFileStream(m_chain->inputFile().toLocal8Bit());
- if (input->isOLEStream()) {
- WPXInputStream* olestream = input->getDocumentOLEStream();
- if (olestream) {
- delete input;
- input = olestream;
- }
- }
- libwpg::WPGString output;
-#else
- WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
- if (input->isOLEStream()) {
- WPXInputStream* olestream = input->getDocumentOLEStream("Anything");
+ librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(m_chain->inputFile().toLocal8Bit());
+ if (input->isStructured()) {
+ librevenge::RVNGInputStream* olestream = input->getSubStreamByName("Anything");
if (olestream) {
delete input;
input = olestream;
}
}
- ::WPXString output;
-#endif
-
if (!libwpg::WPGraphics::isSupported(input)) {
kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
delete input;
return KoFilter::NotImplemented;
}
- if (!libwpg::WPGraphics::generateSVG(input, output)) {
+ ::librevenge::RVNGStringVector output;
+ librevenge::RVNGSVGDrawingGenerator generator(output, "");
+
+ if (!libwpg::WPGraphics::parse(input, &generator)) {
kWarning() << "ERROR: SVG Generation failed!";
delete input;
return KoFilter::ParsingError;
}
+ assert(1 == output.size());
delete input;
@@ -104,7 +92,8 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
return KoFilter::InternalError;
}
- outputFile.write(output.cstr());
+ outputFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
+ outputFile.write(output[0].cstr());
outputFile.close();
return KoFilter::OK;
diff --git a/filters/libodfhandler/DiskDocumentHandler.cxx b/filters/libodfhandler/DiskDocumentHandler.cxx
index e035fdc..f8ca273 100644
--- a/filters/libodfhandler/DiskDocumentHandler.cxx
+++ b/filters/libodfhandler/DiskDocumentHandler.cxx
@@ -37,7 +37,7 @@ DiskOdfDocumentHandler::DiskOdfDocumentHandler(FemtoZip *pOutput) :
{
}
-void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
+void DiskOdfDocumentHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
{
if (mbIsTagOpened)
{
@@ -46,11 +46,11 @@ void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyL
}
PUTSTRING("<");
PUTSTRING(psName);
- WPXPropertyList::Iter i(xPropList);
+ librevenge::RVNGPropertyList::Iter i(xPropList);
for (i.rewind(); i.next(); )
{
- // filter out libwpd elements
- if (strncmp(i.key(), "libwpd", 6) != 0)
+ // filter out librevenge properties
+ if (strncmp(i.key(), "librevenge", 10) != 0)
{
PUTSTRING(" ");
PUTSTRING(i.key());
@@ -91,14 +91,15 @@ void DiskOdfDocumentHandler::endElement(const char *psName)
}
}
-void DiskOdfDocumentHandler::characters(const WPXString &sCharacters)
+void DiskOdfDocumentHandler::characters(const librevenge::RVNGString &sCharacters)
{
if (mbIsTagOpened)
{
PUTSTRING(">");
mbIsTagOpened = false;
}
- WPXString sEscapedCharacters(sCharacters, true);
+ librevenge::RVNGString sEscapedCharacters;
+ sEscapedCharacters.appendEscapedXML(sCharacters);
if (sEscapedCharacters.len() > 0)
PUTSTRING(sEscapedCharacters.cstr());
}
diff --git a/filters/libodfhandler/DiskDocumentHandler.hxx b/filters/libodfhandler/DiskDocumentHandler.hxx
index 17f7eb7..d52a256 100644
--- a/filters/libodfhandler/DiskDocumentHandler.hxx
+++ b/filters/libodfhandler/DiskDocumentHandler.hxx
@@ -23,7 +23,7 @@
#ifndef _DISKDOCUMENTHANDLER_H
#define _DISKDOCUMENTHANDLER_H
-#include <libodfgen/OdfDocumentHandler.hxx>
+#include <libodfgen/libodfgen.hxx>
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -45,9 +45,9 @@ public:
#endif
virtual void startDocument() {}
virtual void endDocument();
- virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
+ virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
virtual void endElement(const char *psName);
- virtual void characters(const WPXString &sCharacters);
+ virtual void characters(const librevenge::RVNGString &sCharacters);
private:
DiskOdfDocumentHandler(DiskOdfDocumentHandler const &);
@@ -58,7 +58,7 @@ private:
FemtoZip *mpOutput;
#endif
bool mbIsTagOpened;
- WPXString msOpenedTagName;
+ librevenge::RVNGString msOpenedTagName;
};
#endif
diff --git a/filters/libodfhandler/OutputFileHelper.cxx b/filters/libodfhandler/OutputFileHelper.cxx
index 8786d4c..61e48e9 100644
--- a/filters/libodfhandler/OutputFileHelper.cxx
+++ b/filters/libodfhandler/OutputFileHelper.cxx
@@ -37,7 +37,7 @@
#include "DiskDocumentHandler.hxx"
#include "StdOutHandler.hxx"
-#include <libwpd-stream/WPXStreamImplementation.h>
+#include <librevenge-stream/librevenge-stream.h>
struct OutputFileHelperImpl
{
@@ -197,12 +197,12 @@ bool OutputFileHelper::writeChildFile(const char *childFileName, const char *str
bool OutputFileHelper::writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType)
{
- WPXFileStream input(inFileName);
+ librevenge::RVNGFileStream input(inFileName);
if (!_isSupportedFormat(&input, m_impl->mpPassword))
return false;
- input.seek(0, WPX_SEEK_SET);
+ input.seek(0, librevenge::RVNG_SEEK_SET);
OdfDocumentHandler *pHandler;
#ifdef USE_GSF_OUTPUT
diff --git a/filters/libodfhandler/OutputFileHelper.hxx b/filters/libodfhandler/OutputFileHelper.hxx
index a61b9a0..d2632a9 100644
--- a/filters/libodfhandler/OutputFileHelper.hxx
+++ b/filters/libodfhandler/OutputFileHelper.hxx
@@ -22,9 +22,10 @@
#ifndef _OUTPUTFILEHELPER_HXX
#define _OUTPUTFILEHELPER_HXX
-#include <libodfgen/OdfDocumentHandler.hxx>
+#include <libodfgen/libodfgen.hxx>
+
+#include <librevenge-stream/librevenge-stream.h>
-class WPXInputStream;
struct OutputFileHelperImpl;
class OutputFileHelper
@@ -38,8 +39,8 @@ public:
bool writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType);
private:
- virtual bool _isSupportedFormat(WPXInputStream *input, const char *password) = 0;
- virtual bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
+ virtual bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password) = 0;
+ virtual bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
OutputFileHelperImpl *m_impl;
private:
diff --git a/filters/libodfhandler/StdOutHandler.cxx b/filters/libodfhandler/StdOutHandler.cxx
index 6864266..16e19f0 100644
--- a/filters/libodfhandler/StdOutHandler.cxx
+++ b/filters/libodfhandler/StdOutHandler.cxx
@@ -31,7 +31,7 @@ StdOutHandler::StdOutHandler() :
printf("<?xml version=\"1.0\"?>\n");
}
-void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
+void StdOutHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
{
if (mbIsTagOpened)
{
@@ -39,11 +39,11 @@ void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPro
mbIsTagOpened = false;
}
printf("<%s", psName);
- WPXPropertyList::Iter i(xPropList);
+ librevenge::RVNGPropertyList::Iter i(xPropList);
for (i.rewind(); i.next(); )
{
- // filter out libwpd elements
- if (strncmp(i.key(), "libwpd", 6) != 0)
+ // filter out librevenge properties
+ if (strncmp(i.key(), "librevenge", 10) != 0)
printf(" %s=\"%s\"", i.key(), i()->getStr().cstr());
}
mbIsTagOpened = true;
@@ -73,15 +73,14 @@ void StdOutHandler::endElement(const char *psName)
}
}
-void StdOutHandler::characters(const WPXString &sCharacters)
+void StdOutHandler::characters(const librevenge::RVNGString &sCharacters)
{
if (mbIsTagOpened)
{
printf(">");
mbIsTagOpened = false;
}
- WPXString sEscapedCharacters(sCharacters, true);
- printf("%s", sEscapedCharacters.cstr());
+ printf("%s", librevenge::RVNGString::escapeXML(sCharacters).cstr());
}
void StdOutHandler::endDocument()
diff --git a/filters/libodfhandler/StdOutHandler.hxx b/filters/libodfhandler/StdOutHandler.hxx
index a18189a..44fa1e7 100644
--- a/filters/libodfhandler/StdOutHandler.hxx
+++ b/filters/libodfhandler/StdOutHandler.hxx
@@ -23,7 +23,7 @@
#ifndef _STDOUTHANDLER_H
#define _STDOUTHANDLER_H
-#include <libodfgen/OdfDocumentHandler.hxx>
+#include <libodfgen/libodfgen.hxx>
class StdOutHandler : public OdfDocumentHandler
{
@@ -31,12 +31,12 @@ public:
StdOutHandler();
virtual void startDocument() {}
virtual void endDocument();
- virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
+ virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
virtual void endElement(const char *psName);
- virtual void characters(const WPXString &sCharacters);
+ virtual void characters(const librevenge::RVNGString &sCharacters);
private:
bool mbIsTagOpened;
- WPXString msOpenedTagName;
+ librevenge::RVNGString msOpenedTagName;
};
#endif
diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt
index 6a0e2d7..ffb3c70 100644
--- a/filters/words/wordperfect/import/CMakeLists.txt
+++ b/filters/words/wordperfect/import/CMakeLists.txt
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
${LIBODFGEN_INCLUDE_DIRS}
+ ${LIBREVENGE_INCLUDE_DIRS}
${LIBWPD_INCLUDE_DIRS}
${LIBWPG_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
@@ -17,7 +18,7 @@ set(wpd2odt_PART_SRCS
kde4_add_plugin(calligra_filter_wpd2odt ${wpd2odt_PART_SRCS})
target_link_libraries(calligra_filter_wpd2odt
- komain ${LIBODFGEN_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
+ komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/filters/words/wordperfect/import/WPDImport.cpp b/filters/words/wordperfect/import/WPDImport.cpp
index af9d9b6..edf1c91 100644
--- a/filters/words/wordperfect/import/WPDImport.cpp
+++ b/filters/words/wordperfect/import/WPDImport.cpp
@@ -18,8 +18,7 @@
#include <libwpd/libwpd.h>
#include <libwpg/libwpg.h>
-#include <libodfgen/OdtGenerator.hxx>
-#include <libodfgen/OdgGenerator.hxx>
+#include <libodfgen/libodfgen.hxx>
#include <OutputFileHelper.hxx>
#include <KoFilterChain.h>
@@ -31,6 +30,7 @@
#include <QString>
#include <QByteArray>
+#include <cassert>
#include <stdio.h>
class OdtOutputFileHelper : public OutputFileHelper
@@ -41,20 +41,20 @@ public:
~OdtOutputFileHelper() {};
private:
- bool _isSupportedFormat(WPXInputStream *input, const char *password)
+ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password)
{
- WPDConfidence confidence = WPDocument::isFileFormatSupported(input);
- if (WPD_CONFIDENCE_EXCELLENT != confidence && WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
+ libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(input);
+ if (libwpd::WPD_CONFIDENCE_EXCELLENT != confidence && libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
{
fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n");
return false;
}
- if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
+ if (libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
{
fprintf(stderr, "ERROR: The WordPerfect document is encrypted and you did not give us a password.\n");
return false;
}
- if (confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (WPD_PASSWORD_MATCH_OK != WPDocument::verifyPassword(input, password)))
+ if (confidence == libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (libwpd::WPD_PASSWORD_MATCH_OK != libwpd::WPDocument::verifyPassword(input, password)))
{
fprintf(stderr, "ERROR: The WordPerfect document is encrypted and we either\n");
fprintf(stderr, "ERROR: don't know how to decrypt it or the given password is wrong.\n");
@@ -64,41 +64,47 @@ private:
return true;
}
- static bool handleEmbeddedWPGObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType)
+ static bool handleEmbeddedWPGObject(const librevenge::RVNGBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType)
{
- OdgGenerator exporter(pHandler, streamType);
+ OdgGenerator exporter;
+ exporter.addDocumentHandler(pHandler, streamType);
libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
- if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(data.getDataStream())))
+ if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(data.getDataStream())))
fileFormat = libwpg::WPG_WPG1;
- return libwpg::WPGraphics::parse(const_cast<WPXInputStream *>(data.getDataStream()), &exporter, fileFormat);
+ return libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(data.getDataStream()), &exporter, fileFormat);
}
- static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData &output)
+ static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, librevenge::RVNGBinaryData &output)
{
- WPXString svgOutput;
libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
- if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(input.getDataStream())))
+ if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(input.getDataStream())))
fileFormat = libwpg::WPG_WPG1;
- if (!libwpg::WPGraphics::generateSVG(const_cast<WPXInputStream *>(input.getDataStream()), svgOutput, fileFormat))
+ librevenge::RVNGStringVector svgOutput;
+ librevenge::RVNGSVGDrawingGenerator generator(svgOutput, "");
+ if (!libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(input.getDataStream()), &generator, fileFormat))
return false;
+ assert(1 == svgOutput.size());
output.clear();
- output.append((unsigned char *)svgOutput.cstr(), strlen(svgOutput.cstr()));
+ const librevenge::RVNGString svgPrefix("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
+ output.append((unsigned char *)svgPrefix.cstr(), svgPrefix.size());
+ output.append((unsigned char *)svgOutput[0].cstr(), svgOutput[0].size());
return true;
}
- bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
+ bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
{
- OdtGenerator collector(handler, streamType);
+ OdtGenerator collector;
+ collector.addDocumentHandler(handler, streamType);
collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject);
collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage);
- if (WPD_OK == WPDocument::parse(input, &collector, password))
+ if (libwpd::WPD_OK == libwpd::WPDocument::parse(input, &collector, password))
return true;
return false;
}
diff --git a/filters/words/works/import/CMakeLists.txt b/filters/words/works/import/CMakeLists.txt
index 76317ae..2c51937 100644
--- a/filters/words/works/import/CMakeLists.txt
+++ b/filters/words/works/import/CMakeLists.txt
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
${LIBODFGEN_INCLUDE_DIRS}
+ ${LIBREVENGE_INCLUDE_DIRS}
${LIBWPS_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
)
@@ -15,7 +16,7 @@ set(wps2odt_PART_SRCS
kde4_add_plugin(calligra_filter_wps2odt ${wps2odt_PART_SRCS})
-target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBWPS_LIBRARIES})
+target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPS_LIBRARIES})
install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp
index c2058e5..545daf3 100644
--- a/filters/words/works/import/WPSImport.cpp
+++ b/filters/words/works/import/WPSImport.cpp
@@ -16,9 +16,9 @@
#include "WPSImport.h"
-#include <libwpd/libwpd.h>
+#include <librevenge/librevenge.h>
#include <libwps/libwps.h>
-#include <libodfgen/OdtGenerator.hxx>
+#include <libodfgen/libodfgen.hxx>
#include "OutputFileHelper.hxx"
#include <KoFilterChain.h>
@@ -40,10 +40,11 @@ public:
~OdtOutputFileHelper() {};
private:
- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
+ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
{
- WPSConfidence confidence = WPSDocument::isFileFormatSupported(input);
- if (confidence == WPS_CONFIDENCE_NONE || confidence == WPS_CONFIDENCE_POOR)
+ libwps::WPSKind kind = libwps::WPS_TEXT;
+ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(input, kind);
+ if ((libwps::WPS_TEXT != kind) || (confidence != libwps::WPS_CONFIDENCE_EXCELLENT))
{
fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Microsoft Works document.\n");
return false;
@@ -52,10 +53,11 @@ private:
return true;
}
- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
+ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
{
- OdtGenerator collector(handler, streamType);
- if (WPS_OK == WPSDocument::parse(input, &collector))
+ OdtGenerator collector;
+ collector.addDocumentHandler(handler, streamType);
+ if (libwps::WPS_OK == libwps::WPSDocument::parse(input, &collector))
return true;
return false;
}
--
1.9.3

8
pkgs/applications/office/hledger-interest/default.nix
View File

@ -1,14 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, hledgerLib, mtl, time }:
{ cabal, Cabal, Decimal, hledgerLib, mtl, time }:
cabal.mkDerivation (self: {
pname = "hledger-interest";
version = "1.4.3";
sha256 = "1nj50zi4p6rs0nl4656rr0vkbh7kdi49z1l53nypfqs3rmjgicsn";
version = "1.4.4";
sha256 = "16knk1cwrpg5jn6vgcab7hqpjzg33ysz57x1f2glrmhhv1slmbfn";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal hledgerLib mtl time ];
buildDepends = [ Cabal Decimal hledgerLib mtl time ];
meta = {
homepage = "http://github.com/peti/hledger-interest";
description = "computes interest for a given account";

2
pkgs/applications/office/hledger-irr/default.nix
View File

@ -13,6 +13,6 @@ cabal.mkDerivation (self: {
description = "computes the internal rate of return of an investment";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ simons ];
broken = true;
};
})

14
pkgs/applications/office/libreoffice/default.nix
View File

@ -24,7 +24,7 @@ let
langsSpaces = stdenv.lib.concatStringsSep " " langs;
major = "4";
minor = "3";
patch = "3";
patch = "5";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@ -80,14 +80,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "0jpkkb71fbiid12r2dpvak304hlvx4ws1bk2yrb3narz15wzcvjr";
sha256 = "0xqvfmfab0hq3hcq76hs7ybv32i02lzl8xghilbjf12k1wgqy96c";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "0vd4ndnqy7xjlxh9flfp84jy82bvaq80pxcsx6lsarxsb4cvw7sz";
sha256 = "14kdhd9pjy0a7dkyx03a73m5iy3qr3ki2xqkinhml24f3n9qddbq";
};
};
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "0abmrn8iwwsbvi9dxq1pnirclxvfb33ngg7lpsj0y5lf0jpgpbb0";
sha256 = "0dr6xzdnnyhhysayz1yhnmv0l3c14kpnlhwd5h66qyzkd4d85rkq";
};
# Openoffice will open libcups dynamically, so we link it directly
@ -180,6 +180,10 @@ stdenv.mkDerivation rec {
substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice"
substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice"
done
mkdir -p "$out/share/desktop"
cp -r sysui/desktop/icons "$out/share/desktop"
sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
'';
configureFlags = [
@ -209,7 +213,7 @@ stdenv.mkDerivation rec {
"--disable-postgresql-sdbc"
"--with-package-format=native"
"--enable-epm"
"--with-jdk-home=${jdk}/lib/openjdk"
"--with-jdk-home=${jdk.home}"
"--with-ant-home=${ant}/lib/ant"
"--without-fonts"
"--without-myspell-dicts"

3
pkgs/applications/science/logic/abc/default.nix
View File

@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
};
buildInputs = [ readline ];
preBuild = ''
export buildFlags="CC=$CC CXX=$CXX LD=$LD"
'';
enableParallelBuilding = true;
installPhase = ''
mkdir -p $out/bin

4
pkgs/applications/science/logic/alt-ergo/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "alt-ergo-${version}";
version = "0.95.2";
version = "0.99.1";
src = fetchurl {
url = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
name = "${name}.tar.gz";
sha256 = "1b7f0rh3jgm67g0x2m3wv7gnnqmz9cjlrfm136z56ihlkhsd8v2s";
sha256 = "0lnlf56ysisa45dxvbwzhl4fgyxyfz35psals2kv9x8gyq54zwpm";
};
buildInputs = with ocamlPackages;

5
pkgs/applications/science/logic/matita/130312.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "http://matita.cs.unibo.it/sources/${pname}_130312.tar.gz";
url = "http://matita.cs.unibo.it/sources/${pname}_130312.tar.gz";
sha256 = "13mjvvldv53dcdid6wmc6g8yn98xca26xq2rgq2jg700lqsni59s";
};
@ -24,7 +24,7 @@ stdenv.mkDerivation {
'';
prePatch = ''
autoreconf -fvi
autoreconf -fvi
'';
buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre automake autoconf];
@ -62,5 +62,6 @@ stdenv.mkDerivation {
description = "Matita is an experimental, interactive theorem prover";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.roconnor ];
broken = true;
};
}

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