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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2015-07-22 22:33:55 +02:00
commit 2cacf77c13
130 changed files with 1026 additions and 755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/language-support.xml
View File

@ -1,3 +1,4 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-language-support">
@ -341,7 +342,14 @@ twisted = buildPythonPackage {
<para>By default <varname>doCheck = true</varname> is set and tests are run with
<literal>${python.interpreter} setup.py test</literal> command in <varname>checkPhase</varname>.</para>
<para><varname>propagatedBuildInputs</varname> packages are propagated to user environment.</para>
<para>
As in Perl, dependencies on other Python packages can be specified in the
<varname>buildInputs</varname> and
<varname>propagatedBuildInputs</varname> attributes. If something is
exclusively a build-time dependency, use
<varname>buildInputs</varname>; if it’s (also) a runtime dependency,
use <varname>propagatedBuildInputs</varname>.
</para>
<para>
By default <varname>meta.platforms</varname> is set to the same value

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

@ -61,6 +61,16 @@ let
echo "${version}" > version
'';
toc = builtins.toFile "toc.xml"
''
<toc role="chunk-toc">
<d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-nixos-manual"><?dbhtml filename="index.html"?>
<d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?></d:tocentry>
<d:tocentry linkend="ch-release-notes"><?dbhtml filename="release-notes.html"?></d:tocentry>
</d:tocentry>
</toc>
'';
in rec {
# The NixOS options in JSON format.
@ -113,9 +123,10 @@ in rec {
--param chunk.section.depth 0 \
--param chunk.first.sections 1 \
--param use.id.as.filename 1 \
--stringparam generate.toc "book toc chapter toc appendix toc" \
--stringparam generate.toc "book toc appendix toc" \
--stringparam chunk.toc ${toc} \
--nonet --xinclude --output $dst/ \
${docbook5_xsl}/xml/xsl/docbook/xhtml/chunkfast.xsl ./manual.xml
${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl ./manual.xml
mkdir -p $dst/images/callouts
cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/

5
nixos/doc/manual/manual.xml
View File

@ -2,7 +2,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="NixOSManual">
xml:id="book-nixos-manual">
<info>
<title>NixOS Manual</title>
@ -33,11 +33,12 @@
<xi:include href="administration/running.xml" />
<!-- <xi:include href="userconfiguration.xml" /> -->
<xi:include href="development/development.xml" />
<xi:include href="release-notes/release-notes.xml" />
<appendix xml:id="ch-options">
<title>Configuration Options</title>
<xi:include href="options-db.xml" />
</appendix>
<xi:include href="release-notes/release-notes.xml" />
</book>

14
nixos/doc/manual/release-notes/release-notes.xml
View File

@ -1,19 +1,17 @@
<part xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ch-release-notes">
<appendix xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ch-release-notes">
<title>Release Notes</title>
<partintro>
<para>This section lists the release notes for each stable version of NixOS
and current unstable revision.</para>
</partintro>
<xi:include href="rl-unstable.xml" />
<xi:include href="rl-1412.xml" />
<xi:include href="rl-1404.xml" />
<xi:include href="rl-1310.xml" />
</part>
</appendix>

12
nixos/doc/manual/release-notes/rl-1310.xml
View File

@ -1,11 +1,11 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-13.10">
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-13.10">
<title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
<para>This is the first stable release branch of NixOS.</para>
</chapter>
</section>

12
nixos/doc/manual/release-notes/rl-1404.xml
View File

@ -1,8 +1,8 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-14.04">
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-14.04">
<title>Release 14.04 (“Baboon”, 2014/04/30)</title>
@ -157,4 +157,4 @@ networking.firewall.enable = false;
</para>
</chapter>
</section>

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

@ -1,8 +1,8 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-14.12">
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-14.12">
<title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
@ -174,4 +174,4 @@ now.</para></listitem>
</para>
</chapter>
</section>

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

@ -1,10 +1,10 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-unstable">
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-unstable">
<title>Unstable revision</title>
<title>Release 15.07 (“Dingo”, 2015/07/??)</title>
<para>In addition to numerous new and upgraded packages, this release has the following highlights:
@ -36,12 +36,12 @@
</para>
<para>Following new services were added since the last release:
<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>
<listitem><para><literal>tvheadend</literal></para></listitem>
</itemizedlist>
</para>
@ -50,6 +50,12 @@ following incompatible changes:
<itemizedlist>
<listitem><para><command>cron</command> is no longer enabled by
default, unless you have a non-empty
<option>services.cron.systemCronJobs</option>. To force
<command>cron</command> to be enabled, set
<option>services.cron.enable = true</option>.</para></listitem>
<listitem><para>Steam now doesn't need root rights to work. Instead of using
<literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>.
<literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>,
@ -64,20 +70,6 @@ was accordingly renamed to <literal>bomi</literal>
was accordingly renamed to <literal>electron</literal>
</para></listitem>
<listitem>
<para>
The default <literal>NIX_PATH</literal> for NixOS now includes
<literal>/nix/var/nix/profiles/per-user/root/channels</literal>, so it's
easy to add custom channels.
</para>
<para>
Moreover, whenever a <command>nixos-rebuild &lt;action&gt;
--upgrade</command> is issued, every channel that includes a file
called <filename>.update-on-nixos-rebuild</filename> will be upgraded
alongside of the <literal>nixos</literal> channel.
</para>
</listitem>
<listitem>
<para>
The CUPS printing service has been updated to version <literal>2.0.2</literal>.
@ -90,15 +82,6 @@ was accordingly renamed to <literal>electron</literal>
</para>
</listitem>
<listitem>
<para>
HPLIP (printer, scanner, and fax drivers for HP devices) has
been updated to version <literal>3.15.4</literal>. This release
adds support for the <literal>arm6l-linux</literal> and
<literal>arm7l-linux</literal> platforms.
</para>
</listitem>
<listitem>
<para>
Haskell packages can no longer be found by name, i.e. the commands
@ -124,7 +107,7 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
<listitem>
<para>
Previous versions of NixOS come with a feature called
Previous versions of NixOS came with a feature called
<literal>ghc-wrapper</literal>, a small wrapper script that allows
GHC to transparently pick up on libraries installed in the user's
profile. This feature has been deprecated;
@ -181,4 +164,4 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
</itemizedlist>
</para>
</chapter>
</section>

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

@ -226,6 +226,7 @@
gitit = 202;
riemanntools = 203;
subsonic = 204;
riak = 205;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -430,6 +431,7 @@
gitit = 202;
riemanntools = 203;
subsonic = 204;
riak = 205;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

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

@ -131,6 +131,7 @@
./services/databases/opentsdb.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/riak.nix
./services/databases/virtuoso.nix
./services/desktops/accountsservice.nix
./services/desktops/geoclue2.nix

148
nixos/modules/services/databases/riak.nix Normal file
View File

@ -0,0 +1,148 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.riak;
in
{
###### interface
options = {
services.riak = {
enable = mkEnableOption "riak";
package = mkOption {
type = types.package;
example = literalExample "pkgs.riak2";
description = ''
Riak package to use.
'';
};
nodeName = mkOption {
type = types.string;
default = "riak@127.0.0.1";
description = ''
Name of the Erlang node.
'';
};
distributedCookie = mkOption {
type = types.string;
default = "riak";
description = ''
Cookie for distributed node communication. All nodes in the
same cluster should use the same cookie or they will not be able to
communicate.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/db/riak";
description = ''
Data directory for Riak.
'';
};
logDir = mkOption {
type = types.path;
default = "/var/log/riak";
description = ''
Log directory for Riak.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Additional text to be appended to <filename>riak.conf</filename>.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
environment.etc."riak/riak.conf".text = ''
nodename = ${cfg.nodeName}
distributed_cookie = ${cfg.distributedCookie}
platform_log_dir = ${cfg.logDir}
platform_etc_dir = /etc/riak
platform_data_dir = ${cfg.dataDir}
${cfg.extraConfig}
'';
users.extraUsers.riak = {
name = "riak";
uid = config.ids.uids.riak;
group = "riak";
description = "Riak server user";
};
users.extraGroups.riak.gid = config.ids.gids.riak;
systemd.services.riak = {
description = "Riak Server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [
pkgs.utillinux # for `logger`
pkgs.bash
];
environment.RIAK_DATA_DIR = "${cfg.dataDir}";
environment.RIAK_LOG_DIR = "${cfg.logDir}";
environment.RIAK_ETC_DIR = "/etc/riak";
preStart = ''
if ! test -e ${cfg.logDir}; then
mkdir -m 0755 -p ${cfg.logDir}
chown -R riak ${cfg.logDir}
fi
if ! test -e ${cfg.dataDir}; then
mkdir -m 0700 -p ${cfg.dataDir}
chown -R riak ${cfg.dataDir}
fi
'';
serviceConfig = {
ExecStart = "${cfg.package}/bin/riak console";
ExecStop = "${cfg.package}/bin/riak stop";
StandardInput = "tty";
User = "riak";
Group = "riak";
PermissionsStartOnly = true;
# Give Riak a decent amount of time to clean up.
TimeoutStopSec = 120;
LimitNOFILE = 65536;
};
unitConfig.RequiresMountsFor = [
"${cfg.dataDir}"
"${cfg.logDir}"
"/etc/riak"
];
};
};
}

65
nixos/modules/services/scheduling/cron.nix
View File

@ -4,8 +4,6 @@ with lib;
let
inherit (config.services) jobsTags;
# Put all the system cronjobs together.
systemCronJobsFile = pkgs.writeText "system-crontab"
''
@ -25,9 +23,9 @@ let
sendmailPath = "/var/setuid-wrappers/sendmail";
};
allFiles = map (f: "\"${f}\"") (
[ "${systemCronJobsFile}" ] ++ config.services.cron.cronFiles
);
allFiles =
optional (config.services.cron.systemCronJobs != []) systemCronJobsFile
++ config.services.cron.cronFiles;
in
@ -91,36 +89,49 @@ in
###### implementation
config = mkIf (config.services.cron.enable && allFiles != []) {
config = mkMerge [
security.setuidPrograms = [ "crontab" ];
{ services.cron.enable = mkDefault (allFiles != []); }
environment.systemPackages = [ cronNixosPkg ];
(mkIf (config.services.cron.enable && allFiles != []) {
systemd.services.cron =
{ description = "Cron Daemon";
security.setuidPrograms = [ "crontab" ];
wantedBy = [ "multi-user.target" ];
environment.systemPackages = [ cronNixosPkg ];
preStart =
''
rm -f /etc/crontab
cat ${toString allFiles} > /etc/crontab
chmod 0600 /etc/crontab
environment.etc.crontab =
{ source = pkgs.runCommand "crontabs" { inherit allFiles; }
''
touch $out
for i in $allFiles; do
cat "$i" >> $out
done
'';
mode = "0600"; # Cron requires this.
};
mkdir -m 710 -p /var/cron
systemd.services.cron =
{ description = "Cron Daemon";
# By default, allow all users to create a crontab. This
# is denoted by the existence of an empty cron.deny file.
if ! test -e /var/cron/cron.allow -o -e /var/cron/cron.deny; then
touch /var/cron/cron.deny
fi
'';
wantedBy = [ "multi-user.target" ];
restartTriggers = [ config.environment.etc.localtime.source ];
serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
};
preStart =
''
mkdir -m 710 -p /var/cron
};
# By default, allow all users to create a crontab. This
# is denoted by the existence of an empty cron.deny file.
if ! test -e /var/cron/cron.allow -o -e /var/cron/cron.deny; then
touch /var/cron/cron.deny
fi
'';
restartTriggers = [ config.environment.etc.localtime.source ];
serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
};
})
];
}

4
nixos/modules/system/activation/activation-script.nix
View File

@ -114,10 +114,6 @@ in
''
# Various log/runtime directories.
touch /run/utmp # must exist
chgrp ${toString config.ids.gids.utmp} /run/utmp
chmod 664 /run/utmp
mkdir -m 0755 -p /run/nix/current-load # for distributed builds
mkdir -m 0700 -p /run/nix/remote-stores

3
nixos/modules/system/boot/networkd.nix
View File

@ -641,9 +641,6 @@ in
environment.etc."systemd/network".source =
generateUnits "network" cfg.units [] [];
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
systemd.services.systemd-networkd = {
wantedBy = [ "multi-user.target" ];
before = [ "network-interfaces.target" ];

3
nixos/modules/system/boot/resolved.nix
View File

@ -30,9 +30,6 @@ with lib;
DNS=${concatStringsSep " " config.networking.nameservers}
'';
users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
};
}

6
nixos/modules/system/boot/stage-1-init.sh
View File

@ -182,9 +182,9 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
for sd in @resumeDevices@; do
# Try to detect resume device. According to Ubuntu bug:
# https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1
# When there are multiple swap devices, we can't know where will hibernate
# image reside. We can check all of them for swsuspend blkid.
resumeInfo="$(udevadm info -q property "$sd" )"
# when there are multiple swap devices, we can't know where the hibernate
# image will reside. We can check all of them for swsuspend blkid.
resumeInfo="$(test -e "$d" && udevadm info -q property "$sd")"
if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
resumeDev="$sd"
break

10
nixos/modules/system/boot/stage-2-init.sh
View File

@ -85,8 +85,10 @@ done
# More special file systems, initialise required directories.
mkdir -m 0755 /dev/shm
mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
if ! mountpoint -q /dev/shm; then
mkdir -m 0755 /dev/shm
mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
fi
mkdir -m 0755 -p /dev/pts
[ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default
mkdir -m 01777 -p /tmp
@ -162,7 +164,9 @@ $systemConfig/activate
# Restore the system time from the hardware clock. We do this after
# running the activation script to be sure that /etc/localtime points
# at the current time zone.
hwclock --hctosys
if [ -e /dev/rtc ]; then
hwclock --hctosys
fi
# Record the boot configuration.

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

@ -639,15 +639,17 @@ in
system.activationScripts.systemd = stringAfter [ "groups" ]
''
mkdir -m 0755 -p /var/lib/udev
mkdir -p /var/log/journal
chmod 0755 /var/log/journal
# Make all journals readable to users in the wheel and adm
# groups, in addition to those in the systemd-journal group.
# Users can always read their own journals.
${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
if ! [ -e /etc/machine-id ]; then
${systemd}/bin/systemd-machine-id-setup
fi
'';
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
# Target for ‘charon send-keys’ to hook into.
users.extraGroups.keys.gid = config.ids.gids.keys;
@ -722,6 +724,7 @@ in
startSession = true;
};
environment.etc."tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
environment.etc."tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
environment.etc."tmpfiles.d/nixos.conf".text =
@ -729,10 +732,6 @@ in
# This file is created automatically and should not be modified.
# Please change the option ‘systemd.tmpfiles.rules’ instead.
z /var/log/journal 2755 root systemd-journal - -
z /var/log/journal/%m 2755 root systemd-journal - -
z /var/log/journal/%m/* 0640 root systemd-journal - -
${concatStringsSep "\n" cfg.tmpfiles.rules}
'';
@ -749,6 +748,10 @@ in
systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
# Don't bother with certain units in containers.
systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container";
};
}

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

@ -708,11 +708,14 @@ in
pkgs.iproute
pkgs.iputils
pkgs.nettools
pkgs.wirelesstools
pkgs.openresolv
]
++ optionals (!config.boot.isContainer) [
pkgs.wirelesstools # FIXME: obsolete?
pkgs.iw
pkgs.rfkill
pkgs.openresolv
] ++ bridgeStp;
]
++ bridgeStp;
systemd.targets."network-interfaces" =
{ description = "All Network Interfaces";

4
nixos/modules/virtualisation/container-config.nix
View File

@ -19,10 +19,6 @@ with lib;
# Shut up warnings about not having a boot loader.
system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
systemd.services.systemd-remount-fs.enable = false;
systemd.services.systemd-random-seed.enable = false;
};
}

21
nixos/modules/virtualisation/docker.nix
View File

@ -54,6 +54,21 @@ in
'';
};
postStart =
mkOption {
type = types.string;
default = ''
while ! [ -e /var/run/docker.sock ]; do
sleep 0.1
done
'';
description = ''
The postStart phase of the systemd service. You may need to
override this if you are passing in flags to docker which
don't cause the socket file to be created.
'';
};
};
@ -106,11 +121,7 @@ in
path = [ pkgs.kmod ];
environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
postStart = ''
while ! [ -e /var/run/docker.sock ]; do
sleep 0.1
done
'';
postStart = cfg.postStart;
# Presumably some containers are running we don't want to interrupt
restartIfChanged = false;

1
nixos/release-combined.nix
View File

@ -52,7 +52,6 @@ in rec {
(all nixos.tests.firefox)
(all nixos.tests.firewall)
(all nixos.tests.gnome3)
(all nixos.tests.installer.grub1)
(all nixos.tests.installer.lvm)
(all nixos.tests.installer.luksroot)
(all nixos.tests.installer.separateBoot)

2
nixos/release.nix
View File

@ -176,10 +176,12 @@ in rec {
# boot that system from uboot (like for the sheevaplug).
# The pc variant helps preparing the expression for the system tarball
# in a machine faster than the sheevpalug
/*
system_tarball_pc = forAllSystems (system: makeSystemTarball {
module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
inherit system;
});
*/
# Provide container tarball for lxc, libvirt-lxc, docker-lxc, ...
containerTarball = forAllSystems (system: makeSystemTarball {

21
nixos/tests/riak.nix Normal file
View File

@ -0,0 +1,21 @@
import ./make-test.nix {
name = "riak";
nodes = {
master =
{ pkgs, config, ... }:
{
services.riak.enable = true;
services.riak.package = pkgs.riak2;
};
};
testScript = ''
startAll;
$master->waitForUnit("riak");
$master->sleep(20); # Hopefully this is long enough!!
$master->succeed("RIAK_DATA_DIR='/var/db/riak' RIAK_LOG_DIR='/var/log/riak' RIAK_ETC_DIR='/etc/riak' riak ping 2>&1");
'';
}

4
pkgs/applications/altcoins/litecoin.nix
View File

@ -8,11 +8,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.9.3-preview5";
version = "0.10.2.2";
src = fetchurl {
url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz";
sha256 = "0nnfz4s2g28jb5fqy6cabsryp3h2amzlyslr6g6k8r1vmzvx5ym6";
sha256 = "1p1h2654b7f2lyrmihcjmpmx6sjpkgsifcm2ixxb2g9jh6qq8b4m";
};
buildInputs = [ pkgconfig autoreconfHook openssl

10
pkgs/applications/audio/mpc/default.nix
View File

@ -13,15 +13,15 @@ stdenv.mkDerivation rec {
preConfigure =
''
export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion}
export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion}
export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
'';
meta = {
meta = with stdenv.lib; {
description = "A minimalist command line interface to MPD";
homepage = http://www.musicpd.org/clients/mpc/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.algorith ];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2;
maintainers = [ maintainers.algorith ];
platforms = with platforms; linux ++ darwin;
};
}

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

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
emacsName = "emacs-24.5";
name = "${emacsName}-mac-5.8";
name = "${emacsName}-mac-5.9";
#builder = ./builder.sh;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
sha256 = "0ljhrag5lag8i72xfsmgk9lndqv0b3sahyyd48svj6jlg4jachir";
sha256 = "1xjskagjlnni1nqshszbvk8h8vhwq9sk09l25vb6fijn4g9akwqr";
};
buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];

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

@ -273,25 +273,25 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "4.5.2";
build = "141.1580";
version = "4.5.3";
build = "141.1899";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "09v1ni06h381y7d5cglifwsz81kln2y4ld7hgpz1sn56fwbi8ld9";
sha256 = "13f3mp7gcl27fikxjlwk7n1gyxa46q0wfgniang4knb596wlfli0";
};
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "4.5.2";
build = "141.1580";
version = "4.5.3";
build = "141.1899";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1dgpzn7wgaxicgw48z83fp462g5mxsr7iwkgp11ffypz93ba2dm7";
sha256 = "00b66fy841vjm54n2fby5wf7y8ihihqgydr6329iv9p5s0mgzh2s";
};
};

10
pkgs/applications/graphics/processing/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }:
{ fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }:
stdenv.mkDerivation rec {
name = "processing-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# Stop it trying to download its own version of java
patches = [ ./use-nixpkgs-jre.patch ];
buildInputs = [ ant jre makeWrapper libXxf86vm which ];
buildInputs = [ ant jdk makeWrapper libXxf86vm which ];
buildPhase = "cd build && ant build";
@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -r linux/work/* $out/${name}/
makeWrapper $out/${name}/processing $out/bin/processing \
--prefix PATH : "${jre}/bin:${which}/bin" \
--prefix PATH : "${jdk}/bin:${which}/bin" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
makeWrapper $out/${name}/processing-java $out/bin/processing-java \
--prefix PATH : "${jre}/bin:${which}/bin" \
--prefix PATH : "${jdk}/bin:${which}/bin" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
ln -s ${jre} $out/${name}/java
ln -s ${jdk} $out/${name}/java
'';
meta = with stdenv.lib; {

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2
, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
let version = "3.17.3"; in
let version = "3.17.4"; in
stdenv.mkDerivation rec {
name = "simple-scan-${version}";
src = fetchurl {
sha256 = "1kb2xk4vr2nab3hfjfnfyapv2z65h99c3g7mfkmanzrng5xwrj8q";
sha256 = "1pslbv45g01g039zj2b01k08f763kkhzqw8wwz7yh27m7bjllnx6";
url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
};

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgs, pythonPackages }:
pythonPackages.buildPythonPackage rec {
version = "0.5.0";
version = "0.6.0";
name = "khal-${version}";
src = fetchurl {
url = "https://github.com/geier/khal/archive/v${version}.tar.gz";
sha256 = "1rjs5s8ky4n628rs6l5ggaj2abb4kq2avvxmimjjgxz3zh9xlz6s";
url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz";
sha256 = "16nsib70rczln0hrh93bas58lr8crvq8yipj7qnfs4hbs9b8sbhs";
};
propagatedBuildInputs = with pythonPackages; [
@ -23,6 +23,7 @@ pythonPackages.buildPythonPackage rec {
tzlocal
urwid
python.modules.sqlite3
pkginfo
];
meta = with stdenv.lib; {

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.
{
dev = {
version = "45.0.2454.6";
sha256 = "09bhbq3hvsfiac7w6ajd6n1lcdzf2isg1s9sqabrnx9blyds7msh";
sha256bin32 = "1f38rfd9v91inhd9m2sfcj4bpvq5f03zn8ypvacr9mpwc47rylx3";
sha256bin64 = "1bfjpjisa0hqiy8kmmgh2mr6zyifpmhr7k5ai44h5szf36768bn6";
version = "45.0.2454.7";
sha256 = "19xjdp0zxr96r2fx9wf30wldalrh393p2dhqwp2n1m751vizbj5s";
sha256bin32 = "1id1z3m0pc2lxh4lp9r6babh098gfyz4dda931yjkxhzb9rw1v0d";
sha256bin64 = "1sksf651z1sqgh9pwdm5dksqnb0lzhwabxj3myg4w5kxi8s4pi8l";
};
beta = {
version = "44.0.2403.89";
@ -13,9 +13,9 @@
sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0";
};
stable = {
version = "43.0.2357.134";
sha256 = "0nbn25pl3rgyqmy4p5dqr0v08xzkm08lpzsaxzszqpa4w7ivp8fk";
sha256bin32 = "1xmybw4vs8x2rrg43f7x7yn763wfzr5f8d1jpq49r42qr365q6vs";
sha256bin64 = "1y79135pmkhvv4cdhdy93jhm0jdx132a6spqqyyhbcr2sn26cq62";
version = "44.0.2403.89";
sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds";
sha256bin32 = "09a1k0xxmp6v1nfnngfkhv9vilnwvqlbgfsisbhwdnkk86pnv7r4";
sha256bin64 = "1i7ylif5vd0yj0gddl2kv87gh3vgzvzmz91rrrs9za2bkf2gkf0p";
};
}

42
pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
View File

@ -1,36 +1,30 @@
a :
let
fetchurl = a.fetchurl;
{ stdenv, fetchurl, firefox, libX11, xproto }:
stdenv.mkDerivation rec {
name = "mozplugger-${version}";
version = "2.1.6";
version = a.lib.attrByPath ["version"] "1.12.0" a;
buildInputs = with a; [
firefox libX11 xproto
];
in
rec {
src = fetchurl {
url = "http://mozplugger.mozdev.org/files/mozplugger-${version}.tar.gz";
sha256 = "1vpggfmbv4h3srk80rgidd020i03hrkpb7cfxkwagkcd0zcal4hk";
sha256 = "1vszkq4kdbaxsrqr2xn9rq6ipza9fngdri79gvjqk3bvsdmg0k19";
};
inherit buildInputs;
configureFlags = [];
makeFlags = ["linux" "prefix=" "root=$out"];
buildInputs = [ firefox libX11 xproto ];
preBuild = a.fullDepEntry(''
sed -e s@/usr/@"$out/"@g -i mozplugger.c
'') ["doUnpack" "minInit"];
installPhase = ''
mkdir -p "$out/etc" "$out/bin" "$out/lib/mozilla/plugins" "$out/share/man/man7"
cp mozpluggerrc "$out/etc"
cp mozplugger-{helper,controller,linker,update} "$out/bin"
cp mozplugger.so "$out/lib/mozilla/plugins"
cp mozplugger.7 "$out/share/man/man7"
postInstall = a.fullDepEntry(''
mkdir -p $out/share/${name}/plugin
ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin
'') ["doMakeInstall" "minInit" "defEnsureDir"];
mkdir -p "$out/share/${name}/plugin"
ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin"
'';
/* doConfigure should be removed if not needed */
phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
name = "mozplugger-" + version;
meta = {
description = "Mozilla plugin for launching external program for handling in-page objects";
homepage = http://mozplugger.mozdev.org/;
license = stdenv.lib.licenses.gpl2Plus;
};
}

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

@ -19,11 +19,11 @@
let
# NOTE: When updating, please also update in current stable, as older versions stop working
version = "3.6.7";
version = "3.6.9";
sha256 =
{
"x86_64-linux" = "1jwzrpw382amx0jap9m411a3yvkc9iwnw6n35kwq3infmbwjs6q8";
"i686-linux" = "0rjd908bhfk00qh6gvizf2fyfb3cccd78spyvh435z377x2pmxzy";
"x86_64-linux" = "1i260mi40siwcx9b2sj4zwszxmj1l88mpmyqncsfa72k02jz22j3";
"i686-linux" = "0qqc8qbfaighbhjq9y22ka6n6apl8b6cr80a9rkpk2qsk99k8h1z";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =

1
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""
substituteInPlace configure.ac --replace gnome-icon-theme adwaita-icon-theme
'';
configureFlags = [

4
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
name = "kicad-20131025";
src = fetchbzr {
url = "https://code.launchpad.net/~kicad-stable-committers/kicad/stable";
url = "https://code.launchpad.net/kicad/stable";
rev = 4024;
sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5";
};
srcLibrary = fetchbzr {
url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
url = "http://bazaar.launchpad.net/~kicad-product-committers/kicad/library";
rev = 293;
sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i";
};

4
pkgs/applications/science/electronics/verilator/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "verilator-${version}";
version = "3.872";
version = "3.874";
src = fetchurl {
url = "http://www.veripool.org/ftp/${name}.tgz";
sha256 = "113ha7vy6lsi9zygiy3rnsd3dhi5y8lkfsfrh0nwzady7147l2yh";
sha256 = "070binwp0jnashi6w45km26vrn6200b8hdg4179lcqyzdxi8c06j";
};
enableParallelBuilding = true;

8
pkgs/applications/search/recoll/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl
, qt4, xapian, file, python
, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
, libwpd, unrtf, untex
, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }:
assert stdenv.system != "powerpc-linux";
@ -40,12 +41,11 @@ stdenv.mkDerivation rec {
substituteInPlace $f --replace unzip ${unzip}/bin/unzip
substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv
substituteInPlace $f --replace xsltproc ${libxslt}/bin/xsltproc
substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf
substituteInPlace $f --replace untex ${untex}/bin/untex
substituteInPlace $f --replace wpd2html ${libwpd}/bin/wpd2html
done
'';
# TODO:
#substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf
#substituteInPlace $f --replace untex ${untex}/bin/untex
#substituteInPlace $f --replace wpd2html ${wpd2html}/bin/wpd2html
meta = with stdenv.lib; {
description = "A full-text search tool";

14
pkgs/applications/video/kodi/default.nix
View File

@ -37,18 +37,18 @@ assert cecSupport -> libcec != null;
assert rtmpSupport -> rtmpdump != null;
let
rel = "Helix";
ffmpeg_2_4_6 = fetchurl {
url = "https://github.com/xbmc/FFmpeg/archive/2.4.6-${rel}.tar.gz";
sha256 = "1kxp2z2zgcbplm5398zrfgwcfacfzvbg9y9wwrmm8vgwfmj32wh8";
rel = "Isengard";
ffmpeg_2_6_3 = fetchurl {
url = "https://github.com/xbmc/FFmpeg/archive/2.6.3-${rel}.tar.gz";
sha256 = "129nwrj9i758vz9xakpp68sm1l7z4in0krq6ayyqnpsnm54r9xlc";
};
in stdenv.mkDerivation rec {
name = "kodi-" + version;
version = "14.2";
version = "15.0";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
sha256 = "1x37l8db6xrvdw933p804lnwvkcm4vdb9gm5i6vmz4ha8f88bjyr";
sha256 = "1zqdmqffjfr5219cvpbvq9v1z5p5pzi2m9xs9lzk4jz7rxrs3nr7";
};
buildInputs = [
@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
--replace "/bin/bash" "${bash}/bin/bash -ex"
cp ${ffmpeg_2_4_6} tools/depends/target/ffmpeg/ffmpeg-2.4.6-${rel}.tar.gz
cp ${ffmpeg_2_6_3} tools/depends/target/ffmpeg/ffmpeg-2.6.3-${rel}.tar.gz
'';
preConfigure = ''

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

@ -6,11 +6,12 @@
}:
stdenv.mkDerivation rec {
name = "weston-${wayland.version}";
name = "weston-${version}";
version = "1.8.0";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1kb6a494j56sh7iy43xwkjlr3bh0nnkq4bkimwj6qirzbya12i8w";
sha256 = "04nkbbdglh0pqznxkdqvak3pc53jmz24d0658bn5r0cf6agycqw9";
};
buildInputs = [

16
pkgs/build-support/build-maven.nix
View File

@ -15,15 +15,27 @@ infoFile: let
script = writeText "build-maven-repository.sh" ''
${lib.concatStrings (map (dep: let
inherit (dep) url sha1 groupId artifactId version authenticated;
inherit (dep)
url sha1 groupId artifactId version
authenticated metadata extension repository-id;
versionDir = dep.unresolved-version or version;
fetch = (if authenticated then requireFile else fetchurl) {
inherit url sha1;
};
fetchMetadata = (if authenticated then requireFile else fetchurl) {
inherit (metadata) url sha1;
};
in ''
dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${version}
dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${versionDir}
mkdir -p $dir
ln -sv ${fetch} $dir/${fetch.name}
${lib.optionalString (dep ? metadata) ''
ln -svf ${fetchMetadata} $dir/maven-metadata-${repository-id}.xml
ln -sv ${fetch} $dir/$(echo ${fetch.name} | sed 's|${version}|${dep.unresolved-version}|')
''}
'') info.dependencies)}
'';

5
pkgs/build-support/cc-wrapper/default.nix
View File

@ -7,7 +7,7 @@
{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
, zlib ? null, extraPackages ? []
, zlib ? null, extraPackages ? [], extraBuildCommands ? ""
, dyld ? null # TODO: should this be a setup-hook on dyld?
, isGNU ? false, isClang ? false
}:
@ -232,7 +232,8 @@ stdenv.mkDerivation {
substituteAll ${./add-flags} $out/nix-support/add-flags.sh
cp -p ${./utils.sh} $out/nix-support/utils.sh
'';
''
+ extraBuildCommands;
# The dynamic linker has different names on different Linux platforms.
dynamicLinker =

6
pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
View File

@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
enableParallelBuilding = true;
# https://bugzilla.gnome.org/show_bug.cgi?id=752596
enableParallelBuilding = false;
buildInputs = with gnome3;
[ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
@ -52,7 +53,8 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "Single sign-on framework for GNOME";
description = "Utilities to configure the GNOME desktop";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lethalman ];
platforms = platforms.linux;
};

4
pkgs/development/compilers/closure/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
version = "20150315";
version = "20150609";
src = fetchurl {
url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
sha256 = "1vzwyhpqbrndg7mri81f1b2yi8cshw5pghvdda9vdxgq465sa52f";
sha256 = "0347j50kg41agrvpb29vp69ra912ljhp206z9kbrk84lxpmx19rp";
};
phases = [ "installPhase" ];

2
pkgs/development/compilers/coreclr/default.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://dotnet.github.io/core/;
description = ".NET is a general purpose development platform.";
platforms = with stdenv.lib.platforms; linux;
platforms = [ "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ obadz ];
license = stdenv.lib.licenses.mit;
};

2
pkgs/development/compilers/edk2/default.nix
View File

@ -46,7 +46,7 @@ edk2 = stdenv.mkDerivation {
configurePhase = ''
mkdir -v Conf
sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
's|MYTOOLS|GCC48|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
< ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
sed -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \
-e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \

4
pkgs/development/compilers/fsharp/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "fsharp-${version}";
version = "3.1.1.32";
version = "3.1.2.5";
src = fetchurl {
url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd";
sha256 = "1j6lnzvhj8fj1csb9am9xcrmmph6v3jyangkq8n1yp3dr6yxqzh1";
};
buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ];

2
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -320,7 +320,7 @@ stdenv.mkDerivation ({
" --with-gnu-as --without-gnu-ld "
else ""}
--enable-lto
${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
${optionalString (isl != null) "--with-isl=${isl}"}

2
pkgs/development/compilers/gcc/5/default.nix
View File

@ -318,7 +318,7 @@ stdenv.mkDerivation ({
" --with-gnu-as --without-gnu-ld "
else ""}
--enable-lto
${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
${optionalString (isl != null) "--with-isl=${isl}"}

2
pkgs/development/compilers/go/default.nix → pkgs/development/compilers/go/1.0.nix
View File

@ -90,6 +90,6 @@ stdenv.mkDerivation {
description = "The Go Programming language";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ pierron viric ];
platforms = stdenv.lib.platforms.linux;
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/development/compilers/go/1.2.nix
View File

@ -87,6 +87,6 @@ stdenv.mkDerivation {
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ pierron viric ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" ];
};
}

8
pkgs/development/compilers/mono/default.nix
View File

@ -6,13 +6,15 @@ let
in
stdenv.mkDerivation rec {
name = "mono-${version}";
version = "4.0.1";
version = "4.0.2.5";
src = fetchurl {
url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
sha256 = "1kjv1zhcmd2qfr89vkaas6541n5jfzisn3y030l6lg6lp3ria7zz";
sha256 = "0lfndz7l3j593wilyczb5w6kvrdbf2fsd1i46qlszfjvx975hx5h";
};
buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
buildInputs =
[ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib
];
propagatedBuildInputs = [glib];
NIX_LDFLAGS = "-lgcc_s" ;

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -891,4 +891,6 @@ self: super: {
# Hydra no longer allows building texlive packages.
lhs2tex = dontDistribute super.lhs2tex;
# https://ghc.haskell.org/trac/ghc/ticket/9825
vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
}

1
pkgs/development/interpreters/pypy/default.nix
View File

@ -114,6 +114,7 @@ let
isPypy = true;
buildEnv = callPackage ../python/wrapper.nix { python = self; };
interpreter = "${self}/bin/${executable}";
sitePackages = "lib/${libPrefix}/site-packages";
};
enableParallelBuilding = true; # almost no parallelization without STM

30
pkgs/development/interpreters/scsh/default.nix
View File

@ -1,26 +1,22 @@
{stdenv, fetchurl}:
let
pname = "scsh";
version = "0.6.7";
name = "${pname}-${version}";
in
{ stdenv, fetchgit, autoconf, automake, autoreconfHook, scheme48 }:
stdenv.mkDerivation {
inherit name;
name = "scsh-0.7pre";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f";
src = fetchgit {
url = "git://github.com/scheme/scsh.git";
rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
fetchSubmodules = true;
sha256 = "0fz1r0bmiii9ld91r84dqkqwhnqk0h6drdycq93zcy5ndyn12fqp";
};
meta = {
buildInputs = [ autoconf automake autoreconfHook scheme48 ];
configureFlags = ''--with-scheme48=${scheme48}'';
meta = with stdenv.lib; {
description = "A Scheme shell";
longDescription = ''
SCSH is an implementation of the Scheme shell. It is implemented as
a heap image which is interpreted by the Scheme 48 virtual machine.
'';
homepage = http://www.scsh.net/;
license = stdenv.lib.licenses.bsd3;
license = licenses.bsd3;
maintainers = with maintainers; [ joachifm ];
};
}

4
pkgs/development/libraries/bobcat/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline
{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline
, utillinux, yodl }:
let version = "3.25.02"; in
@ -19,7 +19,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ];
buildInputs = [ libmilter libX11 openssl readline utillinux ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''

17
pkgs/development/libraries/capstone/default.nix
View File

@ -1,21 +1,16 @@
{ stdenv, fetchurl, bash }:
{ stdenv, fetchurl, bash, cmake }:
stdenv.mkDerivation rec {
name = "capstone-${version}";
version = "2.1.2";
version = "3.0.4";
src = fetchurl {
url = "http://www.capstone-engine.org/download/${version}/${name}.tgz";
sha256 = "1k6px3vdcsfby3lakss5sazs875kbzkzqk7cj79xrm2y5ik1vr29";
url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
};
buildPhase = false;
patchPhase = ''
substituteInPlace make.sh --replace "/usr/bin/env bash" "${bash}/bin/bash"
'';
installPhase = "PREFIX=$out ./make.sh install";
buildInputs = [ cmake ];
enableParallelBuild = true;
meta = {
description = "advanced disassembly library";

5
pkgs/development/libraries/cogl/1.20.nix
View File

@ -18,10 +18,9 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-introspection"
"--enable-gles1"
"--enable-gles2"
"--enable-kms-egl-platform"
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
propagatedBuildInputs = with xorg; [
glib gdk_pixbuf gobjectIntrospection

2
pkgs/development/libraries/glib/default.nix
View File

@ -93,6 +93,8 @@ stdenv.mkDerivation rec {
sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
# All gschemas fail to pass the test, upstream bug?
sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
# Cannot reproduce the failing test_associations on hydra
sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
# Needed because of libtool wrappers
sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
'';

4
pkgs/development/libraries/libseccomp/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libseccomp-${version}";
version = "2.2.1";
version = "2.2.3";
src = fetchFromGitHub {
owner = "seccomp";
repo = "libseccomp";
rev = "v${version}";
sha256 = "153k3jflcgij19nxghmwlvqlngl84vkld514d31490c6sfkr5fy2";
sha256 = "0pl827qjls5b6kjj8qxxdwcn6rviqbm5xjqf0hgx6b04c836mswx";
};
buildInputs = [ autoreconfHook getopt ];

28
pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
View File

@ -1,28 +0,0 @@
From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Fri, 15 May 2015 22:22:13 -0400
Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194)
---
src/channels.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/channels.c b/src/channels.c
index 7a4e71f..db5f83a 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -2206,6 +2206,11 @@ error:
}
/* DEPRECATED */
+int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) {
+ return ssh_channel_listen_forward(session, address, port, bound_port);
+}
+
+/* DEPRECATED */
ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) {
return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL);
}
--
2.1.4

8
pkgs/development/libraries/libssh/default.nix
View File

@ -1,15 +1,13 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
stdenv.mkDerivation rec {
name = "libssh-0.7.0";
name = "libssh-0.7.1";
src = fetchurl {
url = "https://git.libssh.org/projects/libssh.git/snapshot/${name}.tar.gz";
sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0";
url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz";
sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg";
};
patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ];
postPatch = ''
# Fix headers to use libsodium instead of NaCl
sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c

6
pkgs/development/libraries/libwpd/default.nix
View File

@ -11,4 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ glib libgsf libxml2 zlib librevenge ];
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
description = "A library for importing and exporting WordPerfect documents";
homepage = http://libwpd.sourceforge.net/;
license = licenses.lgpl21;
};
}

2
pkgs/development/libraries/poppler/default.nix
View File

@ -4,7 +4,7 @@
, utils ? false, suffix ? "glib"
}:
let
let # beware: updates often break cups_filters build
version = "0.34.0"; # even major numbers are stable
sha256 = "1c2wa4pfzqmvzq1jpp3ps5nmzz745gcg8dnpwqpfdccy5ydbm90v";
in

17
pkgs/development/libraries/qt-5/5.3/default.nix
View File

@ -22,6 +22,8 @@ let
ver = "${v_maj}.${v_min}";
in
let system-x86_64 = elem stdenv.system platforms.x86_64; in
stdenv.mkDerivation rec {
name = "qt-${ver}";
@ -126,6 +128,16 @@ stdenv.mkDerivation rec {
-no-linuxfb
-no-kms
${optionalString (!system-x86_64) "-no-sse2"}
-no-sse3
-no-ssse3
-no-sse4.1
-no-sse4.2
-no-avx
-no-avx2
-no-mips_dsp
-no-mips_dspr2
-system-zlib
-system-libpng
-system-libjpeg
@ -144,6 +156,11 @@ stdenv.mkDerivation rec {
-${optionalString (buildTests == false) "no"}make tests
'';
# PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
# if dependency paths contain the string "pq", which can occur in the hash.
# To prevent these failures, we need to override PostgreSQL detection.
PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre

25
pkgs/development/libraries/qt-5/5.4/qtbase.nix
View File

@ -25,6 +25,8 @@
with stdenv.lib;
let system-x86_64 = elem stdenv.system platforms.x86_64; in
stdenv.mkDerivation {
name = "qtbase-${version}";
@ -104,6 +106,7 @@ stdenv.mkDerivation {
-strip
-reduce-relocations
-system-proxies
-pkg-config
-gui
-widgets
@ -124,6 +127,16 @@ stdenv.mkDerivation {
-no-linuxfb
-no-kms
${optionalString (!system-x86_64) "-no-sse2"}
-no-sse3
-no-ssse3
-no-sse4.1
-no-sse4.2
-no-avx
-no-avx2
-no-mips_dsp
-no-mips_dspr2
-system-zlib
-system-libpng
-system-libjpeg
@ -142,6 +155,11 @@ stdenv.mkDerivation {
-${optionalString (buildTests == false) "no"}make tests
'';
# PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
# if dependency paths contain the string "pq", which can occur in the hash.
# To prevent these failures, we need to override PostgreSQL detection.
PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
@ -171,12 +189,11 @@ stdenv.mkDerivation {
# Don't retain build-time dependencies like gdb and ruby.
sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
mkdir -p "$out/nix-support"
substitute ${./setup-hook.sh} "$out/nix-support/setup-hook" \
--subst-var out --subst-var-by lndir "${lndir}"
'';
inherit lndir;
setupHook = ./setup-hook.sh;
enableParallelBuilding = true; # often fails on Hydra, as well as qt4
meta = {

18
pkgs/development/libraries/signon/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, doxygen, qt5 }:
{ stdenv, fetchzip, doxygen, qt5 }:
stdenv.mkDerivation rec {
name = "signon-8.56";
src = fetchurl {
url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2";
sha256 = "00kwysm7bga0bycclkcyslsa6aahcn98drm125l6brzhigc7qxa8";
name = "signon-${version}";
version = "8.57";
src = fetchzip {
url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip";
sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a";
};
buildInputs = [ qt5.base ];
@ -14,11 +15,4 @@ stdenv.mkDerivation rec {
qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5
'';
postInstall = ''
mv $out/lib/cmake/SignOnQt5/SignOnQtConfig.cmake \
$out/lib/cmake/SignOnQt5/SignOnQt5Config.cmake
mv $out/lib/cmake/SignOnQt5/SignOnQtConfigVersion.cmake \
$out/lib/cmake/SignOnQt5/SignOnQt5ConfigVersion.cmake
'';
}

18
pkgs/development/python-modules/rainbowstream/image.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index f050150..a0fb77d 100644
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -12,11 +12,7 @@ def call_c():
"""
Call the C program for converting RGB to Ansi colors
"""
- library = expanduser('~/.image.so')
- sauce = join(dirname(__file__), 'image.c')
- if not exists(library) or getmtime(sauce) > getmtime(library):
- build = "cc -fPIC -shared -o %s %s" % (library, sauce)
- os.system(build + " >/dev/null 2>&1")
+ library = '@CLIB@'
image_c = ctypes.cdll.LoadLibrary(library)
image_c.init()
return image_c.rgb_to_ansi

3
pkgs/development/tools/build-managers/cargo/default.nix
View File

@ -11,8 +11,7 @@ buildRustPackage rec {
src = fetchgit {
url = "https://github.com/rust-lang/cargo.git";
rev = "refs/tags/0.3.0";
sha256 = "1ckb2xd7nm8357imw6b1ci2ar8grnihzan94kvmjrijq6sz8yv9i";
leaveDotGit = true;
sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793";
};
depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w";

4
pkgs/development/tools/build-managers/ninja/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "ninja-${version}";
version = "1.5.3";
version = "1.6.0";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/martine/ninja/archive/v${version}.tar.gz";
sha256 = "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw";
sha256 = "1ryd1686bd31gfdjxnqm6k1ybnjmjz8v97px7lmdkr4g0vxqhgml";
};
buildInputs = [ python asciidoc re2c ];

4
pkgs/development/tools/misc/pahole/default.nix
View File

@ -11,8 +11,8 @@ stdenv.mkDerivation {
postInstall = ''
for p in $out/bin/*; do
rpath=`patchelf --print-rpath $p`:$out
patchelf --set-rpath $rpath $p
rpath=`patchelf --print-rpath $p || true`:$out
patchelf --set-rpath "$rpath" $p || true
done
'';

4
pkgs/development/tools/parsing/flexc++/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }:
{ stdenv, fetchurl, bobcat, icmake, yodl }:
let version = "2.02.00"; in
stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ bobcat gcc49 ];
buildInputs = [ bobcat ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''

4
pkgs/development/tools/parsing/re2c/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "re2c-${version}";
version = "0.14.2";
version = "0.14.3";
src = fetchurl {
url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz";
sha256 = "0c0w5w1dp9v9d0a6smjbnk6zvfs77fx1xd7damap3x3sjxiyn0m7";
sha256 = "113yj5h38isfsjigqvb2j3ammfmxckgwyxmm0h4fyflzb7ghcs0w";
};
meta = {

10
pkgs/development/tools/vagrant/default.nix
View File

@ -4,7 +4,7 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
let
version = "1.7.3";
version = "1.7.4";
rake = buildRubyGem {
inherit ruby;
name = "rake-10.3.2";
@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
sha256 = "0zg2sdxgrmwqvzqw4z8d6ji8d0cby33nggv0n9ncjxp0wjiv8nkm";
sha256 = "0dl3cskpz7d8mmv0ah86426vlx0lj1wkjdlb5gc868dfsysw5lnw";
}
else
fetchurl {
url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
sha256 = "0r23w49jwl3c3g4nns5xnrsrqyfkqsgln91cj30hxkw50d0ldpvs";
sha256 = "0sns9q48c6b2sabp6bwkppx8ffp774jhv69jrv225qrnifx12105";
};
meta = with stdenv.lib; {
@ -93,12 +93,12 @@ stdenv.mkDerivation rec {
preFixup = ''
# 'hide' the template file from shebang-patching
chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable
chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
'';
postFixup = ''
chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable
chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
'';
}

2
pkgs/games/anki/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ];
preConfigure = ''
substituteInPlace anki \
substituteInPlace anki/anki \
--replace /usr/share/ $out/share/
substituteInPlace Makefile \

6
pkgs/games/dwarf-therapist/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, coreutils, fetchgit, qt4, dwarf_fortress, bash, makeWrapper }:
let
version = "30.2.0pre";
version = "31.0.0";
df = dwarf_fortress;
in
stdenv.mkDerivation rec {
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://github.com/splintermind/Dwarf-Therapist.git";
rev = "65bb15a29d616d788c20a3344058b7277e4fadba";
sha256 = "1q1n9sm0lgmn52m4aigb22cdfbh2s569y1mn5cmimgj600i6c2f2";
rev = "refs/tags/v${version}";
sha256 = "02d6k8c3vm401v04ln9q405njarx869jpfyf42lwskijrzjygk9x";
};
# Needed for hashing

51
pkgs/games/quake3/game/botlib.patch Normal file
View File

@ -0,0 +1,51 @@
Retrieved from https://bugzilla.icculus.org/show_bug.cgi?id=4331,
removed path prefix.
-- nckx <tobias.geerinckx.rice@gmail.com>
PATCH: Bots don't work on 64 bit Intel CPU's
botlib abuses strcpy (source and dest overlap), and the strcpy function for 64
bit intel CPU's in the latest glibc, does not like this causing the bots to not
load.
The attached patch fixes this.
Note this patch should be credited to: Andreas Bierfert (andreas.bierfert at
lowlatency.de)
See: http://bugzilla.redhat.com/show_bug.cgi?id=526338
diff -up quake3-1.36/code/botlib/l_precomp.c~ quake3-1.36/code/botlib/l_precomp.c
--- code/botlib/l_precomp.c~ 2009-04-27 08:42:37.000000000 +0200
+++ code/botlib/l_precomp.c 2009-11-03 21:03:08.000000000 +0100
@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path)
if ((*ptr == '\\' || *ptr == '/') &&
(*(ptr+1) == '\\' || *(ptr+1) == '/'))
{
- strcpy(ptr, ptr+1);
+ memmove(ptr, ptr+1, strlen(ptr));
} //end if
else
{
diff -up quake3-1.36/code/botlib/l_script.c~ quake3-1.36/code/botlib/l_script.c
--- code/botlib/l_script.c~ 2009-04-27 08:42:37.000000000 +0200
+++ code/botlib/l_script.c 2009-11-03 21:06:11.000000000 +0100
@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string)
{
if (*string == '\"')
{
- strcpy(string, string+1);
+ memmove(string, string+1, strlen(string));
} //end if
if (string[strlen(string)-1] == '\"')
{
@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string)
{
if (*string == '\'')
{
- strcpy(string, string+1);
+ memmove(string, string+1, strlen(string));
} //end if
if (string[strlen(string)-1] == '\'')
{

3
pkgs/games/quake3/game/default.nix
View File

@ -20,6 +20,9 @@ stdenv.mkDerivation {
# Do an exit() instead of _exit(). This is nice for gcov.
# Upstream also seems to do this.
./exit.patch
# No bots on amd64 without this patch.
./botlib.patch
];
buildInputs = [ x11 SDL mesa openal gcc46 ];

1
pkgs/games/steam/chrootenv.nix
View File

@ -14,6 +14,7 @@ buildFHSUserEnv {
pkgs.gnome2.zenity
pkgs.xdg_utils
pkgs.xlibs.xrandr
pkgs.which
]
++ lib.optional (config.steam.java or false) pkgs.jdk
++ lib.optional (config.steam.primus or false) pkgs.primus

6
pkgs/games/tibia/default.nix
View File

@ -3,11 +3,11 @@
with stdenv.lib;
assert stdenv.isi686;
stdenv.mkDerivation {
name = "tibia-10.79";
name = "tibia-10.80";
src = fetchurl {
url = http://static.tibia.com/download/tibia1079.tgz;
sha256 = "04wpg5hdfhcp12kk2va3jdijr2p9jfmfivgqrn3cnbblxi83k2sn";
url = http://static.tibia.com/download/tibia1080.tgz;
sha256 = "0ng7gi64lsda8k3674nc2gwnr8si648nmwgghrjrcwyybgsyzfvl";
};
shell = stdenv.shell;

31
pkgs/misc/cups/filters.nix
View File

@ -1,35 +1,32 @@
{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
{ stdenv, fetchurl, fetchpatch, pkgconfig, cups, poppler, poppler_utils, fontconfig
, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }:
stdenv.mkDerivation rec {
name = "cups-filters-${version}";
version = "1.0.61";
version = "1.0.71";
src = fetchurl {
url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m";
sha256 = "07wwlqcykfjfqcwj1bxk60ggahyaw7wcx32n5s104d1qkhham01i";
};
patches = [
(substituteAll {
src = ./longer-shell-path.patch;
bash = "${bash}/bin/bash";
})
# Fix build with poppler-0.31.0
(fetchurl {
url = "https://bugs.linuxfoundation.org/attachment.cgi?id=476";
name = "cups-filters-poppler-0.31.0.patch";
sha256 = "016pzksz4nl1sv3p5ahlnbmb7c899yrvlzq8jxic0gvdrzwd5bl4";
})
];
patches = [(fetchpatch { # drop on update
name = "poppler-0.34.patch";
url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
})];
buildInputs = [
pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl
ijs qpdf dbus avahi
];
configureFlags = "--with-pdftops=pdftops --enable-imagefilters --with-rcdir=no";
configureFlags = [
"--with-pdftops=pdftops"
"--enable-imagefilters"
"--with-rcdir=no"
"--with-shell=${stdenv.shell}"
];
makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups";

13
pkgs/misc/cups/longer-shell-path.patch
View File

@ -1,13 +0,0 @@
diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c
index 1c019aa..431d2f9 100644
--- a/filter/foomatic-rip/foomaticrip.c
+++ b/filter/foomatic-rip/foomaticrip.c
@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
"/opt/cups/filter:"
"/usr/lib/cups/filter";
-char modern_shell[64] = "/bin/bash";
+char modern_shell[128] = "@bash@";
void config_set_option(const char *key, const char *value)
{

12
pkgs/misc/vim-plugins/default.nix
View File

@ -59,6 +59,7 @@ rec {
hoogle = Hoogle;
ipython = vim-ipython;
latex-live-preview = vim-latex-live-preview;
multiple-cursors = vim-multiple-cursors;
necoGhc = neco-ghc; # backwards compat, added 2014-10-18
neocomplete = neocomplete-vim;
neosnippet = neosnippet-vim;
@ -451,6 +452,17 @@ rec {
};
vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-multiple-cursors-2015-05-29";
src = fetchgit {
url = "git://github.com/terryma/vim-multiple-cursors";
rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
};
dependencies = [];
};
vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-nerdtree-tabs-2014-09-25";
src = fetchgit {

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -96,6 +96,7 @@
"vim-gitgutter"
"vim-iced-coffee-script"
"vim-latex-live-preview"
"vim-multiple-cursors"
"vim-signature"
"vim-snippets"
"vim2hs"

4
pkgs/os-specific/linux/gradm/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gradm-${version}";
version = "3.1-201503211320";
version = "3.1-201507191652";
src = fetchurl {
url = "http://grsecurity.net/stable/${name}.tar.gz";
sha256 = "17yd307jqva8jqib2xr3i9kmp58f2cb4jd7an5rbk5zr1k48ap9j";
sha256 = "0l3s56wvk5kpd2qppl328x4alh327xnbf271lh1fan84pxbw651g";
};
buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ];

5
pkgs/os-specific/linux/jfbview/default.nix
View File

@ -1,5 +1,4 @@
# FIXME: remove gcc49 when the default gcc supports C++1y
{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11
, mujs, mupdf, ncurses, openjpeg, openssl }:
let
@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "jichu4n";
};
buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf
buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf
ncurses openjpeg openssl ];
buildFlags = binaries;

62
pkgs/os-specific/linux/kernel-headers/2.6.32.nix
View File

@ -1,62 +0,0 @@
{stdenv, fetchurl, perl, cross ? null}:
assert cross == null -> stdenv.isLinux;
let
version = "2.6.32.16";
kernelHeadersBaseConfig = if cross == null then
stdenv.platform.kernelHeadersBaseConfig
else
cross.platform.kernelHeadersBaseConfig;
in
stdenv.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
};
targetConfig = if cross != null then cross.config else null;
platform =
if cross != null then cross.platform.kernelArch else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.isArm then "arm" else
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
abort "don't know what the kernel include directory is called for this platform";
buildInputs = [perl];
extraIncludeDirs =
if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
buildPhase = ''
if test -n "$targetConfig"; then
export ARCH=$platform
fi
make ${kernelHeadersBaseConfig}
make mrproper headers_check
'';
installPhase = ''
make INSTALL_HDR_PATH=$out headers_install
# Some builds (e.g. KVM) want a kernel.release.
mkdir -p $out/include/config
echo "${version}-default" > $out/include/config/kernel.release
'';
# !!! hacky
fixupPhase = ''
ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86
fi
'';
}

27
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -1,27 +0,0 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.2.69";
extraMeta.branch = "3.2";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0fs7aj3vn51dlx7yfgkx05qpki2msh6j2irwajd9bw0l26cbycd3";
};
# We don't provide these patches if grsecurity is enabled, because
# the grsec 3.2 -stable patchset already includes them.
kernelPatches = args.kernelPatches ++ (
stdenv.lib.optionals (!(args.features.grsecurity or false))
[ { name = "0001-AppArmor-compatibility-patch-for-v5-network-controll";
patch = ./apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch;
}
{ name = "0002-AppArmor-compatibility-patch-for-v5-interface";
patch = ./apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch;
}
{ name = "0003-AppArmor-Allow-dfa-backward-compatibility-with-broke";
patch = ./apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch;
}]);
features.iwlwifi = true;
} // (args.argsOverride or {}))

27
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -1,27 +0,0 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.4.108";
extraMeta.branch = "3.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0xdycfbn2j398n1763zkhiv08xsya52acic1zign4s315b45pijm";
};
kernelPatches = args.kernelPatches ++
[ { name = "0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file";
patch = ./apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch;
}
{ name = "0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules";
patch = ./apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch;
}
{ name = "0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou";
patch = ./apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch;
}];
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.netfilterRPFilter = true;
})

34
pkgs/os-specific/linux/ktap/default.nix
View File

@ -1,34 +0,0 @@
{ stdenv, fetchgit, kernel, useFFI ? false }:
assert builtins.substring 0 4 kernel.version != "3.18";
let
ffiArgs = stdenv.lib.optionalString useFFI "FFI=1";
in
stdenv.mkDerivation rec {
name = "ktap-${version}";
version = "0.5-e7a38ef0";
src = fetchgit {
url = "https://github.com/ktap/ktap.git";
rev = "e7a38ef06bec9a651c9e8bdb3ad66a104210d475";
sha256 = "07acf20e1926d3afd89b13855154b8cc792c57261e7d3cae2da70cb08844f9c8";
};
buildPhase = ''
make ${ffiArgs} KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
'';
installPhase = ''
mkdir -p $out/sbin
cp ktap $out/sbin
make modules_install KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out
'';
meta = {
description = "A lightweight script-based dynamic tracing tool for Linux";
homepage = "http://www.ktap.org";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

8
pkgs/os-specific/linux/lockdep/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "lockdep-${version}";
version = "3.19.1";
fullver = "3.19.1";
version = "4.1.2";
fullver = "4.1.2";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0qx7vxmlcwr4nvzf4wq0da7xwzqw4b67h9a5rfpxgg9mayk3czvi";
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy";
};
preConfigure = "cd tools/lib/lockdep";

15
pkgs/os-specific/linux/nfs-utils/default.nix
View File

@ -1,18 +1,18 @@
{ fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap
, lvm2, e2fsprogs, python
, lvm2, e2fsprogs, python, sqlite
}:
stdenv.mkDerivation rec {
name = "nfs-utils-1.2.5";
name = "nfs-utils-1.3.2"; # NOTE: when updating, remove the HACK BUG FIX below
src = fetchurl {
url = "mirror://sourceforge/nfs/${name}.tar.bz2";
sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m";
sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v";
};
buildInputs =
[ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap
lvm2 e2fsprogs python
lvm2 e2fsprogs python sqlite
];
# FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
@ -32,14 +32,15 @@ stdenv.mkDerivation rec {
done
sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c
# https://bugzilla.redhat.com/show_bug.cgi?id=749195
sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c
# HACK BUG FIX: needed for 1.3.2
# http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=17a3e5bffb7110d46de1bf42b64b90713ff5ea50
sed -e 's,daemon_init(!,daemon_init(,' -i utils/statd/statd.c
'';
preBuild =
''
makeFlags="sbindir=$out/sbin"
installFlags="statedir=$TMPDIR" # hack to make `make install' work
installFlags="statedir=$TMPDIR statdpath=$TMPDIR" # hack to make `make install' work
'';
# One test fails on mips.

4
pkgs/os-specific/linux/pax-utils/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pax-utils-${version}";
version = "1.0.3";
version = "1.0.5";
src = fetchurl {
url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
sha256 = "0w2nddgany3s0znyj6zizlvn8y5vba9x49jm5nliv13p3x7ajdc5";
sha256 = "0vwhmnwai24h654d1zchm5qkbr030ay98l2qdp914ydgwhw9k6pn";
};
makeFlags = [

4
pkgs/os-specific/linux/statifier/default.nix
View File

@ -17,9 +17,9 @@ stdenv.mkDerivation {
sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier
sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh
'';
meta = with stdenv.lib; {
description = "Tool for creating static Linux binaries";
platforms = with platforms; [ linux ];
platforms = with platforms; linux;
};
}

2
pkgs/os-specific/linux/systemd/default.nix
View File

@ -82,6 +82,8 @@ stdenv.mkDerivation rec {
substituteInPlace src/journal/catalog.c \
--replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
'';
# This is needed because systemd uses the gold linker, which doesn't

53
pkgs/os-specific/linux/udev/145.nix
View File

@ -1,53 +0,0 @@
{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "udev-145";
src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
};
buildInputs = [gperf pkgconfig glib acl libusb usbutils];
configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
preConfigure =
''
substituteInPlace extras/keymap/Makefile.in \
--replace /usr/include ${stdenv.glibc}/include
'';
postInstall =
''
# Install some rules that really should be installed by default.
for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
cp rules/packages/$i $out/libexec/rules.d/
done
# The path to rule_generator.functions in write_cd_rules and
# write_net_rules is broken. Also, don't store the mutable
# persistant rules in /etc/udev/rules.d but in
# /var/lib/udev/rules.d.
for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do
substituteInPlace $i \
--replace /lib/udev $out/libexec \
--replace /etc/udev/rules.d /var/lib/udev/rules.d
done
# Don't set PATH to /bin:/sbin; won't work in NixOS.
substituteInPlace $out/libexec/rule_generator.functions \
--replace 'PATH=' '#PATH='
# Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
# environment of the caller.
sed '3,4d' -i $out/libexec/firmware.sh
'';
meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
description = "Udev manages the /dev filesystem";
};
}

6
pkgs/os-specific/linux/zfs/git.nix
View File

@ -1,12 +1,12 @@
{ callPackage, stdenv, fetchgit, spl_git, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2015-07-01";
version = "2015-05-13";
src = fetchgit {
url = git://github.com/zfsonlinux/zfs.git;
rev = "a7b10a931911d3a98a90965795daad031c6d33a2";
sha256 = "0llqbc37f4szx7mwi6j3xmxxz03g3ib7cwypmpcyi0nwkssav5xi";
rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c";
sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437";
};
patches = [ ./nix-build.patch ];

9
pkgs/servers/amqp/qpid-cpp/default.nix
View File

@ -1,14 +1,13 @@
{ stdenv, fetchurl, cmake, python, boost, libuuid, ruby }:
stdenv.mkDerivation rec {
name = "${project}-cpp-${version}";
name = "qpid-cpp-${version}";
project = "qpid";
version = "0.26";
version = "0.34";
src = fetchurl {
url = "mirror://apache/${project}/${version}/${name}.tar.gz";
sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk";
url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w";
};
buildInputs = [ cmake python boost libuuid ruby ];

11
pkgs/servers/hbase/default.nix
View File

@ -1,10 +1,13 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation {
name = "hbase-0.98.8";
stdenv.mkDerivation rec {
name = "hbase-${version}";
version = "0.98.13";
src = fetchurl {
url = http://mirror.gopotato.co.uk/apache/hbase/stable/hbase-0.98.8-hadoop2-bin.tar.gz;
sha256 = "0nvxaqpw8v2hg6mn2p2zxj3y6r4dj4xzxmp8rfmv6m6algn5apv6";
url = "mirror://apache/hbase/${version}/hbase-${version}-hadoop2-bin.tar.gz";
sha256 = "1av81nnnwivxf5ha6x9qrr2afl5sbyskl07prv0rdac954xmgg8n";
};
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out

4
pkgs/servers/http/nginx/unstable.nix
View File

@ -10,10 +10,10 @@
with stdenv.lib;
let
version = "1.9.2";
version = "1.9.3";
mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
sha256 = "0y7d87v9rvc4xvxaz8cag6zhdg7lfp3z65ain665q02aw5dl5dl0";
sha256 = "1svkyrh31g9hzfmj0xwc167sz0b1fn4i62mwipdjy9ia3cscb622";
};
rtmp-ext = fetchFromGitHub {

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