diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:40 +0200 |
commit | eb2e46aab26600484bfabb3c242bdd069279bdb1 (patch) | |
tree | 18ec0523bfcd0967f8eef326756f96dc0075789a /pkgs/applications | |
parent | 16f45507619b4c4012bb7958fba09eb3bdc5ac87 (diff) | |
parent | 22d4472d2744639ccd880f015bb3147cf5222f07 (diff) | |
download | nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.gz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.bz2 nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.lz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.xz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.zst nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.zip |
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
Diffstat (limited to 'pkgs/applications')
62 files changed, 1076 insertions, 220 deletions
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix new file mode 100644 index 000000000000..cc80a96306f3 --- /dev/null +++ b/pkgs/applications/audio/gmpc/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/audio/lame/default.nix b/pkgs/applications/audio/lame/default.nix index 46bbf10f357a..09b553a099c6 100644 --- a/pkgs/applications/audio/lame/default.nix +++ b/pkgs/applications/audio/lame/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index c74cd2b0d7d4..d9413c031546 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -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 diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index d285c4b0e237..d4777dcc53a8 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -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; [ diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index a7fca8cabf1b..b6ac7f26d601 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -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; }; } diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix new file mode 100644 index 000000000000..e422eee363c4 --- /dev/null +++ b/pkgs/applications/audio/normalize/default.nix @@ -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; + }; +} diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index 6b7e1e2aeff6..a543aa32eea5 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix new file mode 100644 index 000000000000..12ef79d746ec --- /dev/null +++ b/pkgs/applications/audio/shntool/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix new file mode 100644 index 000000000000..501826b82df2 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -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" + ''; +} diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch new file mode 100644 index 000000000000..5ae5603b4dd6 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch @@ -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; + diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix new file mode 100644 index 000000000000..ce1f4400b271 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -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; + }; +} \ No newline at end of file diff --git a/pkgs/applications/display-managers/lightdm/lightdm.patch b/pkgs/applications/display-managers/lightdm/lightdm.patch new file mode 100644 index 000000000000..a6e53bafcc79 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/lightdm.patch @@ -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); + diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 751330550f1a..5c425326aaa9 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -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 ]; diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix index da3bde88d752..d4c428e5a1e5 100644 --- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix +++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix @@ -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 = { diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix index 18c16569cf8e..6ac698ed75f5 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix @@ -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 = '' diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index 86f0106ed050..5c17a6c18155 100644 --- a/pkgs/applications/editors/leksah/default.nix +++ b/pkgs/applications/editors/leksah/default.nix @@ -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 + ]; }; }) diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 7b1a7f26239f..8d88e570f272 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - NIX_LDFLAGS = "-llcms -ljpeg"; + NIX_LDFLAGS = "-llcms -ljpeg -lX11"; # NIX_CFLAGS_COMPILE = "-I."; diff --git a/pkgs/applications/graphics/darktable/1.2rc1.nix b/pkgs/applications/graphics/darktable/1.2rc1.nix new file mode 100644 index 000000000000..906240d864f6 --- /dev/null +++ b/pkgs/applications/graphics/darktable/1.2rc1.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 9791efe5d822..aa67406d0e79 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -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 = diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 44d9330043fb..4a9890720a32 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -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 = diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix new file mode 100644 index 000000000000..fa7d16ccf0a7 --- /dev/null +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -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; + }; +} \ No newline at end of file diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 67723dd58183..34ad7821c876 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -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; }; } diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 63f4f77942af..a4048e6f40b2 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 82c9074fadff..1ed51a81f5cc 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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 - - NIX_CFLAGS_COMPILE = "-I${openjpeg}/include/${openjpeg.incDir} -I${ilmbase}/include/OpenEXR"; - NIX_CFLAGS_LINK = "-lpython3"; + "-DPYTHON_LIBRARY=python${python.majorVersion}m" + "-DPYTHON_LIBPATH=${python}/lib" + "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" + ]; + + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix new file mode 100644 index 000000000000..457f20b4d441 --- /dev/null +++ b/pkgs/applications/misc/dunst/default.nix @@ -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; + }; +} diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 7a02100b2cb9..70e810bb8d7b 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix new file mode 100644 index 000000000000..495583d95d4b --- /dev/null +++ b/pkgs/applications/misc/pitz/default.nix @@ -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/; + }; +} diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index a267a29c7e2e..4bb3ef9e64a4 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -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; }; } diff --git a/pkgs/applications/misc/yeganesh/default.nix b/pkgs/applications/misc/yeganesh/default.nix new file mode 100644 index 000000000000..14f0fdb53846 --- /dev/null +++ b/pkgs/applications/misc/yeganesh/default.nix @@ -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 ]; + }; +}) diff --git a/pkgs/applications/networking/browsers/chromium/clone_detached.patch b/pkgs/applications/networking/browsers/chromium/clone_detached.patch deleted file mode 100644 index 682de656459e..000000000000 --- a/pkgs/applications/networking/browsers/chromium/clone_detached.patch +++ /dev/null @@ -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 { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 019ba1792f3b..a4f71ffcb259 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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 diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index dfe2d4b48618..9e4c0cff5634 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -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"; diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index cc38125c1933..0c21213a751c 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -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")"; diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 0a370701109c..b50266e27619 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -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 diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix new file mode 100644 index 000000000000..b298b3c9df99 --- /dev/null +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -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; + }; +} + diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index b979598e17c4..4e911bc33452 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -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" {} \; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index 8ddf784adc04..1d4c772d6f7c 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 147d5f491517..1477cd82cf44 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/p2p/transmission/2.60.nix b/pkgs/applications/networking/p2p/transmission/2.60.nix new file mode 100644 index 000000000000..c59fddf6364b --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission/2.60.nix @@ -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; + }; +} diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index c59fddf6364b..2c6106d13040 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -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 ''; diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix new file mode 100644 index 000000000000..8113e33e0a72 --- /dev/null +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -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"; + }; +} diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix new file mode 100644 index 000000000000..8c6295197643 --- /dev/null +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -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"; + }; +} diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 32b531528d05..5447b21009ff 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -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 ]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index d90c66329162..cc53611493d0 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -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"; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 3ba9e7eb49f6..f9549241a45c 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -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; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 559c4448c316..2f616b2bed0d 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix new file mode 100644 index 000000000000..966d41315a1c --- /dev/null +++ b/pkgs/applications/search/recoll/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix new file mode 100644 index 000000000000..056ad81feb59 --- /dev/null +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -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/; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 066da4bff4a9..fa2d26470496 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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 { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 4ea0a5df8c17..697e7d3b42e0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -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/"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 9aeea223ba7c..b006354a0149 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 8d5c2baa7a50..ea9ce97be161 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -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/"; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 4b1926051822..5290a12a54ac 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix new file mode 100644 index 000000000000..b3880067cac4 --- /dev/null +++ b/pkgs/applications/video/omxplayer/default.nix @@ -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+"; + }; +} diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 0588f580cc25..e5deba4f97f9 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -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 diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index bf19ecd99ca0..d385d431fa39 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -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 ""}@' \ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index f648cb3c7377..20ef5c66997b 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -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" diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 94ac84f838c2..9f9aaa5d6653 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -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; }; } diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 12e4c91e24d0..2331b1eaf815 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -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; }; } diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 60db6188f70c..7317f17bb8b2 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -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; }; } diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 6716591eabae..218e2126a154 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -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 + ]; }; }) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 025bab67e968..f4aed5a18503 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -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 + ]; }; }) |