Merge master into x-updates
Conflicts (taken master): pkgs/development/compilers/llvm/3.4/llvm.nix
This commit is contained in:
Vladimír Čunát
+1
-1
@@ -10,7 +10,7 @@ rec {
|
||||
cleanSource =
|
||||
let filter = name: type: let baseName = baseNameOf (toString name); in ! (
|
||||
# Filter out Subversion and CVS directories.
|
||||
(type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS")) ||
|
||||
(type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
|
||||
# Filter out backup files.
|
||||
(lib.hasSuffix "~" baseName)
|
||||
);
|
||||
|
||||
@@ -295,8 +295,73 @@ $ reboot</screen>
|
||||
}</screen>
|
||||
</example>
|
||||
|
||||
<section>
|
||||
|
||||
<title>UEFI Installation</title>
|
||||
|
||||
<para>NixOS can also be installed on UEFI systems. The procedure
|
||||
is by and large the same as a BIOS installation, with the following
|
||||
changes:
|
||||
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>You should boot the livecd in UEFI mode (consult your specific
|
||||
hardware's documentation for instructions how).</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Instead of <command>fdisk</command>, you should use <command>
|
||||
gdisk</command> to partition your disks. You will need to have a
|
||||
separate partition for <filename>/boot</filename> with partition code
|
||||
EF00, and it should be formatted with a vfat filesystem.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>You must set <option>boot.loader.gummiboot.enable</option> to
|
||||
<literal>true</literal>, and <option>boot.loader.grub.enable</option>
|
||||
to <literal>false</literal>. <command>nixos-generate-config</command>
|
||||
should do this automatically for new configurations when booted in
|
||||
UEFI mode.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>You may want to look at the options starting with
|
||||
<option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option>
|
||||
as well.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>To see console messages during early boot, put <literal>"fbcon"</literal>
|
||||
in your <option>boot.initrd.kernelModules</option></para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</para>
|
||||
|
||||
</section>
|
||||
|
||||
<section>
|
||||
|
||||
<title>Booting from a USB stick</title>
|
||||
|
||||
<para>For systems withoua CD drive, the NixOS livecd can be booted from
|
||||
a usb stick. For non-UEFI installations,
|
||||
<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>
|
||||
will work. For UEFI installations, you should mount the ISO, copy its contents
|
||||
verbatim to your drive, then either:
|
||||
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>Change the label of the disk partition to the label of the ISO
|
||||
(visible with the blkid command), or</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
|
||||
and change the <literal>root=</literal> field in the <literal>options</literal>
|
||||
line to point to your drive (see the documentation on <literal>root=</literal>
|
||||
in <link xlink:href="https://www.kernel.org/doc/Documentation/kernel-parameters.txt">
|
||||
the kernel documentation</link> for more details).</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</para>
|
||||
</section>
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
<!--===============================================================-->
|
||||
|
||||
@@ -19,7 +19,7 @@ with pkgs.lib;
|
||||
# ISO naming.
|
||||
isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
|
||||
|
||||
isoImage.volumeID = substring 0 32 "NIXOS_${config.system.nixosVersion}";
|
||||
isoImage.volumeID = substring 0 11 "NIXOS_${config.system.nixosVersion}";
|
||||
|
||||
# Make the installer more likely to succeed in low memory
|
||||
# environments. The kernel's overcommit heustistics bite us
|
||||
|
||||
@@ -12,18 +12,20 @@ let
|
||||
visible = true;
|
||||
};
|
||||
|
||||
# warn option was renamed
|
||||
obsolete = from: to: rename {
|
||||
inherit from to;
|
||||
name = "Obsolete name";
|
||||
use = x: builtins.trace "Obsolete option `${showOption from}' is used instead of `${showOption to}'." x;
|
||||
define = x: builtins.trace "Obsolete option `${showOption from}' is defined instead of `${showOption to}'." x;
|
||||
use = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x;
|
||||
define = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x;
|
||||
};
|
||||
|
||||
# abort if deprecated option is used
|
||||
deprecated = from: to: rename {
|
||||
inherit from to;
|
||||
name = "Deprecated name";
|
||||
use = x: abort "Deprecated option `${showOption from}' is used instead of `${showOption to}'.";
|
||||
define = x: abort "Deprecated option `${showOption from}' is defined instead of `${showOption to}'.";
|
||||
use = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'.";
|
||||
define = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'.";
|
||||
};
|
||||
|
||||
showOption = concatStringsSep ".";
|
||||
|
||||
@@ -106,7 +106,6 @@ in
|
||||
{ description = "DHCP Client";
|
||||
|
||||
wantedBy = [ "network.target" ];
|
||||
after = [ "systemd-udev-settle.service" ];
|
||||
|
||||
# Stopping dhcpcd during a reconfiguration is undesirable
|
||||
# because it brings down the network interfaces configured by
|
||||
|
||||
@@ -15,6 +15,9 @@ let
|
||||
# chroot to ${stateDir}, we have to specify it as /ntp.drift.
|
||||
driftfile /ntp.drift
|
||||
|
||||
restrict default kod nomodify notrap nopeer noquery
|
||||
restrict -6 default kod nomodify notrap nopeer noquery
|
||||
|
||||
${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)}
|
||||
'';
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ with pkgs.lib;
|
||||
let
|
||||
|
||||
nssModulesPath = config.system.nssModules.path;
|
||||
cfg = config.services.nscd;
|
||||
|
||||
inherit (pkgs.lib) singleton;
|
||||
|
||||
@@ -24,6 +25,12 @@ in
|
||||
description = "Whether to enable the Name Service Cache Daemon.";
|
||||
};
|
||||
|
||||
config = mkOption {
|
||||
type = types.lines;
|
||||
default = builtins.readFile ./nscd.conf;
|
||||
description = "Configuration to use for Name Service Cache Daemon.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
@@ -31,7 +38,7 @@ in
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.nscd.enable {
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
users.extraUsers = singleton
|
||||
{ name = "nscd";
|
||||
@@ -56,7 +63,7 @@ in
|
||||
restartTriggers = [ config.environment.etc.hosts.source ];
|
||||
|
||||
serviceConfig =
|
||||
{ ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${./nscd.conf}";
|
||||
{ ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${pkgs.writeText "nscd.conf" cfg.config}";
|
||||
Type = "forking";
|
||||
PIDFile = "/run/nscd/nscd.pid";
|
||||
Restart = "always";
|
||||
|
||||
@@ -55,8 +55,8 @@ let
|
||||
''
|
||||
[LightDM]
|
||||
greeter-user = ${config.users.extraUsers.lightdm.name}
|
||||
xgreeters-directory = ${cfg.greeter.package}
|
||||
xsessions-directory = ${dmcfg.session.desktops}
|
||||
greeters-directory = ${cfg.greeter.package}
|
||||
sessions-directory = ${dmcfg.session.desktops}
|
||||
|
||||
[SeatDefaults]
|
||||
xserver-command = ${xserverWrapper}
|
||||
|
||||
@@ -93,8 +93,13 @@ sub parseFstab {
|
||||
|
||||
sub parseUnit {
|
||||
my ($filename) = @_;
|
||||
parseKeyValues(read_file($filename));
|
||||
}
|
||||
|
||||
sub parseKeyValues {
|
||||
my @lines = @_;
|
||||
my $info = {};
|
||||
foreach my $line (read_file($filename)) {
|
||||
foreach my $line (@_) {
|
||||
# FIXME: not quite correct.
|
||||
$line =~ /^([^=]+)=(.*)$/ or next;
|
||||
$info->{$1} = $2;
|
||||
@@ -337,8 +342,21 @@ system("@systemd@/bin/systemctl", "reload", "dbus.service");
|
||||
my (@failed, @new, @restarting);
|
||||
my $activeNew = getActiveUnits;
|
||||
while (my ($unit, $state) = each %{$activeNew}) {
|
||||
push @failed, $unit if $state->{state} eq "failed" || $state->{substate} eq "auto-restart";
|
||||
push @new, $unit if $state->{state} ne "failed" && !defined $activePrev->{$unit};
|
||||
if ($state->{state} eq "failed") {
|
||||
push @failed, $unit;
|
||||
}
|
||||
elsif ($state->{state} eq "auto-restart") {
|
||||
# A unit in auto-restart state is a failure *if* it previously failed to start
|
||||
my $lines = `@systemd@/bin/systemctl show '$unit'`;
|
||||
my $info = parseKeyValues(split "\n", $lines);
|
||||
|
||||
if ($info->{ExecMainStatus} ne '0') {
|
||||
push @failed, $unit;
|
||||
}
|
||||
}
|
||||
elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit}) {
|
||||
push @new, $unit;
|
||||
}
|
||||
}
|
||||
|
||||
print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n"
|
||||
|
||||
@@ -9,7 +9,6 @@ import tempfile
|
||||
import errno
|
||||
|
||||
def copy_if_not_exists(source, dest):
|
||||
known_paths.append(dest)
|
||||
if not os.path.exists(dest):
|
||||
shutil.copyfile(source, dest)
|
||||
|
||||
@@ -38,12 +37,13 @@ def write_loader_conf(generation):
|
||||
print >> f, "default nixos-generation-%d" % (generation)
|
||||
os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")
|
||||
|
||||
def copy_from_profile(generation, name):
|
||||
def copy_from_profile(generation, name, dry_run=False):
|
||||
store_file_path = os.readlink("%s/%s" % (system_dir(generation), name))
|
||||
suffix = os.path.basename(store_file_path)
|
||||
store_dir = os.path.basename(os.path.dirname(store_file_path))
|
||||
efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix)
|
||||
copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
|
||||
if not dry_run:
|
||||
copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
|
||||
return efi_file_path
|
||||
|
||||
def add_entry(generation):
|
||||
@@ -72,6 +72,10 @@ def get_generations(profile):
|
||||
def remove_old_entries(gens):
|
||||
slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-")
|
||||
slice_end = -1 * len(".conf")
|
||||
known_paths = []
|
||||
for gen in gens:
|
||||
known_paths.append copy_from_profile(gen, "kernel", True)
|
||||
known_paths.append copy_from_profile(gen, "initrd", True)
|
||||
for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"):
|
||||
try:
|
||||
gen = int(path[slice_start:slice_end])
|
||||
@@ -94,7 +98,6 @@ if os.getenv("NIXOS_INSTALL_GRUB") == "1":
|
||||
else:
|
||||
subprocess.check_call(["@gummiboot@/bin/gummiboot", "--path=@efiSysMountPoint@", "--no-variables", "install"])
|
||||
|
||||
known_paths = []
|
||||
mkdir_p("@efiSysMountPoint@/efi/nixos")
|
||||
mkdir_p("@efiSysMountPoint@/loader/entries")
|
||||
try:
|
||||
@@ -106,9 +109,8 @@ except IOError as e:
|
||||
machine_id = None
|
||||
|
||||
gens = get_generations("system")
|
||||
remove_old_entries(gens)
|
||||
for gen in gens:
|
||||
add_entry(gen)
|
||||
if os.readlink(system_dir(gen)) == args.default_config:
|
||||
write_loader_conf(gen)
|
||||
|
||||
remove_old_entries(gens)
|
||||
|
||||
@@ -68,7 +68,10 @@ with pkgs.lib;
|
||||
|
||||
config = mkIf (!config.boot.isContainer) {
|
||||
|
||||
environment.etc = singleton
|
||||
environment.etc = [
|
||||
{ source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
|
||||
target = "modprobe.d/ubuntu.conf";
|
||||
}
|
||||
{ source = pkgs.writeText "modprobe.conf"
|
||||
''
|
||||
${flip concatMapStrings config.boot.blacklistedKernelModules (name: ''
|
||||
@@ -77,26 +80,11 @@ with pkgs.lib;
|
||||
${config.boot.extraModprobeConfig}
|
||||
'';
|
||||
target = "modprobe.d/nixos.conf";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ];
|
||||
|
||||
boot.blacklistedKernelModules =
|
||||
[ # This module is for debugging and generates gigantic amounts
|
||||
# of log output, so it should never be loaded automatically.
|
||||
"evbug"
|
||||
|
||||
# This module causes ALSA to occassionally select the wrong
|
||||
# default sound device, and is little more than an annoyance
|
||||
# on modern machines.
|
||||
"snd_pcsp"
|
||||
|
||||
# The cirrusfb module prevents X11 from starting. FIXME:
|
||||
# Ubuntu blacklists all framebuffer devices because they're
|
||||
# "buggy" and cause suspend problems. Maybe we should too?
|
||||
"cirrusfb"
|
||||
];
|
||||
|
||||
system.activationScripts.modprobe =
|
||||
''
|
||||
# Allow the kernel to find our wrapped modprobe (which searches
|
||||
|
||||
@@ -238,7 +238,7 @@ in {
|
||||
"mkfs.ext3 -L nixos /dev/vda3",
|
||||
"mount LABEL=nixos /mnt",
|
||||
"mkfs.ext3 -L boot /dev/vda1",
|
||||
"mkdir /mnt/boot",
|
||||
"mkdir -p /mnt/boot",
|
||||
"mount LABEL=boot /mnt/boot",
|
||||
);
|
||||
'';
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
|
||||
let
|
||||
ver_branch = "1.6";
|
||||
version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts
|
||||
version = "1.6.1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lightdm-gtk-greeter-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
|
||||
sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc";
|
||||
sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz";
|
||||
};
|
||||
|
||||
patches = [ ./lightdm-gtk-greeter.patch ];
|
||||
patchFlags = "-p0";
|
||||
patchFlags = "-p1";
|
||||
|
||||
buildInputs = [ pkgconfig lightdm intltool ]
|
||||
++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
|
||||
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://launchpad.net/lightdm-gtk-greeter;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.ocharles ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
=== modified file 'src/lightdm-gtk-greeter.c'
|
||||
--- src/lightdm-gtk-greeter.c 2013-02-09 23:20:39 +0000
|
||||
+++ src/lightdm-gtk-greeter.c 2013-03-29 12:21:34 +0000
|
||||
@@ -1273,7 +1273,7 @@
|
||||
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE);
|
||||
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0);
|
||||
model = gtk_combo_box_get_model (session_combo);
|
||||
diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
|
||||
index cc5f9e1..d615dc1 100644
|
||||
--- a/src/lightdm-gtk-greeter.c
|
||||
+++ b/src/lightdm-gtk-greeter.c
|
||||
@@ -1716,7 +1716,7 @@ main (int argc, char **argv)
|
||||
gtk_container_add (GTK_CONTAINER (menuitem), image);
|
||||
gtk_widget_show (GTK_WIDGET (menuitem));
|
||||
|
||||
- items = lightdm_get_sessions ();
|
||||
+ items = lightdm_get_sessions (greeter);
|
||||
GSList *sessions = NULL;
|
||||
for (item = items; item; item = item->next)
|
||||
{
|
||||
LightDMSession *session = item->data;
|
||||
|
||||
|
||||
@@ -3,18 +3,18 @@
|
||||
|
||||
let
|
||||
ver_branch = "1.8";
|
||||
version = "1.7.0";
|
||||
version = "1.8.6";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lightdm-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
|
||||
sha256 = "0nwwjgc9xvwili6714ag88wsrf0lr5hv1i6z9f0xvin4ym18cbs5";
|
||||
sha256 = "17ivc0c4dbnc0fzd581j53cn6hdav34zz2hswjzy8aczbpk605qi";
|
||||
};
|
||||
|
||||
patches = [ ./lightdm.patch ];
|
||||
patchFlags = "-p0";
|
||||
patchFlags = "-p1";
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
|
||||
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://launchpad.net/lightdm;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.ocharles ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
=== modified file 'liblightdm-gobject/greeter.c'
|
||||
--- liblightdm-gobject/greeter.c 2013-01-31 20:56:09 +0000
|
||||
+++ liblightdm-gobject/greeter.c 2013-03-29 14:15:58 +0000
|
||||
@@ -567,6 +567,21 @@
|
||||
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
|
||||
index 9387118..635cea0 100644
|
||||
--- a/liblightdm-gobject/greeter.c
|
||||
+++ b/liblightdm-gobject/greeter.c
|
||||
@@ -567,6 +567,21 @@ lightdm_greeter_get_default_session_hint (LightDMGreeter *greeter)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -23,11 +24,11 @@
|
||||
* lightdm_greeter_get_hide_users_hint:
|
||||
* @greeter: A #LightDMGreeter
|
||||
*
|
||||
|
||||
=== modified file 'liblightdm-gobject/lightdm/greeter.h'
|
||||
--- liblightdm-gobject/lightdm/greeter.h 2013-01-31 20:56:09 +0000
|
||||
+++ liblightdm-gobject/lightdm/greeter.h 2013-03-29 11:56:11 +0000
|
||||
@@ -93,6 +93,8 @@
|
||||
diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
|
||||
index 7d8988f..2b54909 100644
|
||||
--- a/liblightdm-gobject/lightdm/greeter.h
|
||||
+++ b/liblightdm-gobject/lightdm/greeter.h
|
||||
@@ -93,6 +93,8 @@ gboolean lightdm_greeter_get_select_guest_hint (LightDMGreeter *greeter);
|
||||
|
||||
const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter);
|
||||
|
||||
@@ -36,19 +37,19 @@
|
||||
gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter);
|
||||
|
||||
gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter);
|
||||
|
||||
=== modified file 'liblightdm-gobject/lightdm/session.h'
|
||||
--- liblightdm-gobject/lightdm/session.h 2013-01-31 20:56:09 +0000
|
||||
+++ liblightdm-gobject/lightdm/session.h 2013-03-29 11:59:16 +0000
|
||||
diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h
|
||||
index 13ddcd9..cdb2fd6 100644
|
||||
--- a/liblightdm-gobject/lightdm/session.h
|
||||
+++ b/liblightdm-gobject/lightdm/session.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#define _LIGHTDM_SESSION_H_
|
||||
#define LIGHTDM_SESSION_H_
|
||||
|
||||
#include <glib-object.h>
|
||||
+#include "greeter.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
@@ -42,9 +43,9 @@
|
||||
@@ -42,9 +43,9 @@ typedef struct
|
||||
|
||||
GType lightdm_session_get_type (void);
|
||||
|
||||
@@ -60,10 +61,10 @@
|
||||
|
||||
const gchar *lightdm_session_get_key (LightDMSession *session);
|
||||
|
||||
|
||||
=== modified file 'liblightdm-gobject/session.c'
|
||||
--- liblightdm-gobject/session.c 2013-01-31 20:56:09 +0000
|
||||
+++ liblightdm-gobject/session.c 2013-03-29 14:16:48 +0000
|
||||
diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c
|
||||
index 949778f..db5e18a 100644
|
||||
--- a/liblightdm-gobject/session.c
|
||||
+++ b/liblightdm-gobject/session.c
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <string.h>
|
||||
#include <gio/gdesktopappinfo.h>
|
||||
@@ -72,7 +73,7 @@
|
||||
#include "lightdm/session.h"
|
||||
|
||||
enum {
|
||||
@@ -167,7 +168,7 @@
|
||||
@@ -189,7 +190,7 @@ load_sessions (const gchar *sessions_dir)
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -81,18 +82,17 @@
|
||||
{
|
||||
GKeyFile *config_key_file = NULL;
|
||||
gchar *config_path = NULL;
|
||||
@@ -183,8 +184,8 @@
|
||||
@@ -205,8 +206,7 @@ update_sessions (void)
|
||||
remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR);
|
||||
|
||||
/* Use session directory from configuration */
|
||||
- /* FIXME: This should be sent in the greeter connection */
|
||||
- config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL);
|
||||
+ config_path = g_strdup (lightdm_greeter_get_config_path (greeter));
|
||||
+
|
||||
config_key_file = g_key_file_new ();
|
||||
result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error);
|
||||
if (error)
|
||||
@@ -228,9 +229,9 @@
|
||||
if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
|
||||
@@ -250,9 +250,9 @@ update_sessions (void)
|
||||
* Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
|
||||
**/
|
||||
GList *
|
||||
@@ -104,7 +104,7 @@
|
||||
return local_sessions;
|
||||
}
|
||||
|
||||
@@ -242,9 +243,9 @@
|
||||
@@ -264,9 +264,9 @@ lightdm_get_sessions (void)
|
||||
* Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
|
||||
**/
|
||||
GList *
|
||||
@@ -116,78 +116,29 @@
|
||||
return remote_sessions;
|
||||
}
|
||||
|
||||
|
||||
=== modified file 'src/display.c'
|
||||
--- src/display.c 2013-03-26 22:22:49 +0000
|
||||
+++ src/display.c 2013-03-29 12:12:43 +0000
|
||||
@@ -62,6 +62,9 @@
|
||||
/* Program to run sessions through */
|
||||
gchar *session_wrapper;
|
||||
|
||||
+ /* Path to the configuration file that lightdm is running under */
|
||||
+ gchar *config_path;
|
||||
diff --git a/src/lightdm.c b/src/lightdm.c
|
||||
index 7d35034..910164c 100644
|
||||
--- a/src/lightdm.c
|
||||
+++ b/src/lightdm.c
|
||||
@@ -1142,6 +1142,9 @@ main (int argc, char **argv)
|
||||
}
|
||||
}
|
||||
g_clear_error (&error);
|
||||
+
|
||||
/* TRUE if in a user session */
|
||||
gboolean in_user_session;
|
||||
|
||||
@@ -213,6 +216,14 @@
|
||||
}
|
||||
|
||||
void
|
||||
+display_set_config_path (Display *display, const gchar *config_path)
|
||||
+{
|
||||
+ g_return_if_fail (display != NULL);
|
||||
+ g_free (display->priv->config_path);
|
||||
+ display->priv->config_path = g_strdup (config_path);
|
||||
+}
|
||||
+ config_set_string (config_get_instance (), "SeatDefaults", "config-path", config_path);
|
||||
+
|
||||
+void
|
||||
display_set_show_remote_login_hint (Display *display, gboolean show_remote_login)
|
||||
{
|
||||
g_return_if_fail (display != NULL);
|
||||
@@ -436,6 +447,7 @@
|
||||
greeter_set_hint (display->priv->greeter, "show-remote-login", display->priv->greeter_show_remote_login ? "true" : "false");
|
||||
if (display->priv->greeter_is_lock)
|
||||
greeter_set_hint (display->priv->greeter, "lock-screen", "true");
|
||||
+ greeter_set_hint (display->priv->greeter, "config-path", display->priv->config_path);
|
||||
|
||||
/* Run greeter as unprivileged user */
|
||||
if (getuid () != 0)
|
||||
|
||||
=== modified file 'src/display.h'
|
||||
--- src/display.h 2013-03-26 22:22:49 +0000
|
||||
+++ src/display.h 2013-03-29 12:12:37 +0000
|
||||
@@ -80,6 +80,8 @@
|
||||
|
||||
void display_set_user_session (Display *display, SessionType type, const gchar *session_name);
|
||||
|
||||
+void display_set_config_path (Display *display, const gchar *config_path);
|
||||
+
|
||||
gboolean display_start (Display *display);
|
||||
|
||||
gboolean display_get_is_ready (Display *display);
|
||||
|
||||
=== modified file 'src/lightdm.c'
|
||||
--- src/lightdm.c 2013-03-07 21:40:31 +0000
|
||||
+++ src/lightdm.c 2013-03-29 11:48:45 +0000
|
||||
@@ -1050,6 +1050,7 @@
|
||||
g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ());
|
||||
|
||||
g_debug ("Loaded configuration from %s", config_path);
|
||||
+ config_set_string (config_get_instance (), "LightDM", "config-path", config_path);
|
||||
g_free (config_path);
|
||||
|
||||
g_debug ("Using D-Bus name %s", LIGHTDM_BUS_NAME);
|
||||
|
||||
=== modified file 'src/seat.c'
|
||||
--- src/seat.c 2013-03-26 22:22:49 +0000
|
||||
+++ src/seat.c 2013-03-29 12:13:00 +0000
|
||||
@@ -536,6 +536,7 @@
|
||||
if (!session_name)
|
||||
session_name = seat_get_string_property (seat, "user-session");
|
||||
display_set_user_session (display, SESSION_TYPE_LOCAL, session_name);
|
||||
+ display_set_config_path (display, config_get_string (config_get_instance (), "LightDM", "config-path"));
|
||||
/* Set default values */
|
||||
diff --git a/src/seat.c b/src/seat.c
|
||||
index e2b9c2c..a950ea2 100644
|
||||
--- a/src/seat.c
|
||||
+++ b/src/seat.c
|
||||
@@ -1137,6 +1137,7 @@ create_greeter_session (Seat *seat)
|
||||
greeter_set_hint (greeter_session, "show-manual-login", seat_get_boolean_property (seat, "greeter-show-manual-login") ? "true" : "false");
|
||||
greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false");
|
||||
greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false");
|
||||
+ greeter_set_hint (greeter_session, "config-path", seat_get_string_property (seat, "config-path"));
|
||||
|
||||
g_object_unref (session_config);
|
||||
|
||||
seat->priv->displays = g_list_append (seat->priv->displays, display);
|
||||
g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display);
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Emacs major mode for Idris";
|
||||
homepage = https://github.com/idris-hackers/idris-modehttps://github.com/idris-hackers/idris-mode;
|
||||
homepage = https://github.com/idris-hackers/idris-mode;
|
||||
license = "GPLv3";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gphoto2-2.5.2";
|
||||
name = "gphoto2-2.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
|
||||
sha256 = "16c8k1cxfypg7v5h8xi87grclw7a5ayaamn548ys3zkj727r5fcf";
|
||||
sha256 = "0i6qjyvgn3aaspiblmiwv51mfy92gm73xpbd3z41ki8mw7plg53i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext ];
|
||||
|
||||
@@ -21,10 +21,10 @@
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pidgin-2.10.8";
|
||||
name = "pidgin-2.10.9";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
|
||||
sha256 = "09w2gbnplyw21lmf9jwk6vkk5gpx5lq15s38bmhkxzw86mz3ccxn";
|
||||
sha256 = "06gka47myl9f5x0flkq74ml75akkf28rx9sl8pm3wqkzazc2wdnw";
|
||||
};
|
||||
|
||||
inherit nss ncurses;
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
, libtoxcore, pkgconfig }:
|
||||
|
||||
let
|
||||
version = "5570b7c98aa";
|
||||
date = "20131112";
|
||||
version = "da99d776df";
|
||||
date = "20140203";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "toxic-${date}-${version}";
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tox/toxic/tarball/${version}";
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "02jfdp10qcw4w62qpra59m9yzzk7a3k2nypkbq5q7ydksbqlx8sj";
|
||||
sha256 = "0d97crkslyk7sgcsawnnwyzp31azp80yprpd6xqjcraxd442dfyj";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -1,28 +1,38 @@
|
||||
{stdenv, fetchurl, qt, libupnp, gpgme, libgnome_keyring, glib}:
|
||||
|
||||
throw "still fails to build"
|
||||
{ stdenv, fetchurl, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
|
||||
, libXScrnSaver, speex, curl, libxml2, libxslt }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "retroshare-0.5.1d";
|
||||
name = "retroshare-0.5.5c";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/retroshare/RetroShare-v0.5.1d.tar.gz;
|
||||
sha256 = "15971wxx8djwcxn170jyn0mlh7cfzqsf031aa849wr9z234gwrcn";
|
||||
url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz;
|
||||
sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp";
|
||||
};
|
||||
|
||||
buildInputs = [ qt libupnp gpgme libgnome_keyring glib ];
|
||||
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2";
|
||||
|
||||
buildPhase = ''
|
||||
cd libbitdht/src
|
||||
qmake libbitdht.pro PREFIX=$out
|
||||
make
|
||||
cd ../..
|
||||
cd libretroshare/src
|
||||
qmake libretroshare.pro PREFIX=$out
|
||||
make
|
||||
cd ../../src
|
||||
qmake libretroshare.pro PREFIX=$out
|
||||
make
|
||||
patchPhase = "sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' libretroshare/src/upnp/UPnPBase.cpp";
|
||||
|
||||
buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig
|
||||
protobuf bzip2 libXScrnSaver curl libxml2 libxslt ];
|
||||
|
||||
sourceRoot = "retroshare-0.5.5/src";
|
||||
|
||||
configurePhase = ''
|
||||
qmake PREFIX=$out DESTDIR=$out RetroShare.pro
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/retroshare-nogui $out/bin
|
||||
ln -s $out/RetroShare $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "";
|
||||
homepage = http://retroshare.sourceforge.net/;
|
||||
#license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.iElectric ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hub-${version}";
|
||||
version = "1.10.6";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/github/hub/archive/v${version}.tar.gz";
|
||||
sha256 = "0vfl1iq1927in81vd7zvp7yqqzay7pciyj87s83qfxrqyjpxn609";
|
||||
sha256 = "09wqxxzgrgcx6p3n3bhrb5ka3194qfwnli5j3frv37448hx6wd4n";
|
||||
};
|
||||
|
||||
buildInputs = [ rake makeWrapper ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, guiSupport ? false, tk ? null, curses }:
|
||||
|
||||
let
|
||||
name = "mercurial-2.8.2";
|
||||
name = "mercurial-2.9";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
|
||||
sha256 = "0vxyxx91k6z0knfqslbwxswbc52abrg2pdf395kwvij026ibm9f8";
|
||||
sha256 = "08m6h2zxik4hcqb5qq3k2anwgjrf0p9kj77lvikcaw8rqmz06y3h";
|
||||
};
|
||||
|
||||
inherit python; # pass it so that the same version can be used in hg2git
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
|
||||
name = "OVMF-2012-10-09";
|
||||
name = "OVMF-2014-02-01";
|
||||
|
||||
unpackPhase = ''
|
||||
for file in \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.4" }:
|
||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }:
|
||||
|
||||
let
|
||||
# Need callPackageOrig to avoid infinite cycle
|
||||
|
||||
@@ -0,0 +1,444 @@
|
||||
{stable=true;
|
||||
hashes=builtins.listToAttrs[
|
||||
{name="amor";value="0xqmb8aymsjkdfjwpk6kjbks7x74cg27x81sg5bhx16dzmmrlgyi";}
|
||||
{name="analitza";value="0zc8ja74x9kgsxdri109sf70lgkx17y234gl82b9yv00snifx2kv";}
|
||||
{name="ark";value="1gylhvql6769q4ys9rgnq1lvn0sk8hzr2m6790xvjd1bcgk7sfyw";}
|
||||
{name="audiocd-kio";value="12xq1a0h6xbgz83q9dd82csw08s7srqmxddc8np0mqazlscb5v3i";}
|
||||
{name="blinken";value="1arbj15v4sjlyzdx2ws7rc7ni4ad2aak8adca5r23rc2zmiw18xf";}
|
||||
{name="bomber";value="0glb2sbzw4nnkdwwd16rn9wz9c46aldyb1sw75f7x45h64jj5da3";}
|
||||
{name="bovo";value="102kd629c41fy6mmhd9cynbs77r55hz4y4dw14qnnfmc840c3mnm";}
|
||||
{name="cantor";value="014wbn53lrmrxq6mra94m6dn02d6nl03jvykks6lg6sfsjl28dnx";}
|
||||
{name="cervisia";value="02ipx5z20dszz0ghccjfpy0wzrcyg8wzpql4yc3j28j93waqrhsk";}
|
||||
{name="dolphin-plugins";value="0m5l01mh29s1lnh5vc9m2dx0vzxsnba47p7xd7w4bjmv7yi72qlg";}
|
||||
{name="dragon";value="1hsx5ccll7zvmsk243r3bvw2gap3kicx5cj8iis5p93iivb1ia4w";}
|
||||
{name="ffmpegthumbs";value="0p51vxr4jgb1rk2jssg3qsl5n14afhf9ygkixv7v7bx0x378r3z3";}
|
||||
{name="filelight";value="18hwm0k4k24hbdzbpk0rcisahyp5hjisq0gg8f5x46vwp424i1hn";}
|
||||
{name="granatier";value="119jx58y8z69avrhs9a777dp38chrwf9a414hcqmbjdqsp7k489i";}
|
||||
{name="gwenview";value="0f4xss58dfgvbzwv43cv58166hxvb1g42kz7d82sn184n1903lck";}
|
||||
{name="jovie";value="0galc7jyy57mw1y5vfq53lqmykqvdr5dch9bqs0qv8wv7fry5mf0";}
|
||||
{name="juk";value="0xy1bin8apmxmhn3bhiw8cpv73az6a3q16rflp99x1i0y5675795";}
|
||||
{name="kaccessible";value="0bmffbdkm2cvgbvblq0rgp20f3zzhnmva2mksbpglfzbmivl5287";}
|
||||
{name="kactivities";value="0a1xxm1is20pz7h2iw4rx0fpwnhlz049yizsy6zx7ld8jl60s0sc";}
|
||||
{name="kajongg";value="1158axh5rqnm59jknx2gp57k65vpd839hqnhm8dwpk033v9a7d2r";}
|
||||
{name="kalgebra";value="18wqkc3mv36vdski1xk1jqrd2jja16ckidy94lzmkksb46xpqysz";}
|
||||
{name="kalzium";value="0bxrhd8x5020srv7w842v202akinvd4xc0kl860vfi633vs4nwp9";}
|
||||
{name="kamera";value="0l858wgpsp961vyfd8i43j01iyi3vvgkniwp4w4c88iqhbsxl8wk";}
|
||||
{name="kanagram";value="1bgp5a5m59wvpqqpb5r68sc8w1jz96cfjj6s6wrllj4r5ndn08zy";}
|
||||
{name="kapman";value="0jchv7fc3b0r70k7r0apm7a9r28jihnjzf3ca08nsrc1l7p94rq3";}
|
||||
{name="kapptemplate";value="0jnmvblyrim9ircnjcyw3djih559jhd27dly6msw3zn2106ky2pl";}
|
||||
{name="kate";value="1dxiw83ym3lg4gwdydwchdmgvbqibsj48ff4hjizl2nabh6v6yxv";}
|
||||
{name="katomic";value="03x7bvixaafakxd3v6lms8x2a5v9awx0nldh7g3piq1pb27pgbz1";}
|
||||
{name="kblackbox";value="1dnqnyp8dkg6p5vh48asm3qx7w582n0vb174g5xdk600zxpdcpaj";}
|
||||
{name="kblocks";value="0r23zf8bkxdiljvd241q179pg6glij5kysm50ccjj1j7ni1qvzg2";}
|
||||
{name="kbounce";value="0j70k5d4wcfv2zqai3m8xm244wdn1irl1zy4iq6clnbhfaaad30a";}
|
||||
{name="kbreakout";value="1nlw3xk53srramz1dgcm4cii50ivgs160hha4v3ks47qkfll0gb5";}
|
||||
{name="kbruch";value="0b9116g88n066nrl4hmw57k61zcc2qjhxwkz0cp68y8d5p5nr4hq";}
|
||||
{name="kcachegrind";value="14wdd2nnf9s0a3a3jh86ylgwf8sqgxxw9909bbs82rlfclc6l2lf";}
|
||||
{name="kcalc";value="10lqkb8x9izc1yv45qlav0zbmdq4ygw2xy93ks2fr5k0p8byc31d";}
|
||||
{name="kcharselect";value="1qbjg9950ksryw12ff8djmwj0lnd14q0ws2461smpyvhbd552vwg";}
|
||||
{name="kcolorchooser";value="1a1rsnnavwlj2fij356z2cl60lnxlc3nzisdmibnmq4lfa4chgk6";}
|
||||
{name="kcron";value="011pv51rznrmy91fp4z6fdv4zlsj0gdf2j2pbqgcm1smgbv0mdhq";}
|
||||
{name="kdeartwork";value="1qsd9493gr4mkd4xvh83rjn84vchqgv1s0q3ga4rbxqwxk3ymlfc";}
|
||||
{name="kde-baseapps";value="0v0k0nk2zypd84gaaxlkdcsaqfklp8501xq40fphdci74qcq7hz2";}
|
||||
{name="kde-base-artwork";value="1cirdsaikp9n3w4qxd3h18v1zq1f2jyzy3cpk51k6dnzvpmyqprx";}
|
||||
{name="kde-dev-scripts";value="1d1i5jcs6kvq9piabk9qpf0s885zym8bll5i71a6yfr1di2gp0xk";}
|
||||
{name="kde-dev-utils";value="0ay04ivb24b43lkf7czr92nm42zaprbw08d9qqgshszcrg5nlffn";}
|
||||
{name="kdegraphics-mobipocket";value="1336md4r28vl0dq6r6dfzjyagn95sj1i9y7s4wqgczdcw28kbsyq";}
|
||||
{name="kdegraphics-strigi-analyzer";value="0rxnigayhyikxiws7ayh0v5j8aidcqc2yhpqkg31mxwm23zmi9pc";}
|
||||
{name="kdegraphics-thumbnailers";value="0qqp6fk3vz02hsn5s3nkbakj3bhm7z2l2nx588yazhwl27g23cff";}
|
||||
{name="kdelibs";value="1gdkiviqkmwax54pg33rk1anby5rhsyv6rk2z6px99phgjk58wph";}
|
||||
{name="kdenetwork-filesharing";value="16fmzszggh7ish0jlj4r0x08dzwk9plc1vmcvryhkp1wx7zy5p60";}
|
||||
{name="kdenetwork-strigi-analyzers";value="1c3cpg5cl7rd8ablm38jn8mdccwalvsfnfqx2vb7rbkigkapgcg9";}
|
||||
{name="kdepim";value="066c28iz7s1a4pjf10bv0kv1pqbfcpgzgl1w38pnq7491nmlsyhc";}
|
||||
{name="kdepimlibs";value="18y0awr6m53rhkx076knbf3zsd1c6frf44qpqkcgvcy1r5wk0ab4";}
|
||||
{name="kdepim-runtime";value="1i339a9qhpnihz9scfnh7kv6wjb2jrnmqikwlc13zymnsw0wk0jg";}
|
||||
{name="kdeplasma-addons";value="0829qvhnxqg6bskbnpiwp4dgsr886bixpz0py9xv7mirfsizdqw9";}
|
||||
{name="kde-runtime";value="1qsnp2r4s7zk78k46p0cqjsddpjai78zyx38w1ygz2mfimz5k83z";}
|
||||
{name="kdesdk-kioslaves";value="0ww9ln4c06vsmrcj5qxr52w22md60209193qdvfyw8dmh2c6bjv4";}
|
||||
{name="kdesdk-strigi-analyzers";value="09869ji9f86rrk0jcwvixkiw6jim2yqfmwb6zd792wf87nlfxjbi";}
|
||||
{name="kdesdk-thumbnailers";value="0r2d6g0nm0j8azr7gs40p9g7cwil0spydczx48qa7lqyags43njq";}
|
||||
{name="kde-wallpapers";value="0gzxll9kkrdp07i96bwxwrpwq3537g3chas5vnwp1rvskqyv6ipq";}
|
||||
{name="kdewebdev";value="0waip70ga76p855yyhdgdkhy8gga7mhwz0dqmw96hh84lr4pirfd";}
|
||||
{name="kde-workspace";value="1kqkhryzj1qkfl8fxj560xf83fya62npx9ld2nj1m2vd3ncs769v";}
|
||||
{name="kdf";value="1iwxp8xjy0rz4sf5bc5dblfjxv98k84svwg2d1s021l9kngfggah";}
|
||||
{name="kdiamond";value="1bvnsbjpwcpdqyzjc7qgbba7dir0y34sns7g11sld7ajxdvl3dxj";}
|
||||
{name="kdnssd";value="1fwh4xab5h0zf8a63r0jk5q9xbg1akl2v092lwl5dw84sh2yqxfb";}
|
||||
{name="kfloppy";value="0pwdgbxi7xf8lml7zwqiaqk8pxl8px999b4jvbbkirf6833854f8";}
|
||||
{name="kfourinline";value="1f3h4izv5vh9jdkzv7c2wd5p3j62n8cp7zwglpwrckcgyj0mp3nv";}
|
||||
{name="kgamma";value="0pgrx2mp072i8wq1hjp9kl0ha6jyjhn3a6x6b35lha8qnjkk7bdh";}
|
||||
{name="kgeography";value="1fyn6bk8gn3cqvzxsywwq34py35w0ampblnd6n3dj48928zc9vlr";}
|
||||
{name="kget";value="1709bjfygnbwav1plsdrqmwmhqi6p7wnzziwhh6vamk7pspfhac5";}
|
||||
{name="kgoldrunner";value="19ywv7pkzgc4yx67aqmkcry47japgbpf9gp2namv0mcrwdnzx6y3";}
|
||||
{name="kgpg";value="1l3sc9kgw4qrcl4p3hqnrr9iw6fz981ayn687s78hf9pb5j94dkv";}
|
||||
{name="khangman";value="06r20f9zix26j8s3k3awamrcqzr6xmdx6adk3nda4akyz7li73d6";}
|
||||
{name="kig";value="06dmhhwgnps4pvsmm45ipmgivfjhg5ig40n6z3lgi3hgnknp08an";}
|
||||
{name="kigo";value="1bxnk3lwg3yr2q28dm6k7257k2288gy22ikzvcgsp09y0g0ci1p9";}
|
||||
{name="killbots";value="1dvi1ffd5kjxhz3lssknv4lj4dghh3i7q1lnpzl0d5i8b2rdgg7b";}
|
||||
{name="kimono";value="0k8mp0f6z4rfhfi3jjjvryidy415wiq5pls8pvffis012f8i8xni";}
|
||||
{name="kiriki";value="11svzhki6zh8rvb6ynm3qdhxnbkkj32b4v8aj1fcma9f8vnmvgn0";}
|
||||
{name="kiten";value="1inszkhzwbwf2b6w5nnvia700ar6d0ixrm1kam8gzdh6mkq7z9pw";}
|
||||
{name="kjumpingcube";value="1wc1lrjp4m4p2l1fx7ncwvs5nmxmbbna3ym5x9cpb8jx7w50psqx";}
|
||||
{name="klettres";value="139053skjg2xf8crz9w9z00fx8wm6scxrx0r6610jwhdbbdq7j50";}
|
||||
{name="klickety";value="0i1k8w1s97hppna1qidjnd3vkp2283pism3g3nxi45s0xjb292xi";}
|
||||
{name="klines";value="11ma1p8fqp9dqw3cgfsvh0yirsivddjcjb4y4s7dpgk5m0sd0dcg";}
|
||||
{name="kmag";value="1hgk676l9bxavszzh3n2705d2s6512liflivyq6zrgm23m623h41";}
|
||||
{name="kmahjongg";value="1xk6pc54q6v75v2b409lhh3mhnw0n4h5ngrhqxhrd9lrmzw5w3wh";}
|
||||
{name="kmines";value="0sh1lsqmc25lhfisfzf1qsmb9x9gmiy2a8siaifaaj2p4mnm36fv";}
|
||||
{name="kmix";value="1m9rr5sqh1k8a94f0ypsw7vwvzg1aaijs8gwzyxmb6jpq09ky31x";}
|
||||
{name="kmousetool";value="1yxcb7x5zlrz1vz3aha6naf6gi00v7xgvqlj4s9nxi4684a3gcdj";}
|
||||
{name="kmouth";value="1ga56k2mfrl9ams4gcag60q0id3plysqzlp0jic314zv3xdrj4mz";}
|
||||
{name="kmplot";value="0d6ifl34s1d35zq6jn4qgwvv49x23f8z9r24x2w4i3zg8hxql48n";}
|
||||
{name="knavalbattle";value="1ipll0cw0vr99dj5asncrdz74d8499knich5hjpsp8igrzxv6h48";}
|
||||
{name="knetwalk";value="0ncy8icsrfzr9hafqxds45fp1mxzdg0325gl4zd5b8bpvsf7cg6p";}
|
||||
{name="kolf";value="1rg39mgwj7fgyy7svwwb18q1w7w7q5wbvd694hzwj30akf2z169s";}
|
||||
{name="kollision";value="0qgmbmrjq7g1b63rdlspfxkm69aly5swp3mqi2v88z4irxfyksia";}
|
||||
{name="kolourpaint";value="0sskfwam1nqjc86dyhpyrg4jwv3a5nfmnk7aqff0zd7qnp712zsy";}
|
||||
{name="kompare";value="1f7cwrnz04d5m7fqsi5xwybi2429bkhi5y169y76fqmy3aiywq7c";}
|
||||
{name="konquest";value="1r3vzd8112dq2xw1ml9v458zdgrbbnmcrq3phgml1q73fn7lya11";}
|
||||
{name="konsole";value="0d9gl124bbbwvi77bhz9dwlz3l42da4nhv88wa63w2ghm4kka44d";}
|
||||
{name="kopete";value="0kz8d4m6apm493v8xlm7mh4q17nj0ijbrzin7255hipqqq1fqvn5";}
|
||||
{name="korundum";value="0vfnq32ip9xhkhvhm3f0g7kxgjaschlfskrahsib7j2aqssq1rmm";}
|
||||
{name="kpat";value="0jl34j9drh6q26d3iiv11azd18kqsvyvgfqs70jfbwj0vpa5y5v3";}
|
||||
{name="kppp";value="1lspvj49cdywj5wj9bbydp1fl7hadhmh25p40l36is2bj1malmn6";}
|
||||
{name="krdc";value="163ly4scznpvwf11ns8by5ph8kamy3lwnhfam1c43rgrhnx5h9rl";}
|
||||
{name="kremotecontrol";value="14nxskj1rwqszk0z9dl0mq6z1c5d7951pwwfnhmrnkw53xsl6x6f";}
|
||||
{name="kreversi";value="035ikzf9ndb4s1zcrh20xmjyci6kfy9l1racg280vwyvlgh38kkp";}
|
||||
{name="krfb";value="11aphkp33wdwd0viwq74s9wbl7rnihvc1vja8miq6kjjlpdkr82m";}
|
||||
{name="kross-interpreters";value="09zgg3afs4z13m5dzr6ddvlv5fdx2n1v50y61pb5yah8jl8vmynp";}
|
||||
{name="kruler";value="1wljhmdzaqznccslrpxvg88y3imr674dxm4dp93sh61wl5a90fa3";}
|
||||
{name="ksaneplugin";value="0aia98rrjq8fhzdlwn6j4jpfa2gpzkr82m3mxgbfvx9k7fh8fisp";}
|
||||
{name="kscd";value="02ss42fyp2liwiizi08fdgk5fjv5kcrzraq05ryaily9szv5in4c";}
|
||||
{name="kshisen";value="1b7v9vf4sq54svd05j1hssmip2kjlzrwbyisyzf6dm8v58m9j5lm";}
|
||||
{name="ksirk";value="17wn20a3ifc5rfg77b9pcnz48ldzxpgwi5i4gy3zsd8d4ykyr7n6";}
|
||||
{name="ksnakeduel";value="03wawqbxp402nqnk0iqm47mcyhc0b5r6mla8chm42q88y542ynvz";}
|
||||
{name="ksnapshot";value="0rbc3ff69d7sgvg7lna85m9qkl5lak9acngaw9x11c9zvxwyx994";}
|
||||
{name="kspaceduel";value="1qv5bny5z442xbciqh2qf2mginx7bbpcgyn80znq0fvmyg0z39qx";}
|
||||
{name="ksquares";value="1hj4k9q594rnxqdf81lc1dzh5fck2bxbvb8bgfsb4qr8qlmj47i2";}
|
||||
{name="kstars";value="0hkxins67q34z99z4db6j15iy2h5l7dz3ww81q371wb0ckmj9svb";}
|
||||
{name="ksudoku";value="0ppqyb7z9pf13h0j6y8faxxn9n5xbrkk3gzi73gwld8ipkm742mc";}
|
||||
{name="ksystemlog";value="0pwqji6h382l6vvwy5zlggcfba4yjmjcfrj0zyaixcq2y1g698s6";}
|
||||
{name="kteatime";value="0zbnnxhag82vfw0krma8ih331vg5n96xqbkiappgi4wz22lz9i1j";}
|
||||
{name="ktimer";value="0p4ybw40rspm3phbipnagkhlwfnkyb21zmiq0wh6md0b5gvcvgwa";}
|
||||
{name="ktouch";value="07xsgsfcsjklaclb540ylfmrjadzy8ig63n7svdfjc19g2kfjyrr";}
|
||||
{name="ktuberling";value="0n1j9z55mval6q1m7hbvm1xrzf8jbvl8fpadjnb12bxfyxszck3m";}
|
||||
{name="kturtle";value="1x0ymm2wr2y0f5ih1f7r9p8pswm95b5ymhsh7c105sh1d5ib6mgq";}
|
||||
{name="ktux";value="1fa11fx48bxvlpq9vfh6q0ywmlcmjbkk60fph66zaazzydjj36cj";}
|
||||
{name="kubrick";value="0lnwq2r4rczr9yqn5fvzazzkbsal2fgslcmmdmk94vvwms7jhkfn";}
|
||||
{name="kuser";value="1l0s2x7jj6rka8jwiyazh916z0glz32aq19skvia3i8n3k4x2xk3";}
|
||||
{name="kwallet";value="1jwpp9klcsnh6shbykvfz25cn8m28r62nb9q9nfhfgz96l9ni8rf";}
|
||||
{name="kwordquiz";value="1qq4vv742di0r1azcn0nycchypkm9ygjp4b08m2gmyfid5b2wscb";}
|
||||
{name="libkcddb";value="18d005vzimazamwri4p1dqdg80l98rj38jglvw8r962bw97rk04s";}
|
||||
{name="libkcompactdisc";value="02g0k81rzdgwah45bh7wj0hzh9akfdcpkbyalahn33q2x10inm39";}
|
||||
{name="libkdcraw";value="0b9g4635j0j5m7aw333r7qpjzy63h6c2xhzp64k4f7jcyp5y0z15";}
|
||||
{name="libkdeedu";value="1cmqm78kw9762axhz5am0gh28p2xibnq49gj5b03wjqi9h122mzr";}
|
||||
{name="libkdegames";value="15xb639x83hy1nnyaqby4ypca03wr9yr8kqw1jnfx6d3f994mlyd";}
|
||||
{name="libkexiv2";value="1cnvvrkqdsrdx6n6907a4ki3gfymaclwdcy1frmnjbsa0hyxzi33";}
|
||||
{name="libkipi";value="0ilxsjld8s7nz59wgn90bsyvd20ikkdf69fkwmxvj850ci2qr9cv";}
|
||||
{name="libkmahjongg";value="0kqn55fdbfmhm0m4ani9iz76rrbsyi953sig57vx3b9x0ljahkh0";}
|
||||
{name="libksane";value="1nmrqkzbqqgs57kgg1b6i0kg65l9rga0hs98n8is5c233z4h3bnr";}
|
||||
{name="lokalize";value="062l2zd0x5rrzdxf592kvvw49rvlkd3v65bg2ya8n6qr083xsr79";}
|
||||
{name="lskat";value="13px2vvxdi38lgr21f3zp3wdr0qsrcpynd787qpx0ckg97x567bi";}
|
||||
{name="marble";value="0m9dqabyf17640n2zcf9d003h7svm678g497r4kzslisznaddvxb";}
|
||||
{name="mplayerthumbs";value="0g8h79vxxgfb2zrh04j79pc4iva4qr2jl56w23crp9sw9cv2f5av";}
|
||||
{name="nepomuk-core";value="0jkbpnk70njw4acwhz908k60wjy84ydwqp62m1fsir5gh7rl3n72";}
|
||||
{name="nepomuk-widgets";value="0snfsvaxv04w2vrj51cf5zl06q4dwywxnqcvbd9ys5nj2hz3i9vq";}
|
||||
{name="okteta";value="0dj271z8f61j58iknk1xdk4nz705xgna6gpm7cxfgrkxkiwqqxyy";}
|
||||
{name="okular";value="1slwk6q4q9gl25v9xvj2m0hmrvl7zagririna3543hxa7cpf0kcj";}
|
||||
{name="oxygen-icons";value="1mg64p8pfayzq72v95pz2gr56b5ghajp6qva63gbg6l17h0ahyss";}
|
||||
{name="pairs";value="0ac8712z6dhy948nk9jhzjcixykda3l97zg8n2p2njg2wggbycxz";}
|
||||
{name="palapeli";value="0x7nfd3wplildnc0fvrlf59iv1z85g4s72525wj5lfg5kavdad4p";}
|
||||
{name="parley";value="0pqgf7lyfp3gj2zk67snj7y7l3j8cnpj2g1zl1pj7mkcd7v9j1fh";}
|
||||
{name="perlkde";value="0x0v0hsk60xjvqnn2v1q3l66hvimy3wvfjk4ds80qvy5a29v5qxg";}
|
||||
{name="perlqt";value="1kkrxyfqxjy3rc6h0r879rd88n4qy2ha1fs4jlmzgf4cmc4g4kvl";}
|
||||
{name="picmi";value="0qpxfvpibc2fj1yz1q0g6srk1z1vqc1db521ngywxx9hbpi2h95g";}
|
||||
{name="poxml";value="17lxxh4km09k9xkr1z62xy1ky1yyqnnj6y82xwpazi9lkn1vnpfk";}
|
||||
{name="print-manager";value="1qwzmy15q84gv7jwp8k3jnfa0l27d2174ll5ln6i29ii2rzzcjw1";}
|
||||
{name="pykde4";value="1p6j85s716r6f13mqxaayqjr4lbfzz5lvgdzmpxfc3fk4n2vbws9";}
|
||||
{name="qtruby";value="1zcfxql3pwlfxwfvy3capc7g447ygpg5bliv9azpzaql051dg5bm";}
|
||||
{name="qyoto";value="0447fzldwcy1nwh2cbqjy81s7xkrz5gn8jiy4ya6bd3d00jisa7v";}
|
||||
{name="rocs";value="0s5k80z0n07qz120zbj6bxs7zp923bilkd3h1swa931fhhxg2gy7";}
|
||||
{name="smokegen";value="1pksnjkawqqgw5l8pjdmfjs4ggxdm8j1429iw9s1xf91z5zpnmk7";}
|
||||
{name="smokekde";value="1075cl0vxz7izrvl0krs8wbqpn32qj4ax7fgyfgf5662cwf8pifg";}
|
||||
{name="smokeqt";value="1w1bfycn2gk9axsjf5vpxxrrvadasnw5zvb8qpg01p2q34jh1gdg";}
|
||||
{name="step";value="0k4xqwxdk1fz69i787njy1bsdappsa5ldx42n6g87lz7dvzwc3vd";}
|
||||
{name="superkaramba";value="1ymb7c2s8x72x2z621xccinxkqpkh9kk1fhyal169nys42cwadhh";}
|
||||
{name="svgpart";value="0r2xl69l2j0qd13wwi007qmxkszciysqfxkcpjiryy9h2rcsl3fv";}
|
||||
{name="sweeper";value="0dfdz7jchhlwx7skina9q47z407fjh47r7f743bllmniqcsswfs2";}
|
||||
{name="umbrello";value="0ss77g4fwvz7w1a9nna0d5d9fxs176b0qapy4ji1qn9hz0igcd0n";}
|
||||
];
|
||||
modules=[
|
||||
{
|
||||
module="kdemultimedia";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="audiocd-kio"; sane="audiocd_kio"; }
|
||||
{ name="dragon"; }
|
||||
{ name="ffmpegthumbs"; }
|
||||
{ name="juk"; }
|
||||
{ name="kmix"; }
|
||||
{ name="kscd"; }
|
||||
{ name="libkcddb"; }
|
||||
{ name="libkcompactdisc"; }
|
||||
{ name="mplayerthumbs"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdegraphics";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="gwenview"; }
|
||||
{ name="kamera"; }
|
||||
{ name="kcolorchooser"; }
|
||||
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
|
||||
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
|
||||
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
|
||||
{ name="kgamma"; }
|
||||
{ name="kolourpaint"; }
|
||||
{ name="kruler"; }
|
||||
{ name="ksaneplugin"; }
|
||||
{ name="ksnapshot"; }
|
||||
{ name="libkdcraw"; }
|
||||
{ name="libkexiv2"; }
|
||||
{ name="libkipi"; }
|
||||
{ name="libksane"; }
|
||||
{ name="okular"; }
|
||||
{ name="svgpart"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdelibs";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="kdelibs"; }
|
||||
{ name="nepomuk-core"; sane="nepomuk_core"; }
|
||||
{ name="nepomuk-widgets"; sane="nepomuk_widgets"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdenetwork";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
|
||||
{ name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
|
||||
{ name="kdnssd"; }
|
||||
{ name="kget"; }
|
||||
{ name="kopete"; }
|
||||
{ name="kppp"; }
|
||||
{ name="krdc"; }
|
||||
{ name="krfb"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdeutils";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="ark"; }
|
||||
{ name="filelight"; }
|
||||
{ name="kcalc"; }
|
||||
{ name="kcharselect"; }
|
||||
{ name="kdf"; }
|
||||
{ name="kfloppy"; }
|
||||
{ name="kgpg"; }
|
||||
{ name="kremotecontrol"; }
|
||||
{ name="ktimer"; }
|
||||
{ name="kwallet"; }
|
||||
{ name="print-manager"; sane="print_manager"; }
|
||||
{ name="superkaramba"; }
|
||||
{ name="sweeper"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="applications";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="kate"; }
|
||||
{ name="konsole"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdetoys";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="amor"; }
|
||||
{ name="kteatime"; }
|
||||
{ name="ktux"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdesdk";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="cervisia"; }
|
||||
{ name="dolphin-plugins"; sane="dolphin_plugins"; }
|
||||
{ name="kapptemplate"; }
|
||||
{ name="kcachegrind"; }
|
||||
{ name="kde-dev-scripts"; sane="kde_dev_scripts"; }
|
||||
{ name="kde-dev-utils"; sane="kde_dev_utils"; }
|
||||
{ name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
|
||||
{ name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
|
||||
{ name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
|
||||
{ name="kompare"; }
|
||||
{ name="lokalize"; }
|
||||
{ name="okteta"; }
|
||||
{ name="poxml"; }
|
||||
{ name="umbrello"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdegames";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="bomber"; }
|
||||
{ name="bovo"; }
|
||||
{ name="granatier"; }
|
||||
{ name="kajongg"; }
|
||||
{ name="kapman"; }
|
||||
{ name="katomic"; }
|
||||
{ name="kblackbox"; }
|
||||
{ name="kblocks"; }
|
||||
{ name="kbounce"; }
|
||||
{ name="kbreakout"; }
|
||||
{ name="kdiamond"; }
|
||||
{ name="kfourinline"; }
|
||||
{ name="kgoldrunner"; }
|
||||
{ name="kigo"; }
|
||||
{ name="killbots"; }
|
||||
{ name="kiriki"; }
|
||||
{ name="kjumpingcube"; }
|
||||
{ name="klickety"; }
|
||||
{ name="klines"; }
|
||||
{ name="kmahjongg"; }
|
||||
{ name="kmines"; }
|
||||
{ name="knavalbattle"; }
|
||||
{ name="knetwalk"; }
|
||||
{ name="kolf"; }
|
||||
{ name="kollision"; }
|
||||
{ name="konquest"; }
|
||||
{ name="kpat"; }
|
||||
{ name="kreversi"; }
|
||||
{ name="kshisen"; }
|
||||
{ name="ksirk"; }
|
||||
{ name="ksnakeduel"; }
|
||||
{ name="kspaceduel"; }
|
||||
{ name="ksquares"; }
|
||||
{ name="ksudoku"; }
|
||||
{ name="ktuberling"; }
|
||||
{ name="kubrick"; }
|
||||
{ name="libkdegames"; }
|
||||
{ name="libkmahjongg"; }
|
||||
{ name="lskat"; }
|
||||
{ name="palapeli"; }
|
||||
{ name="picmi"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdeedu";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="analitza"; }
|
||||
{ name="blinken"; }
|
||||
{ name="cantor"; }
|
||||
{ name="kalgebra"; }
|
||||
{ name="kalzium"; }
|
||||
{ name="kanagram"; }
|
||||
{ name="kbruch"; }
|
||||
{ name="kgeography"; }
|
||||
{ name="khangman"; }
|
||||
{ name="kig"; }
|
||||
{ name="kiten"; }
|
||||
{ name="klettres"; }
|
||||
{ name="kmplot"; }
|
||||
{ name="kstars"; }
|
||||
{ name="ktouch"; }
|
||||
{ name="kturtle"; }
|
||||
{ name="kwordquiz"; }
|
||||
{ name="libkdeedu"; }
|
||||
{ name="marble"; }
|
||||
{ name="pairs"; }
|
||||
{ name="parley"; }
|
||||
{ name="rocs"; }
|
||||
{ name="step"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdeadmin";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="kcron"; }
|
||||
{ name="ksystemlog"; }
|
||||
{ name="kuser"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdebindings";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="kimono"; }
|
||||
{ name="korundum"; }
|
||||
{ name="kross-interpreters"; sane="kross_interpreters"; }
|
||||
{ name="perlkde"; }
|
||||
{ name="perlqt"; }
|
||||
{ name="pykde4"; }
|
||||
{ name="qtruby"; }
|
||||
{ name="qyoto"; }
|
||||
{ name="smokegen"; }
|
||||
{ name="smokekde"; }
|
||||
{ name="smokeqt"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kdeaccessibility";
|
||||
split=true;
|
||||
pkgs=[
|
||||
{ name="jovie"; }
|
||||
{ name="kaccessible"; }
|
||||
{ name="kmag"; }
|
||||
{ name="kmousetool"; }
|
||||
{ name="kmouth"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
module="kde-baseapps";
|
||||
sane="kde_baseapps"; split=true;
|
||||
pkgs=[
|
||||
{ name="kde-baseapps"; sane="kde_baseapps"; }
|
||||
];
|
||||
}
|
||||
{ module="kactivities"; split=false;}
|
||||
{ module="kdeartwork"; split=false;
|
||||
pkgs=[
|
||||
{ name="ColorSchemes"; }
|
||||
{ name="IconThemes"; }
|
||||
{ name="emoticons"; }
|
||||
{ name="kscreensaver"; }
|
||||
{ name="kwin-styles"; sane="kwin_styles";}
|
||||
{ name="sounds"; }
|
||||
{ name="styles"; }
|
||||
{ name="wallpapers"; }
|
||||
{ name="HighResolutionWallpapers"; }
|
||||
{ name="WeatherWallpapers"; }
|
||||
{ name="desktopthemes"; }
|
||||
];
|
||||
|
||||
}
|
||||
{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
|
||||
{ module="kdelibs"; split=false;}
|
||||
{ module="kdepim"; split=false;}
|
||||
{ module="kdepimlibs"; split=false;}
|
||||
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
|
||||
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
|
||||
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
|
||||
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
|
||||
{ module="kdewebdev"; split=false;
|
||||
pkgs=[
|
||||
{ name="klinkstatus"; }
|
||||
{ name="kfilereplace"; }
|
||||
{ name="kimagemapeditor"; }
|
||||
{ name="kommander"; }
|
||||
];
|
||||
|
||||
}
|
||||
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
|
||||
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,272 @@
|
||||
[
|
||||
{
|
||||
lang = "ar";
|
||||
saneName = "ar";
|
||||
sha256 = "1yfvdz1s46sg5d2x7jgr0srxc7mh844ir14n9mmiyk6hk69yzxpg";
|
||||
}
|
||||
{
|
||||
lang = "bg";
|
||||
saneName = "bg";
|
||||
sha256 = "076mpcc5m52ap29hjf144d77c3xmg40qc3dypqxgpx1ya4an1lr1";
|
||||
}
|
||||
{
|
||||
lang = "bs";
|
||||
saneName = "bs";
|
||||
sha256 = "15y1h0j7yw03h28mjhmnlbwnaa5cdv0n20f5gby77b3v2b7kjn5q";
|
||||
}
|
||||
{
|
||||
lang = "ca";
|
||||
saneName = "ca";
|
||||
sha256 = "09md2hcj0bkjpsgqviw475v0g0pgbld728p8kx0aqckywsixagsp";
|
||||
}
|
||||
{
|
||||
lang = "ca@valencia";
|
||||
saneName = "ca_valencia";
|
||||
sha256 = "1adxgg4hp2s7js4q6pi6krjy32gl0dk9dgvw40310zb7nh59zbd0";
|
||||
}
|
||||
{
|
||||
lang = "cs";
|
||||
saneName = "cs";
|
||||
sha256 = "00c8dd8w0d47fp113r3bbd1v1rpqd4qqjamsxbs0ygy0vc644d29";
|
||||
}
|
||||
{
|
||||
lang = "da";
|
||||
saneName = "da";
|
||||
sha256 = "0aa40dmrh3brdqra5c72czch75a44lcng68a7j6zzngdmjcn8wh8";
|
||||
}
|
||||
{
|
||||
lang = "de";
|
||||
saneName = "de";
|
||||
sha256 = "0kq0z37fxgl25zh6a7rj4fjram794iwchg8hqfdvzx3k6kfjgb9s";
|
||||
}
|
||||
{
|
||||
lang = "el";
|
||||
saneName = "el";
|
||||
sha256 = "09gn22hlz99j3kra6k1hs76ypvv6whc9rav1hk1hqrvqaz0v78yf";
|
||||
}
|
||||
{
|
||||
lang = "en_GB";
|
||||
saneName = "en_GB";
|
||||
sha256 = "178dqdmmgz52l8anmnnms91c39y9492ksl003snan1yd7r6dbfwj";
|
||||
}
|
||||
{
|
||||
lang = "es";
|
||||
saneName = "es";
|
||||
sha256 = "0amb1d4y201la37kmambhxwh1pb7b284z48npag863f4bqk491vm";
|
||||
}
|
||||
{
|
||||
lang = "et";
|
||||
saneName = "et";
|
||||
sha256 = "04hyginzrzcf4143nw6ps3fpp3sx8wq30irfm4z2lpzl22137rr3";
|
||||
}
|
||||
{
|
||||
lang = "eu";
|
||||
saneName = "eu";
|
||||
sha256 = "0dwxcvnissa5jmng3dj5mgq7sm3lvfmzk11h4fhjnnjkna4ihsnm";
|
||||
}
|
||||
{
|
||||
lang = "fa";
|
||||
saneName = "fa";
|
||||
sha256 = "1xyg93g3c0p8bibv1vdx1wvivddfc41py1mn8kmib0cnkfprx5bw";
|
||||
}
|
||||
{
|
||||
lang = "fi";
|
||||
saneName = "fi";
|
||||
sha256 = "1acazq7x8lzb4r3qcmwllxhgnyc23lq0aamxrcnq7c8i8xya8byl";
|
||||
}
|
||||
{
|
||||
lang = "fr";
|
||||
saneName = "fr";
|
||||
sha256 = "03a466yxp8wcnbgyrgzbpfy2kbnl9c0grsqqqbpkdfc07q1287rj";
|
||||
}
|
||||
{
|
||||
lang = "ga";
|
||||
saneName = "ga";
|
||||
sha256 = "0mqlrm6jq29w432s9qx8nsq7iyswlpi1n6l990i5gyk74n1jp03i";
|
||||
}
|
||||
{
|
||||
lang = "gl";
|
||||
saneName = "gl";
|
||||
sha256 = "05gz0jj2bvq339qz190j79rb24avvgsih5dzibxapx99wq6s7v6x";
|
||||
}
|
||||
{
|
||||
lang = "he";
|
||||
saneName = "he";
|
||||
sha256 = "0gxjs051qfwhdp8g6ir3caxjflsv5k8va9w6zw5ziimfqkc78vph";
|
||||
}
|
||||
{
|
||||
lang = "hi";
|
||||
saneName = "hi";
|
||||
sha256 = "05arlhsbb8qnsz22h020f4dgxqdy4fgf8fzkjjay1f5w47h381gw";
|
||||
}
|
||||
{
|
||||
lang = "hr";
|
||||
saneName = "hr";
|
||||
sha256 = "0kn7ngq6qrrbjk6m4178dkg81a2q1hcb3hg5jqz95875c08hsrjx";
|
||||
}
|
||||
{
|
||||
lang = "hu";
|
||||
saneName = "hu";
|
||||
sha256 = "1ca61pk19x3bm8fkf7mv9nwfvvawn8w4wlzgcprw3zba94dwm2zj";
|
||||
}
|
||||
{
|
||||
lang = "ia";
|
||||
saneName = "ia";
|
||||
sha256 = "046fyhh4b1qca2m241w55xby9nh2lifdmb44z62i31bgvcfkgvp8";
|
||||
}
|
||||
{
|
||||
lang = "is";
|
||||
saneName = "is";
|
||||
sha256 = "1vid1xpqsdb3jvhm0vdb14d02p5s2vsks59inp50ympsmlsy2967";
|
||||
}
|
||||
{
|
||||
lang = "it";
|
||||
saneName = "it";
|
||||
sha256 = "113sq6d1hlcmbdkwz61bbb0pmwj0wixa1pgv9gm1r61qnix6hskb";
|
||||
}
|
||||
{
|
||||
lang = "ja";
|
||||
saneName = "ja";
|
||||
sha256 = "1rlnazib921cv8fjzjm6c928cwlh6si116iq5l1jq4czwcb3j9d3";
|
||||
}
|
||||
{
|
||||
lang = "kk";
|
||||
saneName = "kk";
|
||||
sha256 = "1prpqwznyxpxm4i0ka4ja5j1d0gljpvhbh9r7a574ai8k419p6jq";
|
||||
}
|
||||
{
|
||||
lang = "km";
|
||||
saneName = "km";
|
||||
sha256 = "09p3vpyj0lw6f470jcbahalw8nh5k7adxaxh4vby7k6r8vip4d74";
|
||||
}
|
||||
{
|
||||
lang = "ko";
|
||||
saneName = "ko";
|
||||
sha256 = "1lfv6xf5dhw9hr9jq1ak0dyz3yzwqf3g4cxv3xm27lxks95ddh3r";
|
||||
}
|
||||
{
|
||||
lang = "lt";
|
||||
saneName = "lt";
|
||||
sha256 = "1s7vi6952pqrm5b1qm1vlmkxna1lijnbgcdmr0n9y31gi066nh5j";
|
||||
}
|
||||
{
|
||||
lang = "lv";
|
||||
saneName = "lv";
|
||||
sha256 = "1lvc0zz5wh5f4nihrvwag4q7dajczm50nfdyvhmbl68gjkar1asw";
|
||||
}
|
||||
{
|
||||
lang = "mr";
|
||||
saneName = "mr";
|
||||
sha256 = "001fjpvqg3z4g214cl8qmvsn1yc7rmkqnajbb1c4wflipvhyyq2w";
|
||||
}
|
||||
{
|
||||
lang = "nb";
|
||||
saneName = "nb";
|
||||
sha256 = "18h2y6i4mzkwwwva5jq2wrbc159hdk9djhr26ilzqb8h065j83bn";
|
||||
}
|
||||
{
|
||||
lang = "nds";
|
||||
saneName = "nds";
|
||||
sha256 = "19kc92ipw94mp9pawxgm0kbq3g1rf6p05892c62nm28vqbmmxbp0";
|
||||
}
|
||||
{
|
||||
lang = "nl";
|
||||
saneName = "nl";
|
||||
sha256 = "1zrz65m9q6jylc32rch7iscjjzr5w8cjkxja9xjl0gip409cnl33";
|
||||
}
|
||||
{
|
||||
lang = "nn";
|
||||
saneName = "nn";
|
||||
sha256 = "1yj0jv0p4scy8q6f6g7zl2c2qybhnp6skj8jnv6sj4q9prp6qwmb";
|
||||
}
|
||||
{
|
||||
lang = "pa";
|
||||
saneName = "pa";
|
||||
sha256 = "0sq17776sjkr6lmj4323377a2aljaf1clrm1qk0zmd3036nh2pgx";
|
||||
}
|
||||
{
|
||||
lang = "pl";
|
||||
saneName = "pl";
|
||||
sha256 = "1xg1fjk77g581fihvspn3936b7j3acgiipn9y4z4fxfr0flmvcxx";
|
||||
}
|
||||
{
|
||||
lang = "pt";
|
||||
saneName = "pt";
|
||||
sha256 = "0y8w7nl1ck1hnb5bs2zirpp62cqzh1hps153gqkl2p1hw47dq92k";
|
||||
}
|
||||
{
|
||||
lang = "pt_BR";
|
||||
saneName = "pt_BR";
|
||||
sha256 = "1bvilvia5k4a556d5pn4lvmlm58xxv1d7d858gsr5yvnkrixdryi";
|
||||
}
|
||||
{
|
||||
lang = "ro";
|
||||
saneName = "ro";
|
||||
sha256 = "0gcb87gwymcz197y0fbb6qnd1w5kkid25sywnjp06nymjnspwqhp";
|
||||
}
|
||||
{
|
||||
lang = "ru";
|
||||
saneName = "ru";
|
||||
sha256 = "1z3g2xmskyh9ykimh396055ywhv9hj49nc2rk7fgc20g61wcnglc";
|
||||
}
|
||||
{
|
||||
lang = "sk";
|
||||
saneName = "sk";
|
||||
sha256 = "055a055h3nhvpgaxs87d55va2kyhk72gf9chrqgqjp5wgbs4cpx4";
|
||||
}
|
||||
{
|
||||
lang = "sl";
|
||||
saneName = "sl";
|
||||
sha256 = "07qw1azmqq7rlyd9ngv3wf474w44cqn40fvcpa4hm13kvf19q7d3";
|
||||
}
|
||||
{
|
||||
lang = "sr";
|
||||
saneName = "sr";
|
||||
sha256 = "1qks72arnk10k4brms6p1m3i4b6kxrgf581xnyhf2v4rch80ccdn";
|
||||
}
|
||||
{
|
||||
lang = "sv";
|
||||
saneName = "sv";
|
||||
sha256 = "0dxkjrcpq9c8qbh5hkjzqcwpqpsfxa5ki8x975kqlh40gcc0942i";
|
||||
}
|
||||
{
|
||||
lang = "tg";
|
||||
saneName = "tg";
|
||||
sha256 = "1qi2sr3l7q2cdypi1m3axhm2ciqnzf88hk52dfcvwqfa4y8n3zgv";
|
||||
}
|
||||
{
|
||||
lang = "tr";
|
||||
saneName = "tr";
|
||||
sha256 = "1d6s3n7v6a8wwrh9lbnjh74dxdxnbg138mm5s09418fxl5vi7gaq";
|
||||
}
|
||||
{
|
||||
lang = "ug";
|
||||
saneName = "ug";
|
||||
sha256 = "145j3k5qc6792q955vyxd582sw3ssvp1anvindf04n4dv3nqk24s";
|
||||
}
|
||||
{
|
||||
lang = "uk";
|
||||
saneName = "uk";
|
||||
sha256 = "0vasjp5liigq2gp9dzwz59316jkj7bv3a9kfmfkyj7bs11rbvsx6";
|
||||
}
|
||||
{
|
||||
lang = "vi";
|
||||
saneName = "vi";
|
||||
sha256 = "1xqa0cb5fcras13vsmnsrdag26csgab0jrgwhsdisrsisrla6dxk";
|
||||
}
|
||||
{
|
||||
lang = "wa";
|
||||
saneName = "wa";
|
||||
sha256 = "1gblglgbznlsxghm2ib9h83jchsa07g8kr1cnb4zn43n7dsr8h6s";
|
||||
}
|
||||
{
|
||||
lang = "zh_CN";
|
||||
saneName = "zh_CN";
|
||||
sha256 = "1ff14fxsm2m86i90v7dp4872r3hlxz13dfmkhhpyscy62fl3bzy4";
|
||||
}
|
||||
{
|
||||
lang = "zh_TW";
|
||||
saneName = "zh_TW";
|
||||
sha256 = "039ww6fa0hcmshd4ximwmj29102qg4xx1p96idcwqwkcf3lryhw2";
|
||||
}
|
||||
]
|
||||
@@ -14,6 +14,5 @@ let version = "0.0.3"; in stdenv.mkDerivation {
|
||||
description = "A statically typed programming language that unifies implementation with formal specification";
|
||||
homepage = http://www.ats-lang.org/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.shlevy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,12 +10,12 @@ else
|
||||
throw "Unsupported architecture";
|
||||
|
||||
edk2 = stdenv.mkDerivation {
|
||||
name = "edk2-2013-10-09";
|
||||
name = "edk2-2014-02-01";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://github.com/tianocore/edk2;
|
||||
rev = "5bcb62a4098c9bde9be6af0833a025adc768e08d";
|
||||
sha256 = "3e2958877061bf6bbfb28b150743d7244486929c1c320bdb1ff2586774aa042a";
|
||||
rev = "2818c158de6a164d012e6afb0fc145656aed4e4b";
|
||||
sha256 = "a756b5de3a3e71d82ce1de8c7832bc69d2affb98d704894b26540571f9f5e214";
|
||||
};
|
||||
|
||||
buildInputs = [ libuuid pythonFull ];
|
||||
@@ -47,10 +47,10 @@ edk2 = stdenv.mkDerivation {
|
||||
configurePhase = ''
|
||||
mkdir -v Conf
|
||||
sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
|
||||
's|MYTOOLS|GCC46|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
|
||||
's|MYTOOLS|GCC48|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
|
||||
< ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
|
||||
sed -e 's|DEFINE GCC46_IA32_PREFIX = /usr/bin/|DEFINE GCC46_IA32_PREFIX = ""|' \
|
||||
-e 's|DEFINE GCC46_X64_PREFIX = /usr/bin/|DEFINE GCC46_X64_PREFIX = ""|' \
|
||||
sed -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \
|
||||
-e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \
|
||||
-e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' \
|
||||
< ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt
|
||||
export WORKSPACE="$PWD"
|
||||
|
||||
@@ -456,7 +456,6 @@ stdenv.mkDerivation ({
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.ludo
|
||||
stdenv.lib.maintainers.viric
|
||||
stdenv.lib.maintainers.shlevy
|
||||
];
|
||||
|
||||
# Volunteers needed for the {Cyg,Dar}win ports of *PPL.
|
||||
|
||||
@@ -1,230 +0,0 @@
|
||||
Index: gcc-4_7-branch/libstdc++-v3/configure.host
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/libstdc++-v3/configure.host (revision 194579)
|
||||
+++ gcc-4_7-branch/libstdc++-v3/configure.host (revision 194580)
|
||||
@@ -340,7 +340,7 @@
|
||||
fi
|
||||
esac
|
||||
case "${host}" in
|
||||
- arm*-*-linux-*eabi)
|
||||
+ arm*-*-linux-*eabi*)
|
||||
port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
|
||||
;;
|
||||
esac
|
||||
Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc (revision 194579)
|
||||
+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc (revision 194580)
|
||||
@@ -1,5 +1,5 @@
|
||||
// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
|
||||
-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
|
||||
+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
|
||||
|
||||
// 2007-05-03 Benjamin Kosnik <bkoz@redhat.com>
|
||||
//
|
||||
Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc (revision 194579)
|
||||
+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc (revision 194580)
|
||||
@@ -1,5 +1,5 @@
|
||||
// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
|
||||
-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
|
||||
+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
|
||||
|
||||
// 2007-05-03 Benjamin Kosnik <bkoz@redhat.com>
|
||||
//
|
||||
Index: gcc-4_7-branch/libjava/configure.ac
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/libjava/configure.ac (revision 194579)
|
||||
+++ gcc-4_7-branch/libjava/configure.ac (revision 194580)
|
||||
@@ -931,7 +931,7 @@
|
||||
# on Darwin -single_module speeds up loading of the dynamic libraries.
|
||||
extra_ldflags_libjava=-Wl,-single_module
|
||||
;;
|
||||
-arm*linux*eabi)
|
||||
+arm*-*-linux*eabi*)
|
||||
# Some of the ARM unwinder code is actually in libstdc++. We
|
||||
# could in principle replicate it in libgcj, but it's better to
|
||||
# have a dependency on libstdc++.
|
||||
Index: gcc-4_7-branch/libjava/configure
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/libjava/configure (revision 194579)
|
||||
+++ gcc-4_7-branch/libjava/configure (revision 194580)
|
||||
@@ -20542,7 +20542,7 @@
|
||||
# on Darwin -single_module speeds up loading of the dynamic libraries.
|
||||
extra_ldflags_libjava=-Wl,-single_module
|
||||
;;
|
||||
-arm*linux*eabi)
|
||||
+arm*-*-linux*eabi*)
|
||||
# Some of the ARM unwinder code is actually in libstdc++. We
|
||||
# could in principle replicate it in libgcj, but it's better to
|
||||
# have a dependency on libstdc++.
|
||||
Index: gcc-4_7-branch/libgcc/config.host
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/libgcc/config.host (revision 194579)
|
||||
+++ gcc-4_7-branch/libgcc/config.host (revision 194580)
|
||||
@@ -327,7 +327,7 @@
|
||||
arm*-*-linux*) # ARM GNU/Linux with ELF
|
||||
tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
|
||||
case ${host} in
|
||||
- arm*-*-linux-*eabi)
|
||||
+ arm*-*-linux-*eabi*)
|
||||
tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
|
||||
tm_file="$tm_file arm/bpabi-lib.h"
|
||||
unwind_header=config/arm/unwind-arm.h
|
||||
Index: gcc-4_7-branch/gcc/doc/install.texi
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/doc/install.texi (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/doc/install.texi (revision 194580)
|
||||
@@ -3222,7 +3222,7 @@
|
||||
@heading @anchor{arm-x-eabi}arm-*-eabi
|
||||
ARM-family processors. Subtargets that use the ELF object format
|
||||
require GNU binutils 2.13 or newer. Such subtargets include:
|
||||
-@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi}
|
||||
+@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*}
|
||||
and @code{arm-*-rtemseabi}.
|
||||
|
||||
@html
|
||||
Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c (revision 194580)
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */
|
||||
+/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */
|
||||
|
||||
void *foo (void)
|
||||
{
|
||||
Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C (revision 194580)
|
||||
@@ -7,10 +7,10 @@
|
||||
// enum-size attributes should only be emitted if there are values of
|
||||
// enum type that can escape the compilation unit, gcc cannot currently
|
||||
// detect this; if this facility is added then this linker option should
|
||||
-// not be needed. arm-*-linux*eabi should be a good approximation to
|
||||
+// not be needed. arm-*-linux*eabi* should be a good approximation to
|
||||
// those platforms where the EABI supplement defines enum values to be
|
||||
// 32 bits wide.
|
||||
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
|
||||
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C (revision 194580)
|
||||
@@ -9,10 +9,10 @@
|
||||
// enum-size attributes should only be emitted if there are values of
|
||||
// enum type that can escape the compilation unit, gcc cannot currently
|
||||
// detect this; if this facility is added then this linker option should
|
||||
-// not be needed. arm-*-linux*eabi should be a good approximation to
|
||||
+// not be needed. arm-*-linux*eabi* should be a good approximation to
|
||||
// those platforms where the EABI supplement defines enum values to be
|
||||
// 32 bits wide.
|
||||
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
|
||||
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
|
||||
|
||||
enum E {
|
||||
a = -312
|
||||
Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C (revision 194580)
|
||||
@@ -7,10 +7,10 @@
|
||||
// enum-size attributes should only be emitted if there are values of
|
||||
// enum type that can escape the compilation unit, gcc cannot currently
|
||||
// detect this; if this facility is added then this linker option should
|
||||
-// not be needed. arm-*-linux*eabi should be a good approximation to
|
||||
+// not be needed. arm-*-linux*eabi* should be a good approximation to
|
||||
// those platforms where the EABI supplement defines enum values to be
|
||||
// 32 bits wide.
|
||||
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
|
||||
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
|
||||
|
||||
// GROUPS passed enums
|
||||
extern "C" int printf (const char *, ...);
|
||||
Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp (revision 194580)
|
||||
@@ -3818,7 +3818,7 @@
|
||||
}
|
||||
} ""
|
||||
}]
|
||||
- } elseif { [istarget arm*-*-linux-gnueabi] } {
|
||||
+ } elseif { [istarget arm*-*-linux-gnueabi*] } {
|
||||
return [check_runtime sync_longlong_runtime {
|
||||
#include <stdlib.h>
|
||||
int main ()
|
||||
@@ -3860,7 +3860,7 @@
|
||||
|| [istarget i?86-*-*]
|
||||
|| [istarget x86_64-*-*]
|
||||
|| [istarget alpha*-*-*]
|
||||
- || [istarget arm*-*-linux-gnueabi]
|
||||
+ || [istarget arm*-*-linux-gnueabi*]
|
||||
|| [istarget bfin*-*linux*]
|
||||
|| [istarget hppa*-*linux*]
|
||||
|| [istarget s390*-*-*]
|
||||
@@ -3890,7 +3890,7 @@
|
||||
|| [istarget i?86-*-*]
|
||||
|| [istarget x86_64-*-*]
|
||||
|| [istarget alpha*-*-*]
|
||||
- || [istarget arm*-*-linux-gnueabi]
|
||||
+ || [istarget arm*-*-linux-gnueabi*]
|
||||
|| [istarget hppa*-*linux*]
|
||||
|| [istarget s390*-*-*]
|
||||
|| [istarget powerpc*-*-*]
|
||||
Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90 (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90 (revision 194580)
|
||||
@@ -1,6 +1,6 @@
|
||||
! { dg-do run }
|
||||
! { dg-options "-fshort-enums" }
|
||||
-! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
|
||||
+! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
|
||||
! Program to test enumerations when option -fshort-enums is given
|
||||
|
||||
program main
|
||||
Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90 (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90 (revision 194580)
|
||||
@@ -1,7 +1,7 @@
|
||||
! { dg-do run }
|
||||
! { dg-additional-sources enum_10.c }
|
||||
! { dg-options "-fshort-enums -w" }
|
||||
-! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
|
||||
+! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
|
||||
! Make sure short enums are indeed interoperable with the
|
||||
! corresponding C type.
|
||||
|
||||
Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in (revision 194580)
|
||||
@@ -1866,7 +1866,7 @@
|
||||
LIBRARY_VERSION := $(LIB_VERSION)
|
||||
endif
|
||||
|
||||
-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
|
||||
+ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
|
||||
LIBGNAT_TARGET_PAIRS = \
|
||||
a-intnam.ads<a-intnam-linux.ads \
|
||||
s-inmaop.adb<s-inmaop-posix.adb \
|
||||
Index: gcc-4_7-branch/gcc/config.gcc
|
||||
===================================================================
|
||||
--- gcc-4_7-branch/gcc/config.gcc (revision 194579)
|
||||
+++ gcc-4_7-branch/gcc/config.gcc (revision 194580)
|
||||
@@ -855,7 +855,7 @@
|
||||
esac
|
||||
tmake_file="${tmake_file} arm/t-arm"
|
||||
case ${target} in
|
||||
- arm*-*-linux-*eabi)
|
||||
+ arm*-*-linux-*eabi*)
|
||||
tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
|
||||
tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
|
||||
# Define multilib configuration for arm-linux-androideabi.
|
||||
@@ -63,7 +63,6 @@ let version = "4.8.2";
|
||||
enableParallelBuilding = !profiledCompiler;
|
||||
|
||||
patches = []
|
||||
++ optional stdenv.isArm ./arm-eabi.patch
|
||||
++ optional enableParallelBuilding ./parallel-bconfig.patch
|
||||
++ optional (cross != null) ./libstdc++-target.patch
|
||||
# ++ optional noSysDirs ./no-sys-dirs.patch
|
||||
|
||||
@@ -16,15 +16,12 @@ assert a.stdenv.gcc.gcc != null ;
|
||||
assert a.stdenv.gcc.libc != null ;
|
||||
|
||||
rec {
|
||||
src = a.fetchcvs {
|
||||
cvsRoot = ":pserver:anonymous@cvs.sv.gnu.org:/sources/gcl";
|
||||
module = "gcl";
|
||||
# tag = "Version_2_6_8pre";
|
||||
date = "2010-07-01";
|
||||
sha256 = "a61d1bf669fd11d13050e8e1ab850a5eecb38126b47c744c3e21646773c4fb4d";
|
||||
src = a.fetchurl {
|
||||
sha256 = "1vsicv81ml7d92c87bckgkpvcshi6hzdnj44k0j6zs5mj8pzp8br";
|
||||
url="http://gnu.spinellicreations.com/gcl/gcl-2.6.10.tar.gz";
|
||||
};
|
||||
|
||||
name = "gcl-2.6.8pre";
|
||||
name = "gcl-2.6.10";
|
||||
inherit buildInputs;
|
||||
configureFlags = [
|
||||
"--enable-ansi"
|
||||
|
||||
@@ -27,6 +27,9 @@ stdenv.mkDerivation {
|
||||
(stdenv.lib.optional (stdenv.gcc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include") ++
|
||||
(stdenv.lib.optional (stdenv.gcc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}");
|
||||
|
||||
# Clang expects to find LLVMgold in its own prefix
|
||||
postInstall = "ln -sv ${llvm}/lib/LLVMgold.so $out/lib";
|
||||
|
||||
passthru.gcc = stdenv.gcc.gcc;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
, valgrind
|
||||
, ncurses
|
||||
, version
|
||||
, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -25,9 +26,9 @@ in stdenv.mkDerivation rec {
|
||||
mv compiler-rt-${version} $sourceRoot/projects/compiler-rt
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ ncurses ]; # linked against it, e.g. mesa needs it now, too
|
||||
buildInputs = [ perl groff cmake libxml2 python libffi ncurses ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
|
||||
|
||||
buildInputs = [ perl groff cmake libxml2 python libffi valgrind ];
|
||||
propagatedBuildInputs = [ ncurses zlib ];
|
||||
|
||||
# hacky fix: created binaries need to be run before installation
|
||||
preBuild = ''
|
||||
@@ -52,6 +53,6 @@ in stdenv.mkDerivation rec {
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, gmp }:
|
||||
{ stdenv, fetchurl, patchelf, gmp }:
|
||||
|
||||
let
|
||||
version = "20130715";
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = name;
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
buildInputs = [ patchelf gmp ];
|
||||
|
||||
makeFlags = [ "all-no-docs" ];
|
||||
|
||||
@@ -54,6 +54,15 @@ stdenv.mkDerivation rec {
|
||||
chmod u+x $(pwd)/../usr/bin/mllex
|
||||
chmod u+x $(pwd)/../usr/bin/mlyacc
|
||||
chmod u+x $(pwd)/../usr/bin/mlton
|
||||
|
||||
# So the builder runs the binary compiler with gmp.
|
||||
export LD_LIBRARY_PATH=${gmp}/lib:$LD_LIBRARY_PATH
|
||||
|
||||
# Patch ELF interpreter.
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../usr/lib/mlton/mlton-compile
|
||||
for e in mllex mlyacc ; do
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../usr/bin/$e
|
||||
done
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, zlib, expat}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "exiv2-0.23";
|
||||
name = "exiv2-0.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.exiv2.org/${name}.tar.gz";
|
||||
sha256 = "04bbg2cg6mgcyz435zamx37sp5zw44n2alb59ki1daz71f851yl1";
|
||||
sha256 = "13pgvz14kyapxl89pxjaq3274k56d5lzfckpg1g9z7gvqzk4797l";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [zlib expat];
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
|
||||
, pygobject, gst_python, gupnp_igd
|
||||
, gst_plugins_good, gst_plugins_bad, gst_ffmpeg
|
||||
{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst-plugins-base
|
||||
, pygobject, gst-python, gupnp_igd
|
||||
, gst-plugins-good, gst-plugins-bad, gst-libav
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "farstream-0.1.2";
|
||||
name = "farstream-0.2.3";
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
|
||||
sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps";
|
||||
sha256 = "15h4qv30ql3rnmlm4ac3h7rplvj7125z14fbfh1zrkajjaa3bxdz";
|
||||
};
|
||||
|
||||
buildInputs = [ libnice python pygobject gupnp_igd libnice ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python
|
||||
gst_plugins_good gst_plugins_bad gst_ffmpeg
|
||||
propagatedBuildInputs = [ gstreamer gst-plugins-base gst-python
|
||||
gst-plugins-good gst-plugins-bad gst-libav
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
<fontconfig>
|
||||
<xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
|
||||
|
||||
<include ignore_missing="yes" xml:space="preserve">/etc/fonts/conf.d</include>
|
||||
<include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
|
||||
<include ignore_missing="yes">/etc/fonts/conf.d</include>
|
||||
<include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
|
||||
|
||||
<cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
|
||||
<cachedir xml:space="preserve">~/.fontconfig</cachedir>
|
||||
<cachedir>/var/cache/fontconfig</cachedir>
|
||||
<cachedir>~/.fontconfig</cachedir>
|
||||
|
||||
<xsl:for-each select="str:tokenize($fontDirectories)">
|
||||
<dir><xsl:value-of select="." /></dir>
|
||||
|
||||
@@ -12,4 +12,6 @@ rec {
|
||||
gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
|
||||
|
||||
gst-libav = callPackage ./libav { inherit gst-plugins-base; };
|
||||
|
||||
gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; };
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{ fetchurl, stdenv, pkgconfig, python, gstreamer
|
||||
, gst-plugins-base, pygtk, pygobject3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-python-1.1.90";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"${meta.homepage}/src/gst-python/${name}.tar.bz2"
|
||||
"mirror://gentoo/distfiles/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "1vsykx2l5360y19c0rxspa9nf1ilml2c1ybsv8cw8p696scryb2l";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gst-plugins-base pygtk pygobject3 ]
|
||||
;
|
||||
|
||||
preConfigure = ''
|
||||
export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ gstreamer python ];
|
||||
|
||||
meta = {
|
||||
homepage = http://gstreamer.freedesktop.org;
|
||||
|
||||
description = "Python bindings for GStreamer";
|
||||
|
||||
license = "LGPLv2+";
|
||||
};
|
||||
}
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLUT";
|
||||
version = "2.5.0.2";
|
||||
sha256 = "0v6lwxn9karmym4fzd0hramcj86sb4wgiyqn47hmcg1dd1fsnhb5";
|
||||
version = "2.5.1.0";
|
||||
sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s";
|
||||
buildDepends = [ OpenGL OpenGLRaw ];
|
||||
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
|
||||
meta = {
|
||||
@@ -1,11 +1,15 @@
|
||||
{ cabal, HUnit, random, testFramework, testFrameworkHunit }:
|
||||
{ cabal, HUnit, random, testFramework, testFrameworkHunit, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "abstract-deque";
|
||||
version = "0.2.2";
|
||||
sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb";
|
||||
buildDepends = [ HUnit random testFramework testFrameworkHunit ];
|
||||
testDepends = [ HUnit random testFramework testFrameworkHunit ];
|
||||
version = "0.2.2.1";
|
||||
sha256 = "0saf7j8fdqqk9msxrfja22zx8v0ibzrqx3v9l07g5n84yh4ydbdx";
|
||||
buildDepends = [
|
||||
HUnit random testFramework testFrameworkHunit time
|
||||
];
|
||||
testDepends = [
|
||||
HUnit random testFramework testFrameworkHunit time
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "atomic-primops";
|
||||
version = "0.5";
|
||||
sha256 = "0pni44gi9sh4l3hxwh7bqadhh6nc7v8w869sv9n45vkxwhhwbk4i";
|
||||
version = "0.6";
|
||||
sha256 = "0jj4mv9vzk7s257gnjs00fza6shr7j9bv8p48gj61yncg0qdypiz";
|
||||
buildDepends = [ Cabal primitive ];
|
||||
meta = {
|
||||
homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
|
||||
homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
|
||||
description = "A safe approach to CAS and other atomic ops in Haskell";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "boomerang";
|
||||
version = "1.4.1";
|
||||
sha256 = "0pmaysp6vw6cnxh3px47pwflm4fc83idld09bpnfnh2jkscp630a";
|
||||
version = "1.4.2";
|
||||
sha256 = "0vy70anwnh7649za6nzb65fx09vqkf50a961da6gzwvbaf526rd0";
|
||||
buildDepends = [ mtl text ];
|
||||
meta = {
|
||||
description = "Library for invertible parsing and printing";
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "diagrams-cairo";
|
||||
version = "1.0.1";
|
||||
sha256 = "16h1xz5amn0yd3h9rss0skaq08k1cy91cncxb9ky020s0wcix9fm";
|
||||
version = "1.0.1.1";
|
||||
sha256 = "0mjc24sir0mm1kqhkk26mfbz90kc71hdylral4bjymxs6fpx7crh";
|
||||
buildDepends = [
|
||||
cairo colour dataDefaultClass diagramsCore diagramsLib filepath
|
||||
hashable lens mtl split statestack time
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "diagrams-svg";
|
||||
version = "1.0.1";
|
||||
sha256 = "15adic3dl4qqrd63jx1rc1w4wx270vm7zc3hr69mnh0wn0cr0ga5";
|
||||
version = "1.0.1.1";
|
||||
sha256 = "0wjk2f7xh7ihkvdri669mw25bdwszzx03np32fy66k56x7adgxzc";
|
||||
buildDepends = [
|
||||
blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
|
||||
hashable lens monoidExtras mtl split time vectorSpace
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "doctest";
|
||||
version = "0.9.10";
|
||||
sha256 = "1xislgmg62i2bngq8ghg31r4ip4qdbqzr6rqhm5wac7nchjv0j83";
|
||||
version = "0.9.10.1";
|
||||
sha256 = "1kl6bihhyj08ifij7ddpy6067s1lv2lnnp4an9wany3fzwlifbyi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ deepseq filepath ghcPaths syb transformers ];
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "email-validate";
|
||||
version = "1.0.0";
|
||||
sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg";
|
||||
version = "2.0.1";
|
||||
sha256 = "1qxvcm8xiyz50ganzic8cm8nxswq361i80yi939y3n89dk067lzj";
|
||||
buildDepends = [ attoparsec ];
|
||||
testDepends = [
|
||||
HUnit QuickCheck testFramework testFrameworkHunit
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "fast-logger";
|
||||
version = "2.1.4";
|
||||
sha256 = "1fb75wx1v9h7690x43kd85lq1h9zi8nq438pqclzzrcfidsnm6z5";
|
||||
version = "2.1.5";
|
||||
sha256 = "12f7yad2f6q846rw2ji5fsx3d7qd8jdrnnzsbji5bpv00mvvsiza";
|
||||
buildDepends = [ blazeBuilder filepath text ];
|
||||
testDepends = [ hspec ];
|
||||
meta = {
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "fay";
|
||||
version = "0.19.0.1";
|
||||
sha256 = "036z4wz7vziaczhx1ysbm7d2302n2sb6l1z48py8spai5awkbvh0";
|
||||
version = "0.19.0.2";
|
||||
sha256 = "025yhl32xr5fcsxval5rcj8jrgd6qnjq9bqbhbsr5ni8dz3ks5r3";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@@ -27,8 +27,10 @@ cabal.mkDerivation (self: {
|
||||
];
|
||||
doCheck = false;
|
||||
patchPhase = ''
|
||||
sed -i -e 's|blaze-markup.*,|blaze-markup,|' -e 's|blaze-html.*,|blaze-html,|' \
|
||||
-e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal
|
||||
sed -i -e 's|blaze-markup.*,|blaze-markup,|' \
|
||||
-e 's|blaze-html.*,|blaze-html,|' \
|
||||
-e 's|pandoc-citeproc.*,|pandoc-citeproc,|' \
|
||||
-e 's|regex-tdfa.*,|regex-tdfa,|' hakyll.cabal
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://jaspervdj.be/hakyll";
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "happstack-lite";
|
||||
version = "7.3.1";
|
||||
sha256 = "0y8d0xv26szfjmkfqzak19zqjgv0w6rkc1rzrd2jkvsbchnwacjy";
|
||||
version = "7.3.3";
|
||||
sha256 = "0iv60cch0fiy9kh21wcpk3s4nvd4j2p50pqr3y56bsqwxk53hhv8";
|
||||
buildDepends = [ happstackServer mtl text ];
|
||||
meta = {
|
||||
homepage = "http://www.happstack.com/";
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "happstack-server";
|
||||
version = "7.3.2";
|
||||
sha256 = "11wnnadxy1j786p81nkvd28vgpjjhm1amy34k5r0ynz0nkanfp3z";
|
||||
version = "7.3.3";
|
||||
sha256 = "18z706n9idszmn5j2cm2aqhs8zavk2sas6fwwywh38j536qzz36l";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
|
||||
html monadControl mtl network parsec sendfile syb systemFilepath
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "haxr";
|
||||
version = "3000.10.1.1";
|
||||
sha256 = "0qvbl3bms2mf650w9j3r0pnl151vzkggy2if3f4rj34qwb2sxmvp";
|
||||
version = "3000.10.2";
|
||||
sha256 = "10fgz1vvrx09pvlxp0k772xbfni8c8lxbjp59vzm95v2kc4hnagc";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeBuilder HaXml HTTP mtl network time
|
||||
utf8String
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hsimport";
|
||||
version = "0.2.6.8";
|
||||
sha256 = "0brz7lxbnkwhjlbvs7xk3012mp9419v9wpczwa3nahl5afzbsp3i";
|
||||
version = "0.2.7";
|
||||
sha256 = "03ddrszirx3xg7lxbykhwbzs4vqr8xravn2krc7v0q308rh070nr";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{ cabal, aeson, bifunctors, comonad, constraints, contravariant
|
||||
, deepseq, distributive, doctest, exceptions, filepath
|
||||
, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
|
||||
, primitive, profunctors, QuickCheck, reflection, scientific
|
||||
, semigroupoids, semigroups, simpleReflect, split, tagged
|
||||
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
|
||||
, testFrameworkTh, text, transformers, transformersCompat
|
||||
, unorderedContainers, utf8String, vector, void, zlib
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lens";
|
||||
version = "4.0";
|
||||
sha256 = "1mrpbwnj1k2my71lm0ajxsx5r44sz372gfxn78vz4182yv3bmla1";
|
||||
buildDepends = [
|
||||
aeson bifunctors comonad constraints contravariant distributive
|
||||
exceptions filepath hashable mtl parallel primitive profunctors
|
||||
reflection scientific semigroupoids semigroups split tagged text
|
||||
transformers transformersCompat unorderedContainers utf8String
|
||||
vector void zlib
|
||||
];
|
||||
testDepends = [
|
||||
deepseq doctest filepath genericDeriving hlint HUnit mtl nats
|
||||
parallel QuickCheck semigroups simpleReflect split testFramework
|
||||
testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
|
||||
transformers unorderedContainers vector
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/lens/";
|
||||
description = "Lenses, Folds and Traversals";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,20 @@
|
||||
{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework
|
||||
, testFrameworkHunit, testFrameworkQuickcheck2, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "llvm-general-pure";
|
||||
version = "3.4.0.0";
|
||||
sha256 = "1b8nl4w16w6dsszmnvylrysi4fd86jcn2bvv531d13p81ybnxlx1";
|
||||
buildDepends = [ mtl parsec setenv transformers ];
|
||||
testDepends = [
|
||||
HUnit mtl QuickCheck testFramework testFrameworkHunit
|
||||
testFrameworkQuickcheck2
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
description = "Pure Haskell LLVM functionality (no FFI)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,25 @@
|
||||
{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
|
||||
, QuickCheck, setenv, testFramework, testFrameworkHunit
|
||||
, testFrameworkQuickcheck2, transformers, utf8String
|
||||
, ncurses, zlib
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "llvm-general";
|
||||
version = "3.4.0.0";
|
||||
sha256 = "1hj96wkgdqyvckgmk7r43n9s9fcq4gijnv0ghrj92ggd13hhmv7b";
|
||||
buildDepends = [
|
||||
llvmGeneralPure mtl parsec setenv transformers utf8String
|
||||
];
|
||||
testDepends = [
|
||||
HUnit llvmGeneralPure mtl QuickCheck testFramework
|
||||
testFrameworkHunit testFrameworkQuickcheck2
|
||||
];
|
||||
buildTools = [ llvmConfig ];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
description = "General purpose LLVM bindings";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-aeson";
|
||||
version = "0.2.0";
|
||||
sha256 = "12y5dywrhx3mvmlq26bc1cwybnclqbf91zvlz5ig2pi01ji3q94y";
|
||||
version = "0.2.1";
|
||||
sha256 = "19zrbk9jbls8zsnhx8bm9dzd7rxvf98bpjkr3k9ggmx2g5p08mgz";
|
||||
buildDepends = [
|
||||
aeson attoparsec pipes pipesAttoparsec pipesParse transformers
|
||||
];
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{ cabal, pipes, pipesParse, transformers }:
|
||||
{ cabal, pipes, pipesGroup, pipesParse, profunctors, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-bytestring";
|
||||
version = "1.0.3";
|
||||
sha256 = "11jiaf5vs0jz8m0x9dlcvflh636131bj4jnlrj3r5nz1v7a64v6b";
|
||||
buildDepends = [ pipes pipesParse transformers ];
|
||||
version = "2.0.0";
|
||||
sha256 = "17l74g7xfl1i32jj9qa9ivbb3ndi68hkc1b6jchwnn19rmg51j9i";
|
||||
buildDepends = [
|
||||
pipes pipesGroup pipesParse profunctors transformers
|
||||
];
|
||||
meta = {
|
||||
description = "ByteString support for pipes";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-concurrency";
|
||||
version = "2.0.1";
|
||||
sha256 = "0grfwmmwzxrska2218php22f898nn3x92bz1lmhpw2qi8mywvkzh";
|
||||
version = "2.0.2";
|
||||
sha256 = "0g4fbh8dk8ph2ga0vyanqj52rxk9c1zi6g4yk3a1g6bnf4bklhm8";
|
||||
buildDepends = [ pipes stm ];
|
||||
testDepends = [ async pipes stm ];
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
{ cabal, free, pipes, pipesParse, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-group";
|
||||
version = "1.0.0";
|
||||
sha256 = "1izc2z3cwz7dihhfrngjyiaxmcpp794ragbl6v17y8c2pj0s34kh";
|
||||
buildDepends = [ free pipes pipesParse transformers ];
|
||||
meta = {
|
||||
description = "Group streams into substreams";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-network";
|
||||
version = "0.6.1";
|
||||
sha256 = "0ds6v98jamda8p72rnrwnj3x77mfx3kss57hj9ns97gga5jq88kl";
|
||||
version = "0.6.2";
|
||||
sha256 = "1y64cyi1lq7y5x3b1rv2iixlwqnz4g82nxk2m14x214fmj3np965";
|
||||
buildDepends = [
|
||||
network networkSimple pipes pipesSafe transformers
|
||||
];
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ cabal, free, pipes, transformers }:
|
||||
{ cabal, pipes, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-parse";
|
||||
version = "2.0.2";
|
||||
sha256 = "1jcws5i9jhh4i6bh2j6m9pz1462qm05byibkkxfqvyx392sxy4wz";
|
||||
buildDepends = [ free pipes transformers ];
|
||||
version = "3.0.0";
|
||||
sha256 = "07ycdnx24qlysbf78sgfl2g8rfsrxnaiq1rimc4656in4cmcjn9g";
|
||||
buildDepends = [ pipes transformers ];
|
||||
meta = {
|
||||
description = "Parsing infrastructure for the pipes ecosystem";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-safe";
|
||||
version = "2.0.1";
|
||||
sha256 = "11516rixqdym5rf5z5f5gwbfk689dl3ka3dj44c7a2qy7xl4sqzr";
|
||||
version = "2.0.2";
|
||||
sha256 = "004xjf0aqa73gxn8kj9844pwbkriv3hk9sbnwxx26pgvqvwjlrsj";
|
||||
buildDepends = [ exceptions pipes transformers ];
|
||||
meta = {
|
||||
description = "Safety for the pipes ecosystem";
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ cabal, mmorph, mtl, QuickCheck, testFramework
|
||||
, testFrameworkQuickcheck2, transformers, void
|
||||
, testFrameworkQuickcheck2, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes";
|
||||
version = "4.0.2";
|
||||
sha256 = "18hcpklryyq9f6iwycxzi3sd6gyd9h0gy0ckg4rl7rhgy73hzgcz";
|
||||
buildDepends = [ mmorph mtl transformers void ];
|
||||
version = "4.1.0";
|
||||
sha256 = "1n10plmrjvmkyv502195mkms48y3lfp5gy08lhyhqqr7kn1gzkf0";
|
||||
buildDepends = [ mmorph mtl transformers ];
|
||||
testDepends = [
|
||||
mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
|
||||
];
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "regex-tdfa";
|
||||
version = "1.1.8";
|
||||
sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x";
|
||||
version = "1.2.0";
|
||||
sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw";
|
||||
buildDepends = [ mtl parsec regexBase ];
|
||||
patches = [ ./fix-build-with-array5.patch ];
|
||||
meta = {
|
||||
homepage = "http://hackage.haskell.org/package/regex-tdfa";
|
||||
description = "Replaces/Enhances Text.Regex";
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs
|
||||
--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs 2011-03-12 00:46:39.000000000 +0100
|
||||
+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs 2013-12-19 12:42:27.048813869 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- | This is the code for the main engine. This captures the posix
|
||||
-- subexpressions. There is also a non-capturing engine, and a
|
||||
-- testing engine.
|
||||
@@ -20,7 +21,12 @@
|
||||
|
||||
import Prelude hiding ((!!))
|
||||
import Control.Monad(when,unless,forM,forM_,liftM2,foldM)
|
||||
+#if MIN_VERSION_array(0,4,0)
|
||||
+import Data.Array.MArray(MArray(..))
|
||||
+import Data.Array.Unsafe(unsafeFreeze)
|
||||
+#else
|
||||
import Data.Array.MArray(MArray(..),unsafeFreeze)
|
||||
+#endif
|
||||
import Data.Array.IArray(Array,bounds,assocs,Ix(range))
|
||||
import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
|
||||
import Data.IntMap(IntMap)
|
||||
@@ -574,7 +580,7 @@
|
||||
case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) ->
|
||||
(# s2#, () #) }}
|
||||
{-
|
||||
-#else /* !__GLASGOW_HASKELL__ */
|
||||
+-- #else /* !__GLASGOW_HASKELL__ */
|
||||
|
||||
copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e)
|
||||
copySTU source destination = do
|
||||
@@ -585,5 +591,5 @@
|
||||
forM_ (range b) $ \index ->
|
||||
set destination index =<< source !! index
|
||||
return destination
|
||||
-#endif /* !__GLASGOW_HASKELL__ */
|
||||
+-- #endif /* !__GLASGOW_HASKELL__ */
|
||||
-}
|
||||
diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs
|
||||
--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs 2011-03-12 00:46:39.000000000 +0100
|
||||
+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs 2013-12-19 12:42:27.049813918 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- | This is the code for the main engine. This captures the posix subexpressions. This 'execMatch'
|
||||
-- also dispatches to "Engine_NC", "Engine_FA", and "Engine_FC_NA"
|
||||
--
|
||||
@@ -19,7 +20,12 @@
|
||||
-}
|
||||
import Prelude hiding ((!!))
|
||||
|
||||
+#if MIN_VERSION_array(0,4,0)
|
||||
+import Data.Array.MArray(MArray(..))
|
||||
+import Data.Array.Unsafe(unsafeFreeze)
|
||||
+#else
|
||||
import Data.Array.MArray(MArray(..),unsafeFreeze)
|
||||
+#endif
|
||||
import Data.Array.IArray(Array,bounds,assocs,Ix(rangeSize,range))
|
||||
import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
|
||||
import Data.IntMap(IntMap)
|
||||
@@ -716,7 +722,7 @@
|
||||
case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) ->
|
||||
(# s2#, () #) }}
|
||||
{-
|
||||
-#else /* !__GLASGOW_HASKELL__ */
|
||||
+-- #else /* !__GLASGOW_HASKELL__ */
|
||||
|
||||
copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e)
|
||||
copySTU source destination = do
|
||||
@@ -727,5 +733,5 @@
|
||||
forM_ (range b) $ \index ->
|
||||
set destination index =<< source !! index
|
||||
return destination
|
||||
-#endif /* !__GLASGOW_HASKELL__ */
|
||||
+-- #endif /* !__GLASGOW_HASKELL__ */
|
||||
-}
|
||||
diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs
|
||||
--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs 2011-03-12 00:46:39.000000000 +0100
|
||||
+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs 2013-12-19 12:42:27.048813869 +0100
|
||||
@@ -1,10 +1,16 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String
|
||||
module Text.Regex.TDFA.NewDFA.Engine_NC_FA(execMatch) where
|
||||
|
||||
import Control.Monad(unless)
|
||||
import Prelude hiding ((!!))
|
||||
|
||||
+#if MIN_VERSION_array(0,4,0)
|
||||
+import Data.Array.MArray(MArray(newArray))
|
||||
+import Data.Array.Unsafe(unsafeFreeze)
|
||||
+#else
|
||||
import Data.Array.MArray(MArray(newArray),unsafeFreeze)
|
||||
+#endif
|
||||
import Data.Array.ST(STArray)
|
||||
import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
|
||||
import qualified Data.IntMap as IMap(null)
|
||||
diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs
|
||||
--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs 2011-03-12 00:46:39.000000000 +0100
|
||||
+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs 2013-12-19 12:42:27.048813869 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String
|
||||
module Text.Regex.TDFA.NewDFA.Engine_NC(execMatch) where
|
||||
|
||||
@@ -5,7 +6,12 @@
|
||||
import Data.Array.Base(unsafeRead,unsafeWrite)
|
||||
import Prelude hiding ((!!))
|
||||
|
||||
+#if MIN_VERSION_array(0,4,0)
|
||||
+import Data.Array.MArray(MArray(..))
|
||||
+import Data.Array.Unsafe(unsafeFreeze)
|
||||
+#else
|
||||
import Data.Array.MArray(MArray(..),unsafeFreeze)
|
||||
+#endif
|
||||
import Data.Array.IArray(Ix)
|
||||
import Data.Array.ST(STArray,STUArray)
|
||||
import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
|
||||
@@ -248,4 +254,3 @@
|
||||
wsToGroup (WScratch start stop) = do
|
||||
ma <- newArray (0,0) (start,stop-start) :: S.ST s (STArray s Int (MatchOffset,MatchLength))
|
||||
unsafeFreeze ma
|
||||
-
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "safe";
|
||||
version = "0.3.3";
|
||||
sha256 = "0ig9laq1p4iic24smjb304mvlsvdyn90lvxh64c4p75c8g459489";
|
||||
version = "0.3.4";
|
||||
sha256 = "0mwdaj0sjvqkgg077x1d896xphx64yrjvwbdhv7khdk3rh0vfl64";
|
||||
meta = {
|
||||
homepage = "http://community.haskell.org/~ndm/safe/";
|
||||
description = "Library for safe (pattern match free) functions";
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat
|
||||
{ cabal, async, mtl, systemFileio, systemFilepath, text, time
|
||||
, unixCompat
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "shelly";
|
||||
version = "1.4.1";
|
||||
sha256 = "04yi5kc9jfcpc1rq3prypc832xgv94lrzv3i8saf1rg8a6najwbx";
|
||||
version = "1.4.4";
|
||||
sha256 = "0gxmwwpg7p5ai35ng8fsx743w3q9p5jl0c1c3ckiqvz4jbwgyf7y";
|
||||
buildDepends = [
|
||||
mtl systemFileio systemFilepath text time unixCompat
|
||||
async mtl systemFileio systemFilepath text time unixCompat
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/yesodweb/Shelly.hs";
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "snap";
|
||||
version = "0.13.2.1";
|
||||
sha256 = "0jkjxyw7pcfl8r6gs0amzpkxardncvxsh20m7lad6aqjkcwh8r4l";
|
||||
version = "0.13.2.2";
|
||||
sha256 = "097bv45646g5qanc5ik0lpfm8g7zd1f5ymlxkilgcnvc72wiwkjm";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@@ -17,7 +17,9 @@ cabal.mkDerivation (self: {
|
||||
postPatch = ''
|
||||
substituteInPlace trifecta.cabal \
|
||||
--replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \
|
||||
--replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \
|
||||
--replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \
|
||||
--replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \
|
||||
--replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \
|
||||
--replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \
|
||||
--replace "comonad == 3.*," "comonad >= 3 && < 5," \
|
||||
|
||||
@@ -17,7 +17,9 @@ cabal.mkDerivation (self: {
|
||||
postPatch = ''
|
||||
substituteInPlace trifecta.cabal \
|
||||
--replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \
|
||||
--replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \
|
||||
--replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \
|
||||
--replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \
|
||||
--replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \
|
||||
--replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \
|
||||
--replace "comonad == 3.*," "comonad >= 3 && < 5," \
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml
|
||||
, blazeMarkup, charset, comonad, deepseq, doctest, filepath
|
||||
, fingertree, hashable, lens, mtl, parsers, reducers, semigroups
|
||||
, transformers, unorderedContainers, utf8String
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "trifecta";
|
||||
version = "1.4";
|
||||
sha256 = "1wz9rqd5nf1y4vpwn0vrbdlxdbrdp967p5ivpd0b2w5493m3mvax";
|
||||
buildDepends = [
|
||||
ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
|
||||
charset comonad deepseq fingertree hashable lens mtl parsers
|
||||
reducers semigroups transformers unorderedContainers utf8String
|
||||
];
|
||||
testDepends = [ doctest filepath ];
|
||||
postPatch = ''
|
||||
substituteInPlace trifecta.cabal \
|
||||
--replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \
|
||||
--replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \
|
||||
--replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \
|
||||
--replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \
|
||||
--replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \
|
||||
--replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \
|
||||
--replace "comonad == 3.*," "comonad >= 3 && < 5," \
|
||||
--replace "comonad >= 3 && < 4," "comonad >= 3 && < 5,"
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/trifecta/";
|
||||
description = "A modern parser combinator library with convenient diagnostics";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@@ -1,23 +1,23 @@
|
||||
{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
|
||||
, conduit, doctest, hashable, hspec, HTTP, httpAttoparsec, httpDate
|
||||
, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck
|
||||
, conduit, doctest, hashable, hspec, HTTP, httpDate, httpTypes
|
||||
, HUnit, liftedBase, network, networkConduit, QuickCheck
|
||||
, simpleSendfile, time, transformers, unixCompat, void, wai
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "2.0.2";
|
||||
sha256 = "1v28kfs311kr7n4hraqh5dzhw2gy0da2rp30732adivy9aj9grl9";
|
||||
version = "2.0.2.1";
|
||||
sha256 = "0r8kpg2k7mr9y7nlccvfk6qbzgv459gidbaw6sgaxb26f6bgipgk";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
|
||||
httpAttoparsec httpDate httpTypes liftedBase network networkConduit
|
||||
simpleSendfile transformers unixCompat void wai
|
||||
httpDate httpTypes liftedBase network networkConduit simpleSendfile
|
||||
transformers unixCompat void wai
|
||||
];
|
||||
testDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest
|
||||
hashable hspec HTTP httpAttoparsec httpDate httpTypes HUnit
|
||||
liftedBase network networkConduit QuickCheck simpleSendfile time
|
||||
transformers unixCompat void wai
|
||||
hashable hspec HTTP httpDate httpTypes HUnit liftedBase network
|
||||
networkConduit QuickCheck simpleSendfile time transformers
|
||||
unixCompat void wai
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "web-routes-boomerang";
|
||||
version = "0.28.1";
|
||||
sha256 = "1a655d73fr7b9k033wyqgc8waq7ii3s5rh0w3nkb1phxl9ldg0pi";
|
||||
version = "0.28.2";
|
||||
sha256 = "17237xq8nvy0c1mxzf7pad5kw0mrgbzazy0rflp382ig9q6ipd05";
|
||||
buildDepends = [ boomerang mtl parsec text webRoutes ];
|
||||
meta = {
|
||||
description = "Library for maintaining correctness and composability of URLs within an application";
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "web-routes";
|
||||
version = "0.27.4";
|
||||
sha256 = "1n9gdaxzy22m3fmrq3j1jkm16c4wvffjbh19xckfpva53zdhsal4";
|
||||
version = "0.27.5";
|
||||
sha256 = "1jx5wwmlylwrf45wy3w29ck1p7509mgy8m02vipd8apibx6ghp22";
|
||||
buildDepends = [
|
||||
blazeBuilder httpTypes mtl parsec split text utf8String
|
||||
];
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-bin";
|
||||
version = "1.2.5.7";
|
||||
sha256 = "0vxkwdqmfi2ccknmgx0xh6w1p7bw3wi24w3c3fw80g72j9sxr5hn";
|
||||
version = "1.2.5.8";
|
||||
sha256 = "1k9afj8f463rs0w9bzxda587jhm1g3fq3l42mabydmg8mx4hbm2c";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-core";
|
||||
version = "1.2.6.5";
|
||||
sha256 = "1xry2jhm4rj3a7fg4xdx5q6fah8dixnrhzyk4176a60a3q8j3lal";
|
||||
version = "1.2.6.6";
|
||||
sha256 = "1wmcsblzr9mq831yp7g90m0rk8a1rgsz1vcdcsr7dsjrykcvxqfq";
|
||||
buildDepends = [
|
||||
aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
|
||||
caseInsensitive cereal clientsession conduit cookie dataDefault
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-form";
|
||||
version = "1.3.4.4";
|
||||
sha256 = "0g5kxcb29qa7xq1s57bvl38fbrsm6jvmvw65nw14as0hbqlv67fh";
|
||||
version = "1.3.5";
|
||||
sha256 = "01qh2s4z9w8g70xz613b2dirfrbag6c861c2niy85c6x8h05nnwy";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
|
||||
dataDefault emailValidate hamlet network persistent resourcet
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }:
|
||||
|
||||
let
|
||||
version = "2.1";
|
||||
version = "2.2.1";
|
||||
in stdenv.mkDerivation {
|
||||
name = "http-parser-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";
|
||||
sha256 = "16a2w5z4g2bma25fqcrkpidqzlq8a2jxkk93ajl721q85406j105";
|
||||
sha256 = "0p8wmchqsj9kwa8pg2is7v0h83q5lqns3vnm6sxrld7gaz979zh5";
|
||||
};
|
||||
|
||||
patches = [ ./build-shared.patch ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, pth, libgpgerror }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libassuan-2.0.3";
|
||||
name = "libassuan-2.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/libassuan/${name}.tar.bz2";
|
||||
sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
|
||||
sha256 = "1783nb0b6nr9yjhb5wfh8ykc5w89f4anppz1kz9913mqg5vxdqi3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libgpgerror pth ];
|
||||
|
||||
@@ -26,15 +26,15 @@ with { inherit (stdenv.lib) optional optionals; };
|
||||
|
||||
let
|
||||
result = {
|
||||
libav_9 = libavFun "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3";
|
||||
libav_0_8 = libavFun "0.8.9" "0zzphhkpwsdp2k3ijqr8miqsp4vk7dgcrcrv06qda1s09qb82lag";
|
||||
libav_9 = libavFun "9.11" "1ad7vyxp0w8dw6ngc16fz0ngsjlgk6h8bpphghqia5sqkbl10ca3";
|
||||
libav_0_8 = libavFun "0.8.10" "0sxmj4qsd3ljygvdjz7ly46nf7sqmaqka4hx65b1jdji12al1djc";
|
||||
};
|
||||
|
||||
libavFun = version : sha256 : stdenv.mkDerivation rec {
|
||||
name = "libav-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://libav.org/releases/${name}.tar.xz";
|
||||
url = "${meta.homepage}/releases/${name}.tar.xz";
|
||||
inherit sha256;
|
||||
};
|
||||
configureFlags =
|
||||
@@ -105,6 +105,7 @@ let
|
||||
license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
|
||||
else if enableGPL then gpl2Plus else lgpl21Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.vcunat ];
|
||||
};
|
||||
}; # libavFun
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcangjie-1.0";
|
||||
name = "libcangjie-1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Cangjians/libcangjie/archive/v1.0.tar.gz";
|
||||
sha256 = "15la1pxa2fvhznlbkl32qp2cgd602bvrx2zmahybypbfik0cgqk1";
|
||||
url = "https://github.com/Cangjians/libcangjie/archive/v1.1.tar.gz";
|
||||
sha256 = "1iy57vlmwgai9763adx6q4fisg2c63cmp31d1cd8mk00c222bw1z";
|
||||
};
|
||||
|
||||
buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ];
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcdio-0.82";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libcdio/${name}.tar.gz";
|
||||
sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs";
|
||||
};
|
||||
|
||||
buildInputs = [ libcddb pkgconfig ncurses help2man ];
|
||||
|
||||
# Disabled because one test (check_paranoia.sh) fails.
|
||||
#doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "A library for OS-independent CD-ROM and CD image access";
|
||||
longDescription = ''
|
||||
GNU libcdio is a library for OS-idependent CD-ROM and
|
||||
CD image access. It includes a library for working with
|
||||
ISO-9660 filesystems (libiso9660), as well as utility
|
||||
programs such as an audio CD player and an extractor.
|
||||
'';
|
||||
license = "GPLv2+";
|
||||
homepage = http://www.gnu.org/software/libcdio/;
|
||||
};
|
||||
}
|
||||
@@ -79,7 +79,7 @@ else stdenv.mkDerivation {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Spotify API library";
|
||||
homepage = https://developer.spotify.com/technologies/libspotify;
|
||||
maintainers = with maintainers; [ lovek323 shlevy ];
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
license = licenses.unfree;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
, libconfig, pkgconfig }:
|
||||
|
||||
let
|
||||
version = "18c98eb";
|
||||
date = "20131112";
|
||||
version = "dbe256cc82";
|
||||
date = "20140203";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tox-core-${date}-${version}";
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}";
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "1g69fz9aspzsrlzlk6fpmjyyhb38v8mmp25nszlbra17n3f209yh";
|
||||
sha256 = "0mqbwwqbm15p16ya8nlij23fgbafjdmnc44nm2vh47m8pyb119lc";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openldap-2.4.35";
|
||||
name = "openldap-2.4.38";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
|
||||
sha256 = "1swy3rly6y0asikp862sigmab8gcll6scb65ln10vps7q5s0640n";
|
||||
sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl cyrus_sasl db4 groff ];
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
, pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-0.4.0";
|
||||
name = "${pname}-0.6.0";
|
||||
pname = "telepathy-farstream";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "13mllgfx4b1hh1vpzq8lk5qfr3ivkkkmwbxgi6d47avgk746kznd";
|
||||
sha256 = "04v414jij2ba71krk7vh4avsz07sfp5w38dmvjwig5isdygy0905";
|
||||
};
|
||||
|
||||
buildInputs = [ gst_plugins_base gst_python pygobject ];
|
||||
|
||||
@@ -30,8 +30,8 @@ args : with args;
|
||||
};
|
||||
# official postgres connector
|
||||
psql = rec {
|
||||
deriv = stdenv.mkDerivation {
|
||||
name = "psql-odbc-08.03.0200";
|
||||
deriv = stdenv.mkDerivation rec {
|
||||
name = "psqlodbc-09.03.0100";
|
||||
buildInputs = [ unixODBC libtool postgresql openssl ];
|
||||
preConfigure="
|
||||
export CPPFLAGS=-I${unixODBC}/include
|
||||
@@ -39,9 +39,8 @@ args : with args;
|
||||
";
|
||||
# added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
|
||||
src = fetchurl {
|
||||
url = http://wwwmaster.postgresql.org/redir?setmir=53&typ=h&url=http://ftp.de.postgresql.org/mirror/postgresql//odbc/versions/src/psqlodbc-08.03.0200.tar.gz;
|
||||
name = "psqlodbc-08.03.0200.tar.gz";
|
||||
sha256 = "1401hgzvs3m2yr2nbbf9gfy2wwijrk4ihwz972arbn0krsiwxya1";
|
||||
url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
|
||||
sha256 = "0mh10chkmlppidnmvgbp47v5jnphsrls28zwbvyk2crcn8gdx9q1";
|
||||
};
|
||||
meta = {
|
||||
description = "unix odbc driver for postgresql";
|
||||
@@ -91,8 +90,11 @@ args : with args;
|
||||
|
||||
configureFlags = "--with-sqlite3=${sqlite} --with-odbc=${unixODBC}";
|
||||
|
||||
# move libraries to $out/lib where they're expected to be
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
mkdir -p "$out/lib"
|
||||
mv "$out"/*.so "$out/lib"
|
||||
mv "$out"/*.la "$out/lib"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
|
||||
|
||||
preConfigure = ''
|
||||
find -type f | xargs sed -i 's@/bin/bash@bash@g'
|
||||
|
||||
sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cc')
|
||||
'';
|
||||
|
||||
buildInputs = [ qt4 dbus zlib openssl readline perl ];
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{ stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
|
||||
, sqlite, python3, cython3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pycangjie-${version}";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${name}.tar.gz";
|
||||
url = "https://github.com/Cangjians/pycangjie/archive/v${version}.tar.gz";
|
||||
sha256 = "1wx0m0chcpgxhj6cdxrwyi8hq05xlbap1ifs0wzb6nkglir0sb4j";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
autoconf automake libtool pkgconfig libcangjie sqlite python3 cython3
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
|
||||
sed -i 's@/usr@${libcangjie}@' tests/__init__.py
|
||||
'';
|
||||
|
||||
configureScript = "./autogen.sh";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python wrapper to libcangjie";
|
||||
homepage = http://cangjians.github.io/projects/pycangjie/;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = [ maintainers.linquize ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hlint";
|
||||
version = "1.8.55";
|
||||
sha256 = "184y0vh5rwsv13vj49zvgwwpgdf5y7wxfisry9pv2998flwkf4rj";
|
||||
version = "1.8.56";
|
||||
sha256 = "1idff4jaca324acbr0aa64j977l5nxnlfk9nny33i81b5hzciwmw";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }:
|
||||
{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lttng-tools-2.3.0";
|
||||
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ popt libuuid liburcu lttngUst ];
|
||||
|
||||
patches = [ ./lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch ];
|
||||
prePatch = ''
|
||||
sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \
|
||||
-i src/bin/lttng-sessiond/modprobe.c
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tracing tools (kernel + user space) for Linux";
|
||||
|
||||
-53
@@ -1,53 +0,0 @@
|
||||
From daba2e936571a236817022b760d91c48b730c30b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
|
||||
Date: Tue, 9 Jul 2013 23:47:47 +0200
|
||||
Subject: [PATCH] Change modprobe path from "/sbin/modprobe" to "modprobe"
|
||||
(rely on PATH lookup)
|
||||
|
||||
---
|
||||
src/bin/lttng-sessiond/modprobe.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
|
||||
index 7e06dad..4075efe 100644
|
||||
--- a/src/bin/lttng-sessiond/modprobe.c
|
||||
+++ b/src/bin/lttng-sessiond/modprobe.c
|
||||
@@ -90,7 +90,7 @@ void modprobe_remove_lttng_control(void)
|
||||
|
||||
for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) {
|
||||
ret = snprintf(modprobe, sizeof(modprobe),
|
||||
- "/sbin/modprobe -r -q %s",
|
||||
+ "modprobe -r -q %s",
|
||||
kern_modules_control[i].name);
|
||||
if (ret < 0) {
|
||||
PERROR("snprintf modprobe -r");
|
||||
@@ -125,7 +125,7 @@ void modprobe_remove_lttng_data(void)
|
||||
|
||||
for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) {
|
||||
ret = snprintf(modprobe, sizeof(modprobe),
|
||||
- "/sbin/modprobe -r -q %s",
|
||||
+ "modprobe -r -q %s",
|
||||
kern_modules_list[i].name);
|
||||
if (ret < 0) {
|
||||
PERROR("snprintf modprobe -r");
|
||||
@@ -169,7 +169,7 @@ int modprobe_lttng_control(void)
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) {
|
||||
ret = snprintf(modprobe, sizeof(modprobe),
|
||||
- "/sbin/modprobe %s%s",
|
||||
+ "modprobe %s%s",
|
||||
kern_modules_control[i].required ? "" : "-q ",
|
||||
kern_modules_control[i].name);
|
||||
if (ret < 0) {
|
||||
@@ -205,7 +205,7 @@ int modprobe_lttng_data(void)
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) {
|
||||
ret = snprintf(modprobe, sizeof(modprobe),
|
||||
- "/sbin/modprobe %s%s",
|
||||
+ "modprobe %s%s",
|
||||
kern_modules_list[i].required ? "" : "-q ",
|
||||
kern_modules_list[i].name);
|
||||
if (ret < 0) {
|
||||
--
|
||||
1.8.2.3
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http_parser, c-ares, pkgconfig, runCommand }:
|
||||
{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
|
||||
|
||||
let
|
||||
dtrace = runCommand "dtrace-native" {} ''
|
||||
@@ -6,13 +6,12 @@ let
|
||||
ln -sv /usr/sbin/dtrace $out/bin
|
||||
'';
|
||||
|
||||
version = "0.10.24";
|
||||
version = "0.10.25";
|
||||
|
||||
# !!! Should we also do shared libuv?
|
||||
deps = {
|
||||
inherit v8 openssl zlib;
|
||||
inherit v8 openssl zlib http-parser;
|
||||
cares = c-ares;
|
||||
http-parser = http_parser;
|
||||
};
|
||||
|
||||
sharedConfigureFlags = name: [
|
||||
@@ -27,7 +26,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
|
||||
sha256 = "0yip81va8nd3kzj64385avcx7ck13a2xcdj3amzwnhk830rxf331";
|
||||
sha256 = "0vxkyvl8hyhxxpkh96zws4j6i9f3ykqpqbrbvj0j0nj7snwz7vj6";
|
||||
};
|
||||
|
||||
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user