Merge master into stdenv-updates

Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát 2014-01-18 14:35:07 +01:00
commit 0a58b512cb
231 changed files with 2911 additions and 1982 deletions

View file

@ -112,7 +112,7 @@ file used by <filename>Makefile.PL</filename>:
buildPerlPackage rec {
name = "BerkeleyDB-0.36";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";
@ -123,7 +123,7 @@ buildPerlPackage rec {
echo "INCLUDE = ${db4}/include" >> config.in
'';
}
</programlisting>
</programlisting>
</para>
@ -233,10 +233,83 @@ twisted = buildPythonPackage {
</section>
<section><title>Java</title>
<section xml:id="ssec-language-java"><title>Java</title>
<para>Java packages should install JAR files in
<filename>$out/lib/java</filename>.</para>
<para>Ant-based Java packages are typically built from source as follows:
<programlisting>
stdenv.mkDerivation {
name = "...";
src = fetchurl { ... };
buildInputs = [ jdk ant ];
buildPhase = "ant";
}
</programlisting>
Note that <varname>jdk</varname> is an alias for the OpenJDK.</para>
<para>JAR files that are intended to be used by other packages should
be installed in <filename>$out/share/java</filename>. The OpenJDK has
a stdenv setup hook that adds any JARs in the
<filename>share/java</filename> directories of the build inputs to the
<envar>CLASSPATH</envar> environment variable. For instance, if the
package <literal>libfoo</literal> installs a JAR named
<filename>foo.jar</filename> in its <filename>share/java</filename>
directory, and another package declares the attribute
<programlisting>
buildInputs = [ jdk libfoo ];
</programlisting>
then <envar>CLASSPATH</envar> will be set to
<filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.</para>
<para>Private JARs
should be installed in a location like
<filename>$out/share/<replaceable>package-name</replaceable></filename>.</para>
<para>If your Java package provides a program, you need to generate a
wrapper script to run it using the OpenJRE. You can use
<literal>makeWrapper</literal> for this:
<programlisting>
buildInputs = [ makeWrapper ];
installPhase =
''
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/foo \
--add-flags "-cp $out/share/java/foo.jar org.foo.Main"
'';
</programlisting>
Note the use of <literal>jre</literal>, which is the part of the
OpenJDK package that contains the Java Runtime Environment. By using
<literal>${jre}/bin/java</literal> instead of
<literal>${jdk}/bin/java</literal>, you prevent your package from
depending on the JDK at runtime.</para>
<para>It is possible to use a different Java compiler than
<command>javac</command> from the OpenJDK. For instance, to use the
Eclipse Java Compiler:
<programlisting>
buildInputs = [ jre ant ecj ];
</programlisting>
(Note that here you dont need the full JDK as an input, but just the
JRE.) The ECJ has a stdenv setup hook that sets some environment
variables to cause Ant to use ECJ, but this doesnt work with all Ant
files. Similarly, you can use the GNU Java Compiler:
<programlisting>
buildInputs = [ gcj ant ];
</programlisting>
Here, Ant will automatically use <command>gij</command> (the GNU Java
Runtime) instead of the OpenJRE.</para>
</section>

View file

@ -25,9 +25,11 @@ with pkgs.lib;
config = {
environment.variables.TZDIR = "/etc/zoneinfo";
environment.variables.TZ = config.time.timeZone;
environment.etc.localtime.source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
environment.etc.localtime =
{ source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
mode = "direct-symlink";
};
environment.etc.zoneinfo.source = "${pkgs.tzdata}/share/zoneinfo";

View file

@ -109,6 +109,7 @@
mongodb = 98;
openldap = 99;
memcached = 100;
cgminer = 101;
# When adding a uid, make sure it doesn't match an existing gid.

View file

@ -168,6 +168,7 @@
./services/networking/ifplugd.nix
./services/networking/iodined.nix
./services/networking/ircd-hybrid/default.nix
./services/networking/kippo.nix
./services/networking/minidlna.nix
./services/networking/nat.nix
./services/networking/networkmanager.nix
@ -213,6 +214,7 @@
./services/torrent/transmission.nix
./services/ttys/gpm.nix
./services/ttys/agetty.nix
./services/ttys/kmscon.nix
./services/web-servers/apache-httpd/default.nix
./services/web-servers/jboss/default.nix
./services/web-servers/lighttpd/default.nix
@ -231,6 +233,7 @@
./services/x11/hardware/multitouch.nix
./services/x11/hardware/synaptics.nix
./services/x11/hardware/wacom.nix
./services/x11/mesa.nix
./services/x11/window-managers/awesome.nix
#./services/x11/window-managers/compiz.nix
./services/x11/window-managers/default.nix

View file

@ -113,6 +113,11 @@ in zipModules ([]
# !!! this hardcodes bash, could we detect from config which shell is actually used?
++ obsolete [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ]
++ obsolete [ "services" "xserver" "driSupport" ] [ "services" "mesa" "driSupport" ]
++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "services" "mesa" "driSupport32Bit" ]
++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "services" "mesa" "s3tcSupport" ]
++ obsolete [ "services" "xserver" "videoDrivers" ] [ "services" "mesa" "videoDrivers" ]
# Options that are obsolete and have no replacement.
++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
++ obsolete' [ "boot" "initrd" "luks" "enable" ]

View file

@ -108,20 +108,21 @@ in
config = mkIf config.services.cgminer.enable {
users.extraUsers = singleton
{ name = cfg.user;
users.extraUsers = optionalAttrs (cfg.user == "cgminer") (singleton
{ name = "cgminer";
uid = config.ids.uids.cgminer;
description = "Cgminer user";
};
});
environment.systemPackages = [ cfg.package ];
systemd.services.cgminer = {
path = [ pkgs.cgminer ];
after = [ "display-manager.target" "network.target" ];
after = [ "network.target" "display-manager.service" ];
wantedBy = [ "multi-user.target" ];
environment = {
environment = {
LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib'';
DISPLAY = ":0";
GPU_MAX_ALLOC_PERCENT = "100";
@ -129,9 +130,11 @@ in
};
serviceConfig = {
ExecStart = "${pkgs.cgminer}/bin/cgminer -T -c ${cgminerConfig}";
ExecStart = "${pkgs.cgminer}/bin/cgminer --syslog --text-only --config ${cgminerConfig}";
User = cfg.user;
RestartSec = 10;
RestartSec = "30s";
Restart = "always";
StartLimitInterval = "1m";
};
};

View file

@ -0,0 +1,115 @@
# NixOS module for kippo honeypot ssh server
# See all the options for configuration details.
#
# Default port is 2222. Recommend using something like this for port redirection to default SSH port:
# networking.firewall.extraCommands = ''
# iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222'';
#
# Lastly: use this service at your own risk. I am working on a way to run this inside a VM.
{ pkgs, config, ... }:
with pkgs.lib;
let
cfg = config.services.kippo;
in
rec {
options = {
services.kippo = {
enable = mkOption {
default = false;
type = types.uniq types.bool;
description = ''Enable the kippo honeypot ssh server.'';
};
port = mkOption {
default = 2222;
type = types.uniq types.int;
description = ''TCP port number for kippo to bind to.'';
};
hostname = mkOption {
default = "nas3";
type = types.string;
description = ''Hostname for kippo to present to SSH login'';
};
varPath = mkOption {
default = "/var/lib/kippo";
type = types.string;
description = ''Path of read/write files needed for operation and configuration.'';
};
logPath = mkOption {
default = "/var/log/kippo";
type = types.string;
description = ''Path of log files needed for operation and configuration.'';
};
pidPath = mkOption {
default = "/run/kippo";
type = types.string;
description = ''Path of pid files needed for operation.'';
};
extraConfig = mkOption {
default = "";
type = types.string;
description = ''Extra verbatim configuration added to the end of kippo.cfg.'';
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs.pythonPackages; [
python twisted pycrypto pyasn1 ];
environment.etc."kippo.cfg".text = ''
# Automatically generated by NixOS.
# See ${pkgs.kippo}/src/kippo.cfg for details.
[honeypot]
log_path = ${cfg.logPath}
download_path = ${cfg.logPath}/dl
filesystem_file = ${cfg.varPath}/honeyfs
filesystem_file = ${cfg.varPath}/fs.pickle
data_path = ${cfg.varPath}/data
txtcmds_path = ${cfg.varPath}/txtcmds
public_key = ${cfg.varPath}/keys/public.key
private_key = ${cfg.varPath}/keys/private.key
ssh_port = ${toString cfg.port}
hostname = ${cfg.hostname}
${cfg.extraConfig}
'';
users.extraUsers = singleton {
name = "kippo";
description = "kippo web server privilege separation user";
};
users.extraGroups = singleton { name = "kippo"; };
systemd.services.kippo = with pkgs; {
description = "Kippo Web Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted}/lib/python2.7/site-packages/:.";
preStart = ''
if [ ! -d ${cfg.varPath}/ ] ; then
mkdir -p ${cfg.pidPath}
mkdir -p ${cfg.logPath}/tty
mkdir -p ${cfg.logPath}/dl
mkdir -p ${cfg.varPath}/keys
cp ${pkgs.kippo}/src/honeyfs ${cfg.varPath} -r
cp ${pkgs.kippo}/src/fs.pickle ${cfg.varPath}/fs.pickle
cp ${pkgs.kippo}/src/data ${cfg.varPath} -r
cp ${pkgs.kippo}/src/txtcmds ${cfg.varPath} -r
chmod u+rw ${cfg.varPath} -R
chmod u+rw ${cfg.pidPath}
chown kippo.kippo ${cfg.varPath} -R
chown kippo.kippo ${cfg.pidPath}
chown kippo.kippo ${cfg.logPath} -R
chmod u+rw ${cfg.logPath} -R
fi
'';
serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
serviceConfig.PermissionsStartOnly = true;
serviceConfig.User = "kippo";
serviceConfig.Group = "kippo";
};
};
}

View file

@ -0,0 +1,74 @@
{ config, pkgs, ... }:
let
inherit (pkgs.lib) mkOption types mkIf optionalString;
cfg = config.services.kmscon;
configDir = pkgs.writeTextFile { name = "kmscon-config"; destination = "/kmscon.conf"; text = cfg.extraConfig; };
in {
options = {
services.kmscon = {
enable = mkOption {
description = ''
Use kmscon as the virtual console instead of gettys.
kmscon is a kms/dri-based userspace virtual terminal implementation.
It supports a richer feature set than the standard linux console VT,
including full unicode support, and when the video card supports drm
should be much faster.
'';
type = types.bool;
default = false;
};
hwRender = mkOption {
description = "Whether to use 3D hardware acceleration to render the console.";
type = types.bool;
default = false;
};
extraConfig = mkOption {
description = "Extra contents of the kmscon.conf file.";
type = types.lines;
default = "";
example = "font-size=14";
};
};
};
config = mkIf cfg.enable {
# Largely copied from unit provided with kmscon source
systemd.units."kmsconvt@.service".text = ''
[Unit]
Description=KMS System Console on %I
Documentation=man:kmscon(1)
After=systemd-user-sessions.service
After=plymouth-quit-wait.service
After=systemd-logind.service
Requires=systemd-logind.service
Before=getty.target
Conflicts=getty@%i.service
OnFailure=getty@%i.service
IgnoreOnIsolate=yes
ConditionPathExists=/dev/tty0
[Service]
ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p
UtmpIdentifier=%I
TTYPath=/dev/%I
TTYReset=yes
TTYVHangup=yes
TTYVTDisallocate=yes
X-RestartIfChanged=false
'';
systemd.units."autovt@.service".linkTarget = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
services.kmscon.extraConfig = mkIf cfg.hwRender ''
drm
hwaccel
'';
services.mesa.enable = mkIf cfg.hwRender true;
};
}

View file

@ -60,6 +60,7 @@ in
pkgs.xfce.xfce4session
pkgs.xfce.xfce4settings
pkgs.xfce.xfce4mixer
pkgs.xfce.xfce4screenshooter
pkgs.xfce.xfconf
pkgs.xfce.xfdesktop
pkgs.xfce.xfwm4

View file

@ -103,6 +103,11 @@ let
${cfg.displayManager.sessionCommands}
# Allow the user to execute commands at the beginning of the X session.
if test -f ~/.xprofile; then
source ~/.xprofile
fi
# Allow the user to setup a custom session type.
if test -x ~/.xsession; then
exec ~/.xsession

View file

@ -0,0 +1,117 @@
{ config, pkgs, pkgs_i686, ... }:
let
inherit (pkgs.lib) mkOption types mkIf optional optionals elem optionalString optionalAttrs;
cfg = config.services.mesa;
kernelPackages = config.boot.kernelPackages;
in {
options = {
services.mesa.enable = mkOption {
description = "Whether this configuration requires mesa.";
type = types.bool;
default = false;
internal = true;
};
services.mesa.driSupport = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable accelerated OpenGL rendering through the
Direct Rendering Interface (DRI).
'';
};
services.mesa.driSupport32Bit = mkOption {
type = types.bool;
default = false;
description = ''
On 64-bit systems, whether to support Direct Rendering for
32-bit applications (such as Wine). This is currently only
supported for the <literal>nvidia</literal> driver and for
<literal>mesa</literal>.
'';
};
services.mesa.s3tcSupport = mkOption {
type = types.bool;
default = false;
description = ''
Make S3TC(S3 Texture Compression) via libtxc_dxtn available
to OpenGL drivers. It is essential for many games to work
with FOSS GPU drivers.
Using this library may require a patent license depending on your location.
'';
};
services.mesa.videoDrivers = mkOption {
type = types.listOf types.str;
# !!! We'd like "nv" here, but it segfaults the X server.
default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
example = [ "vesa" ];
description = ''
The names of the video drivers that the mesa should
support. Mesa will try all of the drivers listed
here until it finds one that supports your video card.
'';
};
};
config = mkIf cfg.enable {
system.activationScripts.setup-opengl.deps = [];
system.activationScripts.setup-opengl.text = ''
rm -f /run/opengl-driver{,-32}
${optionalString (!cfg.driSupport32Bit) "ln -sf opengl-driver /run/opengl-driver-32"}
${# !!! The OpenGL driver depends on what's detected at runtime.
if elem "nvidia" cfg.videoDrivers then
''
ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
''
else if elem "nvidiaLegacy173" cfg.videoDrivers then
"ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
else if elem "nvidiaLegacy304" cfg.videoDrivers then
''
ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
''
else if elem "ati_unfree" cfg.videoDrivers then
"ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
else
''
${optionalString cfg.driSupport "ln -sf ${pkgs.mesa_drivers} /run/opengl-driver"}
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"}
''
}
'';
environment.variables.LD_LIBRARY_PATH =
[ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]
++ optional cfg.s3tcSupport "${pkgs.libtxc_dxtn}/lib"
++ optional (cfg.s3tcSupport && cfg.driSupport32Bit) "${pkgs_i686.libtxc_dxtn}/lib";
boot.extraModulePackages =
optional (elem "nvidia" cfg.videoDrivers) kernelPackages.nvidia_x11 ++
optional (elem "nvidiaLegacy173" cfg.videoDrivers) kernelPackages.nvidia_x11_legacy173 ++
optional (elem "nvidiaLegacy304" cfg.videoDrivers) kernelPackages.nvidia_x11_legacy304 ++
optional (elem "virtualbox" cfg.videoDrivers) kernelPackages.virtualboxGuestAdditions ++
optional (elem "ati_unfree" cfg.videoDrivers) kernelPackages.ati_drivers_x11;
boot.blacklistedKernelModules =
optionals (elem "nvidia" cfg.videoDrivers) [ "nouveau" "nvidiafb" ];
environment.etc = (optionalAttrs (elem "ati_unfree" cfg.videoDrivers) {
"ati".source = "${kernelPackages.ati_drivers_x11}/etc/ati";
})
// (optionalAttrs (elem "nvidia" cfg.videoDrivers) {
"OpenCL/vendors/nvidia.icd".source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
});
};
}

View file

@ -22,8 +22,7 @@ let
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
};
driverNames =
optional (cfg.videoDriver != null) cfg.videoDriver ++ cfg.videoDrivers;
driverNames = config.services.mesa.videoDrivers;
drivers = flip map driverNames
(name: { inherit name; driverName = name; } //
@ -182,19 +181,7 @@ in
description = ''
The name of the video driver for your graphics card. This
option is obsolete; please set the
<option>videoDrivers</option> instead.
'';
};
videoDrivers = mkOption {
type = types.listOf types.str;
# !!! We'd like "nv" here, but it segfaults the X server.
default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
example = [ "vesa" ];
description = ''
The names of the video drivers that the X server should
support. The X server will try all of the drivers listed
here until it finds one that supports your video card.
<option>services.mesa.videoDrivers</option> instead.
'';
};
@ -207,38 +194,6 @@ in
'';
};
driSupport = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable accelerated OpenGL rendering through the
Direct Rendering Interface (DRI).
'';
};
driSupport32Bit = mkOption {
type = types.bool;
default = false;
description = ''
On 64-bit systems, whether to support Direct Rendering for
32-bit applications (such as Wine). This is currently only
supported for the <literal>nvidia</literal> driver and for
<literal>mesa</literal>.
'';
};
s3tcSupport = mkOption {
type = types.bool;
default = false;
description = ''
Make S3TC(S3 Texture Compression) via libtxc_dxtn available
to OpenGL drivers. It is essential for many games to work
with FOSS GPU drivers.
Using this library may require a patent license depending on your location.
'';
};
startOpenSSHAgent = mkOption {
type = types.bool;
default = true;
@ -426,6 +381,8 @@ in
###### implementation
config = mkIf cfg.enable {
services.mesa.enable = true;
services.mesa.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
assertions =
[ { assertion = !(cfg.startOpenSSHAgent && cfg.startGnuPGAgent);
@ -440,21 +397,6 @@ in
}
];
boot.extraModulePackages =
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++
optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304 ++
optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
boot.blacklistedKernelModules =
optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ];
environment.variables.LD_LIBRARY_PATH =
[ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]
++ pkgs.lib.optional cfg.s3tcSupport "${pkgs.libtxc_dxtn}/lib"
++ pkgs.lib.optional (cfg.s3tcSupport && cfg.driSupport32Bit) "${pkgs_i686.libtxc_dxtn}/lib";
environment.etc =
(optionals cfg.exportConfiguration
[ { source = "${configFile}";
@ -464,21 +406,7 @@ in
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
}
])
++ (optionals (elem "ati_unfree" driverNames) [
# according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your
# life harder ;) Still it seems to be required
{ source = "${kernelPackages.ati_drivers_x11}/etc/ati";
target = "ati";
}
])
++ (optionals (elem "nvidia" driverNames) [
{ source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
target = "OpenCL/vendors/nvidia.icd";
}
]);
]);
environment.systemPackages =
[ xorg.xorgserver
@ -529,34 +457,6 @@ in
preStart =
''
rm -f /run/opengl-driver{,-32}
${optionalString (!cfg.driSupport32Bit) "ln -sf opengl-driver /run/opengl-driver-32"}
${# !!! The OpenGL driver depends on what's detected at runtime.
if elem "nvidia" driverNames then
''
ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
''
else if elem "nvidiaLegacy173" driverNames then
"ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
else if elem "nvidiaLegacy304" driverNames then
''
ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
''
else if elem "ati_unfree" driverNames then
"ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
else
''
${optionalString cfg.driSupport "ln -sf ${pkgs.mesa_drivers} /run/opengl-driver"}
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"}
''
}
${cfg.displayManager.job.preStart}
rm -f /tmp/.X0-lock

View file

@ -11,13 +11,16 @@ let
systemd = cfg.package;
makeUnit = name: unit:
pkgs.runCommand "unit" { inherit (unit) text; preferLocalBuild = true; }
(if unit.enable then ''
mkdir -p $out
echo -n "$text" > $out/${name}
'' else ''
pkgs.runCommand "unit" ({ preferLocalBuild = true; } // optionalAttrs (unit.linkTarget == null) { inherit (unit) text; })
(if !unit.enable then ''
mkdir -p $out
ln -s /dev/null $out/${name}
'' else if unit.linkTarget != null then ''
mkdir -p $out
ln -s ${unit.linkTarget} $out/${name}
'' else ''
mkdir -p $out
echo -n "$text" > $out/${name}
'');
upstreamUnits =
@ -338,7 +341,7 @@ let
done
for i in ${toString (mapAttrsToList (n: v: v.unit) cfg.units)}; do
ln -s $i/* $out/
ln -fs $i/* $out/
done
for i in ${toString cfg.packages}; do
@ -362,7 +365,7 @@ let
ln -s rescue.target $out/kbrequest.target
mkdir -p $out/getty.target.wants/
ln -s ../getty@tty1.service $out/getty.target.wants/
ln -s ../autovt@tty1.service $out/getty.target.wants/
ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \
../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
@ -416,6 +419,11 @@ in
internal = true;
description = "The generated unit.";
};
linkTarget = mkOption {
default = null;
description = "The file to symlink this target to.";
type = types.nullOr types.path;
};
};
config = {
unit = makeUnit name config;

View file

@ -57,9 +57,13 @@ sub link {
open MODE, "<$_.mode";
my $mode = <MODE>; chomp $mode;
close MODE;
copy "$static/$fn", "$target.tmp" or warn;
chmod oct($mode), "$target.tmp" or warn;
rename "$target.tmp", $target or warn;
if ($mode eq "direct-symlink") {
atomicSymlink readlink("$static/$fn"), $target or warn;
} else {
copy "$static/$fn", "$target.tmp" or warn;
chmod oct($mode), "$target.tmp" or warn;
rename "$target.tmp", $target or warn;
}
} elsif (-l "$_") {
atomicSymlink "$static/$fn", $target or warn;
}

View file

@ -16,6 +16,7 @@
$machine->waitForWindow(qr/Valgrind/);
$machine->sleep(40); # wait until Firefox has finished loading the page
$machine->screenshot("screen");
'';
}

View file

@ -4,19 +4,19 @@
}:
let
version = "3.4.1";
version = "3.4.3";
in
stdenv.mkDerivation {
name = "audacious-${version}";
src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
sha256 = "0wf99b0nrk90fyak4gpwi076qnsrmv1j8958cvi57rxig21lvvap";
sha256 = "04lzwdr1lx6ghbfxzygvnbmdl420w6rm453ds5lyb0hlvzs58d0q";
};
pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
sha256 = "02ivrxs6109nmmz9pkbf9dkm36s2lyp9vfv59sm0acxxd4db71md";
sha256 = "00r88q9fs9a0gicdmk2svcans7igcqgacrw303a5bn44is7pmrmy";
};
buildInputs =
@ -48,7 +48,7 @@ stdenv.mkDerivation {
(
source $stdenv/setup
# gsettings schemas for file dialogues
for file in "$out"/bin/*; do
for file in "$out/bin/"*; do
wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD"
done
)

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
version = "0.3.5";
version = "0.3.6";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "125aa1lmmwjdbzyv13yaax4n6ni7h7v7c7clmjaz7bglzay7xq5w";
sha256 = "13prman3jlh3xz56675vnnnghnmmbxpq8gqdhv5llgd8ggzhmyjn";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];

View file

@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
description = "A Qt application to control the JACK sound server daemon";
homepage = http://qjackctl.sourceforge.net/;
license = "GPL";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }:
stdenv.mkDerivation rec {
name = "streamripper-${version}";
version = "1.64.6";
src = fetchurl {
url = "mirror://sourceforge/streamripper/${name}.tar.gz";
sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
};
buildInputs = [ pkgconfig glib libogg libvorbis ];
meta = with stdenv.lib; {
homepage = http://streamripper.sourceforge.net/;
description = "Application that lets you record streaming mp3 to your hard drive";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ the-kenny ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, patchelf, makeDesktopItem, makeWrapper
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXext, libXrender, zlib
, glib, gtk, libXtst, jre
}:
@ -23,7 +23,7 @@ let
categories = "Application;Development;";
};
buildInputs = [ makeWrapper patchelf ];
buildInputs = [ makeWrapper ];
buildCommand = ''
# Unpack tarball.

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, emacs, texinfo }:
stdenv.mkDerivation rec {
name = "haskell-mode-13.07";
name = "haskell-mode-13.10";
src = fetchurl {
url = "https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz";
sha256 = "15c8ncj9mykkrizy1a8l94gq37s8hj13v3p5rgyaj9z0cwgl85kx";
url = "https://github.com/haskell/haskell-mode/archive/v13.10.tar.gz";
sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b";
};
buildInputs = [ emacs texinfo ];

View file

@ -26,8 +26,8 @@ in
mkdir -p "dist"
cat > build.properties <<EOF
dist.lisp.dir = dist/share/emacs/site-lisp
dist.java.lib.dir = dist/lib/java
dist.jar.jde.file = dist/lib/java/jde.jar
dist.java.lib.dir = dist/share/java
dist.jar.jde.file = dist/share/java/jde.jar
dist.java.src.dir = dist/src/${name}/java
dist.doc.dir dist/doc/${name}
prefix.dir = $out
@ -40,7 +40,7 @@ in
for i in "lisp/"*.el
do
sed -i "$i" -e "s|@out@|$out|g ;
s|@javadir@|$out/lib/java|g ;
s|@javadir@|$out/share/java|g ;
s|@datadir@|$out/share/${name}|g"
done
'';
@ -55,7 +55,7 @@ in
# Move everything that's not a JAR to $datadir. This includes
# `sun_checks.xml', license files, etc.
cd "$out/lib/java"
cd "$out/share/java"
for i in *
do
if echo $i | grep -qv '\.jar''$'

View file

@ -14,7 +14,7 @@ Tell the elisp code about the right Java directory.
- (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
- (oset this checkstyle-jar (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
- (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
+ (let ((jde-java-directory "@out@/lib/java"))
+ (let ((jde-java-directory "@out@/share/java"))
+
+ (oset this bsh-cmd-dir "@datadir@/bsh-commands")
+ (oset this checkstyle-jar (expand-file-name "checkstyle-all.jar" jde-java-directory))
@ -38,7 +38,7 @@ Tell the elisp code about the right Java directory.
- (concat
- (jde-find-jde-data-directory)
- "java/"))
+ (jde-java-directory "@out@/lib/java")
+ (jde-java-directory "@out@/share/java")
(args (append
(unless jde-checkstyle-expanded-properties-file
(jde-checkstyle-get-property-args this))
@ -67,7 +67,7 @@ Tell the elisp code about the right Java directory.
- (jde-java-directory
- (expand-file-name "java"
- (jde-find-jde-data-directory)))
+ (jde-java-directory "@out@/lib/java")
+ (jde-java-directory "@out@/share/java")
(vm-args
(let (args)
(setq args

View file

@ -1,20 +1,20 @@
{ stdenv, fetchurl, ant, jre }:
{ stdenv, fetchurl, ant, jdk }:
let version = "4.4.2"; in
stdenv.mkDerivation {
name = "jedit-4.4.2";
name = "jedit-${version}";
src = fetchurl {
url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2;
url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2";
sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
};
setSourceRoot = ''
sourceRoot=jEdit
'';
buildInputs = [ ant jdk ];
buildPhase = ''
ant build
'';
sourceRoot = "jEdit";
buildPhase = "ant build";
installPhase = ''
mkdir -p $out/share/jEdit
@ -27,7 +27,7 @@ stdenv.mkDerivation {
cp -r macros/* $out/share/jEdit/macros
mkdir -p $out/share/jEdit/doc
cp -r doc/* $out/share/jEdit/doc
sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
mkdir -p $out/share/applications
mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
@ -35,7 +35,7 @@ stdenv.mkDerivation {
patch package-files/linux/jedit << EOF
5a6,8
> # specify the correct JAVA_HOME
> JAVA_HOME=${jre}
> JAVA_HOME=${jdk.jre}/lib/openjdk/jre
>
EOF
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
@ -44,9 +44,7 @@ stdenv.mkDerivation {
chmod +x $out/bin/jedit
'';
buildInputs = [ ant ];
meta = {
meta = {
description = "Mature programmer's text editor (Java based)";
homepage = http://www.jedit.org;
license = "GPL";

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, tk }:
stdenv.mkDerivation rec {
name = "gocr-0.49";
name = "gocr-0.50";
src = fetchurl {
url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz;
sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc";
url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz";
sha256 = "1dgmcpapy7h68d53q2c5d0bpgzgfb2nw2blndnx9qhc7z12149mw";
};
postInstall = ''

View file

@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
buildInputs = [jre unzip];
buildPhase = "";
installPhase = ''
mkdir -p "$out"/{bin,lib/java/zvtm/plugins,share/doc/zvtm}
mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm}
cp overview.html *.license.* "$out/share/doc/zvtm"
cp -r target/* "$out/lib/java/zvtm/"
cp -r target/* "$out/share/java/zvtm/"
echo '#!/bin/sh' > "$out/bin/zgrviewer"
echo "java -jar '$out/lib/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer"
echo "java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer"
chmod a+x "$out/bin/zgrviewer"
'';
meta = {

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, openssl }:
let
version = "6.3.20";
version = "6.3.26";
in
stdenv.mkDerivation {
name="fetchmail-${version}";
src = fetchurl {
url = "http://download.berlios.de/fetchmail/fetchmail-${version}.tar.bz2";
sha256 = "22e94f11d885cb9330a197fd80217d44f65e6b087e4d4b4d83e573adfc24aa7b";
sha256 = "08rafrs1dlr11myr0p99kg4k80qyy0fa63gg3ac88zn49174lwhw";
};
buildInputs = [ openssl ];

View file

@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
version = "3.20130904.1";
version = "3.20140102";
lib = stdenv.lib;
in
@ -32,7 +32,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
sha256 = "1nxycsz49y6801lbrvazzg7qc9q2vpr2ny1sba26f9gwc00c650h";
sha256 = "0nsyfq7j03cg4qq73kw7cxnc7wgbr2m75fqmmll77wyl9cb661lj";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

View file

@ -12,9 +12,9 @@ stdenv.mkDerivation {
sha256 = "1baxwpdvak6nalr943g22z67r1d3fbibbkqvkvvar9xlvrs9gv20";
};
configureFlags = if sslSupport then "--with-ssl" else "";
configureFlags = if sslSupport then "--with-ssl=${openssl}" else "";
buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl;
buildInputs = [ ncurses gzip ];
nativeBuildInputs = [ ncurses ];
crossAttrs = {

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation {
src = fetchurl {
# Note: dropbox doesn't version this file. Annoying.
url = "https://linux.dropbox.com/packages/dropbox.py";
sha256 = "0p1pg8bw6mlhqi5k8y3pgs7byg0kfvq57s53sh188lb5sxvlg7yz";
sha256 = "0505k0xrhbmsv7g5phxxnz5wbff6m5gdsqyxkhd95wdi9d71c43c";
};
buildInputs = [ coreutils python ];

View file

@ -25,9 +25,9 @@ let
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Dropbox client for: ${stdenv.system} not supported!";
version = "2.4.7";
sha256 = if stdenv.system == "x86_64-linux" then "08fh0zx9q83dvivnbx5zr1cwb69ihhlx9mkbd3ikynk1wd8df8n8"
else if stdenv.system == "i686-linux" then "0rhblpahg2axglpi8iavsglffw83rj71qy113wj2dh6q72124j2h"
version = "2.6.2";
sha256 = if stdenv.system == "x86_64-linux" then "0j511nglqg2xngyl78ww7xk09v8yzhghk5cnj6slr9sldy83n7g9"
else if stdenv.system == "i686-linux" then "0n0y0wf313yjas4b89ag613jb80skby1qmfkyy1aazgjancf7v5i"
else throw "Dropbox client for: ${stdenv.system} not supported!";
# relative location where the dropbox libraries are stored

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheAntOpenJDK, jre }:
{ stdenv, fetchurl, ant, jdk }:
let
# The .gitmodules in freenet-official-20130413-eccc9b3198
@ -14,7 +14,7 @@ let
};
in
stdenv.mkDerivation {
name = "freenet-official-20130413-eccc9b3198";
name = "freenet-20130413-eccc9b3198";
src = fetchurl {
url = https://github.com/freenet/fred-official/tarball/eccc9b3198;
@ -29,7 +29,7 @@ stdenv.mkDerivation {
sed '/antcall.*-ext/d' -i build.xml
'';
buildInputs = [ apacheAntOpenJDK jre ];
buildInputs = [ ant jdk ];
buildPhase = "ant package-only";
@ -41,13 +41,13 @@ stdenv.mkDerivation {
cat <<EOF > $out/bin/freenet
#!${stdenv.shell}
${jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
${jdk.jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
-Xmx1024M freenet.node.NodeStarter
EOF
chmod +x $out/bin/freenet
'';
meta = {
meta = {
description = "Decentralised and censorship-resistant network";
homepage = https://freenetproject.org/;
license = "GPLv2+";

View file

@ -4,11 +4,11 @@
, makeWrapper }:
stdenv.mkDerivation rec {
name = "gnunet-0.9.5a";
name = "gnunet-0.10.0";
src = fetchurl {
url = "mirror://gnu/gnunet/${name}.tar.gz";
sha256 = "1mxy1ikv44fia3cybpmiw298x5371a2qh8hr7pi55yg1xqbhfq0x";
sha256 = "0zqpc47kywhjrpphl0palz849khv00ra2gjrfkysp6p0gfsbvd0i";
};
buildInputs = [

View file

@ -1,21 +1,23 @@
{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares, gnutls, libgcrypt
, geoip, heimdal, lua5, gtk, makeDesktopItem
{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
, gnutls, libgcrypt, geoip, heimdal, lua5, gtk, makeDesktopItem, python
}:
let version = "1.10.5"; in
let version = "1.11.2"; in
stdenv.mkDerivation {
name = "wireshark-${version}";
src = fetchurl {
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
sha256 = "1xa1l6z8n1gwnyv5mq4zmyr0afy6s0qpl9wqflg3ipbkjpd908d0";
sha256 = "077hjnmqn44s8dx3pc38bxps5liicjnhzrnf6ky2x60m2cp7ngr3";
};
buildInputs =
[ bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls geoip libnl c-ares gtk ];
buildInputs = [
bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls
geoip libnl c-ares gtk python
];
configureFlags = "--disable-usr-local --enable-packet-editor --with-ssl";
configureFlags = "--disable-usr-local --disable-silent-rules --with-gtk2 --without-gtk3 --without-qt --with-ssl";
desktopItem = makeDesktopItem {
name = "Wireshark";
@ -30,10 +32,12 @@ stdenv.mkDerivation {
postInstall = ''
mkdir -p "$out"/share/applications/
mkdir -p "$out"/share/icons/
cp "$desktopItem"/share/applications/* "$out"/share/applications/
cp "$desktopItem/share/applications/"* "$out/share/applications/"
cp image/wsicon.svg "$out"/share/icons/wireshark.svg
'';
enableParallelBuilding = true;
meta = {
homepage = http://www.wireshark.org/;
description = "a powerful network protocol analyzer";

View file

@ -10,11 +10,11 @@
*/
stdenv.mkDerivation rec {
name = "gnucash-2.4.13";
name = "gnucash-2.4.15";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
sha256 = "0j4m00a3r1hcrhkfjkx3sgi2r4id4wrc639i4s00j35rx80540pn";
sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
};
buildInputs = [

View file

@ -2,7 +2,7 @@
let
download_root = "http://homebank.free.fr/public/";
name = "homebank-4.4";
name = "homebank-4.5.4";
lastrelease = download_root + name + ".tar.gz";
oldrelease = download_root + "old/" + name + ".tar.gz";
in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
urls = [ lastrelease oldrelease ];
sha256 = "1lp7vhimn7aa2b4ik857w7d7rbbqcwlsffk8s8lw4fjyaxrr7f0k";
sha256 = "10xh76mxwbl56xp118gg3b4isv16yvhsvqxwqc28pqqxkpr7vpdk";
};
buildInputs = [ pkgconfig gtk libofx intltool ];

View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl }:
let
version = "2.10";
in stdenv.mkDerivation {
name = "todo.txt-cli-${version}";
src = fetchurl {
url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz";
sha256 = "1agn4zzbizrrylvbfi053b5mpb39bvl1gzziw08xibzfdyi1g55m";
};
installPhase = ''
install -vd $out/bin
install -vm 755 todo.sh $out/bin
install -vd $out/etc/bash_completion.d
install -vm 644 todo_completion $out/etc/bash_completion.d/todo
install -vd $out/etc/todo
install -vm 644 todo.cfg $out/etc/todo/config
'';
meta = {
description = "Simple plaintext todo list manager";
homepage = "http://todotxt.com";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation {
name = "hol_light-20130324";
name = "hol_light-20140112";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = "157";
sha256 = "0d0pbnkw2gb11dn30ggfl91lhdxv86kd1fyiqn170w08n0gi805f";
rev = "179";
sha256 = "1j402s7142fj09bjijrkargwx03fvbdwmn0hgzzmi6s4p1y7gww0";
};
buildInputs = [ ocaml findlib camlp5 ];

View file

@ -2,7 +2,7 @@
let
name = "maxima";
version = "5.31.3";
version = "5.32.1";
searchPath =
stdenv.lib.makeSearchPath "bin"
@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
sha256 = "1g959569plywqaxxp488ylblgkirqg24arwa93dplfxi4h7fc4km";
sha256 = "0krxha1jckgw5s52bjasf7bnkcnq81qyi2k1bcglgqzfp79b44gw";
};
buildInputs = [sbcl texinfo perl makeWrapper];

View file

@ -1,17 +1,18 @@
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa }:
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre
, SDL_image, glew, mesa, boostHeaders
}:
let
name = "gource-0.37";
in
stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
name = "gource-0.40";
src = fetchurl {
url = "http://gource.googlecode.com/files/${name}.tar.gz";
sha256 = "03kd9nn65cl1p2jgn6pvpxmvnfscz3c8jqds90fsc0z37ij2iiyn";
sha256 = "04nirh07xjslqsph557as4s50nlf91bi6v2l7vmbifmkdf90m2cw";
};
buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
buildInputs = [
glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boostHeaders
];
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
@ -31,7 +32,6 @@ stdenv.mkDerivation {
by several third party tools for CVS repositories.
'';
platforms = stdenv.lib.platforms.gnu;
maintainers = [ stdenv.lib.maintainers.simons ];
broken = true;
};
}

View file

@ -2,7 +2,7 @@
, guiSupport ? false, tk ? null, curses }:
let
name = "mercurial-2.8.1";
name = "mercurial-2.8.2";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
sha256 = "0riksf6p07yxfq1xlraqhl8cacsgb1gg7si185mlbdknrh2a4ffj";
sha256 = "0vxyxx91k6z0knfqslbwxswbc52abrg2pdf395kwvij026ibm9f8";
};
inherit python; # pass it so that the same version can be used in hg2git

View file

@ -50,17 +50,18 @@ let
waf = fetchurl {
url = https://waf.googlecode.com/files/waf-1.7.13;
sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
};
};
version = "0.3.2";
in
stdenv.mkDerivation rec {
name = "mpv-20131222";
name = "mpv-${version}";
src = fetchgit {
url = "https://github.com/mpv-player/mpv.git";
rev = "e6bea0ec5a";
sha256 = "984c7d19b1916b7e5befc370ffb7f6c31e560c64c47090b924a115d00c35a1a8";
src = fetchurl {
url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
sha256 = "1vzdhzry2adyp2yh2dmy1qznqhnzar7g24rhi0vv624jgd20qax2";
};
buildInputs = with stdenv.lib;

View file

@ -2,11 +2,11 @@
}:
stdenv.mkDerivation rec {
name = "i3status-2.7";
name = "i3status-2.8";
src = fetchurl {
url = "http://i3wm.org/i3status/${name}.tar.bz2";
sha256 = "0cm6fhsc7hzsqni8pwhjl2l0rfd458paabn54cgzqnmwwdflwgq7";
sha256 = "1zh7z2qbw0jsrqdkc1irviq2n20mc5hq4h1mckyfcm238pfwa1mb";
};
buildInputs = [ confuse yajl alsaLib wirelesstools ];

View file

@ -2,11 +2,11 @@
, libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }:
stdenv.mkDerivation rec {
name = "ratpoison-1.4.5";
name = "ratpoison-1.4.6";
src = fetchurl {
url = "mirror://savannah/ratpoison/${name}.tar.gz";
sha256 = "7391079db20b8613eecfd81d64d243edc9d3c586750c8f2da2bb9db14d260f03";
sha256 = "1y1b38bng0naxfy50asshzg5xr1b2rn88mcgbds42y72d7y9d0za";
};
buildInputs =
@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
preConfigure = "autoreconf -vf"; # needed because of the patch above
patches = [ ./glibc-fix.patch ];
postInstall = ''
mkdir -p $out/share/emacs/site-lisp
mv "$out/share/ratpoison/"*.el $out/share/emacs/site-lisp/
@ -45,7 +43,7 @@ stdenv.mkDerivation rec {
cripples Emacs and other quality pieces of software.
'';
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ ];
};
}

View file

@ -1,22 +0,0 @@
From 4ad0b38fb53506d613c4b4f7268dadfcedae9b8e Mon Sep 17 00:00:00 2001
From: Shawn Betts <sabetts@gmail.com>
Date: Mon, 13 Jul 2009 01:23:25 +0000
Subject: check for getline in configure.in
This fixes a build error encountered on glibc 2.10 systems
---
diff --git a/configure.in b/configure.in
index 0c1b42c..08f4ee8 100644
--- a/configure.in
+++ b/configure.in
@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(unistd.h stdarg.h)
dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
-AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep)
+AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep getline)
AC_TYPE_SIGNAL
--
cgit v0.9.0.2

View file

@ -8,7 +8,7 @@
, antProperties ? []
, antBuildInputs ? []
, buildfile ? "build.xml"
, ant ? pkgs.apacheAntOpenJDK
, ant ? pkgs.ant
, jre ? pkgs.openjdk
, hydraAntLogger ? pkgs.hydraAntLogger
, ... } @ args:
@ -31,7 +31,7 @@ stdenv.mkDerivation (
antSetupPhase = with stdenv.lib; ''
if test "$hydraAntLogger" != "" ; then
export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/lib/java/*.jar | head -1`"
export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`"
fi
for abi in ${concatStringsSep " " (map (f: "`find ${f} -name '*.jar'`") antBuildInputs)}; do
export ANT_ARGS="$ANT_ARGS -lib $abi"
@ -39,20 +39,20 @@ stdenv.mkDerivation (
'';
installPhase = ''
mkdir -p $out/lib/java
mkdir -p $out/share/java
${ if jars == [] then ''
find . -name "*.jar" | xargs -I{} cp -v {} $out/lib/java
find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java
'' else stdenv.lib.concatMapStrings (j: ''
cp -v ${j} $out/lib/java
cp -v ${j} $out/share/java
'') jars }
for j in $out/lib/java/*.jar ; do
for j in $out/share/java/*.jar ; do
echo file jar $j >> $out/nix-support/hydra-build-products
done
'';
generateWrappersPhase =
let
cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/lib/java/*"}'";
cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/share/java/*"}'";
in
''
header "Generating jar wrappers"

View file

@ -0,0 +1,35 @@
# On Mac OS X, binaries refer to dynamic library dependencies using
# either relative paths (e.g. "libicudata.dylib", searched relative to
# $DYLD_LIBRARY_PATH) or absolute paths
# (e.g. "/nix/store/.../lib/libicudata.dylib"). In Nix, the latter is
# preferred since it allows programs to just work. When linking
# against a library (e.g. "-licudata"), the linker uses the install
# name embedded in the dylib (which can be shown using "otool -D").
# Most packages create dylibs with absolute install names, but some do
# not. This setup hook fixes dylibs by setting their install names to
# their absolute path (using "install_name_tool -id"). It also
# rewrites references in other dylibs to absolute paths.
fixDarwinDylibNames() {
local flags=()
local old_id
for fn in "$@"; do
flags+=(-change "$(basename "$fn")" "$fn")
done
for fn in "$@"; do
if [ -L "$fn" ]; then continue; fi
echo "$fn: fixing dylib"
install_name_tool -id "$fn" "${flags[@]}" "$fn"
done
}
fixDarwinDylibNamesIn() {
local dir="$1"
fixDarwinDylibNames $(find "$dir" -name "*.dylib")
}
postFixup() {
fixDarwinDylibNamesIn "$prefix"
}

View file

@ -0,0 +1,13 @@
# This setup hook adds every JAR in the share/java subdirectories of
# the build inputs to $CLASSPATH.
export CLASSPATH
addPkgToClassPath () {
local jar
for jar in $1/share/java/*.jar; do
export CLASSPATH=''${CLASSPATH}''${CLASSPATH:+:}''${jar}
done
}
envHooks=(''${envHooks[@]} addPkgToClassPath)

View file

@ -290,7 +290,7 @@ rec {
args = ["-e" (vmRunCommand qemuCommandLinux)];
origArgs = attrs.args;
origBuilder = attrs.builder;
QEMU_OPTS = "-m ${toString (attrs.memSize or 512)}";
QEMU_OPTS = "${attrs.QEMU_OPTS or ""} -m ${toString (attrs.memSize or 512)}";
});
@ -766,10 +766,22 @@ rec {
url = mirror://fedora/linux/releases/8/Everything/i386/os/repodata/primary.xml.gz;
sha256 = "0kwf0jcp63pygpvgvwl4w58pph24xbcy6db6fnq2f3ly5myhz53n";
};
urlPrefix = mirror://fedora/linux/releases/8/Everything/i386/os;
urlPrefix = http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/8/Everything/i386/os;
packages = commonFedoraPackages;
};
fedora8x86_64 = {
name = "fedora-8-x86_64";
fullName = "Fedora 8 (x86_64)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/8/Everything/x86_64/os/repodata/primary.xml.gz;
sha256 = "11bfmpy3nz82zzmj5lfravvzlw514v4718adi4b06ps9zv3zpy8r";
};
urlPrefix = http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/8/Everything/x86_64/os;
packages = commonFedoraPackages;
archs = ["noarch" "x86_64"];
};
fedora9i386 = {
name = "fedora-9-i386";
fullName = "Fedora 9 (i386)";
@ -1024,26 +1036,26 @@ rec {
packages = commonOpenSUSEPackages;
};
centos64i386 = {
name = "centos-6.4-i386";
fullName = "CentOS 6.4 (i386)";
centos65i386 = {
name = "centos-6.5-i386";
fullName = "CentOS 6.5 (i386)";
packagesList = fetchurl {
url = http://mirror.centos.org/centos/6.4/os/i386/repodata/87aa4c4e19f9a3ec93e3d820f1ea6b6ece8810cb45f117a16354465e57a1b50d-primary.xml.gz;
sha256 = "03dml5bmwijlcfhigwa5rc88ikkfdgmg286qwf9yr8zr3574ral7";
url = http://mirror.centos.org/centos/6.5/os/i386/repodata/a89f27cc7d3cea431f3bd605a1e9309c32d5d409abc1b51a7b5c71c05f18a0c2-primary.xml.gz;
sha256 = "1hm031gw0wawgcdbbhdb17adaclw63ls21fn7cgl7siwgp62g7x8";
};
urlPrefix = http://mirror.centos.org/centos/6.4/os/i386/ ;
urlPrefix = http://mirror.centos.org/centos/6.5/os/i386/ ;
archs = ["noarch" "i386"];
packages = commonCentOSPackages;
};
centos64x86_64 = {
name = "centos-6.4-x86_64";
fullName = "CentOS 6.4 (x86_64)";
centos65x86_64 = {
name = "centos-6.5-x86_64";
fullName = "CentOS 6.5 (x86_64)";
packagesList = fetchurl {
url = http://mirror.centos.org/centos/6.4/os/x86_64/repodata/4d4030b92f010f466eb4f004312b9f532b9e85e60c5e6421e8b429c180ac1efe-primary.xml.gz;
sha256 = "1zhymj0c2adlx0hn8phcws2rwaskkwmk217hnip4c3q15ywk0h2d";
url = http://mirror.centos.org/centos/6.5/os/x86_64/repodata/3353e378f5cb4bb6c3b3dd2ca266c6d68a1e29c36cf99f76aea3d8e158626024-primary.xml.gz;
sha256 = "0930c9cf3n53mrv9zybcqclix2nnqrka4b6xng1vcjybymwf6lrk";
};
urlPrefix = http://mirror.centos.org/centos/6.4/os/x86_64/ ;
urlPrefix = http://mirror.centos.org/centos/6.5/os/x86_64/ ;
archs = ["noarch" "x86_64"];
packages = commonCentOSPackages;
};

View file

@ -44,8 +44,9 @@ stdenv.mkDerivation rec {
# by `g_file_info_get_content_type ()'.
wrapProgram "$out/bin/evince" \
--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf/loaders.cache \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:${shared_mime_info}/share:$out/share"
--prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:${shared_mime_info}/share:$out/share"
'';
doCheck = false; # would need pythonPackages.dogTail, which is missing
meta = with stdenv.lib; {
@ -61,5 +62,6 @@ stdenv.mkDerivation rec {
license = "GPLv2+";
platforms = platforms.linux;
maintainers = [ maintainers.vcunat ];
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup
, exo}:
stdenv.mkDerivation rec {
p_name = "xfce4-screenshooter";
ver_maj = "1.8";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [
pkgconfig intltool xfce4panel libxfce4util gtk libsoup exo
];
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter;
description = "Xfce screenshooter";
license = "GPLv2+";
};
}

View file

@ -48,6 +48,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
xfce4terminal = callPackage ./applications/terminal.nix { };
xfce4screenshooter = callPackage ./applications/xfce4-screenshooter.nix { };
#### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"

View file

@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
buildInputs = [ gnutar ];
installPhase = ''
mkdir -p $out/lib/java $out/bin
mkdir -p $out/share/java $out/bin
tar -xzf $src
cp -r compiler.jar $out/lib/java/
cp -r compiler.jar $out/share/java/
echo "#!${bash}/bin/bash" > $out/bin/closure-compiler
echo "${jre}/bin/java -jar $out/lib/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
echo "${jre}/bin/java -jar $out/share/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
chmod +x $out/bin/closure-compiler
'';

View file

@ -63,8 +63,8 @@ let version = "4.8.2";
enableParallelBuilding = !profiledCompiler;
patches = []
++ optional stdenv.isArm ./arm-eabi.patch
++ optional enableParallelBuilding ./parallel-bconfig.patch
++ optional stdenv.isArm [ ./arm-eabi.patch ]
++ optional (cross != null) ./libstdc++-target.patch
# ++ optional noSysDirs ./no-sys-dirs.patch
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

View file

@ -1,19 +1,24 @@
{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }:
{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils, version }:
let version = "3.3"; in
with { inherit (stdenv.lib) optional; };
assert version == "3.4" || version == "3.3";
stdenv.mkDerivation rec {
name = "llvm-${version}";
src = fetchurl {
url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
sha256 = "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
sha256 =
if version == "3.4" then "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995"
else /*3.3*/ "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
};
patches = [
./more-memory-for-bugpoint.patch # The default rlimits are too low for shared libraries.
./no-rule-aarch64.patch # http://llvm.org/bugs/show_bug.cgi?id=16625
];
patches =
# The default rlimits in 3.3 are too low for shared libraries.
optional (version == "3.3") ./more-memory-for-bugpoint.patch
++ [ ./no-rule-aarch64.patch ] # http://llvm.org/bugs/show_bug.cgi?id=16625
;
# libffi was propagated before, but it wasn't even being used, so
# unless something needs it just an input is fine.
@ -27,8 +32,9 @@ stdenv.mkDerivation rec {
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
]
++ optional (version == "3.3") "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
++ optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
enableParallelBuilding = true;

View file

@ -1,16 +1,19 @@
{stdenv, fetchurl, ...}:
let
jdk = stdenv.mkDerivation {
name = "openjdk6-b16-24_apr_2009-r1";
stdenv.mkDerivation {
name = "openjdk6-b16-24_apr_2009-r1";
src = fetchurl {
url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v";
};
installPhase = ''
mkdir -p $out
cp -vR * $out/
'';
passthru.jre = jdk;
src = fetchurl {
url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v";
};
installPhase = ''
mkdir -p $out
cp -vR * $out/
'';
}
in jdk

View file

@ -1,30 +1,6 @@
{ stdenv
, fetchurl
, unzip
, zip
, procps
, coreutils
, alsaLib
, ant
, freetype
, cups
, which
, jdk
, nettools
, libX11
, libXt
, libXext
, libXrender
, libXtst
, libXi
, libXinerama
, libXcursor
, fontconfig
, cpio
, cacert
, jreOnly ? false
, perl
}:
{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups
, which, jdk, nettools, libX11, libXt, libXext, libXrender, libXtst, libXi, libXinerama
, libXcursor, fontconfig, cpio, cacert, perl, setJavaClassPath }:
let
@ -46,35 +22,20 @@ let
in
stdenv.mkDerivation rec {
name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}";
name = "openjdk-7u${update}b${build}";
src = fetchurl {
url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip;
sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00";
};
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
outputs = [ "out" "jre" ];
buildInputs = [
unzip
procps
ant
which
zip
cpio
nettools
alsaLib
libX11
libXt
libXext
libXrender
libXtst
libXi
libXinerama
libXcursor
fontconfig
perl
];
buildInputs =
[ unzip procps ant which zip cpio nettools alsaLib
libX11 libXt libXext libXrender libXtst libXi libXinerama libXcursor
fontconfig perl
];
NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
@ -85,13 +46,12 @@ stdenv.mkDerivation rec {
sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
sed -i "s@<Xrender.h>@<X11/extensions/Xrender.h>@" \
openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
'';
patches = [ ./cppflags-include-fix.patch ];
NIX_NO_SELF_RPATH = true;
makeFlags = [
"SORT=${coreutils}/bin/sort"
"ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
@ -109,43 +69,68 @@ stdenv.mkDerivation rec {
"UNLIMITED_CRYPTO=1"
];
configurePhase = ''
make $makeFlags sanity
'';
configurePhase = "true";
installPhase = ''
mkdir -p $out
cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
cp -av build/*/j2sdk-image/* $out/lib/openjdk
# Move some stuff to top-level.
mv $out/lib/openjdk/include $out/include
mv $out/lib/openjdk/man $out/share/man
# Remove some broken manpages.
rm -rf $out/share/man/ja*
# Remove crap from the installation.
rm -rf $out/demo $out/sample
rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
# Move the JRE to a separate output.
mv $out/lib/openjdk/jre $jre/lib/openjdk/
ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre
# Remove duplicate binaries.
for i in $(cd $out/lib/openjdk/bin && echo *); do
if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
fi
done
# Generate certificates.
pushd $out/${if ! jreOnly then "jre/" else ""}lib/security
pushd $jre/lib/openjdk/jre/lib/security
rm cacerts
perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt
perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt
popd
ln -s $out/lib/openjdk/bin $out/bin
ln -s $jre/lib/openjdk/jre/bin $jre/bin
''; # */
# FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = ''
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
patchELF $jre
propagatedNativeBuildInputs+=" $jre"
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $jre/nix-support
echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat <<EOF > $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
EOF
'';
# '' + (if jreOnly then "" else ''
# if [ -z $jre ]; then
# exit 0
# fi
# mkdir -p $jre
# cp -av build/*/j2re-image/* $jre
# '');
meta = {
homepage = http://openjdk.java.net/;
license = "GPLv2";
description = "The open-source Java Development Kit";
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl}:
let
version = "5.4.1";
version = "5.5.1";
in
stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
sha256 = "514d1d07be487b783d4dfa29dbd550b3396640579ce135a9eb5a61f08e7f9cac";
sha256 = "16i0ir5mydl7381aijihkll19khp3z8dq0g2ja6k0pcbpkd0k06g";
};
meta = {

View file

@ -1,29 +1,32 @@
{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib,
libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig,
fontconfig }:
{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib
, libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig
, fontconfig
}:
let
version = "6.4.1";
version = "6.6.1";
in
stdenv.mkDerivation {
name = "swi-prolog-${version}";
src = fetchurl {
url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz";
sha256 = "1szqqwypqfd0qr3sk0qlip1ar22kpqgba6b44klmr1aag0lrahs8";
sha256 = "033b7z60jd1907p9idaa3xzbid2aadhqcdwsa2g9c1c7q8fj1gy8";
};
buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig];
buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ];
configureFlags = "--with-world --enable-gmp --enable-shared";
makeFlags = "world";
buildFlags = "world";
meta = {
homepage = http://www.swi-prolog.org/;
description = "A Prolog compiler and interpreter";
license = "LGPL";
platforms = stdenv.lib.platforms.unix;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

View file

@ -1,59 +1,59 @@
{ stdenv, fetchurl, unzip, ant, gcj }:
{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
let
version = "3.7.2";
date = "201202080800";
isGCJ = stdenv.lib.strings.substring 0 3 gcj.name == "gcj";
javaExec = if isGCJ then "gij" else "java";
javaFlags = if isGCJ then "--cp" else "-cp";
in
stdenv.mkDerivation rec {
name = "ecj-${version}";
src = fetchurl {
url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar";
sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm";
};
stdenv.mkDerivation rec {
name = "ecj-${version}";
buildInputs = [ unzip ant gcj ];
src = fetchurl {
url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar";
sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm";
};
unpackPhase = ''
mkdir "${name}"
cd "${name}"
unzip "$src"
buildInputs = [ unzip ant jdk makeWrapper ];
unpackPhase = ''
mkdir "${name}"
cd "${name}"
unzip "$src"
'';
# Use whatever compiler Ant knows.
buildPhase = "ant build";
installPhase = ''
mkdir -pv $out/share/java
cp -v *.jar $out/share/java
mkdir -pv $out/bin
makeWrapper ${jdk.jre}/bin/java $out/bin/ecj \
--add-flags "-cp $out/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main"
# Add a setup hook that causes Ant to use the ECJ.
mkdir -p $out/nix-support
cat <<EOF > $out/nix-support/setup-hook
export NIX_ANT_ARGS="-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter \$NIX_ANT_ARGS"
EOF
'';
meta = {
description = "The Eclipse Compiler for Java (ECJ)";
longDescription = ''
ECJ is an incremental Java compiler. Implemented as an Eclipse
builder, it is based on technology evolved from VisualAge for Java
compiler. In particular, it allows users to run and debug code which
still contains unresolved errors.
'';
# Use whatever compiler Ant knows.
buildPhase = "ant build";
homepage = http://www.eclipse.org/jdt/core/index.php;
installPhase = ''
mkdir -pv "$out/lib/java"
cp -v *.jar "$out/lib/java"
# http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
license = "EPLv1.0";
mkdir -pv "$out/bin"
cat > "$out/bin/ecj" <<EOF
#! /bin/sh
exec "$(type -P ${javaExec})" ${javaFlags} "$out/lib/java/ecj.jar" org.eclipse.jdt.internal.compiler.batch.Main \$@
EOF
chmod u+x "$out/bin/ecj"
'';
meta = {
description = "The Eclipse Compiler for Java (ECJ)";
longDescription = ''
ECJ is an incremental Java compiler. Implemented as an Eclipse
builder, it is based on technology evolved from VisualAge for Java
compiler. In particular, it allows users to run and debug code which
still contains unresolved errors.
'';
homepage = http://www.eclipse.org/jdt/core/index.php;
# http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
license = "EPLv1.0";
maintainers = [ ];
};
}
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,47 +0,0 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
version = "1.5.1";
name = "clojure-binary-${version}";
src = fetchurl {
url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy";
};
buildInputs = [ unzip ];
phases = "unpackPhase installPhase";
installPhase = "
mkdir -p $out/lib/java
cp clojure-${version}.jar clojure.jar
install -t $out/lib/java clojure.jar
";
meta = {
description = "a Lisp dialect for the JVM";
homepage = http://clojure.org/;
license = stdenv.lib.licenses.bsd3;
longDescription = ''
Clojure is a dynamic programming language that targets the Java
Virtual Machine. It is designed to be a general-purpose language,
combining the approachability and interactive development of a
scripting language with an efficient and robust infrastructure for
multithreaded programming. Clojure is a compiled language - it
compiles directly to JVM bytecode, yet remains completely
dynamic. Every feature supported by Clojure is supported at
runtime. Clojure provides easy access to the Java frameworks, with
optional type hints and type inference, to ensure that calls to Java
can avoid reflection.
Clojure is a dialect of Lisp, and shares with Lisp the code-as-data
philosophy and a powerful macro system. Clojure is predominantly a
functional programming language, and features a rich set of immutable,
persistent data structures. When mutable state is needed, Clojure
offers a software transactional memory system and reactive Agent
system that ensure clean, correct, multithreaded designs.
'';
};
}

View file

@ -1,11 +0,0 @@
{writeTextFile, jre, clooj}:
writeTextFile {
name = "clooj-wrapper";
executable = true;
destination = "/bin/clooj";
text = ''
#!/bin/sh
exec ${jre}/bin/java -jar ${clooj}/lib/java/clooj.jar
'';
}

View file

@ -1,24 +1,27 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl, jre, makeWrapper }:
let
jar = fetchurl {
url = https://github.com/downloads/arthuredelstein/clooj/clooj-0.1.36-STANDALONE.jar;
sha256 = "173c66c0aade3ae5d21622f629e60efa51a03ad83c087b02c25e806c5b7f838c";
};
in
let version = "0.4.4"; in
stdenv.mkDerivation {
name = "clooj-0.1.32";
name = "clooj-${version}";
jar = fetchurl {
url = "http://www.mediafire.com/download/prkf64humftrmz3/clooj-${version}-standalone.jar";
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
};
buildInputs = [ makeWrapper ];
phases = "installPhase";
installPhase = ''
mkdir -p $out/lib/java
ln -s ${jar} $out/lib/java/clooj.jar
mkdir -p $out/share/java
ln -s $jar $out/share/java/clooj.jar
makeWrapper ${jre}/bin/java $out/bin/clooj --add-flags "-jar $out/share/java/clooj.jar"
'';
meta = {
description = "clooj, a lightweight IDE for clojure";
description = "A lightweight IDE for Clojure";
homepage = https://github.com/arthuredelstein/clooj;
license = stdenv.lib.licenses.bsd3;
};

View file

@ -1,30 +1,27 @@
{stdenv, fetchurl, unzip, ant, version ? "1.4.0" }:
{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
let version = "1.5.1"; in
let
src_hashes = {
"1.4.0" = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
"1.5.0-RC1" = "111jm0nxkvqr1vrwcpvr70v5paasp8msrj5h8zm1c144c8zc1vln";
};
in
stdenv.mkDerivation {
name = "clojure-${version}";
src = fetchurl {
url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = (builtins.getAttr version src_hashes);
sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy";
};
buildInputs = [ unzip ant ];
buildInputs = [ unzip ant jdk makeWrapper ];
buildPhase = "ant jar";
installPhase = "
mkdir -p $out/lib/java
install -t $out/lib/java clojure.jar
";
installPhase = ''
mkdir -p $out/share/java $out/bin
install -t $out/share/java clojure.jar
makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main"
'';
meta = {
description = "a Lisp dialect for the JVM";
description = "A Lisp dialect for the JVM";
homepage = http://clojure.org/;
license = stdenv.lib.licenses.bsd3;
longDescription = ''

View file

@ -1,11 +0,0 @@
{writeTextFile, jre, clojure}:
writeTextFile {
name = "clojure-wrapper";
executable = true;
destination = "/bin/clojure";
text = ''
#!/bin/sh
exec ${jre}/bin/java -cp ${clojure}/lib/java/clojure.jar clojure.main
'';
}

View file

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation {
name = "io-2011.09.12";
name = "io-2013.12.04";
src = fetchurl {
url = http://github.com/stevedekorte/io/tarball/2011.09.12;
name = "io-2011.09.12.tar.gz";
sha256 = "14nhk5vkk74pbf36jsfaxqh2ihi5d7jby79yf1ibbax319xbjk3v";
url = http://github.com/stevedekorte/io/tarball/2013.12.04;
name = "io-2013.12.04.tar.gz";
sha256 = "0kvwr32xdpcr32rnv301xr5l89185dsisbj4v465m68isas0gjm5";
};
buildInputs = [

View file

@ -1,5 +0,0 @@
source $stdenv/setup || exit 1
configureFlags="--with-jikes=$jikes/bin/jikes --enable-pure-java-math"
genericBuild

View file

@ -1,14 +0,0 @@
{stdenv, fetchurl, alsaLib, xlibs, jikes}:
stdenv.mkDerivation {
name = "kaffe-1.1.4";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/kaffe-1.1.4.tar.gz;
md5 = "94d6e7035ba68c2221dce68bb5b3f6e9";
};
inherit jikes alsaLib;
inherit (xlibs) libXaw libX11;
buildInputs = [jikes alsaLib xlibs.libXaw xlibs.libX11];
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, readline }:
{ stdenv, fetchurl, readline, compat ? false }:
let
dsoPatch = fetchurl {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
patches = [ dsoPatch ];
configurePhase = ''
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDLAGS="-fPIC" V=${majorVersion} R=${version} )
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} )
installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' )
'';

View file

@ -15,12 +15,17 @@ stdenv.mkDerivation rec {
buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper];
configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"'';
preConfigure = ''
configureFlagsArray=(
--datadir=$out/share/maude
TECLA_LIBS="-ltecla -lncursesw"
CFLAGS="-O3" CXXFLAGS="-O3"
)
'';
doCheck = true;
postInstall =
''
postInstall = ''
for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
mkdir -p $out/share/maude
cp ${fullMaude} $out/share/maude/full-maude.maude
@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
rewriting logic computation.
'';
platforms = stdenv.lib.platforms.all;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, makeWrapper, jdk }:
stdenv.mkDerivation rec {
name = "rascal-0.6.2";
src = fetchurl {
url = "http://update.rascal-mpl.org/console/${name}.jar";
sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6";
};
buildInputs = [ makeWrapper jdk ];
unpackPhase = "true";
installPhase =
''
mkdir -p $out/bin
makeWrapper ${jdk}/bin/java $out/bin/rascal \
--add-flags "-Djava.home=$JAVA_HOME -jar ${src}" \
'';
meta = {
homepage = http://www.rascal-mpl.org/;
description = "Command-line REPL for the Rascal metaprogramming language";
license = stdenv.lib.licenses.epl10;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
, toolset ? null
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
@ -35,6 +36,8 @@ let
"cflags=-fexceptions"
else
"";
withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}";
in
stdenv.mkDerivation {
@ -56,18 +59,22 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
buildInputs = [icu expat zlib bzip2 python];
buildInputs =
[ icu expat zlib bzip2 python ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python" + withToolset;
buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
buildPhase = "${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY; "}./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}";
# normal install does not install bjam, this is a separate step
installPhase = ''
cd tools/build/v2
sh bootstrap.sh
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install
sh bootstrap.sh${withToolset}
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}
rm $out/bin/bjam
ln -s $out/bin/b2 $out/bin/bjam
'';
crossAttrs = rec {

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://sourceforge.net/apps/mediawiki/cppunit/";
description = "C++ unit testing framework";
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
, lame, speex, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL
, freetype, fontconfig, fdk_aac
, freetype, fontconfig, fdk_aac, gnutls
}:
stdenv.mkDerivation rec {
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
x11grabSupport = config.ffmpeg.x11grab or false;
playSupport = config.ffmpeg.play or true;
freetypeSupport = config.ffmpeg.freetype or true;
gnutlsSupport = config.ffmpeg.gnutls or true;
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
@ -54,7 +55,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay"
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree";
++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree"
++ stdenv.lib.optional gnutlsSupport "--enable-gnutls";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional mp3Support lame
@ -72,7 +74,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
++ stdenv.lib.optional playSupport SDL
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
++ stdenv.lib.optional fdkAACSupport fdk_aac;
++ stdenv.lib.optional fdkAACSupport fdk_aac
++ stdenv.lib.optional gnutlsSupport gnutls;
enableParallelBuilding = true;

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SHA";
version = "1.6.2.1";
sha256 = "0knzwqgwshr9b0rf8mf6xmgp3qxv4yavg0zy9xz4zmgm5319mvla";
version = "1.6.4";
sha256 = "13d7sg8r0qqs425banrwd15hahy8gnl4k81q0wfqld77xpb2vvbj";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary ];

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Stream";
version = "0.4.6.1";
sha256 = "19z052rd0varq5cbw0i0f0vkbpb40kqg6i93kz2brk6a101q5llp";
version = "0.4.7.1";
sha256 = "08h0h6pwvfcj92n7mk5za36x9agpqnax12cjlvd68zwghjf9qxy3";
buildDepends = [ lazysmallcheck QuickCheck ];
meta = {
description = "A library for manipulating infinite lists";

View file

@ -0,0 +1,15 @@
{ cabal, aeson, doctest, lens, text, unorderedContainers, vector }:
cabal.mkDerivation (self: {
pname = "aeson-lens";
version = "0.5.0.0";
sha256 = "1pr8cxkx41wi7095cp1gpqrwadwx6azcrdi1kr1ik0fs6606dkks";
buildDepends = [ aeson lens text unorderedContainers vector ];
testDepends = [ doctest ];
meta = {
description = "Lens of Aeson";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec-enumerator";
version = "0.3.1";
sha256 = "10h6i23vhcishp599s4lbp0c46wcba99w6iv4ickdr1avrm9z2m7";
version = "0.3.2";
sha256 = "1jrrdhzqjfb78bhnjpy0j0qywqd2j67an41pcn8y6331nzmzsrl8";
buildDepends = [ attoparsec enumerator text ];
meta = {
homepage = "https://john-millikin.com/software/attoparsec-enumerator/";

View file

@ -0,0 +1,27 @@
{ cabal, attempt, base64Bytestring, blazeBuilder, caseInsensitive
, cereal, conduit, cryptoApi, cryptohash, cryptohashCryptoapi
, dataDefault, failure, filepath, httpConduit, httpTypes
, liftedBase, monadControl, mtl, resourcet, text, time
, transformers, utf8String, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "aws";
version = "0.8.4";
sha256 = "0p4m07lw33wd82phwfvyr1alqx3bsafnf25n60h1mss7l0rzyn0i";
isLibrary = true;
isExecutable = true;
buildDepends = [
attempt base64Bytestring blazeBuilder caseInsensitive cereal
conduit cryptoApi cryptohash cryptohashCryptoapi dataDefault
failure filepath httpConduit httpTypes liftedBase monadControl mtl
resourcet text time transformers utf8String xmlConduit
];
meta = {
homepage = "http://github.com/aristidb/aws";
description = "Amazon Web Services (AWS) for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.6.1.2";
sha256 = "09a9gp40y31im763bri755if5j369a8m4kkl3c4wabq8q21y8z7m";
version = "0.6.1.3";
sha256 = "0hjyi3iv2770wicgfjipa901vk7mwr8kknfqvj3v9kzcvb4lq5aq";
buildDepends = [ blazeBuilder blazeMarkup text ];
testDepends = [
blazeBuilder blazeMarkup HUnit QuickCheck testFramework

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-markup";
version = "0.5.1.6";
sha256 = "09w0mwws1xz0h0h99n6ppbdycnrv5y74x6asgzvrzqaslrp5rhvm";
version = "0.5.2.1";
sha256 = "1drq98q70jfbxsdf3b6n5ksr1pcy8h5cgjngg6h3kd6vww3vysdy";
buildDepends = [ blazeBuilder text ];
testDepends = [
blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.9.3";
sha256 = "162lf83v0cip48y7a5mgvxrxnpr1vpc4lpcr8rbh0w981wkaxk4h";
version = "1.0.10";
sha256 = "12vqh747rdldw3n42cxzd77rzb66129dc690n23q5xy7pbhzilfp";
buildDepends = [
liftedBase mmorph monadControl mtl resourcet text transformers
transformersBase void

View file

@ -4,16 +4,13 @@
cabal.mkDerivation (self: {
pname = "crypto-conduit";
version = "0.5.2.1";
sha256 = "1i9m4pzy4ib9n941zlh398idmxcjak2496c4c73i8bmikryahl8p";
version = "0.5.2.2";
sha256 = "1969jys4za3m818jvnfcsv5hpc50bcvkrmy9lxr8fz854q01vhk2";
buildDepends = [ cereal conduit cryptoApi transformers ];
testDepends = [
cereal conduit cryptoApi cryptocipher cryptohashCryptoapi hspec
skein transformers
];
patchPhase = ''
sed -i -e 's|crypto-api >=.*|crypto-api|' crypto-conduit.cabal
'';
jailbreak = true;
doCheck = false;
meta = {

View file

@ -0,0 +1,21 @@
{ cabal, configurator, fgl, filepath, HDBC, HDBCPostgresql
, HDBCSqlite3, HUnit, mtl, random, text, time, yamlLight
}:
cabal.mkDerivation (self: {
pname = "dbmigrations";
version = "0.7";
sha256 = "1mpmka6jszip8sm8k9mrk0fg1q7wp36n0szyiqy7fnbzijfw0xlz";
isLibrary = true;
isExecutable = true;
buildDepends = [
configurator fgl filepath HDBC HDBCPostgresql HDBCSqlite3 HUnit mtl
random text time yamlLight
];
meta = {
description = "An implementation of relational database \"migrations\"";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
version = "1.1";
sha256 = "1f2rcqmcf94ykas4qjfcksh89z2p0hr4s1zkcx0izphrazjyj9gq";
version = "1.1.0.1";
sha256 = "1vgfk3drs61am5z0146pq17i00ygsi2pyz8qipf6c30c9wri9hjp";
buildDepends = [
arithmoi circlePacking colour dataDefault dataDefaultClass
diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec

View file

@ -0,0 +1,22 @@
{ cabal, aeson, aesonLens, digestiveFunctors, HUnit, lens, mtl
, safe, tasty, tastyHunit, text, vector
}:
cabal.mkDerivation (self: {
pname = "digestive-functors-aeson";
version = "1.1.3";
sha256 = "0194yd2b9irm1gmk3d8awrsrmsr4lml63wr4vm8a92s7w3hdy0db";
buildDepends = [
aeson aesonLens digestiveFunctors lens safe text vector
];
testDepends = [
aeson digestiveFunctors HUnit mtl tasty tastyHunit text
];
meta = {
homepage = "http://github.com/ocharles/digestive-functors-aeson";
description = "Run digestive-functors forms against JSON";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

View file

@ -1,10 +1,12 @@
{ cabal, doctest, filepath, transformers, transformersCompat }:
{ cabal, doctest, filepath, tagged, transformers
, transformersCompat
}:
cabal.mkDerivation (self: {
pname = "distributive";
version = "0.3.2";
sha256 = "1n2xnjffrbfw736qn9w5fxy4pjl2319yhimkglhbayq85pz51r1h";
buildDepends = [ transformers transformersCompat ];
version = "0.4";
sha256 = "11zln3h7pflv1f6jfma5b505p4wnr9xrs711mhh3a8xi20n4r318";
buildDepends = [ tagged transformers transformersCompat ];
testDepends = [ doctest filepath ];
meta = {
homepage = "http://github.com/ekmett/distributive/";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "encoding";
version = "0.6.7.2";
sha256 = "0b1z5824vdkcc51bd1vgcbaniw3fv9dmd5qczjc89b5lhrl7qq0d";
version = "0.7";
sha256 = "1h6yki4d3912sr8nsk1cff2pdvzw8ys6xnzi97b5ay1f8i28bmi5";
buildDepends = [
binary extensibleExceptions HaXml mtl regexCompat
];

View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "esqueleto";
version = "1.3.4.2";
sha256 = "1gp0jy8ra11ansari659wqvwafw1pi2svl3w16wa5dv9xk3v9pr6";
version = "1.3.4.3";
sha256 = "1p35nzaqmpcc7slr10ihlc54kz5zv5ak0ql848m3xpbjfzq6f6vc";
buildDepends = [
conduit monadLogger persistent resourcet tagged text transformers
unorderedContainers

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fast-logger";
version = "2.1.2";
sha256 = "0kz31jfhc40wlw3b49zcsn97y6vc9qqnaci743mgjskv4zbqaf34";
version = "2.1.4";
sha256 = "1fb75wx1v9h7690x43kd85lq1h9zi8nq438pqclzzrcfidsnm6z5";
buildDepends = [ blazeBuilder filepath text ];
testDepends = [ hspec ];
meta = {

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "3.1.4";
sha256 = "1sm8wj6vcgbm91z762h6rbq68njj5384a69w4k3q0qzdyix0cxym";
version = "3.1.5";
sha256 = "1sjam6cqz9dhgsdv4sm1lgmwq5dhs9x5q3p1h7l0n34w2q7cc6if";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -1,10 +1,11 @@
{ cabal, gloss, repa, llvm }:
{ cabal, gloss, llvm, repa }:
cabal.mkDerivation (self: {
pname = "gloss-raster";
version = "1.8.1.1";
sha256 = "0qqk2fizmv1zdvi8lljxiqdwlmfzni4qzsdvm2jbvgg5qjx9l9qp";
buildDepends = [ gloss repa llvm ];
buildDepends = [ gloss repa ];
extraLibraries = [ llvm ];
meta = {
homepage = "http://gloss.ouroborus.net";
description = "Parallel rendering of raster images";

View file

@ -0,0 +1,16 @@
{ cabal, filepath, terminfo, transformers, utf8String }:
cabal.mkDerivation (self: {
pname = "haskeline";
version = "0.7.1.2";
sha256 = "178hzal5gqw3rmgijv9ph9xa6d4sld279z4a8cjyx3hv4azciwr4";
buildDepends = [ filepath terminfo transformers utf8String ];
configureFlags = "-fterminfo";
meta = {
homepage = "http://trac.haskell.org/haskeline";
description = "A command-line interface for user input, written in Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "haskell-packages";
version = "0.2.3.1";
sha256 = "0sryw0gdwkgd53la6gryf7i5h8rlpys6j8nh75f9j014i4y1p0jw";
version = "0.2.3.3";
sha256 = "1i3x392dwryhw6k02bd2r9wn9iwwmcqzjhk7gx5lx1vhyb470qr2";
buildDepends = [
aeson Cabal deepseq EitherT filepath haskellSrcExts hseCpp mtl
optparseApplicative tagged

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "heist";
version = "0.13.0.3";
sha256 = "0aynsb74i7yzw02cqd9fhcbz6sqkid98l6gpzxssaydq7vnkpj7a";
version = "0.13.0.4";
sha256 = "15iixsjlx3zd44dcdxla5pgpl16995pk9g34zjqynmhcj7sfv5as";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hexpat";
version = "0.20.5";
sha256 = "09p8mh2b76ymgfv64zpddywdf34n7b78agri6kjnhls0xsk8260a";
version = "0.20.6";
sha256 = "02ms6lchj6k0krqjk47bibfb0cbpbc16ip9f22c4rgp04qkzp60b";
buildDepends = [ deepseq List text transformers utf8String ];
meta = {
homepage = "http://haskell.org/haskellwiki/Hexpat/";

View file

@ -0,0 +1,22 @@
{ cabal, attoparsec, cmdargs, filepath, haskellSrcExts, lens, mtl
, split, tasty, tastyGolden, text
}:
cabal.mkDerivation (self: {
pname = "hsimport";
version = "0.2.6.8";
sha256 = "0brz7lxbnkwhjlbvs7xk3012mp9419v9wpczwa3nahl5afzbsp3i";
isLibrary = true;
isExecutable = true;
buildDepends = [
attoparsec cmdargs haskellSrcExts lens mtl split text
];
testDepends = [ filepath tasty tastyGolden ];
doCheck = false;
meta = {
description = "A command line program for extending the import list of a Haskell source file";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-attoparsec";
version = "0.1.0";
sha256 = "1ncdjzgb5kv20y9kps4nawvbwaqnfil9g552if638vv8hag8cwq9";
version = "0.1.1";
sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
buildDepends = [ attoparsec httpTypes ];
meta = {
homepage = "https://github.com/tlaitinen/http-attoparsec";

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "http-client";
version = "0.2.0.3";
sha256 = "0dy0nf92404hlg4f4zifx6b1qs5wadgky7snqrizl5kk5af43i4h";
version = "0.2.1";
sha256 = "1hwr8pjlal88b6clmrs0cksmyy1vmbybvr78s6kb2ppwrzmd2v8q";
buildDepends = [
base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
deepseq failure httpTypes network publicsuffixlist text time

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