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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III 2015-09-23 14:44:21 -07:00
commit d3f4ba9d6f
351 changed files with 12549 additions and 1699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/functions.xml
View File

@ -248,7 +248,7 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
targetPkgs = pkgs: (with pkgs; targetPkgs = pkgs: (with pkgs;
[ udev [ udev
alsaLib alsaLib
]) ++ (with pkgs.xlibs; ]) ++ (with pkgs.xorg;
[ libX11 [ libX11
libXcursor libXcursor
libXrandr libXrandr

2
doc/meta.xml
View File

@ -61,7 +61,7 @@ $ nix-env -qa hello --meta --json
"i686-openbsd", "i686-openbsd",
"x86_64-openbsd" "x86_64-openbsd"
], ],
"position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/ex-2/default.nix:14" "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14"
}, },
"name": "hello-2.9", "name": "hello-2.9",
"system": "x86_64-linux" "system": "x86_64-linux"

2
doc/quick-start.xml
View File

@ -56,7 +56,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
<listitem> <listitem>
<para>GNU Hello: <link <para>GNU Hello: <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>.
Trivial package, which specifies some <varname>meta</varname> Trivial package, which specifies some <varname>meta</varname>
attributes which is good practice.</para> attributes which is good practice.</para>
</listitem> </listitem>

2
lib/maintainers.nix
View File

@ -19,6 +19,7 @@
akc = "Anders Claesson <akc@akc.is>"; akc = "Anders Claesson <akc@akc.is>";
algorith = "Dries Van Daele <dries_van_daele@telenet.be>"; algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
all = "Nix Committers <nix-commits@lists.science.uu.nl>"; all = "Nix Committers <nix-commits@lists.science.uu.nl>";
ambrop72 = "Ambroz Bizjak <ambrop7@gmail.com>";
amiddelk = "Arie Middelkoop <amiddelk@gmail.com>"; amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>"; amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>"; AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
@ -70,6 +71,7 @@
cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>"; cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
cwoac = "Oliver Matthews <oliver@codersoffortune.net>"; cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
DamienCassou = "Damien Cassou <damien@cassou.me>"; DamienCassou = "Damien Cassou <damien@cassou.me>";
davidak = "David Kleuker <post@davidak.de>";
davidrusu = "David Rusu <davidrusu.me@gmail.com>"; davidrusu = "David Rusu <davidrusu.me@gmail.com>";
dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>"; dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>"; DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";

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

@ -146,12 +146,9 @@ in rec {
inherit sources; inherit sources;
buildInputs = [ libxml2 libxslt dblatex tetex ]; buildInputs = [ libxml2 libxslt dblatex dblatex.tex ];
buildCommand = '' buildCommand = ''
# TeX needs a writable font cache.
export VARTEXFONTS=$TMPDIR/texfonts
${copySources} ${copySources}
dst=$out/share/doc/nixos dst=$out/share/doc/nixos
@ -162,7 +159,7 @@ in rec {
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo "doc-pdf manual $dst/manual.pdf" >> $out/nix-support/hydra-build-products echo "doc-pdf manual $dst/manual.pdf" >> $out/nix-support/hydra-build-products
''; # */ '';
}; };
# Generate the NixOS manpages. # Generate the NixOS manpages.

123
nixos/doc/manual/release-notes/rl-1509.xml
View File

@ -6,35 +6,48 @@
<title>Release 15.09 (“Dingo”, 2015/09/??)</title> <title>Release 15.09 (“Dingo”, 2015/09/??)</title>
<para>In addition to numerous new and upgraded packages, this release has the following highlights: <para>In addition to numerous new and upgraded packages, this release
has the following highlights:</para>
<itemizedlist> <itemizedlist>
<listitem>
<para>
The Haskell packages infrastructure has been re-designed from the ground up.
NixOS now distributes the latest version of every single package registered on
<link xlink:href="http://hackage.haskell.org/">Hackage</link>, i.e. well over
8000 Haskell packages. Further information and usage instructions for the
improved infrastructure are available at <link
xlink:href="https://nixos.org/wiki/Haskell">https://nixos.org/wiki/Haskell</link>.
Users migrating from an earlier release will find also find helpful information
below, in the list of backwards-incompatible changes.
</para>
</listitem>
<listitem> <listitem>
<para> <para>The Haskell packages infrastructure has been re-designed
Users running an SSH server who worry about the quality of their from the ground up. NixOS now distributes the latest version of
<literal>/etc/ssh/moduli</literal> file with respect to the <link every single package registered on <link
xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities xlink:href="http://hackage.haskell.org/">Hackage</link>, i.e. well
discovered in the Diffie-Hellman key exchange</link> can now replace OpenSSH's over 8000 Haskell packages. Further information and usage
default version with one they generated themselves using the new instructions for the improved infrastructure are available at
<literal>services.openssh.moduliFile</literal> option. <link
</para> xlink:href="https://nixos.org/wiki/Haskell">https://nixos.org/wiki/Haskell</link>.
</listitem> Users migrating from an earlier release will also find helpful
</itemizedlist> information below, in the list of backwards-incompatible changes.</para>
</listitem>
</para> <listitem>
<para>Nix has been updated to version 1.10, which among other
improvements enables cryptographic signatures on binary caches for
improved security.</para>
</listitem>
<listitem>
<para>You can now keep your NixOS system up to date automatically
by setting
<programlisting>
system.autoUpgrade.enable = true;
</programlisting>
This will cause the system to periodically check for updates in
your current channel and run <command>nixos-rebuild</command>.</para>
</listitem>
<listitem>
<para>This release is based on Glibc 2.21, GCC 4.9 and Linux
3.18.</para>
</listitem>
</itemizedlist>
<para>When upgrading from a previous release, please be aware of the <para>When upgrading from a previous release, please be aware of the
@ -50,10 +63,11 @@ and want to continue to use them, please set
system.stateVersion = "14.12"; system.stateVersion = "14.12";
</programlisting> </programlisting>
(The new option <option>system.stateVersion</option> ensures that The new option <option>system.stateVersion</option> ensures that
certain configuration changes that could break existing systems (such certain configuration changes that could break existing systems (such
as the <command>sshd</command> host key setting) will maintain as the <command>sshd</command> host key setting) will maintain
compatibility with the specified NixOS release.)</para></listitem> compatibility with the specified NixOS release. NixOps sets the state
version of existing deployments automatically.</para></listitem>
<listitem><para><command>cron</command> is no longer enabled by <listitem><para><command>cron</command> is no longer enabled by
default, unless you have a non-empty default, unless you have a non-empty
@ -72,9 +86,9 @@ false</option>.</para></listitem>
and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>. and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
</para></listitem> </para></listitem>
<listitem><para>CMPlayer has been renamed to bomi upstream. Package <literal>cmplayer</literal> <listitem><para>CMPlayer has been renamed to bomi upstream. Package
was accordingly renamed to <literal>bomi</literal> <literal>cmplayer</literal> was accordingly renamed to
</para></listitem> <literal>bomi</literal> </para></listitem>
<listitem><para>Atom Shell has been renamed to Electron upstream. Package <literal>atom-shell</literal> <listitem><para>Atom Shell has been renamed to Electron upstream. Package <literal>atom-shell</literal>
was accordingly renamed to <literal>electron</literal> was accordingly renamed to <literal>electron</literal>
@ -84,21 +98,20 @@ was accordingly renamed to <literal>electron</literal>
which contains the latest Elm platform.</para></listitem> which contains the latest Elm platform.</para></listitem>
<listitem> <listitem>
<para> <para>The CUPS printing service has been updated to version
The CUPS printing service has been updated to version <literal>2.0.2</literal>. <literal>2.0.2</literal>. Furthermore its systemd service has been
Furthermore its systemd service has been renamed to <literal>cups.service</literal>. renamed to <literal>cups.service</literal>.</para>
</para>
<para> <para>Local printers are no longer shared or advertised by
Local printers are no longer shared or advertised by default. This behavior default. This behavior can be changed by enabling
can be changed by enabling <literal>services.printing.defaultShared</literal> <literal>services.printing.defaultShared</literal> or
or <literal>services.printing.browsing</literal> respectively. <literal>services.printing.browsing</literal> respectively.</para>
</para>
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
The VirtualBox host and guest options have been moved/renamed more The VirtualBox host and guest options have been named more
consistently and less confusing to be now found in consistently. They can now found in
<literal>virtualisation.virtualbox.host.*</literal> instead of <literal>virtualisation.virtualbox.host.*</literal> instead of
<literal>services.virtualboxHost.*</literal> and <literal>services.virtualboxHost.*</literal> and
<literal>virtualisation.virtualbox.guest.*</literal> instead of <literal>virtualisation.virtualbox.guest.*</literal> instead of
@ -207,25 +220,31 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
</para> </para>
<para>The following new services were added since the last release:
<itemizedlist>
<listitem><para><literal>brltty</literal></para></listitem>
<listitem><para><literal>marathon</literal></para></listitem>
<listitem><para><literal>tvheadend</literal></para></listitem>
</itemizedlist>
</para>
<para>Other notable improvements: <para>Other notable improvements:
<itemizedlist> <itemizedlist>
<listitem><para>The nixos and nixpkgs channels were unified, <listitem><para>The nixos and nixpkgs channels were unified,
so one <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal> so one <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal>
instead of <literal>nix-env -iA nixos.pkgs.bash</literal>. instead of <literal>nix-env -iA nixos.pkgs.bash</literal>.
See <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the commit</link> for details. See <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the commit</link> for details.
</para></listitem> </para></listitem>
<listitem>
<para>
Users running an SSH server who worry about the quality of their
<literal>/etc/ssh/moduli</literal> file with respect to the
<link
xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities
discovered in the Diffie-Hellman key exchange</link> can now
replace OpenSSH's default version with one they generated
themselves using the new
<literal>services.openssh.moduliFile</literal> option.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</para> </para>
</section> </section>

61
nixos/doc/manual/release-notes/rl-unstable.xml
View File

@ -7,34 +7,39 @@
<title>Unstable</title> <title>Unstable</title>
<para>When upgrading from a previous release, please be aware of the <para>When upgrading from a previous release, please be aware of the
following incompatible changes: following incompatible changes:</para>
<itemizedlist> <itemizedlist>
<listitem><para> <listitem>
<command>wmiiSnap</command> has been replaced with <para><command>wmiiSnap</command> has been replaced with
<command>wmii_hg</command>, but <command>wmii_hg</command>, but
<command>services.xserver.windowManager.wmii.enable</command> <command>services.xserver.windowManager.wmii.enable</command> has
has been updated respectively so this only affects you if you been updated respectively so this only affects you if you have
have explicitly installed <command>wmiiSnap</command>. explicitly installed <command>wmiiSnap</command>.
</para></listitem> </para>
<listitem><para> </listitem>
<command>wmiimenu</command> is removed, as it has been removed by
the developers upstream. Use <command>wimenu</command> from the <listitem>
<command>wmii-hg</command> package. <para><command>wmiimenu</command> is removed, as it has been
</para></listitem> removed by the developers upstream. Use <command>wimenu</command>
from the <command>wmii-hg</command> package.</para>
</listitem>
<listitem>
<para>Gitit is no longer automatically added to the module list in
NixOS and as such there will not be any manual entries for it. You
will need to add an import statement to your NixOS configuration
in order to use it, e.g.
<programlisting><![CDATA[
{
imports = [ <nixos/modules/services/misc/gitit.nix> ];
}
]]></programlisting>
will include the Gitit service configuration options.</para>
</listitem>
</itemizedlist>
<listitem><para>Gitit! Is no longer automatically added to the module list in
NixOS and as such there will not be any manual entries for it. You will need to
add an import statement to your nixos configuration in order to use it. As
an example adding:
<programlisting><![CDATA[
{
imports = [ <nixos/modules/services/misc/gitit.nix> ];
}
]]>
</programlisting>
Will include the gitit service configuration options.
</para></listitem>
</itemizedlist>
</para>
</section> </section>

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

@ -233,6 +233,7 @@
dnschain = 209; dnschain = 209;
#lxd = 210; # unused #lxd = 210; # unused
kibana = 211; kibana = 211;
xtreemfs = 212;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -444,6 +445,7 @@
#dnschain = 209; #unused #dnschain = 209; #unused
lxd = 210; # unused lxd = 210; # unused
#kibana = 211; #kibana = 211;
xtreemfs = 212;
# When adding a gid, make sure it doesn't match an existing # When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal # uid. Users and groups with the same name should have equal

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

@ -257,6 +257,7 @@
./services/network-filesystems/diod.nix ./services/network-filesystems/diod.nix
./services/network-filesystems/u9fs.nix ./services/network-filesystems/u9fs.nix
./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/yandex-disk.nix
./services/network-filesystems/xtreemfs.nix
./services/networking/aiccu.nix ./services/networking/aiccu.nix
./services/networking/amuled.nix ./services/networking/amuled.nix
./services/networking/asterisk.nix ./services/networking/asterisk.nix
@ -472,6 +473,7 @@
./tasks/filesystems/ntfs.nix ./tasks/filesystems/ntfs.nix
./tasks/filesystems/reiserfs.nix ./tasks/filesystems/reiserfs.nix
./tasks/filesystems/unionfs-fuse.nix ./tasks/filesystems/unionfs-fuse.nix
./tasks/filesystems/vboxsf.nix
./tasks/filesystems/vfat.nix ./tasks/filesystems/vfat.nix
./tasks/filesystems/xfs.nix ./tasks/filesystems/xfs.nix
./tasks/filesystems/zfs.nix ./tasks/filesystems/zfs.nix

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

@ -77,7 +77,8 @@ let
smtpd_tls_key_file = ${cfg.sslKey} smtpd_tls_key_file = ${cfg.sslKey}
smtpd_use_tls = yes smtpd_use_tls = yes
''
+ optionalString (cfg.recipientDelimiter != "") ''
recipient_delimiter = ${cfg.recipientDelimiter} recipient_delimiter = ${cfg.recipientDelimiter}
'' ''
+ optionalString (cfg.virtual != "") '' + optionalString (cfg.virtual != "") ''

469
nixos/modules/services/network-filesystems/xtreemfs.nix Normal file
View File

@ -0,0 +1,469 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xtreemfs;
xtreemfs = pkgs.xtreemfs;
home = cfg.homeDir;
startupScript = class: configPath: pkgs.writeScript "xtreemfs-osd.sh" ''
#! ${pkgs.stdenv.shell}
JAVA_HOME="${pkgs.jdk}"
JAVADIR="${xtreemfs}/share/java"
JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar"
$JAVA_CALL ${class} ${configPath}
'';
dirReplicationConfig = pkgs.writeText "xtreemfs-dir-replication-plugin.properties" ''
babudb.repl.backupDir = ${home}/server-repl-dir
plugin.jar = ${xtreemfs}/share/java/BabuDB_replication_plugin.jar
babudb.repl.dependency.0 = ${xtreemfs}/share/java/Flease.jar
${cfg.dir.replication.extraConfig}
'';
dirConfig = pkgs.writeText "xtreemfs-dir-config.properties" ''
uuid = ${cfg.dir.uuid}
listen.port = ${toString cfg.dir.port}
${optionalString (cfg.dir.address != "") "listen.address = ${cfg.dir.address}"}
http_port = ${toString cfg.dir.httpPort}
babudb.baseDir = ${home}/dir/database
babudb.logDir = ${home}/dir/db-log
babudb.sync = ${if cfg.dir.replication.enable then "FDATASYNC" else cfg.dir.syncMode}
${optionalString cfg.dir.replication.enable "babudb.plugin.0 = ${dirReplicationConfig}"}
${cfg.dir.extraConfig}
'';
mrcReplicationConfig = pkgs.writeText "xtreemfs-mrc-replication-plugin.properties" ''
babudb.repl.backupDir = ${home}/server-repl-mrc
plugin.jar = ${xtreemfs}/share/java/BabuDB_replication_plugin.jar
babudb.repl.dependency.0 = ${xtreemfs}/share/java/Flease.jar
${cfg.mrc.replication.extraConfig}
'';
mrcConfig = pkgs.writeText "xtreemfs-mrc-config.properties" ''
uuid = ${cfg.mrc.uuid}
listen.port = ${toString cfg.mrc.port}
${optionalString (cfg.mrc.address != "") "listen.address = ${cfg.mrc.address}"}
http_port = ${toString cfg.mrc.httpPort}
babudb.baseDir = ${home}/mrc/database
babudb.logDir = ${home}/mrc/db-log
babudb.sync = ${if cfg.mrc.replication.enable then "FDATASYNC" else cfg.mrc.syncMode}
${optionalString cfg.mrc.replication.enable "babudb.plugin.0 = ${mrcReplicationConfig}"}
${cfg.mrc.extraConfig}
'';
osdConfig = pkgs.writeText "xtreemfs-osd-config.properties" ''
uuid = ${cfg.osd.uuid}
listen.port = ${toString cfg.osd.port}
${optionalString (cfg.osd.address != "") "listen.address = ${cfg.osd.address}"}
http_port = ${toString cfg.osd.httpPort}
object_dir = ${home}/osd/
${cfg.osd.extraConfig}
'';
optionalDir = optionals cfg.dir.enable ["xtreemfs-dir.service"];
systemdOptionalDependencies = {
after = [ "network.target" ] ++ optionalDir;
wantedBy = [ "multi-user.target" ] ++ optionalDir;
};
in
{
###### interface
options = {
services.xtreemfs = {
enable = mkEnableOption "XtreemFS";
homeDir = mkOption {
default = "/var/lib/xtreemfs";
description = ''
XtreemFS home dir for the xtreemfs user.
'';
};
dir = {
enable = mkOption {
default = true;
description = ''
Whether to enable XtreemFS DIR service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40";
description = ''
Must be set to a unique identifier, preferably a UUID according to
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
the `utillinux` package.
'';
};
port = mkOption {
default = 32638;
description = ''
The port to listen on for incoming connections (TCP).
'';
};
address = mkOption {
example = "127.0.0.1";
default = "";
description = ''
If specified, it defines the interface to listen on. If not
specified, the service will listen on all interfaces (any).
'';
};
httpPort = mkOption {
default = 30638;
description = ''
Specifies the listen port for the HTTP service that returns the
status page.
'';
};
syncMode = mkOption {
default = "FSYNC";
example = "FDATASYNC";
description = ''
The sync mode influences how operations are committed to the disk
log before the operation is acknowledged to the caller.
-ASYNC mode the writes to the disk log are buffered in memory by the operating system. This is the fastest mode but will lead to data loss in case of a crash, kernel panic or power failure.
-SYNC_WRITE_METADATA opens the file with O_SYNC, the system will not buffer any writes. The operation will be acknowledged when data has been safely written to disk. This mode is slow but offers maximum data safety. However, BabuDB cannot influence the disk drive caches, this depends on the OS and hard disk model.
-SYNC_WRITE similar to SYNC_WRITE_METADATA but opens file with O_DSYNC which means that only the data is commit to disk. This can lead to some data loss depending on the implementation of the underlying file system. Linux does not implement this mode.
-FDATASYNC is similar to SYNC_WRITE but opens the file in asynchronous mode and calls fdatasync() after writing the data to disk.
-FSYNC is similar to SYNC_WRITE_METADATA but opens the file in asynchronous mode and calls fsync() after writing the data to disk.
For best throughput use ASYNC, for maximum data safety use FSYNC.
(If xtreemfs.dir.replication.enable is true then FDATASYNC is forced)
'';
};
extraConfig = mkOption {
default = "";
example = ''
# specify whether SSL is required
ssl.enabled = true
ssl.service_creds.pw = passphrase
ssl.service_creds.container = pkcs12
ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/dir.p12
ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
ssl.trusted_certs.pw = jks_passphrase
ssl.trusted_certs.container = jks
'';
description = ''
Configuration of XtreemFS DIR service.
WARNING: configuration is saved as plaintext inside nix store.
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
'';
};
replication = {
enable = mkEnableOption "XtreemFS DIR replication plugin";
extraConfig = mkOption {
example = ''
# participants of the replication including this replica
babudb.repl.participant.0 = 192.168.0.10
babudb.repl.participant.0.port = 35676
babudb.repl.participant.1 = 192.168.0.11
babudb.repl.participant.1.port = 35676
babudb.repl.participant.2 = 192.168.0.12
babudb.repl.participant.2.port = 35676
# number of servers that at least have to be up to date
# To have a fault-tolerant system, this value has to be set to the
# majority of nodes i.e., if you have three replicas, set this to 2
# Please note that a setup with two nodes provides no fault-tolerance.
babudb.repl.sync.n = 2
# specify whether SSL is required
babudb.ssl.enabled = true
babudb.ssl.protocol = tlsv12
# server credentials for SSL handshakes
babudb.ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12
babudb.ssl.service_creds.pw = passphrase
babudb.ssl.service_creds.container = pkcs12
# trusted certificates for SSL handshakes
babudb.ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
babudb.ssl.trusted_certs.pw = jks_passphrase
babudb.ssl.trusted_certs.container = jks
babudb.ssl.authenticationWithoutEncryption = false
'';
description = ''
Configuration of XtreemFS DIR replication plugin.
WARNING: configuration is saved as plaintext inside nix store.
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
'';
};
};
};
mrc = {
enable = mkOption {
default = true;
description = ''
Whether to enable XtreemFS MRC service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41";
description = ''
Must be set to a unique identifier, preferably a UUID according to
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
the `utillinux` package.
'';
};
port = mkOption {
default = 32636;
description = ''
The port to listen on for incoming connections (TCP).
'';
};
address = mkOption {
example = "127.0.0.1";
default = "";
description = ''
If specified, it defines the interface to listen on. If not
specified, the service will listen on all interfaces (any).
'';
};
httpPort = mkOption {
default = 30636;
description = ''
Specifies the listen port for the HTTP service that returns the
status page.
'';
};
syncMode = mkOption {
default = "FSYNC";
example = "FDATASYNC";
description = ''
The sync mode influences how operations are committed to the disk
log before the operation is acknowledged to the caller.
-ASYNC mode the writes to the disk log are buffered in memory by the operating system. This is the fastest mode but will lead to data loss in case of a crash, kernel panic or power failure.
-SYNC_WRITE_METADATA opens the file with O_SYNC, the system will not buffer any writes. The operation will be acknowledged when data has been safely written to disk. This mode is slow but offers maximum data safety. However, BabuDB cannot influence the disk drive caches, this depends on the OS and hard disk model.
-SYNC_WRITE similar to SYNC_WRITE_METADATA but opens file with O_DSYNC which means that only the data is commit to disk. This can lead to some data loss depending on the implementation of the underlying file system. Linux does not implement this mode.
-FDATASYNC is similar to SYNC_WRITE but opens the file in asynchronous mode and calls fdatasync() after writing the data to disk.
-FSYNC is similar to SYNC_WRITE_METADATA but opens the file in asynchronous mode and calls fsync() after writing the data to disk.
For best throughput use ASYNC, for maximum data safety use FSYNC.
(If xtreemfs.mrc.replication.enable is true then FDATASYNC is forced)
'';
};
extraConfig = mkOption {
example = ''
osd_check_interval = 300
no_atime = true
local_clock_renewal = 0
remote_time_sync = 30000
authentication_provider = org.xtreemfs.common.auth.NullAuthProvider
# shared secret between the MRC and all OSDs
capability_secret = iNG8UuQJrJ6XVDTe
dir_service.host = 192.168.0.10
dir_service.port = 32638
# if replication is enabled
dir_service.1.host = 192.168.0.11
dir_service.1.port = 32638
dir_service.2.host = 192.168.0.12
dir_service.2.port = 32638
# specify whether SSL is required
ssl.enabled = true
ssl.protocol = tlsv12
ssl.service_creds.pw = passphrase
ssl.service_creds.container = pkcs12
ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/mrc.p12
ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
ssl.trusted_certs.pw = jks_passphrase
ssl.trusted_certs.container = jks
'';
description = ''
Configuration of XtreemFS MRC service.
WARNING: configuration is saved as plaintext inside nix store.
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
'';
};
replication = {
enable = mkEnableOption "XtreemFS MRC replication plugin";
extraConfig = mkOption {
example = ''
# participants of the replication including this replica
babudb.repl.participant.0 = 192.168.0.10
babudb.repl.participant.0.port = 35678
babudb.repl.participant.1 = 192.168.0.11
babudb.repl.participant.1.port = 35678
babudb.repl.participant.2 = 192.168.0.12
babudb.repl.participant.2.port = 35678
# number of servers that at least have to be up to date
# To have a fault-tolerant system, this value has to be set to the
# majority of nodes i.e., if you have three replicas, set this to 2
# Please note that a setup with two nodes provides no fault-tolerance.
babudb.repl.sync.n = 2
# specify whether SSL is required
babudb.ssl.enabled = true
babudb.ssl.protocol = tlsv12
# server credentials for SSL handshakes
babudb.ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12
babudb.ssl.service_creds.pw = passphrase
babudb.ssl.service_creds.container = pkcs12
# trusted certificates for SSL handshakes
babudb.ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
babudb.ssl.trusted_certs.pw = jks_passphrase
babudb.ssl.trusted_certs.container = jks
babudb.ssl.authenticationWithoutEncryption = false
'';
description = ''
Configuration of XtreemFS MRC replication plugin.
WARNING: configuration is saved as plaintext inside nix store.
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
'';
};
};
};
osd = {
enable = mkOption {
default = true;
description = ''
Whether to enable XtreemFS OSD service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42";
description = ''
Must be set to a unique identifier, preferably a UUID according to
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
the `utillinux` package.
'';
};
port = mkOption {
default = 32640;
description = ''
The port to listen on for incoming connections (TCP and UDP).
'';
};
address = mkOption {
example = "127.0.0.1";
default = "";
description = ''
If specified, it defines the interface to listen on. If not
specified, the service will listen on all interfaces (any).
'';
};
httpPort = mkOption {
default = 30640;
description = ''
Specifies the listen port for the HTTP service that returns the
status page.
'';
};
extraConfig = mkOption {
example = ''
local_clock_renewal = 0
remote_time_sync = 30000
report_free_space = true
capability_secret = iNG8UuQJrJ6XVDTe
dir_service.host = 192.168.0.10
dir_service.port = 32638
# if replication is used
dir_service.1.host = 192.168.0.11
dir_service.1.port = 32638
dir_service.2.host = 192.168.0.12
dir_service.2.port = 32638
# specify whether SSL is required
ssl.enabled = true
ssl.service_creds.pw = passphrase
ssl.service_creds.container = pkcs12
ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12
ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
ssl.trusted_certs.pw = jks_passphrase
ssl.trusted_certs.container = jks
'';
description = ''
Configuration of XtreemFS OSD service.
WARNING: configuration is saved as plaintext inside nix store.
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
'';
};
};
};
};
###### implementation
config = lib.mkIf cfg.enable {
environment.systemPackages = [ xtreemfs ];
users.extraUsers.xtreemfs =
{ uid = config.ids.uids.xtreemfs;
description = "XtreemFS user";
createHome = true;
home = home;
};
users.extraGroups.xtreemfs =
{ gid = config.ids.gids.xtreemfs;
};
systemd.services.xtreemfs-dir = mkIf cfg.dir.enable {
description = "XtreemFS-DIR Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = "xtreemfs";
ExecStart = "${startupScript "org.xtreemfs.dir.DIR" dirConfig}";
};
};
systemd.services.xtreemfs-mrc = mkIf cfg.mrc.enable ({
description = "XtreemFS-MRC Server";
serviceConfig = {
User = "xtreemfs";
ExecStart = "${startupScript "org.xtreemfs.mrc.MRC" mrcConfig}";
};
} // systemdOptionalDependencies);
systemd.services.xtreemfs-osd = mkIf cfg.osd.enable ({
description = "XtreemFS-OSD Server";
serviceConfig = {
User = "xtreemfs";
ExecStart = "${startupScript "org.xtreemfs.osd.OSD" osdConfig}";
};
} // systemdOptionalDependencies);
};
}

2
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -106,7 +106,7 @@ in
systemd.services.display-manager.wants = [ "systemd-machined.service" ]; systemd.services.display-manager.wants = [ "systemd-machined.service" ];
systemd.services.display-manager.after = [ "systemd-machined.service" ]; systemd.services.display-manager.after = [ "systemd-machined.service" ];
systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ]; systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ];
services.dbus.packages = [ gdm ]; services.dbus.packages = [ gdm ];

2
nixos/modules/services/x11/display-managers/kdm.nix
View File

@ -19,7 +19,7 @@ let
''} ''}
[X-*-Core] [X-*-Core]
Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb Xrdb=${pkgs.xorg.xrdb}/bin/xrdb
SessionsDirs=${dmcfg.session.desktops} SessionsDirs=${dmcfg.session.desktops}
Session=${dmcfg.session.script} Session=${dmcfg.session.script}
FailsafeClient=${pkgs.xterm}/bin/xterm FailsafeClient=${pkgs.xterm}/bin/xterm

9
nixos/modules/services/x11/hardware/synaptics.nix
View File

@ -18,6 +18,8 @@ let cfg = config.services.xserver.synaptics;
Option "TapButton2" "0" Option "TapButton2" "0"
Option "TapButton3" "0" Option "TapButton3" "0"
''; '';
pkg = pkgs.xorg.xf86inputsynaptics;
etcFile = "X11/xorg.conf.d/50-synaptics.conf";
in { in {
options = { options = {
@ -146,9 +148,12 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.xserver.modules = [ pkgs.xorg.xf86inputsynaptics ]; services.xserver.modules = [ pkg ];
environment.systemPackages = [ pkgs.xorg.xf86inputsynaptics ]; environment.etc."${etcFile}".source =
"${pkg}/share/X11/xorg.conf.d/50-synaptics.conf";
environment.systemPackages = [ pkg ];
services.xserver.config = services.xserver.config =
'' ''

4
nixos/modules/tasks/filesystems.nix
View File

@ -69,6 +69,8 @@ let
config = { config = {
mountPoint = mkDefault name; mountPoint = mkDefault name;
device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType);
# The vboxsf filesystem doesn't support the relatime option:
options = mkIf (config.fsType == "vboxsf") (mkDefault "defaults");
}; };
}; };
@ -141,7 +143,7 @@ in
environment.etc.fstab.text = environment.etc.fstab.text =
let let
fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" ]; fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" ];
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
in '' in ''
# This is a generated file. Do not edit! # This is a generated file. Do not edit!

23
nixos/modules/tasks/filesystems/vboxsf.nix Normal file
View File

@ -0,0 +1,23 @@
{ config, lib, pkgs, ... }:
with lib;
let
inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems;
package = pkgs.runCommand "mount.vboxsf" {} ''
mkdir -p $out/bin
cp ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf $out/bin
'';
in
{
config = mkIf (any (fs: fs == "vboxsf") config.boot.supportedFilesystems) {
system.fsPackages = [ package ];
boot.initrd.kernelModules = mkIf inInitrd [ "vboxsf" ];
};
}

14
nixos/modules/virtualisation/ec2-data.nix
View File

@ -9,7 +9,7 @@ with lib;
{ {
config = { config = {
systemd.services."fetch-ec2-data" = systemd.services.fetch-ec2-data =
{ description = "Fetch EC2 Data"; { description = "Fetch EC2 Data";
wantedBy = [ "multi-user.target" "sshd.service" ]; wantedBy = [ "multi-user.target" "sshd.service" ];
@ -48,13 +48,22 @@ with lib;
# the supplied user data, if available. Otherwise sshd will # the supplied user data, if available. Otherwise sshd will
# generate one normally. # generate one normally.
$wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
mkdir -m 0755 -p /etc/ssh
key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)" key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)" key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
mkdir -m 0755 -p /etc/ssh
(umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key) (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
fi fi
key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' /root/user-data)"
key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' /root/user-data)"
if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_ed25519_key ]; then
(umask 077; echo "$key" > /etc/ssh/ssh_host_ed25519_key)
echo "$key_pub" > /etc/ssh/ssh_host_ed25519_key.pub
fi
''; '';
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
@ -72,6 +81,7 @@ with lib;
# ec2-get-console-output. # ec2-get-console-output.
echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console
${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_ed25519_key.pub > /dev/console
echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
''; '';
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";

3
nixos/modules/virtualisation/virtualbox-guest.nix
View File

@ -32,7 +32,8 @@ in
boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
boot.kernelModules = [ "vboxsf" ]; boot.supportedFilesystems = [ "vboxsf" ];
boot.initrd.supportedFilesystems = [ "vboxsf" ];
users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf; users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf;

15
nixos/tests/virtualbox.nix
View File

@ -389,6 +389,21 @@ in {
destroyVM_simple; destroyVM_simple;
sub removeUUIDs {
return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n";
}
subtest "host-usb-permissions", sub {
my $userUSB = removeUUIDs vbm("list usbhost");
print STDERR $userUSB;
my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost");
print STDERR $rootUSB;
die "USB host devices differ for root and normal user"
if $userUSB ne $rootUSB;
die "No USB host devices found" if $userUSB =~ /<none>/;
};
subtest "systemd-detect-virt", sub { subtest "systemd-detect-virt", sub {
createVM_detectvirt; createVM_detectvirt;
vbm("startvm detectvirt"); vbm("startvm detectvirt");

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs
, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg , gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg
, libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper
, mpg123, neon, faad2 , mpg123, neon, faad2
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib
libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio
libcddb ffmpeg makeWrapper mpg123 neon faad2 libcddb ffmpeg makeWrapper mpg123 neon faad2
]; ];

6
pkgs/applications/audio/bristol/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }: { stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bristol-${version}"; name = "bristol-${version}";
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext
xlibs.xproto xorg.xproto
]; ];
preInstall = '' preInstall = ''

20
pkgs/applications/audio/bs1770gain/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, ffmpeg, sox }:
stdenv.mkDerivation rec {
name = "bs1770gain-${version}";
version = "0.4.7";
src = fetchurl {
url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
sha256 = "0dnypm7k4axc693g0z73n2mvycbzgc4lnj2am64xjzyg37my4qzz";
};
buildInputs = [ ffmpeg sox ];
meta = {
description = "A audio/video loudness scanner implementing ITU-R BS.1770";
license = stdenv.lib.licenses.gpl2Plus;
homepage = "http://bs1770gain.sourceforge.net/";
platforms = stdenv.lib.platforms.all;
};
}

6
pkgs/applications/audio/distrho/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2 { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }: , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "distrho-ports-git-2015-07-18"; name = "distrho-ports-git-2015-07-18";
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3 alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xlibs.libXinerama xlibs.libXrender ladspa-sdk xorg.libXinerama xorg.libXrender ladspa-sdk
]; ];
buildPhase = '' buildPhase = ''

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }: { stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "eq10q-2-${version}"; name = "eq10q-2-${version}";
version = "beta7.1"; version = "beta7.1";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi";
}; };
buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ]; buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
installFlags = '' installFlags = ''
DESTDIR=$(out) DESTDIR=$(out)

8
pkgs/applications/audio/google-musicmanager/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac { stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac
, libvorbis }: , libvorbis }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux"; assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
let let
archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo
product = "google-musicmanager"; product = "google-musicmanager";
name = "${product}-${version}"; name = "${product}-${version}";
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
src = if stdenv.system == "x86_64-linux" src = if stdenv.system == "x86_64-linux"
then fetchurl { then fetchurl {
url = archUrl name "amd64"; url = archUrl name "amd64";
sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4"; sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37";
} }
else fetchurl { else fetchurl {
url = archUrl name "i386"; url = archUrl name "i386";
sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l"; sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i";
}; };
unpackPhase = '' unpackPhase = ''

2
pkgs/applications/audio/jaaa/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }: { stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jaaa-${version}"; name = "jaaa-${version}";

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

@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ncmpcpp-${version}"; name = "ncmpcpp-${version}";
version = "0.6.5"; version = "0.6.7";
src = fetchurl { src = fetchurl {
url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
sha256 = "1zfidkskmiqx1wfykinmr639lhd90s7b0rks6vaci4n56ml8y4ji"; sha256 = "0yr1ib14qkgbsv839anpzkfbwkm6gg8wv4bf98ar7q5l2p2pv008";
}; };
configureFlags = [ "BOOST_LIB_SUFFIX=" ] configureFlags = [ "BOOST_LIB_SUFFIX=" ]

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11 { stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper
# transports # transports
, curl, libmms , curl, libmms
# input plugins # input plugins
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ # basic requirements [ # basic requirements
cmake qt4 pkgconfig x11 cmake qt4 pkgconfig xlibsWrapper
# transports # transports
curl libmms curl libmms
# input plugins # input plugins

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

@ -1,5 +1,5 @@
{ stdenv, pkgs, fetchFromGitHub, { stdenv, pkgs, fetchFromGitHub,
automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
}; };
buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
meta = { meta = {
description = "Rakarrak effects ported to LV2"; description = "Rakarrak effects ported to LV2";

22
pkgs/applications/audio/spotify/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype { fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
, libgcrypt, chromium, udev, fontconfig , libgcrypt, chromium, udev, fontconfig
, dbus, expat }: , dbus, expat }:
@ -28,16 +28,16 @@ let
qt4 qt4
stdenv.cc.cc stdenv.cc.cc
udev udev
xlibs.libX11 xorg.libX11
xlibs.libXcomposite xorg.libXcomposite
xlibs.libXdamage xorg.libXdamage
xlibs.libXext xorg.libXext
xlibs.libXfixes xorg.libXfixes
xlibs.libXi xorg.libXi
xlibs.libXrandr xorg.libXrandr
xlibs.libXrender xorg.libXrender
xlibs.libXrender xorg.libXrender
xlibs.libXScrnSaver xorg.libXScrnSaver
]; ];
in in

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, makeWrapper
, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient , expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient
, libsndfile, libxcb, xlibs , libsndfile, libxcb, xorg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender libxcb xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXft xorg.libXrender
]; ];
makeFlags = [ makeFlags = [

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

@ -15,11 +15,11 @@ let
quazipQt4 = quazip.override { qt = qt4; }; quazipQt4 = quazip.override { qt = qt4; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "tomahawk-${version}"; name = "tomahawk-${version}";
version = "0.8.3"; version = "0.8.4";
src = fetchurl { src = fetchurl {
url = "http://download.tomahawk-player.org/${name}.tar.bz2"; url = "http://download.tomahawk-player.org/${name}.tar.bz2";
sha256 = "0kjzkq21g3jl1lvadsm7gf0zvpbsv208kqf76wg2hnbm4k1a02wj"; sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g";
}; };
cmakeFlags = [ cmakeFlags = [

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

@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "yoshimi-${version}"; name = "yoshimi-${version}";
version = "1.3.5.1"; version = "1.3.5.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
sha256 = "1c7049pnvadxndk1rbja77kyr0rwnqca2546pxjnxksg923s5l8n"; sha256 = "001xvwknsm1sv5lvwz7f6dgf57b8djbpwbyk2gfxjy9rzl5q53qr";
}; };
buildInputs = [ buildInputs = [

2
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
, intltool, x11, libxklavier, libgcrypt, libaudit , intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit
, qt4 ? null, qt5 ? null , qt4 ? null, qt5 ? null
}: }:

8
pkgs/applications/editors/atom/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, systemd , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd
}: }:
let let
@ -9,9 +9,9 @@ let
paths = [ paths = [
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xlibs.libXcursor libcap systemd xorg.libXcursor libcap systemd
]; ];
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

4
pkgs/applications/editors/eclipse/plugins.nix
View File

@ -317,11 +317,11 @@ rec {
scala = buildEclipseUpdateSite rec { scala = buildEclipseUpdateSite rec {
name = "scala-${version}"; name = "scala-${version}";
version = "4.1.1"; version = "4.1.1.20150911";
src = fetchzip { src = fetchzip {
url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip"; url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
sha256 = "0x5cdcm7p2ynz5ryw041gb150sripf9i4m1yrfqklnn581yqm6y8"; sha256 = "03g24sjivm7kzy64wwjs4ihf9vrb6703lb7bx3jafxzcwqm0pj1i";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d { stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc , alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
[ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ] [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ]
++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optional stdenv.isLinux dbus
++ stdenv.lib.optionals withX ++ stdenv.lib.optionals withX
[ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gconf ] imagemagick gconf ]
++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK2) gtk2
++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ stdenv.lib.optional (withX && withGTK3) gtk3

6
pkgs/applications/editors/lighttable/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xlibs, udev , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev
}: }:
let let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xorg.libXcomposite xorg.libXi xorg.libXfixes
]; ];
in in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, motif, libXpm }: { stdenv, fetchurl, xlibsWrapper, motif, libXpm }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna";
}; };
buildInputs = [ x11 motif libXpm ]; buildInputs = [ xlibsWrapper motif libXpm ];
buildFlags = if stdenv.isLinux then "linux" else ""; buildFlags = if stdenv.isLinux then "linux" else "";

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

@ -1,6 +1,6 @@
{ fetchurl, stdenv, glib, xlibs, cairo, gtk}: { fetchurl, stdenv, glib, xorg, cairo, gtk}:
let let
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo]; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo];
in in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

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

@ -1,10 +1,10 @@
{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: { fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let let
build = "3083"; build = "3083";
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
in let in let
# package with just the binaries # package with just the binaries
sublime = stdenv.mkDerivation { sublime = stdenv.mkDerivation {

4
pkgs/applications/gis/qgis/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl,
qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }: qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qgis-2.10.1"; name = "qgis-2.10.1";
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql ] ++ fcgi libspatialindex libspatialite postgresql ] ++
(with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ]; (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];

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

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng { stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng
, libXinerama, curl, libexif }: , libXinerama, curl, libexif }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46"; sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46";
}; };
buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ]; buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ];
preBuild = '' preBuild = ''
makeFlags="PREFIX=$out exif=1" makeFlags="PREFIX=$out exif=1"

6
pkgs/applications/graphics/gimp/2.8.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }: , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gimp-2.8.14"; name = "gimp-2.8.14";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
[ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
libmng librsvg libwmf zlib libzip ghostscript aalib jasper libmng librsvg libwmf zlib libzip ghostscript aalib jasper
python pygtk libart_lgpl libexif gettext xlibs.libXpm python pygtk libart_lgpl libexif gettext xorg.libXpm
wrapPython wrapPython
]; ];
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
#configureFlags = [ "--disable-print" ]; #configureFlags = [ "--disable-print" ];
# "screenshot" needs this. # "screenshot" needs this.
NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib" NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib"
+ stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + stdenv.lib.optionalString stdenv.isDarwin " -lintl";
meta = { meta = {

6
pkgs/applications/graphics/simple-scan/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
, libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }: , libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:
let version = "3.17.92"; in let version = "3.18.0"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "simple-scan-${version}"; name = "simple-scan-${version}";
src = fetchurl { src = fetchurl {
sha256 = "0ax4rqqpwcz65nvw8l89npjc5v0g1ik1mb5w3025xlipm7djgybp"; sha256 = "09qki4h1px65fxwpr7jppzqsi5cfcb8168p13blp3wcfizjgb9gl";
url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz"; url = "https://launchpad.net/simple-scan/3.18/${version}/+download/${name}.tar.xz";
}; };
buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, imake { stdenv, fetchurl, makeWrapper, imake
, x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: , xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:
let version = "3.2.5b"; in let version = "3.2.5b"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
nativeBuildInputs = [ imake makeWrapper ]; nativeBuildInputs = [ imake makeWrapper ];

4
pkgs/applications/inferno/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }: { fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# Inferno is a rolling release from a mercurial repository. For the verison number # Inferno is a rolling release from a mercurial repository. For the verison number
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
}; };
# Fails with gcc48 due to inferno triggering an optimisation issue with floating point. # Fails with gcc48 due to inferno triggering an optimisation issue with floating point.
buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ]; buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ];
infernoWrapper = ./inferno; infernoWrapper = ./inferno;

10
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -174,7 +174,7 @@ let
libvncserver libical networkmanager openal opencv libvncserver libical networkmanager openal opencv
openexr perl phonon pkgconfig polkit_qt4 prison python qca2 openexr perl phonon pkgconfig polkit_qt4 prison python qca2
qimageblitz qjson qt4 samba saneBackends soprano speechd qimageblitz qjson qt4 samba saneBackends soprano speechd
strigi taglib udev xlibs xplanet xscreensaver xz; strigi taglib udev xorg xplanet xscreensaver xz;
alsa = alsaLib; alsa = alsaLib;
assuan = libassuan; assuan = libassuan;
boost = boost155; boost = boost155;
@ -289,7 +289,7 @@ let
kde-wallpapers = kde4Package super.kde-wallpapers; kde-wallpapers = kde4Package super.kde-wallpapers;
kde-workspace = extendDerivation (kde4Package super.kde-workspace) { kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
buildInputs = with scope.xlibs; [ buildInputs = with scope.xorg; [
libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
]; ];
nativeBuildInputs = [ scope.pkgconfig ]; nativeBuildInputs = [ scope.pkgconfig ];
@ -385,7 +385,7 @@ let
}; };
kmousetool = extendDerivation (kde4Package super.kmousetool) { kmousetool = extendDerivation (kde4Package super.kmousetool) {
buildInputs = with scope.xlibs; [ libXtst libXt ]; buildInputs = with scope.xorg; [ libXtst libXt ];
}; };
kmouth = kde4Package super.kmouth; kmouth = kde4Package super.kmouth;
@ -407,13 +407,13 @@ let
krdc = kde4Package super.krdc; krdc = kde4Package super.krdc;
kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) { kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
buildInputs = [ scope.xlibs.libXtst ]; buildInputs = [ scope.xorg.libXtst ];
}; };
kreversi = kde4Package super.kreversi; kreversi = kde4Package super.kreversi;
krfb = extendDerivation (kde4Package super.krfb) { krfb = extendDerivation (kde4Package super.krfb) {
buildInputs = with scope; [ xlibs.libXtst ktp-common-internals ]; buildInputs = with scope; [ xorg.libXtst ktp-common-internals ];
}; };
ksaneplugin = kde4Package super.ksaneplugin; ksaneplugin = kde4Package super.ksaneplugin;

9
pkgs/applications/misc/audio/sox/default.nix
View File

@ -6,6 +6,9 @@
, enableLibogg ? true, libogg ? null, libvorbis ? null , enableLibogg ? true, libogg ? null, libvorbis ? null
, enableFLAC ? true, flac ? null , enableFLAC ? true, flac ? null
, enablePNG ? true, libpng ? null , enablePNG ? true, libpng ? null
, enableLibsndfile ? true, libsndfile ? null
# amrnb and amrwb are unfree, disabled by default
, enableAMR ? false, amrnb ? null, amrwb ? null
}: }:
with stdenv.lib; with stdenv.lib;
@ -25,13 +28,15 @@ stdenv.mkDerivation rec {
optional enableLibmad libmad ++ optional enableLibmad libmad ++
optionals enableLibogg [ libogg libvorbis ] ++ optionals enableLibogg [ libogg libvorbis ] ++
optional enableFLAC flac ++ optional enableFLAC flac ++
optional enablePNG libpng; optional enablePNG libpng ++
optional enableLibsndfile libsndfile ++
optionals enableAMR [ amrnb amrwb ];
meta = { meta = {
description = "Sample Rate Converter for audio"; description = "Sample Rate Converter for audio";
homepage = http://sox.sourceforge.net/; homepage = http://sox.sourceforge.net/;
maintainers = [ lib.maintainers.marcweber ]; maintainers = [ lib.maintainers.marcweber ];
license = lib.licenses.gpl2Plus; license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus;
platforms = lib.platforms.linux ++ lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

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

@ -1,5 +1,5 @@
{ stdenv, fetchgit, makeWrapper, pkgconfig, { stdenv, fetchgit, makeWrapper, pkgconfig,
gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs, gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
configH configH
}: }:
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11 gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11
xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig
]; ];
buildPhase = '' buildPhase = ''

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

@ -1,7 +1,7 @@
{ stdenv, lib, fetchgit, makeWrapper { stdenv, lib, fetchgit, makeWrapper
, pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc , pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc
, keybinder3, clutter_gtk, libnotify , keybinder3, clutter_gtk, libnotify
, libxkbcommon, xlibs, udev , libxkbcommon, xorg, udev
, bashInteractive , bashInteractive
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee
gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper
xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
libxkbcommon libxkbcommon
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
udev udev

2
pkgs/applications/misc/hello/ex-2/default.nix → pkgs/applications/misc/hello/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
separateDebugInfo = true;
meta = { meta = {
description = "A program that produces a familiar, friendly greeting"; description = "A program that produces a familiar, friendly greeting";
longDescription = '' longDescription = ''

4
pkgs/applications/misc/keepassx/2.0.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }: { stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "keepassx2-2.0beta2"; name = "keepassx2-2.0beta2";
@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"; sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q";
}; };
buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ]; buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];
meta = { meta = {
description = "Qt password manager compatible with its Win32 and Pocket PC versions"; description = "Qt password manager compatible with its Win32 and Pocket PC versions";

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgs, pythonPackages }: { stdenv, fetchurl, pkgs, pythonPackages }:
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
version = "0.5.0"; version = "0.6.0";
name = "khard-${version}"; name = "khard-${version}";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
sha256 = "0k3pix4zdr5jc323w63kwrfhkvmn5ijnznzfhf6rvqp05lrkyh9x"; sha256 = "1ag6p416iibwgvijjc8bwyrssxw3s3j559700xfgp10vj0nqk1hb";
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [

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

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rofi-${version}"; name = "rofi-${version}";
version = "0.15.7"; version = "0.15.8";
src = fetchurl { src = fetchurl {
url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz"; url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
sha256 = "0alygwc82shkg9lmy8r5vmgd84imx1f9pndrisjpisl8h28dw5dq"; sha256 = "1qhj8xrxfnzy16g577w0zxg1cy885rbqydlbbxgfk0dpjvq70lq6";
}; };
buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr { stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
, xinput, curl, openssl, unzip }: , xinput, curl, openssl, unzip }:
with stdenv.lib; with stdenv.lib;
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl
]; ];
installPhase = '' installPhase = ''

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, tcl, tk, x11, makeWrapper}: {stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:
let version = "3.0"; in let version = "3.0"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
}; };
buildInputs = [tcl tk x11 makeWrapper]; buildInputs = [tcl tk xlibsWrapper makeWrapper];
patchPhase = '' patchPhase = ''
sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gccmakedep, xlibs }: { stdenv, fetchurl, gccmakedep, xorg }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xcruiser-0.30"; name = "xcruiser-0.30";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
}; };
buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ]; buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ];
configurePhase = "xmkmf -a"; configurePhase = "xmkmf -a";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: { stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xfe-1.37"; name = "xfe-1.37";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd"; sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";
}; };
buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ]; buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ];
preConfigure = '' preConfigure = ''
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h

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

@ -1,9 +1,9 @@
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null , stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null
, base14Fonts ? null , base14Fonts ? null
}: }:
assert enableGUI -> x11 != null && motif != null && freetype != null; assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null;
assert enablePDFtoPPM -> freetype != null; assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null; assert useT1Lib -> t1lib != null;
@ -18,7 +18,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ zlib libpng ] ++ buildInputs = [ zlib libpng ] ++
stdenv.lib.optionals enableGUI [x11 motif] ++ stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++
stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional useT1Lib t1lib ++
stdenv.lib.optional enablePDFtoPPM freetype; stdenv.lib.optional enablePDFtoPPM freetype;

16
pkgs/applications/networking/browsers/chromium/source/sources.nix
View File

@ -1,10 +1,10 @@
# This file is autogenerated from update.sh in the parent directory. # This file is autogenerated from update.sh in the parent directory.
{ {
dev = { dev = {
version = "47.0.2508.0"; version = "47.0.2516.0";
sha256 = "1jmcvbimj3x91czvclnqbp8w2nfqhk2bd7bw9yd37c576md1wnw2"; sha256 = "05caz427lis89rrh1885mp84q4lsavkn7d1x519drmjvyz3djal8";
sha256bin32 = "10spq63yfyzw419bz22r2g5rmnaxy5861715mkrcbpfm8cylzmzh"; sha256bin32 = "0fylv375j7wypwbjpccsjiyzzijkj6v96nvmal2x6fqyzz1qcx2s";
sha256bin64 = "1ycdp37ikdc9w4hp9qgpzjp47zh37g01ax8x4ack202vrv0dxhsh"; sha256bin64 = "1n4vyibv9jvm12cxpj3grvafc0x7izw71hz83dr9q5r73q43bkkk";
}; };
beta = { beta = {
version = "46.0.2490.33"; version = "46.0.2490.33";
@ -13,9 +13,9 @@
sha256bin64 = "1kn0k8gpjnm1xsdiby76phwr0i8yb1w9mzmnf7ppj5cddikc5n3v"; sha256bin64 = "1kn0k8gpjnm1xsdiby76phwr0i8yb1w9mzmnf7ppj5cddikc5n3v";
}; };
stable = { stable = {
version = "45.0.2454.93"; version = "45.0.2454.99";
sha256 = "1iraimblbzp9q16s5q7rbbb7079v095kr8dzqq1wwdb1bvcsllh6"; sha256 = "0h53gvgrs7f9sjw9vq21fr890f4qja0m2ja2c5ys1z5cs0gs7l8m";
sha256bin32 = "1gndmychajm4qb623k57zirp72w4y1vfxp17gyrbjpg4kzbi1qcg"; sha256bin32 = "18cc3vqvcfv1x11w1briis57fz53cdnmlxzzkrgs3585kw1q3m1d";
sha256bin64 = "107l7f7crhcsv4xa219lmnsg2i7jqi5zly71cix54qg2bb7wgfwn"; sha256bin64 = "16pj25zvjiinc2wgvj2fwai6s2y5g8nx7j1p2s8bjix3hfnp26df";
}; };
} }

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl { stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl
, spidermonkey, gpm , spidermonkey, gpm
, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 , enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2
, enablePython ? false, python ? null , enablePython ? false, python ? null
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ]; patches = [ ./gc-init.patch ];
buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ]
++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python; ++ stdenv.lib.optional enablePython python;

358
pkgs/applications/networking/browsers/firefox-bin/sources.nix
View File

@ -4,185 +4,185 @@
# ruby generate_source.rb > source.nix # ruby generate_source.rb > source.nix
{ {
version = "40.0.3"; version = "41.0";
sources = [ sources = [
{ locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; } { locale = "ach"; arch = "linux-i686"; sha1 = "f5170ec868dd1aee22e42ce5df62714cd5bd0272"; }
{ locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; } { locale = "ach"; arch = "linux-x86_64"; sha1 = "45cc71012e2c9423f53a9ba501087dc8d47e6b8a"; }
{ locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; } { locale = "af"; arch = "linux-i686"; sha1 = "d9677f0ad122cc64a99638397d52177d6df20128"; }
{ locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; } { locale = "af"; arch = "linux-x86_64"; sha1 = "7516c969fe2d572d1f9ef9d4de523e3d6caa88e1"; }
{ locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; } { locale = "an"; arch = "linux-i686"; sha1 = "d4ad4e5f5f7469b0fea1650b4104bf888cb5c15b"; }
{ locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; } { locale = "an"; arch = "linux-x86_64"; sha1 = "70bbff8841cc16f77c5095bd5b1069cb00c5f1cc"; }
{ locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; } { locale = "ar"; arch = "linux-i686"; sha1 = "efa4ed982bf62ffdfc665bb87d658936d8db5776"; }
{ locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; } { locale = "ar"; arch = "linux-x86_64"; sha1 = "0f9f7ade25f478081ba4c727aecd9984aee4df70"; }
{ locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; } { locale = "as"; arch = "linux-i686"; sha1 = "eb2367bf83ac5dbd2ee8878321b52db10d3639ad"; }
{ locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; } { locale = "as"; arch = "linux-x86_64"; sha1 = "e08846464bc3ff55d6964d19d737d0039322100f"; }
{ locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; } { locale = "ast"; arch = "linux-i686"; sha1 = "86304c1e29b9c5231767bd401273ec68046c76b2"; }
{ locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; } { locale = "ast"; arch = "linux-x86_64"; sha1 = "920f441939469910ddc938036cde2ab509cb2343"; }
{ locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; } { locale = "az"; arch = "linux-i686"; sha1 = "1f8520b21a3addb7f75068cc10a7b8e33b8ca518"; }
{ locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; } { locale = "az"; arch = "linux-x86_64"; sha1 = "177e632d49f6c1d97e5f1597e23ce11dca07e0e5"; }
{ locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; } { locale = "be"; arch = "linux-i686"; sha1 = "142285626aa67c743c5713b6a65e153fe0a641e0"; }
{ locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; } { locale = "be"; arch = "linux-x86_64"; sha1 = "7d49ab01ed0c42bca581bf86b3e8e1ad5bbf7bf1"; }
{ locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; } { locale = "bg"; arch = "linux-i686"; sha1 = "ab1b18aa69960298dfabd161f45d0a27795f0a1a"; }
{ locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; } { locale = "bg"; arch = "linux-x86_64"; sha1 = "0993c19e4345d993bb94c2dd2b5e4a80c95c4a43"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; } { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a23f101ec5f80a88720615daa367cf0c019da41c"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; } { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "5a192b64a22e21cc4e35342c06f90529e0677703"; }
{ locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; } { locale = "bn-IN"; arch = "linux-i686"; sha1 = "0c316e902d44dea1a0c6bdb021ac189207aa791a"; }
{ locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; } { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "fc72cd6c2fa14120b78f19e75271a3ab61795889"; }
{ locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; } { locale = "br"; arch = "linux-i686"; sha1 = "5c159e461a8bf96f2189a843786451c62e842a2b"; }
{ locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; } { locale = "br"; arch = "linux-x86_64"; sha1 = "236b0c31e5f0ebd147bab0b0b03be356316242db"; }
{ locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; } { locale = "bs"; arch = "linux-i686"; sha1 = "515501f46ba1b02b076204a88954a31b2b2e7914"; }
{ locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; } { locale = "bs"; arch = "linux-x86_64"; sha1 = "5c7a4a0a260b5b16dc972cc2e4acaf001b3cdd41"; }
{ locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; } { locale = "ca"; arch = "linux-i686"; sha1 = "aa7ea9c8ec0c71445d89bf43031ac87951ea192f"; }
{ locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; } { locale = "ca"; arch = "linux-x86_64"; sha1 = "b6d9e57dc189c5178bbb585091d133fc8c04e718"; }
{ locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; } { locale = "cs"; arch = "linux-i686"; sha1 = "20fe53563a9c8c21a1e1c4095ac42ed0254bfbdd"; }
{ locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; } { locale = "cs"; arch = "linux-x86_64"; sha1 = "eb763eefb704c57ac367b4d242695c28eed640b4"; }
{ locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; } { locale = "cy"; arch = "linux-i686"; sha1 = "41c8826a12e642d0a4d073628a02ce3ef1ebd5fe"; }
{ locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; } { locale = "cy"; arch = "linux-x86_64"; sha1 = "057359932d6526eaa463907513814e2767a21f7d"; }
{ locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; } { locale = "da"; arch = "linux-i686"; sha1 = "b347c71204d4257b0a4ac710644fa0dab1aa8325"; }
{ locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; } { locale = "da"; arch = "linux-x86_64"; sha1 = "c0e54aa74ae60b241435a80450f75a8246a472cd"; }
{ locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; } { locale = "de"; arch = "linux-i686"; sha1 = "1eb209d6512043b1a51c805fef9056d377fd23bb"; }
{ locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; } { locale = "de"; arch = "linux-x86_64"; sha1 = "de9ba01f5f29a704ee4e9ddd05d0072d340c40f3"; }
{ locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; } { locale = "dsb"; arch = "linux-i686"; sha1 = "17c154b2f579ee94efc222dc0ba790e8bd93f324"; }
{ locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; } { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6f14ca2d875559e8459967b103fde124ab2827b"; }
{ locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; } { locale = "el"; arch = "linux-i686"; sha1 = "6cece97d1faca809bb44cccf1b46c83ec9391ef7"; }
{ locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; } { locale = "el"; arch = "linux-x86_64"; sha1 = "a47eecbd48135bb114fcd7160d7368074501a260"; }
{ locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; } { locale = "en-GB"; arch = "linux-i686"; sha1 = "e7a85809117d0092cc6532c781bfab915b3f16f6"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; } { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "62823bc5fed9ed5b86566e2f4ddfb9764d3c3b83"; }
{ locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; } { locale = "en-US"; arch = "linux-i686"; sha1 = "5d5fa02110c31f1b1cca53f23f00119bf404a06d"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; } { locale = "en-US"; arch = "linux-x86_64"; sha1 = "41909356a1f661a64cef3c3ae696b356084be5a7"; }
{ locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; } { locale = "en-ZA"; arch = "linux-i686"; sha1 = "077a01cd8a9205c025693eb0cb3055e997a1b40e"; }
{ locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; } { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51c13e2eddbabd12d7d35bb7465003768991806e"; }
{ locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; } { locale = "eo"; arch = "linux-i686"; sha1 = "a3851ca2e53b4fb2be4b2bb05e5551037d11184d"; }
{ locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; } { locale = "eo"; arch = "linux-x86_64"; sha1 = "103d1300b9fa071ae3c793874846c3cdff2c90c4"; }
{ locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; } { locale = "es-AR"; arch = "linux-i686"; sha1 = "275d3c72a0b8e6905c97bc58ad7e51811e6e37d7"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; } { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "027749dee7e3541b0c29e4c8d1b27e7caa21044e"; }
{ locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; } { locale = "es-CL"; arch = "linux-i686"; sha1 = "a1c918e6e4460b49e8efdb4e5999ef1e28db9a5c"; }
{ locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; } { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "6ebbb610c3614e308b5ee47a9b034292674b76ca"; }
{ locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; } { locale = "es-ES"; arch = "linux-i686"; sha1 = "21d50757c31db0a1a608aff651971670b8f10ab2"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; } { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "f3549981b618fe6de379c1806ae8e5b4c088788e"; }
{ locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; } { locale = "es-MX"; arch = "linux-i686"; sha1 = "8918a3ae0b1327a100bea927aaad7a6c0fdf35ed"; }
{ locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; } { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e40461a28eb7c1dfa0c9e3bbfd76fbf9f532ca9f"; }
{ locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; } { locale = "et"; arch = "linux-i686"; sha1 = "779f1a8399d47a9515e79028e3a0f12a9e9e791a"; }
{ locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; } { locale = "et"; arch = "linux-x86_64"; sha1 = "5c1c8be5bc86d386a938d6ad1080d0fd8a763c0d"; }
{ locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; } { locale = "eu"; arch = "linux-i686"; sha1 = "5b8c59f4cf19d66bca5c34d51727717e0626ffd6"; }
{ locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; } { locale = "eu"; arch = "linux-x86_64"; sha1 = "0e2ba0116a0976059b224321747eb34b91d229dd"; }
{ locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; } { locale = "fa"; arch = "linux-i686"; sha1 = "3f1a0cab5c292d5319b852d4a974b17489b5516d"; }
{ locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; } { locale = "fa"; arch = "linux-x86_64"; sha1 = "199a7f70e3fa43e910da21b5680368a8b0805fe5"; }
{ locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; } { locale = "ff"; arch = "linux-i686"; sha1 = "7f54aa948b7b030e40019612ad5420d913d636d7"; }
{ locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; } { locale = "ff"; arch = "linux-x86_64"; sha1 = "38aaae5894f1c9a9aec27a8be3d93239d754178e"; }
{ locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; } { locale = "fi"; arch = "linux-i686"; sha1 = "338d3556673f77ee63f21cfaf5f58eaee4442181"; }
{ locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; } { locale = "fi"; arch = "linux-x86_64"; sha1 = "f8bd7b421699d499aed052396b2bbaf98c050728"; }
{ locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; } { locale = "fr"; arch = "linux-i686"; sha1 = "e2c58911aa0ff3b5bd98e83c758947c97d955503"; }
{ locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; } { locale = "fr"; arch = "linux-x86_64"; sha1 = "9b50488ae97c01f2848e827cd842e17abd8b5d21"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; } { locale = "fy-NL"; arch = "linux-i686"; sha1 = "cceb0a3752bd584cd02b3f84f8c07bc27ec38eef"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; } { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "c6c0d21b8230fdd2b35b8da591b027a594ef60d0"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; } { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c662e5b2b59ce620754a845111bc58eab8e8a0ef"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; } { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "17e5c0a48e998c9e6f703033b386533ebd8354c0"; }
{ locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; } { locale = "gd"; arch = "linux-i686"; sha1 = "9a4569025d500290a4e1db03bca59d5731ba1e85"; }
{ locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; } { locale = "gd"; arch = "linux-x86_64"; sha1 = "3ca3494e510159ef1bb8e5c323a1b7c5b8faf235"; }
{ locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; } { locale = "gl"; arch = "linux-i686"; sha1 = "0b331461d902100249ef67d9038023ed8001d513"; }
{ locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; } { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b11c8dfe0bdd4de77e03148fb1fe3ecbfb20677"; }
{ locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; } { locale = "gu-IN"; arch = "linux-i686"; sha1 = "03c09178f69f4040fe3817ba6d2fd40e98392aef"; }
{ locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; } { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "b0e6de684fcb7a47f7616f3071d09d89afbbcb80"; }
{ locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; } { locale = "he"; arch = "linux-i686"; sha1 = "e3d8f15caf7fa19df43e676a5cf93ca5e09ee27b"; }
{ locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; } { locale = "he"; arch = "linux-x86_64"; sha1 = "18441b8f340c0afe14f3869cc37ed041b911fb26"; }
{ locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; } { locale = "hi-IN"; arch = "linux-i686"; sha1 = "fb3627d0f89553741a8fbc3b7671309928832076"; }
{ locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; } { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3da130031d183f003aa7c0fa3509f8982a4e70e1"; }
{ locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; } { locale = "hr"; arch = "linux-i686"; sha1 = "e6e4909d66672c665cf86db494351354720d5682"; }
{ locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; } { locale = "hr"; arch = "linux-x86_64"; sha1 = "027575c413be191f23b22f87a3db0ecdcb48b13c"; }
{ locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; } { locale = "hsb"; arch = "linux-i686"; sha1 = "24f5f3027708320a01d884ba7a91feac98c11f98"; }
{ locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; } { locale = "hsb"; arch = "linux-x86_64"; sha1 = "ede78b5b3ac15fec01de936dc722f25239dac5fb"; }
{ locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; } { locale = "hu"; arch = "linux-i686"; sha1 = "816f5e910aea73d6e36470d3169f900cda2004e2"; }
{ locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; } { locale = "hu"; arch = "linux-x86_64"; sha1 = "f5248943de5e8af2ed3e15fb85aa4429a7b97787"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; } { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ae4e11326f3ad491ec2f823267be4c54a55f93cc"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; } { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0ad1dce94bdc81f534399b00a09c004bac3c69c9"; }
{ locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; } { locale = "id"; arch = "linux-i686"; sha1 = "6568d4e201def196d457eaf13b6e4486ff70d336"; }
{ locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; } { locale = "id"; arch = "linux-x86_64"; sha1 = "45b74a17607f5d93d0062bb09c372afec0eedce6"; }
{ locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; } { locale = "is"; arch = "linux-i686"; sha1 = "d550eefe14d84cf91b3265675298f6c58cfbfe5c"; }
{ locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; } { locale = "is"; arch = "linux-x86_64"; sha1 = "0ddf532263b7f987867e640b278a9f2554e792cb"; }
{ locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; } { locale = "it"; arch = "linux-i686"; sha1 = "6cb353c7fbd9fc67571c5ba00b92d4760e33efaa"; }
{ locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; } { locale = "it"; arch = "linux-x86_64"; sha1 = "353d8e6e83f709d5ba5d26b1a42bc3cfca9997bf"; }
{ locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; } { locale = "ja"; arch = "linux-i686"; sha1 = "e03b1ad563f75cfdec52b392a888c60d2f1438f0"; }
{ locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; } { locale = "ja"; arch = "linux-x86_64"; sha1 = "5fad4f77e055e827ae948e9119d6c30e40ecd831"; }
{ locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; } { locale = "kk"; arch = "linux-i686"; sha1 = "68b9b9d57b6a28000abfcb6363273888f6f4814a"; }
{ locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; } { locale = "kk"; arch = "linux-x86_64"; sha1 = "09f3e62b0e084c26beabdb175232c3a46b8deba9"; }
{ locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; } { locale = "km"; arch = "linux-i686"; sha1 = "7bb71271eae1fecc328abd3a22f97eb8218f2ef4"; }
{ locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; } { locale = "km"; arch = "linux-x86_64"; sha1 = "c328d9f0ae6805aa5d1d4747c375a1f049e77252"; }
{ locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; } { locale = "kn"; arch = "linux-i686"; sha1 = "51d910f52c22180e2a92be77c846303ed037a437"; }
{ locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; } { locale = "kn"; arch = "linux-x86_64"; sha1 = "71411c26ed9c3a899c0e059301050acbcb96a751"; }
{ locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; } { locale = "ko"; arch = "linux-i686"; sha1 = "74f5c7e44dfd537857b29297f27037a6a741cbdd"; }
{ locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; } { locale = "ko"; arch = "linux-x86_64"; sha1 = "dcecd4c55763ec7441c37e048439dc1cb6ea480f"; }
{ locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; } { locale = "lij"; arch = "linux-i686"; sha1 = "df8d745849099c514ad7b6c40b89e2a6f1333a54"; }
{ locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; } { locale = "lij"; arch = "linux-x86_64"; sha1 = "d449eab057742d8798f2d255b4c3134f820e4379"; }
{ locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; } { locale = "lt"; arch = "linux-i686"; sha1 = "9186dab13998c5d01e508fca536f36c1a4fc7dfb"; }
{ locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; } { locale = "lt"; arch = "linux-x86_64"; sha1 = "11e28641755c2ee9648d46181f2861ef67937f53"; }
{ locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; } { locale = "lv"; arch = "linux-i686"; sha1 = "552bd1ef40500c9a5e68b122c8b3525077ce5f6e"; }
{ locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; } { locale = "lv"; arch = "linux-x86_64"; sha1 = "6a6403dd89318608b1436b7d42700054f9a6945a"; }
{ locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; } { locale = "mai"; arch = "linux-i686"; sha1 = "ec3d4b155e58cfec6496fbd824a15dba9377e6ae"; }
{ locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; } { locale = "mai"; arch = "linux-x86_64"; sha1 = "15c2e13971e05b8023826e96ad9d326dd254bbdc"; }
{ locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; } { locale = "mk"; arch = "linux-i686"; sha1 = "7fb2263b3376b8f05ccf12672994919b6a0bdeee"; }
{ locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; } { locale = "mk"; arch = "linux-x86_64"; sha1 = "67b91736a82ab8ce2c523ea084e9be2587d6ee9a"; }
{ locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; } { locale = "ml"; arch = "linux-i686"; sha1 = "9558d57c27f08cf87e35d827bffdc1161505bdf8"; }
{ locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; } { locale = "ml"; arch = "linux-x86_64"; sha1 = "07dd0613207de1b32d7ea7d057154a25f162c240"; }
{ locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; } { locale = "mr"; arch = "linux-i686"; sha1 = "1f1138e747e86fd2408ae827f7785af9a46e49ec"; }
{ locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; } { locale = "mr"; arch = "linux-x86_64"; sha1 = "6b9d24d1f1956fbe375d4850d977c8794b2094ce"; }
{ locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; } { locale = "ms"; arch = "linux-i686"; sha1 = "d8c35c7542ad0c30ac06ba8c6670396eb4cba115"; }
{ locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; } { locale = "ms"; arch = "linux-x86_64"; sha1 = "b885a83d29c8b7670bba999df6bcb67f6c9a13de"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; } { locale = "nb-NO"; arch = "linux-i686"; sha1 = "3fbd8181255cca312da88cadd088b6fe5edabaad"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; } { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "969f2d6715824ca22cb19a5c7c338d9b4e9cbc87"; }
{ locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; } { locale = "nl"; arch = "linux-i686"; sha1 = "e8f99b167cc4d9101168c5d054e439fa00b53d66"; }
{ locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; } { locale = "nl"; arch = "linux-x86_64"; sha1 = "121c2c1839fb65c242e719c05c2794fb80d3df29"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; } { locale = "nn-NO"; arch = "linux-i686"; sha1 = "b77b21a3d8fc78df630f9b412aad94e6bbf6045d"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; } { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bece8813404652dc07b4223d93cf925085a8c2d7"; }
{ locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; } { locale = "or"; arch = "linux-i686"; sha1 = "5c79f1aa2a5a4b9d173f8705000cb950764d308e"; }
{ locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; } { locale = "or"; arch = "linux-x86_64"; sha1 = "edb4f388e48f6a5e63e285f4fca64fd7053ea291"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; } { locale = "pa-IN"; arch = "linux-i686"; sha1 = "618063149909ead3828d509b3f4bdebe98f562c5"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; } { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50d2f536cbf118ab1480d716f7729627c57e05c"; }
{ locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; } { locale = "pl"; arch = "linux-i686"; sha1 = "e94e2d515b8aed6c24a5239f852b971eb7001202"; }
{ locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; } { locale = "pl"; arch = "linux-x86_64"; sha1 = "58e2208b25a70586ae6aff1b58e9c25948622be0"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; } { locale = "pt-BR"; arch = "linux-i686"; sha1 = "732f7e366000509958fdd8065f67138ea38a55a6"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; } { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "2a6e341c14b8bc060e93e9fdbe20f6c7f14ffaeb"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; } { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5f54ba5748c637d3a94558bc10e6fab3db1518ec"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; } { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "72e93c7a33b799c7067163cb7834ab2f93f851f5"; }
{ locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; } { locale = "rm"; arch = "linux-i686"; sha1 = "8c47019cc0cb465431d207e1f8e499d00a7fe8d0"; }
{ locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; } { locale = "rm"; arch = "linux-x86_64"; sha1 = "29bea7462e7b3295e1964ff472a295906e297925"; }
{ locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; } { locale = "ro"; arch = "linux-i686"; sha1 = "2822d04eef821bbd35448b69f27f8e933def6f4e"; }
{ locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; } { locale = "ro"; arch = "linux-x86_64"; sha1 = "9a31c8ce51c31d118de81ef9c7afbd2a0536a9e4"; }
{ locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; } { locale = "ru"; arch = "linux-i686"; sha1 = "04a8a632f3cb50445091baa52aced77cfb00f4e2"; }
{ locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; } { locale = "ru"; arch = "linux-x86_64"; sha1 = "1de49f0817c3a7c6cf4f58f72c10203a8b5a59ba"; }
{ locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; } { locale = "si"; arch = "linux-i686"; sha1 = "f7983c4ce6a6d8b30ae0f55228cc9e3a25ae3971"; }
{ locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; } { locale = "si"; arch = "linux-x86_64"; sha1 = "f5cd2cc05d03d34d6284468c08ba76f7ac95b6ef"; }
{ locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; } { locale = "sk"; arch = "linux-i686"; sha1 = "dbe36a51050b2efb613318d81da0df2e32a7361c"; }
{ locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; } { locale = "sk"; arch = "linux-x86_64"; sha1 = "77dcba31255d019e19c01dc1131b4a2364817e6b"; }
{ locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; } { locale = "sl"; arch = "linux-i686"; sha1 = "42976aa670cf12730ac548603f6a84fde0dd4152"; }
{ locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; } { locale = "sl"; arch = "linux-x86_64"; sha1 = "7f3d486be4782a5a9a85fbbcccb30cd7f020b0a6"; }
{ locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; } { locale = "son"; arch = "linux-i686"; sha1 = "5becaf85ea5b992798e1bf2561f3771d23676d9d"; }
{ locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; } { locale = "son"; arch = "linux-x86_64"; sha1 = "56f32e6524b0d16ba7e3aeb1fde7d9d56fae67e6"; }
{ locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; } { locale = "sq"; arch = "linux-i686"; sha1 = "654860607a653d13895c188d6d7acba8a3cd3342"; }
{ locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; } { locale = "sq"; arch = "linux-x86_64"; sha1 = "859f9e3fda8e9952dd33e67f619124af6a8f3147"; }
{ locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; } { locale = "sr"; arch = "linux-i686"; sha1 = "e5b06f11813d3e7e1bce62a20c85a3e860828e0a"; }
{ locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; } { locale = "sr"; arch = "linux-x86_64"; sha1 = "fa2167558158241844e2061cb28c7890bef939ac"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; } { locale = "sv-SE"; arch = "linux-i686"; sha1 = "71c099a731af87a46dfb153b7ba3ea9a5d188fb4"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; } { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "f1a151abc610c75ce54fddfc0649e1e361469d01"; }
{ locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; } { locale = "ta"; arch = "linux-i686"; sha1 = "feff271a83d4ed97c754c7502033d5d5d7af8082"; }
{ locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; } { locale = "ta"; arch = "linux-x86_64"; sha1 = "1976cdbf1153579bc97e00595ce60f93732ee85c"; }
{ locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; } { locale = "te"; arch = "linux-i686"; sha1 = "063c1c55aad4f055cba90292dd231ef037b6add1"; }
{ locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; } { locale = "te"; arch = "linux-x86_64"; sha1 = "d04d784383d0bf4a6cf10750c1e2d2dce280e8ad"; }
{ locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; } { locale = "th"; arch = "linux-i686"; sha1 = "4b453bd313d45386d5d99b935e24289bd4c51f25"; }
{ locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; } { locale = "th"; arch = "linux-x86_64"; sha1 = "784c38a90182d136407a056892349607b414bdd3"; }
{ locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; } { locale = "tr"; arch = "linux-i686"; sha1 = "bcbc685a2122c23460d8d2ac4e807fdccd75b8e9"; }
{ locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; } { locale = "tr"; arch = "linux-x86_64"; sha1 = "167ffbf3547713c6f236f9c661de8b239699070d"; }
{ locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; } { locale = "uk"; arch = "linux-i686"; sha1 = "ebd2e78cd94454a58757ff093b3ee84faf08e7b8"; }
{ locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; } { locale = "uk"; arch = "linux-x86_64"; sha1 = "6b8f59fefb8d37750a311614f8403f5be989917f"; }
{ locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; } { locale = "uz"; arch = "linux-i686"; sha1 = "5a799fd0f5cdcab2580f14dc107a43160e065092"; }
{ locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; } { locale = "uz"; arch = "linux-x86_64"; sha1 = "c28fe123246a378035ee6ceee3e2d33d0412e874"; }
{ locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; } { locale = "vi"; arch = "linux-i686"; sha1 = "2cdc27ce098519017e006e2cdfb4b4d883264050"; }
{ locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; } { locale = "vi"; arch = "linux-x86_64"; sha1 = "b5891e4e1284ea3e1a2ee7dc60a60ad5460b65e5"; }
{ locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; } { locale = "xh"; arch = "linux-i686"; sha1 = "ce010fe5110e0dd6b3763d23c460d74ec7bfcaad"; }
{ locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; } { locale = "xh"; arch = "linux-x86_64"; sha1 = "231a10effa87e4a5d8848a175a4016e104c1cbaf"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; } { locale = "zh-CN"; arch = "linux-i686"; sha1 = "d40f8e841323cd2cb99392514e6e5daae7ab9246"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; } { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "5bf94401578d12e01a0f4a4911472efbae95f5c9"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; } { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e96feab226294cb6170bd4c707d97c6298db91e"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; } { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c7a7698cec959f3592c9cf2e7f3f425016281c04"; }
]; ];
} }

25
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL { lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL
, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
@ -22,7 +22,9 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; url =
let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2";
in "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}";
inherit sha1; inherit sha1;
}; };
@ -39,11 +41,11 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi python dbus dbus_glib pango freetype fontconfig xorg.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa alsaLib nspr nss libnotify xorg.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx /* cairo */ hunspell libevent libstartup_notification libvpx /* cairo */
gstreamer gst_plugins_base icu libpng jemalloc gstreamer gst_plugins_base icu libpng jemalloc
libpulseaudio # only headers are needed libpulseaudio # only headers are needed
@ -77,6 +79,7 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec {
"--disable-installer" "--disable-installer"
"--disable-updater" "--disable-updater"
"--enable-jemalloc" "--enable-jemalloc"
"--disable-gconf"
] ]
++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
@ -137,14 +140,14 @@ in {
firefox = common { firefox = common {
pname = "firefox"; pname = "firefox";
version = "40.0.3"; version = "41.0";
sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; sha1 = "0ce7a5ccdf671a6c98eaac07d06d49a895a99449";
}; };
firefox-esr = common { firefox-esr = common {
pname = "firefox-esr"; pname = "firefox-esr";
version = "38.2.1esr"; version = "38.3.0esr";
sha1 = "c596174e7273be5079bf55aecde33ec191d99538"; sha1 = "57d2c255348ac13b6ffbb952c5e0d57757aa0290";
}; };
} }

4
pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, xlibsWrapper
, GConf, gnome_mplayer, mplayer, gmtk , GConf, gnome_mplayer, mplayer, gmtk
}: }:
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49"; sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";
}; };
buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ]; buildInputs = [ pkgconfig glib dbus dbus_glib browser xlibsWrapper GConf browser gmtk ];
# !!! fix this # !!! fix this
preBuild = preBuild =

9
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2 }: { stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2,
gst_plugins_base, gst_plugins_good, gst_ffmpeg }:
let version = "0.4.0"; in let version = "0.4.0"; in
@ -19,6 +20,12 @@ buildPythonPackage {
python pyyaml pyqt5 jinja2 pygments pypeg2 python pyyaml pyqt5 jinja2 pygments pypeg2
]; ];
makeWrapperArgs = ''
--prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10"
[ gst_plugins_base gst_plugins_good gst_ffmpeg ]}"
--prefix QT_PLUGIN_PATH : "${qt5.multimedia}/lib/qt5/plugins"
'';
meta = { meta = {
homepage = https://github.com/The-Compiler/qutebrowser; homepage = https://github.com/The-Compiler/qutebrowser;
description = "Keyboard-focused browser with a minimal GUI"; description = "Keyboard-focused browser with a minimal GUI";

6
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -3,12 +3,12 @@
, graphicsSupport ? false , graphicsSupport ? false
, mouseSupport ? false , mouseSupport ? false
, ncurses, openssl ? null, boehmgc, gettext, zlib , ncurses, openssl ? null, boehmgc, gettext, zlib
, imlib2 ? null, x11 ? null, fbcon ? null , imlib2 ? null, xlibsWrapper ? null, fbcon ? null
, gpm-ncurses ? null , gpm-ncurses ? null
}: }:
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null);
assert mouseSupport -> gpm-ncurses != null; assert mouseSupport -> gpm-ncurses != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [ncurses boehmgc gettext zlib] buildInputs = [ncurses boehmgc gettext zlib]
++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional sslSupport openssl
++ stdenv.lib.optional mouseSupport gpm-ncurses ++ stdenv.lib.optional mouseSupport gpm-ncurses
++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon];
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
+ stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb";

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}: {stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "amsn-0.98.9"; name = "amsn-0.98.9";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";
buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper]; buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper];
postInstall = '' postInstall = ''
wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin

26
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib { stdenv, fetchurl, libtool, xorg, freetype, fontconfig, openssl, glib
, mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid
, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra , libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra
, makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }: , makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }:
@ -10,18 +10,18 @@ let
rpath = stdenv.lib.makeSearchPath "lib" [ rpath = stdenv.lib.makeSearchPath "lib" [
stdenv.glibc stdenv.glibc
libtool libtool
xlibs.libXext xorg.libXext
xlibs.libSM xorg.libSM
xlibs.libICE xorg.libICE
xlibs.libX11 xorg.libX11
xlibs.libXft xorg.libXft
xlibs.libXau xorg.libXau
xlibs.libXdmcp xorg.libXdmcp
xlibs.libXrender xorg.libXrender
xlibs.libXfixes xorg.libXfixes
xlibs.libXcomposite xorg.libXcomposite
xlibs.libxcb xorg.libxcb
xlibs.libXi xorg.libXi
freetype freetype
fontconfig fontconfig
openssl openssl

20
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk
# Optional, Jitsi still runs without, but you may pass null: # Optional, Jitsi still runs without, but you may pass null:
, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xlibs , alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
gtk2 gtk2
libpulseaudio libpulseaudio
openssl openssl
] ++ lib.optionals (xlibs != null) [ ] ++ lib.optionals (xorg != null) [
xlibs.libX11 xorg.libX11
xlibs.libXext xorg.libXext
xlibs.libXScrnSaver xorg.libXScrnSaver
xlibs.libXv xorg.libXv
]); ]);
buildInputs = [unzip ant jdk]; buildInputs = [unzip ant jdk];
@ -66,12 +66,12 @@ stdenv.mkDerivation rec {
done done
''; '';
meta = { meta = with stdenv.lib; {
homepage = https://jitsi.org/; homepage = https://jitsi.org/;
description = "Open Source Video Calls and Chat"; description = "Open Source Video Calls and Chat";
license = stdenv.lib.licenses.lgpl21Plus.shortName; license = licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
maintainers = [ stdenv.lib.maintainers.khumba ]; maintainers = [ maintainers.khumba ];
}; };
} }

4
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
, xorg, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null , xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
, libredirect, quazip, less, which, unzip , libredirect, quazip, less, which, unzip
}: }:
@ -12,7 +12,7 @@ let
deps = deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
]; ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
, bwidget, makeWrapper, x11 , bwidget, makeWrapper, xlibsWrapper
, withSitePlugins ? true , withSitePlugins ? true
, theme ? null , theme ? null
}: }:
@ -62,7 +62,7 @@ in mkTkabber (main // {
done done
''; '';
buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries; buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries;
meta = { meta = {
homepage = "http://tkabber.jabber.ru/"; homepage = "http://tkabber.jabber.ru/";

10
pkgs/applications/networking/instant-messengers/viber/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }: { fetchurl, stdenv, dpkg, makeWrapper, xorg, qt5Full, gstreamer, zlib, sqlite, libxslt }:
assert stdenv.system == "x86_64-linux"; assert stdenv.system == "x86_64-linux";
@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
qt5Full qt5Full
xlibs.libX11 xorg.libX11
gstreamer gstreamer
zlib zlib
sqlite sqlite
xlibs.libXrender xorg.libXrender
libxslt libxslt
stdenv.cc.cc stdenv.cc.cc
xlibs.libXScrnSaver xorg.libXScrnSaver
xlibs.libXext xorg.libXext
]; ];
installPhase = '' installPhase = ''

12
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL { stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
[ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2 [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi python dbus dbus_glib pango freetype fontconfig xorg.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa alsaLib nspr nss libnotify xorg.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification cairo icu hunspell libevent libstartup_notification cairo icu
] ++ [ m4 ]; ] ++ [ m4 ];

4
pkgs/applications/office/mendeley/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, dpkg, makeWrapper, which { fetchurl, stdenv, dpkg, makeWrapper, which
,gcc, xlibs, qt4, zlib ,gcc, xorg, qt4, zlib
, ...}: , ...}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@ -24,7 +24,7 @@ let
deps = [ deps = [
gcc.cc gcc.cc
qt4 qt4
xlibs.libX11 xorg.libX11
zlib zlib
]; ];

2
pkgs/applications/office/zotero/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }: { stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
let let

29
pkgs/applications/science/logic/metis-prover/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, perl, mlton }:
stdenv.mkDerivation rec {
name = "metis-prover-${version}";
version = "2.3";
src = fetchurl {
url = "http://www.gilith.com/software/metis/metis.tar.gz";
sha256 = "07wqhic66i5ip2j194x6pswwrxyxrimpc4vg0haa5aqv9pfpmxad";
};
nativeBuildInputs = [ perl ];
buildInputs = [ mlton ];
patchPhase = "patchShebangs scripts/mlpp";
buildPhase = "make mlton";
installPhase = ''
install -Dm0755 bin/mlton/metis $out/bin/metis
'';
meta = with stdenv.lib; {
description = "Automatic theorem prover for first-order logic with equality";
homepage = http://www.gilith.com/research/metis/;
license = licenses.mit;
maintainers = with maintainers; [ gebner ];
};
}

4
pkgs/applications/science/math/mathematica/9.nix
View File

@ -12,7 +12,7 @@
, opencv , opencv
, openssl , openssl
, unixODBC , unixODBC
, xlibs , xorg
, zlib , zlib
}: }:
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
opencv opencv
openssl openssl
unixODBC unixODBC
] ++ (with xlibs; [ ] ++ (with xorg; [
libX11 libX11
libXext libXext
libXtst libXtst

4
pkgs/applications/science/math/mathematica/default.nix
View File

@ -12,7 +12,7 @@
, opencv , opencv
, openssl , openssl
, unixODBC , unixODBC
, xlibs , xorg
, zlib , zlib
, libxml2 , libxml2
, libuuid , libuuid
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
unixODBC unixODBC
libxml2 libxml2
libuuid libuuid
] ++ (with xlibs; [ ] ++ (with xorg; [
libX11 libX11
libXext libXext
libXtst libXtst

10
pkgs/applications/science/math/scilab/default.nix
View File

@ -8,7 +8,7 @@
, ocaml, withOCaml ? false , ocaml, withOCaml ? false
#, withJava ? false #, withJava ? false
#, atlasMath, withAtlas ? false #, atlasMath, withAtlas ? false
, x11, withX ? false , xlibsWrapper, withX ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [gfortran ncurses] buildInputs = [gfortran ncurses]
++ lib.optionals withGtk [gtk] ++ lib.optionals withGtk [gtk]
++ lib.optionals withOCaml [ocaml] ++ lib.optionals withOCaml [ocaml]
++ lib.optionals withX [x11] ++ lib.optional withX xlibsWrapper
; ;
@ -58,11 +58,7 @@ stdenv.mkDerivation rec {
# do not compile Java interface # do not compile Java interface
+ " --without-java" + " --without-java"
# use the X Window System # use the X Window System
+ (lib.optionalString withX " + lib.optionalString withX "--with-x"
--with-x
--x-libraries=${x11}/lib
--x-includes=${x11}/include
")
; ;
makeFlags = "all"; makeFlags = "all";

4
pkgs/applications/science/misc/openmodelica/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk, makeWrapper }: doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }:
let let
@ -17,7 +17,7 @@ stdenv.mkDerivation {
buildInputs = [autoconf cmake automake libtool gfortran clang gnumake buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu
git gtk makeWrapper]; git gtk makeWrapper];
patchPhase = '' patchPhase = ''

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

@ -51,13 +51,13 @@ rec {
qgit = import ./qgit { qgit = import ./qgit {
inherit fetchurl stdenv; inherit fetchurl stdenv;
inherit (xlibs) libXext libX11; inherit (xorg) libXext libX11;
qt = qt4; qt = qt4;
}; };
qgitGit = import ./qgit/qgit-git.nix { qgitGit = import ./qgit/qgit-git.nix {
inherit fetchurl sourceFromHead stdenv; inherit fetchurl sourceFromHead stdenv;
inherit (xlibs) libXext libX11; inherit (xorg) libXext libX11;
qt = qt4; qt = qt4;
}; };

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

@ -9,7 +9,7 @@
}: }:
let let
version = "2.5.2"; version = "2.5.3";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
in in
@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "16qcli3cip1ixbrxrb3hhvvgx6ppy4anig83wz7aqlfy1sln0isb"; sha256 = "06is8pq8gsia3dav8mgl2zlvms2ny4hs1x0w2792ya51azc2jk8j";
}; };
patches = [ patches = [

21
pkgs/applications/version-management/gitinspector/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchzip, buildPythonPackage }:
buildPythonPackage rec {
name = "gitinspector-${version}";
version = "0.4.1";
namePrefix = "";
src = fetchzip {
url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz";
sha256 = "07kjvf9cj6g6gvjgnnas5facm3nhxppf0l0fcxyd4vq6xhdb3swp";
name = name + "-src";
};
meta = with stdenv.lib; {
homepage = https://github.com/ejwa/gitinspector;
description = "Statistical analysis tool for git repositories";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [ maintainers.bjornfor ];
};
}

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

@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
version = "1.9.1"; version = "1.9.2";
name = "subversion-${version}"; name = "subversion-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://apache/subversion/${name}.tar.bz2"; url = "mirror://apache/subversion/${name}.tar.bz2";
sha1 = "1244a741dbcf24f2b1d165225f0159a0c994e37a"; sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017";
}; };
buildInputs = [ zlib apr aprutil sqlite ] buildInputs = [ zlib apr aprutil sqlite ]

4
pkgs/applications/video/gnash/default.nix
View File

@ -3,7 +3,7 @@
, gst_ffmpeg, speex , gst_ffmpeg, speex
, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
, boost, freetype, agg, dbus, curl, pkgconfig, gettext , boost, freetype, agg, dbus, curl, pkgconfig, gettext
, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl , glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl
, freefont_ttf, haxe, swftools , freefont_ttf, haxe, swftools
, lib, makeWrapper , lib, makeWrapper
, xulrunner }: , xulrunner }:
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
# XXX: KDE is supported as well so we could make it available optionally. # XXX: KDE is supported as well so we could make it available optionally.
buildInputs = [ buildInputs = [
gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
gst_ffmpeg speex libtool gst_ffmpeg speex libtool
libogg libxml2 libjpeg mesa libpng libungif boost freetype agg libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
dbus curl pkgconfig glib gtk gtkglext pangox_compat dbus curl pkgconfig glib gtk gtkglext pangox_compat

4
pkgs/applications/video/mythtv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec { stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec
, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
, yasm, libuuid, taglib, libtool, autoconf, automake, file , yasm, libuuid, taglib, libtool, autoconf, automake, file
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sourceRoot = "${name}/mythtv"; sourceRoot = "${name}/mythtv";
buildInputs = [ buildInputs = [
freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec
libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
libuuid taglib libuuid taglib
]; ];

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, xlibs, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, {stdenv, fetchurl, xorg, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau,
libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext, libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext,
pkgconfig, kernel, file, libXi}: pkgconfig, kernel, file, libXi}:
@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = '' configureFlags = ''
--x-includes=${xlibs.libX11}/include --x-includes=${xorg.libX11}/include
--x-libraries=${xlibs.libX11}/lib --x-libraries=${xorg.libX11}/lib
''; '';
buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ]; buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray { stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
] ]
++ (if withQt5 then with qt5; [ base ] else [qt4]) ++ (if withQt5 then with qt5; [ base ] else [qt4])

6
pkgs/applications/video/xine-ui/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl {stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl
, lirc, shared_mime_info, libjpeg }: , lirc, shared_mime_info, libjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ xineLib libpng readline ncurses curl lirc libjpeg [ xineLib libpng readline ncurses curl lirc libjpeg
xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto
xlibs.libXinerama xlibs.libXi xlibs.libXft xorg.libXinerama xorg.libXi xorg.libXft
]; ];
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';

4
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake, { stdenv, lib, fetchurl, makeWrapper, autoconf, automake,
libmspack, openssl, pam, xercesc, icu, libdnet, procps, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
x11, libXinerama, libXi, libXrender, libXrandr, libXtst, xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
pkgconfig, glib, gtk, gtkmm }: pkgconfig, glib, gtk, gtkmm }:
let let
@ -18,7 +18,7 @@ in stdenv.mkDerivation {
buildInputs = buildInputs =
[ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps
pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ]; pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
patchPhase = '' patchPhase = ''
sed -i s,-Werror,,g configure.ac sed -i s,-Werror,,g configure.ac

4
pkgs/applications/virtualization/xen/generic.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl
, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2
, lvm2, utillinux, procps, texinfo, perl, pythonPackages , lvm2, utillinux, procps, texinfo, perl, pythonPackages
, glib, bridge-utils, xlibs, pixman, iproute, udev, bison , glib, bridge-utils, xorg, pixman, iproute, udev, bison
, flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl
, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
, spice_protocol, usbredir, alsaLib, quilt , spice_protocol, usbredir, alsaLib, quilt
@ -66,7 +66,7 @@ stdenv.mkDerivation {
[ which zlib pkgconfig SDL openssl libuuid gettext ncurses [ which zlib pkgconfig SDL openssl libuuid gettext ncurses
dev86 iasl pciutils bzip2 xz texinfo perl yajl dev86 iasl pciutils bzip2 xz texinfo perl yajl
pythonPackages.python pythonPackages.wrapPython pythonPackages.python pythonPackages.wrapPython
glib bridge-utils pixman iproute udev bison xlibs.libX11 glib bridge-utils pixman iproute udev bison xorg.libX11
flex ocaml ocamlPackages.findlib figlet libaio flex ocaml ocamlPackages.findlib figlet libaio
checkpolicy pythonPackages.markdown transfig checkpolicy pythonPackages.markdown transfig
glusterfs acl cmake spice spice_protocol usbredir glusterfs acl cmake spice spice_protocol usbredir

20
pkgs/applications/window-managers/awesome/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
, xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
, which, dbus, nettools, git, asciidoc, doxygen , which, dbus, nettools, git, asciidoc, doxygen
@ -46,15 +46,15 @@ stdenv.mkDerivation rec {
pango pango
pkgconfig pkgconfig
xcb-util-cursor xcb-util-cursor
xlibs.libXau xorg.libXau
xlibs.libXdmcp xorg.libXdmcp
xlibs.libxcb xorg.libxcb
xlibs.libxshmfence xorg.libxshmfence
xlibs.xcbutil xorg.xcbutil
xlibs.xcbutilimage xorg.xcbutilimage
xlibs.xcbutilkeysyms xorg.xcbutilkeysyms
xlibs.xcbutilrenderutil xorg.xcbutilrenderutil
xlibs.xcbutilwm xorg.xcbutilwm
#xmlto docbook_xml_dtd_45 docbook_xsl #xmlto docbook_xml_dtd_45 docbook_xsl
]; ];

4
pkgs/applications/window-managers/ion-3/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, lua, gettext, groff }: { stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ion-3-20090110"; name = "ion-3-20090110";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz;
sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
}; };
buildInputs = [ x11 lua gettext groff ]; buildInputs = [ xlibsWrapper lua gettext groff ];
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
installFlags = "PREFIX=\${out}"; installFlags = "PREFIX=\${out}";
} }

4
pkgs/applications/window-managers/notion/default.nix
View File

@ -4,7 +4,7 @@
stdenv, fetchurl, stdenv, fetchurl,
lua, gettext, groff, lua, gettext, groff,
pkgconfig, busybox, pkgconfig, busybox,
x11, libXinerama, libXrandr, libX11 xlibsWrapper, libXinerama, libXrandr, libX11
}: }:
assert enableXft -> libXft != null; assert enableXft -> libXft != null;
@ -26,7 +26,7 @@ stdenv.mkDerivation {
patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff; patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff;
postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'"; postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'";
buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
installFlags = "PREFIX=\${out}"; installFlags = "PREFIX=\${out}";

8
pkgs/applications/window-managers/qtile/default.nix
View File

@ -17,20 +17,20 @@ buildPythonPackage rec {
substituteInPlace libqtile/manager.py --subst-var-by out $out substituteInPlace libqtile/manager.py --subst-var-by out $out
''; '';
buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xlibs.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];
cairocffi-xcffib = python27Packages.cairocffi.override { cairocffi-xcffib = python27Packages.cairocffi.override {
LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";
pythonPath = [ python27Packages.xcffib ]; pythonPath = [ python27Packages.xcffib ];
}; };
pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ]; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ];
LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";
postInstall = '' postInstall = ''
wrapProgram $out/bin/qtile \ wrapProgram $out/bin/qtile \
--prefix LD_LIBRARY_PATH : ${pkgs.xlibs.libxcb}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \
--prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \
--prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \
--prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib

7
pkgs/applications/window-managers/weston/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb
, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null , libwebp ? null, xwayland ? null
# beware of null defaults, as the parameters *are* supplied by callPackage by default # beware of null defaults, as the parameters *are* supplied by callPackage by default
@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm mtdev wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva libwebp mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva
libwebp
]; ];
configureFlags = [ configureFlags = [

11
pkgs/build-support/setup-hooks/separate-debug-info.sh
View File

@ -18,7 +18,6 @@ _separateDebugInfo() {
# Skip non-ELF files. # Skip non-ELF files.
exec 10< "$i" exec 10< "$i"
read -n 4 -u 10 magic read -n 4 -u 10 magic
if [[ "$magic" =~ ELF ]]; then echo FOO; fi
exec 10<&- exec 10<&-
# Extract the Build ID. FIXME: there's probably a cleaner way. # Extract the Build ID. FIXME: there's probably a cleaner way.
@ -31,7 +30,15 @@ _separateDebugInfo() {
# Extract the debug info. # Extract the debug info.
header "separating debug info from $i (build ID $id)" header "separating debug info from $i (build ID $id)"
mkdir -p "$dst/${id:0:2}" mkdir -p "$dst/${id:0:2}"
objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" --compress-debug-sections
strip --strip-debug "$i" strip --strip-debug "$i"
done done
} }
# - We might prefer to compress the debug info during link-time already,
# but our ld doesn't support --compress-debug-sections=zlib (yet).
# - Debug info may cause problems due to excessive memory usage during linking.
# Using -Wa,--compress-debug-sections should help with that;
# further interesting information: https://gcc.gnu.org/wiki/DebugFission
# - Another related tool: https://fedoraproject.org/wiki/Features/DwarfCompressor

4
pkgs/data/documentation/zeal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }: { stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1.1"; version = "0.1.1";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
]; ];
configurePhase = '' configurePhase = ''

13
pkgs/data/fonts/noto-fonts/default.nix
View File

@ -96,7 +96,16 @@ rec {
sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2"; sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2";
}; };
buildInputs = [ optipng cairo fontforge pythonPackages.nototools pythonPackages.fonttools pkgconfig ]; buildInputs = with pythonPackages; [
optipng cairo fontforge python nototools fonttools pkgconfig
];
#FIXME: perhaps use our pngquant instead
preConfigure = ''
for f in ./*.py ./third_party/pngquant/configure; do
patchShebangs "$f"
done
'';
preBuild = '' preBuild = ''
export PYTHONPATH=$PYTHONPATH:$PWD export PYTHONPATH=$PYTHONPATH:$PWD
@ -116,4 +125,4 @@ rec {
maintainers = with maintainers; [ mathnerd314 ]; maintainers = with maintainers; [ mathnerd314 ];
}; };
}; };
} }

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