Merge branch 'master' into x-updates
Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
commit
eb2e46aab2
3
.gitignore
vendored
3
.gitignore
vendored
@ -2,3 +2,6 @@
|
||||
,*
|
||||
.*.swp
|
||||
.*.swo
|
||||
cpan-info
|
||||
cpan_tmp/
|
||||
result
|
||||
|
||||
@ -1,32 +1,23 @@
|
||||
# Evaluate `release.nix' like Hydra would (i.e. call each job
|
||||
# attribute with the expected `system' argument). Too bad
|
||||
# nix-instantiate can't to do this.
|
||||
# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate
|
||||
# can't to do this.
|
||||
|
||||
with import ../../pkgs/lib;
|
||||
|
||||
let
|
||||
trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
|
||||
|
||||
rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
|
||||
|
||||
seqList = xs: res: fold (x: xs: seq x xs) res xs;
|
||||
|
||||
strictAttrs = as: seqList (attrValues as) as;
|
||||
|
||||
maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" {};
|
||||
|
||||
call = attrs: flip mapAttrs attrs
|
||||
(n: v: trace n (
|
||||
if builtins.isFunction v then maybe (v { system = "x86_64-linux"; })
|
||||
else if builtins.isAttrs v then call v
|
||||
else null
|
||||
));
|
||||
rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ];
|
||||
|
||||
# Add the ‘recurseForDerivations’ attribute to ensure that
|
||||
# nix-instantiate recurses into nested attribute sets.
|
||||
recurse = attrs:
|
||||
if isDerivation attrs
|
||||
then attrs
|
||||
else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs;
|
||||
if (builtins.tryEval attrs).success then
|
||||
if isDerivation attrs
|
||||
then
|
||||
if (builtins.tryEval attrs.outPath).success
|
||||
then attrs
|
||||
else { }
|
||||
else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs
|
||||
else { };
|
||||
|
||||
in recurse (call rel)
|
||||
in recurse rel
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
#! /bin/sh -e
|
||||
|
||||
export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl
|
||||
|
||||
name="$1"
|
||||
[ -n "$name" ] || { echo "no name"; exit 1; }
|
||||
|
||||
|
||||
50
pkgs/applications/audio/gmpc/default.nix
Normal file
50
pkgs/applications/audio/gmpc/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib
|
||||
, gtk, curl, mpd_clientlib, libsoup, gob2, vala
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gmpc-${version}";
|
||||
version = "11.8.16";
|
||||
|
||||
libmpd = stdenv.mkDerivation {
|
||||
name = "libmpd-11.8.17";
|
||||
src = fetchurl {
|
||||
url = http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz;
|
||||
sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y";
|
||||
};
|
||||
buildInputs = [ pkgconfig glib ];
|
||||
};
|
||||
|
||||
libunique = stdenv.mkDerivation {
|
||||
name = "libunique-1.1.6";
|
||||
src = fetchurl {
|
||||
url = http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.6.tar.gz;
|
||||
sha256 = "2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea";
|
||||
};
|
||||
buildInputs = [ pkgconfig glib gtk ];
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/remove_G_CONST_RETURN.patch?h=packages/libunique";
|
||||
sha256 = "0da2qi7cyyax4rr1p25drlhk360h8d3lapgypi5w95wj9k6bykhr";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz";
|
||||
sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
|
||||
libunique libmpd gob2 vala
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://gmpclient.org;
|
||||
description = "A GTK2 frontend for Music Player Daemon";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.rickynils ];
|
||||
};
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, nasm}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lame-3.98.4";
|
||||
name = "lame-3.99.5";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lame/${name}.tar.gz";
|
||||
sha256 = "1j3jywv6ic2cy0x0q1a1h6rcl6xmcs5f58xawjdkl8hpcv3l8cdc";
|
||||
sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14";
|
||||
};
|
||||
|
||||
buildInputs = [ nasm ];
|
||||
|
||||
@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = ./linuxsampler_lv2_sfz_fix.diff;
|
||||
|
||||
# It fails to compile without this option. I'm not sure what the bug
|
||||
# is, but everything works OK for me (goibhniu).
|
||||
configureFlags = [ "--disable-nptl-bug-check" ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -e 's/which/type -P/g' -i scripts/generate_parser.sh
|
||||
make -f Makefile.cvs
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "mopidy-${version}";
|
||||
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mopidy/mopidy.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "123p9hsnlgwvrw4vzlxjf5f43rqzqa3ynbqha8pyi6r0q3ln7qjn";
|
||||
sha256 = "18b1gsyq1ph1a8gl6m4jmhkvq1gyyhbkbb6rrr3qr4rb5prl1fyi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
|
||||
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://unkart.ovh.org/ncmpcpp/;
|
||||
license = "GPLv2+";
|
||||
maintainers = [ stdenv.lib.maintainers.mornfall ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
17
pkgs/applications/audio/normalize/default.nix
Normal file
17
pkgs/applications/audio/normalize/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "normalize-${version}";
|
||||
version = "0.7.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.gz";
|
||||
sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://normalize.nongnu.org/;
|
||||
description = "Audio file normalizer";
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opus-tools-0.1.5";
|
||||
name = "opus-tools-0.1.6";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
|
||||
sha256 = "0184zfamg3qcjknk4liz4smws3mbv77gjhq2pn9xgcx9nw78srvn";
|
||||
sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc";
|
||||
};
|
||||
|
||||
buildInputs = [ libogg libao pkgconfig libopus ];
|
||||
|
||||
21
pkgs/applications/audio/shntool/default.nix
Normal file
21
pkgs/applications/audio/shntool/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ stdenv, fetchurl, flac }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.10";
|
||||
name = "shntool-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz;
|
||||
sha256 = "00i1rbjaaws3drkhiczaign3lnbhr161b7rbnjr8z83w8yn2wc3l";
|
||||
};
|
||||
|
||||
buildInputs = [ flac ];
|
||||
|
||||
meta = {
|
||||
description = "multi-purpose WAVE data processing and reporting utility";
|
||||
homepage = http://www.etree.org/shnutils/shntool/;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with stdenv.lib.maintainers; [ jcumming ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lightdm-gtk-greeter";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz";
|
||||
sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk3 lightdm intltool ];
|
||||
|
||||
patches =
|
||||
[ ./lightdm-gtk-greeter.patch
|
||||
];
|
||||
|
||||
patchFlags = "-p0";
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
|
||||
--replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
|
||||
'';
|
||||
}
|
||||
@ -0,0 +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);
|
||||
- items = lightdm_get_sessions ();
|
||||
+ items = lightdm_get_sessions (greeter);
|
||||
for (item = items; item; item = item->next)
|
||||
{
|
||||
LightDMSession *session = item->data;
|
||||
|
||||
25
pkgs/applications/display-managers/lightdm/default.nix
Normal file
25
pkgs/applications/display-managers/lightdm/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lightdm-1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz;
|
||||
sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ];
|
||||
|
||||
configureFlags = [ "--enable-liblightdm-gobject" ];
|
||||
|
||||
patches =
|
||||
[ ./lightdm.patch
|
||||
];
|
||||
|
||||
patchFlags = "-p0";
|
||||
|
||||
meta = {
|
||||
homepage = http://launchpad.net/lightdm;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
193
pkgs/applications/display-managers/lightdm/lightdm.patch
Normal file
193
pkgs/applications/display-managers/lightdm/lightdm.patch
Normal file
@ -0,0 +1,193 @@
|
||||
=== 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 @@
|
||||
}
|
||||
|
||||
/**
|
||||
+ * lightdm_greeter_get_config_path
|
||||
+ * @greeter: A #LightDMGreeter
|
||||
+ *
|
||||
+ * Get the config path to LightDM.
|
||||
+ *
|
||||
+ * Return value: The path to the current LightDM configuration file.
|
||||
+ **/
|
||||
+const gchar *
|
||||
+lightdm_greeter_get_config_path (LightDMGreeter *greeter)
|
||||
+{
|
||||
+ g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
|
||||
+ return lightdm_greeter_get_hint (greeter, "config-path");
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
* 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 @@
|
||||
|
||||
const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter);
|
||||
|
||||
+const gchar *lightdm_greeter_get_config_path (LightDMGreeter *greeter);
|
||||
+
|
||||
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
|
||||
@@ -12,6 +12,7 @@
|
||||
#define _LIGHTDM_SESSION_H_
|
||||
|
||||
#include <glib-object.h>
|
||||
+#include "greeter.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
@@ -42,9 +43,9 @@
|
||||
|
||||
GType lightdm_session_get_type (void);
|
||||
|
||||
-GList *lightdm_get_sessions (void);
|
||||
+GList *lightdm_get_sessions (LightDMGreeter *greeter);
|
||||
|
||||
-GList *lightdm_get_remote_sessions (void);
|
||||
+GList *lightdm_get_remote_sessions (LightDMGreeter *greeter);
|
||||
|
||||
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
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <string.h>
|
||||
#include <gio/gdesktopappinfo.h>
|
||||
|
||||
+#include "lightdm/greeter.h"
|
||||
#include "lightdm/session.h"
|
||||
|
||||
enum {
|
||||
@@ -167,7 +168,7 @@
|
||||
}
|
||||
|
||||
static void
|
||||
-update_sessions (void)
|
||||
+update_sessions (LightDMGreeter *greeter)
|
||||
{
|
||||
GKeyFile *config_key_file = NULL;
|
||||
gchar *config_path = NULL;
|
||||
@@ -183,8 +184,8 @@
|
||||
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 @@
|
||||
* Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
|
||||
**/
|
||||
GList *
|
||||
-lightdm_get_sessions (void)
|
||||
+lightdm_get_sessions (LightDMGreeter *greeter)
|
||||
{
|
||||
- update_sessions ();
|
||||
+ update_sessions (greeter);
|
||||
return local_sessions;
|
||||
}
|
||||
|
||||
@@ -242,9 +243,9 @@
|
||||
* Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
|
||||
**/
|
||||
GList *
|
||||
-lightdm_get_remote_sessions (void)
|
||||
+lightdm_get_remote_sessions (LightDMGreeter *greeter)
|
||||
{
|
||||
- update_sessions ();
|
||||
+ update_sessions (greeter);
|
||||
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;
|
||||
+
|
||||
/* 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);
|
||||
+}
|
||||
+
|
||||
+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"));
|
||||
|
||||
seat->priv->displays = g_list_append (seat->priv->displays, display);
|
||||
g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
|
||||
|
||||
let date = "2012-01-15"; in
|
||||
let date = "2013-03-21"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emacs-w3m-cvs${date}";
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
inherit date;
|
||||
cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
|
||||
module = "emacs-w3m";
|
||||
sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc";
|
||||
sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs w3m texinfo autoconf ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "htmlize-1.43";
|
||||
name = "htmlize-1.47";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
|
||||
sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi";
|
||||
sha256 = "0m7lby95w9sj0xlqv39imlbp80x8ajd295cs6079jyhmryf6mr10";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "ProofGeneral-4.1";
|
||||
name = "ProofGeneral-4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz;
|
||||
sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia";
|
||||
url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz;
|
||||
sha256 = "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm";
|
||||
};
|
||||
|
||||
sourceRoot = name;
|
||||
@ -22,9 +22,6 @@ stdenv.mkDerivation (rec {
|
||||
# @image{ProofGeneral} fails, so remove it.
|
||||
sed -i '94d' doc/PG-adapting.texi
|
||||
sed -i '101d' doc/ProofGeneral.texi
|
||||
|
||||
# Emacs 24 compatibility.
|
||||
sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
|
||||
description = "Haskell IDE written in Haskell";
|
||||
license = "GPL";
|
||||
platforms = self.stdenv.lib.platforms.linux;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
NIX_LDFLAGS = "-llcms -ljpeg";
|
||||
NIX_LDFLAGS = "-llcms -ljpeg -lX11";
|
||||
|
||||
# NIX_CFLAGS_COMPILE = "-I.";
|
||||
|
||||
|
||||
53
pkgs/applications/graphics/darktable/1.2rc1.nix
Normal file
53
pkgs/applications/graphics/darktable/1.2rc1.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ stdenv, fetchurl
|
||||
, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
|
||||
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
|
||||
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
|
||||
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
|
||||
, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2rc1";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tinyurl.com/bmwdztq";
|
||||
name = "${name}-${version}.tar.xz";
|
||||
sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
|
||||
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
|
||||
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
|
||||
librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
|
||||
|
||||
substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
|
||||
"-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
|
||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Virtual lighttable and darkroom for photographers";
|
||||
homepage = http://darktable.sourceforge.net;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
};
|
||||
}
|
||||
@ -8,12 +8,12 @@
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.2";
|
||||
version = "1.1.4";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
|
||||
sha256 = "225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765";
|
||||
url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz";
|
||||
sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gimp-2.8.2";
|
||||
name = "gimp-2.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
|
||||
md5 = "b542138820ca3a41cbd63fc331907955";
|
||||
md5 = "392592e8755d046317878d226145900f";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
34
pkgs/applications/graphics/openimageio/default.nix
Normal file
34
pkgs/applications/graphics/openimageio/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff
|
||||
, opencolorio, openexr, unzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "oiio-${version}";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
|
||||
sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
|
||||
];
|
||||
|
||||
configurePhase = "";
|
||||
|
||||
buildPhase = ''
|
||||
make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 \
|
||||
INSTALLDIR=$out dist_dir=
|
||||
'';
|
||||
|
||||
installPhase = ":";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.openimageio.org;
|
||||
description = "A library and tools for reading and writing images";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
|
||||
, libXdmcp, lcms2, libiptcdata, expat
|
||||
, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat
|
||||
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rawtherapee-4.0.9";
|
||||
name = "rawtherapee-4.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz;
|
||||
sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a";
|
||||
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz;
|
||||
sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
|
||||
lcms2 libiptcdata expat mercurial ];
|
||||
lcms2 libiptcdata mercurial libcanberra fftw expat ];
|
||||
|
||||
# Disable the use of the RAWZOR propietary libraries
|
||||
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
|
||||
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "RAW converter and digital photo processing software";
|
||||
homepage = http://www.rawtherapee.com/;
|
||||
license = "GPLv3+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [viric jcumming];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.3";
|
||||
version = "0.8.1";
|
||||
name = "bitcoin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz";
|
||||
sha256 = "722d4209ff4a951a9eb5cae26a33ad62770fdcb5dfb5acf0b5c6a8f6f3a8a0ef";
|
||||
sha256 = "161arfkzpya5anh6vh5i9ydvwqpia7bpqgz83p2kd97iklx04zvd";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
|
||||
|
||||
@ -1,32 +1,37 @@
|
||||
{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
|
||||
libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
|
||||
python, zlib, boost, glew, xlibs }:
|
||||
{ stdenv, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
|
||||
, ilmbase, jackaudio, libXi, libjpeg, libpng, libsamplerate, libsndfile
|
||||
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "blender-2.65a";
|
||||
name = "blender-2.66a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
||||
sha256 = "1p7nszbqsn48s6jrj0bqav7q52gj82rpv1w5lhh64v092m3v9jpq";
|
||||
sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
|
||||
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost glew xlibs.libXxf86vm ];
|
||||
buildInputs = [
|
||||
SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi
|
||||
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
|
||||
opencolorio openexr openimageio openjpeg python zlib
|
||||
];
|
||||
|
||||
patches = [ ./fix-include.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOPENEXR_INC=${openexr}/include/OpenEXR"
|
||||
"-DWITH_OPENCOLLADA=OFF"
|
||||
"-DWITH_CODEC_FFMPEG=ON"
|
||||
"-DWITH_CODEC_SNDFILE=ON"
|
||||
"-DWITH_JACK=ON"
|
||||
"-DWITH_INSTALL_PORTABLE=OFF"
|
||||
"-DPYTHON_LIBRARY=${python}/lib"
|
||||
"-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}"
|
||||
"-DOPENJPEG_INCLUDE_DIR=${openjpeg}/include"
|
||||
"-DWITH_CYCLES=0" # would need openimageio
|
||||
]; # ToDo?: more options available
|
||||
"-DPYTHON_LIBRARY=python${python.majorVersion}m"
|
||||
"-DPYTHON_LIBPATH=${python}/lib"
|
||||
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${openjpeg}/include/${openjpeg.incDir} -I${ilmbase}/include/OpenEXR";
|
||||
NIX_CFLAGS_LINK = "-lpython3";
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
33
pkgs/applications/misc/dunst/default.nix
Normal file
33
pkgs/applications/misc/dunst/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
|
||||
, freetype, xdg_utils , libXext, glib, pango , cairo, libX11
|
||||
, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dunst-0.5.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/knopwob/dunst/archive/v0.5.0.zip";
|
||||
sha256 = "08myzhpb1afffcfk3mpmc7gs9305x853b0553fxf3lkgksmg70a6";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ coreutils unzip which pkgconfig dbus freetype
|
||||
xdg_utils libXext glib pango cairo libX11 libxdg_basedir
|
||||
libXScrnSaver xproto libXinerama perl];
|
||||
|
||||
buildPhase = ''
|
||||
export VERSION=${version};
|
||||
export PREFIX=$out;
|
||||
make dunst;
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "lightweight and customizable notification daemon";
|
||||
homepage = http://www.knopwob.org/dunst/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
# NOTE: 'unix' or even 'all' COULD work too, I'm not sure
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
|
||||
|
||||
let
|
||||
name = "gv-3.7.3";
|
||||
name = "gv-3.7.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gv/${name}.tar.gz";
|
||||
sha256 = "ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b";
|
||||
sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
|
||||
};
|
||||
|
||||
buildInputs = [ Xaw3d ghostscriptX perl ];
|
||||
|
||||
31
pkgs/applications/misc/pitz/default.nix
Normal file
31
pkgs/applications/misc/pitz/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock
|
||||
, nose, decorator, docutils }:
|
||||
|
||||
# TODO: pitz has a pitz-shell utility that depends on ipython, but it just
|
||||
# errors out and dies (it probably depends on an old ipython version):
|
||||
#
|
||||
# from IPython.Shell import IPShellEmbed
|
||||
# ImportError: No module named Shell
|
||||
#
|
||||
# pitz-shell is not the primary interface, so it is not critical to have it
|
||||
# working. Concider fixing pitz upstream.
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "pitz-1.2.4";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/p/pitz/${name}.tar.gz";
|
||||
sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr";
|
||||
};
|
||||
|
||||
# propagatedBuildInputs is needed for pitz to find its dependencies at
|
||||
# runtime. If we use buildInputs it would just build, not run.
|
||||
propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ];
|
||||
|
||||
meta = {
|
||||
description = "Distributed bugtracker";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
homepage = http://pitz.tplus1.com/;
|
||||
};
|
||||
}
|
||||
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Tool to share the mouse keyboard and the clipboard between computers";
|
||||
homepage = http://synergy-foss.org;
|
||||
license = "GPL";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
17
pkgs/applications/misc/yeganesh/default.nix
Normal file
17
pkgs/applications/misc/yeganesh/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ cabal, filepath, strict, time, xdgBasedir }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yeganesh";
|
||||
version = "2.5";
|
||||
sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ filepath strict time xdgBasedir ];
|
||||
meta = {
|
||||
homepage = "http://dmwit.com/yeganesh";
|
||||
description = "small dmenu wrapper";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
})
|
||||
@ -1,19 +0,0 @@
|
||||
From 222f1e980ab84ffd3a21001feaf06dd537570a1a Mon Sep 17 00:00:00 2001
|
||||
From: Ian Farmer <ian@ianfarmer.net>
|
||||
Date: Sat, 16 Feb 2013 09:38:10 -0800
|
||||
Subject: [PATCH] Update Chromium dev channel version to 26.0.1410.5.
|
||||
|
||||
This version requires a patch for compatibility with versions
|
||||
of glibc that support older kernel versions.
|
||||
|
||||
--- a/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:06.000000000 -0800
|
||||
+++ b/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:24.000000000 -0800
|
||||
@@ -1313,7 +1313,7 @@
|
||||
return Sandbox::Cond(0, ErrorCode::TP_32BIT, ErrorCode::OP_EQUAL,
|
||||
CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
|
||||
CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS |
|
||||
- CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID,
|
||||
+ CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED,
|
||||
ErrorCode(ErrorCode::ERR_ALLOWED),
|
||||
Sandbox::Trap(ReportCloneFailure, NULL));
|
||||
} else {
|
||||
@ -21,6 +21,9 @@
|
||||
# dependencies for >= v26
|
||||
, speechd, libXdamage
|
||||
|
||||
# dependencies for >= v27
|
||||
, libXtst
|
||||
|
||||
# optional dependencies
|
||||
, libgcrypt ? null # gnomeSupport || cupsSupport
|
||||
|
||||
@ -88,7 +91,9 @@ let
|
||||
];
|
||||
|
||||
pre26 = versionOlder sourceInfo.version "26.0.0.0";
|
||||
pre27 = versionOlder sourceInfo.version "27.0.0.0";
|
||||
post25 = !pre26;
|
||||
post26 = !pre27;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${packageName}-${version}";
|
||||
@ -118,16 +123,16 @@ in stdenv.mkDerivation rec {
|
||||
++ optional cupsSupport libgcrypt
|
||||
++ optional pulseSupport pulseaudio
|
||||
++ optional pre26 libvpx
|
||||
++ optionals post25 [ speechd libXdamage ];
|
||||
++ optionals post25 [ speechd libXdamage ]
|
||||
++ optional post26 libXtst;
|
||||
|
||||
opensslPatches = optional useOpenSSL openssl.patches;
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
||||
patches = optional cupsSupport ./cups_allow_deprecated.patch
|
||||
++ optional pulseSupport ./pulseaudio_array_bounds.patch
|
||||
++ optional post25 ./clone_detached.patch
|
||||
++ [ ./glibc-2.16-use-siginfo_t.patch ];
|
||||
++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch
|
||||
++ optional pre27 ./glibc-2.16-use-siginfo_t.patch;
|
||||
|
||||
postPatch = ''
|
||||
sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
dev = {
|
||||
version = "27.0.1453.6";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.6.tar.bz2";
|
||||
sha256 = "";
|
||||
version = "27.0.1448.0";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.xz";
|
||||
sha256 = "03sarp8drf9a6likk4m73lgk2i4nhqqri8ja9h8qiglqc4sf2hn0";
|
||||
};
|
||||
beta = {
|
||||
version = "26.0.1410.43";
|
||||
|
||||
@ -62,7 +62,7 @@ then
|
||||
sha256="$(nix_getattr "$output_file" "$channel.sha256")";
|
||||
fi;
|
||||
|
||||
sha_insert "$version" "$sha256"
|
||||
sha_insert "$version" "$sha256";
|
||||
echo "$sha256";
|
||||
}
|
||||
else
|
||||
@ -80,10 +80,11 @@ get_channel_exprs()
|
||||
version="${chline##*,}";
|
||||
|
||||
# XXX: Remove case after version 26 is stable:
|
||||
case "${version%%.*}" in
|
||||
26) url="${bucket_url%/}/chromium-$version-lite.tar.xz";;
|
||||
*) url="${bucket_url%/}/chromium-$version.tar.bz2";;
|
||||
esac;
|
||||
if [ "${version%%.*}" -ge 26 ]; then
|
||||
url="${bucket_url%/}/chromium-$version.tar.xz";
|
||||
else
|
||||
url="${bucket_url%/}/chromium-$version.tar.bz2";
|
||||
fi;
|
||||
|
||||
echo -n "Checking if sha256 of version $version is cached..." >&2;
|
||||
if sha256="$(sha_lookup "$version")";
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "conkeror-1.0pre-20120316";
|
||||
name = "conkeror-1.0pre-20130401";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://repo.or.cz/w/conkeror.git/snapshot/1264c0dbbefb6d671504a072d4ddb48d62ccead2.zip;
|
||||
sha256 = "1vdxnhqjjvg9cry70byv6d3wib2p4rxhkmv7hs10pq39km1kpj7f";
|
||||
url = http://repo.or.cz/w/conkeror.git/snapshot/0341e791c78653a2f5bbbff9a1dac04bf898dd65.zip;
|
||||
sha256 = "11v7p40lcz6r5z0w54f8pk6hyn9mqjcw44fqszjyz25rkhx951ry";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
installPhase = ''
|
||||
mkdir -p $out/libexec/conkeror
|
||||
unzip $src -d $out/libexec
|
||||
cp -r * $out/libexec/conkeror
|
||||
|
||||
makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \
|
||||
--add-flags $out/libexec/conkeror/application.ini
|
||||
|
||||
36
pkgs/applications/networking/dropbox-cli/default.nix
Normal file
36
pkgs/applications/networking/dropbox-cli/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ stdenv, coreutils, fetchurl, python }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dropbox-cli";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linux.dropbox.com/packages/dropbox.py";
|
||||
sha256 = "1x46i0aplah4a2nqglb8byl3c60w7h1cjja62myxj2dpxyv7fydy";
|
||||
};
|
||||
|
||||
buildInputs = [ coreutils python ];
|
||||
|
||||
phases = "installPhase fixupPhase";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin/
|
||||
cp $src $out/bin/dropbox-cli
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
substituteInPlace $out/bin/dropbox-cli \
|
||||
--replace "/usr/bin/python" ${python}/bin/python \
|
||||
--replace "use dropbox help" "use dropbox-cli help"
|
||||
|
||||
chmod +x $out/bin/dropbox-cli
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://dropbox.com;
|
||||
description = "Command line client for the dropbox daemon.";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
# NOTE: Dropbox itself only works on linux, so this is ok.
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,13 +16,19 @@
|
||||
# replace these libraries with the appropriate ones in
|
||||
# nixpkgs.
|
||||
|
||||
# note: there is a i686 version available as well
|
||||
assert stdenv.system == "x86_64-linux";
|
||||
|
||||
let
|
||||
arch = if stdenv.system == "x86_64-linux" then "x86_64"
|
||||
else if stdenv.system == "i686-linux" then "x86"
|
||||
else throw "Dropbox client for: ${stdenv.system} not supported!";
|
||||
|
||||
interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
|
||||
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
|
||||
else throw "Dropbox client for: ${stdenv.system} not supported!";
|
||||
|
||||
version = "1.4.21";
|
||||
sha256 = "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2";
|
||||
sha256 = if stdenv.system == "x86_64-linux" then "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2"
|
||||
else if stdenv.system == "i686-linux" then "121v92m20l73xjmzng3vmcp4zsp9mlbcfia73f5py5y74kndb2ap"
|
||||
else throw "Dropbox client for: ${stdenv.system} not supported!";
|
||||
|
||||
# relative location where the dropbox libraries are stored
|
||||
appdir = "opt/dropbox";
|
||||
@ -52,8 +58,8 @@ in stdenv.mkDerivation {
|
||||
name = "dropbox-${version}.tar.gz";
|
||||
# using version-specific URL so if the version is no longer available,
|
||||
# build will fail without having to finish downloading first
|
||||
# url = "http://www.dropbox.com/download?plat=lnx.x86_64";
|
||||
url = "http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${version}.tar.gz";
|
||||
# url = "http://www.dropbox.com/download?plat=lnx.${arch}";
|
||||
url = "http://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
@ -69,10 +75,10 @@ in stdenv.mkDerivation {
|
||||
ensureDir "$out/bin"
|
||||
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
|
||||
"$out/${appdir}/dropbox"
|
||||
|
||||
RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${appdir}
|
||||
RPATH=${ldpath}:${gcc.gcc}/lib:$out/${appdir}
|
||||
echo "updating rpaths to: $RPATH"
|
||||
find "$out/${appdir}" -type f -a -perm +0100 \
|
||||
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
|
||||
|
||||
@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0qsi5f8d84mgdszvz22acyv6mjnbrpk55d54km9i5mkkapck7r4y";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e 's,#include <linux/if_tr.h>,#include <netinet/if_tr.h>,' src/*
|
||||
'';
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "notmuch-0.15";
|
||||
name = "notmuch-0.15.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://notmuchmail.org/releases/${name}.tar.gz";
|
||||
sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q";
|
||||
sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56";
|
||||
};
|
||||
|
||||
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
|
||||
|
||||
41
pkgs/applications/networking/p2p/transmission/2.60.nix
Normal file
41
pkgs/applications/networking/p2p/transmission/2.60.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
|
||||
file, inotifyTools, gtk ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.transmissionbt.com/files/${name}.tar.xz";
|
||||
sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig openssl curl intltool libevent
|
||||
file inotifyTools gtk ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
rm -f $out/share/icons/hicolor/icon-theme.cache
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A fast, easy and free BitTorrent client";
|
||||
longDescription = ''
|
||||
Transmission is a BitTorrent client which features a simple interface
|
||||
on top of a cross-platform back-end.
|
||||
Feature spotlight:
|
||||
* Uses fewer resources than other clients
|
||||
* Native Mac, GTK+ and Qt GUI clients
|
||||
* Daemon ideal for servers, embedded systems, and headless use
|
||||
* All these can be remote controlled by Web and Terminal clients
|
||||
* Bluetack (PeerGuardian) blocklists with automatic updates
|
||||
* Full encryption, DHT, and PEX support
|
||||
'';
|
||||
homepage = http://www.transmissionbt.com/;
|
||||
license = [ "GPLv2" ];
|
||||
maintainers = [ stdenv.lib.maintainers.astsmtl ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,21 +1,27 @@
|
||||
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
|
||||
file, inotifyTools, gtk ? null }:
|
||||
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent
|
||||
, file, inotifyTools
|
||||
, enableGtk ? false, gtk ? null }:
|
||||
|
||||
assert enableGtk -> gtk != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
|
||||
name = "transmission-2.77"; # transmission >= 2.61 requires gtk3
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.transmissionbt.com/files/${name}.tar.xz";
|
||||
sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
|
||||
sha256 = "1phzhj4wds6r2ziclva1b5l6l9xjsx5ji7s3m4xia44aq4znbcam";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig openssl curl intltool libevent
|
||||
file inotifyTools gtk ];
|
||||
file inotifyTools ]
|
||||
++ stdenv.lib.optional enableGtk gtk;
|
||||
|
||||
preConfigure = ''
|
||||
sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
|
||||
'';
|
||||
|
||||
configureFlags = stdenv.lib.optionalString enableGtk "--with-gtk";
|
||||
|
||||
postInstall = ''
|
||||
rm -f $out/share/icons/hicolor/icon-theme.cache
|
||||
'';
|
||||
|
||||
49
pkgs/applications/networking/remote/teamviewer/8.nix
Normal file
49
pkgs/applications/networking/remote/teamviewer/8.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
|
||||
, bash }:
|
||||
|
||||
# Work in progress.
|
||||
|
||||
# It doesn't want to start unless teamviewerd is running as root.
|
||||
# I haven't tried to make the daemon run.
|
||||
|
||||
assert stdenv.system == "i686-linux";
|
||||
let
|
||||
topath = "${wine}/bin";
|
||||
|
||||
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
|
||||
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "teamviewer-8.0.17147";
|
||||
src = fetchurl {
|
||||
url = "http://download.teamviewer.com/download/teamviewer_linux_x64.deb";
|
||||
sha256 = "01iynk954pphl5mq4avs843xyzvdfzng1lpsy7skgwvw0k9cx5ab";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
unpackPhase = ''
|
||||
ar x $src
|
||||
tar xf data.tar.gz
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/teamviewer8 $out/bin
|
||||
cp -a opt/teamviewer8/* $out/share/teamviewer8
|
||||
rm -R $out/share/teamviewer8/tv_bin/wine/{bin,lib,share}
|
||||
|
||||
cat > $out/bin/teamviewer << EOF
|
||||
#!${bash}/bin/sh
|
||||
export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
|
||||
export PATH=${topath}\''${PATH:+:\$PATH}
|
||||
$out/share/teamviewer8/tv_bin/script/teamviewer
|
||||
EOF
|
||||
chmod +x $out/bin/teamviewer
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.teamviewer.com";
|
||||
license = "unfree";
|
||||
description = "Desktop sharing application, providing remote support and online meetings";
|
||||
};
|
||||
}
|
||||
46
pkgs/applications/networking/remote/teamviewer/default.nix
Normal file
46
pkgs/applications/networking/remote/teamviewer/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
|
||||
, bash }:
|
||||
|
||||
assert stdenv.system == "i686-linux";
|
||||
let
|
||||
topath = "${wine}/bin";
|
||||
|
||||
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
|
||||
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "teamviewer-7.0.9377";
|
||||
src = fetchurl {
|
||||
url = "http://www.teamviewer.com/download/version_7x/teamviewer_linux.tar.gz";
|
||||
sha256 = "1f8934jqj093m1z56yl6k2ah6njkk6pz1rjvpqnryi29pp5piaiy";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
# I need patching, mainly for it not try to use its own 'wine' (in the tarball).
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/teamviewer $out/bin
|
||||
cp -a .tvscript/* $out/share/teamviewer
|
||||
cp -a .wine/drive_c $out/share/teamviewer
|
||||
sed -i -e 's/^tv_Run//' \
|
||||
-e 's/^ setup_tar_env//' \
|
||||
-e 's/^ setup_env//' \
|
||||
-e 's,^ TV_Wine_dir=.*, TV_Wine_dir=${wine},' \
|
||||
-e 's,progsrc=.*drive_c,progsrc='$out'"/share/teamviewer/drive_c,' \
|
||||
$out/share/teamviewer/wrapper
|
||||
|
||||
cat > $out/bin/teamviewer << EOF
|
||||
#!${bash}/bin/sh
|
||||
export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
|
||||
export PATH=${topath}\''${PATH:+:\$PATH}
|
||||
$out/share/teamviewer/wrapper wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/teamviewer
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.teamviewer.com";
|
||||
license = "unfree";
|
||||
description = "Desktop sharing application, providing remote support and online meetings";
|
||||
};
|
||||
}
|
||||
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://samba.anu.edu.au/rsync/;
|
||||
description = "A fast incremental file transfer utility";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11,
|
||||
gettext}:
|
||||
{ stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, gtk, wxGTK, zlib, libX11,
|
||||
gettext, cups } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kicad-20110708";
|
||||
name = "kicad-20130325";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip;
|
||||
sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a";
|
||||
url = "http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-stable_2013-03-25_BZR4005.zip";
|
||||
sha256 = "0hg2aiis14am7mmpimcxnxvhy7c7fr5rgzlk6rjv44d9m0f9957m";
|
||||
};
|
||||
|
||||
srcLibrary = fetchbzr {
|
||||
url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
|
||||
revision = 112;
|
||||
sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312";
|
||||
revision = 220;
|
||||
sha256 = "0l2lblgnm51n2w1p4ifpwdvq04rxgq73zrfxlhqa9zdlyh4rcddb";
|
||||
};
|
||||
|
||||
cmakeFlags = "-DKICAD_TESTING_VERSION=ON";
|
||||
|
||||
@ -4,28 +4,20 @@ let
|
||||
start_script = ''
|
||||
#!/bin/sh
|
||||
cd "$out/lib/hol_light"
|
||||
exec ${ocaml}/bin/ocaml -I "$(ocamlfind query camlp5)" -init make.ml
|
||||
exec ${ocaml}/bin/ocaml -I "camlp5 -where" -init make.ml
|
||||
'';
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hol_light-20130124";
|
||||
name = "hol_light-20130324";
|
||||
src = fetchsvn {
|
||||
url = http://hol-light.googlecode.com/svn/trunk;
|
||||
rev = "155";
|
||||
sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr";
|
||||
rev = "157";
|
||||
sha256 = "0d0pbnkw2gb11dn30ggfl91lhdxv86kd1fyiqn170w08n0gi805f";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib camlp5 ];
|
||||
|
||||
buildPhase = ''
|
||||
make pa_j.ml
|
||||
ocamlc -c \
|
||||
-pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \
|
||||
-I "$(ocamlfind query camlp5)" \
|
||||
pa_j.ml
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/lib/hol_light" "$out/bin"
|
||||
cp -a . $out/lib/hol_light
|
||||
@ -45,6 +37,6 @@ can extend it with new theorems and inference rules without compromising its
|
||||
soundness.
|
||||
'';
|
||||
homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
|
||||
license = "BSD";
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation {
|
||||
description = "Cross platform GUI for the computer algebra system Maxima.";
|
||||
license = "GPL2";
|
||||
homepage = http://wxmaxima.sourceforge.net;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
||||
59
pkgs/applications/search/recoll/default.nix
Normal file
59
pkgs/applications/search/recoll/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ stdenv, fetchurl
|
||||
, qt4, xapian, file, python
|
||||
, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
|
||||
, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconvOrLibc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
ver = "1.18.1";
|
||||
name = "recoll-${ver}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
|
||||
sha256 = "0cyrkx5aza3485avb2kxc6cbsqqrb32l1kq8ravr9d828331v84f";
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-inotify" ];
|
||||
|
||||
buildInputs = [ qt4 xapian file python ];
|
||||
|
||||
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
|
||||
# filtering utils. Short circuit this by replacing the filtering command with
|
||||
# the absolute path to the filtering command.
|
||||
postInstall = ''
|
||||
for f in $out/share/recoll/filters/* ; do
|
||||
substituteInPlace $f --replace antiword ${antiword}/bin/antiword
|
||||
substituteInPlace $f --replace awk ${gawk}/bin/awk
|
||||
substituteInPlace $f --replace catppt ${catdoc}/bin/catppt
|
||||
substituteInPlace $f --replace djvused ${djvulibre}/bin/djvused
|
||||
substituteInPlace $f --replace djvutxt ${djvulibre}/bin/djvutxt
|
||||
substituteInPlace $f --replace grep ${gnugrep}/bin/grep
|
||||
substituteInPlace $f --replace groff ${groff}/bin/groff
|
||||
substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip
|
||||
substituteInPlace $f --replace iconv ${libiconvOrLibc}/bin/iconv
|
||||
substituteInPlace $f --replace lyx ${lyx}/bin/lyx
|
||||
substituteInPlace $f --replace pdftotext ${xpdf}/bin/pdftotext
|
||||
substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii
|
||||
substituteInPlace $f --replace sed ${gnused}/bin/sed
|
||||
substituteInPlace $f --replace tar ${gnutar}/bin/tar
|
||||
substituteInPlace $f --replace unzip ${unzip}/bin/unzip
|
||||
substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv
|
||||
substituteInPlace $f --replace xsltproc ${libxslt}/bin/xsltproc
|
||||
done
|
||||
'';
|
||||
# TODO:
|
||||
#substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf
|
||||
#substituteInPlace $f --replace untex ${untex}/bin/untex
|
||||
#substituteInPlace $f --replace wpd2html ${wpd2html}/bin/wpd2html
|
||||
|
||||
meta = {
|
||||
description = "finds keywords inside documents as well as file names";
|
||||
longDescription = ''
|
||||
Recoll is an Xapian frontend that can search through files, archive
|
||||
members, email attachments.
|
||||
'';
|
||||
homepage = http://www.lesbonscomptes.com/recoll/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ jcumming ];
|
||||
};
|
||||
}
|
||||
37
pkgs/applications/taxes/aangifte-2012/default.nix
Normal file
37
pkgs/applications/taxes/aangifte-2012/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "aangifte2012-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz;
|
||||
sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy";
|
||||
};
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
buildPhase =
|
||||
''
|
||||
for i in bin/*; do
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
|
||||
$i
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out
|
||||
cp -prvd * $out/
|
||||
wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
|
||||
url = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@ rec {
|
||||
git = lib.makeOverridable (import ./git) {
|
||||
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
|
||||
asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
|
||||
cpio tcl tk makeWrapper subversionClient;
|
||||
cpio tcl tk makeWrapper subversionClient hardlink;
|
||||
svnSupport = false; # for git-svn support
|
||||
guiSupport = false; # requires tcl/tk
|
||||
sendEmailSupport = false; # requires plenty of perl libraries
|
||||
@ -49,10 +49,9 @@ rec {
|
||||
editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
|
||||
hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
|
||||
monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
|
||||
QuickCheck random regexCompat SafeSemaphore SHA stm text time
|
||||
QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
|
||||
transformers transformersBase utf8String uuid wai waiLogger warp
|
||||
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack
|
||||
cabalInstall;
|
||||
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack;
|
||||
};
|
||||
|
||||
qgit = import ./qgit {
|
||||
@ -72,7 +71,7 @@ rec {
|
||||
};
|
||||
|
||||
topGit = lib.makeOverridable (import ./topgit) {
|
||||
inherit stdenv fetchurl unzip;
|
||||
inherit stdenv fetchurl;
|
||||
};
|
||||
|
||||
tig = import ./tig {
|
||||
|
||||
@ -6,19 +6,18 @@
|
||||
, networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
|
||||
, random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
|
||||
, transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
|
||||
, yesod, yesodDefault, yesodForm, yesodStatic, testpack
|
||||
, cabalInstall # TODO: remove this build input at the next update
|
||||
, yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.20130227";
|
||||
version = "4.20130314";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "git-annex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
|
||||
sha256 = "1zw5kzb08zz43ahbhrazjpq9zn73l3kwnqilp464frf7fg7rwan6";
|
||||
sha256 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9";
|
||||
name = "git-annex-${version}.tar.gz";
|
||||
};
|
||||
|
||||
@ -30,20 +29,21 @@ stdenv.mkDerivation {
|
||||
networkProtocolXmpp openssh QuickCheck random regexCompat rsync
|
||||
SafeSemaphore SHA stm text time transformers transformersBase utf8String
|
||||
uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
|
||||
yesodStatic which perl testpack cabalInstall ];
|
||||
yesodStatic which perl testpack regexTdfa ];
|
||||
|
||||
configurePhase = ''
|
||||
makeFlagsArray=( PREFIX=$out )
|
||||
makeFlagsArray=( PREFIX=$out CABAL=./Setup )
|
||||
patchShebangs .
|
||||
|
||||
# cabal-install wants to store stuff in $HOME
|
||||
mkdir ../tmp
|
||||
export HOME=$PWD/../tmp
|
||||
|
||||
cabal configure -f-fast -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
|
||||
ghc -O2 --make Setup
|
||||
./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
|
||||
'';
|
||||
|
||||
checkPhase = "./git-annex test";
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
export HOME="$NIX_BUILD_TOP/tmp"
|
||||
mkdir "$HOME"
|
||||
./git-annex test
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://git-annex.branchable.com/";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
|
||||
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
|
||||
, libxslt, tcl, tk, makeWrapper
|
||||
, libxslt, tcl, tk, makeWrapper, hardlink
|
||||
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
|
||||
, guiSupport
|
||||
, withManual ? true
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "1.8.1.3";
|
||||
version = "1.8.2";
|
||||
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
||||
sha256 = "1waz35cwgcwhgmgzmc4s00yd2vivhy77p49crgqsl0nqpxyj8lrp";
|
||||
sha256 = "1rhkya4kfs7iayasgj3bk8zg1pfk3h7wqhfy9d6aaqjgzb75pwy2";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ];
|
||||
@ -111,46 +111,26 @@ stdenv.mkDerivation {
|
||||
notSupported "$out/$prog" \
|
||||
"reinstall with config git = { guiSupport = true; } set"
|
||||
done
|
||||
'')
|
||||
'');
|
||||
|
||||
# Don't know why hardlinks aren't created. git installs the same executable
|
||||
# multiple times into $out so replace duplicates by symlinks because I
|
||||
# haven't tested whether the nix distribution system can handle hardlinks.
|
||||
# This reduces the size of $out from 115MB down to 13MB on x86_64-linux!
|
||||
+ ''
|
||||
declare -A seen
|
||||
shopt -s globstar
|
||||
for f in "$out/"**; do
|
||||
if [ -L "$f" ]; then continue; fi
|
||||
test -f "$f" || continue
|
||||
sum=$(md5sum "$f");
|
||||
sum=''\${sum/ */}
|
||||
if [ -z "''\${seen["$sum"]}" ]; then
|
||||
seen["$sum"]="$f"
|
||||
else
|
||||
rm "$f"; ln -v -s "''\${seen["$sum"]}" "$f"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
# Git installs many copies of the same binary using hardlinks, but unfortunately
|
||||
# our patchELF phase re-writes those files and destroys the hardlinks in the
|
||||
# process. This utility re-generates them afterwards.
|
||||
postFixup = "${hardlink}/bin/hardlink $out";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
license = "GPLv2";
|
||||
homepage = http://git-scm.com/;
|
||||
homepage = "http://git-scm.com/";
|
||||
description = "Git, a popular distributed version control system";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
longDescription = ''
|
||||
Git, a popular distributed version control system designed to
|
||||
handle very large projects with speed and efficiency.
|
||||
'';
|
||||
|
||||
maintainers =
|
||||
[ # Add your name here!
|
||||
stdenv.lib.maintainers.ludo
|
||||
stdenv.lib.maintainers.simons
|
||||
];
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
make install
|
||||
make install-doc
|
||||
mkdir -p $out/etc/bash_completion.d/
|
||||
cp contrib/tig-completion.bash $out/etc/bash_completion.d/
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://jonas.nitro.dk/tig/";
|
||||
|
||||
@ -1,33 +1,26 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "0.8-45-gd279e29";
|
||||
lib = stdenv.lib;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "topgit-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "topgit-0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://repo.or.cz/w/topgit.git/snapshot/topgit-${version}.zip";
|
||||
sha256 = "0vzrng1w2k7m4z0x9h6zbrcf33dx08ly8fnbxzz3ms2k2dbsmpl6";
|
||||
url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz";
|
||||
sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94";
|
||||
};
|
||||
|
||||
buildInputs = [unzip];
|
||||
configurePhase = "export prefix=$out";
|
||||
configurePhase = "makeFlags=prefix=$out";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/doc/topgit-${version}"
|
||||
cp README "$out/share/doc/topgit-${version}/"
|
||||
mkdir -p "$out/etc/bash_completion.d"
|
||||
make prefix="$out" install
|
||||
mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/"
|
||||
mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/"
|
||||
mv README "$out/share/doc/${name}/"
|
||||
mv contrib/tg-completion.bash "$out/etc/bash_completion.d/"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
|
||||
maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
|
||||
homepage = http://repo.or.cz/w/topgit.git;
|
||||
homepage = "https://github.com/greenrd/topgit";
|
||||
description = "TopGit manages large amount of interdependent topic branches";
|
||||
license = "GPLv2";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ];
|
||||
};
|
||||
}
|
||||
|
||||
84
pkgs/applications/video/omxplayer/default.nix
Normal file
84
pkgs/applications/video/omxplayer/default.nix
Normal file
@ -0,0 +1,84 @@
|
||||
{ stdenv, fetchurl, raspberrypifw, pcre, boostHeaders, freetype, zlib }:
|
||||
|
||||
let
|
||||
ffmpeg = stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-1.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||
sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--arch=arm"
|
||||
"--cpu=arm1176jzf-s"
|
||||
"--disable-muxers"
|
||||
"--enable-muxer=spdif"
|
||||
"--enable-muxer=adts"
|
||||
"--disable-encoders"
|
||||
"--enable-encoder=ac3"
|
||||
"--enable-encoder=aac"
|
||||
"--disable-decoder=mpeg_xvmc"
|
||||
"--disable-devices"
|
||||
"--disable-ffprobe"
|
||||
"--disable-ffplay"
|
||||
"--disable-ffserver"
|
||||
"--disable-ffmpeg"
|
||||
"--enable-shared"
|
||||
"--disable-doc"
|
||||
"--enable-postproc"
|
||||
"--enable-gpl"
|
||||
"--enable-protocol=http"
|
||||
"--enable-pthreads"
|
||||
"--disable-runtime-cpudetect"
|
||||
"--enable-pic"
|
||||
"--disable-armv5te"
|
||||
"--disable-neon"
|
||||
"--enable-armv6t2"
|
||||
"--enable-armv6"
|
||||
"--enable-hardcoded-tables"
|
||||
"--disable-runtime-cpudetect"
|
||||
"--disable-debug"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
crossAttrs = {
|
||||
dontSetConfigureCross = true;
|
||||
configureFlags = configureFlags ++ [
|
||||
"--cross-prefix=${stdenv.cross.config}-"
|
||||
"--enable-cross-compile"
|
||||
"--target_os=linux"
|
||||
"--arch=${stdenv.cross.arch}"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://www.ffmpeg.org/;
|
||||
description = "A complete, cross-platform solution to record, convert and stream audio and video";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "omxplayer-20130328-fbee325dc2";
|
||||
src = fetchurl {
|
||||
url = https://github.com/huceke/omxplayer/tarball/fbee325dc2;
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg";
|
||||
};
|
||||
patchPhase = ''
|
||||
sed -i 1d Makefile
|
||||
export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/"
|
||||
'';
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp omxplayer.bin $out/bin
|
||||
'';
|
||||
buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ];
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/huceke/omxplayer;
|
||||
description = "Commandline OMX player for the Raspberry Pi";
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchurl, makeWrapper
|
||||
, pkgconfig, cmake, gnumake, yasm, python
|
||||
, boost
|
||||
, boost, avahi, libdvdcss, lame
|
||||
, gettext, pcre, yajl, fribidi
|
||||
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
|
||||
, libX11, xproto, inputproto
|
||||
@ -20,7 +20,9 @@
|
||||
, libusb ? null, usbSupport ? false
|
||||
, samba ? null, sambaSupport ? true
|
||||
# TODO: would be nice to have nfsSupport (needs libnfs library)
|
||||
# TODO: librtmp
|
||||
, libvdpau ? null, vdpauSupport ? true
|
||||
, pulseaudio ? null, pulseSupport ? false
|
||||
}:
|
||||
|
||||
assert dbusSupport -> dbus_libs != null;
|
||||
@ -28,13 +30,14 @@ assert udevSupport -> udev != null;
|
||||
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
|
||||
assert sambaSupport -> samba != null;
|
||||
assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
|
||||
assert pulseSupport -> pulseaudio != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xbmc-12.0";
|
||||
name = "xbmc-12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
|
||||
sha256 = "0vy1a38gfbp9vhbjvwqm11sd76gl3s9q0h7gwpsks85m2k88q0ak";
|
||||
sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -53,14 +56,15 @@ stdenv.mkDerivation rec {
|
||||
ffmpeg libmpeg2 libsamplerate libmad
|
||||
libogg libvorbis flac
|
||||
lzo libcdio libmodplug libass
|
||||
sqlite mysql nasm
|
||||
sqlite mysql nasm avahi libdvdcss lame
|
||||
curl bzip2 zip unzip glxinfo xdpyinfo
|
||||
]
|
||||
++ lib.optional dbusSupport dbus_libs
|
||||
++ lib.optional udevSupport udev
|
||||
++ lib.optional usbSupport libusb
|
||||
++ lib.optional sambaSupport samba
|
||||
++ lib.optional vdpauSupport libvdpau;
|
||||
++ lib.optional vdpauSupport libvdpau
|
||||
++ lib.optional pulseSupport pulseaudio;
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@ -69,7 +73,8 @@ stdenv.mkDerivation rec {
|
||||
"--disable-webserver"
|
||||
]
|
||||
++ lib.optional (! sambaSupport) "--disable-samba"
|
||||
++ lib.optional vdpauSupport "--enable-vdpau";
|
||||
++ lib.optional vdpauSupport "--enable-vdpau"
|
||||
++ lib.optional pulseSupport "--enable-pulse";
|
||||
|
||||
postInstall = ''
|
||||
for p in $(ls $out/bin/) ; do
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
|
||||
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
|
||||
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernelDev, lvm2
|
||||
, which, alsaLib, curl, gawk
|
||||
, xorriso, makeself, perl, pkgconfig
|
||||
, javaBindings ? false, jdk ? null
|
||||
@ -40,7 +40,7 @@ let
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "virtualbox-${version}-${kernel.version}";
|
||||
name = "virtualbox-${version}-${kernelDev.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||
@ -49,7 +49,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
buildInputs =
|
||||
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
|
||||
libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl
|
||||
libcap glib kernelDev lvm2 python alsaLib curl pam xorriso makeself perl
|
||||
pkgconfig which libXmu ]
|
||||
++ optional javaBindings jdk
|
||||
++ optional pythonBindings python;
|
||||
@ -61,7 +61,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
prePatch = ''
|
||||
set -x
|
||||
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
|
||||
MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build`
|
||||
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
|
||||
-e 's@MKISOFS --version@MKISOFS -version@' \
|
||||
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
|
||||
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
|
||||
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
|
||||
, dbus }:
|
||||
|
||||
let version = "4.2.8"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
|
||||
name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5";
|
||||
};
|
||||
|
||||
KERN_DIR = "${kernel}/lib/modules/*/build";
|
||||
KERN_DIR = "${kernelDev}/lib/modules/*/build";
|
||||
|
||||
buildInputs = [ patchelf cdrkit makeWrapper dbus ];
|
||||
|
||||
@ -112,7 +112,7 @@ stdenv.mkDerivation {
|
||||
for i in *
|
||||
do
|
||||
cd $i
|
||||
kernelVersion=$(cd ${kernel}/lib/modules; ls)
|
||||
kernelVersion=$(cd ${kernelDev}/lib/modules; ls)
|
||||
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
|
||||
find . -type f | xargs sed -i -e "s|-o root||g" \
|
||||
-e "s|-g root||g"
|
||||
|
||||
@ -1,21 +1,20 @@
|
||||
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
|
||||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
|
||||
libXcursor, coreutils, perl }:
|
||||
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil,
|
||||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl,
|
||||
libXcursor, coreutils, perl, pango }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "i3-${version}";
|
||||
version = "4.4";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://i3wm.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr";
|
||||
sha256 = "bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2";
|
||||
};
|
||||
|
||||
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
|
||||
libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
|
||||
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
|
||||
libstartup_notification libX11 pcre libev yajl libXcursor perl pango ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e '/^# Pango/,/^$/d' common.mk
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
@ -26,6 +25,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://i3wm.org";
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://i3wm.org;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "i3status-2.6";
|
||||
name = "i3status-2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://i3wm.org/i3status/${name}.tar.bz2";
|
||||
sha256 = "e7e710cc271887bcd22757269e1b00a5618fb53abdb3455140116b3d38797bce";
|
||||
sha256 = "0cm6fhsc7hzsqni8pwhjl2l0rfd458paabn54cgzqnmwwdflwgq7";
|
||||
};
|
||||
|
||||
buildInputs = [ confuse yajl alsaLib wirelesstools ];
|
||||
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://i3wm.org;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmonad-contrib";
|
||||
version = "0.11";
|
||||
sha256 = "188brys16b3wmxd22j4284wnpasm8bixdjfxl1jr2q2xi45nzks0";
|
||||
version = "0.11.1";
|
||||
sha256 = "1356dn8ipw7fgn2xijppn69f64zg36gcxbw9qndxbbmml5gq0zrl";
|
||||
buildDepends = [
|
||||
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
|
||||
];
|
||||
@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
|
||||
description = "Third party extensions for xmonad";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
|
||||
description = "Third party extensions for xmonad with wacky dependencies";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@ -92,7 +92,7 @@
|
||||
|
||||
# pass the '--enable-tests' flag to cabal in the configure stage
|
||||
# and run any regression test suites the package might have
|
||||
doCheck = stdenv.lib.versionOlder "7" ghc.ghcVersion;
|
||||
doCheck = stdenv.lib.versionOlder "7.4" ghc.ghcVersion;
|
||||
|
||||
extraConfigureFlags = [
|
||||
(stdenv.lib.enableFeature enableLibraryProfiling "library-profiling")
|
||||
|
||||
@ -4,6 +4,6 @@ header "exporting \`$url' (revision $revision) into \`$out'"
|
||||
|
||||
# Perform a lightweight checkout so that we don't end up importing
|
||||
# all the repository's history.
|
||||
bzr checkout --lightweight "$url" -r "$revision" "$out"
|
||||
bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url"
|
||||
|
||||
stopNest
|
||||
|
||||
@ -50,12 +50,7 @@ if test -z "$finalPath"; then
|
||||
trap "rm -rf $tmpPath" EXIT
|
||||
|
||||
# Perform the checkout.
|
||||
if test "$NIX_PREFETCH_BZR_LEAVE_DOT_BZR" != 1
|
||||
then
|
||||
bzr export $revarg "$tmpFile" "$url" >&2
|
||||
else
|
||||
bzr checkout --lightweight $revarg "$url" "$tmpFile" >&2
|
||||
fi
|
||||
bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url"
|
||||
|
||||
# Compute the hash.
|
||||
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
|
||||
|
||||
@ -22,6 +22,7 @@ fi;
|
||||
# server's certificate. This is perfectly safe: we don't care
|
||||
# whether the server is being spoofed --- only the cryptographic
|
||||
# hash of the output matters.
|
||||
echo 'p' | svn export -r "$rev" "$url" $out
|
||||
echo 'p' | svn export ${ignoreExternals:+--ignore-externals} \
|
||||
-r "$rev" "$url" "$out"
|
||||
|
||||
stopNest
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{stdenv, subversion, sshSupport ? false, openssh ? null}:
|
||||
{url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
|
||||
{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false}:
|
||||
|
||||
let
|
||||
repoName = with stdenv.lib;
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation {
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if sha256 == "" then md5 else sha256;
|
||||
|
||||
inherit url rev sshSupport openssh;
|
||||
inherit url rev sshSupport openssh ignoreExternals;
|
||||
|
||||
impureEnvVars = [
|
||||
# We borrow these environment variables from the caller to allow
|
||||
|
||||
@ -39,4 +39,14 @@ rec {
|
||||
{ inherit stdenv vmTools checkinstall;
|
||||
} // args);
|
||||
|
||||
aggregate =
|
||||
{ name, members, meta ? { } }:
|
||||
pkgs.runCommand name
|
||||
{ inherit members meta;
|
||||
_hydraAggregate = true;
|
||||
}
|
||||
''
|
||||
echo $members > $out
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "man-pages-3.48";
|
||||
name = "man-pages-3.50";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
|
||||
sha256 = "6944cc3ad5131abab01c6703e63672b2e44be52737cdb1144f6ddaebb7f7d682";
|
||||
sha256 = "04fn7zzi75y79rkg57nkync3hf14m8708iw33s03f0x8ays6fajz";
|
||||
};
|
||||
|
||||
preBuild =
|
||||
|
||||
33
pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
Normal file
33
pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
let
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip;
|
||||
sha256 = "0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0";
|
||||
};
|
||||
|
||||
isoents = fetchurl {
|
||||
url = http://www.oasis-open.org/cover/ISOEnts.zip;
|
||||
sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "docbook-sgml-3.1";
|
||||
|
||||
unpackPhase = "true";
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
o=$out/sgml/dtd/docbook-3.1
|
||||
mkdir -p $o
|
||||
cd $o
|
||||
unzip ${src}
|
||||
unzip ${isoents}
|
||||
sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat
|
||||
'';
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core, avrgcclibc }:
|
||||
{ stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom
|
||||
, avrdude, arduino_core, avrgcclibc }:
|
||||
|
||||
buildPythonPackage {
|
||||
name = "ino-0.3.4";
|
||||
@ -10,15 +11,20 @@ buildPythonPackage {
|
||||
};
|
||||
|
||||
# TODO: add avrgcclibc, it must be rebuild with C++ support
|
||||
propagatedBuildInputs = [ minicom avrdude arduino_core ];
|
||||
propagatedBuildInputs =
|
||||
[ arduino_core avrdude minicom pythonPackages.configobj
|
||||
pythonPackages.jinja2 pythonPackages.pyserial ];
|
||||
|
||||
patchPhase = ''
|
||||
echo "Patching Arduino distribution path"
|
||||
sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' ino/environment.py
|
||||
sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' \
|
||||
ino/environment.py
|
||||
sed -i -e 's@argparse@@' -e 's@ordereddict@@' \
|
||||
requirements.txt
|
||||
sed -i -e 's@from ordereddict@from collections@' \
|
||||
ino/environment.py ino/utils.py
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Command line toolkit for working with Arduino hardware";
|
||||
homepage = http://inotool.org/;
|
||||
|
||||
@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
|
||||
description = "Command-line program for type-checking and compiling Agda programs";
|
||||
license = "unknown";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
18
pkgs/development/compilers/chicken/default.nix
Normal file
18
pkgs/development/compilers/chicken/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "chicken-4.8.1";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.call-cc.org/;
|
||||
description = "Chicken Scheme";
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz;
|
||||
md5 = "bd758ec7abeaeb4f4c92c290fb5f3db7";
|
||||
};
|
||||
|
||||
buildFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
|
||||
installFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
|
||||
}
|
||||
@ -10,12 +10,12 @@ else
|
||||
throw "Unsupported architecture";
|
||||
|
||||
edk2 = stdenv.mkDerivation {
|
||||
name = "edk2-2012-03-13";
|
||||
name = "edk2-2013-03-19";
|
||||
|
||||
src = fetchsvn {
|
||||
url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
|
||||
rev = "13783";
|
||||
sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil";
|
||||
rev = "14211";
|
||||
sha256 = "1rhrv7cyazb1d4gw3s8fv0c245iankvb9pqx6nngbkkxkcswvnw7";
|
||||
};
|
||||
|
||||
buildInputs = [ libuuid pythonFull ];
|
||||
|
||||
@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
|
||||
description = "Compiler for a simple functional language";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
230
pkgs/development/compilers/gcc/4.7/arm-eabi.patch
Normal file
230
pkgs/development/compilers/gcc/4.7/arm-eabi.patch
Normal file
@ -0,0 +1,230 @@
|
||||
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.
|
||||
@ -54,7 +54,8 @@ let version = "4.7.2";
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = cross != null && cross.config == "i586-pc-gnu";
|
||||
|
||||
patches = [ ]
|
||||
patches = []
|
||||
++ optional stdenv.isArm [ ./arm-eabi.patch ]
|
||||
++ optional (cross != null) ./libstdc++-target.patch
|
||||
# ++ optional noSysDirs ./no-sys-dirs.patch
|
||||
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
|
||||
|
||||
@ -98,5 +98,6 @@ stdenv.mkDerivation rec {
|
||||
[ $(./main) == "yes" ]
|
||||
'';
|
||||
|
||||
meta.license = stdenv.lib.licenses.bsd3;
|
||||
meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
inherit homepage;
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -97,5 +97,6 @@ stdenv.mkDerivation rec {
|
||||
[ $(./main) == "yes" ]
|
||||
'';
|
||||
|
||||
meta.license = stdenv.lib.licenses.bsd3;
|
||||
meta.platforms = ["x86_64-linux" "i686-linux"];
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
inherit homepage;
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
inherit homepage;
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
inherit homepage;
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
inherit homepage;
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
|
||||
[ $(./main) == "yes" ]
|
||||
'';
|
||||
|
||||
meta.license = stdenv.lib.licenses.bsd3;
|
||||
meta.platforms = ["x86_64-linux" "i686-linux"];
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
];
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
# TODO: requires a comment as to what it does and why it is needed.
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
];
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
# TODO: requires a comment as to what it does and why it is needed.
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
];
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
# TODO: requires a comment as to what it does and why it is needed.
|
||||
|
||||
@ -62,5 +62,6 @@ stdenv.mkDerivation {
|
||||
|
||||
'' else "";
|
||||
|
||||
meta.license = stdenv.lib.licenses.bsd3;
|
||||
meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
|
||||
}
|
||||
|
||||
@ -23,6 +23,6 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
meta = {
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
meta = {
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
configureFlags=[
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
configureFlags=[
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
];
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
# TODO: requires a comment as to what it does and why it is needed.
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
];
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
];
|
||||
platforms = ghc.meta.platforms;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
|
||||
[ $(./main) == "yes" ]
|
||||
'';
|
||||
|
||||
meta.license = stdenv.lib.licenses.bsd3;
|
||||
meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user