Merge branch 'master' into staging.
This commit is contained in:
Peter Simons
commit
5341196f01
@ -233,4 +233,9 @@ rec {
|
||||
xs = unique (drop 1 list);
|
||||
in [x] ++ remove x xs;
|
||||
|
||||
# Intersects list 'e' and another list
|
||||
intersect = e: filter (x: elem x e);
|
||||
|
||||
# Substracts list 'e' from another list
|
||||
substract = e: filter (x: !(elem x e));
|
||||
}
|
||||
|
||||
@ -85,6 +85,7 @@
|
||||
henrytill = "Henry Till <henrytill@gmail.com>";
|
||||
hinton = "Tom Hinton <t@larkery.com>";
|
||||
hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
|
||||
iand675 = "Ian Duncan <ian@iankduncan.com>";
|
||||
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
|
||||
iElectric = "Domen Kozar <domen@dev.si>";
|
||||
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
|
||||
|
||||
@ -228,6 +228,7 @@
|
||||
./services/network-filesystems/rsyncd.nix
|
||||
./services/network-filesystems/samba.nix
|
||||
./services/network-filesystems/diod.nix
|
||||
./services/network-filesystems/u9fs.nix
|
||||
./services/network-filesystems/yandex-disk.nix
|
||||
./services/networking/amuled.nix
|
||||
./services/networking/atftpd.nix
|
||||
@ -432,5 +433,5 @@
|
||||
./virtualisation/openvswitch.nix
|
||||
./virtualisation/parallels-guest.nix
|
||||
./virtualisation/virtualbox-guest.nix
|
||||
#./virtualisation/xen-dom0.nix
|
||||
./virtualisation/xen-dom0.nix
|
||||
]
|
||||
|
||||
@ -286,10 +286,11 @@ in
|
||||
|
||||
systemd.services.grsec-lock = mkIf cfg.config.sysctl {
|
||||
description = "grsecurity sysctl-lock Service";
|
||||
requires = [ "sysctl.service" ];
|
||||
requires = [ "systemd-sysctl.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.RemainAfterExit = "yes";
|
||||
unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel/grsecurity/grsec_lock";
|
||||
script = ''
|
||||
locked=`cat /proc/sys/kernel/grsecurity/grsec_lock`
|
||||
if [ "$locked" == "0" ]; then
|
||||
|
||||
@ -131,8 +131,8 @@ in {
|
||||
type = types.string;
|
||||
default = "/var/lib/couchdb/couchdb.ini";
|
||||
description = ''
|
||||
Custom configuration file. File needs to be readable and writable
|
||||
from couchdb user/group.
|
||||
Configuration file for persisting runtime changes. File
|
||||
needs to be readable and writable from couchdb user/group.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -157,12 +157,15 @@ in {
|
||||
mkdir -p ${cfg.databaseDir};
|
||||
mkdir -p ${cfg.viewIndexDir};
|
||||
touch ${cfg.configFile}
|
||||
touch -a ${cfg.logFile}
|
||||
|
||||
if [ "$(id -u)" = 0 ]; then
|
||||
chown ${cfg.user}:${cfg.group} ${cfg.uriFile}
|
||||
chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`;
|
||||
(-f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true
|
||||
chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
|
||||
chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
|
||||
chown ${cfg.user}:${cfg.group} ${cfg.configFile}
|
||||
chown ${cfg.user}:${cfg.group} ${cfg.logFile}
|
||||
fi
|
||||
'';
|
||||
|
||||
|
||||
@ -236,8 +236,6 @@ in
|
||||
|
||||
system.activationScripts.udevd =
|
||||
''
|
||||
echo "" > /proc/sys/kernel/hotplug
|
||||
|
||||
# Regenerate the hardware database /var/lib/udev/hwdb.bin
|
||||
# whenever systemd changes.
|
||||
if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${config.systemd.package} ]; then
|
||||
|
||||
@ -132,7 +132,7 @@ in
|
||||
|
||||
restartIfChanged = false;
|
||||
|
||||
path = [ pkgs.nix pkgs.disnix dysnomia ];
|
||||
path = [ pkgs.nix pkgs.disnix dysnomia "/run/current-system/sw" ];
|
||||
|
||||
environment = {
|
||||
HOME = "/root";
|
||||
|
||||
75
nixos/modules/services/network-filesystems/u9fs.nix
Normal file
75
nixos/modules/services/network-filesystems/u9fs.nix
Normal file
@ -0,0 +1,75 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.u9fs;
|
||||
in
|
||||
{
|
||||
|
||||
options = {
|
||||
|
||||
services.u9fs = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to run the u9fs 9P server for Unix.";
|
||||
};
|
||||
|
||||
listenStreams = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ "564" ];
|
||||
example = [ "192.168.16.1:564" ];
|
||||
description = ''
|
||||
Sockets to listen for clients on.
|
||||
See <command>man 5 systemd.socket</command> for socket syntax.
|
||||
'';
|
||||
};
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
example = "-a none -u nobody";
|
||||
description =
|
||||
''
|
||||
Extra arguments to pass on invocation,
|
||||
see <command>man 4 u9fs</command>
|
||||
'';
|
||||
};
|
||||
|
||||
fsroot = mkOption {
|
||||
type = types.path;
|
||||
default = "/";
|
||||
example = "/srv";
|
||||
description = "File system root to serve to clients.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd = {
|
||||
sockets.u9fs = {
|
||||
description = "U9fs Listening Socket";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
inherit (cfg) listenStreams;
|
||||
socketConfig.Accept = "yes";
|
||||
};
|
||||
services."u9fs@" = {
|
||||
description = "9P Protocol Server";
|
||||
reloadIfChanged = true;
|
||||
requires = [ "u9fs.socket" ];
|
||||
serviceConfig =
|
||||
{ ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs} ${cfg.fsroot}";
|
||||
StandardInput = "socket";
|
||||
StandardError = "journal";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -178,7 +178,7 @@ in
|
||||
ExecReload = "${pkgs.consul}/bin/consul reload";
|
||||
PermissionsStartOnly = true;
|
||||
User = if cfg.dropPrivileges then "consul" else null;
|
||||
TimeoutStartSec = "${toString (20 + (3 * cfg.joinRetries))}s";
|
||||
TimeoutStartSec = "0";
|
||||
} // (optionalAttrs (cfg.leaveOnStop) {
|
||||
ExecStop = "${pkgs.consul}/bin/consul leave";
|
||||
});
|
||||
@ -209,13 +209,14 @@ in
|
||||
echo "$ADDR"
|
||||
}
|
||||
echo "{" > /etc/consul-addrs.json
|
||||
delim=" "
|
||||
''
|
||||
+ concatStrings (flip mapAttrsToList cfg.interface (name: i:
|
||||
optionalString (i != null) ''
|
||||
echo " \"${name}_addr\": \"$(getAddr "${i}")\"," >> /etc/consul-addrs.json
|
||||
echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json
|
||||
delim=","
|
||||
''))
|
||||
+ ''
|
||||
echo " \"\": \"\"" >> /etc/consul-addrs.json
|
||||
echo "}" >> /etc/consul-addrs.json
|
||||
'';
|
||||
postStart = ''
|
||||
|
||||
@ -8,8 +8,10 @@ in
|
||||
|
||||
{
|
||||
imports = [
|
||||
./afterstep.nix
|
||||
./bspwm.nix
|
||||
./compiz.nix
|
||||
./fluxbox.nix
|
||||
./herbstluftwm.nix
|
||||
./i3.nix
|
||||
./metacity.nix
|
||||
|
||||
@ -24,6 +24,7 @@ in
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to create symlinks to the system generations under
|
||||
<literal>/boot</literal>. When enabled,
|
||||
@ -42,6 +43,7 @@ in
|
||||
|
||||
copyKernels = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = "
|
||||
Whether copy the necessary boot files into /boot, so
|
||||
/nix/store is not needed by the boot loader.
|
||||
|
||||
@ -179,6 +179,7 @@ in
|
||||
};
|
||||
|
||||
splashImage = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
example = literalExample "./my-background.png";
|
||||
description = ''
|
||||
Background image used for GRUB. It must be a 640x480,
|
||||
|
||||
@ -23,6 +23,7 @@ in
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Some systems require a /sbin/init script which is started.
|
||||
Or having it makes starting NixOS easier.
|
||||
|
||||
@ -21,6 +21,7 @@ in
|
||||
|
||||
boot.loader.raspberryPi.enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to create files with the system generations in
|
||||
<literal>/boot</literal>.
|
||||
|
||||
@ -22,6 +22,7 @@ in
|
||||
# FIXME: still needed?
|
||||
boot.extraTTYs = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.string;
|
||||
example = ["tty8" "tty9"];
|
||||
description = ''
|
||||
Tty (virtual console) devices, in addition to the consoles on
|
||||
|
||||
@ -10,6 +10,7 @@ let
|
||||
isExecutable = true;
|
||||
src = ./nixos-container.pl;
|
||||
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
|
||||
su = "${pkgs.shadow.su}/bin/su";
|
||||
inherit (pkgs) utillinux;
|
||||
};
|
||||
|
||||
@ -202,7 +203,7 @@ in
|
||||
script =
|
||||
''
|
||||
mkdir -p -m 0755 "$root/etc" "$root/var/lib"
|
||||
mkdir -p -m 0700 "$root/var/lib/private" "$root/root"
|
||||
mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers
|
||||
if ! [ -e "$root/etc/os-release" ]; then
|
||||
touch "$root/etc/os-release"
|
||||
fi
|
||||
@ -211,7 +212,7 @@ in
|
||||
"/nix/var/nix/profiles/per-container/$INSTANCE" \
|
||||
"/nix/var/nix/gcroots/per-container/$INSTANCE"
|
||||
|
||||
cp -f /etc/resolv.conf "$root/etc/resolv.conf"
|
||||
cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf"
|
||||
|
||||
if [ "$PRIVATE_NETWORK" = 1 ]; then
|
||||
extraFlags+=" --network-veth"
|
||||
@ -260,11 +261,21 @@ in
|
||||
ip route add $LOCAL_ADDRESS dev $ifaceHost
|
||||
fi
|
||||
fi
|
||||
|
||||
# Get the leader PID so that we can signal it in
|
||||
# preStop. We can't use machinectl there because D-Bus
|
||||
# might be shutting down. FIXME: in systemd 219 we can
|
||||
# just signal systemd-nspawn to do a clean shutdown.
|
||||
machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid"
|
||||
'';
|
||||
|
||||
preStop =
|
||||
''
|
||||
machinectl poweroff "$INSTANCE" || true
|
||||
pid="$(cat /run/containers/$INSTANCE.pid)"
|
||||
if [ -n "$pid" ]; then
|
||||
kill -RTMIN+4 "$pid"
|
||||
fi
|
||||
rm -f "/run/containers/$INSTANCE.pid"
|
||||
'';
|
||||
|
||||
restartIfChanged = false;
|
||||
|
||||
@ -129,10 +129,10 @@ in
|
||||
|
||||
wantedBy = [ "sshd.service" ];
|
||||
before = [ "sshd.service" ];
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" "ip-up.target" ];
|
||||
wants = [ "network-online.target" "ip-up.target" ];
|
||||
|
||||
script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 6 --waitretry=10"; in
|
||||
script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'"; in
|
||||
''
|
||||
# When dealing with cryptographic keys, we want to keep things private.
|
||||
umask 077
|
||||
@ -140,7 +140,7 @@ in
|
||||
if ! [ -e /root/.ssh/authorized_keys ]; then
|
||||
echo "obtaining SSH key..."
|
||||
mkdir -m 0700 -p /root/.ssh
|
||||
${wget} -O /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys
|
||||
${wget} -O /root/authorized-keys-metadata http://metadata.google.internal/0.1/meta-data/authorized-keys
|
||||
if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then
|
||||
cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub
|
||||
if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
|
||||
@ -156,7 +156,7 @@ in
|
||||
${flip concatMapStrings config.services.openssh.hostKeys (k :
|
||||
let kName = baseNameOf k.path; in ''
|
||||
echo "trying to obtain SSH private host key ${kName}"
|
||||
${wget} -O /root/${kName} http://metadata/0.1/meta-data/attributes/${kName} && :
|
||||
${wget} -O /root/${kName} http://metadata.google.internal/0.1/meta-data/attributes/${kName} && :
|
||||
if [ $? -eq 0 -a -e /root/${kName} ]; then
|
||||
countKeys=$((countKeys+1))
|
||||
mv -f /root/${kName} ${k.path}
|
||||
|
||||
@ -32,7 +32,9 @@ in
|
||||
default = "";
|
||||
description =
|
||||
''
|
||||
This is the system-wide LXC config. See lxc.system.conf(5).
|
||||
This is the system-wide LXC config. See
|
||||
<citerefentry><refentrytitle>lxc.system.conf</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -43,7 +45,8 @@ in
|
||||
description =
|
||||
''
|
||||
Default config (default.conf) for new containers, i.e. for
|
||||
network config. See lxc.container.conf(5).
|
||||
network config. See <citerefentry><refentrytitle>lxc.container.conf
|
||||
</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -54,7 +57,9 @@ in
|
||||
description =
|
||||
''
|
||||
This is the config file for managing unprivileged user network
|
||||
administration access in LXC. See lxc-user-net(5).
|
||||
administration access in LXC. See <citerefentry>
|
||||
<refentrytitle>lxc-user-net</refentrytitle><manvolnum>5</manvolnum>
|
||||
</citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@ use Fcntl ':flock';
|
||||
use Getopt::Long qw(:config gnu_getopt);
|
||||
|
||||
my $nsenter = "@utillinux@/bin/nsenter";
|
||||
my $su = "@su@";
|
||||
|
||||
# Ensure a consistent umask.
|
||||
umask 0022;
|
||||
@ -271,14 +272,14 @@ elsif ($action eq "login") {
|
||||
}
|
||||
|
||||
elsif ($action eq "root-login") {
|
||||
runInContainer("su", "root", "-l");
|
||||
runInContainer("@su@", "root", "-l");
|
||||
}
|
||||
|
||||
elsif ($action eq "run") {
|
||||
shift @ARGV; shift @ARGV;
|
||||
# Escape command.
|
||||
my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV);
|
||||
runInContainer("su", "root", "-l", "-c", "exec " . $s);
|
||||
runInContainer("@su@", "root", "-l", "-c", "exec " . $s);
|
||||
}
|
||||
|
||||
elsif ($action eq "show-ip") {
|
||||
|
||||
@ -5,18 +5,8 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.virtualisation.xen;
|
||||
|
||||
xen = pkgs.xen;
|
||||
|
||||
xendConfig = pkgs.writeText "xend-config.sxp"
|
||||
''
|
||||
(loglevel DEBUG)
|
||||
(network-script network-bridge)
|
||||
(vif-script vif-bridge)
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
@ -58,23 +48,60 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
virtualisation.xen.bridge =
|
||||
mkOption {
|
||||
default = "xenbr0";
|
||||
description =
|
||||
''
|
||||
Create a bridge for the Xen domUs to connect to.
|
||||
'';
|
||||
};
|
||||
|
||||
virtualisation.xen.stored =
|
||||
mkOption {
|
||||
default = "${pkgs.xen}/bin/oxenstored";
|
||||
description =
|
||||
''
|
||||
Xen Store daemon to use.
|
||||
'';
|
||||
};
|
||||
|
||||
virtualisation.xen.trace =
|
||||
mkOption {
|
||||
default = false;
|
||||
description =
|
||||
''
|
||||
Enable Xen tracing.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [ {
|
||||
assertion = pkgs.stdenv.isx86_64;
|
||||
message = "Xen currently not supported on ${pkgs.stdenv.system}";
|
||||
} {
|
||||
assertion = config.boot.loader.grub.enable && (config.boot.loader.grub.efiSupport == false);
|
||||
message = "Xen currently does not support EFI boot";
|
||||
} ];
|
||||
|
||||
environment.systemPackages = [ xen ];
|
||||
|
||||
# Domain 0 requires a pvops-enabled kernel.
|
||||
boot.kernelPackages = pkgs.linuxPackages_3_2_xen;
|
||||
# Make sure Domain 0 gets the required configuration
|
||||
#boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; };
|
||||
|
||||
boot.kernelModules =
|
||||
[ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback"
|
||||
"blktap" "tun"
|
||||
[ "xen-evtchn" "xen-gntdev" "xen-gntalloc" "xen-blkback" "xen-netback"
|
||||
"xen-pciback" "evtchn" "gntdev" "netbk" "blkbk" "xen-scsibk"
|
||||
"usbbk" "pciback" "xen-acpi-processor" "blktap2" "tun" "netxen_nic"
|
||||
"xen_wdt" "xen-acpi-processor" "xen-privcmd" "xen-scsiback"
|
||||
"xenfs"
|
||||
];
|
||||
|
||||
|
||||
# The radeonfb kernel module causes the screen to go black as soon
|
||||
# as it's loaded, so don't load it.
|
||||
boot.blacklistedKernelModules = [ "radeonfb" ];
|
||||
@ -87,8 +114,8 @@ in
|
||||
options loop max_loop=64
|
||||
'';
|
||||
|
||||
virtualisation.xen.bootParams =
|
||||
[ "loglvl=all" "guest_loglvl=all" ] ++
|
||||
virtualisation.xen.bootParams = [] ++
|
||||
optionals cfg.trace [ "loglvl=all" "guest_loglvl=all" ] ++
|
||||
optional (cfg.domain0MemorySize != 0) "dom0_mem=${toString cfg.domain0MemorySize}M";
|
||||
|
||||
system.extraSystemBuilderCmds =
|
||||
@ -101,71 +128,36 @@ in
|
||||
system.activationScripts.xen =
|
||||
''
|
||||
if [ -d /proc/xen ]; then
|
||||
${pkgs.sysvtools}/bin/mountpoint -q /proc/xen || \
|
||||
${pkgs.kmod}/bin/modprobe xenfs 2> /dev/null
|
||||
${pkgs.utillinux}/bin/mountpoint -q /proc/xen || \
|
||||
${pkgs.utillinux}/bin/mount -t xenfs none /proc/xen
|
||||
fi
|
||||
'';
|
||||
|
||||
jobs.xend =
|
||||
{ description = "Xen Control Daemon";
|
||||
# Domain 0 requires a pvops-enabled kernel.
|
||||
system.requiredKernelConfig = with config.lib.kernelConfig;
|
||||
[ (isYes "XEN")
|
||||
(isYes "X86_IO_APIC")
|
||||
(isYes "ACPI")
|
||||
(isYes "XEN_DOM0")
|
||||
(isYes "PCI_XEN")
|
||||
(isYes "XEN_DEV_EVTCHN")
|
||||
(isYes "XENFS")
|
||||
(isYes "XEN_COMPAT_XENFS")
|
||||
(isYes "XEN_SYS_HYPERVISOR")
|
||||
(isYes "XEN_GNTDEV")
|
||||
(isYes "XEN_BACKEND")
|
||||
(isModule "XEN_NETDEV_BACKEND")
|
||||
(isModule "XEN_BLKDEV_BACKEND")
|
||||
(isModule "XEN_PCIDEV_BACKEND")
|
||||
(isYes "XEN_BALLOON")
|
||||
(isYes "XEN_SCRUB_PAGES")
|
||||
];
|
||||
|
||||
startOn = "stopped udevtrigger";
|
||||
|
||||
path =
|
||||
[ pkgs.bridge-utils pkgs.gawk pkgs.iproute pkgs.nettools
|
||||
pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps
|
||||
];
|
||||
|
||||
environment.XENCONSOLED_TRACE = "hv";
|
||||
|
||||
preStart =
|
||||
''
|
||||
mkdir -p /var/log/xen/console -m 0700
|
||||
|
||||
${xen}/sbin/xend start
|
||||
|
||||
# Wait until Xend is running.
|
||||
for ((i = 0; i < 60; i++)); do echo "waiting for xend..."; ${xen}/sbin/xend status && break; done
|
||||
|
||||
${xen}/sbin/xend status || exit 1
|
||||
'';
|
||||
|
||||
postStop = "${xen}/sbin/xend stop";
|
||||
};
|
||||
|
||||
jobs.xendomains =
|
||||
{ description = "Automatically starts, saves and restores Xen domains on startup/shutdown";
|
||||
|
||||
startOn = "started xend";
|
||||
|
||||
stopOn = "starting shutdown and stopping xend";
|
||||
|
||||
restartIfChanged = false;
|
||||
|
||||
path = [ pkgs.xen ];
|
||||
|
||||
environment.XENDOM_CONFIG = "${xen}/etc/sysconfig/xendomains";
|
||||
|
||||
preStart =
|
||||
''
|
||||
mkdir -p /var/lock/subsys -m 755
|
||||
${xen}/etc/init.d/xendomains start
|
||||
'';
|
||||
|
||||
postStop = "${xen}/etc/init.d/xendomains stop";
|
||||
};
|
||||
|
||||
# To prevent a race between dhcpcd and xend's bridge setup script
|
||||
# (which renames eth* to peth* and recreates eth* as a virtual
|
||||
# device), start dhcpcd after xend.
|
||||
jobs.dhcpcd.startOn = mkOverride 50 "started xend";
|
||||
|
||||
environment.etc =
|
||||
[ { source = xendConfig;
|
||||
target = "xen/xend-config.sxp";
|
||||
}
|
||||
{ source = "${xen}/etc/xen/scripts";
|
||||
target = "xen/scripts";
|
||||
[ { source = "${xen}/etc/xen/xl.conf";
|
||||
target = "xen/xl.conf";
|
||||
}
|
||||
];
|
||||
|
||||
@ -174,6 +166,125 @@ in
|
||||
|
||||
services.udev.path = [ pkgs.bridge-utils pkgs.iproute ];
|
||||
|
||||
systemd.services.xen-store = {
|
||||
description = "Xen Store Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" "xen-store.socket" ];
|
||||
requires = [ "xen-store.socket" ];
|
||||
preStart = ''
|
||||
export XENSTORED_ROOTDIR="/var/lib/xenstored"
|
||||
rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null
|
||||
|
||||
mkdir -p /var/run
|
||||
${optionalString cfg.trace "mkdir -p /var/log/xen"}
|
||||
grep -q control_d /proc/xen/capabilities
|
||||
'';
|
||||
serviceConfig.ExecStart = ''
|
||||
${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork
|
||||
'';
|
||||
postStart = ''
|
||||
time=0
|
||||
timeout=30
|
||||
# Wait for xenstored to actually come up, timing out after 30 seconds
|
||||
while [ $time -lt $timeout ] && ! `${pkgs.xen}/bin/xenstore-read -s / >/dev/null 2>&1` ; do
|
||||
time=$(($time+1))
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# Exit if we timed out
|
||||
if ! [ $time -lt $timeout ] ; then
|
||||
echo "Could not start Xenstore Daemon"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
${pkgs.xen}/bin/xenstore-write "/local/domain/0/name" "Domain-0"
|
||||
${pkgs.xen}/bin/xenstore-write "/local/domain/0/domid" 0
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.sockets.xen-store = {
|
||||
description = "XenStore Socket for userspace API";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
socketConfig = {
|
||||
ListenStream = [ "/var/run/xenstored/socket" "/var/run/xenstored/socket_ro" ];
|
||||
SocketMode = "0660";
|
||||
SocketUser = "root";
|
||||
SocketGroup = "root";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
systemd.services.xen-console = {
|
||||
description = "Xen Console Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "xen-store.service" ];
|
||||
preStart = ''
|
||||
mkdir -p /var/run/xen
|
||||
${optionalString cfg.trace "mkdir -p /var/log/xen"}
|
||||
grep -q control_d /proc/xen/capabilities
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.xen}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
systemd.services.xen-qemu = {
|
||||
description = "Xen Qemu Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "xen-console.service" ];
|
||||
serviceConfig.ExecStart = ''
|
||||
${pkgs.xen}/lib/xen/bin/qemu-system-i386 -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv \
|
||||
-monitor /dev/null -serial /dev/null -parallel /dev/null
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
systemd.services.xen-watchdog = {
|
||||
description = "Xen Watchdog Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "xen-qemu.service" ];
|
||||
serviceConfig.ExecStart = "${pkgs.xen}/bin/xenwatchdogd 30 15";
|
||||
serviceConfig.Type = "forking";
|
||||
serviceConfig.RestartSec = "1";
|
||||
serviceConfig.Restart = "on-failure";
|
||||
};
|
||||
|
||||
|
||||
systemd.services.xen-bridge = {
|
||||
description = "Xen bridge";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
before = [ "xen-domains.service" ];
|
||||
serviceConfig.RemainAfterExit = "yes";
|
||||
serviceConfig.ExecStart = ''
|
||||
${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge}
|
||||
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up
|
||||
'';
|
||||
serviceConfig.ExecStop = ''
|
||||
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down
|
||||
${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge}
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.xen-domains = {
|
||||
description = "Xen domains - automatically starts, saves and restores Xen domains";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "xen-bridge.service" "xen-qemu.service" ];
|
||||
## To prevent a race between dhcpcd and xend's bridge setup script
|
||||
## (which renames eth* to peth* and recreates eth* as a virtual
|
||||
## device), start dhcpcd after xend.
|
||||
before = [ "dhcpd.service" ];
|
||||
restartIfChanged = false;
|
||||
serviceConfig.RemainAfterExit = "yes";
|
||||
path = [ pkgs.xen ];
|
||||
environment.XENDOM_CONFIG = "${pkgs.xen}/etc/sysconfig/xendomains";
|
||||
preStart = "mkdir -p /var/lock/subsys -m 755";
|
||||
serviceConfig.ExecStart = "${pkgs.xen}/etc/init.d/xendomains start";
|
||||
serviceConfig.ExecStop = "${pkgs.xen}/etc/init.d/xendomains stop";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -9,7 +9,10 @@
|
||||
boot.loader.grub.device = "nodev";
|
||||
boot.loader.grub.extraPerEntryConfig = "root (hd0)";
|
||||
|
||||
boot.initrd.kernelModules = [ "xen-blkfront" ];
|
||||
boot.initrd.kernelModules =
|
||||
[ "xen-blkfront" "xen-tpmfront" "xen-kbdfront" "xen-fbfront"
|
||||
"xen-netfront" "xen-pcifront" "xen-scsifront"
|
||||
];
|
||||
|
||||
# Send syslog messages to the Xen console.
|
||||
services.syslogd.tty = "hvc0";
|
||||
|
||||
@ -244,7 +244,7 @@ in rec {
|
||||
tests.blivet = callTest tests/blivet.nix {};
|
||||
tests.cadvisor = scrubDrv (import tests/cadvisor.nix { system = "x86_64-linux"; });
|
||||
tests.chromium = callTest tests/chromium.nix {};
|
||||
tests.cjdns = callTest tests/cjdns.nix {};
|
||||
#tests.cjdns = callTest tests/cjdns.nix {};
|
||||
tests.containers = callTest tests/containers.nix {};
|
||||
tests.docker = scrubDrv (import tests/docker.nix { system = "x86_64-linux"; });
|
||||
tests.dockerRegistry = scrubDrv (import tests/docker-registry.nix { system = "x86_64-linux"; });
|
||||
|
||||
@ -6,11 +6,11 @@ with stdenv.lib;
|
||||
stdenv.mkDerivation rec{
|
||||
|
||||
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
|
||||
version = "0.9.3";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bitcoin/bitcoin/archive/v${version}.tar.gz";
|
||||
sha256 = "0a6lkfzsmqqcbz2cc0cg8dccd990b5y7qi8mw358fhfb4f1jxn9y";
|
||||
url = "https://bitcoin.org/bin/bitcoin-core-0.10.0/bitcoin-${version}.tar.gz";
|
||||
sha256 = "a516cf6d9f58a117607148405334b35d3178df1ba1c59229609d2bcd08d30624";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchurl, cairo, gtk, gtkmm, lv2, lvtk, pkgconfig, python }:
|
||||
{ stdenv, fetchurl, cairo, fftw, gtk, gtkmm, lv2, lvtk, pkgconfig, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ams-lv2-${version}";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz";
|
||||
sha256 = "0fa1ghf6qahbhj9j1ciyw0hr6nngwksa37hbs651mlz0fn7lz4xm";
|
||||
sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5";
|
||||
};
|
||||
|
||||
buildInputs = [ cairo gtk gtkmm lv2 lvtk pkgconfig python ];
|
||||
buildInputs = [ cairo fftw gtk gtkmm lv2 lvtk pkgconfig python ];
|
||||
|
||||
configurePhase = "python waf configure --prefix=$out";
|
||||
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "1iijbrq2chqwvvb8nv744fg1q1c9iflrw8jbc7rhj97jdmdyqwhk";
|
||||
sha256 = "1gf5pl4fhak1aqx3dgg0491zgsl6qr6kgyl034hnk4fzwn65zvk6";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, makeWrapper, unzip, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yEd-3.13";
|
||||
name = "yEd-3.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.yworks.com/products/yed/demo/${name}.zip";
|
||||
sha256 = "1d5qs6q31k49y9gh054aafck548pv9f97b3il4iksnna1r59w5jy";
|
||||
sha256 = "147bb081b063abee202a0019597ac960273454046afb29ebbe91e62102dd0471";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
|
||||
, zlib, fftw
|
||||
, jackaudioSupport ? false, jack2
|
||||
, cudaSupport ? false, cudatoolkit6
|
||||
, cudaSupport ? false, cudatoolkit65
|
||||
, colladaSupport ? true, opencollada
|
||||
}:
|
||||
|
||||
@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc";
|
||||
};
|
||||
|
||||
patches = [ ./sm52.patch ];
|
||||
|
||||
buildInputs =
|
||||
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi
|
||||
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
|
||||
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
|
||||
]
|
||||
++ optional jackaudioSupport jack2
|
||||
++ optional cudaSupport cudatoolkit6
|
||||
++ optional cudaSupport cudatoolkit65
|
||||
++ optional colladaSupport opencollada;
|
||||
|
||||
postUnpack =
|
||||
|
||||
12
pkgs/applications/misc/blender/sm52.patch
Normal file
12
pkgs/applications/misc/blender/sm52.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ru -x '*~' blender-2.73a-orig/CMakeLists.txt blender-2.73a/CMakeLists.txt
|
||||
--- blender-2.73a-orig/CMakeLists.txt 2015-01-21 13:31:24.000000000 +0100
|
||||
+++ blender-2.73a/CMakeLists.txt 2015-03-01 23:14:22.962585422 +0100
|
||||
@@ -351,7 +351,7 @@
|
||||
option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF)
|
||||
option(WITH_CYCLES_OSL "Build Cycles with OSL support" ${_init_CYCLES_OSL})
|
||||
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
|
||||
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for")
|
||||
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for")
|
||||
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
|
||||
unset(PLATFORM_DEFAULT)
|
||||
option(WITH_CYCLES_LOGGING "Build cycles with logging support" ON)
|
||||
@ -32,6 +32,11 @@ stdenv.mkDerivation {
|
||||
)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/gsettings-schemas/$name
|
||||
mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/finalterm" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
|
||||
@ -21,4 +21,6 @@ stdenv.mkDerivation {
|
||||
url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz;
|
||||
sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
|
||||
};
|
||||
|
||||
meta.homepage = "http://www.procmail.org/";
|
||||
}
|
||||
|
||||
29
pkgs/applications/misc/rofi/default.nix
Normal file
29
pkgs/applications/misc/rofi/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig
|
||||
, libX11, libXinerama, libXft, pango
|
||||
, i3Support ? false, i3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rofi-${version}";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "rofi";
|
||||
owner = "DaveDavenport";
|
||||
rev = "${version}";
|
||||
sha256 = "0b8k5g2fpqrz1yac09kmfk4caxcc107qq4yhncnl159xdxw66vz8";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango
|
||||
] ++ stdenv.lib.optional i3Support i3;
|
||||
|
||||
preConfigure = ''
|
||||
autoreconf -vif
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Window switcher, run dialog and dmenu replacement";
|
||||
homepage = https://davedavenport.github.io/rofi;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
|
||||
sha1 = "0939dd0258b042c7b7d4d3a3bff8e476c380885b";
|
||||
sha1 = "bcbfe0e4aa3236582c3b5c49619641224cf942df";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
}:
|
||||
|
||||
let pname = "liferea";
|
||||
version = "1.10.13";
|
||||
version = "1.10.14";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
|
||||
sha256 = "0yz5sj960w0w6fdx32fdm4rzrav9l8ajid1d8g7n398hjh4mm0q1";
|
||||
sha256 = "0szazfknarw6ivnr4flr928ar309pz2mv6alc6pk6l1i9jchcnfs";
|
||||
};
|
||||
|
||||
buildInputs = with gst_all_1; [
|
||||
|
||||
@ -2,16 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "rdesktop";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
|
||||
sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv";
|
||||
sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8";
|
||||
};
|
||||
|
||||
patches = [ ./enable_windows_key.patch ];
|
||||
|
||||
buildInputs = [openssl libX11];
|
||||
|
||||
configureFlags = [
|
||||
@ -24,6 +22,6 @@ stdenv.mkDerivation (rec {
|
||||
description = "Open source client for Windows Terminal Services";
|
||||
homepage = http://www.rdesktop.org/;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
http://sourceforge.net/p/rdesktop/code/1816/
|
||||
Fix constant naming and enabled windowskey by default.
|
||||
|
||||
Index: trunk/rdesktop.c
|
||||
===================================================================
|
||||
--- trunk/rdesktop.c (revision 1815)
|
||||
+++ trunk/rdesktop.c (revision 1816)
|
||||
@@ -554,7 +554,7 @@
|
||||
act.sa_flags = 0;
|
||||
sigaction(SIGPIPE, &act, NULL);
|
||||
|
||||
- flags = RDP_LOGON_NORMAL;
|
||||
+ flags = RDP_LOGON_NORMAL | RDP_LOGON_ENABLEWINDOWSKEY;
|
||||
prompt_password = False;
|
||||
g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0;
|
||||
g_embed_wnd = 0;
|
||||
Index: trunk/constants.h
|
||||
===================================================================
|
||||
--- trunk/constants.h (revision 1815)
|
||||
+++ trunk/constants.h (revision 1816)
|
||||
@@ -321,7 +321,7 @@
|
||||
#define RDP_LOGON_AUTO 0x0008
|
||||
#define RDP_LOGON_NORMAL 0x0033
|
||||
#define RDP_LOGON_COMPRESSION 0x0080 /* mppc compression with 8kB histroy buffer */
|
||||
-#define RDP_LOGON_BLOB 0x0100
|
||||
+#define RDP_LOGON_ENABLEWINDOWSKEY 0x0100
|
||||
#define RDP_LOGON_COMPRESSION2 0x0200 /* rdp5 mppc compression with 64kB history buffer */
|
||||
#define RDP_LOGON_LEAVE_AUDIO 0x2000
|
||||
#define RDP_LOGON_PASSWORD_IS_SC_PIN 0x40000
|
||||
32
pkgs/applications/networking/sipcmd/default.nix
Normal file
32
pkgs/applications/networking/sipcmd/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv, fetchgit, opal, ptlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
rev = "3090e9f";
|
||||
|
||||
name = "sipcmd-${rev}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/tmakkonen/sipcmd";
|
||||
rev = "${rev}";
|
||||
sha256 = "072h9qapmz46r8pxbzkfmc4ikd7dv9g8cgrfrw21q942icbrvq2c";
|
||||
};
|
||||
|
||||
buildInputs = [ opal ptlib ];
|
||||
|
||||
buildPhase = ''
|
||||
make IFLAGS="-I${opal}/include/opal -I${ptlib}/include -Isrc/ -L${opal}/lib -L${ptlib}/lib"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
cp sipcmd $out/bin/sipcmd
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/tmakkonen/sipcmd;
|
||||
description = "sipcmd - the command line SIP/H.323/RTP softphone";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkwave-3.3.62";
|
||||
name = "gtkwave-3.3.64";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
|
||||
sha256 = "1ykc5j11rkfcinsl9cza9k93jwvcj04xxz0i446lwby4svcbaa9i";
|
||||
sha256 = "05bisdh82rsbs0pj0687dzbp0s30p3wzq4gypb9bbjaxwnrmdsfs";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];
|
||||
|
||||
@ -32,9 +32,13 @@ buildPythonPackage rec {
|
||||
--install-lib=$out/lib/${python27.libPrefix}/site-packages \
|
||||
--prefix="$out"
|
||||
|
||||
mkdir -p $out/share/gsettings-schemas/$name
|
||||
mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/meld \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
|
||||
'';
|
||||
|
||||
|
||||
@ -1,14 +1,12 @@
|
||||
{stdenv, fetchgit}:
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rev = "ef15aeeb0553efb698e3d4261e79eff77a136ee7";
|
||||
version = "1.20141026";
|
||||
name = "vcsh-${version}_${builtins.substring 0 7 rev}";
|
||||
version = "1.20141026-1";
|
||||
name = "vcsh-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/RichiH/vcsh";
|
||||
sha256 = "1dg6ina2wpy406s5x0x4r7khx6gc42hfak0gjwy0i53ivkckl1nd";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RichiH/vcsh/archive/v${version}.tar.gz";
|
||||
sha256 = "1wgrmkygsbmk8zj88kjx9aim2fc44hh2d1a83h4mn2j714pffh33";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4
|
||||
, phonon , makeWrapper, mlt, gettext , qimageblitz, qjson
|
||||
, shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies
|
||||
, libv4l
|
||||
, libv4l, oxygen_icons
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
||||
shared_mime_info soprano
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ oxygen_icons ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -13,15 +13,16 @@
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
|
||||
assert (withQt5 -> qt5 != null);
|
||||
assert (!withQt5 -> qt4 != null);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vlc-${version}";
|
||||
version = "2.1.5";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz";
|
||||
sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg";
|
||||
sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "docker-${version}";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
|
||||
sha256 = "0d98c7dfzv1gj5ssbyln4pbkbml6rrmy22v5v4ricbsx9qhhwc1l";
|
||||
sha256 = "0j1wlh0jj84ly3iykp2iqvm01g5il5v56fvlrfvx6qsslyrs35yg";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python
|
||||
, makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
|
||||
, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
|
||||
, avahi, dconf, spiceSupport ? true, spice_gtk
|
||||
, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -9,12 +9,12 @@ with pythonPackages;
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "virt-manager-${version}";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
|
||||
sha256 = "1n248kack1fni8y17ysgq5xhvffcgy4l62hnd0zvr4kjw0579qq8";
|
||||
sha256 = "0hbr1wf4byfvbqlbq3w6s71ckhn626i4rb497y4z2cm12p5hc2db";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
paste_deploy m2crypto ipy twisted sqlalchemy_migrate
|
||||
distutils_extra simplejson readline glance cheetah lockfile httplib2
|
||||
urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
|
||||
libvirt libxml2Python ipaddr vte
|
||||
libvirt libxml2Python ipaddr vte libosinfo
|
||||
] ++ optional spiceSupport spice_gtk;
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -11,10 +11,10 @@ with stdenv.lib;
|
||||
|
||||
let sourceInfo = rec {
|
||||
baseName="virt-viewer";
|
||||
version="1.0";
|
||||
version="2.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
|
||||
hash="09sf1xzvw2yysv4c1jkqlzrazdg501r4j12hiwjdzk5swk6lppw0";
|
||||
hash="0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9";
|
||||
}; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
46
pkgs/applications/virtualization/xen/4.4.1.nix
Normal file
46
pkgs/applications/virtualization/xen/4.4.1.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
let
|
||||
# Xen 4.4.1
|
||||
xenConfig = {
|
||||
name = "xen-4.4.1";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://bits.xensource.com/oss-xen/release/4.4.1/xen-4.4.1.tar.gz";
|
||||
sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m";
|
||||
};
|
||||
|
||||
# Sources needed to build the xen tools and tools/firmware.
|
||||
toolsGits =
|
||||
[ # tag qemu-xen-4.4.1
|
||||
{ name = "qemu-xen";
|
||||
url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git;
|
||||
rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4";
|
||||
sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18";
|
||||
}
|
||||
# tag xen-4.4.1
|
||||
{ name = "qemu-xen-traditional";
|
||||
url = git://xenbits.xen.org/qemu-xen-4.4-testing.git;
|
||||
rev = "6ae4e588081620b141071eb010ec40aca7e12876";
|
||||
sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded";
|
||||
}
|
||||
];
|
||||
|
||||
firmwareGits =
|
||||
[ # tag 1.7.3.1
|
||||
{ name = "seabios";
|
||||
url = git://xenbits.xen.org/seabios.git;
|
||||
rev = "7d9cbe613694924921ed1a6f8947d711c5832eee";
|
||||
sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87";
|
||||
}
|
||||
{ name = "ovmf";
|
||||
url = git://xenbits.xen.org/ovmf.git;
|
||||
rev = "447d264115c476142f884af0be287622cd244423";
|
||||
sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
|
||||
}
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
|
||||
58
pkgs/applications/virtualization/xen/4.5.0.nix
Normal file
58
pkgs/applications/virtualization/xen/4.5.0.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ callPackage, fetchurl, fetchgit, ... } @ args:
|
||||
|
||||
let
|
||||
# Xen 4.5.0
|
||||
xenConfig = {
|
||||
name = "xen-4.5.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz";
|
||||
sha256 = "0fvg00d596gh6cfm51xr8kj2mghcyivrf6np3dafnbldnbi41nsv";
|
||||
};
|
||||
|
||||
# Sources needed to build the xen tools and tools/firmware.
|
||||
firmwareGits =
|
||||
[ # tag 1.7.5
|
||||
{ name = "seabios";
|
||||
url = git://xenbits.xen.org/seabios.git;
|
||||
rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2";
|
||||
sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb";
|
||||
}
|
||||
{ name = "ovmf";
|
||||
url = git://xenbits.xen.org/ovmf.git;
|
||||
rev = "447d264115c476142f884af0be287622cd244423";
|
||||
sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
|
||||
}
|
||||
];
|
||||
|
||||
toolsGits =
|
||||
[ # tag qemu-xen-4.5.0
|
||||
{ name = "qemu-xen";
|
||||
url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git;
|
||||
rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99";
|
||||
sha256 = "1j312q2mqvkvby9adkkxf7f1pn3nz85g5mr9nbg4qpf2y9cg122z";
|
||||
}
|
||||
# tag xen-4.5.0
|
||||
{ name = "qemu-xen-traditional";
|
||||
url = git://xenbits.xen.org/qemu-xen-4.5-testing.git;
|
||||
rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22";
|
||||
sha256 = "ce52b5108936c30ab85ec0c9554f88d5e7b34896f3acb666d56765b49c86f2af";
|
||||
}
|
||||
];
|
||||
|
||||
xenserverPatches = let
|
||||
patches = {
|
||||
url = https://github.com/ts468/xen-4.5.pg.git;
|
||||
rev = "3442b65b490f43c817cbc53369220d0b1ab9b785";
|
||||
sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845";
|
||||
};
|
||||
in ''
|
||||
cp -r ${fetchgit patches}/master patches
|
||||
quilt push -a
|
||||
substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE"
|
||||
'';
|
||||
};
|
||||
|
||||
in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
|
||||
|
||||
89
pkgs/applications/virtualization/xen/default.nix → pkgs/applications/virtualization/xen/generic.nix
89
pkgs/applications/virtualization/xen/default.nix → pkgs/applications/virtualization/xen/generic.nix
@ -3,46 +3,20 @@
|
||||
, lvm2, utillinux, procps, texinfo, perl, pythonPackages
|
||||
, glib, bridge-utils, xlibs, pixman, iproute, udev, bison
|
||||
, flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl
|
||||
, checkpolicy, transfig, glusterfs, fetchgit, xz }:
|
||||
, checkpolicy, transfig, glusterfs, fetchgit, xz, spice
|
||||
, spice_protocol, usbredir, alsaLib, quilt
|
||||
, coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools
|
||||
, inetutils, iptables, openvswitch, nbd, drbd, xenConfig
|
||||
, xenserverPatched ? false, ... }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "4.4.1";
|
||||
|
||||
libDir = if stdenv.is64bit then "lib64" else "lib";
|
||||
|
||||
# Sources needed to build the xen tools and tools/firmware.
|
||||
toolsGits =
|
||||
[ # tag qemu-xen-4.4.1
|
||||
#{ name = "qemu-xen";
|
||||
# url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git;
|
||||
# rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4";
|
||||
# sha256 = "e7abaf0e927f7a2bba4c59b6dad6ae19e77c92689c94fa0384e2c41742f8cdb6";
|
||||
#}
|
||||
# tag xen-4.4.1
|
||||
{ name = "qemu-xen-traditional";
|
||||
url = git://xenbits.xen.org/qemu-xen-4.4-testing.git;
|
||||
rev = "6ae4e588081620b141071eb010ec40aca7e12876";
|
||||
sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded";
|
||||
}
|
||||
];
|
||||
firmwareGits =
|
||||
[ # tag 1.7.3.1
|
||||
{ name = "seabios";
|
||||
url = git://xenbits.xen.org/seabios.git;
|
||||
rev = "7d9cbe613694924921ed1a6f8947d711c5832eee";
|
||||
sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87";
|
||||
}
|
||||
{ name = "ovmf";
|
||||
url = git://xenbits.xen.org/ovmf.git;
|
||||
rev = "447d264115c476142f884af0be287622cd244423";
|
||||
sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
# Sources needed to build the stubdoms and tools
|
||||
# These sources are already rather old and probably do not change frequently
|
||||
xenExtfiles = [
|
||||
{ url = http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz;
|
||||
sha256 = "13wlr85s1hnvia6a698qpryyy12lvmqw0a05xmjnd0h71ralsbkp";
|
||||
@ -76,15 +50,15 @@ let
|
||||
}
|
||||
];
|
||||
|
||||
scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin")
|
||||
[ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools
|
||||
iproute inetutils iptables bridge-utils openvswitch nbd drbd ]));
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xen-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
|
||||
sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m";
|
||||
};
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (xenConfig) name version src;
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@ -95,11 +69,15 @@ stdenv.mkDerivation {
|
||||
glib bridge-utils pixman iproute udev bison xlibs.libX11
|
||||
flex ocaml ocamlPackages.findlib figlet libaio
|
||||
checkpolicy pythonPackages.markdown transfig
|
||||
glusterfs cmake
|
||||
glusterfs cmake spice spice_protocol usbredir
|
||||
alsaLib quilt
|
||||
];
|
||||
|
||||
pythonPath = [ pythonPackages.curses ];
|
||||
|
||||
patchPhase = if ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig))
|
||||
then xenConfig.xenserverPatches
|
||||
else "";
|
||||
|
||||
preConfigure = ''
|
||||
# Fake wget: copy prefetched downloads instead
|
||||
@ -111,6 +89,13 @@ stdenv.mkDerivation {
|
||||
export PATH=$PATH:$PWD/wget
|
||||
'';
|
||||
|
||||
# TODO: If multiple arguments are given with with-extra-qemuu,
|
||||
# then the configuration aborts; the reason is unclear.
|
||||
# If you know how to fix it, please let me know! :)
|
||||
#configureFlags = "--with-extra-qemuu-configure-args='--enable-spice --enable-usb-redir --enable-linux-aio'";
|
||||
|
||||
# TODO: Flask needs more testing before enabling it by default.
|
||||
#makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
|
||||
makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
|
||||
|
||||
buildFlags = "xen tools stubdom";
|
||||
@ -136,6 +121,12 @@ stdenv.mkDerivation {
|
||||
substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \
|
||||
--replace /usr/include/pci ${pciutils}/include/pci
|
||||
|
||||
substituteInPlace tools/hotplug/Linux/xen-backend.rules \
|
||||
--replace /etc/xen/scripts $out/etc/xen/scripts
|
||||
|
||||
# blktap is not provided by xen, but by xapi
|
||||
sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules
|
||||
|
||||
# Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
|
||||
# print the GCC version number properly.
|
||||
substituteInPlace xen/Makefile \
|
||||
@ -157,15 +148,17 @@ stdenv.mkDerivation {
|
||||
# overriden at runtime.
|
||||
substituteInPlace tools/hotplug/Linux/init.d/xendomains \
|
||||
--replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
|
||||
--replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \
|
||||
--replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \
|
||||
--replace /bin/ls ls
|
||||
|
||||
# Xen's tools and firmares need various git repositories that it
|
||||
# usually checks out at time using git. We can't have that.
|
||||
${flip concatMapStrings toolsGits (x: let src = fetchgit x; in ''
|
||||
${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x; in ''
|
||||
cp -r ${src} tools/${src.name}-dir-remote
|
||||
chmod +w tools/${src.name}-dir-remote
|
||||
'')}
|
||||
${flip concatMapStrings firmwareGits (x: let src = fetchgit x; in ''
|
||||
${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x; in ''
|
||||
cp -r ${src} tools/firmware/${src.name}-dir-remote
|
||||
chmod +w tools/firmware/${src.name}-dir-remote
|
||||
'')}
|
||||
@ -189,18 +182,24 @@ stdenv.mkDerivation {
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out
|
||||
mkdir -p $out $out/share
|
||||
cp -prvd dist/install/nix/store/*/* $out/
|
||||
cp -prvd dist/install/boot $out/boot
|
||||
cp -prvd dist/install/etc $out/etc
|
||||
cp -prvd dist/install/etc $out
|
||||
cp -dR docs/man1 docs/man5 $out/share/man/
|
||||
wrapPythonPrograms
|
||||
''; # */
|
||||
substituteInPlace $out/etc/xen/scripts/hotplugpath.sh --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\"
|
||||
|
||||
shopt -s extglob
|
||||
for i in $out/etc/xen/scripts/!(*.sh); do
|
||||
sed -i '2s@^@export PATH=$out/bin:${scriptEnvPath}@' $i
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xen.org/;
|
||||
description = "Xen hypervisor and management tools for Dom0";
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with stdenv.lib.maintainers; [ eelco tstrobel ];
|
||||
};
|
||||
}
|
||||
@ -4,19 +4,20 @@
|
||||
, libXinerama
|
||||
, imlib2 }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "fluxbox-${version}";
|
||||
version = "1.3.5";
|
||||
version = "1.3.7";
|
||||
|
||||
buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fluxbox/${name}.tar.bz2";
|
||||
sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983";
|
||||
url = "mirror://sourceforge/fluxbox/${name}.tar.xz";
|
||||
sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = {
|
||||
description = "Full-featured, light-resource X window manager";
|
||||
longDescription = ''
|
||||
Fluxbox is a X window manager based on Blackbox 0.61.1 window
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
|
||||
, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl
|
||||
, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy }:
|
||||
, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy, libxkbcommon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "i3-${version}";
|
||||
version = "4.8";
|
||||
version = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://i3wm.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "0sqvd8yqf9vwqrrvbpbf8k93b3qfa3q9289m82xq15r31wlk8b2h";
|
||||
sha256 = "0n6hfma058iykfxnl1m23mkh8y5sx1x80s3fxfdngbd9wc41kqxy";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm
|
||||
which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon
|
||||
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
|
||||
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
|
||||
perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
|
||||
@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
|
||||
mkdir -p $out/man/man1
|
||||
cp man/*.1 $out/man/man1
|
||||
for program in $out/bin/i3-sensible-*; do
|
||||
sed -i 's/which/command -v/' $program
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wmCalClock-1.25";
|
||||
src = fetchurl {
|
||||
url = http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz;
|
||||
sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libX11 libXpm libXext ];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/Src";
|
||||
|
||||
buildPhase=''
|
||||
make prefix=$out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
mkdir -pv $out/man/man1
|
||||
make DESTDIR=$out install
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Clock for Windowmaker";
|
||||
homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.bstrik ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wmsystemtray-1.4";
|
||||
src = fetchurl {
|
||||
url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz;
|
||||
sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libX11 libXpm libXext libXfixes libXmu ];
|
||||
|
||||
meta = {
|
||||
description = "Systemtray for Windowmaker";
|
||||
homepage = "http://wmsystemtray.sourceforge.net";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.bstrik ];
|
||||
};
|
||||
}
|
||||
@ -423,7 +423,7 @@ rec {
|
||||
set +o pipefail
|
||||
for i in $rpms; do
|
||||
echo "$i..."
|
||||
${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional
|
||||
${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional --extract-over-symlinks
|
||||
done
|
||||
|
||||
eval "$preInstall"
|
||||
|
||||
@ -15,6 +15,10 @@ in
|
||||
buildInputs = [ udev ];
|
||||
nativeBuildInputs = [ pkgconfig python3 ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./tools
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="$configureFlags --with-udevdir=$out/lib/udev"
|
||||
'';
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, pkgconfig, e19 }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "terminology-${version}";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
|
||||
sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5";
|
||||
sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628";
|
||||
};
|
||||
buildInputs = [ pkgconfig e19.efl e19.elementary ];
|
||||
preConfigure = ''
|
||||
|
||||
@ -108,7 +108,7 @@ let
|
||||
kwin = with pkgs; super.kwin // {
|
||||
buildInputs = with xlibs;
|
||||
super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
|
||||
patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ./kwin/libinput-0.8.patch ];
|
||||
patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
|
||||
};
|
||||
|
||||
libkscreen = with pkgs; super.libkscreen // {
|
||||
|
||||
@ -241,6 +241,14 @@
|
||||
propagatedUserEnvPkgs = [ ];
|
||||
};
|
||||
|
||||
plasma-workspace-wallpaper = {
|
||||
buildInputs = [ "ECM" ];
|
||||
nativeBuildInputs = [ "cmake" ];
|
||||
propagatedBuildInputs = [ ];
|
||||
propagatedNativeBuildInputs = [ ];
|
||||
propagatedUserEnvPkgs = [ ];
|
||||
};
|
||||
|
||||
plasma-workspace-wallpapers = {
|
||||
buildInputs = [ "ECM" ];
|
||||
nativeBuildInputs = [ "cmake" ];
|
||||
|
||||
@ -325,4 +325,328 @@
|
||||
name = "kwin-5.2.0.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kio-extras-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/79invr6hmjir390chxkbqwijfl47sn44-kio-extras-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kio-extras-5.2.1.tar.xz";
|
||||
sha256 = "0b410hrwpanshvnr3qsgcpza142d178nr3hsgb0r0ssfh0wycmm8";
|
||||
name = "kio-extras-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/wp46hfmfna4343jryqnxgkx0i73w206m-kde-gtk-config-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kde-gtk-config-5.2.1.tar.xz";
|
||||
sha256 = "0d1ll4wx1wr14rczjmzxpfiwp67i0ljn172c9w8vhvrv7gy579vw";
|
||||
name = "kde-gtk-config-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "oxygen-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/qsi6ridvxykn2qpdq6h8s85dcnn04l1a-oxygen-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/oxygen-5.2.1.tar.xz";
|
||||
sha256 = "1aj9y24ii51av8ydkk07nj666xk6igqkqqhlcpcc513qy87l041l";
|
||||
name = "oxygen-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "khotkeys-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/98gn6w9nnzl0901dgs7kzm9j5kgf9i75-khotkeys-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/khotkeys-5.2.1.tar.xz";
|
||||
sha256 = "012hnykqwx4asmbsd84kqzrq90bwkpryh7nribpsc99kwlngdgsn";
|
||||
name = "khotkeys-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "plasma-desktop-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/ndkx7f2agaxdgn0l8yz9p3a0ahkhbyy8-plasma-desktop-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/plasma-desktop-5.2.1.tar.xz";
|
||||
sha256 = "08pjyvb8lzjd0pmc72k8c6jcgprzq0g8psd5vhmvw614j9pz1a5d";
|
||||
name = "plasma-desktop-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "baloo-5.6.1.tar.xz" ".tar";
|
||||
store = "/nix/store/qjcgng89qgribr5np0vrvj86jvvprsg4-baloo-5.6.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/baloo-5.6.1.tar.xz";
|
||||
sha256 = "1agf2vqkx9hb95di99c65752q9wjnyhkz1iwwvyk1n1a7jzvdqf2";
|
||||
name = "baloo-5.6.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "sddm-kcm-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/g5lazmji9vlyiqkl6sj8h6i0yzdgnx1k-sddm-kcm-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/sddm-kcm-5.2.1.tar.xz";
|
||||
sha256 = "0jjis582j1rk8ss64ys94izsg29sik0khv3czzw5zjqns22kn2r3";
|
||||
name = "sddm-kcm-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "powerdevil-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/dv4cbwkmvpinz0v3s9y6p0ifci0q5fh0-powerdevil-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/powerdevil-5.2.1.tar.xz";
|
||||
sha256 = "147hpzwmw0vxysp7wv0fhmrgaw1aclap70ii7i5pz05k093xngfm";
|
||||
name = "powerdevil-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "plasma-workspace-wallpaper-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/mfchg5yspiyzvhhp5qh6j3zwfnwpca70-plasma-workspace-wallpaper-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-wallpaper-5.2.1.tar.xz";
|
||||
sha256 = "0cr6s3rs2gz8cq93q7l2w2g0ibzqqlyh0v1nkzhpyxqq0vggjliw";
|
||||
name = "plasma-workspace-wallpaper-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "libbluedevil-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/iwiksm38d0ywn3x4rvcfjiynknxmy628-libbluedevil-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/libbluedevil-5.2.1.tar.xz";
|
||||
sha256 = "1wqk03pxl2bzy4f77fy1zwlrlv3k96x9xz8qnavkir9j0i3ijndp";
|
||||
name = "libbluedevil-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kfilemetadata-5.6.1.tar.xz" ".tar";
|
||||
store = "/nix/store/m3f02ph2gqj8zw3p1kq86ih6m423i670-kfilemetadata-5.6.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kfilemetadata-5.6.1.tar.xz";
|
||||
sha256 = "0w6dzhng4wp4mrxnq6859np6j3h9iydj4dscp1qr3zc0y377blw3";
|
||||
name = "kfilemetadata-5.6.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "milou-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/f5979rdy20yxjbh9qif3wf7sylhdfr5i-milou-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/milou-5.2.1.tar.xz";
|
||||
sha256 = "1q5bfw7wbgq3gz5r3sdvx7rmsf4cbj501cy1asl6bf1grshjqiyn";
|
||||
name = "milou-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "ksysguard-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/6llw96fvpb79s3482w0v3ahb6qzn8czi-ksysguard-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/ksysguard-5.2.1.tar.xz";
|
||||
sha256 = "06sr86siw43ly1c8iqjd672szxxjqxl6n8gnxmf92h3qqh1i8a2k";
|
||||
name = "ksysguard-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kmenuedit-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/fka4bg5h2hz93knjv2kqvz62dg5pk805-kmenuedit-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kmenuedit-5.2.1.tar.xz";
|
||||
sha256 = "0kpfxgm8jfm2lyf7wxmnnl9flligmds8f6fy1cy36fqxpzhcal98";
|
||||
name = "kmenuedit-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "systemsettings-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/942knn924cz51wwn3jimhcp799zlc7c8-systemsettings-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/systemsettings-5.2.1.tar.xz";
|
||||
sha256 = "0ib84irgdbjd3sga7csjx59c2wxg34yr3j9a8ajhqvdq34yb14n4";
|
||||
name = "systemsettings-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "muon-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/fvq7swhq8343kr70vjsl11bv1c3ayw3k-muon-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/muon-5.2.1.tar.xz";
|
||||
sha256 = "115a7q2ns0h6lszn1lq84y5bk02fm4ly3alxkig7976jh8rbykxf";
|
||||
name = "muon-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "plasma-nm-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/igw2v8zgczarw9ynxf473mfl76y6wd4j-plasma-nm-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/plasma-nm-5.2.1.tar.xz";
|
||||
sha256 = "1c4gkxv24kdl2b5gslljihwh5h0v970f70802swblgrp87819bfj";
|
||||
name = "plasma-nm-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "libksysguard-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/zkrwgpjsa2761wpmic225szjs4503kss-libksysguard-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/libksysguard-5.2.1.tar.xz";
|
||||
sha256 = "0f0s3hafdvgvscfbvkkdll95rzxa44j89qm7cmsclaqclmnwcfa2";
|
||||
name = "libksysguard-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/gsni5ny5qx2j1vic0q1pa0xb0126x2z0-polkit-kde-agent-1-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/polkit-kde-agent-1-5.2.1.tar.xz";
|
||||
sha256 = "0scmsiwwmmz1by8yzh5waa8ngp13hk7yihxh0bf0mfph8zkv3jf4";
|
||||
name = "polkit-kde-agent-1-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kwin-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/n8bydi50mqc41sxh95v1zyncfh157am1-kwin-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kwin-5.2.1.tar.xz";
|
||||
sha256 = "1cp7rak0y7jjizj9ampx2wcvra0kffxjs7grd2j57s4qy3z9az6i";
|
||||
name = "kwin-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/cmrfclyx47g0byimi9fk2vgc92mi8vjd-plasma-workspace-wallpapers-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-wallpapers-5.2.1.tar.xz";
|
||||
sha256 = "0dhbwygbxzjxzklcrqa2429k1harl9gz33l9183bz3q62iwcxf0x";
|
||||
name = "plasma-workspace-wallpapers-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "bluedevil-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/5mj21ln4sm2i32xbhzbadjhgxhig0fjs-bluedevil-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/bluedevil-5.2.1.tar.xz";
|
||||
sha256 = "1jahp2a8v4hmar8qfiw04miiih5br5s3jpkqlqmmpc56vn1czx6m";
|
||||
name = "bluedevil-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kinfocenter-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/cww4i8a48yhm0mddak67lqy9lld20wy3-kinfocenter-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kinfocenter-5.2.1.tar.xz";
|
||||
sha256 = "141mkk1gnhmnxxk0j1mn4p5zzwyjkbbwmwbpqq2adaar18p917i8";
|
||||
name = "kinfocenter-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kscreen-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/h65gaypalzzqfgq3vcc495cdan9k4p5v-kscreen-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kscreen-5.2.1.tar.xz";
|
||||
sha256 = "164vwvqrvzjczg2nbi9wkpnk8yki240iz2h5j50n5gkqvgg0w7df";
|
||||
name = "kscreen-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/hlcr09wkzjs62vwawsi9d611n0gxrixp-oxygen-fonts-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/oxygen-fonts-5.2.1.tar.xz";
|
||||
sha256 = "0xnhh135yihmv40imd3mibwzcfdxgbn1mk4rjrsj5fqni113f0lm";
|
||||
name = "oxygen-fonts-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "libkscreen-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/6xs5v03w12rmqpz235sk9scxap51s2db-libkscreen-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/libkscreen-5.2.1.tar.xz";
|
||||
sha256 = "0i7vm73gs1f715fnmacrdnvk1hij03d72fr70wwa3x18cdcg4qas";
|
||||
name = "libkscreen-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "breeze-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/8sr3b4ah8ds74wgfna9zcnq6vm5s3kn3-breeze-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/breeze-5.2.1.tar.xz";
|
||||
sha256 = "0qdps15mr897s2pcjdci4nyg81n3j90ksz7jybqfkd0gr9l14iy5";
|
||||
name = "breeze-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "libmm-qt-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/cgj3wzm22izb1hvbx3wdd18zw3wswgil-libmm-qt-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/libmm-qt-5.2.1.tar.xz";
|
||||
sha256 = "0n3q4bgj4ijrx7hdrnbbhxfnw4w97vgj5ba341qwf89hkhc4dhwn";
|
||||
name = "libmm-qt-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kwrited-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/l3swq17a373a0z131mvqn4xa0nwsvjp5-kwrited-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kwrited-5.2.1.tar.xz";
|
||||
sha256 = "006y89c7pxzc55lrkjrvyrywj4j95641n3j0b5vjr2mgxcnv8q7a";
|
||||
name = "kwrited-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/06vk8iv3k4xb96rghh6jva6zj8q9a7ha-kdeplasma-addons-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kdeplasma-addons-5.2.1.tar.xz";
|
||||
sha256 = "1lfb6f5h1qjbl0zyqw5q98b27hw16lszyk1nacgncp3ig1y177r3";
|
||||
name = "kdeplasma-addons-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "ksshaskpass-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/fydms9jaal65yga60hngnz7hmz268wi2-ksshaskpass-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/ksshaskpass-5.2.1.tar.xz";
|
||||
sha256 = "18wa7naxv7g7zrrkrbh9iljd4h479cq6xmair5iqc0cbbfw7znm0";
|
||||
name = "ksshaskpass-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/1rm663f8mdif77m0wrkib534yskj0g6n-kde-cli-tools-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kde-cli-tools-5.2.1.tar.xz";
|
||||
sha256 = "0zxrn1j4lmlj0s6j5245sd0ykg9wa93i0d8qzca4rjxn5mh87v9q";
|
||||
name = "kde-cli-tools-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kdecoration-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/06pjfn5j8lwbd7dj808mjs2bsfwbc3hr-kdecoration-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kdecoration-5.2.1.tar.xz";
|
||||
sha256 = "0910hgh64xbap213sjj1bbxwmibi74chdyyp2qc149f5anqs3fcy";
|
||||
name = "kdecoration-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "kwayland-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/03np6kr81s99j3ijzq236ywc8nkxpy0j-kwayland-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/kwayland-5.2.1.tar.xz";
|
||||
sha256 = "1c7h9csiam65jkrlg81iqi9y7q3mf63af87zkf6nfalbmz6j0p8l";
|
||||
name = "kwayland-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "khelpcenter-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/2ws6508gv1m375l4xcyf6pa8q5c26748-khelpcenter-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/khelpcenter-5.2.1.tar.xz";
|
||||
sha256 = "17sl0va35p420s8lmyz1pzyhzmrssvakc3w06xjj7f6hvgh8iqxw";
|
||||
name = "khelpcenter-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = stdenv.lib.nameFromURL "plasma-workspace-5.2.1.tar.xz" ".tar";
|
||||
store = "/nix/store/04b1cp5432y80dl8a55xy4nvw586f33c-plasma-workspace-5.2.1.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-5.2.1.tar.xz";
|
||||
sha256 = "0ldls1q5f88imc4cvxizssizswfgalh9ix95ab7p5f6ylizagp63";
|
||||
name = "plasma-workspace-5.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@ -6,6 +6,7 @@ if [ $# -eq 0 ]; then
|
||||
# from recursing over the whole server! (No, it's not a bug.)
|
||||
$(nix-build ../../.. -A autonix.manifest) \
|
||||
http://download.kde.org/stable/plasma/5.2.0/ \
|
||||
http://download.kde.org/stable/plasma/5.2.1/ \
|
||||
-A '*.tar.xz'
|
||||
|
||||
else
|
||||
|
||||
65
pkgs/development/compilers/cudatoolkit/6.5.nix
Normal file
65
pkgs/development/compilers/cudatoolkit/6.5.nix
Normal file
@ -0,0 +1,65 @@
|
||||
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
|
||||
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
|
||||
}:
|
||||
|
||||
let version = "6.5.19"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cudatoolkit-${version}";
|
||||
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_${version}_linux_64.run";
|
||||
sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
|
||||
}
|
||||
else throw "cudatoolkit does not support platform ${stdenv.system}";
|
||||
|
||||
outputs = [ "out" "sdk" ];
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
runtimeDependencies = [
|
||||
ncurses expat python zlib
|
||||
xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
|
||||
gtk2 glib fontconfig freetype unixODBC alsaLib
|
||||
];
|
||||
|
||||
rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64";
|
||||
|
||||
unpackPhase = ''
|
||||
sh $src --keep --noexec
|
||||
cd pkg/run_files
|
||||
sh cuda-linux64-rel-${version}-*.run --keep --noexec
|
||||
sh cuda-samples-linux-${version}-*.run --keep --noexec
|
||||
cd pkg
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
find . -type f -executable -exec patchelf \
|
||||
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||
'{}' \; || true
|
||||
find . -type f -exec patchelf \
|
||||
--set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
|
||||
--force-rpath \
|
||||
'{}' \; || true
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out $sdk
|
||||
perl ./install-linux.pl --prefix="$out"
|
||||
rm $out/tools/CUDA_Occupancy_Calculator.xls
|
||||
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
|
||||
mv $out/include $out/usr_include
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nasm-${version}";
|
||||
version = "2.11.05"; # do not update until syslinux is fixed with that version
|
||||
version = "2.11.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
|
||||
sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa";
|
||||
sha256 = "0ialkla6i63j8fpv840jy7k5mdf2wbqr98bvbcq0dp0b38ls18wx";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -47,7 +47,7 @@ EuclideanGeometry = "11n8877zksgksdfcj7arjx0zcfhsrvg83lcp6yb2bynvfp80gyzb";
|
||||
EulerFormula = "1nhh49rf6wza2m5qmz5l5m24m299qn3v80wqzvf51lybadzll2h6";
|
||||
ExactRealArithmetic = "1p32g13sx2z5rj3q6390ym8902gvl5x16wdhgz5i75y44s6kmkb1";
|
||||
Exceptions = "0w2b16nr80f70dxllmhbqwfr1aw26rcfbak5bdyc0fna8hqp4q3p";
|
||||
#FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6";
|
||||
FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6";
|
||||
FSSecModel = "0fi78vqfrw4vrmdw215ic08rw8y6aia901wqs4f1s9z2idd6m8qy";
|
||||
FSets = "1n54s2vr6snh31jnvr79q951vyk0w0w6jrnwnlz9d3vyw47la9js";
|
||||
Fairisle = "0gg9x69qr0zflaryniqnl8d34kjdij0i55fcb1f1i5hmrwn2sqn6";
|
||||
@ -135,10 +135,10 @@ RulerCompassGeometry = "02vm80xvvw22pdxrag3pv5zrhqf8726i9jqsiv4bnjqavj5z2hdr";
|
||||
SMC = "0ca3ar1y9nyj5147r18babqsbg2q2ywws8fdi91xb5z9m3i97nv1";
|
||||
Schroeder = "0mfbjmw4a48758k88yv01494wnywcp5yamkl394axvvbbna9h8b6";
|
||||
SearchTrees = "1jyps6ddm8klmxjm50p2j9i014ij7imy3229pwz3dkzg54gxzzxb";
|
||||
#Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580";
|
||||
Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580";
|
||||
Shuffle = "14v1m4s9k49w30xrnyncjzgqjcckiga8wd2vnnzy8axrwr9zq7iq";
|
||||
SquareMatrices = "07dlykg3w59crc54qqdqxq6hf8rmzvwwfr1g8z8v2l8h4yvfnhfl";
|
||||
Ssreflect = "1capfvkdnsv95ik0yj9kpwj4smm7i7n2n98d6rlv68bdd2abw9f3";
|
||||
Ssreflect = "07hv0ixv68d8vrpf9s6gxazxaz5fwpmhqrd6cqw7xp8m8gspxifz";
|
||||
Stalmarck = "0vcbkzappq1si4hxbnb9bjkfk82j3jklb8g8ia83h1mdhzr7xdpz";
|
||||
Streams = "1spcqnvwayahk12fd13vzh922ypzrjkcmws9gcy12qdqp04h8bnc";
|
||||
String = "1wy7g66yq9y8m8y3gq29q7whfdm98g3cj9jxm5yibdzfahfdzzni";
|
||||
|
||||
@ -4,6 +4,15 @@ let
|
||||
mkContrib = import ./mk-contrib.nix;
|
||||
all = import ./all.nix;
|
||||
overrides = {
|
||||
Additions = self: {
|
||||
patchPhase = ''
|
||||
for p in binary_strat dicho_strat generation log2_implementation shift
|
||||
do
|
||||
substituteInPlace $p.v \
|
||||
--replace 'Require Import Euclid.' 'Require Import Coq.Arith.Euclid.'
|
||||
done
|
||||
'';
|
||||
};
|
||||
BDDs = self: {
|
||||
buildInputs = self.buildInputs ++ [ contribs.IntMap ];
|
||||
patchPhase = ''
|
||||
@ -13,6 +22,7 @@ let
|
||||
32d30
|
||||
< extraction
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
@ -25,6 +35,7 @@ let
|
||||
17d16
|
||||
< rauzy/algorithme1/extraction
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
@ -38,6 +49,7 @@ let
|
||||
2d1
|
||||
< -R ../QArithSternBrocot QArithSternBrocot
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
CoRN = self: {
|
||||
@ -47,7 +59,9 @@ let
|
||||
2d1
|
||||
< -R ../MathClasses/ MathClasses
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile.coq
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
installFlags = self.installFlags + " -f Makefile.coq";
|
||||
};
|
||||
Counting = self: {
|
||||
@ -70,6 +84,7 @@ let
|
||||
< -I ../Counting/src
|
||||
< -R ../Counting/theories Counting
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
FingerTree = self: {
|
||||
@ -78,6 +93,22 @@ let
|
||||
21d20
|
||||
< extraction
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
FOUnify = self: {
|
||||
patchPhase = ''
|
||||
patch Make <<EOF
|
||||
8c8
|
||||
< -custom "\$(CAMLOPTLINK) -pp '\$(CAMLBIN)\$(CAMLP4)o' -o unif unif.mli unif.ml main.ml" unif.ml unif
|
||||
---
|
||||
> -custom "\$(CAMLOPTLINK) -pp 'camlp5o' -o unif unif.mli unif.ml main.ml" unif.ml unif
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
cp unif $out/bin/
|
||||
'';
|
||||
};
|
||||
Goedel = self: {
|
||||
@ -85,8 +116,9 @@ let
|
||||
patchPhase = ''
|
||||
patch Make <<EOF
|
||||
2d1
|
||||
< -R ../../Eindhoven/Pocklington Pocklington
|
||||
< -R ../../Eindhoven/Pocklington Pocklington
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
Graphs = self: {
|
||||
@ -96,6 +128,7 @@ let
|
||||
2d1
|
||||
< -R ../../Cachan/IntMap IntMap
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
@ -110,6 +143,7 @@ let
|
||||
2d1
|
||||
< -R ../../Sophia-Antipolis/Algebra/ Algebra
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
Markov = self: { configurePhase = "coq_makefile -o Makefile -R . Markov markov.v"; };
|
||||
@ -129,6 +163,7 @@ let
|
||||
< -R ../../Sophia-Antipolis/Algebra Algebra
|
||||
< -R ../../Nijmegen/LinAlg LinAlg
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
PTSF = self: {
|
||||
@ -138,6 +173,7 @@ let
|
||||
1d0
|
||||
< -R ../../Paris/PTSATR/ PTSATR
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
RelationExtraction = self: {
|
||||
@ -146,6 +182,20 @@ let
|
||||
31d30
|
||||
< test
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
Semantics = self: {
|
||||
patchPhase = ''
|
||||
patch Make <<EOF
|
||||
18a19
|
||||
> interp.mli
|
||||
EOF
|
||||
'';
|
||||
configurePhase = ''
|
||||
coq_makefile -f Make -o Makefile
|
||||
make extract_interpret.vo
|
||||
rm -f str_little.ml.d
|
||||
'';
|
||||
};
|
||||
SMC = self: {
|
||||
@ -155,12 +205,13 @@ let
|
||||
2d1
|
||||
< -R ../../Cachan/IntMap IntMap
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
Ssreflect = self: {
|
||||
patchPhase = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "/bin/mkdir" "mkdir"
|
||||
--replace "/bin/mkdir" "mkdir"
|
||||
'';
|
||||
};
|
||||
Stalmarck = self: {
|
||||
@ -173,6 +224,7 @@ let
|
||||
2d1
|
||||
< -R ../ZornsLemma ZornsLemma
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
TreeAutomata = self: {
|
||||
@ -182,6 +234,7 @@ let
|
||||
2d1
|
||||
< -R ../../Cachan/IntMap IntMap
|
||||
EOF
|
||||
coq_makefile -f Make -o Makefile
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@ -99,7 +99,7 @@ self: super: {
|
||||
});
|
||||
foldl = appendPatch super.foldl (pkgs.fetchpatch {
|
||||
url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch";
|
||||
sha256 = "15lfh54vhdp36197dp4xpb2mr3g49gz2xzl31cjir1fmcvjsbgjl";
|
||||
sha256 = "0q4gs3xkazh644ff7qn2mp2q1nq3jq71x82g7iaacxclkiv0bphx";
|
||||
});
|
||||
persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch {
|
||||
url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch";
|
||||
|
||||
@ -9908,8 +9908,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "MonadCompose";
|
||||
version = "0.6.0.0";
|
||||
sha256 = "05fvnkpq37a4ab97lcv460znnq86csivyz3v6cmq08mnvsjf6cpl";
|
||||
version = "0.7.0.0";
|
||||
sha256 = "1jy81fkqr3325j58qxajzdmy22ssds3v80ks8320f3ws7rgkdhrh";
|
||||
buildDepends = [
|
||||
base ghc-prim MaybeT mmorph monad-products mtl transformers
|
||||
];
|
||||
@ -21147,8 +21147,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "aws-kinesis-client";
|
||||
version = "0.3.0.0";
|
||||
sha256 = "0rc2r8adw4j667iicncvf266mc65f1agj50q8x6hn1fm8pa8ssa7";
|
||||
version = "0.3.0.1";
|
||||
sha256 = "020vv9aaqfxpgrpviy0y6i0448rypr7rg5cvzbmn46n96jyww12w";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
@ -27633,8 +27633,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "casadi-bindings";
|
||||
version = "2.2.0.6";
|
||||
sha256 = "1iasw1yvh5cm2b2lfhn7026rkil054fymal3n8p1kc0qm02zb4i5";
|
||||
version = "2.2.0.7";
|
||||
sha256 = "05xgsn9xgkckx7ip2qqy332miv6yl70avyzp7z5ww8lvn2v8q8ks";
|
||||
buildDepends = [
|
||||
base casadi-bindings-core casadi-bindings-internal cereal
|
||||
containers linear vector
|
||||
@ -45658,6 +45658,18 @@ self: {
|
||||
license = stdenv.lib.licenses.publicDomain;
|
||||
}) {};
|
||||
|
||||
"flexible-time" = callPackage
|
||||
({ mkDerivation, base, bytestring, unix-time }:
|
||||
mkDerivation {
|
||||
pname = "flexible-time";
|
||||
version = "0.1.0.3";
|
||||
sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
|
||||
buildDepends = [ base bytestring unix-time ];
|
||||
homepage = "https://github.com/tattsun/flexible-time";
|
||||
description = "simple extension of Data.UnixTime.";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"flexible-unlit" = callPackage
|
||||
({ mkDerivation, base, bytestring, text }:
|
||||
mkDerivation {
|
||||
@ -49018,21 +49030,21 @@ self: {
|
||||
}) {};
|
||||
|
||||
"ghcid" = callPackage
|
||||
({ mkDerivation, base, cmdargs, containers, directory, extra
|
||||
({ mkDerivation, ansi-terminal, base, cmdargs, directory, extra
|
||||
, filepath, process, tasty, tasty-hunit, terminal-size, time
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ghcid";
|
||||
version = "0.3.4";
|
||||
sha256 = "1xapx3rlx9fsvs5idqyarassqbg8ifsar923pi9vsn29ipjp2kjq";
|
||||
version = "0.3.5";
|
||||
sha256 = "1ad5x1xvx5v00gj4gwlqz806mzigga4h8xx6ldqsndb8inz7hsrx";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
base cmdargs containers directory extra filepath process
|
||||
ansi-terminal base cmdargs directory extra filepath process
|
||||
terminal-size time
|
||||
];
|
||||
testDepends = [
|
||||
base cmdargs containers directory extra filepath process tasty
|
||||
ansi-terminal base cmdargs directory extra filepath process tasty
|
||||
tasty-hunit terminal-size time
|
||||
];
|
||||
homepage = "https://github.com/ndmitchell/ghcid#readme";
|
||||
@ -55727,8 +55739,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "haskell-docs";
|
||||
version = "4.2.4";
|
||||
sha256 = "061gj5g1hga8k93rzknpyi51srlqnzcagykb9mzv91m8vp9wlnrf";
|
||||
version = "4.2.5";
|
||||
sha256 = "09xagxs0br6781flp430syfn6yv36ri0y1yki8cakrn7ak722fq2";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
@ -60939,18 +60951,19 @@ self: {
|
||||
|
||||
"hlint" = callPackage
|
||||
({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
|
||||
, directory, extra, filepath, haskell-src-exts, hscolour, process
|
||||
, directory, extra, filepath, haskell-src-exts, process
|
||||
, transformers, uniplate
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hlint";
|
||||
version = "1.9.16";
|
||||
sha256 = "11ykjslyr8sgpa1jpnv3vdzz0nxyrxw3mzcsdbidgzw7aphpzcb3";
|
||||
editedCabalFile = "4e3f4397ef78f431aadf4644b37ec01d624dd14dd70fec81953a509546182b8a";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
ansi-terminal base cmdargs containers cpphs directory extra
|
||||
filepath haskell-src-exts hscolour process transformers uniplate
|
||||
filepath haskell-src-exts process transformers uniplate
|
||||
];
|
||||
homepage = "http://community.haskell.org/~ndm/hlint/";
|
||||
description = "Source code suggestions";
|
||||
@ -103198,8 +103211,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "shelly";
|
||||
version = "1.6.1";
|
||||
sha256 = "01j25pw9xywfmw3rgi756n1sdzlclwbhsj6dgwalsc8rbpwdbynv";
|
||||
version = "1.6.1.1";
|
||||
sha256 = "1yv29fjyxfqykg7l8r4la1j4kz3ixmklhw15ki2b9dgwsp7vzmfh";
|
||||
buildDepends = [
|
||||
async base bytestring containers directory enclosed-exceptions
|
||||
exceptions lifted-async lifted-base monad-control mtl process
|
||||
@ -103955,8 +103968,8 @@ self: {
|
||||
({ mkDerivation, base, process }:
|
||||
mkDerivation {
|
||||
pname = "simple-smt";
|
||||
version = "0.5.3";
|
||||
sha256 = "0m3ghgh2ip22808cyx1babfkpj6v0ii6lmnwgrk8adaj5aif9dfg";
|
||||
version = "0.5.4";
|
||||
sha256 = "153f0h0432rh3ff5cvsjcnwaq6ydiprs16ximp1rcamwzm0nl8hp";
|
||||
buildDepends = [ base process ];
|
||||
description = "A simple way to interact with an SMT solver process";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
@ -104728,11 +104741,11 @@ self: {
|
||||
({ mkDerivation, base, linear, vector }:
|
||||
mkDerivation {
|
||||
pname = "smoothie";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "1njg9lw3wc11q15yh4mi1hmfmr4891w59pdwxy782jgqlxanmbx7";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "1gr36qbc1d6j3mhgpyxc08qkgk11kdpschvclh06jlcq3h2j62sy";
|
||||
buildDepends = [ base linear vector ];
|
||||
homepage = "https://github.com/phaazon/smoothie";
|
||||
description = "Smooth curves via several spline and polynomials";
|
||||
description = "Smooth curves via several splines and polynomials";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
@ -106483,8 +106496,10 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "soxlib";
|
||||
version = "0.0.1.1";
|
||||
sha256 = "0bc4s74f2sw32j17pihpq0liyaysi4n5i2704ycn5agsgnc0n8xp";
|
||||
version = "0.0.2";
|
||||
sha256 = "1d82sqihmx3ymgyahbnjlzmam4pj4rwyp956p74fpl0gsmqphmr8";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
base containers explicit-exception extensible-exceptions
|
||||
sample-frame storablevector transformers utility-ht
|
||||
@ -119230,8 +119245,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "vcache";
|
||||
version = "0.2.1";
|
||||
sha256 = "1nhcz52fszwyk363hi3xd0k2rx950xbrfq8ifl4i9l9zh3s0p232";
|
||||
version = "0.2.2";
|
||||
sha256 = "1df4y09f25y0sj3qn9x62a4bzdjjrml4510hdf0jsmiimqqyq0ac";
|
||||
buildDepends = [
|
||||
base bytestring containers direct-murmur-hash easy-file filelock
|
||||
lmdb random stm transformers
|
||||
@ -120832,6 +120847,25 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"wai-middleware-static-caching" = callPackage
|
||||
({ mkDerivation, base, base16-bytestring, bytestring, containers
|
||||
, cryptohash, directory, expiring-cache-map, filepath, http-types
|
||||
, mtl, old-locale, text, time, unix, wai
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "wai-middleware-static-caching";
|
||||
version = "0.6.0.1";
|
||||
sha256 = "0xj4r1fr1g0fybgsq65gxcvh5zn9hafvm0f73p6dnj6jhz6dryhk";
|
||||
buildDepends = [
|
||||
base base16-bytestring bytestring containers cryptohash directory
|
||||
expiring-cache-map filepath http-types mtl old-locale text time
|
||||
unix wai
|
||||
];
|
||||
homepage = "https://github.com/agrafix/wai-middleware-static";
|
||||
description = "WAI middleware that serves requests to static files";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"wai-middleware-throttle" = callPackage
|
||||
({ mkDerivation, base, bytestring, haddock, hlint, hspec
|
||||
, http-types, HUnit, network, process, regex-compat, stm, text
|
||||
|
||||
@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
|
||||
# there is a mysterious sh: command not found
|
||||
doCheck = false;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# problems on Hydra
|
||||
enableParallelBuilding = false;
|
||||
|
||||
configureFlags = [ "--enable-readline" "--enable-dl" ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
source "http://rubygems.org"
|
||||
gem "bundix",
|
||||
:git => "https://github.com/cstrahan/bundix.git",
|
||||
:ref => "5df25b11b5b86e636754d54c2a8859c7c6ec78c7"
|
||||
:ref => "v1.0.2"
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/cstrahan/bundix.git
|
||||
revision: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7
|
||||
ref: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7
|
||||
revision: e098b8c04087079c897aaf9542990e9fdd503bcf
|
||||
ref: v1.0.2
|
||||
specs:
|
||||
bundix (0.1.0)
|
||||
bundler (~> 1.7.9)
|
||||
bundix (1.0.2)
|
||||
thor (~> 0.19.1)
|
||||
|
||||
GEM
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{
|
||||
"bundix" = {
|
||||
version = "0.1.0";
|
||||
version = "1.0.2";
|
||||
source = {
|
||||
type = "git";
|
||||
url = "https://github.com/cstrahan/bundix.git";
|
||||
rev = "5df25b11b5b86e636754d54c2a8859c7c6ec78c7";
|
||||
rev = "e098b8c04087079c897aaf9542990e9fdd503bcf";
|
||||
sha256 = "0www8srjqlxy1pzn2b6himy5y768dni54m7rv67gj8yvx48vd803";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "1iqx12y777v8gszggj25x0xcf6lzllx58lmv53x6zy3jmvfh4siv";
|
||||
};
|
||||
dependencies = [
|
||||
"thor"
|
||||
@ -19,4 +19,4 @@
|
||||
sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
baseVersion = "1.11";
|
||||
revision = "13";
|
||||
sha256 = "1jg36k376w6d6g7hgs2d67sr84pail5qf6yy1s5ys7pc16k2dy41";
|
||||
revision = "10";
|
||||
sha256 = "06d5p0bs953r2pqfc635x2w78m3xv28gr6fmvd8whbk9qp8r91yb";
|
||||
openssl = null;
|
||||
})
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
source $stdenv/setup
|
||||
|
||||
mkdir smack
|
||||
cd smack
|
||||
tar xfvz $src
|
||||
cd smack*
|
||||
mkdir -p $out/share/java
|
||||
cp *.jar $out/share/java
|
||||
cp smack-*.jar $out/share/java
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "smack-3_2_1";
|
||||
name = "smack-3.4.1";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_2_1.tar.gz;
|
||||
sha256 = "0lljrxky66gc73caaflia2wgmlpry2cdj00bz1gd1vqrzd3pg3gd";
|
||||
};
|
||||
url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_4_1.tar.gz;
|
||||
sha256 = "13jm93b0dsfxr62brq1hagi9fqk7ip3pi80svq10zh5kcpk77jf4";
|
||||
};
|
||||
}
|
||||
|
||||
22
pkgs/development/libraries/libctemplate/2.2.nix
Normal file
22
pkgs/development/libraries/libctemplate/2.2.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "A simple but powerful template language for C++";
|
||||
longDescription = ''
|
||||
CTemplate is a simple but powerful template language for C++. It
|
||||
emphasizes separating logic from presentation: it is impossible to
|
||||
embed application logic in this template language. '';
|
||||
homepage = http://code.google.com/p/google-ctemplate/;
|
||||
license = "bsd";
|
||||
};
|
||||
|
||||
pname = "ctemplate";
|
||||
version = "2.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ctemplate.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4";
|
||||
};
|
||||
}
|
||||
@ -1,23 +1,20 @@
|
||||
{ stdenv, fetchurl, alsaLib, bash, help2man }:
|
||||
{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lirc-0.9.1a";
|
||||
name = "lirc-0.9.2a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lirc/${name}.tar.bz2";
|
||||
sha256 = "191vhgsds221rzpzjibj005pfr182hq65hniqfd0qqsl5h1zwq8r";
|
||||
sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lirc-0.9.1a-fix-segfaults.patch?h=packages/lirc";
|
||||
sha256 = "00ainq7y8yh2r447968jid06cqfb1xirv24xxrkl0gvakrrv9gnh";
|
||||
})
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -e 's|^#!/usr/bin/env python3$|#!${python3}/bin/python3|g' -i tools/*.py
|
||||
'';
|
||||
|
||||
preBuild = "patchShebangs .";
|
||||
|
||||
buildInputs = [ alsaLib help2man ];
|
||||
buildInputs = [ alsaLib help2man pkgconfig x11 python3 ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-driver=devinput"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, withCryptodev ? false, cryptodevHeaders }:
|
||||
|
||||
let
|
||||
name = "openssl-1.0.1k";
|
||||
name = "openssl-1.0.1l";
|
||||
|
||||
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
|
||||
(throw "openssl needs its platform name cross building" null)
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
||||
"http://www.openssl.org/source/${name}.tar.gz"
|
||||
"http://openssl.linux-mirror.org/source/${name}.tar.gz"
|
||||
];
|
||||
sha256 = "0754wzmzr90hiiqs5cy6g3cf8as75ljkhppgyirfg26hpapax7wg";
|
||||
sha256 = "1m6i80y9c9g7h4303bqbxnsk5wm6jd0n57hwqr0g4jaxzr44vkxj";
|
||||
};
|
||||
|
||||
patches = patchesCross false;
|
||||
|
||||
@ -1,5 +1,15 @@
|
||||
{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
|
||||
|
||||
# Minimum CPU requirements:
|
||||
# x86: Pentium 4 (Prescott, circa 2004)
|
||||
# x86_64: Opteron (circa 2003)
|
||||
# These are the settings used for the generic builds. Performance will
|
||||
# be poor on modern systems. The goal of the Hydra builds is simply to
|
||||
# support as many systems as possible. OpenBLAS may support older
|
||||
# CPU architectures, but you will need to set 'config.openblas.target'
|
||||
# and 'config.openblas.preferLocalBuild', which will build it on your
|
||||
# local machine.
|
||||
|
||||
let local = config.openblas.preferLocalBuild or false;
|
||||
localTarget = config.openblas.target or "";
|
||||
in
|
||||
@ -20,18 +30,24 @@ stdenv.mkDerivation rec {
|
||||
cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
|
||||
|
||||
target = if local then localTarget else
|
||||
if cpu == "i686" then "P2" else
|
||||
if cpu == "x86_64" then "CORE2" else
|
||||
if cpu == "i686" then "PRESCOTT" else
|
||||
if cpu == "x86_64" then "OPTERON" else
|
||||
# allow autodetect
|
||||
"";
|
||||
|
||||
makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
|
||||
makeFlags = [
|
||||
"${if target != "" then "TARGET=" else ""}${target}"
|
||||
"FC=gfortran"
|
||||
"CC=gcc"
|
||||
''PREFIX="''$(out)"''
|
||||
"INTERFACE64=1"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Basic Linear Algebra Subprograms";
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://github.com/xianyi/OpenBLAS";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
};
|
||||
}
|
||||
|
||||
27
pkgs/development/ocaml-modules/asn1-combinators/default.nix
Normal file
27
pkgs/development/ocaml-modules/asn1-combinators/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith }:
|
||||
|
||||
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
|
||||
|
||||
let version = "0.1.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-asn1-combinators-${version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz";
|
||||
sha256 = "1wl5g2cqd4dk33w0ski6z425cs4sgj980fw0xkwgz1w1xzywh4i2";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
propagatedBuildInputs = [ cstruct zarith ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/mirleft/ocaml-asn1-combinators;
|
||||
description = "Combinators for expressing ASN.1 grammars in OCaml";
|
||||
platforms = ocaml.meta.platforms;
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
maintainers = with stdenv.lib.maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
33
pkgs/development/ocaml-modules/erm_xmpp/default.nix
Normal file
33
pkgs/development/ocaml-modules/erm_xmpp/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }:
|
||||
|
||||
let
|
||||
version = "0.2";
|
||||
disable-tests = fetchurl {
|
||||
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/erm_xmpp/erm_xmpp.0.2/files/disable_tests.patch;
|
||||
sha256 = "09d8630nmx2x8kb8ap1zmsb93zs14cqg7ga1gmdl92jvsjxbhgc1";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-erm_xmpp-${version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz";
|
||||
sha256 = "0saw2dmrzv2aadrznvyvchnhivvcwm78x9nwf6flq5v0pqddapk2";
|
||||
};
|
||||
|
||||
patches = [ disable-tests ];
|
||||
|
||||
buildInputs = [ ocaml findlib camlp4 ];
|
||||
propagatedBuildInputs = [ erm_xml cryptokit ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/ermine/xmpp;
|
||||
description = "OCaml based XMPP implementation";
|
||||
platforms = ocaml.meta.platforms;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
24
pkgs/development/ocaml-modules/io-page/default.nix
Normal file
24
pkgs/development/ocaml-modules/io-page/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchzip, ocaml, findlib, cstruct }:
|
||||
|
||||
let version = "1.4.0"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-io-page-${version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz";
|
||||
sha256 = "05m1gbcy72i6gikdijbkpw8pfygc86a3l4k8ayyl58019l6qa2fq";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
propagatedBuildInputs = [ cstruct ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/mirage/io-page;
|
||||
platforms = ocaml.meta.platforms;
|
||||
description = "IO memory page library for Mirage backends";
|
||||
maintainers = with stdenv.lib.maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
@ -1,30 +1,25 @@
|
||||
{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp, camlp4}:
|
||||
{ stdenv, fetchzip, ocaml, findlib, oasis, ocaml_optcomp, camlp4 }:
|
||||
|
||||
let version = "0.7"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocsigen-deriving";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/ocsigen/deriving";
|
||||
rev = "refs/tags/0.6.2";
|
||||
sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662";
|
||||
name = "ocsigen-deriving-${version}";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";
|
||||
sha256 = "05z606gly1iyan292x3mflg3zasgg68n8i2mivz0zbshx2hz2jbw";
|
||||
};
|
||||
|
||||
buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp camlp4];
|
||||
|
||||
configurePhase = ''
|
||||
make setup-dev.exe
|
||||
./setup-dev.exe -configure --prefix $out
|
||||
'';
|
||||
buildInputs = [ ocaml findlib oasis ocaml_optcomp camlp4 ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/ocsigen/deriving;
|
||||
description = "Extension to OCaml for deriving functions from type declarations";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = ocaml.meta.platforms;
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.gal_bolle
|
||||
maintainers = with stdenv.lib.maintainers; [
|
||||
gal_bolle vbgl
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.3";
|
||||
version = "6.4";
|
||||
name = "checkstyle-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
|
||||
sha256 = "181wm6yxyf9dsp1dgy7bpjz5j72a5fc818293k5mxr8g1gf0s3f4";
|
||||
sha256 = "0qk653i8973ygz630siava3fm54vxmahbw6rikdi9lzjlpvvn74f";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = http://coan2.sourceforge.net/;
|
||||
license = with licenses; bsd3;
|
||||
platforms = with platforms; all;
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ nckx ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
|
||||
mkdir -pv $out
|
||||
cp -rv lib $out
|
||||
|
||||
gradle_launcher_jar=$(echo $out/lib/gradle-launcher-*.jar)
|
||||
test -f $gradle_launcher_jar
|
||||
makeWrapper ${jdk}/bin/java $out/bin/gradle \
|
||||
--set JAVA_HOME ${jdk} \
|
||||
--add-flags "-classpath $out/lib/gradle-launcher-2.2.1.jar org.gradle.launcher.GradleMain"
|
||||
--add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
|
||||
'';
|
||||
|
||||
phases = "unpackPhase installPhase";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, libusb }:
|
||||
let
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name="dfu-programmer-${version}";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz";
|
||||
sha256 = "0cwy7z5h6f13yx9bkgh61bphzii6lcl21j2gckskphf37bfzazwz";
|
||||
sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-libusb_1_0" ];
|
||||
|
||||
29
pkgs/development/tools/misc/sipp/default.nix
Normal file
29
pkgs/development/tools/misc/sipp/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{stdenv, fetchurl, ncurses, libpcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "3.4-beta2";
|
||||
|
||||
name = "sipp-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz";
|
||||
sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
export ac_cv_lib_curses_initscr=yes
|
||||
export ac_cv_lib_pthread_pthread_mutex_init=yes
|
||||
sed -i "s@-lcurses@-lncurses@g" ./configure
|
||||
sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
|
||||
./configure --prefix=$out --with-pcap
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -pv $out/share/pcap
|
||||
cp pcap/* $out/share/pcap
|
||||
'';
|
||||
|
||||
buildInputs = [ncurses libpcap];
|
||||
}
|
||||
|
||||
@ -57,15 +57,20 @@ let
|
||||
mv $(find . -type d -mindepth 1 -maxdepth 1) $out
|
||||
'';
|
||||
|
||||
platforms = fold (entry: platforms:
|
||||
let
|
||||
filterPlatforms = attrByPath [(removePrefix "!" entry)] [] stdenv.lib.platforms;
|
||||
in
|
||||
if hasPrefix "!" entry then
|
||||
filter (p: any (f: p != f) filterPlatforms) platforms
|
||||
else
|
||||
filter (p: any (f: p == f) filterPlatforms) platforms
|
||||
) nodejs.meta.platforms os;
|
||||
platforms = if os == [] then nodejs.meta.platforms else
|
||||
fold (entry: platforms:
|
||||
let
|
||||
filterPlatforms =
|
||||
stdenv.lib.platforms.${removePrefix "!" entry} or [];
|
||||
in
|
||||
# Ignore unknown platforms
|
||||
if filterPlatforms == [] then platforms
|
||||
else
|
||||
if hasPrefix "!" entry then
|
||||
substract (intersect filterPlatforms nodejs.meta.platforms) platforms
|
||||
else
|
||||
platforms ++ (intersect filterPlatforms nodejs.meta.platforms)
|
||||
) [] os;
|
||||
|
||||
mapDependencies = deps: f: rec {
|
||||
# Convert deps to attribute set
|
||||
@ -87,8 +92,8 @@ let
|
||||
_dependencies = mapDependencies deps (name: dep:
|
||||
dep.pkgName != pkgName);
|
||||
_optionalDependencies = mapDependencies optionalDependencies (name: dep:
|
||||
any (platform: stdenv.system == platform) dep.meta.platforms &&
|
||||
all (d: d != dep.pkgName) skipOptionalDependencies
|
||||
(builtins.tryEval dep).success &&
|
||||
!(elem dep.pkgName skipOptionalDependencies)
|
||||
);
|
||||
_peerDependencies = mapDependencies peerDependencies (name: dep:
|
||||
dep.pkgName != pkgName);
|
||||
@ -301,7 +306,7 @@ let
|
||||
dontStrip = true;
|
||||
|
||||
meta = {
|
||||
platforms = platforms;
|
||||
inherit platforms;
|
||||
maintainers = [ stdenv.lib.maintainers.offline ];
|
||||
};
|
||||
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
, pulseaudio ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dolphin-emu-20150201";
|
||||
name = "dolphin-emu-20150302";
|
||||
src = fetchgit {
|
||||
url = git://github.com/dolphin-emu/dolphin.git;
|
||||
rev = "3c475b91ea5c4baa13b1339c3d2921938e8a3be9";
|
||||
sha256 = "1az8cv5y2hccvnp719rpynwglamf04zck1ic796c126xp286i5ki";
|
||||
rev = "cd8c37bc0792a492b59976eba10a3e54e0ea2842";
|
||||
sha256 = "06cb89c97w86ffn2nls0jb69macd5lqz930fjyjjahk9njx164fv";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
|
||||
@ -1,15 +1,11 @@
|
||||
{ stdenv, fetchgit }:
|
||||
|
||||
let
|
||||
version = "4517261caab34742afdeaf0c36128b9579675717";
|
||||
shortVersion = stdenv.lib.substring 0 7 version;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "firmware-linux-nonfree-${shortVersion}";
|
||||
name = "firmware-linux-nonfree-2015-02-24";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
|
||||
rev = version;
|
||||
rev = "4517261caab34742afdeaf0c36128b9579675717";
|
||||
sha256 = "0w386nfwlqhk1wn7zzhfxkxx06nzqasc4dr0qq61wc29s9qlgi3c";
|
||||
};
|
||||
|
||||
|
||||
@ -263,6 +263,9 @@ with stdenv.lib;
|
||||
SLIP_COMPRESSED y # CSLIP compressed headers
|
||||
SLIP_SMART y
|
||||
THERMAL_HWMON y # Hardware monitoring support
|
||||
${optionalString (versionAtLeast version "3.15") ''
|
||||
UEVENT_HELPER n
|
||||
''}
|
||||
USB_DEBUG? n
|
||||
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
|
||||
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
|
||||
|
||||
@ -68,7 +68,6 @@ installPhase() {
|
||||
#patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
|
||||
#patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
|
||||
|
||||
|
||||
if test -z "$libsOnly"; then
|
||||
# Install headers and /share files etc.
|
||||
mkdir -p $out/include/nvidia
|
||||
@ -99,15 +98,16 @@ installPhase() {
|
||||
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
|
||||
done
|
||||
|
||||
patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.*
|
||||
patchelf --set-rpath $glPath:$gtkPath $out/lib/libnvidia-gtk2.so.*.*
|
||||
|
||||
# Test a bit.
|
||||
$out/bin/nvidia-settings --version
|
||||
else
|
||||
rm $out/lib/libnvidia-gtk3.*
|
||||
rm $out/lib/libnvidia-gtk2.*
|
||||
fi
|
||||
# for simplicity and dependency reduction, don't support the gtk2 interface
|
||||
rm $out/lib/libnvidia-gtk2.*
|
||||
|
||||
# For simplicity and dependency reduction, don't support the gtk3 interface.
|
||||
rm $out/lib/libnvidia-gtk3.*
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
|
||||
, gtk3, atk, pango, glib, gdk_pixbuf, cairo
|
||||
, gtk, atk, pango, glib, gdk_pixbuf, cairo
|
||||
, # Whether to build the libraries only (i.e. not the kernel module or
|
||||
# nvidia-settings). Used to support 32-bit binaries on 64-bit
|
||||
# Linux.
|
||||
@ -12,9 +12,11 @@ assert (!libsOnly) -> kernel != null;
|
||||
|
||||
let
|
||||
|
||||
versionNumber = "346.35";
|
||||
versionNumber = "346.47";
|
||||
|
||||
# Policy: use the highest stable version as the default (on our master).
|
||||
inherit (stdenv.lib) makeLibraryPath;
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -26,12 +28,12 @@ stdenv.mkDerivation {
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
|
||||
sha256 = "09fz8nydi8ip3yv7dmbwnpwvjql5wp582z57022ppb9hqwq3r9mv";
|
||||
sha256 = "0vkayz6nhw00kn2nvxvr9hsh4sa555nbbr9swlx5x1frziym48dv";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
|
||||
sha256 = "1z9a69a9xbcrz925mj02l2qaqcnhxzh2msbq4hf73p7x4h94ibkx";
|
||||
sha256 = "0xqnjs54i281pnkky7dnz4n7jcn2vqjba0kra8da1wnyklm6gdni";
|
||||
}
|
||||
else throw "nvidia-x11 does not support platform ${stdenv.system}";
|
||||
|
||||
@ -46,9 +48,8 @@ stdenv.mkDerivation {
|
||||
openclPath = makeLibraryPath [zlib];
|
||||
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc];
|
||||
|
||||
# we don't support the gtk2 version
|
||||
gtk3Path = optionalString (!libsOnly) (makeLibraryPath
|
||||
[ gtk3 atk pango glib gdk_pixbuf cairo ] );
|
||||
gtkPath = optionalString (!libsOnly) (makeLibraryPath
|
||||
[ gtk atk pango glib gdk_pixbuf cairo ] );
|
||||
programPath = makeLibraryPath [ xlibs.libXv ];
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ callPackage, fetchgit, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "086476f";
|
||||
version = "2015-02-04";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://github.com/zfsonlinux/spl.git;
|
||||
|
||||
@ -39,6 +39,11 @@ stdenv.mkDerivation {
|
||||
outputs = [ "out" "ui" ];
|
||||
|
||||
installPhase = ''
|
||||
# Fix references to go-deps in the binary
|
||||
hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g')
|
||||
xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c)))
|
||||
sed -i "s,$hash,$xs,g" consul
|
||||
|
||||
# Install consul binary
|
||||
mkdir -p $out/bin
|
||||
cp consul $out/bin
|
||||
|
||||
@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# Fix references to go-deps in the binary
|
||||
hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g')
|
||||
xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c)))
|
||||
sed -i "s,$hash,$xs,g" consul-template
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp consul-template $out/bin
|
||||
'';
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
|
||||
|
||||
let version = "9.9.5-W1"; in
|
||||
let version = "9.10.2"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "bind-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
|
||||
sha256 = "1b3ycb376b1j2fc0k6w16k8j9vgsfrzy3nlw1vxzzi41fgyqmcd3";
|
||||
sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
50
pkgs/servers/nosql/cassandra/2.0.nix
Normal file
50
pkgs/servers/nosql/cassandra/2.0.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, jre
|
||||
, python
|
||||
, makeWrapper
|
||||
, gawk
|
||||
, bash
|
||||
, getopt
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
version = "2.0.12";
|
||||
sha256 = "125yga0h155fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cassandra-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
mv * $out
|
||||
|
||||
for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade
|
||||
do wrapProgram $out/bin/$cmd \
|
||||
--set JAVA_HOME ${jre} \
|
||||
--prefix PATH : ${bash}/bin \
|
||||
--prefix PATH : ${getopt}/bin \
|
||||
--prefix PATH : ${gawk}/bin
|
||||
done
|
||||
|
||||
wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://cassandra.apache.org/;
|
||||
description = "A massively scalable open source NoSQL database";
|
||||
platforms = with platforms; all;
|
||||
license = with licenses; asl20;
|
||||
maintainers = with maintainers; [ nckx rushmorem ];
|
||||
};
|
||||
}
|
||||
@ -8,13 +8,19 @@
|
||||
, getopt
|
||||
}:
|
||||
|
||||
let version = "2.1.3";
|
||||
in stdenv.mkDerivation rec {
|
||||
let
|
||||
|
||||
version = "2.1.3";
|
||||
sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cassandra-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
|
||||
sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
@ -39,6 +45,6 @@ in stdenv.mkDerivation rec {
|
||||
description = "A massively scalable open source NoSQL database";
|
||||
platforms = with platforms; all;
|
||||
license = with licenses; asl20;
|
||||
maintainers = with maintainers; [ nckx ];
|
||||
maintainers = with maintainers; [ nckx rushmorem ];
|
||||
};
|
||||
}
|
||||
@ -41,6 +41,9 @@ in stdenv.mkDerivation rec {
|
||||
# bug #482576
|
||||
sed -i -e "/-Werror/d" src/third_party/v8/SConscript
|
||||
|
||||
# fix inclusion of std::swap
|
||||
sed -i '1i #include <algorithm>' src/mongo/shell/linenoise_utf8.h
|
||||
|
||||
# fix environment variable reading
|
||||
substituteInPlace SConstruct \
|
||||
--replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, zlib, readline }:
|
||||
|
||||
let version = "9.0.18"; in
|
||||
let version = "9.0.19"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "postgresql-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
|
||||
sha256 = "7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003";
|
||||
sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib readline ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, zlib, readline }:
|
||||
|
||||
let version = "9.1.14"; in
|
||||
let version = "9.1.15"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "postgresql-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
|
||||
sha256 = "d0647ce563d18ae02bf68c5dd646a4c75e8b45b3a4fada64d481371fdc16f522";
|
||||
sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib readline ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, zlib, readline }:
|
||||
|
||||
let version = "9.2.9"; in
|
||||
let version = "9.2.10"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "postgresql-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
|
||||
sha256 = "94ec6d330f125b6fc725741293073b07d7d20cc3e7b8ed127bc3d14ad2370197";
|
||||
sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib readline ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user