alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch master into x-updates

Browse source 
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
This commit is contained in:
Vladimír Čunát 2013-11-23 10:22:26 +01:00
parent 0d4d1097cb a7675b2aae
commit b5fba47147
98 changed files with 2198 additions and 531 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/maintainers.nix
View file

@ -63,5 +63,6 @@
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
zef = "Zef Hemel <zef@zef.me>";
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
zoomulator = "Kim Simmons <zoomulator@gmail.com>";
}

31
nixos/doc/manual/development.xml
View file

@ -652,6 +652,37 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
</listitem>
</varlistentry>
<varlistentry>
<term><varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname></term>
<listitem>
<para>This builds the unit with the specified name. Note that
since unit names contain dots
(e.g. <literal>httpd.service</literal>), you need to put them
between quotes, like this:
<screen>
$ nix-build -A 'config.systemd.units."httpd.service".unit'
</screen>
You can also test individual units, without rebuilding the whole
system, by putting them in
<filename>/run/systemd/system</filename>:
<screen>
$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
/run/systemd/system/tmp-httpd.service
$ systemctl daemon-reload
$ systemctl start tmp-httpd.service
</screen>
Note that the unit must not have the same name as any unit in
<filename>/etc/systemd/system</filename> since those take
precedence over <filename>/run/systemd/system</filename>.
That’s why the unit is installed as
<filename>tmp-httpd.service</filename> here.</para>
</listitem>
</varlistentry>
</variablelist>
</para>

2
nixos/maintainers/scripts/ec2/create-ebs-amis.py
View file

@ -67,7 +67,7 @@ m.run_command("mkdir -p /mnt/etc/nixos")
m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
m.run_command("nix-channel --update")
m.run_command("nixos-rebuild switch")
version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
version = m.run_command("nixos-version", capture_stdout=True).split(' ')[0]
print >> sys.stderr, "NixOS version is {0}".format(version)
m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix")
m.run_command("nixos-install")

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

@ -91,6 +91,7 @@
./services/databases/virtuoso.nix
./services/games/ghost-one.nix
./services/hardware/acpid.nix
./services/hardware/amd-hybrid-graphics.nix
./services/hardware/bluetooth.nix
./services/hardware/nvidia-optimus.nix
./services/hardware/pcscd.nix
@ -274,6 +275,7 @@
./tasks/network-interfaces.nix
./tasks/scsi-link-power-management.nix
./tasks/swraid.nix
./testing/service-runner.nix
./virtualisation/libvirtd.nix
#./virtualisation/nova.nix
./virtualisation/virtualbox-guest.nix

35
nixos/modules/security/polkit.nix
View file

@ -23,7 +23,15 @@ in
default = "";
example =
''
TODO
/* Log authorization checks. */
polkit.addRule(function(action, subject) {
polkit.log("user " + subject.user + " is attempting action " + action.id + " from PID " + subject.pid);
});
/* Allow any local user to do anything (dangerous!). */
polkit.addRule(function(action, subject) {
if (subject.local) return "yes";
});
'';
description =
''
@ -33,9 +41,9 @@ in
};
security.polkit.adminIdentities = mkOption {
type = types.str;
default = "unix-user:0;unix-group:wheel";
example = "";
type = types.listOf types.str;
default = [ "unix-user:0" "unix-group:wheel" ];
example = [ "unix-user:alice" "unix-group:admin" ];
description =
''
Specifies which users are considered “administrators”, for those
@ -58,18 +66,15 @@ in
# The polkit daemon reads action/rule files
environment.pathsToLink = [ "/share/polkit-1" ];
# PolKit rules for NixOS
environment.etc = [ {
source = pkgs.writeText "10-nixos.conf"
''
polkit.addAdminRule(function(action, subject) {
return ["${cfg.adminIdentities}"];
});
# PolKit rules for NixOS.
environment.etc."polkit-1/rules.d/10-nixos.rules".text =
''
polkit.addAdminRule(function(action, subject) {
return [${concatStringsSep ", " (map (i: "\"${i}\"") cfg.adminIdentities)}];
});
${cfg.extraConfig}
''; #TODO: validation on compilation (at least against typos)
target = "polkit-1/rules.d/10-nixos.conf";
} ];
${cfg.extraConfig}
''; #TODO: validation on compilation (at least against typos)
services.dbus.packages = [ pkgs.polkit ];

9
nixos/modules/services/databases/postgresql.nix
View file

@ -181,8 +181,13 @@ in
# Initialise the database.
if ! test -e ${cfg.dataDir}; then
mkdir -m 0700 -p ${cfg.dataDir}
chown -R postgres ${cfg.dataDir}
su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
if [ "$(id -u)" = 0 ]; then
chown -R postgres ${cfg.dataDir}
su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
else
# For non-root operation.
initdb
fi
rm -f ${cfg.dataDir}/*.conf
touch "${cfg.dataDir}/.first_startup"
fi

39
nixos/modules/services/hardware/amd-hybrid-graphics.nix Normal file
View file

@ -0,0 +1,39 @@
{ config, pkgs, ... }:
{
###### interface
options = {
hardware.amdHybridGraphics.disable = pkgs.lib.mkOption {
default = false;
type = pkgs.lib.types.bool;
description = ''
Completely disable the AMD graphics card and use the
integrated graphics processor instead.
'';
};
};
###### implementation
config = pkgs.lib.mkIf config.hardware.amdHybridGraphics.disable {
systemd.services."amd-hybrid-graphics" = {
path = [ pkgs.bash ];
description = "Disable AMD Card";
after = [ "sys-kernel-debug.mount" ];
requires = [ "sys-kernel-debug.mount" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${pkgs.bash}/bin/sh -c 'echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch; exit 0'";
ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch; exit 0'";
};
};
};
}

4
nixos/modules/services/monitoring/dd-agent.nix
View file

@ -62,6 +62,8 @@ in {
ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
User = "dd-agent";
Group = "dd-agent";
Restart = "always";
RestartSec = 2;
};
restartTriggers = [ pkgs.dd-agent datadog_conf ];
};
@ -76,6 +78,8 @@ in {
Group = "dd-agent";
Type = "forking";
PIDFile = "/tmp/dogstatsd.pid";
Restart = "always";
RestartSec = 2;
};
restartTriggers = [ pkgs.dd-agent datadog_conf ];
};

5
nixos/modules/services/web-servers/apache-httpd/default.nix
View file

@ -628,10 +628,10 @@ in
preStart =
''
mkdir -m 0750 -p ${mainCfg.stateDir}
chown root.${mainCfg.group} ${mainCfg.stateDir}
[ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir}
${optionalString version24 ''
mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
[ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
''}
mkdir -m 0700 -p ${mainCfg.logDir}
@ -659,6 +659,7 @@ in
serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}";
serviceConfig.ExecStop = "${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop";
serviceConfig.Type = "forking";
serviceConfig.PIDFile = "${mainCfg.stateDir}/httpd.pid";
serviceConfig.Restart = "always";
};

6
nixos/modules/system/boot/kernel.nix
View file

@ -230,10 +230,8 @@ in
{ description = "Load Kernel Modules";
wantedBy = [ "sysinit.target" "multi-user.target" ];
before = [ "sysinit.target" "shutdown.target" ];
unitConfig =
{ DefaultDependencies = "no";
Conflicts = "shutdown.target";
};
conflicts = [ "shutdown.target" ];
unitConfig.DefaultDependencies = "no";
serviceConfig =
{ Type = "oneshot";
RemainAfterExit = true;

5
nixos/modules/system/boot/stage-1.nix
View file

@ -330,6 +330,11 @@ in
config = {
assertions = singleton
{ assertion = any (fs: fs.mountPoint == "/") (attrValues config.fileSystems);
message = "The ‘fileSystems’ option does not specify your root file system.";
};
system.build.bootStage1 = bootStage1;
system.build.initialRamdisk = initialRamdisk;
system.build.extraUtils = extraUtils;

54
nixos/modules/system/boot/systemd-unit-options.nix
View file

@ -14,6 +14,18 @@ let
in if errors == [] then true
else builtins.trace (concatStringsSep "\n" errors) false;
unitOption = mkOptionType {
name = "systemd option";
merge = loc: defs:
let
defs' = filterOverrides defs;
defs'' = getValues defs';
in
if isList (head defs'')
then concatLists defs''
else mergeOneOption loc defs';
};
in rec {
unitOptions = {
@ -37,7 +49,7 @@ in rec {
requires = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = ''
Start the specified units when this unit is started, and stop
this unit when the specified units are stopped or fail.
@ -46,7 +58,7 @@ in rec {
wants = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = ''
Start the specified units when this unit is started.
'';
@ -54,7 +66,7 @@ in rec {
after = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = ''
If the specified units are started at the same time as
this unit, delay this unit until they have started.
@ -63,7 +75,7 @@ in rec {
before = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = ''
If the specified units are started at the same time as
this unit, delay them until this unit has started.
@ -72,7 +84,7 @@ in rec {
bindsTo = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = ''
Like ‘requires’, but in addition, if the specified units
unexpectedly disappear, this unit will be stopped as well.
@ -81,7 +93,7 @@ in rec {
partOf = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = ''
If the specified units are stopped or restarted, then this
unit is stopped or restarted as well.
@ -90,7 +102,7 @@ in rec {
conflicts = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = ''
If the specified units are started, then this unit is stopped
and vice versa.
@ -99,20 +111,20 @@ in rec {
requiredBy = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = "Units that require (i.e. depend on and need to go down with) this unit.";
};
wantedBy = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = "Units that want (i.e. depend on) this unit.";
};
unitConfig = mkOption {
default = {};
example = { RequiresMountsFor = "/data"; };
type = types.attrs;
type = types.attrsOf unitOption;
description = ''
Each attribute in this set specifies an option in the
<literal>[Unit]</literal> section of the unit. See
@ -137,7 +149,7 @@ in rec {
environment = mkOption {
default = {};
type = types.attrs;
type = types.attrs; # FIXME
example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
description = "Environment variables passed to the service's processes.";
};
@ -159,7 +171,7 @@ in rec {
{ StartLimitInterval = 10;
RestartSec = 5;
};
type = types.addCheck types.attrs checkService;
type = types.addCheck (types.attrsOf unitOption) checkService;
description = ''
Each attribute in this set specifies an option in the
<literal>[Service]</literal> section of the unit. See
@ -169,7 +181,7 @@ in rec {
};
script = mkOption {
type = types.str;
type = types.lines;
default = "";
description = "Shell commands executed as the service's main process.";
};
@ -181,7 +193,7 @@ in rec {
};
preStart = mkOption {
type = types.string;
type = types.lines;
default = "";
description = ''
Shell commands executed before the service's main process
@ -190,7 +202,7 @@ in rec {
};
postStart = mkOption {
type = types.string;
type = types.lines;
default = "";
description = ''
Shell commands executed after the service's main process
@ -199,7 +211,7 @@ in rec {
};
postStop = mkOption {
type = types.string;
type = types.lines;
default = "";
description = ''
Shell commands executed after the service's main process
@ -252,7 +264,7 @@ in rec {
listenStreams = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
example = [ "0.0.0.0:993" "/run/my-socket" ];
description = ''
For each item in this list, a <literal>ListenStream</literal>
@ -263,7 +275,7 @@ in rec {
socketConfig = mkOption {
default = {};
example = { ListenStream = "/run/my-socket"; };
type = types.attrs;
type = types.attrsOf unitOption;
description = ''
Each attribute in this set specifies an option in the
<literal>[Socket]</literal> section of the unit. See
@ -280,7 +292,7 @@ in rec {
timerConfig = mkOption {
default = {};
example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; };
type = types.attrs;
type = types.attrsOf unitOption;
description = ''
Each attribute in this set specifies an option in the
<literal>[Timer]</literal> section of the unit. See
@ -328,7 +340,7 @@ in rec {
mountConfig = mkOption {
default = {};
example = { DirectoryMode = "0775"; };
type = types.attrs;
type = types.attrsOf unitOption;
description = ''
Each attribute in this set specifies an option in the
<literal>[Mount]</literal> section of the unit. See
@ -352,7 +364,7 @@ in rec {
automountConfig = mkOption {
default = {};
example = { DirectoryMode = "0775"; };
type = types.attrs;
type = types.attrsOf unitOption;
description = ''
Each attribute in this set specifies an option in the
<literal>[Automount]</literal> section of the unit. See

141
nixos/modules/system/boot/systemd.nix
View file

@ -160,16 +160,43 @@ let
};
serviceConfig = { name, config, ... }: {
config = {
# Default path for systemd services. Should be quite minimal.
path =
[ pkgs.coreutils
pkgs.findutils
pkgs.gnugrep
pkgs.gnused
systemd
];
};
config = mkMerge
[ { # Default path for systemd services. Should be quite minimal.
path =
[ pkgs.coreutils
pkgs.findutils
pkgs.gnugrep
pkgs.gnused
systemd
];
environment.PATH = config.path;
environment.LD_LIBRARY_PATH = "";
}
(mkIf (config.preStart != "")
{ serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" ''
#! ${pkgs.stdenv.shell} -e
${config.preStart}
'';
})
(mkIf (config.script != "")
{ serviceConfig.ExecStart = makeJobScript "${name}-start" ''
#! ${pkgs.stdenv.shell} -e
${config.script}
'' + " " + config.scriptArgs;
})
(mkIf (config.postStart != "")
{ serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" ''
#! ${pkgs.stdenv.shell} -e
${config.postStart}
'';
})
(mkIf (config.postStop != "")
{ serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" ''
#! ${pkgs.stdenv.shell} -e
${config.postStop}
'';
})
];
};
mountConfig = { name, config, ... }: {
@ -223,41 +250,10 @@ let
${attrsToSection def.unitConfig}
[Service]
Environment=PATH=${def.path}
Environment=LD_LIBRARY_PATH=
${let env = cfg.globalEnvironment // def.environment;
in concatMapStrings (n: "Environment=\"${n}=${getAttr n env}\"\n") (attrNames env)}
${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"}
${optionalString (def.preStart != "") ''
ExecStartPre=${makeJobScript "${name}-pre-start" ''
#! ${pkgs.stdenv.shell} -e
${def.preStart}
''}
''}
${optionalString (def.script != "") ''
ExecStart=${makeJobScript "${name}-start" ''
#! ${pkgs.stdenv.shell} -e
${def.script}
''} ${def.scriptArgs}
''}
${optionalString (def.postStart != "") ''
ExecStartPost=${makeJobScript "${name}-post-start" ''
#! ${pkgs.stdenv.shell} -e
${def.postStart}
''}
''}
${optionalString (def.postStop != "") ''
ExecStopPost=${makeJobScript "${name}-post-stop" ''
#! ${pkgs.stdenv.shell} -e
${def.postStop}
''}
''}
${attrsToSection def.serviceConfig}
'';
};
@ -311,8 +307,6 @@ let
'';
};
nixosUnits = mapAttrsToList makeUnit cfg.units;
units = pkgs.runCommand "units" { preferLocalBuild = true; }
''
mkdir -p $out
@ -338,7 +332,7 @@ let
done
done
for i in ${toString nixosUnits}; do
for i in ${toString (mapAttrsToList (n: v: v.unit) cfg.units)}; do
ln -s $i/* $out/
done
@ -387,32 +381,41 @@ in
description = "Definition of systemd units.";
default = {};
type = types.attrsOf types.optionSet;
options = {
text = mkOption {
type = types.str;
description = "Text of this systemd unit.";
options = { name, config, ... }:
{ options = {
text = mkOption {
type = types.str;
description = "Text of this systemd unit.";
};
enable = mkOption {
default = true;
type = types.bool;
description = ''
If set to false, this unit will be a symlink to
/dev/null. This is primarily useful to prevent specific
template instances (e.g. <literal>serial-getty@ttyS0</literal>)
from being started.
'';
};
requiredBy = mkOption {
default = [];
type = types.listOf types.string;
description = "Units that require (i.e. depend on and need to go down with) this unit.";
};
wantedBy = mkOption {
default = [];
type = types.listOf types.string;
description = "Units that want (i.e. depend on) this unit.";
};
unit = mkOption {
internal = true;
description = "The generated unit.";
};
};
config = {
unit = makeUnit name config;
};
};
enable = mkOption {
default = true;
type = types.bool;
description = ''
If set to false, this unit will be a symlink to
/dev/null. This is primarily useful to prevent specific
template instances (e.g. <literal>serial-getty@ttyS0</literal>)
from being started.
'';
};
requiredBy = mkOption {
default = [];
type = types.listOf types.string;
description = "Units that require (i.e. depend on and need to go down with) this unit.";
};
wantedBy = mkOption {
default = [];
type = types.listOf types.string;
description = "Units that want (i.e. depend on) this unit.";
};
};
};
systemd.packages = mkOption {

1
nixos/modules/tasks/filesystems.nix
View file

@ -81,6 +81,7 @@ in
options = {
fileSystems = mkOption {
default = {};
example = {
"/".device = "/dev/hda1";
"/data" = {

2
nixos/modules/tasks/kbd.nix
View file

@ -55,9 +55,9 @@ in
{ description = "Setup Virtual Console";
wantedBy = [ "sysinit.target" "multi-user.target" ];
before = [ "sysinit.target" "shutdown.target" ];
conflicts = [ "shutdown.target" ];
unitConfig =
{ DefaultDependencies = "no";
Conflicts = "shutdown.target";
ConditionPathExists = "/dev/tty1";
};
serviceConfig =

114
nixos/modules/testing/service-runner.nix Normal file
View file

@ -0,0 +1,114 @@
{ config, pkgs, ... }:
with pkgs.lib;
let
makeScript = name: service: pkgs.writeScript "${name}-runner"
''
#! ${pkgs.perl}/bin/perl -w -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl
use File::Slurp;
sub run {
my ($cmd) = @_;
my @args = split " ", $cmd;
my $prog;
if (substr($args[0], 0, 1) eq "@") {
$prog = substr($args[0], 1);
shift @args;
} else {
$prog = $args[0];
}
my $pid = fork;
if ($pid == 0) {
setpgrp; # don't receive SIGINT etc. from terminal
exec { $prog } @args;
die "failed to exec $prog\n";
} elsif (!defined $pid) {
die "failed to fork: $!\n";
}
return $pid;
};
sub run_wait {
my ($cmd) = @_;
my $pid = run $cmd;
die if waitpid($pid, 0) != $pid;
return $?;
};
# Set the environment. FIXME: escaping.
foreach my $key (keys %ENV) {
next if $key eq 'LOCALE_ARCHIVE';
delete $ENV{$key};
}
${concatStrings (mapAttrsToList (n: v: ''
$ENV{'${n}'} = '${v}';
'') service.environment)}
# Run the ExecStartPre program. FIXME: this could be a list.
my $preStart = '${service.serviceConfig.ExecStartPre or ""}';
if ($preStart ne "") {
print STDERR "running ExecStartPre: $preStart\n";
my $res = run_wait $preStart;
die "$0: ExecStartPre failed with status $res\n" if $res;
};
# Run the ExecStart program.
my $cmd = '${service.serviceConfig.ExecStart}';
print STDERR "running ExecStart: $cmd\n";
my $mainPid = run $cmd;
$ENV{'MAINPID'} = $mainPid;
# Catch SIGINT, propagate to the main program.
sub intHandler {
print STDERR "got SIGINT, stopping service...\n";
kill 'INT', $mainPid;
};
$SIG{'INT'} = \&intHandler;
$SIG{'QUIT'} = \&intHandler;
# Run the ExecStartPost program.
my $postStart = '${service.serviceConfig.ExecStartPost or ""}';
if ($postStart ne "") {
print STDERR "running ExecStartPost: $postStart\n";
my $res = run_wait $postStart;
die "$0: ExecStartPost failed with status $res\n" if $res;
}
# Wait for the main program to exit.
die if waitpid($mainPid, 0) != $mainPid;
my $mainRes = $?;
# Run the ExecStopPost program.
my $postStop = '${service.serviceConfig.ExecStopPost or ""}';
if ($postStop ne "") {
print STDERR "running ExecStopPost: $postStop\n";
my $res = run_wait $postStop;
die "$0: ExecStopPost failed with status $res\n" if $res;
}
exit($mainRes & 127 ? 255 : $mainRes << 8);
'';
in
{
options = {
systemd.services = mkOption {
options =
{ config, name, ... }:
{ options.runner = mkOption {
internal = true;
description = ''
A script that runs the service outside of systemd,
useful for testing or for using NixOS services outside
of NixOS.
'';
};
config.runner = makeScript name config;
};
};
};
}

5
pkgs/applications/audio/qmmp/default.nix
View file

@ -28,11 +28,11 @@
# handle that.
stdenv.mkDerivation rec {
name = "qmmp-0.7.0";
name = "qmmp-0.7.3";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
sha256 = "0g8qcs82y3dy06lsgam2w6gh2ccx0frlw9fp4xg947vi3a16g6ig";
sha256 = "0qjmnyq3qmrm510g3lsa6vd80nmbz0859pwhnaaa19ah0jhf3r2p";
};
buildInputs =
@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [maintainers.bjornfor];
repositories.svn = http://qmmp.googlecode.com/svn/;
};
}

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

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-1.8.0";
name = "calibre-1.11.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "0awh24n5bvypmiylngmz0w0126yz1jxlrjfy9b4w5aflg7vgr0qq";
sha256 = "17jp93wzq11yb89yg2x42f65yyx6v0hy6nhvrd42ig0vhk7sdh2n";
};
inherit python;

9
pkgs/applications/misc/vue/default.nix
View file

@ -11,10 +11,10 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="vue";
version="3.1.2";
version="3.2.2";
name="${baseName}-${version}";
url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_2.zip";
hash="0ga98gnp4qhcrb31cb8j0mwbrh6ym6hr4k5y4blxvyfff9c0vq47";
url="releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
hash="0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
};
in
rec {
@ -30,9 +30,8 @@ rec {
phaseNames = ["doDeploy"];
doDeploy = a.fullDepEntry ''
unzip ${src}
mkdir -p "$out"/{share/vue,bin}
cp VUE.jar "$out/share/vue/vue.jar"
cp ${src} "$out/share/vue/vue.jar"
echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
chmod a+x "$out/bin/vue"

9
pkgs/applications/networking/browsers/firefox/default.nix
View file

@ -15,12 +15,11 @@
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
let optional = stdenv.lib.optional;
in rec {
rec {
firefoxVersion = "25.0";
firefoxVersion = "25.0.1";
xulVersion = "25.0"; # this attribute is used by other packages
xulVersion = "25.0.1"; # this attribute is used by other packages
src = fetchurl {
@ -30,7 +29,7 @@ in rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "854722e283659d2b6b2eacd38f757b3c5b63a448";
sha1 = "592ebd242c4839ef0e18707a7e959d8bed2a98f3";
};
commonConfigureFlags =

4
pkgs/applications/networking/feedreaders/newsbeuter/default.nix
View file

@ -2,11 +2,11 @@
, gettext, libiconvOrEmpty, makeWrapper, perl }:
stdenv.mkDerivation rec {
name = "newsbeuter-2.6";
name = "newsbeuter-2.7";
src = fetchurl {
url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
sha256 = "1hywz5206k0ykjklkjvnfy9fm4jfv9phz8dkzzwhfcjvqv9zv29i";
sha256 = "0flhzzlbdirjmrq738gmcxqqnifg3kb7plcwqcxshpizmjkhswp6";
};
buildInputs

45
pkgs/applications/networking/feedreaders/newsbeuter/dev.nix Normal file
View file

@ -0,0 +1,45 @@
{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses
, gettext, libiconvOrEmpty, makeWrapper, perl }:
stdenv.mkDerivation rec {
name = "newsbeuter-dev-20131103";
src = fetchurl {
url = "https://github.com/akrennmair/newsbeuter/archive/8abefa3efb5e6d70c32bac9e068248e98616d6ec.tar.gz";
sha256 = "1pfkr4adm7rxwq44hpxwblw6gg8vd0frsi6szvhmzkpn5qmnpwpg";
};
buildInputs
# use gettext instead of libintlOrEmpty so we have access to the msgfmt
# command
= [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ]
++ libiconvOrEmpty
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
preBuild = ''
sed -i -e 104,108d config.sh
sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
export LDFLAGS=-lncursesw
'';
NIX_CFLAGS_COMPILE =
"-I${libxml2}/include/libxml2 -I${json-c-0-11}/include/json-c";
NIX_LDFLAGS = "-lsqlite3 -lcurl -lxml2 -lstfl -ljson";
installPhase = ''
DESTDIR=$out prefix=\"\" make install
'' + stdenv.lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
done
'';
meta = with stdenv.lib; {
homepage = http://www.newsbeuter.org;
description = "An open-source RSS/Atom feed reader for text terminals";
maintainers = with maintainers; [ lovek323 ];
license = licenses.mit;
platforms = platforms.unix;
};
}

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

@ -0,0 +1,53 @@
{ stdenv, fetchurl, dpkg, openssl, alsaLib, libXext, libXfixes, libXrandr
, libjpeg, curl, libX11, libXmu, libXv, libXtst, qt4, mesa, zlib
, gnome, libidn, rtmpdump, c-ares, openldap, makeWrapper, cacert
}:
assert stdenv.system == "x86_64-linux";
let
curl_custom =
stdenv.lib.overrideDerivation curl (args: {
configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ca-bundle.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.gcc.gcc 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_GCC/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 = "Fuze for Linux";
homepage = http://www.fuzebox.com;
license = "unknown";
};
}

24
pkgs/applications/networking/remote/teamviewer/8.nix
View file

@ -1,26 +1,20 @@
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
, bash }:
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau
, bash, patchelf }:
# Work in progress.
# It doesn't want to start unless teamviewerd is running as root.
# I haven't tried to make the daemon run.
assert stdenv.system == "i686-linux";
let
topath = "${wine}/bin";
topath = "${wineUnstable}/bin";
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
in
stdenv.mkDerivation {
name = "teamviewer-8.0.17147";
src = fetchurl {
url = "http://download.teamviewer.com/download/teamviewer_linux_x64.deb";
sha256 = "01iynk954pphl5mq4avs843xyzvdfzng1lpsy7skgwvw0k9cx5ab";
sha256 = "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k";
};
buildInputs = [ makeWrapper ];
buildInputs = [ makeWrapper patchelf ];
unpackPhase = ''
ar x $src
@ -36,9 +30,13 @@ stdenv.mkDerivation {
#!${bash}/bin/sh
export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
export PATH=${topath}\''${PATH:+:\$PATH}
$out/share/teamviewer8/tv_bin/script/teamviewer
$out/share/teamviewer8/tv_bin/script/teamviewer "\$@"
EOF
chmod +x $out/bin/teamviewer
patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd
ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/
'';
meta = {

4
pkgs/applications/science/spyder/default.nix
View file

@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
name = "spyder-2.1.13.1";
name = "spyder-2.2.5";
namePrefix = "";
src = fetchurl {
url = "https://spyderlib.googlecode.com/files/${name}.zip";
sha256 = "1sg88shvw6k2v5428k13mah4pyqng43856rzr6ypz5qgwn0677ya";
sha256 = "1bxc5qs2bqc21s6kxljsfxnmwgrgnyjfr9mkwzg9njpqsran3bp2";
};
buildInputs = [ unzip ];

50
pkgs/applications/window-managers/awesome/3.4.nix Normal file
View file

@ -0,0 +1,50 @@
{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua
, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
, libXdmcp, pixman, doxygen
, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
, docbook_xml_dtd_45, libxslt, coreutils, which }:
let
version = "3.4.13";
in
stdenv.mkDerivation rec {
name = "awesome-${version}";
src = fetchurl {
url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr";
};
buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango
imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ];
# We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
# the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as
# dependencies.
prePatch = ''
# Fix the tab completion (supporting bash or zsh)
sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
# Remove the 'root' PATH override (I don't know why they have that)
sed /WHOAMI/d -i utils/awsetbg
# Russian manpages fail to be generated:
# [ 56%] Generating manpages/ru/man1/awesome.1.xml
# asciidoc: ERROR: <stdin>: line 3: name section expected
# asciidoc: FAILED: <stdin>: line 3: section title expected
# make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
substituteInPlace CMakeLists.txt \
--replace "set(AWE_MAN_LANGS it es fr de ru)" \
"set(AWE_MAN_LANGS it es fr de)"
'';
meta = {
homepage = http://awesome.naquadah.org/;
description = "Highly configurable, dynamic window manager for X";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

97
pkgs/applications/window-managers/awesome/default.nix
View file

@ -1,51 +1,72 @@
{stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua
, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
, libXdmcp, pixman, doxygen
, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
, docbook_xml_dtd_45, libxslt, coreutils}:
{ stdenv, fetchurl, lua, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
, xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, lgi, makeWrapper, pango, gobjectIntrospection, unclutter
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode
, which, dbus, nettools, git, asciidoc, doxygen }:
let
version = "3.4.13";
version = "3.5.2";
in
stdenv.mkDerivation rec {
name = "awesome-${version}";
src = fetchurl {
url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr";
url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
sha256 = "11iya03yzr8sa3snmywlw22ayg0d3dcy49pi8fz0bycf5aq6b38q";
};
buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango
imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];
# We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
# the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as
# dependencies.
prePatch = ''
# Fix the tab completion (supporting bash or zsh)
sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
# Remove the 'root' PATH override (I don't know why they have that)
sed /WHOAMI/d -i utils/awsetbg
# Russian manpages fail to be generated:
# [ 56%] Generating manpages/ru/man1/awesome.1.xml
# asciidoc: ERROR: <stdin>: line 3: name section expected
# asciidoc: FAILED: <stdin>: line 3: section title expected
# make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
substituteInPlace CMakeLists.txt \
--replace "set(AWE_MAN_LANGS it es fr de ru)" \
"set(AWE_MAN_LANGS it es fr de)"
'';
meta = {
homepage = http://awesome.naquadah.org/;
meta = with stdenv.lib; {
description = "Highly configurable, dynamic window manager for X";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
homepage = http://awesome.naquadah.org/;
license = "GPLv2+";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.linux;
};
}
buildInputs = [
asciidoc
cairo
cmake
dbus
doxygen
gdk_pixbuf
git
imagemagick
lgi
libpthreadstubs
libstartup_notification
libxdg_basedir
lua
makeWrapper
nettools
pango
pkgconfig
xcb-util-cursor
xlibs.libXau
xlibs.libXdmcp
xlibs.libxcb
xlibs.xcbutil
xlibs.xcbutilimage
xlibs.xcbutilkeysyms
xlibs.xcbutilrenderutil
xlibs.xcbutilwm
];
AWESOME_IGNORE_LGI = 1;
LUA_CPATH = "${lgi}/lib/lua/5.1/?.so";
LUA_PATH = "${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua";
postInstall = ''
wrapProgram $out/bin/awesome \
--set LUA_CPATH '"${lgi}/lib/lua/5.1/?.so"' \
--set LUA_PATH '"${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"' \
--set GI_TYPELIB_PATH "${pango}/lib/girepository-1.0" \
--set LD_LIBRARY_PATH "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \
--prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin"
wrapProgram $out/bin/awesome-client \
--prefix PATH : "${which}/bin"
'';
}

4
pkgs/applications/window-managers/openbox/default.nix
View file

@ -3,7 +3,7 @@
, imlib2, pango, libstartup_notification }:
stdenv.mkDerivation rec {
name = "openbox-3.5.0";
name = "openbox-3.5.2";
buildInputs = [
pkgconfig libxml2
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://openbox.org/dist/openbox/${name}.tar.gz";
sha256 = "02pa1wa2rzvnq1z3xchzafc96hvp3537jh155q8acfhbacb01abg";
sha256 = "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj";
};
meta = {

5
pkgs/desktops/xfce/core/xfce4-session.nix
View file

@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
polkit
];
preBuild = ''
sed '/^PATH=/d' -i scripts/xflock4
sed '/^export PATH$/d' -i scripts/xflock4
'';
configureFlags = [ "--with-xsession-prefix=$(out)" ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";

4
pkgs/desktops/xfce/default.nix
View file

@ -55,7 +55,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
#### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"
xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
}; # xfce_self

23
pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4panel
, gtk }:
stdenv.mkDerivation rec {
p_name = "xfce4-datetime-plugin";
ver_maj = "0.6";
ver_min = "1";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "06xvh22y5y0bcy7zb9ylvjpcl09wdyb751r7gwyg7m3h44f0qd7v";
};
buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 xfce4panel gtk ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
platforms = stdenv.lib.platforms.linux;
};
}

25
pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix Normal file
View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel
, gtk, libxklavier, librsvg, libwnck
}:
stdenv.mkDerivation rec {
p_name = "xfce4-xkb-plugin";
ver_maj = "0.5";
ver_min = "4.3";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0v9r0w9m5lxrzmz12f8w67l781lsywy9p1vixgn4xq6z5sxh2j6a";
};
buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk
libxklavier librsvg libwnck ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Allows you to setup and use multiple keyboard layouts";
platforms = stdenv.lib.platforms.linux;
};
}

5
pkgs/development/compilers/go/1.1-darwin.nix
View file

@ -45,6 +45,11 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p "$out/bin"
# CGO is broken on Maverick. See: http://code.google.com/p/go/issues/detail?id=5926
# Reevaluate once go 1.1.3 is out
export CGO_ENABLED=0
export GOROOT="$(pwd)/"
export GOBIN="$out/bin"
export PATH="$GOBIN:$PATH"

4
pkgs/development/compilers/sdcc/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, bison, flex, boost, gputils ? null }:
stdenv.mkDerivation rec {
version = "3.2.0";
version = "3.3.0";
name = "sdcc-${version}";
src = fetchurl {
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
sha256 = "15gdl04kqpvmwvvplss5nmp3bz8rhz48dhb0wmb2v9v9sn7qj01d";
sha256 = "1pj4hssvq34vbryvxc2jpp2b14cgxp695ygwiax6b7l2kvr62gw7";
};
# TODO: remove this comment when gputils != null is tested

15
pkgs/development/interpreters/scheme48/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "scheme48-1.9";
meta = {
homepage = http://s48.org/;
description = "Scheme 48";
};
src = fetchurl {
url = http://s48.org/1.9/scheme48-1.9.tgz;
md5 = "b4c20057f92191d05a61fac1372878ad";
};
}

14
pkgs/development/libraries/haskell/EitherT/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, monadControl, transformers, transformersBase }:
cabal.mkDerivation (self: {
pname = "EitherT";
version = "0.2.0";
sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw";
buildDepends = [ monadControl transformers transformersBase ];
meta = {
description = "EitherT monad transformer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

22
pkgs/development/libraries/haskell/ariadne/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ cabal, bert, Cabal, haskellNames, haskellPackages, haskellSrcExts
, mtl, utf8String
}:
cabal.mkDerivation (self: {
pname = "ariadne";
version = "0.1.2.1";
sha256 = "1gx6jrv3s86h02cjx8pvqyklp445ljiysx29hg39qykyhi1q5a3z";
isLibrary = false;
isExecutable = true;
buildDepends = [
bert Cabal haskellNames haskellPackages haskellSrcExts mtl
utf8String
];
meta = {
homepage = "https://github.com/feuerbach/ariadne";
description = "Go-to-definition for Haskell";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

24
pkgs/development/libraries/haskell/bert/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ cabal, async, binary, binaryConduit, conduit, mtl, network
, networkConduit, parsec, smallcheck, tasty, tastyHunit
, tastySmallcheck, time, void
}:
cabal.mkDerivation (self: {
pname = "bert";
version = "1.2.1.1";
sha256 = "1g5sm23cxlzc7lqdlrjn4f89g65ia2bhr25yfh286awxf23z8pyh";
buildDepends = [
binary binaryConduit conduit mtl network networkConduit parsec time
void
];
testDepends = [
async binary network smallcheck tasty tastyHunit tastySmallcheck
];
meta = {
homepage = "https://github.com/feuerbach/bert";
description = "BERT implementation";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

20
pkgs/development/libraries/haskell/binary-conduit/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ cabal, binary, conduit, hspec, QuickCheck, quickcheckAssertions
, vector
}:
cabal.mkDerivation (self: {
pname = "binary-conduit";
version = "1.2";
sha256 = "1m58zgmivapn51gs5983vpsivzkki94kkac014mwvnp90q46nkvx";
buildDepends = [ binary conduit vector ];
testDepends = [
binary conduit hspec QuickCheck quickcheckAssertions
];
meta = {
homepage = "http://github.com/qnikst/binary-conduit";
description = "data serialization/deserialization conduit library";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

14
pkgs/development/libraries/haskell/digits/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, QuickCheck }:
cabal.mkDerivation (self: {
pname = "digits";
version = "0.2";
sha256 = "18s9k7kj0qvd4297msl0k6ziwfb5bl1gwnxlrl8b4rkqda4kf17l";
buildDepends = [ QuickCheck ];
meta = {
description = "Converts integers to lists of digits and back";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

15
pkgs/development/libraries/haskell/filemanip/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ cabal, filepath, mtl, unixCompat }:
cabal.mkDerivation (self: {
pname = "filemanip";
version = "0.3.6.2";
sha256 = "03l114rhb4f6nyzs9w14i79d7kyyq9ia542alsqpbmikm9gxm4rz";
buildDepends = [ filepath mtl unixCompat ];
meta = {
homepage = "https://github.com/bos/filemanip";
description = "Expressive file and directory manipulation for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

28
pkgs/development/libraries/haskell/haskell-names/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ cabal, aeson, Cabal, dataLens, dataLensTemplate, filemanip
, filepath, haskellPackages, haskellSrcExts, hseCpp, mtl
, prettyShow, tagged, tasty, tastyGolden, transformers
, traverseWithClass, typeEq, uniplate, utf8String
}:
cabal.mkDerivation (self: {
pname = "haskell-names";
version = "0.3.1";
sha256 = "134rxpsgki1disb24gvj1bq5xi4491k9ihb5pjhab78w4m7b99gn";
buildDepends = [
aeson Cabal dataLens dataLensTemplate filepath haskellPackages
haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
typeEq uniplate
];
testDepends = [
aeson Cabal filemanip filepath haskellPackages haskellSrcExts
hseCpp mtl prettyShow tagged tasty tastyGolden traverseWithClass
uniplate utf8String
];
meta = {
homepage = "http://documentup.com/haskell-suite/haskell-names";
description = "Name resolution library for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

20
pkgs/development/libraries/haskell/haskell-packages/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ cabal, aeson, Cabal, deepseq, EitherT, filepath, haskellSrcExts
, hseCpp, mtl, optparseApplicative, tagged
}:
cabal.mkDerivation (self: {
pname = "haskell-packages";
version = "0.2.3.1";
sha256 = "0sryw0gdwkgd53la6gryf7i5h8rlpys6j8nh75f9j014i4y1p0jw";
buildDepends = [
aeson Cabal deepseq EitherT filepath haskellSrcExts hseCpp mtl
optparseApplicative tagged
];
meta = {
homepage = "http://documentup.com/haskell-suite/haskell-packages";
description = "Haskell suite library for package management and integration with Cabal";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

14
pkgs/development/libraries/haskell/hse-cpp/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, cpphs, haskellSrcExts }:
cabal.mkDerivation (self: {
pname = "hse-cpp";
version = "0.1";
sha256 = "0f1bgi1hnpnry1pm7jhi626afdvymzy7k0a70n07n41js46pjxd0";
buildDepends = [ cpphs haskellSrcExts ];
meta = {
description = "Preprocess+parse haskell code";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

2
pkgs/development/libraries/haskell/language-ecmascript/default.nix
View file

@ -14,6 +14,8 @@ cabal.mkDerivation (self: {
dataDefaultClass Diff filepath HUnit mtl parsec QuickCheck
testFramework testFrameworkHunit testFrameworkQuickcheck2
];
jailbreak = true;
doCheck = false;
meta = {
homepage = "http://github.com/jswebtools/language-ecmascript";
description = "JavaScript parser and pretty-printer library";

16
pkgs/development/libraries/haskell/quickcheck-assertions/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ cabal, hspec, ieee754, QuickCheck }:
cabal.mkDerivation (self: {
pname = "quickcheck-assertions";
version = "0.1.1";
sha256 = "0hrnr17wafng7nc6d8w6pp1lygplri8xkb5380aq64zg9iik2s21";
buildDepends = [ ieee754 QuickCheck ];
testDepends = [ hspec ieee754 QuickCheck ];
meta = {
homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
description = "HUnit like assertions for QuickCheck";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

15
pkgs/development/libraries/haskell/quickcheck-instances/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ cabal, QuickCheck, text, time }:
cabal.mkDerivation (self: {
pname = "quickcheck-instances";
version = "0.3.3";
sha256 = "0l5rck5sh3cplqqkkasm00phy962y3wa9l8a44843grp3flnpv72";
buildDepends = [ QuickCheck text time ];
meta = {
homepage = "https://github.com/aslatter/qc-instances";
description = "Common quickcheck instances";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

9
pkgs/development/libraries/haskell/smallcheck/default.nix
View file

@ -2,14 +2,17 @@
cabal.mkDerivation (self: {
pname = "smallcheck";
version = "1.0.4";
sha256 = "0zqssw7r56k7gi1lxdss3f4piqa692y728rli9p81q9rbcvi3x7z";
version = "1.1";
sha256 = "167dhi0j4mfmf9idjcfx0x1y1jajx4qmgcpiia93vjpmv8ha56j8";
buildDepends = [ logict mtl ];
meta = {
homepage = "https://github.com/feuerbach/smallcheck";
description = "A property-based testing library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.ocharles
];
};
})

15
pkgs/development/libraries/haskell/socket-activation/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ cabal, network, transformers }:
cabal.mkDerivation (self: {
pname = "socket-activation";
version = "0.1.0.0";
sha256 = "1w10i9a10lq5gscwm1vf1w7pqkfyx3n108jw8dx4zdqhrh82lmwv";
buildDepends = [ network transformers ];
meta = {
homepage = "https://github.com/sakana/haskell-socket-activation";
description = "systemd socket activation library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

19
pkgs/development/libraries/haskell/tasty-ant-xml/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ cabal, genericDeriving, mtl, reducers, stm, tagged, tasty
, transformers, xml
}:
cabal.mkDerivation (self: {
pname = "tasty-ant-xml";
version = "1.0.0.1";
sha256 = "1yn337dr9clzrkr8kpvm7x07lyb3v8pcijrddqah08k0ds8zpzcj";
buildDepends = [
genericDeriving mtl reducers stm tagged tasty transformers xml
];
meta = {
homepage = "http://github.com/ocharles/tasty-ant-xml";
description = "A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

19
pkgs/development/libraries/haskell/tasty-golden/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ cabal, filepath, mtl, optparseApplicative, tagged, tasty
, temporary
}:
cabal.mkDerivation (self: {
pname = "tasty-golden";
version = "2.2";
sha256 = "0z49w4ksbbih3x0j170pfy93r2d68jw34hdni4s2p43kds52cakb";
buildDepends = [
filepath mtl optparseApplicative tagged tasty temporary
];
meta = {
homepage = "https://github.com/feuerbach/tasty-golden";
description = "Golden tests support for tasty";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

15
pkgs/development/libraries/haskell/tasty-hspec/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ cabal, hspec, tasty }:
cabal.mkDerivation (self: {
pname = "tasty-hspec";
version = "0.1";
sha256 = "1pf4ffaqy0f25a2sjirg5g4gdcfslapwq4mm0pkdsysmh9bv1f64";
buildDepends = [ hspec tasty ];
meta = {
homepage = "http://github.com/mitchellwrosen/tasty-hspec";
description = "Hspec support for the Tasty test framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

1
pkgs/development/libraries/haskell/tasty-hunit/default.nix
View file

@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
description = "HUnit support for the Tasty test framework";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

14
pkgs/development/libraries/haskell/tasty-quickcheck/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, QuickCheck, random, tagged, tasty }:
cabal.mkDerivation (self: {
pname = "tasty-quickcheck";
version = "0.3.1";
sha256 = "1rajvcq2a1yxdbb4kykvab1p9rnmsd2lgmlk61nd4fxvsvfj5gzn";
buildDepends = [ QuickCheck random tagged tasty ];
meta = {
description = "QuickCheck support for the Tasty test framework";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

1
pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
View file

@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
description = "SmallCheck support for the Tasty test framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

15
pkgs/development/libraries/haskell/tasty-th/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ cabal, languageHaskellExtract, tasty }:
cabal.mkDerivation (self: {
pname = "tasty-th";
version = "0.1.1";
sha256 = "0ndwfz2gq0did6dfjilhdaxzya2qw9gckjkj090cp2rbkahywsga";
buildDepends = [ languageHaskellExtract tasty ];
meta = {
homepage = "http://github.com/bennofs/tasty-th";
description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

1
pkgs/development/libraries/haskell/tasty/default.nix
View file

@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
description = "Modern and extensible testing framework";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

14
pkgs/development/libraries/haskell/traverse-with-class/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, transformers }:
cabal.mkDerivation (self: {
pname = "traverse-with-class";
version = "0.1.1.1";
sha256 = "0agdgnibv8q65av2fkr2qm0air8zqmygwpkl30wmay5mqqknzxiq";
buildDepends = [ transformers ];
meta = {
description = "Generic applicative traversals";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

14
pkgs/development/libraries/haskell/type-eq/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "type-eq";
version = "0.3";
sha256 = "094m8mk4a1iiqgrnqw0yk89rimp5ffj7i4n61nx3lzxqs5mw0kws";
meta = {
homepage = "http://github.com/glehel/type-eq";
description = "Type equality evidence you can carry around";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

14
pkgs/development/libraries/haskell/web-routes-boomerang/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, boomerang, mtl, parsec, text, webRoutes }:
cabal.mkDerivation (self: {
pname = "web-routes-boomerang";
version = "0.28.0";
sha256 = "1xp8p0fkwirrpssb9lnxl7fmlmrql28r2ywaa99gw9cdqxifzbbl";
buildDepends = [ boomerang mtl parsec text webRoutes ];
meta = {
description = "Library for maintaining correctness and composability of URLs within an application";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

23
pkgs/development/libraries/haskell/web-routes/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ cabal, blazeBuilder, httpTypes, HUnit, mtl, parsec, QuickCheck
, split, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, testFrameworkTh, text, utf8String
}:
cabal.mkDerivation (self: {
pname = "web-routes";
version = "0.27.3";
sha256 = "06a3b88gzbn7dr7hff2fjy1q7sxc479ha4g1wqsbjrb2ajrp376q";
buildDepends = [
blazeBuilder httpTypes mtl parsec split text utf8String
];
testDepends = [
HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 testFrameworkTh
];
meta = {
description = "Library for maintaining correctness and composability of URLs within an application";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

22
pkgs/development/libraries/json-c/0.11.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "json-c-0.11";
src = fetchurl {
url = "https://github.com/json-c/json-c/archive/json-c-0.11-20130402.tar.gz";
sha256 = "1m8fy7lbahv1r7yqbhw4pl057sxmmgjihm1fsvc3h66710s2i24r";
};
meta = with stdenv.lib; {
description = "A JSON implementation in C";
homepage = https://github.com/json-c/json-c/wiki;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
longDescription = ''
JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON formatted strings
and parse JSON formatted strings back into the C representation of JSON
objects.
'';
};
}

12
pkgs/development/libraries/json-c/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl}:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "json-c-0.9";
@ -6,9 +6,15 @@ stdenv.mkDerivation rec {
url = "http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz";
sha256 = "0xcl8cwzm860f8m0cdzyw6slwcddni4mraw4shvr3qgqkdn4hakh";
};
meta = {
meta = with stdenv.lib; {
homepage = "http://oss.metaparadigm.com/json-c/";
description = "A JSON implementation in C";
longDescription = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects.";
longDescription = ''
JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON formatted strings
and parse JSON formatted strings back into the C representation of JSON
objects.
'';
platforms = platforms.linux;
};
}

24
pkgs/development/libraries/lgi/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, lua, glib }:
stdenv.mkDerivation {
name = "lgi-0.7.2";
src = fetchurl {
url = https://github.com/pavouk/lgi/archive/0.7.2.tar.gz;
sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn";
};
meta = with stdenv.lib; {
description = "Gobject-introspection based dynamic Lua binding to GObject based libraries";
homepage = https://github.com/pavouk/lgi;
license = "custom";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
buildInputs = [ glib gobjectIntrospection lua pkgconfig ];
preBuild = ''
sed -i "s|/usr/local|$out|" lgi/Makefile
'';
}

23
pkgs/development/libraries/log4cxx/default.nix
View file

@ -2,18 +2,31 @@
, apr, aprutil, db45, expat
}:
stdenv.mkDerivation {
name = "log4cxx-0.10.0";
stdenv.mkDerivation rec {
name = "log4cxx-${version}";
version = "0.10.0";
src = fetchurl {
url = http://apache.mirrors.hoobly.com/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz;
url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz";
sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d";
};
postPatch = ''
sed -i -e '1,/^#include/ {
/^#include/i \
#include <cstdio> \
#include <cstdlib> \
#include <cstring>
}' src/examples/cpp/console.cpp \
src/main/cpp/inputstreamreader.cpp \
src/main/cpp/socketoutputstream.cpp
'';
buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat];
meta = {
homepage = http://logging.apache.org/log4cxx/index.html;
description = "A logging framework for C++ patterned after Apache log4j";
license = stdenv.lib.licenses.asl20;
};
}

4
pkgs/development/libraries/nspr/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
let version = "4.10.1"; in
let version = "4.10.2"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha1 = "bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7";
sha1 = "650e4aa35d58624bc1083ed585c81c4af09cf23c";
};
preConfigure = "cd nspr";

8
pkgs/development/libraries/nss/default.nix
View file

@ -11,17 +11,17 @@ let
secLoadPatch = fetchurl {
name = "security_load.patch";
urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.1-1/85_security_load.patch;
urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.3-1/85_security_load.patch;
sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds";
};
in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.15.2";
version = "3.15.3";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_2_RTM/src/${name}.tar.gz";
sha1 = "2d900c296bf11deabbf833ebd6ecdea549c97a5f";
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_3_RTM/src/${name}.tar.gz";
sha1 = "1d0f6707eda35f6c7be92fe2b0537dc090a8f203";
};
buildInputs = [ nspr perl zlib sqlite ];

38
pkgs/development/libraries/xcb-util-cursor/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ stdenv, fetchurl, bashInteractive, autoconf, automake, libtool, pkgconfig
, git, xlibs, gnum4, libxcb, gperf }:
stdenv.mkDerivation rec {
name = "xcb-util-cursor-0.1.1";
src = fetchurl {
url = "http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.1.tar.gz";
sha256 = "0lkjbcml305imyzr80yb8spjvq6y83v2allk5gc9plkv39zag29z";
};
meta = with stdenv.lib; {
description = "XCB cursor library (libxcursor port)";
homepage = http://cgit.freedesktop.org/xcb/util-cursor;
license = licenses.mit;
maintainer = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
buildInputs = [
autoconf
automake
gnum4
gperf
libtool
libxcb
pkgconfig
xlibs.utilmacros
xlibs.xcbutilimage
xlibs.xcbutilrenderutil
];
configurePhase = ''
sed -i '15 i\
LT_INIT' configure.ac
${bashInteractive}/bin/bash autogen.sh --prefix="$out"
'';
}

174
pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 Normal file
View file

@ -0,0 +1,174 @@
# ===========================================================================
# http://autoconf-archive.cryp.to/ax_compare_version.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
#
# DESCRIPTION
#
# This macro compares two version strings. Due to the various number of
# minor-version numbers that can exist, and the fact that string
# comparisons are not compatible with numeric comparisons, this is not
# necessarily trivial to do in a autoconf script. This macro makes doing
# these comparisons easy.
#
# The six basic comparisons are available, as well as checking equality
# limited to a certain number of minor-version levels.
#
# The operator OP determines what type of comparison to do, and can be one
# of:
#
# eq - equal (test A == B)
# ne - not equal (test A != B)
# le - less than or equal (test A <= B)
# ge - greater than or equal (test A >= B)
# lt - less than (test A < B)
# gt - greater than (test A > B)
#
# Additionally, the eq and ne operator can have a number after it to limit
# the test to that number of minor versions.
#
# eq0 - equal up to the length of the shorter version
# ne0 - not equal up to the length of the shorter version
# eqN - equal up to N sub-version levels
# neN - not equal up to N sub-version levels
#
# When the condition is true, shell commands ACTION-IF-TRUE are run,
# otherwise shell commands ACTION-IF-FALSE are run. The environment
# variable 'ax_compare_version' is always set to either 'true' or 'false'
# as well.
#
# Examples:
#
# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
#
# would both be true.
#
# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
#
# would both be false.
#
# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
#
# would be true because it is only comparing two minor versions.
#
# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
#
# would be true because it is only comparing the lesser number of minor
# versions of the two values.
#
# Note: The characters that separate the version numbers do not matter. An
# empty string is the same as version 0. OP is evaluated by autoconf, not
# configure, so must be a string, not a variable.
#
# The author would like to acknowledge Guido Draheim whose advice about
# the m4_case and m4_ifvaln functions make this macro only include the
# portions necessary to perform the specific comparison specified by the
# OP argument in the final configure script.
#
# LICENSE
#
# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved.
dnl #########################################################################
AC_DEFUN([AX_COMPARE_VERSION], [
AC_PROG_AWK
# Used to indicate true or false condition
ax_compare_version=false
# Convert the two version strings to be compared into a format that
# allows a simple string comparison. The end result is that a version
# string of the form 1.12.5-r617 will be converted to the form
# 0001001200050617. In other words, each number is zero padded to four
# digits, and non digits are removed.
AS_VAR_PUSHDEF([A],[ax_compare_version_A])
A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-e 's/[[^0-9]]//g'`
AS_VAR_PUSHDEF([B],[ax_compare_version_B])
B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-e 's/[[^0-9]]//g'`
dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
dnl # then the first line is used to determine if the condition is true.
dnl # The sed right after the echo is to remove any indented white space.
m4_case(m4_tolower($2),
[lt],[
ax_compare_version=`echo "x$A
x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
],
[gt],[
ax_compare_version=`echo "x$A
x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
],
[le],[
ax_compare_version=`echo "x$A
x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
],
[ge],[
ax_compare_version=`echo "x$A
x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
],[
dnl Split the operator from the subversion count if present.
m4_bmatch(m4_substr($2,2),
[0],[
# A count of zero means use the length of the shorter version.
# Determine the number of characters in A and B.
ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
# Set A to no more than B's length and B to no more than A's length.
A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
],
[[0-9]+],[
# A count greater than zero means use only that many subversions
A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
],
[.+],[
AC_WARNING(
[illegal OP numeric parameter: $2])
],[])
# Pad zeros at end of numbers to make same length.
ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
B="$B`echo $A | sed 's/./0/g'`"
A="$ax_compare_version_tmp_A"
# Check for equality or inequality as necessary.
m4_case(m4_tolower(m4_substr($2,0,2)),
[eq],[
test "x$A" = "x$B" && ax_compare_version=true
],
[ne],[
test "x$A" != "x$B" && ax_compare_version=true
],[
AC_WARNING([illegal OP parameter: $2])
])
])
AS_VAR_POPDEF([A])dnl
AS_VAR_POPDEF([B])dnl
dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
if test "$ax_compare_version" = "true" ; then
m4_ifvaln([$4],[$4],[:])dnl
m4_ifvaln([$5],[else $5])dnl
fi
]) dnl AX_COMPARE_VERSION

44
pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 Normal file
View file

@ -0,0 +1,44 @@
# XCB_UTIL_COMMON(xcb-required-version, xcb-proto-required-version)
# -----------------------------------------------------------------
#
# Defines default options for xcb-util libraries. xorg/util/macros >=
# 1.6.0 is required for cross-platform compiler flags and to build
# library documentation.
#
AC_DEFUN([XCB_UTIL_COMMON], [
m4_ifndef([AX_COMPARE_VERSION],
[m4_fatal([could not find AX_COMPARE_VERSION in macros search path])])
AC_REQUIRE([AC_PROG_LIBTOOL])
# Define header files and pkgconfig paths
xcbincludedir='${includedir}/xcb'
AC_SUBST(xcbincludedir)
pkgconfigdir='${libdir}/pkgconfig'
AC_SUBST(pkgconfigdir)
# Check xcb version
PKG_CHECK_MODULES(XCB, xcb >= [$1])
# Check version of xcb-proto that xcb was compiled against
xcbproto_required=[$2]
AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required])
xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb`
AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes",
xcbproto_ok="no")
AC_MSG_RESULT([$xcbproto_ok])
if test $xcbproto_ok = no; then
AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs to be compiled against version $xcbproto_required or higher])
fi
# Call macros from Xorg util-macros
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.6.0 or later before running autoconf/autogen])])
XORG_MACROS_VERSION([1.6.0])
XORG_DEFAULT_OPTIONS
XORG_ENABLE_DEVEL_DOCS
XORG_WITH_DOXYGEN
]) # XCB_UTIL_COMMON

24
pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 Normal file
View file

@ -0,0 +1,24 @@
# XCB_UTIL_M4_WITH_INCLUDE_PATH
# ------------------------------
#
# This macro attempts to locate an m4 macro processor which supports
# -I option and is only useful for modules relying on M4 in order to
# expand macros in source code files.
#
# M4: variable holding the path to an usable m4 program.
#
# This macro requires Autoconf 2.62 or later as it is relying upon
# AC_PATH_PROGS_FEATURE_CHECK macro. NOTE: As soon as the minimum
# required version of Autoconf for Xorg is bumped to 2.62, this macro
# is supposed to be shipped with xorg/util/macros.
#
AC_DEFUN([XCB_UTIL_M4_WITH_INCLUDE_PATH], [
AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
[AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
[[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
[AC_MSG_ERROR([could not find m4 that supports -I option])],
[$PATH:/usr/gnu/bin])])
AC_SUBST([M4], [$ac_cv_path_M4])
]) # XCB_UTIL_M4_WITH_INCLUDE_PATH

4
pkgs/development/libraries/xmlrpc-c/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, curl }:
stdenv.mkDerivation rec {
name = "xmlrpc-c-1.25.25";
name = "xmlrpc-c-1.25.26";
src = fetchurl {
url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
sha256 = "1sk33q4c6liza920rp4w803cfq0a79saq7fg1yjsp8hks7q011ml";
sha256 = "1f82vsdkldhk1sfqyh6z0ylp5769x4fx3rnd2hw0c6fhx8swcmgj";
};
buildInputs = [ curl ];

6
pkgs/development/python-modules/buildout-nix/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, buildPythonPackage }:
buildPythonPackage {
name = "zc.buildout-nix-2.2.0";
name = "zc.buildout-nix-2.2.1";
src = fetchurl {
url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.0.tar.gz";
md5 = "771dd9807da7d5ef5bb998991c5fdae1";
url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.1.tar.gz";
md5 = "476a06eed08506925c700109119b6e41";
};
patches = [ ./nix.patch ];

4
pkgs/development/tools/misc/swig/2.x.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pcre }:
stdenv.mkDerivation rec {
name = "swig-2.0.4";
name = "swig-2.0.11";
src = fetchurl {
url = "mirror://sourceforge/swig/${name}.tar.gz";
sha256 = "12pcw4whi36vd41c43v8c62bn7vnq331hmvzsrg8wvyj61vi2fkn";
sha256 = "0kj21b6syp62vx68r1j6azv9033kng68pxm1k79pm4skkzr0ny33";
};
buildInputs = [ pcre ];

6
pkgs/games/sdlmame/default.nix
View file

@ -3,17 +3,17 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
version = "0.150.u0-1";
version = "0.151.u0-1";
name = "sdlmame-${version}";
src = if stdenv.system == "x86_64-linux"
then fetchurl {
url = "ftp://ftp.archlinux.org/community/os/x86_64/${name}-x86_64.pkg.tar.xz";
sha256 = "0393xnzrzq53szmicn96lvapm66wmlykdxaa1n7smx8a0mcz0kah";
sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9";
}
else fetchurl {
url = "ftp://ftp.archlinux.org/community/os/i686/${name}-i686.pkg.tar.xz";
sha256 = "0js67w2szd0qs7ycgxb3bbmcdziv1fywyd9ihra2f6bq5rhcs2jp";
sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7";
};
buildPhase = ''

4
pkgs/games/xonotic/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }:
stdenv.mkDerivation rec {
name = "xonotic-0.5.0";
name = "xonotic-0.7.0";
src = fetchurl {
url = "http://dl.xonotic.org/${name}.zip";
sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq";
sha256 = "21a5fb5493c269cd3843789cb8598f952d4196e8bc71804b9bd5808b646542c6";
};
# Commented out things needed to build cl-release because of errors.

4
pkgs/os-specific/linux/kernel/linux-3.11.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.11.7";
version = "3.11.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1nb93pchv72c7jibv1kvkmgkg2556gb9a0xx21nf9mclf46a9dx9";
sha256 = "0g2c7zzgsrwg6y6j8rn3sn7nx464857i7w0575b1lz24493cgdna";
};
features.iwlwifi = true;

10
pkgs/servers/http/lighttpd/default.nix
View file

@ -4,12 +4,12 @@
assert enableMagnet -> lua5 != null;
stdenv.mkDerivation {
name = "lighttpd-1.4.32";
stdenv.mkDerivation rec {
name = "lighttpd-1.4.33";
src = fetchurl {
url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.32.tar.xz;
sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k";
url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
sha256 = "0331671snhhf48qb43mfb6l85v2rc3ryd3qvz56s8z454gfax1i8";
};
buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
@ -27,6 +27,6 @@ stdenv.mkDerivation {
homepage = http://www.lighttpd.net/;
license = "BSD";
platforms = platforms.linux;
maintainers = [maintainers.bjornfor];
maintainers = [ maintainers.bjornfor ];
};
}

17
pkgs/servers/http/nginx/default.nix
View file

@ -1,6 +1,15 @@
{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false, syslog ? false }:
{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat
, rtmp ? false
, fullWebDAV ? false
, syslog ? false}:
let
rtmp-ext = fetchgit {
url = git://github.com/arut/nginx-rtmp-module.git;
rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1";
sha256 = "03ikfd2l8mzsjwx896l07rdrw5jn7jjfdiyl572yb9jfrnk48fwi";
};
dav-ext = fetchgit {
url = git://github.com/arut/nginx-dav-ext-module.git;
rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d";
@ -22,7 +31,8 @@ stdenv.mkDerivation rec {
sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf";
};
buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat;
buildInputs = [ openssl zlib pcre libxml2 libxslt
] ++ stdenv.lib.optional fullWebDAV expat;
patches = if syslog then [ "${syslog-ext}/syslog_1.4.0.patch" ] else [];
@ -35,7 +45,8 @@ stdenv.mkDerivation rec {
"--with-http_secure_link_module"
# Install destination problems
# "--with-http_perl_module"
] ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}"
] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}"
++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}"
++ stdenv.lib.optional syslog "--add-module=${syslog-ext}";
preConfigure = ''

6
pkgs/servers/mpd/default.nix
View file

@ -27,10 +27,10 @@ let
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
in stdenv.mkDerivation rec {
name = "mpd-0.17.4";
name = "mpd-0.18.3";
src = fetchurl {
url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
sha256 = "06diyprg65xx0c0bgxdwlgrc5bhwy6cf39rabwnv9ikhimh94ir3";
url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
sha256 = "177h23vqa59lm1fid883z9y5qn7kfb57yda6p44zva5hh85xczgh";
};
buildInputs = [ pkgconfig glib ]

23
pkgs/stdenv/generic/default.nix
View file

@ -20,6 +20,8 @@ let
allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null);
stdenvGenerator = setupScript: rec {
# The stdenv that we are producing.
@ -51,12 +53,20 @@ let
# Add a utility function to produce derivations that use this
# stdenv and its shell.
mkDerivation = attrs:
let
pos =
if attrs.meta.description or null != null then
unsafeGetAttrPos "description" attrs.meta
else
unsafeGetAttrPos "name" attrs;
pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
in
if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then
throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate"
throw "package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate"
else if !allowBroken && attrs.meta.broken or false then
throw "you can't use package ‘${attrs.name}’ because it has been marked as broken"
throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken"
else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
throw "the package ‘${attrs.name}’ is not supported on ‘${result.system}’"
throw "the package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’"
else
lib.addPassthru (derivation (
(removeAttrs attrs ["meta" "passthru" "crossAttrs"])
@ -89,8 +99,11 @@ let
# but it's not part of the actual derivation, i.e., it's not
# passed to the builder and is not a dependency. But since we
# include it in the result, it *is* available to nix-env for
# queries.
meta = attrs.meta or {};
# queries. We also a meta.position attribute here to
# identify the source location of the package.
meta = attrs.meta or {} // (if pos != null then {
position = pos.file + ":" + (toString pos.line);
} else {});
passthru = attrs.passthru or {};
} //
# Pass through extra attributes that are not inputs, but

54
pkgs/tools/filesystems/yandex-disk/default.nix Normal file
View file

@ -0,0 +1,54 @@
{ stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }:
let
p = if stdenv.is64bit then {
arch = "x86_64";
gcclib = "${stdenv.gcc.gcc}/lib64";
sha256 = "1fmmlvvh97d60n9k08bn4k6ghwr3yhs8sib82025nwpw1sq08vim";
}
else {
arch = "i386";
gcclib = "${stdenv.gcc.gcc}/lib";
sha256 = "3940420bd9d1fe1ecec1a117bfd9d21d545bca59f5e0a4364304ab808c976f7f";
};
in
stdenv.mkDerivation rec {
name = "yandex-disk-0.1.2.481";
src = fetchurl {
url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
sha256 = p.sha256;
};
builder = writeText "builder.sh" ''
. $stdenv/setup
mkdir -pv $out/bin
mkdir -pv $out/share
mkdir -pv $out/etc
mkdir -pv unpacked
cd unpacked
${rpm}/bin/rpm2cpio $src | ${cpio}/bin/cpio -imd
cp -r -t $out/bin usr/bin/*
cp -r -t $out/share usr/share/*
cp -r -t $out/etc etc/*
sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \
$out/etc/bash_completion.d/yandex-disk-completion.bash
${patchelf}/bin/patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "${zlib}/lib:${p.gcclib}" \
$out/bin/yandex-disk
'';
meta = {
homepage = http://help.yandex.com/disk/cli-clients.xml;
description = "Yandex.Disk is a free cloud file storage service";
maintainers = with stdenv.lib.maintainers; [smironov];
platforms = ["i686-linux" "x86_64-linux"];
license = stdenv.lib.licenses.unfree;
};
}

37
pkgs/tools/misc/direnv/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ fetchurl, stdenv, go }:
let
version = "2.1.0";
in
stdenv.mkDerivation {
name = "direnv-${version}";
src = fetchurl {
url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz";
name = "direnv-${version}.tar.gz";
sha256 = "4dad14e53aa5a20fd11cdbb907c19a05f16464172af302981adb410bd691cefe";
};
buildInputs = [ go ];
buildPhase = "make";
installPhase = "make install DESTDIR=$out";
meta = {
description = "a shell extension that manages your environment";
longDescription = ''
Once hooked into your shell direnv is looking for an .envrc file in your
current directory before every prompt.
If found it will load the exported environment variables from that bash
script into your current environment, and unload them if the .envrc is
not reachable from the current path anymore.
In short, this little tool allows you to have project-specific
environment variables.
'';
homepage = http://direnv.net;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.zimbatm ];
};
}

49
pkgs/tools/misc/smc/default.nix Normal file
View file

@ -0,0 +1,49 @@
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
name = "smc-6.3.0";
src = fetchurl {
url = "mirror://sourceforge/project/smc/smc/6_3_0/smc_6_3_0.tgz";
sha256 = "0arzi8kc4vycp1ccf0v87p08cdpylwhx4za2pzvp08vkfwi8zc7z";
};
# Prebuilt Java package.
installPhase = ''
mkdir -p "$out/bin"
mkdir -p "$out/share/smc"
mkdir -p "$out/share/smc/lib"
mkdir -p "$out/share/icons"
mkdir -p "$out/lib/java"
cp bin/Smc.jar "$out/lib/java/"
cp -r examples/ docs/ tools/ README.txt LICENSE.txt "$out/share/smc/"
cp -r lib/* "$out/share/smc/lib/"
cp misc/smc.ico "$out/share/icons/"
cat > "$out/bin/smc" << EOF
#!${stdenv.shell}
${jre}/bin/java -jar "$out/lib/java/Smc.jar" "\$@"
EOF
chmod a+x "$out/bin/smc"
'';
meta = with stdenv.lib; {
description = "Generate state machine code from text input (state diagram)";
longDescription = ''
SMC (State Machine Compiler) takes a text input file describing states,
events and actions of a state machine and generates source code that
implements the state machine.
SMC supports many target languages:
C, C++, DotNet, Groovy, java, Java, JavaScript, Lua, ObjC, Perl, Php,
Python, Ruby, Scala, Tcl.
SMC can also generate GraphViz state diagrams from the input file.
'';
homepage = http://smc.sourceforge.net/;
license = licenses.mpl11;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

4
pkgs/tools/misc/ttmkfdir/default.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "ttf-mkfontdir-3.0.9-6";
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq";
};
@ -12,7 +12,7 @@ stdenv.mkDerivation {
# who knows more about C/C++ ..
patches =
[ (fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz;
url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz;
sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633";
})

35
pkgs/tools/networking/badvpn/default.nix Normal file
View file

@ -0,0 +1,35 @@
{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash}:
let
s = # Generated upstream information
rec {
baseName="badvpn";
version="1.999.128";
name="${baseName}-${version}";
hash="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn";
url="http://badvpn.googlecode.com/files/badvpn-1.999.128.tar.bz2";
sha256="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn";
};
buildInputs = [
cmake openssl nss pkgconfig nspr
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
preConfigure = ''
find . -name '*.sh' -exec sed -e 's@#!/bin/sh@${stdenv.shell}@' -i '{}' ';'
find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
'';
meta = {
inherit (s) version;
description = ''A set of network-related (mostly VPN-related) tools'';
license = stdenv.lib.licenses.bsd3 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

3
pkgs/tools/networking/badvpn/default.upstream Normal file
View file

@ -0,0 +1,3 @@
url http://gc.codehum.com/p/badvpn/downloads/list
version_link '[.]tar[.][a-z0-9]+$'
process 'gc.codehum.com//' ''

4
pkgs/tools/networking/curl/default.nix
View file

@ -13,11 +13,11 @@ assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec {
name = "curl-7.30.0";
name = "curl-7.33.0";
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "04dgm9aqvplsx43n8xin5rkr8mwmc6mdd1gcp80jda5yhw1l273b";
sha256 = "1cyiali7jq613qz5zb28myhywrdi35dngniwvknmh9lyjk6y9z8a";
};
# Zlib and OpenSSL must be propagated because `libcurl.la' contains

6
pkgs/tools/security/ccid/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
stdenv.mkDerivation rec {
name = "ccid-1.4.9";
name = "ccid-1.4.13";
src = fetchurl {
url = "https://alioth.debian.org/frs/download.php/3866/${name}.tar.bz2";
sha256 = "1dj0cw4js4ab678l94rf9p8a8gppkf1hm66qhmq5ajra6r5nv3m9";
url = "http://pkgs.fedoraproject.org/repo/pkgs/pcsc-lite-ccid/ccid-1.4.13.tar.bz2/89c167a873df1f8bc0dc907ce209e5ff/ccid-1.4.13.tar.bz2";
sha256 = "1w0mxb5qzps9x2fcggv958mwgwmvfxxj4nspxs67fa7qg7r6yxar";
};
patchPhase = ''

1
pkgs/tools/security/prey/default.nix
View file

@ -10,6 +10,7 @@ let
modulesSrc = fetchgit {
url = "git://github.com/prey/prey-bash-client-modules.git";
rev = "aba260ef110834cb2e92923a31f50c15970639ee";
sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30";
};
in stdenv.mkDerivation rec {
name = "prey-bash-client-${version}";

6
pkgs/tools/text/xml/basex/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }:
stdenv.mkDerivation rec {
name = "basex-7.7";
name = "basex-7.7.2";
src = fetchurl {
url = "http://files.basex.org/releases/7.7/BaseX77.zip";
sha256 = "1wnndq8lcnfx29bc3j2sgswk6dxgv2nln2chmwbf7h4a05fcavdj";
url = "http://files.basex.org/releases/7.7.2/BaseX772.zip";
sha256 = "1rh91rzgca1waq8jnd3ard1r04qlalc2qqrawmrahwxgf3f16f4a";
};
buildInputs = [ unzip jre ];

4
pkgs/tools/typesetting/asciidoc/default.nix
View file

@ -128,11 +128,11 @@ let
in
stdenv.mkDerivation rec {
name = "asciidoc-8.6.8";
name = "asciidoc-8.6.9";
src = fetchurl {
url = "mirror://sourceforge/asciidoc/${name}.tar.gz";
sha256 = "ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4";
sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq";
};
buildInputs = [ python unzip ];

5
pkgs/tools/typesetting/tex/texlive/default.nix
View file

@ -6,8 +6,8 @@ rec {
};
texmfSrc = fetchurl {
url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20130918.orig.tar.xz;
sha256 = "0h7x49zsd2gs8fr28f4h04dv5m8p2mpgqxk2vvl5xlf4wwxxbm2p";
url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20131112.orig.tar.xz;
sha256 = "1zak95xh35bnzr3hjrjaxg0yisyw8g3xcym0ywsspc4dxpn1qgk1";
};
langTexmfSrc = fetchurl {
@ -133,4 +133,3 @@ rec {
platforms = platforms.unix;
};
}

31
pkgs/top-level/all-packages.nix
View file

@ -517,6 +517,8 @@ let
babeld = callPackage ../tools/networking/babeld { };
badvpn = callPackage ../tools/networking/badvpn {};
banner = callPackage ../games/banner {};
barcode = callPackage ../tools/graphics/barcode {};
@ -551,6 +553,8 @@ let
ditaa = callPackage ../tools/graphics/ditaa { };
direnv = callPackage ../tools/misc/direnv { };
dlx = callPackage ../misc/emulators/dlx { };
eggdrop = callPackage ../tools/networking/eggdrop { };
@ -1409,6 +1413,8 @@ let
newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { };
ngrok = callPackage ../tools/misc/ngrok { };
mpack = callPackage ../tools/networking/mpack { };
@ -3317,6 +3323,8 @@ let
scsh = callPackage ../development/interpreters/scsh { };
scheme48 = callPackage ../development/interpreters/scheme48 { };
spidermonkey = callPackage ../development/interpreters/spidermonkey { };
spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
@ -3760,6 +3768,8 @@ let
buildc2xml = false;
};
smc = callPackage ../tools/misc/smc { };
sparse = callPackage ../development/tools/analysis/sparse { };
speedtest_cli = callPackage ../tools/networking/speedtest-cli { };
@ -4573,7 +4583,9 @@ let
json_glib = callPackage ../development/libraries/json-glib { };
json_c = callPackage ../development/libraries/json-c { };
json-c-0-9 = callPackage ../development/libraries/json-c { };
json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { };
json_c = json-c-0-9;
jsoncpp = callPackage ../development/libraries/jsoncpp { };
@ -4603,6 +4615,10 @@ let
libpng = libpng12;
};
lgi = callPackage ../development/libraries/lgi {
lua = lua5_1;
};
lib3ds = callPackage ../development/libraries/lib3ds { };
libaacs = callPackage ../development/libraries/libaacs { };
@ -5847,6 +5863,8 @@ let
xbase = callPackage ../development/libraries/xbase { };
xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { };
xineLib = callPackage ../development/libraries/xine-lib { };
xautolock = callPackage ../misc/screensavers/xautolock { };
@ -7412,10 +7430,15 @@ let
avxsynth = callPackage ../applications/video/avxsynth { };
awesome = callPackage ../applications/window-managers/awesome {
awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix {
lua = lua5;
cairo = cairo.override { xcbSupport = true; };
};
awesome-3-5 = callPackage ../applications/window-managers/awesome {
lua = lua5_1;
cairo = cairo.override { xcbSupport = true; };
};
awesome = awesome-3-5;
baresip = callPackage ../applications/networking/instant-messengers/baresip {};
@ -7914,6 +7937,8 @@ let
gtksharp = gtksharp1;
};
fuze = callPackage ../applications/networking/instant-messengers/fuze {};
get_iplayer = callPackage ../applications/misc/get_iplayer {};
gimp_2_6 = callPackage ../applications/graphics/gimp {
@ -10280,6 +10305,8 @@ let
yafc = callPackage ../applications/networking/yafc { };
yandex-disk = callPackage ../tools/filesystems/yandex-disk { };
myEnvFun = import ../misc/my-env {
inherit substituteAll pkgs;
inherit (stdenv) mkDerivation;

44
pkgs/top-level/haskell-packages.nix
View file

@ -541,6 +541,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
ariadne = callPackage ../development/libraries/haskell/ariadne {
Cabal = self.Cabal_1_18_1_2;
};
arithmoi = callPackage ../development/libraries/haskell/arithmoi {};
arrows = callPackage ../development/libraries/haskell/arrows {};
@ -588,6 +592,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
benchpress = callPackage ../development/libraries/haskell/benchpress {};
bert = callPackage ../development/libraries/haskell/bert {};
bifunctors = callPackage ../development/libraries/haskell/bifunctors {};
bimap = callPackage ../development/libraries/haskell/bimap {};
@ -596,6 +602,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {};
binary = self.binary_0_7_1_0;
binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {};
binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {};
@ -895,6 +903,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
digestiveFunctorsSnap = callPackage ../development/libraries/haskell/digestive-functors-snap {};
digits = callPackage ../development/libraries/haskell/digits {};
dimensional = callPackage ../development/libraries/haskell/dimensional {};
dimensionalTf = callPackage ../development/libraries/haskell/dimensional-tf {};
@ -957,6 +967,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
either = callPackage ../development/libraries/haskell/either {};
EitherT = callPackage ../development/libraries/haskell/EitherT {};
esqueleto = callPackage ../development/libraries/haskell/esqueleto {};
exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
@ -996,6 +1008,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
fileEmbed = callPackage ../development/libraries/haskell/file-embed {};
filemanip = callPackage ../development/libraries/haskell/filemanip {};
flexibleDefaults = callPackage ../development/libraries/haskell/flexible-defaults {};
filestore = callPackage ../development/libraries/haskell/filestore {};
@ -1156,6 +1170,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
mpi = pkgs.openmpi;
};
haskellNames = callPackage ../development/libraries/haskell/haskell-names {};
haskellPackages = callPackage ../development/libraries/haskell/haskell-packages {};
haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {};
haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {};
haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
@ -1171,6 +1189,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
hexpat = callPackage ../development/libraries/haskell/hexpat {};
hseCpp = callPackage ../development/libraries/haskell/hse-cpp {};
HTF = callPackage ../development/libraries/haskell/HTF {};
HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {};
@ -1769,6 +1789,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
QuickCheck2 = self.QuickCheck_2_6;
QuickCheck = self.QuickCheck2;
quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {};
quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {};
quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
qrencode = callPackage ../development/libraries/haskell/qrencode {
@ -1994,6 +2018,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
socketActivation = callPackage ../development/libraries/haskell/socket-activation {};
split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {};
split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {};
split = self.split_0_2_2;
@ -2046,10 +2072,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
tasty = callPackage ../development/libraries/haskell/tasty {};
tastyAntXml = callPackage ../development/libraries/haskell/tasty-ant-xml {};
tastyGolden = callPackage ../development/libraries/haskell/tasty-golden {};
tastyHspec = callPackage ../development/libraries/haskell/tasty-hspec {};
tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {};
tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {};
tastyTh = callPackage ../development/libraries/haskell/tasty-th {};
templateDefault = callPackage ../development/libraries/haskell/template-default {};
temporary = callPackage ../development/libraries/haskell/temporary {};
@ -2125,6 +2161,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {};
traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {};
trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix {
parsers = self.parsers_0_9;
};
@ -2133,6 +2171,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
tuple = callPackage ../development/libraries/haskell/tuple {};
typeEq = callPackage ../development/libraries/haskell/type-eq {};
typeEquality = callPackage ../development/libraries/haskell/type-equality {};
typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {};
@ -2250,6 +2290,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
};
WebBitsHtml = self.WebBitsHtml_1_0_2;
webRoutes = callPackage ../development/libraries/haskell/web-routes {};
webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};
CouchDB = callPackage ../development/libraries/haskell/CouchDB {};
wlPprint = callPackage ../development/libraries/haskell/wl-pprint {};

698
pkgs/top-level/node-packages-generated.nix
View file

File diff suppressed because it is too large Load diff

2
pkgs/top-level/node-packages.nix
View file

@ -19,7 +19,7 @@ rec {
unpackFile ${src}
chmod -R +w */
mv */ package 2>/dev/null || true
sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e "s/:\s*\"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json
sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e "s/:\s*\"\(https\?\|git\(\+\(ssh\|http\|https\)\)\?\):\/\/[^\"]*\"/: \"*\"/" package/package.json
mv */ $out
'';

71
pkgs/top-level/python-packages.nix
View file

@ -126,9 +126,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
inherit python buildPythonPackage pygobject pycairo;
};
# A patched version of buildout, useful for buildout based development on Nix
zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
# packages defined here
aafigure = buildPythonPackage rec {
@ -725,7 +722,26 @@ pythonPackages = modules // import ./python-packages-generated.nix {
buildout = zc_buildout;
buildout152 = zc_buildout152;
# A patched version of buildout, useful for buildout based development on Nix
zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
zc_buildout = zc_buildout171;
zc_buildout2 = zc_buildout221;
zc_buildout221 = buildPythonPackage rec {
name = "zc.buildout-2.2.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
md5 = "476a06eed08506925c700109119b6e41";
};
meta = {
homepage = "http://www.buildout.org";
description = "A software build and configuration system";
license = pkgs.lib.licenses.zpt21;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
};
zc_buildout171 = buildPythonPackage rec {
name = "zc.buildout-1.7.1";
@ -2128,13 +2144,15 @@ pythonPackages = modules // import ./python-packages-generated.nix {
};
};
django = buildPythonPackage rec {
django = django_1_6;
django_1_6 = buildPythonPackage rec {
name = "Django-${version}";
version = "1.4.1";
version = "1.6";
src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz";
sha256 = "16s0anvpaccbqmdrhl71z73k0dy2sl166nnc2fbd5lshlgmj13ad";
url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz";
sha256 = "165bd5wmv2an9h365d12k0112z0l375dxsy7dlxa7r8kyg4gvnfk";
};
# error: invalid command 'test'
@ -2146,6 +2164,41 @@ pythonPackages = modules // import ./python-packages-generated.nix {
};
};
django_1_5 = buildPythonPackage rec {
name = "Django-${version}";
version = "1.5.5";
src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz";
sha256 = "07fp8ycx76q2nz96mxld1svvpfsrivjgpql0mr20r7gwzcfrrrka";
};
# error: invalid command 'test'
doCheck = false;
meta = {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
};
};
django_1_4 = buildPythonPackage rec {
name = "Django-${version}";
version = "1.4.10";
src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz";
sha256 = "1pi9mi14f19xlp29j2c8dz8rs749c1m41d9j1i0b3nlz0cy0h7rx";
};
# error: invalid command 'test'
doCheck = false;
meta = {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
};
};
django_1_3 = buildPythonPackage rec {
name = "Django-1.3.7";
@ -4266,11 +4319,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
pillow = buildPythonPackage rec {
name = "Pillow-2.1.0";
name = "Pillow-2.2.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip";
md5 = "ec630d8ae15d4a3c4ae7b7efdeac8200";
md5 = "d1d20d3db5d1ab312da0951ff061e6bf";
};
buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ];