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

Merge remote-tracking branch 'philhub/master'

Browse Source
This commit is contained in:
Philipp Volguine 2016-01-23 21:19:34 +00:00
commit af2b47646c
298 changed files with 19344 additions and 5268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/erlang-users-guide.xml
View File

@ -3,6 +3,23 @@
xml:id="users-guide-to-the-erlang-infrastructure">
<title>User's Guide to the Erlang Infrastructure</title>
<section xml:id="build-tools">
<title>Build Tools</title>
<para>
By default Rebar3 wants to manage it's own dependencies. In the
normal non-Nix, this is perfectly acceptable. In the Nix world it
is not. To support this we have created two versions of rebar3,
<literal>rebar3</literal> and <literal>rebar3-open</literal>. The
<literal>rebar3</literal> version has been patched to remove the
ability to download anything from it. If you are not running it a
nix-shell or a nix-build then its probably not going to work for
you. <literal>rebar3-open</literal> is the normal, un-modified
rebar3. It should work exactly as would any other version of
rebar3. Any Erlang package should rely on
<literal>rebar3</literal> and thats really what you should be
using too.
</para>
</section>
<section xml:id="how-to-install-erlang-packages">
<title>How to install Erlang packages</title>

57
doc/stdenv.xml
View File

@ -224,6 +224,63 @@ genericBuild
</variablelist>
<variablelist>
<title>Variables affecting build properties</title>
<varlistentry>
<term><varname>enableParallelBuilding</varname></term>
<listitem><para>If set, <literal>stdenv</literal> will pass specific
flags to <literal>make</literal> and other build tools to enable
parallel building with up to <literal>build-cores</literal>
workers.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>preferLocalBuild</varname></term>
<listitem><para>If set, specifies that the package is so lightweight
in terms of build operations (e.g. write a text file from a Nix string
to the store) that there's no need to look for it in binary caches --
it's faster to just build it locally. It also tells Hydra and other
facilities that this package doesn't need to be exported in binary
caches (noone would use it, after all).</para></listitem>
</varlistentry>
</variablelist>
<variablelist>
<title>Special variables</title>
<varlistentry>
<term><varname>passthru</varname></term>
<listitem><para>This is an attribute set which can be filled with arbitrary
values. For example:
<programlisting>
passthru = {
foo = "bar";
baz = {
value1 = 4;
value2 = 5;
};
}
</programlisting>
</para>
<para>Values inside it are not passed to the builder, so you can change
them without triggering a rebuild. However, they can be accessed outside of a
derivation directly, as if they were set inside a derivation itself, e.g.
<literal>hello.baz.value1</literal>. We don't specify any usage or
schema of <literal>passthru</literal> - it is meant for values that would be
useful outside the derivation in other parts of a Nix expression (e.g. in other
derivations). An example would be to convey some specific dependency of your
derivation which contains a program with plugins support. Later, others who
make derivations with plugins can use passed-through dependency to ensure that
their plugin would be binary-compatible with built program.</para></listitem>
</varlistentry>
</variablelist>
</section>

1
lib/maintainers.nix
View File

@ -339,6 +339,7 @@
zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
zef = "Zef Hemel <zef@zef.me>";
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
zohl = "Al Zohali <zohl@fmap.me>";
zoomulator = "Kim Simmons <zoomulator@gmail.com>";
Gonzih = "Max Gonzih <gonzih@gmail.com>";
}

8
nixos/doc/manual/configuration/user-mgmt.xml
View File

@ -65,6 +65,14 @@ account named <literal>alice</literal>:
<screen>
$ useradd -m alice</screen>
To make all nix tools available to this new user use `su - USER` which
opens a login shell (==shell that loads the profile) for given user.
This will create the ~/.nix-defexpr symlink. So run:
<screen>
$ su - alice -c "true"</screen>
The flag <option>-m</option> causes the creation of a home directory
for the new user, which is generally what you want. The user does not
have an initial password and therefore cannot log in. A password can

78
nixos/doc/manual/development/writing-modules.xml
View File

@ -107,12 +107,12 @@ the file system. This module declares two options that can be defined
by other modules (typically the user’s
<filename>configuration.nix</filename>):
<option>services.locate.enable</option> (whether the database should
be updated) and <option>services.locate.period</option> (when the
be updated) and <option>services.locate.interval</option> (when the
update should be done). It implements its functionality by defining
two options declared by other modules:
<option>systemd.services</option> (the set of all systemd services)
and <option>services.cron.systemCronJobs</option> (the list of
commands to be executed periodically by <command>cron</command>).</para>
and <option>systemd.timers</option> (the list of commands to be
executed periodically by <command>systemd</command>).</para>
<example xml:id='locate-example'><title>NixOS Module for the “locate” Service</title>
<programlisting>
@ -120,53 +120,59 @@ commands to be executed periodically by <command>cron</command>).</para>
with lib;
let locatedb = "/var/cache/locatedb"; in
{
options = {
services.locate = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
If enabled, NixOS will periodically update the database of
files used by the <command>locate</command> command.
'';
};
period = mkOption {
type = types.str;
default = "15 02 * * *";
description = ''
This option defines (in the format used by cron) when the
locate database is updated. The default is to update at
02:15 at night every day.
'';
};
let
cfg = config.services.locate;
in {
options.services.locate = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
If enabled, NixOS will periodically update the database of
files used by the <command>locate</command> command.
'';
};
interval = mkOption {
type = types.str;
default = "02:15";
example = "hourly";
description = ''
Update the locate database at this interval. Updates by
default at 2:15 AM every day.
The format is described in
<citerefentry><refentrytitle>systemd.time</refentrytitle>
<manvolnum>7</manvolnum></citerefentry>.
'';
};
# Other options omitted for documentation
};
config = {
systemd.services.update-locatedb =
{ description = "Update Locate Database";
path = [ pkgs.su ];
script =
''
mkdir -m 0755 -p $(dirname ${locatedb})
exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /run'
mkdir -m 0755 -p $(dirname ${toString cfg.output})
exec updatedb \
--localuser=${cfg.localuser} \
${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
'';
};
services.cron.systemCronJobs = optional config.services.locate.enable
"${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
systemd.timers.update-locatedb = mkIf cfg.enable
{ description = "Update timer for locate database";
partOf = [ "update-locatedb.service" ];
wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = cfg.interval;
};
};
}</programlisting>
}
</programlisting>
</example>
<xi:include href="option-declarations.xml" />

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

@ -145,6 +145,15 @@ nginx.override {
from the ELPA, MELPA, and MELPA Stable repositories.
</para>
</listitem>
<listitem>
<para>Data directory for Postfix MTA server is moved from
<filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>.
Old configurations are migrated automatically. <literal>service.postfix</literal>
module has also received many improvements, such as correct directories' access
rights, new <literal>aliasFiles</literal> and <literal>mapFiles</literal>
options and more.</para>
</listitem>
</itemizedlist>
@ -158,6 +167,11 @@ nginx.override {
<command>nix-shell</command> (without installing anything). </para>
</listitem>
<listitem>
<para><literal>ejabberd</literal> module is brought back and now works on
NixOS.</para>
</listitem>
</itemizedlist></para>
</section>

16
nixos/modules/config/networking.nix
View File

@ -39,6 +39,17 @@ in
'';
};
networking.dnsExtensionMechanism = lib.mkOption {
type = types.bool;
default = false;
description = ''
Enable the <code>edns0</code> option in <filename>resolv.conf</filename>. With
that option set, <code>glibc</code> supports use of the extension mechanisms for
DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC,
which does not work without it.
'';
};
networking.extraResolvconfConf = lib.mkOption {
type = types.lines;
default = "";
@ -162,7 +173,10 @@ in
libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
'' + optionalString cfg.dnsSingleRequest ''
# only send one DNS request at a time
resolv_conf_options='single-request'
resolv_conf_options+=' single-request'
'' + optionalString cfg.dnsExtensionMechanism ''
# enable extension mechanisms for DNS
resolv_conf_options+=' edns0'
'' + optionalString hasLocalResolver ''
# This hosts runs a full-blown DNS resolver.
name_servers='127.0.0.1'

187
nixos/modules/installer/tools/nixos-rebuild.sh
View File

@ -19,6 +19,8 @@ rollback=
upgrade=
repair=
profile=/nix/var/nix/profiles/system
buildHost=
targetHost=
while [ "$#" -gt 0 ]; do
i="$1"; shift 1
@ -73,6 +75,14 @@ while [ "$#" -gt 0 ]; do
fi
shift 1
;;
--build-host|h)
buildHost="$1"
shift 1
;;
--target-host|t)
targetHost="$1"
shift 1
;;
*)
echo "$0: unknown option \`$i'"
exit 1
@ -80,6 +90,90 @@ while [ "$#" -gt 0 ]; do
esac
done
if [ -z "$buildHost" -a -n "$targetHost" ]; then
buildHost="$targetHost"
fi
if [ "$targetHost" = localhost ]; then
targetHost=
fi
if [ "$buildHost" = localhost ]; then
buildHost=
fi
buildHostCmd() {
if [ -z "$buildHost" ]; then
"$@"
elif [ -n "$remoteNix" ]; then
ssh $SSHOPTS "$buildHost" PATH="$remoteNix:$PATH" "$@"
else
ssh $SSHOPTS "$buildHost" "$@"
fi
}
targetHostCmd() {
if [ -z "$targetHost" ]; then
"$@"
else
ssh $SSHOPTS "$targetHost" "$@"
fi
}
copyToTarget() {
if ! [ "$targetHost" = "$buildHost" ]; then
if [ -z "$targetHost" ]; then
NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --from "$buildHost" "$1"
elif [ -z "$buildHost" ]; then
NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$targetHost" "$1"
else
buildHostCmd nix-copy-closure --to "$targetHost" "$1"
fi
fi
}
nixBuild() {
if [ -z "$buildHost" ]; then
nix-build "$@"
else
local instArgs=()
local buildArgs=()
while [ "$#" -gt 0 ]; do
local i="$1"; shift 1
case "$i" in
-o)
local out="$1"; shift 1
buildArgs+=("--add-root" "$out" "--indirect")
;;
-A)
local j="$1"; shift 1
instArgs+=("$i" "$j")
;;
-I)
# We don't want this in buildArgs
shift 1
;;
"<"*) # nix paths
instArgs+=("$i")
;;
*)
buildArgs+=("$i")
;;
esac
done
local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")"
if [ -a "$drv" ]; then
NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$buildHost" "$drv"
buildHostCmd nix-store -r "$drv" "${buildArgs[@]}"
else
echo "nix-instantiate failed"
exit 1
fi
fi
}
if [ -z "$action" ]; then showSyntax; fi
# Only run shell scripts from the Nixpkgs tree if the action is
@ -128,7 +222,16 @@ fi
tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
trap 'rm -rf "$tmpDir"' EXIT
SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
cleanup() {
for ctrl in "$tmpDir"/ssh-*; do
ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
done
rm -rf "$tmpDir"
}
trap cleanup EXIT
# If the Nix daemon is running, then use it. This allows us to use
@ -150,30 +253,56 @@ if [ -n "$rollback" -o "$action" = dry-build ]; then
buildNix=
fi
prebuiltNix() {
machine="$1"
if [ "$machine" = x86_64 ]; then
return /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
elif [[ "$machine" =~ i.86 ]]; then
return /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
else
echo "$0: unsupported platform"
exit 1
fi
}
remotePATH=
if [ -n "$buildNix" ]; then
echo "building Nix..." >&2
if ! nix-build '<nixpkgs/nixos>' -A config.nix.package -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
if ! nix-build '<nixpkgs/nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
machine="$(uname -m)"
if [ "$machine" = x86_64 ]; then
nixStorePath=/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
elif [[ "$machine" =~ i.86 ]]; then
nixStorePath=/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
else
echo "$0: unsupported platform"
exit 1
fi
nixDrv=
if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then
if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then
nixStorePath="$(prebuiltNix "$(uname -m)")"
if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
--option extra-binary-caches https://cache.nixos.org/; then
echo "warning: don't know how to get latest Nix" >&2
fi
# Older version of nix-store -r don't support --add-root.
[ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
if [ -n "$buildHost" ]; then
remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")"
remoteNix="$remoteNixStorePath/bin"
if ! buildHostCmd nix-store -r $remoteNixStorePath \
--option extra-binary-caches https://cache.nixos.org/ >/dev/null; then
remoteNix=
echo "warning: don't know how to get latest Nix" >&2
fi
fi
fi
fi
fi
PATH=$tmpDir/nix/bin:$PATH
if [ -a "$nixDrv" ]; then
nix-store -r "$nixDrv"'!'"out" --add-root $tmpDir/nix --indirect >/dev/null
if [ -n "$buildHost" ]; then
nix-copy-closure --to "$buildHost" "$nixDrv"
# The nix build produces multiple outputs, we add them all to the remote path
for p in $(buildHostCmd nix-store -r "$(readlink "$nixDrv")" "${buildArgs[@]}"); do
remoteNix="$remoteNix${remoteNix:+:}$p/bin"
done
fi
fi
PATH="$tmpDir/nix/bin:$PATH"
fi
@ -200,31 +329,35 @@ fi
if [ -z "$rollback" ]; then
echo "building the system configuration..." >&2
if [ "$action" = switch -o "$action" = boot ]; then
nix-env "${extraBuildFlags[@]}" -p "$profile" -f '<nixpkgs/nixos>' --set -A system
pathToConfig="$profile"
pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system "${extraBuildFlags[@]}")"
copyToTarget "$pathToConfig"
targetHostCmd nix-env -p "$profile" --set "$pathToConfig"
elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then
nix-build '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}" > /dev/null
pathToConfig=./result
pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}")"
elif [ "$action" = build-vm ]; then
nix-build '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}" > /dev/null
pathToConfig=./result
pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")"
elif [ "$action" = build-vm-with-bootloader ]; then
nix-build '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}" > /dev/null
pathToConfig=./result
pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")"
else
showSyntax
fi
# Copy build to target host if we haven't already done it
if ! [ "$action" = switch -o "$action" = boot ]; then
copyToTarget "$pathToConfig"
fi
else # [ -n "$rollback" ]
if [ "$action" = switch -o "$action" = boot ]; then
nix-env --rollback -p "$profile"
targetHostCmd nix-env --rollback -p "$profile"
pathToConfig="$profile"
elif [ "$action" = test -o "$action" = build ]; then
systemNumber=$(
nix-env -p "$profile" --list-generations |
targetHostCmd nix-env -p "$profile" --list-generations |
sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
)
ln -sT "$profile"-${systemNumber}-link ./result
pathToConfig=./result
pathToConfig="$profile"-${systemNumber}-link
if [ -z "$targetHost" ]; then
ln -sT "$pathToConfig" ./result
fi
else
showSyntax
fi
@ -234,7 +367,7 @@ fi
# If we're not just building, then make the new configuration the boot
# default and/or activate it now.
if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then
if ! $pathToConfig/bin/switch-to-configuration "$action"; then
if ! targetHostCmd $pathToConfig/bin/switch-to-configuration "$action"; then
echo "warning: error(s) occurred while switching to the new configuration" >&2
exit 1
fi

137
nixos/modules/misc/locate.nix
View File

@ -1,76 +1,74 @@
{ config, lib, pkgs, ... }:
{ config, options, lib, pkgs, ... }:
with lib;
let
cfg = config.services.locate;
in {
###### interface
options = {
services.locate = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
If enabled, NixOS will periodically update the database of
files used by the <command>locate</command> command.
'';
};
period = mkOption {
type = types.str;
default = "15 02 * * *";
description = ''
This option defines (in the format used by cron) when the
locate database is updated.
The default is to update at 02:15 at night every day.
'';
};
extraFlags = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
Extra flags to pass to <command>updatedb</command>.
'';
};
output = mkOption {
type = types.path;
default = "/var/cache/locatedb";
description = ''
The database file to build.
'';
};
localuser = mkOption {
type = types.str;
default = "nobody";
description = ''
The user to search non-network directories as, using
<command>su</command>.
'';
};
includeStore = mkOption {
type = types.bool;
default = false;
description = ''
Whether to include <filename>/nix/store</filename> in the locate database.
'';
};
options.services.locate = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
If enabled, NixOS will periodically update the database of
files used by the <command>locate</command> command.
'';
};
interval = mkOption {
type = types.str;
default = "02:15";
example = "hourly";
description = ''
Update the locate database at this interval. Updates by
default at 2:15 AM every day.
The format is described in
<citerefentry><refentrytitle>systemd.time</refentrytitle>
<manvolnum>7</manvolnum></citerefentry>.
'';
};
# This is no longer supported, but we keep it to give a better warning below
period = mkOption { visible = false; };
extraFlags = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
Extra flags to pass to <command>updatedb</command>.
'';
};
output = mkOption {
type = types.path;
default = "/var/cache/locatedb";
description = ''
The database file to build.
'';
};
localuser = mkOption {
type = types.str;
default = "nobody";
description = ''
The user to search non-network directories as, using
<command>su</command>.
'';
};
includeStore = mkOption {
type = types.bool;
default = false;
description = ''
Whether to include <filename>/nix/store</filename> in the locate database.
'';
};
};
###### implementation
config = {
warnings = let opt = options.services.locate.period; in optional opt.isDefined "The `period` definition in ${showFiles opt.files} has been removed; please replace it with `interval`, using the new systemd.time interval specifier.";
systemd.services.update-locatedb =
{ description = "Update Locate Database";
path = [ pkgs.su ];
@ -84,11 +82,18 @@ in {
'';
serviceConfig.Nice = 19;
serviceConfig.IOSchedulingClass = "idle";
serviceConfig.PrivateTmp = "yes";
serviceConfig.PrivateNetwork = "yes";
serviceConfig.NoNewPrivileges = "yes";
serviceConfig.ReadOnlyDirectories = "/";
serviceConfig.ReadWriteDirectories = cfg.output;
};
services.cron.systemCronJobs = optional config.services.locate.enable
"${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
systemd.timers.update-locatedb = mkIf cfg.enable
{ description = "Update timer for locate database";
partOf = [ "update-locatedb.service" ];
wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = cfg.interval;
};
};
}

104
nixos/modules/services/mail/dovecot.nix
View File

@ -9,16 +9,10 @@ let
baseDir = "/run/dovecot2";
stateDir = "/var/lib/dovecot";
protocols = concatStrings [
(optionalString cfg.enableImap "imap")
(optionalString cfg.enablePop3 "pop3")
(optionalString cfg.enableLmtp "lmtp")
];
dovecotConf = concatStrings [
''
base_dir = ${baseDir}
protocols = ${protocols}
protocols = ${concatStringsSep " " cfg.protocols}
''
(if isNull cfg.sslServerCert then ''
@ -33,6 +27,8 @@ let
''
default_internal_user = ${cfg.user}
${optionalString (cfg.mailUser != null) "mail_uid = ${cfg.mailUser}"}
${optionalString (cfg.mailGroup != null) "mail_gid = ${cfg.mailGroup}"}
mail_location = ${cfg.mailLocation}
@ -57,11 +53,17 @@ let
}
'')
(optionalString (cfg.sieveScripts != {}) ''
plugin {
${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)}
}
'')
cfg.extraConfig
];
modulesDir = pkgs.symlinkJoin "dovecot-modules"
(map (module: "${module}/lib/dovecot") cfg.modules);
(map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules));
in
{
@ -87,6 +89,12 @@ in
description = "Start the LMTP listener (when Dovecot is enabled).";
};
protocols = mkOption {
type = types.listOf types.str;
default = [ ];
description = "Additional listeners to start when Dovecot is enabled.";
};
package = mkOption {
type = types.package;
default = pkgs.dovecot22;
@ -129,13 +137,25 @@ in
'';
};
mailUser = mkOption {
type = types.nullOr types.str;
default = null;
description = "Default user to store mail for virtual users.";
};
mailGroup = mkOption {
type = types.nullOr types.str;
default = null;
description = "Default group to store mail for virtual users.";
};
modules = mkOption {
type = types.listOf types.package;
default = [];
example = literalExample "[ pkgs.dovecot_pigeonhole ]";
description = ''
Symlinks the contents of lib/dovecot of every given package into
/var/lib/dovecot/modules. This will make the given modules available
/etc/dovecot/modules. This will make the given modules available
if a dovecot package with the module_dir patch applied (like
pkgs.dovecot22, the default) is being used.
'';
@ -162,7 +182,13 @@ in
enablePAM = mkOption {
type = types.bool;
default = true;
description = "Wether to create a own Dovecot PAM service and configure PAM user logins.";
description = "Whether to create a own Dovecot PAM service and configure PAM user logins.";
};
sieveScripts = mkOption {
type = types.attrsOf types.path;
default = {};
description = "Sieve scripts to be executed. Key is a sequence, e.g. 'before2', 'after' etc.";
};
showPAMFailure = mkOption {
@ -177,23 +203,31 @@ in
security.pam.services.dovecot2 = mkIf cfg.enablePAM {};
services.dovecot2.protocols =
optional cfg.enableImap "imap"
++ optional cfg.enablePop3 "pop3"
++ optional cfg.enableLmtp "lmtp";
users.extraUsers = [
{ name = cfg.user;
uid = config.ids.uids.dovecot2;
description = "Dovecot user";
group = cfg.group;
}
{ name = "dovenull";
uid = config.ids.uids.dovenull2;
description = "Dovecot user for untrusted logins";
group = cfg.group;
}
];
] ++ optional (cfg.user == "dovecot2")
{ name = "dovecot2";
uid = config.ids.uids.dovecot2;
description = "Dovecot user";
group = cfg.group;
};
users.extraGroups = singleton {
name = cfg.group;
gid = config.ids.gids.dovecot2;
};
users.extraGroups = optional (cfg.group == "dovecot2")
{ name = "dovecot2";
gid = config.ids.gids.dovecot2;
};
environment.etc."dovecot/modules".source = modulesDir;
environment.etc."dovecot/dovecot.conf".source = cfg.configFile;
systemd.services.dovecot2 = {
description = "Dovecot IMAP/POP3 server";
@ -201,26 +235,38 @@ in
after = [ "keys.target" "network.target" ];
wants = [ "keys.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
mkdir -p "${baseDir}/login"
chown -R ${cfg.user}:${cfg.group} "${baseDir}"
rm -f "${stateDir}/modules"
ln -s "${modulesDir}" "${stateDir}/modules"
'';
restartTriggers = [ cfg.configFile ];
serviceConfig = {
ExecStart = "${dovecotPkg}/sbin/dovecot -F -c ${cfg.configFile}";
ExecStart = "${dovecotPkg}/sbin/dovecot -F";
ExecReload = "${dovecotPkg}/sbin/doveadm reload";
Restart = "on-failure";
RestartSec = "1s";
StartLimitInterval = "1min";
RuntimeDirectory = [ "dovecot2" ];
};
preStart = ''
rm -rf ${stateDir}/sieve
'' + optionalString (cfg.sieveScripts != {}) ''
mkdir -p ${stateDir}/sieve
${concatStringsSep "\n" (mapAttrsToList (to: from: ''
if [ -d '${from}' ]; then
mkdir '${stateDir}/sieve/${to}'
cp ${from}/*.sieve '${stateDir}/sieve/${to}'
else
cp '${from}' '${stateDir}/sieve/${to}'
fi
${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
'') cfg.sieveScripts)}
chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve'
'';
};
environment.systemPackages = [ dovecotPkg ];
assertions = [
{ assertion = cfg.enablePop3 || cfg.enableImap;
{ assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != [];
message = "dovecot needs at least one of the IMAP or POP3 listeners enabled";
}
{ assertion = isNull cfg.sslServerCert == isNull cfg.sslServerKey

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

@ -20,6 +20,23 @@ let
mail_owner = ${user}
default_privs = nobody
# NixOS specific locations
data_directory = /var/lib/postfix/data
queue_directory = /var/lib/postfix/queue
# Default location of everything in package
meta_directory = ${pkgs.postfix}/etc/postfix
command_directory = ${pkgs.postfix}/bin
sample_directory = /etc/postfix
newaliases_path = ${pkgs.postfix}/bin/newaliases
mailq_path = ${pkgs.postfix}/bin/mailq
readme_directory = no
sendmail_path = ${pkgs.postfix}/bin/sendmail
daemon_directory = ${pkgs.postfix}/libexec/postfix
manpage_directory = ${pkgs.postfix}/share/man
html_directory = ${pkgs.postfix}/share/postfix/doc/html
shlib_directory = no
''
+ optionalString config.networking.enableIPv6 ''
inet_protocols = all
@ -435,31 +452,35 @@ in
mkdir -p /var/lib
mv /var/postfix /var/lib/postfix
fi
mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop}
chown -R ${user}:${group} /var/lib/postfix
chown root /var/lib/postfix/queue
chown root /var/lib/postfix/queue/pid
chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop}
chmod 770 /var/lib/postfix/queue/{public,maildrop}
# All permissions set according ${pkgs.postfix}/etc/postfix/postfix-files script
mkdir -p /var/lib/postfix /var/lib/postfix/queue/{pid,public,maildrop}
chmod 0755 /var/lib/postfix
chown root:root /var/lib/postfix
rm -rf /var/lib/postfix/conf
mkdir -p /var/lib/postfix/conf
chmod 0755 /var/lib/postfix/conf
ln -sf ${pkgs.postfix}/etc/postfix/postfix-files
ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
${concatStringsSep "\n" (mapAttrsToList (to: from: ''
ln -sf ${from} /var/lib/postfix/conf/${to}
postalias /var/lib/postfix/conf/${to}
${pkgs.postfix}/bin/postalias /var/lib/postfix/conf/${to}
'') cfg.aliasFiles)}
${concatStringsSep "\n" (mapAttrsToList (to: from: ''
ln -sf ${from} /var/lib/postfix/conf/${to}
postmap /var/lib/postfix/conf/${to}
${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/${to}
'') cfg.mapFiles)}
mkdir -p /var/spool/mail
chown root:root /var/spool/mail
chmod a+rwxt /var/spool/mail
ln -sf /var/spool/mail /var/
#Finally delegate to postfix checking remain directories in /var/lib/postfix and set permissions on them
${pkgs.postfix}/bin/postfix set-permissions config_directory=/var/lib/postfix/conf
'';
};
}

2
nixos/modules/services/misc/ihaskell.nix
View File

@ -6,7 +6,6 @@ let
cfg = config.services.ihaskell;
ihaskell = pkgs.ihaskell.override {
inherit (cfg.haskellPackages) ihaskell ghcWithPackages;
packages = self: cfg.extraPackages self;
};
@ -22,7 +21,6 @@ in
};
haskellPackages = mkOption {
type = types.attrsOf types.package;
default = pkgs.haskellPackages;
defaultText = "pkgs.haskellPackages";
example = literalExample "pkgs.haskell.packages.ghc784";

12
nixos/modules/services/networking/gale.nix
View File

@ -76,7 +76,7 @@ in
system.activationScripts.gale = mkIf cfg.enable (
stringAfter [ "users" "groups" ] ''
chmod -R 755 ${home}
chmod 755 ${home}
mkdir -m 0777 -p ${home}/auth/cache
mkdir -m 1777 -p ${home}/auth/local # GALE_DOMAIN.gpub
mkdir -m 0700 -p ${home}/auth/private # ROOT.gpub
@ -86,7 +86,8 @@ in
mkdir -m 0700 -p ${home}/.gale/auth/private # GALE_DOMAIN.gpri
ln -sf ${pkgs.gale}/etc/gale/auth/trusted/ROOT "${home}/auth/trusted/ROOT"
chown -R ${cfg.user}:${cfg.group} ${home}
chown ${cfg.user}:${cfg.group} ${home} ${home}/auth ${home}/auth/*
chown ${cfg.user}:${cfg.group} ${home}/.gale ${home}/.gale/auth ${home}/.gale/auth/private
''
);
@ -149,10 +150,9 @@ in
after = [ "network.target" ];
preStart = ''
install -m 0640 ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/"
install -m 0644 ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub"
install -m 0644 ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub"
chown -R ${cfg.user}:${cfg.group} ${home}
install -m 0640 -o ${cfg.user} -g ${cfg.group} ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/"
install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub"
install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub"
'';
serviceConfig = {

31
nixos/modules/services/networking/softether.nix
View File

@ -61,11 +61,14 @@ in
dataDir = cfg.dataDir;
}))
];
systemd.services.softether = {
description = "SoftEther VPN services initial job";
after = [ "network-interfaces.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
systemd.services."softether-init" = {
description = "SoftEther VPN services initial task";
wantedBy = [ "network-interfaces.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = false;
};
script = ''
for d in vpnserver vpnbridge vpnclient vpncmd; do
if ! test -e ${cfg.dataDir}/$d; then
${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
@ -81,12 +84,12 @@ in
(mkIf (cfg.vpnserver.enable) {
systemd.services.vpnserver = {
description = "SoftEther VPN Server";
after = [ "network-interfaces.target" ];
wantedBy = [ "multi-user.target" ];
after = [ "softether-init.service" ];
wantedBy = [ "network-interfaces.target" ];
serviceConfig = {
Type = "forking";
ExecStart = "${pkg}/bin/vpnserver start";
ExecStop = "${pkg}/bin/vpnserver stop";
Type = "forking";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
@ -101,12 +104,12 @@ in
(mkIf (cfg.vpnbridge.enable) {
systemd.services.vpnbridge = {
description = "SoftEther VPN Bridge";
after = [ "network-interfaces.target" ];
wantedBy = [ "multi-user.target" ];
after = [ "softether-init.service" ];
wantedBy = [ "network-interfaces.target" ];
serviceConfig = {
Type = "forking";
ExecStart = "${pkg}/bin/vpnbridge start";
ExecStop = "${pkg}/bin/vpnbridge stop";
Type = "forking";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
@ -121,12 +124,12 @@ in
(mkIf (cfg.vpnclient.enable) {
systemd.services.vpnclient = {
description = "SoftEther VPN Client";
after = [ "network-interfaces.target" ];
wantedBy = [ "multi-user.target" ];
after = [ "softether-init.service" ];
wantedBy = [ "network-interfaces.target" ];
serviceConfig = {
Type = "forking";
ExecStart = "${pkg}/bin/vpnclient start";
ExecStop = "${pkg}/bin/vpnclient stop";
Type = "forking";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnclient/vpnclient

71
nixos/modules/services/system/uptimed.nix
View File

@ -1,66 +1,55 @@
{pkgs, config, lib, ...}:
{ config, lib, pkgs, ... }:
with lib;
let
inherit (lib) mkOption mkIf singleton;
inherit (pkgs) uptimed;
cfg = config.services.uptimed;
stateDir = "/var/spool/uptimed";
uptimedUser = "uptimed";
in
{
###### interface
options = {
services.uptimed = {
enable = mkOption {
default = false;
description = ''
Uptimed allows you to track your highest uptimes.
Enable <literal>uptimed</literal>, allowing you to track
your highest uptimes.
'';
};
};
};
###### implementation
config = mkIf config.services.uptimed.enable {
environment.systemPackages = [ uptimed ];
users.extraUsers = singleton
{ name = uptimedUser;
uid = config.ids.uids.uptimed;
description = "Uptimed daemon user";
home = stateDir;
};
config = mkIf cfg.enable {
users.extraUsers.uptimed = {
description = "Uptimed daemon user";
home = stateDir;
createHome = true;
uid = config.ids.uids.uptimed;
};
systemd.services.uptimed = {
description = "Uptimed daemon";
wantedBy = [ "multi-user.target" ];
unitConfig.Documentation = "man:uptimed(8) man:uprecords(1)";
description = "uptimed service";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "on-failure";
User = "uptimed";
Nice = 19;
IOSchedulingClass = "idle";
PrivateTmp = "yes";
PrivateNetwork = "yes";
NoNewPrivileges = "yes";
ReadWriteDirectories = stateDir;
InaccessibleDirectories = "/home";
ExecStart = "${pkgs.uptimed}/sbin/uptimed -f -p ${stateDir}/pid";
};
preStart = ''
mkdir -m 0755 -p ${stateDir}
chown ${uptimedUser} ${stateDir}
if ! test -f ${stateDir}/bootid ; then
${uptimed}/sbin/uptimed -b
${pkgs.uptimed}/sbin/uptimed -b
fi
'';
script = "${uptimed}/sbin/uptimed";
};
};
}

2
nixos/modules/services/x11/window-managers/i3.nix
View File

@ -34,6 +34,6 @@ in
'';
}];
};
environment.systemPackages = [ pkgs.i3 ];
environment.systemPackages = with pkgs; [ i3 i3status dmenu ];
};
}

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

@ -94,6 +94,18 @@ in
};
environment.usrbinenv = mkOption {
default = "${pkgs.coreutils}/bin/env";
example = literalExample ''
"''${pkgs.busybox}/bin/env"
'';
type = types.nullOr types.path;
visible = false;
description = ''
The env(1) executable that is linked system-wide to
<literal>/usr/bin/env</literal>.
'';
};
};
@ -128,11 +140,15 @@ in
mkdir -m 0555 -p /var/empty
'';
system.activationScripts.usrbinenv =
''
system.activationScripts.usrbinenv = if config.environment.usrbinenv != null
then ''
mkdir -m 0755 -p /usr/bin
ln -sfn ${pkgs.coreutils}/bin/env /usr/bin/.env.tmp
ln -sfn ${config.environment.usrbinenv} /usr/bin/.env.tmp
mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env
''
else ''
rm -f /usr/bin/env
rmdir --ignore-fail-on-non-empty /usr/bin /usr
'';
system.activationScripts.tmpfs =

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

@ -93,11 +93,13 @@ let
checkNetwork = checkUnitConfig "Network" [
(assertOnlyFields [
"Description" "DHCP" "DHCPServer" "IPv4LL" "IPv4LLRoute"
"Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute"
"LLMNR" "Domains" "Bridge" "Bond"
])
(assertValueOneOf "DHCP" ["both" "none" "v4" "v6"])
(assertValueOneOf "DHCPServer" boolValues)
(assertValueOneOf "IPForward" ["yes" "no" "ipv4" "ipv6"])
(assertValueOneOf "IPMasquerade" boolValues)
(assertValueOneOf "IPv4LL" boolValues)
(assertValueOneOf "IPv4LLRoute" boolValues)
(assertValueOneOf "LLMNR" boolValues)
@ -129,6 +131,16 @@ let
(assertValueOneOf "RequestBroadcast" boolValues)
];
checkDhcpServer = checkUnitConfig "DHCPServer" [
(assertOnlyFields [
"PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec"
"EmitDNS" "DNS" "EmitNTP" "NTP" "EmitTimezone" "Timezone"
])
(assertValueOneOf "EmitDNS" boolValues)
(assertValueOneOf "EmitNTP" boolValues)
(assertValueOneOf "EmitTimezone" boolValues)
];
commonNetworkOptions = {
enable = mkOption {
@ -341,6 +353,18 @@ let
'';
};
dhcpServerConfig = mkOption {
default = {};
example = { PoolOffset = 50; EmitDNS = false; };
type = types.addCheck (types.attrsOf unitOption) checkDhcpServer;
description = ''
Each attribute in this set specifies an option in the
<literal>[DHCPServer]</literal> section of the unit. See
<citerefentry><refentrytitle>systemd.network</refentrytitle>
<manvolnum>5</manvolnum></citerefentry> for details.
'';
};
name = mkOption {
type = types.nullOr types.str;
default = null;
@ -565,6 +589,11 @@ let
[DHCP]
${attrsToSection def.dhcpConfig}
''}
${optionalString (def.dhcpServerConfig != { }) ''
[DHCPServer]
${attrsToSection def.dhcpServerConfig}
''}
${flip concatMapStrings def.addresses (x: ''
[Address]

2
nixos/modules/virtualisation/nixos-container.pl Normal file → Executable file
View File

@ -97,10 +97,10 @@ if ($action eq "create") {
if ($ensureUniqueName) {
my $base = $containerName;
for (my $nr = 0; ; $nr++) {
$containerName = "$base-$nr";
$confFile = "/etc/containers/$containerName.conf";
$root = "/var/lib/containers/$containerName";
last unless -e $confFile || -e $root;
$containerName = "$base-$nr";
}
}

2
nixos/modules/virtualisation/nova.nix
View File

@ -146,7 +146,7 @@ in
path =
[ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm
pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools pkgs.iproute
pkgs.e2fsprogs pkgs.utillinux pkgs.multipath-tools pkgs.iproute
pkgs.bridge-utils
];

2
nixos/modules/virtualisation/rkt.nix
View File

@ -58,5 +58,7 @@ in
ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}";
};
};
users.extraGroups.rkt = {};
};
}

1
nixos/release.nix
View File

@ -287,6 +287,7 @@ in rec {
tests.openssh = callTest tests/openssh.nix {};
tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
tests.peerflix = callTest tests/peerflix.nix {};
tests.postgresql = callTest tests/postgresql.nix {};
tests.printing = callTest tests/printing.nix {};
tests.proxy = callTest tests/proxy.nix {};
tests.pumpio = callTest tests/pump.io.nix {};

26
nixos/tests/postgresql.nix Normal file
View File

@ -0,0 +1,26 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "postgresql";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ zagy ];
};
nodes = {
master =
{ pkgs, config, ... }:
{
services.postgresql.enable = true;
services.postgresql.initialScript = pkgs.writeText "postgresql-init.sql"
''
CREATE ROLE postgres WITH superuser login createdb;
'';
};
};
testScript = ''
startAll;
$master->waitForUnit("postgresql");
$master->sleep(10); # Hopefully this is long enough!!
$master->succeed("echo 'select 1' | sudo -u postgres psql");
'';
})

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

@ -2,13 +2,13 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
version = "3.22.02";
version = "3.23.07";
pname = "fldigi";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz";
sha256 = "1gry3r133j2x99h0ji56v6yjxzvbi0hb18p1lbkr9djzjvf591j3";
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "0v78sk9bllxw640wxd4q2qy0h8z2j1d077nxhmpkjpf6mn6vwcda";
};
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Digital modem program";
homepage = http://www.w1hkj.com/Fldigi.html;
homepage = http://sourceforge.net/projects/fldigi/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ relrod ];
maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ];
platforms = stdenv.lib.platforms.linux;
};
}

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

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype
{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
, libsndfile, libogg
}:
@ -13,12 +13,10 @@ stdenv.mkDerivation {
};
buildInputs = [
pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf
pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf
liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg
];
preConfigure = "autoreconf -vfi";
patches = [ ./am_path_sdl.patch ./xml.patch ];
meta = {

10
pkgs/applications/audio/ladspa-plugins/git.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchgit, automake, autoreconfHook, fftw, gettext, ladspaH, libxml2, pkgconfig, perl, perlPackages }:
{ stdenv, fetchgit, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig
, perl, perlPackages }:
stdenv.mkDerivation {
name = "swh-plugins-git-2015-03-04";
@ -9,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "7d9aa13a064903b330bd52e35c1f810f1c8a253ea5eb4e5a3a69a051af03150e";
};
buildInputs = [ automake autoreconfHook fftw gettext ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
patchPhase = ''
patchShebangs .
@ -17,11 +18,6 @@ stdenv.mkDerivation {
cp ${automake}/share/automake-*/mkinstalldirs .
'';
configurePhase = ''
autoreconf -i
./configure --prefix=$out
'';
meta = with stdenv.lib; {
homepage = http://plugin.org.uk/;
description = "LADSPA format audio plugins";

30
pkgs/applications/audio/mixxx/default.nix
View File

@ -1,20 +1,22 @@
{ stdenv, fetchurl, scons, pkgconfig, qt4, portaudio, portmidi, libusb1
, libmad, protobuf, libvorbis, taglib, libid3tag, flac, libsndfile, libshout
, fftw, vampSDK
{ stdenv, fetchurl, chromaprint, fftw, flac, libid3tag, libmad
, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig
, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
, taglib, vampSDK
}:
stdenv.mkDerivation rec {
name = "mixxx-${version}";
version = "1.11.0";
version = "2.0.0";
src = fetchurl {
url = "http://downloads.mixxx.org/${name}/${name}-src.tar.gz";
sha256 = "0c833gf4169xvpfn7car9vzvwfwl9d3xwmbfsy36cv8ydifip5h0";
sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
};
buildInputs = [
scons pkgconfig qt4 portaudio portmidi libusb1 libmad protobuf libvorbis
taglib libid3tag flac libsndfile libshout fftw vampSDK
chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
rubberband scons sqlite taglib vampSDK
];
sconsFlags = [
@ -22,10 +24,6 @@ stdenv.mkDerivation rec {
"qtdir=${qt4}"
];
postPatch = ''
sed -i -e 's/"which /"type -P /' build/depends.py
'';
buildPhase = ''
runHook preBuild
mkdir -p "$out"
@ -41,11 +39,11 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = {
homepage = "http://mixxx.org/";
meta = with stdenv.lib; {
homepage = http://mixxx.org;
description = "Digital DJ mixing software";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.aszlig ];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Plus;
maintainers = [ maintainers.aszlig maintainers.goibhniu ];
platforms = platforms.linux;
};
}

21
pkgs/applications/audio/mopidy/default.nix
View File

@ -1,27 +1,30 @@
{ stdenv, fetchurl, pythonPackages, pygobject, gst_python
, gst_plugins_good, gst_plugins_base, gst_plugins_ugly
{ stdenv, fetchurl, pythonPackages, pygobject, gst_python, wrapGAppsHook
, glib_networking, gst_plugins_good, gst_plugins_base, gst_plugins_ugly
}:
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
version = "1.1.1";
version = "1.1.2";
src = fetchurl {
url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
sha256 = "1xfyg8xqgnrb98wx7a4fzr4vlzkffjhkc1s36ka63rwmx86vqhyw";
sha256 = "1vn4knpmnp3krmn627iv1r7xa50zl816ac6b24b8ph50cq2sqjfv";
};
buildInputs = [
wrapGAppsHook gst_plugins_base gst_plugins_good gst_plugins_ugly glib_networking
];
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good gst_plugins_ugly
gst_python pygobject pykka tornado requests2
];
# There are no tests
doCheck = false;
postInstall = ''
wrapProgram $out/bin/mopidy \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
preFixup = ''
gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
'';
meta = with stdenv.lib; {
@ -31,7 +34,7 @@ pythonPackages.buildPythonPackage rec {
SoundCloud, Google Play Music, and more
'';
license = licenses.asl20;
maintainers = [ maintainers.rickynils ];
maintainers = with maintainers; [ rickynils fpletz ];
hydraPlatforms = [];
};
}

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

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

54
pkgs/applications/editors/eclipse/build-eclipse.nix Normal file
View File

@ -0,0 +1,54 @@
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jre, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }:
{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
stdenv.mkDerivation rec {
inherit name src;
desktopItem = makeDesktopItem {
name = "Eclipse";
exec = "eclipse";
icon = "eclipse";
comment = "Integrated Development Environment";
desktopName = "Eclipse IDE";
genericName = "Integrated Development Environment";
categories = "Application;Development;";
};
buildInputs = [ makeWrapper ];
buildCommand = ''
# Unpack tarball.
mkdir -p $out
tar xfvz $src -C $out
# Patch binaries.
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
libCairo=$out/eclipse/libcairo-swt.so
patchelf --set-interpreter $interpreter $out/eclipse/eclipse
[ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
# Create wrapper script. Pass -configuration to store
# settings in ~/.eclipse/org.eclipse.platform_<version> rather
# than ~/.eclipse/org.eclipse.platform_<version>_<number>.
productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct)
productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jre}/bin \
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
# Create desktop item.
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
mkdir -p $out/share/pixmaps
ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
''; # */
meta = {
homepage = http://www.eclipse.org/;
inherit description;
};
}

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

@ -4,67 +4,13 @@
, webkitgtk2 ? null # for internal web browser
, buildEnv, writeText, runCommand
, callPackage
}:
} @ args:
assert stdenv ? glibc;
let
rec {
buildEclipse =
{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
stdenv.mkDerivation rec {
inherit name src;
desktopItem = makeDesktopItem {
name = "Eclipse";
exec = "eclipse";
icon = "eclipse";
comment = "Integrated Development Environment";
desktopName = "Eclipse IDE";
genericName = "Integrated Development Environment";
categories = "Application;Development;";
};
buildInputs = [ makeWrapper ];
buildCommand = ''
# Unpack tarball.
mkdir -p $out
tar xfvz $src -C $out
# Patch binaries.
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
libCairo=$out/eclipse/libcairo-swt.so
patchelf --set-interpreter $interpreter $out/eclipse/eclipse
[ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
# Create wrapper script. Pass -configuration to store
# settings in ~/.eclipse/org.eclipse.platform_<version> rather
# than ~/.eclipse/org.eclipse.platform_<version>_<number>.
productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct)
productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jre}/bin \
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
# Create desktop item.
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
mkdir -p $out/share/pixmaps
ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
''; # */
meta = {
homepage = http://www.eclipse.org/;
inherit description;
};
};
in {
buildEclipse = import ./build-eclipse.nix args;
eclipse_sdk_35 = buildEclipse {
name = "eclipse-sdk-3.5.2";
@ -312,7 +258,6 @@ in {
"x86_64-linux" = fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz;
sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l";
};
"i686-linux" = fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz;
@ -328,7 +273,6 @@ in {
"x86_64-linux" = fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz;
sha256 = "0vfql4gh263ms8bg7sgn05gnjajplx304cn3nr03jlacgr3pkarf";
};
"i686-linux" = fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk.tar.gz;
@ -337,22 +281,53 @@ in {
};
};
eclipse-platform = buildEclipse {
eclipse_sdk_451 = buildEclipse {
name = "eclipse-sdk-4.5.1";
description = "Eclipse Mars Classic";
sources = {
"x86_64-linux" = fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk-x86_64.tar.gz;
sha256 = "b56503ab4b86f54e1cdc93084ef8c32fb1eaabc6f6dad9ef636153b14c928e02";
};
"i686-linux" = fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk.tar.gz;
sha256 = "f2e41da52e138276f8f121fd4d57c3f98839817836b56f8424e99b63c9b1b025";
};
};
};
eclipse-platform = eclipse-platform-451;
eclipse-platform-45 = buildEclipse {
name = "eclipse-platform-4.5";
description = "Eclipse platform";
sources = {
"x86_64-linux" = fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz";
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz;
sha256 = "1510j41yr86pbzwf48kjjdd46nkpkh8zwn0hna0cqvsw1gk2vqcg";
};
"i686-linux" = fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz";
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz;
sha256 = "1f97jd3qbi3830y3djk8bhwzd9whsq8gzfdk996chxc55prn0qbd";
};
};
};
eclipse-platform-451 = buildEclipse {
name = "eclipse-platform-4.5.1";
description = "Eclipse platform";
sources = {
"x86_64-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz;
sha256 = "1m7bzyi20yss6cz74d7hvhxj1cddcpgzxjia5wcjycsvq33kkny0";
};
"i686-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk.tar.gz;
sha256 = "17x8w4k0rba0c0v9ghxdl0zqfadla5c1aakfd5k0q9q3x3qi6rxp";
};
};
};
eclipseWithPlugins = { eclipse, plugins ? [], jvmArgs ? [] }:
let
# Gather up the desired plugins.
@ -369,21 +344,20 @@ in {
dropinProp = "-D${dropinPropName}=${pluginEnv}/eclipse/dropins";
jvmArgsText = stdenv.lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]);
# Prepare an eclipse.ini with the plugin directory.
origEclipseIni = builtins.readFile "${eclipse}/eclipse/eclipse.ini";
eclipseIniFile = writeText "eclipse.ini" ''
${origEclipseIni}
${jvmArgsText}
'';
# Base the derivation name on the name of the underlying
# Eclipse.
name = (stdenv.lib.meta.appendToName "with-plugins" eclipse).name;
in
runCommand name { buildInputs = [ makeWrapper ]; } ''
mkdir -p $out/bin
mkdir -p $out/bin $out/etc
# Prepare an eclipse.ini with the plugin directory.
cat ${eclipse}/eclipse/eclipse.ini - > $out/etc/eclipse.ini <<EOF
${jvmArgsText}
EOF
makeWrapper ${eclipse}/bin/eclipse $out/bin/eclipse \
--add-flags "--launcher.ini ${eclipseIniFile}"
--add-flags "--launcher.ini $out/etc/eclipse.ini"
ln -s ${eclipse}/share $out/
'';

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

@ -152,12 +152,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
version = "8.7.0";
version = "8.8.0";
src = fetchzip {
stripRoot = false;
url = "http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/8.7/${name}.zip";
sha256 = "0qpcjcl6n98x7ys4qz8p1x5hhk2ydrgh8w3r1kqk0zc7liqrx7vg";
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/8.8/${name}.zip";
sha256 = "1i1m7g5128q21njgrkiw71y4vi4aqzz8xdd4iv80j3nsvhbv6cnm";
};
meta = with stdenv.lib; {
@ -298,12 +298,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
version = "4.5";
version = "4.5.1";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/org.eclipse.jdt-4.5.zip";
sha256 = "0zrdn26f7qsms2xfiyc049bhhh0czsbf989pgyq736b8hfmmh9iy";
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/org.eclipse.jdt-4.5.1.zip";
sha256 = "0nxi552vvpjalnsqhc0zi6fgaj9p22amxsiczpv7za4kr7m47x73";
};
meta = with stdenv.lib; {

13
pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
View File

@ -1,4 +1,4 @@
{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }:
let date = "2013-03-21"; in
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
};
buildInputs = [ emacs w3m texinfo autoconf ];
buildInputs = [ emacs w3m texinfo autoreconfHook ];
# XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
patchPhase = ''
@ -26,11 +26,10 @@ stdenv.mkDerivation rec {
s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g'
'';
configurePhase = ''
autoreconf -vfi && \
./configure --prefix="$out" --with-lispdir="$out/share/emacs/site-lisp" \
--with-icondir="$out/share/emacs/site-lisp/images/w3m"
'';
configureFlags = [
"--with-lispdir=$out/share/emacs/site-lisp"
"--with-icondir=$out/share/emacs/site-lisp/images/w3m"
];
postInstall = ''
cd "$out/share/emacs/site-lisp"

4
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

@ -29697,10 +29697,10 @@
}) {};
isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "isearch-plus";
version = "20160115.1122";
version = "20160118.1030";
src = fetchurl {
url = "http://www.emacswiki.org/emacs/download/isearch+.el";
sha256 = "0wgfjl083nz7p5j9gbsq7ki7wpjikb8546iiaydkx5ay3lrcg7nf";
sha256 = "176krgrrjvj6r6iahr53ncxm2hrc4nmkyz43lc2rbnpivih4z9i6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch+";

3
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -89,6 +89,9 @@ self:
# upstream issue: missing file header
fold-dwim = markBroken super.fold-dwim;
# build timeout
graphene = markBroken super.graphene;
# upstream issue: mismatched filename
helm-lobsters = markBroken super.helm-lobsters;

3
pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
View File

@ -87,6 +87,9 @@ self:
# upstream issue: missing file header
fold-dwim = markBroken super.fold-dwim;
# build timeout
graphene = markBroken super.graphene;
# upstream issue: mismatched filename
helm-lobsters = markBroken super.helm-lobsters;

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

@ -166,13 +166,13 @@ in
clion = buildClion rec {
name = "clion-${version}";
version = "1.0.4";
build = "141.874";
version = "1.2.4";
build = "143.1186";
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
sha256 = "1cz59h2znzjy7zncc049f2w30kc89rvmk7l51a1y6ymf9s7cj4cm";
sha256 = "0asjgfshbximjk6i57fz3d2ykby5qw5x6nhw91cpzrzszc59dmm2";
};
};
@ -190,25 +190,25 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "15.0.2";
build = "IC-143.1184";
version = "15.0.3";
build = "IC-143.1821";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "0y8rrbsb87avn1dhw5r1xb4axpbm1qvgcd0aysir9bqzhx8qg64c";
sha256 = "15hj4kqlpg3b4xp2v4f4iidascrc8s97mq8022nvbcs879gpajqa";
};
};
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "15.0.2";
build = "IU-143.1184";
version = "15.0.3";
build = "IU-143.1821";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "1r8gw7mv1b0k223k76ib08f4yrrgrw24qmhkbx88rknmls5nsgss";
sha256 = "02v8v2a7p620l4mlk7jqw9sl2455a1nya1dy84y23h9vq20aihlh";
};
};

6
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
version = "6.9.2-0";
src = fetchurl {
url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz";
urls = [
"mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
# the original source above removes tarballs quickly
"http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
];
sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
};

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

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "openimageio-${version}";
version = "1.4.16";
version = "1.6.9";
src = fetchurl {
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
sha256 = "0f9gspsjhniz992c04dm4lvffzz7zjqn1n34nqn6c32r498kimcj";
sha256 = "0942xj877875f4dpfg7aqwyw015y82vkhaqap7yhybmvzsfj7wki";
};
buildInputs = [

20
pkgs/applications/graphics/solvespace/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit,autoconf, automake, gcc, fltk13
, libjpeg, libpng, libtool, mesa, pkgconfig }:
{ stdenv, fetchgit, autoreconfHook, fltk13
, libjpeg, libpng, mesa, pkgconfig }:
stdenv.mkDerivation {
name = "solvespace-2.0";
@ -14,27 +14,15 @@ stdenv.mkDerivation {
dontBuild = true;
enableParallelBuilding = false;
buildInputs = [
autoconf
automake
gcc
buildInputs = [
autoreconfHook
fltk13
libjpeg
libpng
libtool
mesa
pkgconfig
stdenv
];
preConfigure = ''
aclocal
libtoolize
autoreconf -i
automake --add-missing
'';
meta = {
description = "A parametric 3d CAD program";
license = stdenv.lib.licenses.gpl3;

26
pkgs/applications/misc/albert/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, qtbase, qtx11extras, makeQtWrapper, muparser, cmake }:
stdenv.mkDerivation rec {
name = "albert-${version}";
version = "0.8.0";
src = fetchFromGitHub {
owner = "manuelschneid3r";
repo = "albert";
rev = "v${version}";
sha256 = "0lzj1gbcc5sp2x1c0d3s21y55kcnnn4dmy8d205mrgnyavjrak7n";
};
buildInputs = [ cmake qtbase qtx11extras muparser makeQtWrapper ];
fixupPhase = ''
wrapQtProgram $out/bin/albert
'';
meta = {
homepage = https://github.com/manuelSchneid3r/albert;
description = "Desktop agnostic launcher";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.ericsagnes ];
};
}

10
pkgs/applications/misc/direwolf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, alsaLib }:
{ stdenv, fetchFromGitHub, unzip, alsaLib }:
let
version = "1.2";
in
@ -6,9 +6,11 @@ stdenv.mkDerivation rec {
name = "direwolf-${version}";
inherit version;
src = fetchurl {
url = "http://home.comcast.net/~wb2osz/Version%201.2/direwolf-${version}-src.zip";
sha256 = "0csl6harx7gmjmamxy0ylzhbamppphffisk8j33dc6g08k6rc77f";
src = fetchFromGitHub {
owner = "wb2osz";
repo = "direwolf";
rev = "8b81a32";
sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs";
};
buildInputs = [

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

@ -1,11 +1,9 @@
{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }:
stdenv.mkDerivation rec {
name = "evtest-1.32";
preConfigure = "autoreconf -iv";
buildInputs = [ autoconf automake pkgconfig libxml2 ];
buildInputs = [ autoreconfHook pkgconfig libxml2 ];
src = fetchgit {
url = "git://anongit.freedesktop.org/evtest";

15
pkgs/applications/misc/get_iplayer/default.nix
View File

@ -1,23 +1,28 @@
{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}:
buildPerlPackage {
name = "get_iplayer-2.86";
name = "get_iplayer-2.94";
buildInputs = [makeWrapper perl];
propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP];
propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLSimple];
preConfigure = "touch Makefile.PL";
doCheck = false;
patchPhase = ''
sed -e 's|^update_script|#update_script|' \
-e '/WARNING.*updater/d' \
-i get_iplayer
'';
installPhase = ''
mkdir -p $out/bin
cp get_iplayer $out/bin
sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer
wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB
'';
src = fetchurl {
url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.86.tar.gz;
sha256 = "0zhcw0ikxrrz1jayx7jjgxmdf7gzk4pmzfvpraxmv64xwzgc1sc1";
url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.94.tar.gz;
sha256 = "16p0bw879fl8cs6rp37g1hgrcai771z6rcqk2nvm49kk39dx1zi4";
};
}

77
pkgs/applications/misc/guake/default.nix Normal file
View File

@ -0,0 +1,77 @@
/* Beware!
After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?",
which will have to be resolved manually, because I have not found a way to automate this, without being impure.
If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store,
which then can be used in the following command to install the schemas file of Guake:
gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas
It can be removed again by the following command:
gconftool-2 --recursive-unset /apps/guake
*/
{ stdenv, fetchurl, lib
, pkgconfig, libtool, intltool, makeWrapper
, dbus, gtk2, gconf, python2, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }:
with lib;
let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ];
pySubDir = "lib/${python2.libPrefix}/site-packages";
pyPath = makeSearchPath pySubDir (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
in stdenv.mkDerivation rec {
name = "guake-${version}";
version = "0.8.3";
src = fetchurl {
url = "https://github.com/Guake/guake/archive/${version}.tar.gz";
sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y";
};
nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ];
buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]);
patchPhase = ''
patchShebangs .
'';
configureScript = "./autogen.sh";
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--disable-schemas-install"
];
installFlags = [
# Configuring the installation to not install gconf schemas is not always supported,
# therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases.
"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
"sysconfdir=\${out}/etc"
"localstatedir=\${TMPDIR}"
];
postInstall = ''
mkdir -p $out/share/gconf/schemas
cp data/guake.schemas $out/share/gconf/schemas
'';
postFixup = ''
for bin in $out/bin/{guake,guake-prefs}; do
substituteInPlace $bin \
--replace '/usr/bin/env python2' ${python2}/bin/python2
wrapProgram $bin \
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \
--prefix PYTHONPATH : "$out/${pySubDir}:${pyPath}:$PYTHONPATH"
done
'';
meta = {
description = "Drop-down terminal for GNOME";
homepage = http://guake-project.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.msteen ];
};
}

34
pkgs/applications/misc/ipmiview/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "IPMIView-${version}";
version = "20151223";
src = fetchurl {
url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_V2.11.0_bundleJRE_Linux_x64_${version}.tar.gz";
sha256 = "1rv9j0id7i2ipm25n60bpfdm1gj44xg2aj8rnx4s6id3ln90q121";
};
buildInputs = [ patchelf makeWrapper ];
buildPhase = with xorg; ''
patchelf --set-rpath "${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" ./jre/lib/amd64/xawt/libmawt.so
patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so
patchelf --set-rpath "${libXcursor}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
'';
installPhase = ''
mkdir -p $out/bin
cp -R . $out/
echo "$out/jre/bin/java -jar $out/IPMIView20.jar" > $out/bin/IPMIView
chmod +x $out/bin/IPMIView
'';
meta = with stdenv.lib; {
license = licenses.unfree;
};
}

12
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
{ stdenv, fetchurl, makeWrapper, autoreconfHook, boost, file
, glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool
, libctemplate, libglade
, libiodbc
, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql
, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo
}:
@ -16,18 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6";
};
buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
buildInputs = [ autoreconfHook boost file glib glibc libgnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libiodbc libsigcxx libuuid libxml2 libzip lua makeWrapper mesa
mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
preConfigure = ''
substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
'';
postConfigure = ''
autoreconf -fi
'';
postInstall = ''
patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, pkgconfig
{ stdenv, fetchurl, autoreconfHook, pkgconfig
, libX11, libXinerama, pango, cairo
, libstartup_notification, i3Support ? false, i3
}:
@ -12,14 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5";
};
buildInputs = [ autoconf automake pkgconfig libX11 libXinerama pango
buildInputs = [ autoreconfHook pkgconfig libX11 libXinerama pango
cairo libstartup_notification
] ++ stdenv.lib.optional i3Support i3;
preConfigure = ''
autoreconf -vif
'';
meta = {
description = "Window switcher, run dialog and dmenu replacement";
homepage = https://davedavenport.github.io/rofi;

2
pkgs/applications/misc/scim/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "scim-${version}";
src = fetchurl {
url = "https://github.com/andmarti1424/scim/archive/v${version}.tar.gz";
url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz";
sha256 = "00rjz344acw0bxv78x1w9jz8snl9lb9qhr9z22phxinidnd3vaaz";
};

10
pkgs/applications/misc/yakuake/default.nix
View File

@ -3,23 +3,21 @@
let
pname = "yakuake";
version = "2.9.8";
version = "2.9.9";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2";
sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3";
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce";
};
buildInputs = [ kdelibs ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
patchPhase = ''
substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\""
'';
propagatedUserEnvPkgs = [ konsole ];
meta = {
homepage = http://yakuake.kde.org;

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

@ -1,29 +1,30 @@
{ stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5
, jinja2, pygments, pyyaml, pypeg2, gst_plugins_base, gst_plugins_good
, gst_ffmpeg }:
{ stdenv, fetchurl, python, buildPythonPackage, qtmultimedia, pyqt5
, jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }:
let version = "0.4.1"; in
let version = "0.5.1"; in
buildPythonPackage {
buildPythonPackage rec {
name = "qutebrowser-${version}";
namePrefix = "";
src = fetchgit {
url = "https://github.com/The-Compiler/qutebrowser.git";
rev = "8d9e9851f1dcff5deb6363586ad0f1edec040b72";
sha256 = "1qsdad10swnk14qw4pfyvb94y6valhkscyvl46zbxxs7ck6llsm2";
src = fetchurl {
url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
sha256 = "1pxgap04rv94kgcp9a05xx2kwg3j6jv8f6d3ww7hqs2xnkj8wzqb";
};
# Needs tox
doCheck = false;
buildInputs = [ wrapGAppsHook
gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav
glib_networking ];
propagatedBuildInputs = [
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 : "${qtmultimedia}/lib/qt5/plugins"
'';

53
pkgs/applications/networking/instant-messengers/fuze/default.nix
View File

@ -1,53 +0,0 @@
{ stdenv, fetchurl, dpkg, openssl, alsaLib, libXext, libXfixes, libXrandr
, libjpeg, curl, libX11, libXmu, libXv, libXtst, qt4, mesa, zlib
, gnome, libidn, rtmpdump, c-ares, openldap, makeWrapper
}:
assert stdenv.system == "x86_64-linux";
let
curl_custom =
stdenv.lib.overrideDerivation curl (args: {
configureFlags = args.configureFlags ++ ["--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"] ;
} );
in
stdenv.mkDerivation {
name = "fuze-1.0.5";
src = fetchurl {
url = http://apt.fuzebox.com/apt/pool/lucid/main/f/fuzelinuxclient/fuzelinuxclient_1.0.5.lucid_amd64.deb;
sha256 = "0gvxc8qj526cigr1lif8vdn1aawj621camkc8kvps23r7zijhnqv";
};
buildInputs = [ dpkg makeWrapper ];
libPath =
stdenv.lib.makeLibraryPath [
openssl alsaLib libXext libXfixes libXrandr libjpeg curl_custom
libX11 libXmu libXv qt4 libXtst mesa stdenv.cc.cc zlib
gnome.GConf libidn rtmpdump c-ares openldap
];
buildCommand = ''
dpkg-deb -x $src .
mkdir -p $out/lib $out/bin
cp -R usr/lib/fuzebox $out/lib
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $out/lib/fuzebox:$libPath \
$out/lib/fuzebox/FuzeLinuxApp
wrapProgram $out/lib/fuzebox/FuzeLinuxApp --prefix LD_LIBRARY_PATH : $libPath
for f in $out/lib/fuzebox/*.so.*; do
patchelf \
--set-rpath $out/lib/fuzebox:$libPath \
$f
done
ln -s ${openssl}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8
ln -s ${openssl}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8
ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze
'';
meta = {
description = "Internet and mobile based unified communications solutions (Linux client)";
homepage = http://www.fuzebox.com;
license = "unknown";
};
}

7
pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoconf, automake, libtool
, libsodium } :
{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
let
version = "dd181722ea";
@ -17,11 +16,9 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lssp -lsodium";
preConfigure = "autoreconf -vfi";
postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";
buildInputs = [ libtoxcore pidgin autoconf automake libtool libsodium ];
buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ];
meta = {
homepage = http://tox.dhs.org/;

84
pkgs/applications/networking/irc/konversation/1.6.nix Normal file
View File

@ -0,0 +1,84 @@
{ stdenv
, lib
, fetchurl
, cmake
, extra-cmake-modules
, kbookmarks
, karchive
, kconfig
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdoctools
, kemoticons
, kglobalaccel
, ki18n
, kiconthemes
, kidletime
, kitemviews
, knotifications
, knotifyconfig
, kio
, kparts
, kwallet
, makeQtWrapper
, solid
, sonnet
, phonon}:
let
pn = "konversation";
v = "1.6";
in
stdenv.mkDerivation rec {
name = "${pn}-${v}";
src = fetchurl {
url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz";
sha256 = "789fd75644bf54606778971310433dbe2bc01ac0917b34bc4e8cac88e204d5b6";
};
buildInputs = [
cmake
extra-cmake-modules
kbookmarks
karchive
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
kdoctools
kemoticons
kglobalaccel
ki18n
kiconthemes
kidletime
kitemviews
knotifications
knotifyconfig
kio
kparts
kwallet
solid
sonnet
phonon
];
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
postInstall = ''
wrapQtProgram "$out/bin/konversation"
'';
meta = {
description = "Integrated IRC client for KDE";
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh ];
homepage = https://konversation.kde.org;
};
}

4
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -4,12 +4,12 @@
, extraBuildInputs ? [] }:
stdenv.mkDerivation rec {
version = "1.3";
version = "1.4";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "0j2ic1c69ksf78wi0cmc4yi5348x6c92g6annsx928sayxqxfgbh";
sha256 = "1m6xq6izcac5186xvvmm8znfjzrg9hq42p69jabdvv7cri4rjvg0";
};
cmakeFlags = stdenv.lib.optional stdenv.isDarwin

4
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
version = "3.3.1";
version = "3.3.3";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs";
sha256 = "0lyv230vqwb77isjqm6fwwgv8hdap88zir9yrccj0qxj7zf8p3cw";
};
nativeBuildInputs = [ pkgconfig which ];

9
pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
View File

@ -1,12 +1,17 @@
diff --git a/qm_gen.pri b/qm_gen.pri
index ed29b76..2d5990c 100644
index 5454440..2d5990c 100644
--- a/qm_gen.pri
+++ b/qm_gen.pri
@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
@@ -5,12 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
unix {
- equals(QT_MAJOR_VERSION, 4) {
- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
- }
- equals(QT_MAJOR_VERSION, 5) {
- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
- }
+ !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
} else {
!exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }

162
pkgs/applications/office/ib/controller/default.nix Normal file
View File

@ -0,0 +1,162 @@
{ stdenv, fetchurl, unzip, jdk, ib-tws, xpra }:
stdenv.mkDerivation rec {
version = "2.14.0";
name = "ib-controller-${version}";
src = fetchurl {
url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz";
sha256 = "17a8bcgg9z3b4y38k035hm2lgvhmf8srlz59c7n2q3fdw2i95i68";
};
phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ unzip jdk ib-tws ];
installPhase = ''
mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController
cp resources/*.jar $out/share/IBController/.
cp resources/*.ini $out/etc/ib/controller/.
classpath=""
for jar in ${ib-tws}/share/IBJts/*.jar; do
classpath="$classpath:$jar"
done
for jar in $out/share/IBController/*.jar; do
classpath="$classpath:$jar"
done
# strings to use below; separated to avoid nix specific substitutions
javaOptions={JAVA_OPTIONS:--Xmx1024M}
ibProfileDir={IB_PROFILE_DIR:-~/IB/}
cat<<EOF > $out/bin/ib-tws-c
#!$SHELL
if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then
IB_USER_PROFILE=\`realpath \$1\`
IB_USER_PROFILE_TITLE=\`basename \$1\`
else
if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then
IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\`
IB_USER_PROFILE_TITLE=\$1
else
echo "ERROR: \"\$1\" is not a valid name of a profile."
exit 1
fi
fi
shift
if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi
if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi
if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi
if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi
if [[ \$1 == "-q" ]]; then
if [ -f \$IB_USER_PROFILE/xpra/run ]; then
${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null
fi
exit 0
fi
if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then
( sleep infinity ) &
WAIT_DUMMY_PID=\$!
( trap "" INT;
DISPLAYNUM=100
while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done
mkdir -p \$IB_USER_PROFILE/xpra
cd \$IB_USER_PROFILE
nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \
--socket-dir=\$IB_USER_PROFILE/xpra/ \
--start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \
&& kill \$WAIT_DUMMY_PID &> /dev/null \
&& ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBController \$IB_USER_PROFILE/IBController.ini" \
--exit-with-children \
--no-pulseaudio \
--no-mdns \
--no-notification \
--no-daemon \
&> \$IB_USER_PROFILE/xpra/server.log
rm -f \$IB_USER_PROFILE/xpra/run
rm -f /tmp/.X\$DISPLAYNUM-lock
) &
wait \$WAIT_DUMMY_PID
exit 0
fi
if [ -f \$IB_USER_PROFILE/xpra/run ]; then
${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \
--windows \
--no-speaker \
--no-microphone \
--no-tray \
--title="\$IB_USER_PROFILE_TITLE: @title@" \
&> \$IB_USER_PROFILE/xpra/client.log
fi
EOF
chmod u+x $out/bin/ib-tws-c
cat<<EOF > $out/bin/ib-gw-c
#!$SHELL
if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then
IB_USER_PROFILE=\`realpath \$1\`
IB_USER_PROFILE_TITLE=\`basename \$1\`
else
if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then
IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\`
IB_USER_PROFILE_TITLE=\$1
else
echo "ERROR: \"\$1\" is not a valid name of a profile."
exit 1
fi
fi
shift
if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi
if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi
if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi
if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi
if [[ \$1 == "-q" ]]; then
if [ -f \$IB_USER_PROFILE/xpra/run ]; then
${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null
fi
exit 0
fi
if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then
( sleep infinity ) &
WAIT_DUMMY_PID=\$!
( trap "" INT;
DISPLAYNUM=100
while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done
mkdir -p \$IB_USER_PROFILE/xpra
cd \$IB_USER_PROFILE
nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \
--socket-dir=\$IB_USER_PROFILE/xpra/ \
--start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \
&& kill \$WAIT_DUMMY_PID &> /dev/null \
&& ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBGatewayController \$IB_USER_PROFILE/IBController.ini" \
--exit-with-children \
--no-pulseaudio \
--no-mdns \
--no-notification \
--no-daemon \
&> \$IB_USER_PROFILE/xpra/server.log
rm -f \$IB_USER_PROFILE/xpra/run
rm -f /tmp/.X\$DISPLAYNUM-lock
) &
wait \$WAIT_DUMMY_PID
exit 0
fi
if [ -f \$IB_USER_PROFILE/xpra/run ]; then
${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \
--windows \
--no-speaker \
--no-microphone \
--no-tray \
--title="\$IB_USER_PROFILE_TITLE: @title@" \
&> \$IB_USER_PROFILE/xpra/client.log
fi
EOF
chmod u+x $out/bin/ib-gw-c
'';
meta = with stdenv.lib; {
description = "Automation Controller for the Trader Work Station of Interactive Brokers";
homepage = https://github.com/ib-controller/ib-controller;
license = licenses.gpl3;
maintainers = [ maintainers.tstrobel ];
platforms = platforms.linux;
};
}

96
pkgs/applications/office/ib/tws/default.nix Normal file
View File

@ -0,0 +1,96 @@
{ stdenv, requireFile, jdk }:
stdenv.mkDerivation rec {
version = "9542";
name = "ib-tws-${version}";
src = requireFile rec {
name = "ibtws_${version}.jar";
message = ''
This nix expression requires that ${name} is already part of the store.
Download the TWS from
https://download2.interactivebrokers.com/download/unixmacosx_latest.jar,
rename the file to ${name}, and add it to the nix store with
"nix-prefetch-url file://${name}".
'';
sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf";
};
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
buildInputs = [ jdk ];
buildPhase = ''
jar -xf IBJts/jts.jar
cp trader/common/images/ibapp_icon.gif ibtws_icon.gif
'';
unpackPhase = ''
jar xf ${src}
'';
installPhase = ''
mkdir -p $out $out/bin $out/etc/ib/tws $out/share/IBJts $out/share/icons
cp IBJts/*.jar $out/share/IBJts/.
cp IBJts/*.ini $out/etc/ib/tws/.
cp ibtws_icon.gif $out/share/icons/.
classpath=""
for jar in $out/share/IBJts/*.jar; do
classpath="$classpath:$jar"
done
# strings to use below; separated to avoid nix specific substitutions
javaOptions={JAVA_OPTIONS:-'-Xmx1024M -Dawt.useSystemAAFontSettings=lcd -Dsun.java2d.xrender=True -Dsun.java2d.opengl=False'}
# OTHER JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java
ibProfileDir={IB_PROFILE_DIR:-~/IB/}
cat<<EOF > $out/bin/ib-tws
#!$SHELL
if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then
IB_USER_PROFILE=\`realpath \$1\`
IB_USER_PROFILE_TITLE=\`basename \$1\`
else
if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then
IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\`
IB_USER_PROFILE_TITLE=\$1
else
echo "ERROR: \"\$1\" is not a valid name of a profile."
exit 1
fi
fi
shift
if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi
if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi
if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi
${jdk}/bin/java -cp $classpath \$$javaOptions jclient.LoginFrame \$IB_USER_PROFILE
EOF
chmod u+x $out/bin/ib-tws
cat<<EOF > $out/bin/ib-gw
#!$SHELL
if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then
IB_USER_PROFILE=\`realpath \$1\`
IB_USER_PROFILE_TITLE=\`basename \$1\`
else
if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then
IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\`
IB_USER_PROFILE_TITLE=\$1
else
echo "ERROR: \"\$1\" is not a valid name of a profile."
exit 1
fi
fi
shift
if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi
if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi
if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi
${jdk}/bin/java -cp $classpath -Dsun.java2d.noddraw=true \$$javaOptions ibgateway.GWClient \$IB_USER_PROFILE
EOF
chmod u+x $out/bin/ib-gw
'';
meta = with stdenv.lib; {
description = "Trader Work Station of Interactive Brokers";
homepage = https://www.interactivebrokers.com;
license = licenses.unfree;
maintainers = [ maintainers.tstrobel ];
platforms = platforms.linux;
};
}

12
pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
View File

@ -1,7 +1,11 @@
#!/run/current-system/sw/bin/bash
# Ideally we would move as much as possible into derivation dependencies
# Take the list of files from the main package, ooo.lst.in
# This script wants an argument: download list file
cat <<EOF
[
EOF
@ -11,11 +15,18 @@ write_entry(){
echo " name = \"${name}\";"
echo " md5 = \"${md5}\";"
echo " brief = ${brief};"
eval "echo -n \"\$additions_${name%%[-_.]*}\""
eval "test -n \"\$additions_${name%%[-_.]*}\" && echo"
echo '}'
}
cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" |
while read line; do
case "$line" in
EVAL\ *)
echo "${line#* }" >&2;
eval "${line#* }";
;;
\#*)
echo Skipping comment: "$line" >&2;
;;
@ -42,6 +53,7 @@ while read line; do
line="${line#,}"
md5=${line:0:32};
name=${line:33};
name="${name%)}"
brief=false;
write_entry;
;;

1
pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh Normal file
View File

@ -0,0 +1 @@
EVAL additions_libgltf=' subDir = "libgltf/";'

1
pkgs/applications/office/libreoffice/libreoffice-srcs.nix
View File

@ -323,6 +323,7 @@
name = "libgltf-0.0.2.tar.bz2";
md5 = "d63a9f47ab048f5009d90693d6aa6424";
brief = true;
subDir = "libgltf/";
}
{
name = "liblangtag-0.5.1.tar.bz2";

21
pkgs/applications/science/astronomy/celestia/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext, glib, cairo
, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo
, pango, gdk_pixbuf, atk
}:
@ -45,7 +45,7 @@ stdenv.mkDerivation {
};
buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua
perl automake autoconf libtool gettext ];
perl autoreconfHook ];
patchPhase = ''
patch -Np0 -i "${gcc46Patch}"
@ -53,18 +53,15 @@ stdenv.mkDerivation {
patch -Np2 -i "${libpng16Patch}"
patch -Np1 -i "${linkingPatch}"
patch -Np1 -i "${gcc47Patch}"
autoreconf
configureFlagsArray=(
--with-gtk
--with-lua=${lua}
CPPFLAGS="-DNDEBUG"
CFLAGS="-O2 -fsigned-char"
CXXFLAGS="-O2 -fsigned-char"
GTK_CFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"
GTK_LIBS="-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"
)
'';
configureFlags = "--with-gtk --with-lua=${lua}";
CPPFLAGS = "-DNDEBUG";
CFLAGS = "-O2 -fsigned-char";
CXXFLAGS = "-O2 -fsigned-char";
GTK_CFLAGS = "-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include";
GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0";
installPhase = ''make MKDIR_P="mkdir -p" install'';
enableParallelBuilding = true;

4
pkgs/applications/science/logic/metis-prover/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "metis-prover-${version}";
version = "2.3.20160101";
version = "2.3.20160102";
src = fetchurl {
url = "http://www.gilith.com/software/metis/metis.tar.gz";
sha256 = "0wkh506ggwmfacwl19n84n1xi6ak4xhrc96d9pdkpk8zdwh5w58l";
sha256 = "13csr90i9lsxdyzxqiwgi98pa7phfl28drjcv4qdjhzi71wcdc66";
};
nativeBuildInputs = [ perl ];

6
pkgs/applications/science/logic/z3/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "z3-${version}";
version = "4.4.0";
version = "4.4.1";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152";
sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx";
rev = "z3-${version}";
sha256 = "1ix100r1h00iph1bk5qx5963gpqaxmmx42r2vb5zglynchjif07c";
};
buildInputs = [ python ];

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake,
libmspack, openssl, pam, xercesc, icu, libdnet, procps,
{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook,
libmspack, openssl, pam, xercesc, icu, libdnet, procps,
xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
pkgconfig, glib, gtk, gtkmm }:
@ -16,8 +16,8 @@ in stdenv.mkDerivation {
sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1";
};
buildInputs =
[ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps
buildInputs =
[ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps
pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
patchPhase = ''
@ -28,7 +28,6 @@ in stdenv.mkDerivation {
patches = [ ./recognize_nixos.patch ];
preConfigure = "autoreconf";
configureFlags = "--without-kernel-modules --without-xmlsecurity";
meta = with stdenv.lib; {

18
pkgs/applications/virtualization/rkt/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio
, fetchurl, fetchFromGitHub }:
{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools,
cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
let
coreosImageRelease = "794.1.0";
coreosImageSystemdVersion = "222";
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
stage1Flavours = [ "coreos" "fly" ];
stage1Flavours = [ "coreos" "fly" "host" ];
in stdenv.mkDerivation rec {
version = "0.14.0";
version = "0.15.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
rev = "v${version}";
owner = "coreos";
repo = "rkt";
sha256 = "0dmgs9s40xhan2rh9f5n0k5gv8p2dn946zffq02sq35qqvi67s71";
sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf";
};
stage1BaseImage = fetchurl {
@ -25,7 +25,10 @@ in stdenv.mkDerivation rec {
sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
};
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
buildInputs = [
autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd
makeWrapper
];
preConfigure = ''
./autogen.sh
@ -45,6 +48,9 @@ in stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp -Rv $BUILDDIR/bin/* $out/bin
wrapProgram $out/bin/rkt \
--prefix LD_LIBRARY_PATH : ${systemd}/lib \
--prefix PATH : ${iptables}/bin
'';
meta = with lib; {

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

@ -5,7 +5,7 @@
, flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl
, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
, spice_protocol, usbredir, alsaLib, quilt
, coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools
, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
, inetutils, iptables, openvswitch, nbd, drbd, xenConfig
, xenserverPatched ? false, ... }:
@ -51,7 +51,7 @@ let
];
scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin")
[ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools
[ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath-tools
iproute inetutils iptables bridge-utils openvswitch nbd drbd ]));
in

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

@ -7,7 +7,7 @@
}:
let
version = "3.5.6";
version = "3.5.7";
in with luaPackages;
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
sha256 = "1ms6a3l1i2jdhzrd1zr25cqckznmb44qgz4n635jam42hzhrvx1p";
sha256 = "ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf";
};
meta = with stdenv.lib; {

4
pkgs/build-support/build-fhs-userenv/default.nix
View File

@ -12,6 +12,8 @@ let
'';
init = run: writeText "${name}-init" ''
source /etc/profile
# Make /tmp directory
mkdir -m 1777 /tmp
@ -44,7 +46,7 @@ in runCommand name {
cat <<EOF >$out/bin/${name}
#! ${stdenv.shell}
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS"
exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init runScript} "\$(pwd)" "\$@"
exec ${chroot-user}/bin/chroot-user ${env} ${bash'} ${init runScript} "\$(pwd)" "\$@"
EOF
chmod +x $out/bin/${name}
${extraInstallCommands}

2
pkgs/build-support/fetchgit/default.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation {
# easy proxy configuration. This is impure, but a fixed-output
# derivation like fetchurl is allowed to do so since its result is
# by definition pure.
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" "GIT_PROXY_COMMAND" "SOCKS_SERVER"
];
preferLocalBuild = true;

34
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -24,6 +24,22 @@ else
leaveDotGit=true
fi
usage(){
echo >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
Options:
--out path Path where the output would be stored.
--url url Any url understand by 'git clone'.
--rev ref Any sha1 or references (such as refs/heads/master)
--hash h Expected hash.
--deepClone Clone submodules recursively.
--no-deepClone Do not clone submodules.
--leave-dotGit Keep the .git directories.
--fetch-submodules Fetch submodules.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
"
exit 1
}
argi=0
argfun=""
@ -40,6 +56,7 @@ for arg; do
--leave-dotGit) leaveDotGit=true;;
--fetch-submodules) fetchSubmodules=true;;
--builder) builder=true;;
--help) usage; exit;;
*)
argi=$(($argi + 1))
case $argi in
@ -61,23 +78,6 @@ for arg; do
fi
done
usage(){
echo >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
Options:
--out path Path where the output would be stored.
--url url Any url understand by 'git clone'.
--rev ref Any sha1 or references (such as refs/heads/master)
--hash h Expected hash.
--deepClone Clone submodules recursively.
--no-deepClone Do not clone submodules.
--leave-dotGit Keep the .git directories.
--fetch-submodules Fetch submodules.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
"
exit 1
}
if test -z "$url"; then
usage
fi

5
pkgs/build-support/fetchurl/builder.sh
View File

@ -45,6 +45,11 @@ tryDownload() {
finish() {
set +o noglob
if [[ $executable == "1" ]]; then
chmod +x $downloadedFile
fi
runHook postFetch
stopNest
exit 0

7
pkgs/build-support/fetchurl/default.nix
View File

@ -73,6 +73,9 @@ in
# is communicated to postFetch via $downloadedFile.
downloadToTemp ? false
, # If true, set executable bit on downloaded file
executable ? false
, # If set, don't download the file, but write a list of all possible
# URLs (resulting from resolving mirror:// URLs) to $out.
showURLs ? false
@ -116,9 +119,9 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s
outputHash = if outputHash != "" then outputHash else
if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
outputHashMode = if recursiveHash then "recursive" else "flat";
outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp;
inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp executable;
# Doing the download on a remote machine just duplicates network
# traffic, so don't do that.

3
pkgs/build-support/grsecurity/default.nix
View File

@ -33,7 +33,7 @@ let
grKernel = if cfg.stable
then mkKernel pkgs.linux_3_14 stable-patch
else mkKernel pkgs.linux_4_2 test-patch;
else mkKernel pkgs.linux_4_3 test-patch;
## -- grsecurity configuration ---------------------------------------------
@ -142,6 +142,7 @@ let
};
extraConfig = grsecConfig;
features.grsecurity = true;
ignoreConfigErrors = true; # Too lazy to model the config options that work with grsecurity and don't for now
})) (args: grsecurityOverrider args grkern));
mkGrsecPkg = grkern: pkgs.linuxPackagesFor grkern (mkGrsecPkg grkern);

6
pkgs/data/icons/numix-icon-theme-circle/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, unzip }:
stdenv.mkDerivation rec {
version = "129da4d8036c9ea52ba8b94cdfa0148e4c2cff96";
version = "e7008b488edfe37379ba9c4b8d5245dfd6125fc3";
package-name = "numix-icon-theme-circle";
name = "${package-name}-20151014";
name = "${package-name}-20160121-${version}";
buildInputs = [ unzip ];
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "numixproject";
repo = package-name;
rev = version;
sha256 = "1505j63qh96hy04x3ywc6kspavzgjd848cgdkda23kjdbx0fpij4";
sha256 = "0pfcz50b9g7zzskws94m6wvd8zm3sjvhpbzq9vjqi1q02nzflap6";
};
dontBuild = true;

6
pkgs/data/icons/numix-icon-theme/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "0f7641b048a07eb614662c502eb209dad5eb6d97";
version = "a704451830d343670721cbf1391df18611d61901";
package-name = "numix-icon-theme";
name = "${package-name}-20151023";
name = "${package-name}-20160120-${version}";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = version;
sha256 = "16kbasgbb5mgiyl9b240215kivdnl8ynpkxhp5gairba9l4jpbih";
sha256 = "0kk0rvywbm074nskjvvy0vjf6giw54jgvrw7sz9kwnv6h75ki96m";
};
dontBuild = true;

3
pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
, gdk_pixbuf, librsvg, gnome_common }:
@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
for f in $out/bin/* $out/libexec/*; do
wrapProgram "$f" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
done
'';

6
pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-3.18.3";
name = "evolution-3.18.4";
src = fetchurl {
url = mirror://gnome/sources/evolution/3.18/evolution-3.18.3.tar.xz;
sha256 = "f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9";
url = mirror://gnome/sources/evolution/3.18/evolution-3.18.4.tar.xz;
sha256 = "8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb";
};
}

6
pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gedit-3.18.2";
name = "gedit-3.18.3";
src = fetchurl {
url = mirror://gnome/sources/gedit/3.18/gedit-3.18.2.tar.xz;
sha256 = "856e451aec29ee45980011de57cadfe89c3cbc53968f6cc865f8efe0bd0d49b1";
url = mirror://gnome/sources/gedit/3.18/gedit-3.18.3.tar.xz;
sha256 = "6762ac0d793b0f754a2da5f88739d04fa39daa7491c5c46401d24bcef76c32e7";
};
}

3
pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
, gdk_pixbuf, librsvg, gnome_common }:
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
for f in $out/bin/* $out/libexec/*; do
wrapProgram "$f" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
done
'';

6
pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-data-server-3.18.3";
name = "evolution-data-server-3.18.4";
src = fetchurl {
url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.3.tar.xz;
sha256 = "9de9d6392822bb4b89318a88f5db1fd2f0f09899b793a0dd5525a656ed0e8163";
url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.4.tar.xz;
sha256 = "0b756f05feae538676832acc122407046a89d4dd32da725789229dc3c416433f";
};
}

6
pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-bluetooth-3.18.1";
name = "gnome-bluetooth-3.18.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.1.tar.xz;
sha256 = "c51d5b896d32845a2b5bb6ccd48926c88c8e9ef0915c32d3c56cb7e7974d4a49";
url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.2.tar.xz;
sha256 = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398";
};
}

6
pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-dictionary-3.18.0";
name = "gnome-dictionary-3.18.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.0.tar.xz;
sha256 = "5338962124f6d784920ed4968d98734a7589513b36e4f4a6ff00d1ed5afb4ead";
url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.1.tar.xz;
sha256 = "92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc";
};
}

6
pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gtksourceview-3.18.1";
name = "gtksourceview-3.18.2";
src = fetchurl {
url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.1.tar.xz;
sha256 = "7be95faf068b9f0ac7540cc1e8d607baa98a482850ef11a6471b53c9327aede6";
url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.2.tar.xz;
sha256 = "60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2";
};
}

4
pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix
View File

@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
rev = "624945d";
rev = "4844fada548ba4d30e1441e063565f9e46334ffd";
name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
src = fetchFromGitHub {
owner = "codito";
repo = "gnome-pomodoro";
rev = "${rev}";
sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
sha256 = "11vqlz0gcvrvf87hwwxvpw3lv50ail16nlynlzkqfd2dac028mag";
};
configureScript = ''./autogen.sh'';

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

@ -34,7 +34,7 @@ let
EOF
'' + lib.concatStrings cmds;
hsPkgs = haskell.packages.ghc7102.override {
hsPkgs = haskell.packages.ghc7103.override {
overrides = self: super:
let hlib = haskell.lib;
elmRelease = import ./packages/release.nix { inherit (self) callPackage; };

78
pkgs/development/compilers/fstar/default.nix Normal file
View File

@ -0,0 +1,78 @@
{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper }:
stdenv.mkDerivation rec {
name = "fstar-${version}";
version = "2016-01-12";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "FStar";
rev = "af9a231566ca52c9bc3409398c801ae9e8191cfa";
sha256 = "1zri4gqr6j6hygnh0ckfhq93mqwk9i19vng8chnmvlr27zq734a2";
};
buildInputs = with ocamlPackages; [
mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl makeWrapper
];
preBuild = ''
substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true"
source setenv.sh
'';
makeFlags = [
"FSYACC=${dotnetPackages.FsLexYacc}/bin/fsyacc"
"FSLEX=${dotnetPackages.FsLexYacc}/bin/fslex"
"NUGET=true"
"PREFIX=$(out)"
];
buildFlags = "-C src";
# Now that the .NET fstar.exe is built, use it to build the native OCaml binary
postBuild = ''
patchShebangs bin/fstar.exe
# Workaround for fsharp/fsharp#419
cp ${fsharp}/lib/mono/4.5/FSharp.Core.dll bin/
# Use the built .NET binary to extract the sources of itself from F* to OCaml
make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} \
$makeFlags "''${makeFlagsArray[@]}" \
ocaml -C src
# Build the extracted OCaml sources
make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} \
$makeFlags "''${makeFlagsArray[@]}" \
-C src/ocaml-output
'';
doCheck = true;
preCheck = "ulimit -s unlimited";
# Basic test suite:
#checkFlags = "VERBOSE=y -C examples";
# Complete, but heavyweight test suite:
checkTarget = "regressions";
checkFlags = "VERBOSE=y -C src";
installFlags = "-C src/ocaml-output";
postInstall = ''
# Workaround for FStarLang/FStar#456
mv $out/lib/fstar/* $out/lib/
rmdir $out/lib/fstar
wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin"
'';
meta = with stdenv.lib; {
description = "ML-like functional programming language aimed at program verification";
homepage = "https://www.fstar-lang.org";
license = licenses.asl20;
platforms = with platforms; linux;
};
}

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

@ -1,13 +1,11 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "nim-0.11.2";
buildInputs = [ unzip ];
name = "nim-0.13.0";
src = fetchurl {
url = "http://nim-lang.org/download/${name}.zip";
sha256 = "0ay8gkd8fki3d8kbnw2px7rjdlr54kyqh5n1rjhq4vjmqs2wg5s4";
url = "http://nim-lang.org/download/${name}.tar.xz";
sha256 = "1adiij20n1cigsc44dbp60jdbydmkfp7ixbddmcn6h4dfvjzaqfd";
};
buildPhase = "sh build.sh";

6
pkgs/development/compilers/oraclejdk/jdk8-linux.nix
View File

@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "65";
patchVersion = "71";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "1shri8mw648piivyparbpzskiq4i0z6kain9kr7ylav5mv7h66fg";
sha256_x86_64 = "1rr6g2sb0f1vyf3l9nvj49ah28bsid92z0lj9pfjlb12vjn2mnw8";
sha256_i686 = "11wcizv4gvlffzn2wj34ffwrq21xwh4ikg2vjv63avdfp2hazjqv";
sha256_x86_64 = "18jqdrlbv4sdds2hlmp437waq7r9b33f7hdp8kb6l7pkrizr9nwv";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

6
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
View File

@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "66";
patchVersion = "72";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "18l4r89na4z92djcdgyinjlhl6fmgz4x1sm40lwrsiwzg26nl0i1";
sha256_x86_64 = "02nwcgplq14vj1vkz99r5x20lg86hscrxb5aaifwcny7l5gsv5by";
sha256_i686 = "023rnlm5v7d9w4d7bgcac8j0r1vqkbv6fl20k8354pzpdjg6liaq";
sha256_x86_64 = "167ca39a6y0n8l87kdm5nv2hrp0wf6g4mw1rbychjc04f5igkrs6";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

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

@ -51,5 +51,7 @@ in stdenv.mkDerivation rec {
# support the -static flag and thus breaks the build.
platforms = ["x86_64-linux"];
broken = true; # https://github.com/UU-ComputerScience/uhc/issues/69
};
}

5734
pkgs/development/erlang-modules/hex-packages.nix
View File

File diff suppressed because it is too large Load Diff

3
pkgs/development/go-modules/generic/default.nix
View File

@ -112,6 +112,9 @@ go.stdenv.mkDerivation (
}
export -f buildGoDir # parallel needs to see the function
if [ -z "$enableParallelBuilding" ]; then
export NIX_BUILD_CORES=1
fi
getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install
runHook postBuild

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

@ -21,13 +21,14 @@ self: super: {
clock = dontCheck super.clock;
Dust-crypto = dontCheck super.Dust-crypto;
hasql-postgres = dontCheck super.hasql-postgres;
hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; };
hspec_2_1_2 = super.hspec_2_1_2.override { stringbuilder = dontCheck super.stringbuilder; };
hspec_2_1_3 = super.hspec_2_1_3.override { stringbuilder = dontCheck super.stringbuilder; };
hspec_2_1_4 = super.hspec_2_1_4.override { stringbuilder = dontCheck super.stringbuilder; };
hspec_2_1_5 = super.hspec_2_1_5.override { stringbuilder = dontCheck super.stringbuilder; };
hspec_2_1_6 = super.hspec_2_1_6.override { stringbuilder = dontCheck super.stringbuilder; };
hspec_2_1_7 = super.hspec_2_1_7.override { stringbuilder = dontCheck super.stringbuilder; };
hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; };
hspec_2_2_1 = super.hspec_2_2_1.override { stringbuilder = dontCheck super.stringbuilder; };
hspec-expectations_0_6_1_1 = dontCheck super.hspec-expectations_0_6_1_1;
hspec-expectations_0_6_1 = dontCheck super.hspec-expectations_0_6_1;
hspec-expectations_0_7_1 = dontCheck super.hspec-expectations_0_7_1;

3
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
View File

@ -51,4 +51,7 @@ self: super: {
# https://github.com/hspec/HUnit/issues/7
HUnit = dontCheck super.HUnit;
# Older versions don't support our version of base.
async = self.async_2_1_0;
}

24
pkgs/development/haskell-modules/configuration-lts-0.0.nix
View File

@ -380,6 +380,7 @@ self: super: {
"GeomPredicates" = dontDistribute super."GeomPredicates";
"GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
"GiST" = dontDistribute super."GiST";
"Gifcurry" = dontDistribute super."Gifcurry";
"GiveYouAHead" = dontDistribute super."GiveYouAHead";
"GlomeTrace" = dontDistribute super."GlomeTrace";
"GlomeVec" = dontDistribute super."GlomeVec";
@ -770,6 +771,7 @@ self: super: {
"PDBtools" = dontDistribute super."PDBtools";
"PSQueue" = dontDistribute super."PSQueue";
"PTQ" = dontDistribute super."PTQ";
"PUH-Project" = dontDistribute super."PUH-Project";
"PageIO" = dontDistribute super."PageIO";
"Paillier" = dontDistribute super."Paillier";
"PandocAgda" = dontDistribute super."PandocAgda";
@ -1156,6 +1158,7 @@ self: super: {
"adhoc-network" = dontDistribute super."adhoc-network";
"adict" = dontDistribute super."adict";
"adjunctions" = doDistribute super."adjunctions_4_2";
"adler32" = dontDistribute super."adler32";
"adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
"adp-multi" = dontDistribute super."adp-multi";
"adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@ -1486,6 +1489,8 @@ self: super: {
"avatar-generator" = dontDistribute super."avatar-generator";
"average" = dontDistribute super."average";
"avers" = dontDistribute super."avers";
"avers-api" = dontDistribute super."avers-api";
"avers-server" = dontDistribute super."avers-server";
"avl-static" = dontDistribute super."avl-static";
"avr-shake" = dontDistribute super."avr-shake";
"awesomium" = dontDistribute super."awesomium";
@ -1787,6 +1792,7 @@ self: super: {
"bowntz" = dontDistribute super."bowntz";
"boxes" = dontDistribute super."boxes";
"bpann" = dontDistribute super."bpann";
"braid" = dontDistribute super."braid";
"brainfuck" = dontDistribute super."brainfuck";
"brainfuck-monad" = dontDistribute super."brainfuck-monad";
"brainfuck-tut" = dontDistribute super."brainfuck-tut";
@ -2026,6 +2032,7 @@ self: super: {
"chatty-text" = dontDistribute super."chatty-text";
"chatty-utils" = dontDistribute super."chatty-utils";
"cheapskate" = dontDistribute super."cheapskate";
"cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
"check-pvp" = dontDistribute super."check-pvp";
"checked" = dontDistribute super."checked";
"checkers" = doDistribute super."checkers_0_4_1";
@ -2449,6 +2456,7 @@ self: super: {
"darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
"darkplaces-text" = dontDistribute super."darkplaces-text";
"dash-haskell" = dontDistribute super."dash-haskell";
"data-accessor" = doDistribute super."data-accessor_0_2_2_6";
"data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
"data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
"data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
@ -2615,6 +2623,7 @@ self: super: {
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
"derive-monoid" = dontDistribute super."derive-monoid";
"derive-topdown" = dontDistribute super."derive-topdown";
"derive-trie" = dontDistribute super."derive-trie";
"deriving-compat" = dontDistribute super."deriving-compat";
@ -2733,8 +2742,10 @@ self: super: {
"distributed-static" = doDistribute super."distributed-static_0_3_1_0";
"distribution" = dontDistribute super."distribution";
"distribution-plot" = dontDistribute super."distribution-plot";
"distributive" = doDistribute super."distributive_0_4_4";
"diversity" = dontDistribute super."diversity";
"dixi" = dontDistribute super."dixi";
"djembe" = dontDistribute super."djembe";
"djinn" = dontDistribute super."djinn";
"djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
"djinn-th" = dontDistribute super."djinn-th";
@ -3050,6 +3061,7 @@ self: super: {
"factory" = dontDistribute super."factory";
"factual-api" = dontDistribute super."factual-api";
"fad" = dontDistribute super."fad";
"fail" = dontDistribute super."fail";
"failable-list" = dontDistribute super."failable-list";
"fair-predicates" = dontDistribute super."fair-predicates";
"fake-type" = dontDistribute super."fake-type";
@ -3381,6 +3393,7 @@ self: super: {
"generic-trie" = dontDistribute super."generic-trie";
"generic-xml" = dontDistribute super."generic-xml";
"generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
"generics-eot" = dontDistribute super."generics-eot";
"generics-sop" = doDistribute super."generics-sop_0_1_0_3";
"genericserialize" = dontDistribute super."genericserialize";
"genetics" = dontDistribute super."genetics";
@ -3707,6 +3720,7 @@ self: super: {
"graphs" = doDistribute super."graphs_0_5_0_1";
"graphtype" = dontDistribute super."graphtype";
"graphviz" = doDistribute super."graphviz_2999_17_0_1";
"grasp" = dontDistribute super."grasp";
"gravatar" = doDistribute super."gravatar_0_6";
"gray-code" = dontDistribute super."gray-code";
"gray-extended" = dontDistribute super."gray-extended";
@ -3939,6 +3953,7 @@ self: super: {
"happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
"har" = dontDistribute super."har";
"harchive" = dontDistribute super."harchive";
"hardware-edsl" = dontDistribute super."hardware-edsl";
"hark" = dontDistribute super."hark";
"harmony" = dontDistribute super."harmony";
"haroonga" = dontDistribute super."haroonga";
@ -4178,6 +4193,7 @@ self: super: {
"her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
"herbalizer" = dontDistribute super."herbalizer";
"here" = doDistribute super."here_1_2_6";
"herf-time" = dontDistribute super."herf-time";
"hermit" = dontDistribute super."hermit";
"hermit-syb" = dontDistribute super."hermit-syb";
"hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
@ -5448,6 +5464,7 @@ self: super: {
"logfloat" = doDistribute super."logfloat_0_12_1";
"logger" = dontDistribute super."logger";
"logging" = dontDistribute super."logging";
"logging-effect" = dontDistribute super."logging-effect";
"logging-facade" = dontDistribute super."logging-facade";
"logging-facade-journald" = dontDistribute super."logging-facade-journald";
"logic-TPTP" = dontDistribute super."logic-TPTP";
@ -5701,6 +5718,7 @@ self: super: {
"mkcabal" = dontDistribute super."mkcabal";
"ml-w" = dontDistribute super."ml-w";
"mlist" = dontDistribute super."mlist";
"mmorph" = doDistribute super."mmorph_1_0_4";
"mmtl" = dontDistribute super."mmtl";
"mmtl-base" = dontDistribute super."mmtl-base";
"moan" = dontDistribute super."moan";
@ -5749,6 +5767,7 @@ self: super: {
"monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
"monad-param" = dontDistribute super."monad-param";
"monad-peel" = dontDistribute super."monad-peel";
"monad-products" = doDistribute super."monad-products_4_0_0_1";
"monad-ran" = dontDistribute super."monad-ran";
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-skeleton" = dontDistribute super."monad-skeleton";
@ -6228,6 +6247,7 @@ self: super: {
"padKONTROL" = dontDistribute super."padKONTROL";
"pagarme" = dontDistribute super."pagarme";
"pager" = dontDistribute super."pager";
"pagerduty" = dontDistribute super."pagerduty";
"pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
"palette" = dontDistribute super."palette";
"palindromes" = dontDistribute super."palindromes";
@ -6239,6 +6259,7 @@ self: super: {
"pandoc-crossref" = dontDistribute super."pandoc-crossref";
"pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
"pandoc-include" = dontDistribute super."pandoc-include";
"pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
"pandoc-lens" = dontDistribute super."pandoc-lens";
"pandoc-placetable" = dontDistribute super."pandoc-placetable";
"pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
@ -6299,6 +6320,7 @@ self: super: {
"patches-vector" = dontDistribute super."patches-vector";
"path" = dontDistribute super."path";
"path-extra" = dontDistribute super."path-extra";
"path-io" = dontDistribute super."path-io";
"path-pieces" = doDistribute super."path-pieces_0_1_4";
"pathfinding" = dontDistribute super."pathfinding";
"pathfindingcore" = dontDistribute super."pathfindingcore";
@ -6509,6 +6531,7 @@ self: super: {
"poly-arity" = dontDistribute super."poly-arity";
"polyToMonoid" = dontDistribute super."polyToMonoid";
"polymap" = dontDistribute super."polymap";
"polynom" = dontDistribute super."polynom";
"polynomial" = dontDistribute super."polynomial";
"polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
"polyparse" = doDistribute super."polyparse_1_9";
@ -8672,6 +8695,7 @@ self: super: {
"weighted-regexp" = dontDistribute super."weighted-regexp";
"weighted-search" = dontDistribute super."weighted-search";
"welshy" = dontDistribute super."welshy";
"werewolf" = dontDistribute super."werewolf";
"wheb-mongo" = dontDistribute super."wheb-mongo";
"wheb-redis" = dontDistribute super."wheb-redis";
"wheb-strapped" = dontDistribute super."wheb-strapped";

24
pkgs/development/haskell-modules/configuration-lts-0.1.nix
View File

@ -380,6 +380,7 @@ self: super: {
"GeomPredicates" = dontDistribute super."GeomPredicates";
"GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
"GiST" = dontDistribute super."GiST";
"Gifcurry" = dontDistribute super."Gifcurry";
"GiveYouAHead" = dontDistribute super."GiveYouAHead";
"GlomeTrace" = dontDistribute super."GlomeTrace";
"GlomeVec" = dontDistribute super."GlomeVec";
@ -770,6 +771,7 @@ self: super: {
"PDBtools" = dontDistribute super."PDBtools";
"PSQueue" = dontDistribute super."PSQueue";
"PTQ" = dontDistribute super."PTQ";
"PUH-Project" = dontDistribute super."PUH-Project";
"PageIO" = dontDistribute super."PageIO";
"Paillier" = dontDistribute super."Paillier";
"PandocAgda" = dontDistribute super."PandocAgda";
@ -1156,6 +1158,7 @@ self: super: {
"adhoc-network" = dontDistribute super."adhoc-network";
"adict" = dontDistribute super."adict";
"adjunctions" = doDistribute super."adjunctions_4_2";
"adler32" = dontDistribute super."adler32";
"adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
"adp-multi" = dontDistribute super."adp-multi";
"adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@ -1486,6 +1489,8 @@ self: super: {
"avatar-generator" = dontDistribute super."avatar-generator";
"average" = dontDistribute super."average";
"avers" = dontDistribute super."avers";
"avers-api" = dontDistribute super."avers-api";
"avers-server" = dontDistribute super."avers-server";
"avl-static" = dontDistribute super."avl-static";
"avr-shake" = dontDistribute super."avr-shake";
"awesomium" = dontDistribute super."awesomium";
@ -1787,6 +1792,7 @@ self: super: {
"bowntz" = dontDistribute super."bowntz";
"boxes" = dontDistribute super."boxes";
"bpann" = dontDistribute super."bpann";
"braid" = dontDistribute super."braid";
"brainfuck" = dontDistribute super."brainfuck";
"brainfuck-monad" = dontDistribute super."brainfuck-monad";
"brainfuck-tut" = dontDistribute super."brainfuck-tut";
@ -2026,6 +2032,7 @@ self: super: {
"chatty-text" = dontDistribute super."chatty-text";
"chatty-utils" = dontDistribute super."chatty-utils";
"cheapskate" = dontDistribute super."cheapskate";
"cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
"check-pvp" = dontDistribute super."check-pvp";
"checked" = dontDistribute super."checked";
"checkers" = doDistribute super."checkers_0_4_1";
@ -2449,6 +2456,7 @@ self: super: {
"darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
"darkplaces-text" = dontDistribute super."darkplaces-text";
"dash-haskell" = dontDistribute super."dash-haskell";
"data-accessor" = doDistribute super."data-accessor_0_2_2_6";
"data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
"data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
"data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
@ -2615,6 +2623,7 @@ self: super: {
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
"derive-monoid" = dontDistribute super."derive-monoid";
"derive-topdown" = dontDistribute super."derive-topdown";
"derive-trie" = dontDistribute super."derive-trie";
"deriving-compat" = dontDistribute super."deriving-compat";
@ -2733,8 +2742,10 @@ self: super: {
"distributed-static" = doDistribute super."distributed-static_0_3_1_0";
"distribution" = dontDistribute super."distribution";
"distribution-plot" = dontDistribute super."distribution-plot";
"distributive" = doDistribute super."distributive_0_4_4";
"diversity" = dontDistribute super."diversity";
"dixi" = dontDistribute super."dixi";
"djembe" = dontDistribute super."djembe";
"djinn" = dontDistribute super."djinn";
"djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
"djinn-th" = dontDistribute super."djinn-th";
@ -3050,6 +3061,7 @@ self: super: {
"factory" = dontDistribute super."factory";
"factual-api" = dontDistribute super."factual-api";
"fad" = dontDistribute super."fad";
"fail" = dontDistribute super."fail";
"failable-list" = dontDistribute super."failable-list";
"fair-predicates" = dontDistribute super."fair-predicates";
"fake-type" = dontDistribute super."fake-type";
@ -3381,6 +3393,7 @@ self: super: {
"generic-trie" = dontDistribute super."generic-trie";
"generic-xml" = dontDistribute super."generic-xml";
"generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
"generics-eot" = dontDistribute super."generics-eot";
"generics-sop" = doDistribute super."generics-sop_0_1_0_3";
"genericserialize" = dontDistribute super."genericserialize";
"genetics" = dontDistribute super."genetics";
@ -3707,6 +3720,7 @@ self: super: {
"graphs" = doDistribute super."graphs_0_5_0_1";
"graphtype" = dontDistribute super."graphtype";
"graphviz" = doDistribute super."graphviz_2999_17_0_1";
"grasp" = dontDistribute super."grasp";
"gravatar" = doDistribute super."gravatar_0_6";
"gray-code" = dontDistribute super."gray-code";
"gray-extended" = dontDistribute super."gray-extended";
@ -3939,6 +3953,7 @@ self: super: {
"happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
"har" = dontDistribute super."har";
"harchive" = dontDistribute super."harchive";
"hardware-edsl" = dontDistribute super."hardware-edsl";
"hark" = dontDistribute super."hark";
"harmony" = dontDistribute super."harmony";
"haroonga" = dontDistribute super."haroonga";
@ -4178,6 +4193,7 @@ self: super: {
"her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
"herbalizer" = dontDistribute super."herbalizer";
"here" = doDistribute super."here_1_2_6";
"herf-time" = dontDistribute super."herf-time";
"hermit" = dontDistribute super."hermit";
"hermit-syb" = dontDistribute super."hermit-syb";
"hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
@ -5448,6 +5464,7 @@ self: super: {
"logfloat" = doDistribute super."logfloat_0_12_1";
"logger" = dontDistribute super."logger";
"logging" = dontDistribute super."logging";
"logging-effect" = dontDistribute super."logging-effect";
"logging-facade" = dontDistribute super."logging-facade";
"logging-facade-journald" = dontDistribute super."logging-facade-journald";
"logic-TPTP" = dontDistribute super."logic-TPTP";
@ -5701,6 +5718,7 @@ self: super: {
"mkcabal" = dontDistribute super."mkcabal";
"ml-w" = dontDistribute super."ml-w";
"mlist" = dontDistribute super."mlist";
"mmorph" = doDistribute super."mmorph_1_0_4";
"mmtl" = dontDistribute super."mmtl";
"mmtl-base" = dontDistribute super."mmtl-base";
"moan" = dontDistribute super."moan";
@ -5749,6 +5767,7 @@ self: super: {
"monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
"monad-param" = dontDistribute super."monad-param";
"monad-peel" = dontDistribute super."monad-peel";
"monad-products" = doDistribute super."monad-products_4_0_0_1";
"monad-ran" = dontDistribute super."monad-ran";
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-skeleton" = dontDistribute super."monad-skeleton";
@ -6228,6 +6247,7 @@ self: super: {
"padKONTROL" = dontDistribute super."padKONTROL";
"pagarme" = dontDistribute super."pagarme";
"pager" = dontDistribute super."pager";
"pagerduty" = dontDistribute super."pagerduty";
"pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
"palette" = dontDistribute super."palette";
"palindromes" = dontDistribute super."palindromes";
@ -6239,6 +6259,7 @@ self: super: {
"pandoc-crossref" = dontDistribute super."pandoc-crossref";
"pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
"pandoc-include" = dontDistribute super."pandoc-include";
"pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
"pandoc-lens" = dontDistribute super."pandoc-lens";
"pandoc-placetable" = dontDistribute super."pandoc-placetable";
"pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
@ -6299,6 +6320,7 @@ self: super: {
"patches-vector" = dontDistribute super."patches-vector";
"path" = dontDistribute super."path";
"path-extra" = dontDistribute super."path-extra";
"path-io" = dontDistribute super."path-io";
"path-pieces" = doDistribute super."path-pieces_0_1_4";
"pathfinding" = dontDistribute super."pathfinding";
"pathfindingcore" = dontDistribute super."pathfindingcore";
@ -6509,6 +6531,7 @@ self: super: {
"poly-arity" = dontDistribute super."poly-arity";
"polyToMonoid" = dontDistribute super."polyToMonoid";
"polymap" = dontDistribute super."polymap";
"polynom" = dontDistribute super."polynom";
"polynomial" = dontDistribute super."polynomial";
"polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
"polyparse" = doDistribute super."polyparse_1_9";
@ -8672,6 +8695,7 @@ self: super: {
"weighted-regexp" = dontDistribute super."weighted-regexp";
"weighted-search" = dontDistribute super."weighted-search";
"welshy" = dontDistribute super."welshy";
"werewolf" = dontDistribute super."werewolf";
"wheb-mongo" = dontDistribute super."wheb-mongo";
"wheb-redis" = dontDistribute super."wheb-redis";
"wheb-strapped" = dontDistribute super."wheb-strapped";

24
pkgs/development/haskell-modules/configuration-lts-0.2.nix
View File

@ -380,6 +380,7 @@ self: super: {
"GeomPredicates" = dontDistribute super."GeomPredicates";
"GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
"GiST" = dontDistribute super."GiST";
"Gifcurry" = dontDistribute super."Gifcurry";
"GiveYouAHead" = dontDistribute super."GiveYouAHead";
"GlomeTrace" = dontDistribute super."GlomeTrace";
"GlomeVec" = dontDistribute super."GlomeVec";
@ -770,6 +771,7 @@ self: super: {
"PDBtools" = dontDistribute super."PDBtools";
"PSQueue" = dontDistribute super."PSQueue";
"PTQ" = dontDistribute super."PTQ";
"PUH-Project" = dontDistribute super."PUH-Project";
"PageIO" = dontDistribute super."PageIO";
"Paillier" = dontDistribute super."Paillier";
"PandocAgda" = dontDistribute super."PandocAgda";
@ -1156,6 +1158,7 @@ self: super: {
"adhoc-network" = dontDistribute super."adhoc-network";
"adict" = dontDistribute super."adict";
"adjunctions" = doDistribute super."adjunctions_4_2";
"adler32" = dontDistribute super."adler32";
"adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
"adp-multi" = dontDistribute super."adp-multi";
"adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@ -1486,6 +1489,8 @@ self: super: {
"avatar-generator" = dontDistribute super."avatar-generator";
"average" = dontDistribute super."average";
"avers" = dontDistribute super."avers";
"avers-api" = dontDistribute super."avers-api";
"avers-server" = dontDistribute super."avers-server";
"avl-static" = dontDistribute super."avl-static";
"avr-shake" = dontDistribute super."avr-shake";
"awesomium" = dontDistribute super."awesomium";
@ -1787,6 +1792,7 @@ self: super: {
"bowntz" = dontDistribute super."bowntz";
"boxes" = dontDistribute super."boxes";
"bpann" = dontDistribute super."bpann";
"braid" = dontDistribute super."braid";
"brainfuck" = dontDistribute super."brainfuck";
"brainfuck-monad" = dontDistribute super."brainfuck-monad";
"brainfuck-tut" = dontDistribute super."brainfuck-tut";
@ -2026,6 +2032,7 @@ self: super: {
"chatty-text" = dontDistribute super."chatty-text";
"chatty-utils" = dontDistribute super."chatty-utils";
"cheapskate" = dontDistribute super."cheapskate";
"cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
"check-pvp" = dontDistribute super."check-pvp";
"checked" = dontDistribute super."checked";
"checkers" = doDistribute super."checkers_0_4_1";
@ -2449,6 +2456,7 @@ self: super: {
"darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
"darkplaces-text" = dontDistribute super."darkplaces-text";
"dash-haskell" = dontDistribute super."dash-haskell";
"data-accessor" = doDistribute super."data-accessor_0_2_2_6";
"data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
"data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
"data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
@ -2615,6 +2623,7 @@ self: super: {
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
"derive-monoid" = dontDistribute super."derive-monoid";
"derive-topdown" = dontDistribute super."derive-topdown";
"derive-trie" = dontDistribute super."derive-trie";
"deriving-compat" = dontDistribute super."deriving-compat";
@ -2733,8 +2742,10 @@ self: super: {
"distributed-static" = doDistribute super."distributed-static_0_3_1_0";
"distribution" = dontDistribute super."distribution";
"distribution-plot" = dontDistribute super."distribution-plot";
"distributive" = doDistribute super."distributive_0_4_4";
"diversity" = dontDistribute super."diversity";
"dixi" = dontDistribute super."dixi";
"djembe" = dontDistribute super."djembe";
"djinn" = dontDistribute super."djinn";
"djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
"djinn-th" = dontDistribute super."djinn-th";
@ -3050,6 +3061,7 @@ self: super: {
"factory" = dontDistribute super."factory";
"factual-api" = dontDistribute super."factual-api";
"fad" = dontDistribute super."fad";
"fail" = dontDistribute super."fail";
"failable-list" = dontDistribute super."failable-list";
"fair-predicates" = dontDistribute super."fair-predicates";
"fake-type" = dontDistribute super."fake-type";
@ -3381,6 +3393,7 @@ self: super: {
"generic-trie" = dontDistribute super."generic-trie";
"generic-xml" = dontDistribute super."generic-xml";
"generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
"generics-eot" = dontDistribute super."generics-eot";
"generics-sop" = doDistribute super."generics-sop_0_1_0_3";
"genericserialize" = dontDistribute super."genericserialize";
"genetics" = dontDistribute super."genetics";
@ -3707,6 +3720,7 @@ self: super: {
"graphs" = doDistribute super."graphs_0_5_0_1";
"graphtype" = dontDistribute super."graphtype";
"graphviz" = doDistribute super."graphviz_2999_17_0_1";
"grasp" = dontDistribute super."grasp";
"gravatar" = doDistribute super."gravatar_0_6";
"gray-code" = dontDistribute super."gray-code";
"gray-extended" = dontDistribute super."gray-extended";
@ -3939,6 +3953,7 @@ self: super: {
"happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
"har" = dontDistribute super."har";
"harchive" = dontDistribute super."harchive";
"hardware-edsl" = dontDistribute super."hardware-edsl";
"hark" = dontDistribute super."hark";
"harmony" = dontDistribute super."harmony";
"haroonga" = dontDistribute super."haroonga";
@ -4178,6 +4193,7 @@ self: super: {
"her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
"herbalizer" = dontDistribute super."herbalizer";
"here" = doDistribute super."here_1_2_6";
"herf-time" = dontDistribute super."herf-time";
"hermit" = dontDistribute super."hermit";
"hermit-syb" = dontDistribute super."hermit-syb";
"hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
@ -5448,6 +5464,7 @@ self: super: {
"logfloat" = doDistribute super."logfloat_0_12_1";
"logger" = dontDistribute super."logger";
"logging" = dontDistribute super."logging";
"logging-effect" = dontDistribute super."logging-effect";
"logging-facade" = dontDistribute super."logging-facade";
"logging-facade-journald" = dontDistribute super."logging-facade-journald";
"logic-TPTP" = dontDistribute super."logic-TPTP";
@ -5701,6 +5718,7 @@ self: super: {
"mkcabal" = dontDistribute super."mkcabal";
"ml-w" = dontDistribute super."ml-w";
"mlist" = dontDistribute super."mlist";
"mmorph" = doDistribute super."mmorph_1_0_4";
"mmtl" = dontDistribute super."mmtl";
"mmtl-base" = dontDistribute super."mmtl-base";
"moan" = dontDistribute super."moan";
@ -5749,6 +5767,7 @@ self: super: {
"monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
"monad-param" = dontDistribute super."monad-param";
"monad-peel" = dontDistribute super."monad-peel";
"monad-products" = doDistribute super."monad-products_4_0_0_1";
"monad-ran" = dontDistribute super."monad-ran";
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-skeleton" = dontDistribute super."monad-skeleton";
@ -6228,6 +6247,7 @@ self: super: {
"padKONTROL" = dontDistribute super."padKONTROL";
"pagarme" = dontDistribute super."pagarme";
"pager" = dontDistribute super."pager";
"pagerduty" = dontDistribute super."pagerduty";
"pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
"palette" = dontDistribute super."palette";
"palindromes" = dontDistribute super."palindromes";
@ -6239,6 +6259,7 @@ self: super: {
"pandoc-crossref" = dontDistribute super."pandoc-crossref";
"pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
"pandoc-include" = dontDistribute super."pandoc-include";
"pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
"pandoc-lens" = dontDistribute super."pandoc-lens";
"pandoc-placetable" = dontDistribute super."pandoc-placetable";
"pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
@ -6299,6 +6320,7 @@ self: super: {
"patches-vector" = dontDistribute super."patches-vector";
"path" = dontDistribute super."path";
"path-extra" = dontDistribute super."path-extra";
"path-io" = dontDistribute super."path-io";
"path-pieces" = doDistribute super."path-pieces_0_1_4";
"pathfinding" = dontDistribute super."pathfinding";
"pathfindingcore" = dontDistribute super."pathfindingcore";
@ -6509,6 +6531,7 @@ self: super: {
"poly-arity" = dontDistribute super."poly-arity";
"polyToMonoid" = dontDistribute super."polyToMonoid";
"polymap" = dontDistribute super."polymap";
"polynom" = dontDistribute super."polynom";
"polynomial" = dontDistribute super."polynomial";
"polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
"polyparse" = doDistribute super."polyparse_1_9";
@ -8672,6 +8695,7 @@ self: super: {
"weighted-regexp" = dontDistribute super."weighted-regexp";
"weighted-search" = dontDistribute super."weighted-search";
"welshy" = dontDistribute super."welshy";
"werewolf" = dontDistribute super."werewolf";
"wheb-mongo" = dontDistribute super."wheb-mongo";
"wheb-redis" = dontDistribute super."wheb-redis";
"wheb-strapped" = dontDistribute super."wheb-strapped";

24
pkgs/development/haskell-modules/configuration-lts-0.3.nix
View File

@ -380,6 +380,7 @@ self: super: {
"GeomPredicates" = dontDistribute super."GeomPredicates";
"GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
"GiST" = dontDistribute super."GiST";
"Gifcurry" = dontDistribute super."Gifcurry";
"GiveYouAHead" = dontDistribute super."GiveYouAHead";
"GlomeTrace" = dontDistribute super."GlomeTrace";
"GlomeVec" = dontDistribute super."GlomeVec";
@ -770,6 +771,7 @@ self: super: {
"PDBtools" = dontDistribute super."PDBtools";
"PSQueue" = dontDistribute super."PSQueue";
"PTQ" = dontDistribute super."PTQ";
"PUH-Project" = dontDistribute super."PUH-Project";
"PageIO" = dontDistribute super."PageIO";
"Paillier" = dontDistribute super."Paillier";
"PandocAgda" = dontDistribute super."PandocAgda";
@ -1156,6 +1158,7 @@ self: super: {
"adhoc-network" = dontDistribute super."adhoc-network";
"adict" = dontDistribute super."adict";
"adjunctions" = doDistribute super."adjunctions_4_2";
"adler32" = dontDistribute super."adler32";
"adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
"adp-multi" = dontDistribute super."adp-multi";
"adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@ -1486,6 +1489,8 @@ self: super: {
"avatar-generator" = dontDistribute super."avatar-generator";
"average" = dontDistribute super."average";
"avers" = dontDistribute super."avers";
"avers-api" = dontDistribute super."avers-api";
"avers-server" = dontDistribute super."avers-server";
"avl-static" = dontDistribute super."avl-static";
"avr-shake" = dontDistribute super."avr-shake";
"awesomium" = dontDistribute super."awesomium";
@ -1787,6 +1792,7 @@ self: super: {
"bowntz" = dontDistribute super."bowntz";
"boxes" = dontDistribute super."boxes";
"bpann" = dontDistribute super."bpann";
"braid" = dontDistribute super."braid";
"brainfuck" = dontDistribute super."brainfuck";
"brainfuck-monad" = dontDistribute super."brainfuck-monad";
"brainfuck-tut" = dontDistribute super."brainfuck-tut";
@ -2026,6 +2032,7 @@ self: super: {
"chatty-text" = dontDistribute super."chatty-text";
"chatty-utils" = dontDistribute super."chatty-utils";
"cheapskate" = dontDistribute super."cheapskate";
"cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
"check-pvp" = dontDistribute super."check-pvp";
"checked" = dontDistribute super."checked";
"checkers" = doDistribute super."checkers_0_4_1";
@ -2449,6 +2456,7 @@ self: super: {
"darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
"darkplaces-text" = dontDistribute super."darkplaces-text";
"dash-haskell" = dontDistribute super."dash-haskell";
"data-accessor" = doDistribute super."data-accessor_0_2_2_6";
"data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
"data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
"data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
@ -2615,6 +2623,7 @@ self: super: {
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
"derive-monoid" = dontDistribute super."derive-monoid";
"derive-topdown" = dontDistribute super."derive-topdown";
"derive-trie" = dontDistribute super."derive-trie";
"deriving-compat" = dontDistribute super."deriving-compat";
@ -2733,8 +2742,10 @@ self: super: {
"distributed-static" = doDistribute super."distributed-static_0_3_1_0";
"distribution" = dontDistribute super."distribution";
"distribution-plot" = dontDistribute super."distribution-plot";
"distributive" = doDistribute super."distributive_0_4_4";
"diversity" = dontDistribute super."diversity";
"dixi" = dontDistribute super."dixi";
"djembe" = dontDistribute super."djembe";
"djinn" = dontDistribute super."djinn";
"djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
"djinn-th" = dontDistribute super."djinn-th";
@ -3050,6 +3061,7 @@ self: super: {
"factory" = dontDistribute super."factory";
"factual-api" = dontDistribute super."factual-api";
"fad" = dontDistribute super."fad";
"fail" = dontDistribute super."fail";
"failable-list" = dontDistribute super."failable-list";
"fair-predicates" = dontDistribute super."fair-predicates";
"fake-type" = dontDistribute super."fake-type";
@ -3381,6 +3393,7 @@ self: super: {
"generic-trie" = dontDistribute super."generic-trie";
"generic-xml" = dontDistribute super."generic-xml";
"generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
"generics-eot" = dontDistribute super."generics-eot";
"generics-sop" = doDistribute super."generics-sop_0_1_0_3";
"genericserialize" = dontDistribute super."genericserialize";
"genetics" = dontDistribute super."genetics";
@ -3707,6 +3720,7 @@ self: super: {
"graphs" = doDistribute super."graphs_0_5_0_1";
"graphtype" = dontDistribute super."graphtype";
"graphviz" = doDistribute super."graphviz_2999_17_0_1";
"grasp" = dontDistribute super."grasp";
"gravatar" = doDistribute super."gravatar_0_6";
"gray-code" = dontDistribute super."gray-code";
"gray-extended" = dontDistribute super."gray-extended";
@ -3939,6 +3953,7 @@ self: super: {
"happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
"har" = dontDistribute super."har";
"harchive" = dontDistribute super."harchive";
"hardware-edsl" = dontDistribute super."hardware-edsl";
"hark" = dontDistribute super."hark";
"harmony" = dontDistribute super."harmony";
"haroonga" = dontDistribute super."haroonga";
@ -4178,6 +4193,7 @@ self: super: {
"her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
"herbalizer" = dontDistribute super."herbalizer";
"here" = doDistribute super."here_1_2_6";
"herf-time" = dontDistribute super."herf-time";
"hermit" = dontDistribute super."hermit";
"hermit-syb" = dontDistribute super."hermit-syb";
"hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
@ -5448,6 +5464,7 @@ self: super: {
"logfloat" = doDistribute super."logfloat_0_12_1";
"logger" = dontDistribute super."logger";
"logging" = dontDistribute super."logging";
"logging-effect" = dontDistribute super."logging-effect";
"logging-facade" = dontDistribute super."logging-facade";
"logging-facade-journald" = dontDistribute super."logging-facade-journald";
"logic-TPTP" = dontDistribute super."logic-TPTP";
@ -5701,6 +5718,7 @@ self: super: {
"mkcabal" = dontDistribute super."mkcabal";
"ml-w" = dontDistribute super."ml-w";
"mlist" = dontDistribute super."mlist";
"mmorph" = doDistribute super."mmorph_1_0_4";
"mmtl" = dontDistribute super."mmtl";
"mmtl-base" = dontDistribute super."mmtl-base";
"moan" = dontDistribute super."moan";
@ -5749,6 +5767,7 @@ self: super: {
"monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
"monad-param" = dontDistribute super."monad-param";
"monad-peel" = dontDistribute super."monad-peel";
"monad-products" = doDistribute super."monad-products_4_0_0_1";
"monad-ran" = dontDistribute super."monad-ran";
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-skeleton" = dontDistribute super."monad-skeleton";
@ -6228,6 +6247,7 @@ self: super: {
"padKONTROL" = dontDistribute super."padKONTROL";
"pagarme" = dontDistribute super."pagarme";
"pager" = dontDistribute super."pager";
"pagerduty" = dontDistribute super."pagerduty";
"pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
"palette" = dontDistribute super."palette";
"palindromes" = dontDistribute super."palindromes";
@ -6239,6 +6259,7 @@ self: super: {
"pandoc-crossref" = dontDistribute super."pandoc-crossref";
"pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
"pandoc-include" = dontDistribute super."pandoc-include";
"pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
"pandoc-lens" = dontDistribute super."pandoc-lens";
"pandoc-placetable" = dontDistribute super."pandoc-placetable";
"pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
@ -6299,6 +6320,7 @@ self: super: {
"patches-vector" = dontDistribute super."patches-vector";
"path" = dontDistribute super."path";
"path-extra" = dontDistribute super."path-extra";
"path-io" = dontDistribute super."path-io";
"path-pieces" = doDistribute super."path-pieces_0_1_4";
"pathfinding" = dontDistribute super."pathfinding";
"pathfindingcore" = dontDistribute super."pathfindingcore";
@ -6509,6 +6531,7 @@ self: super: {
"poly-arity" = dontDistribute super."poly-arity";
"polyToMonoid" = dontDistribute super."polyToMonoid";
"polymap" = dontDistribute super."polymap";
"polynom" = dontDistribute super."polynom";
"polynomial" = dontDistribute super."polynomial";
"polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
"polyparse" = doDistribute super."polyparse_1_9";
@ -8672,6 +8695,7 @@ self: super: {
"weighted-regexp" = dontDistribute super."weighted-regexp";
"weighted-search" = dontDistribute super."weighted-search";
"welshy" = dontDistribute super."welshy";
"werewolf" = dontDistribute super."werewolf";
"wheb-mongo" = dontDistribute super."wheb-mongo";
"wheb-redis" = dontDistribute super."wheb-redis";
"wheb-strapped" = dontDistribute super."wheb-strapped";

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