From a8a3cc00fdad74029966c057e078d89c6444c8a7 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sun, 31 Mar 2013 12:27:46 +0400 Subject: [PATCH 01/32] wicd: fix dhclient interaction wicd used to write dhclient config file into $out/var/lib/wicd directory attempting to change nix-store. That didn't work and thats why we couldn't use dhclient. With this patch wicd will generate temporary file name for this purpose. File is generated each time the daemon starts. --- pkgs/tools/networking/wicd/default.nix | 9 +- pkgs/tools/networking/wicd/dhclient.patch | 101 ++++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/wicd/dhclient.patch diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 6cacfc14ffc8..9bb4d6461fac 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; - patches = [ ./no-var-install.patch ./no-trans.patch ./mkdir-networks.patch ./pygtk.patch ./no-optimization.patch ]; + patches = [ + ./no-var-install.patch + ./no-trans.patch + #./mkdir-networks.patch + ./pygtk.patch + ./no-optimization.patch + ./dhclient.patch + ]; # Should I be using pygtk's propogated build inputs? # !!! Should use makeWrapper. diff --git a/pkgs/tools/networking/wicd/dhclient.patch b/pkgs/tools/networking/wicd/dhclient.patch new file mode 100644 index 000000000000..52d91846518f --- /dev/null +++ b/pkgs/tools/networking/wicd/dhclient.patch @@ -0,0 +1,101 @@ +diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py +--- wicd-1.7.2.4.orig/wicd/wnettools.py 2013-03-30 21:47:19.804907552 +0000 ++++ wicd-1.7.2.4/wicd/wnettools.py 2013-03-31 08:44:37.572792110 +0000 +@@ -37,6 +37,7 @@ + import time + from string import maketrans, translate + ++import tempfile + import wpath + import misc + from misc import find_path +@@ -216,6 +217,7 @@ + self.flush_tool = None + self.link_detect = None + self.dhcp_object = None ++ self.dhclient_conf_path = None; + + def SetDebugMode(self, value): + """ If True, verbose output is enabled. """ +@@ -277,12 +279,6 @@ + cmd = "" + return (client, cmd) + +- # probably /var/lib/wicd/dhclient.conf with defaults +- dhclient_conf_path = os.path.join( +- wpath.varlib, +- 'dhclient.conf' +- ) +- + client_dict = { + "dhclient" : + {'connect' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s", +@@ -307,41 +303,44 @@ + } + (client_name, cmd) = get_client_name(self.DHCP_CLIENT) + +- # cause dhclient doesn't have a handy dandy argument +- # for specifing the hostname to be sent +- if client_name == "dhclient" and flavor: +- if hostname == None: +- # will use the system hostname +- # we'll use that if there is hostname passed +- # that shouldn't happen, though +- hostname = '' +- print 'attempting to set hostname with dhclient' +- print 'using dhcpcd or another supported client may work better' +- dhclient_template = \ +- open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r') +- +- output_conf = open(dhclient_conf_path, 'w') +- +- for line in dhclient_template.readlines(): +- line = line.replace('$_HOSTNAME', hostname) +- output_conf.write(line) +- +- output_conf.close() +- dhclient_template.close() +- os.chmod(dhclient_conf_path, 0644) +- + if not client_name or not cmd: + print "WARNING: Failed to find a valid dhcp client!" + return "" + + if flavor == "connect": ++ # cause dhclient doesn't have a handy dandy argument ++ # for specifing the hostname to be sent ++ if client_name == "dhclient" and flavor: ++ if hostname == None: ++ # will use the system hostname ++ # we'll use that if there is hostname passed ++ # that shouldn't happen, though ++ hostname = '' ++ print 'attempting to set hostname with dhclient' ++ print 'using dhcpcd or another supported client may work better' ++ if not self.dhclient_conf_path: ++ _,self.dhclient_conf_path = tempfile.mkstemp() ++ print 'New dhclient conf path: %s ' % self.dhclient_conf_path ++ dhclient_template = \ ++ open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r') ++ ++ output_conf = open(self.dhclient_conf_path, 'w') ++ ++ for line in dhclient_template.readlines(): ++ line = line.replace('$_HOSTNAME', hostname) ++ output_conf.write(line) ++ ++ output_conf.close() ++ dhclient_template.close() ++ os.chmod(self.dhclient_conf_path, 0644) ++ + if not hostname: + hostname = os.uname()[1] + return client_dict[client_name]['connect'] % \ + { "cmd" : cmd, + "iface" : self.iface, + "hostname" : hostname, +- 'dhclientconf' : dhclient_conf_path } ++ 'dhclientconf' : self.dhclient_conf_path } + elif flavor == "release": + return client_dict[client_name]['release'] % {"cmd":cmd, "iface":self.iface} + else: From f7efab5fd83e5b28c5e5f54dff057be7a33b0d39 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sun, 31 Mar 2013 12:56:34 +0400 Subject: [PATCH 02/32] wicd: bring translations back. --- pkgs/tools/networking/wicd/default.nix | 8 +- .../tools/networking/wicd/no-ast-transl.patch | 1040 +++++++++++++++++ 2 files changed, 1044 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/networking/wicd/no-ast-transl.patch diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 9bb4d6461fac..b080018f1cb0 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils, - locale ? "C" }: + pythonPackages, locale ? "C" }: # Wicd has a ncurses interface that we do not build because it depends # on urwid which has not been packaged at this time (2009-12-27). @@ -14,15 +14,16 @@ stdenv.mkDerivation rec { sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; }; - buildInputs = [ python ]; + buildInputs = [ python pythonPackages.Babel ]; patches = [ ./no-var-install.patch - ./no-trans.patch + #./no-trans.patch #./mkdir-networks.patch ./pygtk.patch ./no-optimization.patch ./dhclient.patch + ./no-ast-transl.patch ]; # Should I be using pygtk's propogated build inputs? @@ -35,7 +36,6 @@ stdenv.mkDerivation rec { sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/sbin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in - sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in diff --git a/pkgs/tools/networking/wicd/no-ast-transl.patch b/pkgs/tools/networking/wicd/no-ast-transl.patch new file mode 100644 index 000000000000..eafb0ecf8c53 --- /dev/null +++ b/pkgs/tools/networking/wicd/no-ast-transl.patch @@ -0,0 +1,1040 @@ +Remove asturian translation since it causes failure in pybabel. + +diff -ruN wicd-1.7.2.4.orig/po/ast.po wicd-1.7.2.4/po/ast.po +--- wicd-1.7.2.4.orig/po/ast.po 2013-03-30 21:47:19.799907554 +0000 ++++ wicd-1.7.2.4/po/ast.po 1970-01-01 00:00:00.000000000 +0000 +@@ -1,1033 +0,0 @@ +-# Asturian translation for wicd +-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +-# This file is distributed under the same license as the wicd package. +-# FIRST AUTHOR , 2011. +-# +-msgid "" +-msgstr "" +-"Project-Id-Version: wicd\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2011-12-07 23:04+0100\n" +-"PO-Revision-Date: 2012-01-17 22:23+0000\n" +-"Last-Translator: ASTUR2000 \n" +-"Language-Team: Asturian \n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"X-Launchpad-Export-Date: 2012-04-25 05:02+0000\n" +-"X-Generator: Launchpad (build 15139)\n" +-"Language: ast\n" +- +-#: gtk/wicd-client.py:610 +-msgid "" +-"$A\n" +-"$B\n" +-"$C\n" +-"$D\n" +-"$E KB/s\n" +-"$F KB/s" +-msgstr "" +-"$A\n" +-"$B\n" +-"$C\n" +-"$D\n" +-"$E KB/s\n" +-"$F KB/s" +- +-#: gtk/wicd-client.py:603 +-msgid "" +-"$A\n" +-"$B KB/s\n" +-"$C KB/s" +-msgstr "" +-"$A\n" +-"$B KB/s\n" +-"$C KB/s" +- +-#: curses/wicd-curses.py:564 +-msgid "About" +-msgstr "Tocante a" +- +-#: curses/wicd-curses.py:201 +-msgid "About Wicd" +-msgstr "Tocantes a Wicd" +- +-#: curses/wicd-curses.py:465 gtk/gui.py:272 +-msgid "Activate Internet Connection Sharing" +-msgstr "Activar compartición de conexón" +- +-#: curses/wicd-curses.py:378 +-msgid "Add a new profile" +-msgstr "Añader un perfil" +- +-#: curses/wicd-curses.py:411 +-msgid "Add a new wired profile" +-msgstr "Añader un perfil cableáu" +- +-#: curses/prefs_curses.py:52 data/wicd.ui:1669 +-msgid "Advanced Settings" +-msgstr "Configuración avanzao" +- +-#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +-msgid "Always show wired interface" +-msgstr "Amosar siempres perfil cableáu" +- +-#: curses/prefs_curses.py:70 +-msgid "Always switch to wired connection when available" +-msgstr "Camudar siempres pa una conexón cableada cuando tean disponibles" +- +-#: wicd/translations.py:77 +-msgid "Authentication" +-msgstr "Identificación" +- +-#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +-#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +-#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +-msgid "Automatic (recommended)" +-msgstr "Automático (encamentao)" +- +-#: curses/prefs_curses.py:86 +-msgid "Automatic Reconnection" +-msgstr "Reconexón automática" +- +-#: curses/netentry_curses.py:257 gtk/netentry.py:817 +-msgid "Automatically connect to this network" +-msgstr "Coneutar namás pa esta rede" +- +-#: curses/prefs_curses.py:87 gtk/prefs.py:331 +-msgid "Automatically reconnect on connection loss" +-msgstr "Reconeutar namás perder la conexón" +- +-#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +-msgid "Backend" +-msgstr "" +- +-#: curses/wicd-curses.py:195 +-msgid "Brought to you by:" +-msgstr "Sofitáu por:" +- +-#: curses/wicd-curses.py:1029 +-msgid "Can't connect to the daemon, trying to start it automatically..." +-msgstr "Nun pue coneutase col degorriu, tentando pa entamalo automáticamente" +- +-#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +-#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +-#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +-msgid "Cancel" +-msgstr "Atayar" +- +-#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +-#: gtk/netentry.py:1088 +-msgid "Channel" +-msgstr "Canal" +- +-#: gtk/gui.py:188 data/wicd.ui:173 +-msgid "Choose from the networks below:" +-msgstr "Esbilla dende les redes d'emabxo" +- +-#: curses/wicd-curses.py:556 +-msgid "Config" +-msgstr "Config" +- +-#: curses/wicd-curses.py:225 +-msgid "Configure selected network" +-msgstr "Configurar rede esbillada" +- +-#: curses/netentry_curses.py:196 +-msgid "Configuring preferences for wired profile \"$A\"" +-msgstr "Configurando preferencies pal perfil cableáu \"$A\"" +- +-#: curses/netentry_curses.py:272 +-msgid "Configuring preferences for wireless network \"$A\" ($B)" +-msgstr "Configurando preferencies pal perfil inalámbricu \"$A\" ($B)" +- +-#: wicd/misc.py:80 +-msgid "Configuring wireless interface..." +-msgstr "Configurando rede inalámbrica" +- +-#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +-msgid "Connect" +-msgstr "Coneutase" +- +-#: curses/wicd-curses.py:215 +-msgid "Connect to selected network" +-msgstr "Coneutase a la rede esbillada" +- +-#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 +-msgid "Connected to $A at $B (IP: $C)" +-msgstr "Coneutáu a $A en $B (IP: $C)" +- +-#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 +-msgid "Connected to wired network (IP: $A)" +-msgstr "Coneutáu a la rede cableada (IP: $A)" +- +-#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +-msgid "Connecting" +-msgstr "Coneutando" +- +-#: wicd/misc.py:77 +-msgid "Connection Cancelled" +-msgstr "Conexón atayada" +- +-#: wicd/misc.py:83 +-msgid "Connection Failed." +-msgstr "Conexón fallía." +- +-#: wicd/misc.py:79 +-msgid "Connection Failed: Bad password" +-msgstr "Conexón fallía: conseña mala" +- +-#: wicd/misc.py:89 +-msgid "Connection Failed: No DHCP offers received." +-msgstr "Conexón fallía: ensin ufiertes DHCP recivies." +- +-#: wicd/misc.py:81 +-msgid "Connection Failed: Unable to Get IP Address" +-msgstr "Conexón fallía: Nun pue consiguise una direición IP" +- +-#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +-msgid "Connection established" +-msgstr "Conexón establecida" +- +-#: wicd/misc.py:78 +-msgid "Connection failed: Could not contact the wireless access point." +-msgstr "Conexón fallía: Nun pudo contautase col puntu d'accesu inalámbricu." +- +-#: wicd/misc.py:95 +-msgid "Connection successful." +-msgstr "Conexón correcha." +- +-#: gtk/gui.py:65 gtk/wicd-client.py:955 +-msgid "" +-"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +-"messages." +-msgstr "" +-"Nun pudo coneutase a la interfaz D-Bus de Wicd. Agüeya'l log de Wicd pa " +-"mensaxes d'erros" +- +-#: gtk/netentry.py:303 gtk/netentry.py:411 +-msgid "" +-"Could not find a graphical sudo program. The script editor could not be " +-"launched. You'll have to edit scripts directly your configuration file." +-msgstr "" +-"Nun pudo alcontrase un programa gráficu sudo. L'editor de scripts nun " +-"s'anició. Tienes d'editar los scripts direutamente dende l'archivu de " +-"configuración." +- +-#: curses/wicd-curses.py:488 gtk/gui.py:258 +-msgid "Create an Ad-Hoc Network" +-msgstr "Criar una rede Ad-Hoc" +- +-#: curses/wicd-curses.py:99 +-msgid "" +-"DBus failure! This is most likely caused by the wicd daemon stopping while " +-"wicd-curses is running. Please restart the daemon, and then restart wicd-" +-"curses." +-msgstr "" +- +-#: curses/prefs_curses.py:92 +-msgid "DHCP Client" +-msgstr "Cliente DHCP" +- +-#: curses/netentry_curses.py:63 +-msgid "DHCP Hostname" +-msgstr "Viesu d'agospiu DHCP" +- +-#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +-msgid "DNS domain" +-msgstr "Dominiu DNS" +- +-#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +-#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +-#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +-#: gtk/netentry.py:81 gtk/netentry.py:82 +-msgid "DNS server" +-msgstr "Sirvidor DNS" +- +-#: curses/prefs_curses.py:117 +-msgid "Debugging" +-msgstr "Depuración" +- +-#: curses/wicd-curses.py:560 +-msgid "Disconn" +-msgstr "Descon" +- +-#: curses/wicd-curses.py:216 +-msgid "Disconnect from all networks" +-msgstr "Desconeutar toles redes" +- +-#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +-msgid "Disconnected" +-msgstr "Desconeutáu" +- +-#: gtk/gui.py:725 +-msgid "Disconnecting active connections..." +-msgstr "" +- +-#: curses/wicd-curses.py:226 +-msgid "Display 'about' dialog" +-msgstr "Amosar dialogu 'tocante a'" +- +-#: gtk/prefs.py:349 data/wicd.ui:992 +-msgid "Display notifications about connection status" +-msgstr "Amosar notificaciones sobro l'estáu conexón" +- +-#: curses/wicd-curses.py:214 +-msgid "Display this help dialog" +-msgstr "Amosar esti dialogu d'aida" +- +-#: wicd/translations.py:78 +-msgid "Domain" +-msgstr "Dominiu" +- +-#: wicd/misc.py:82 +-msgid "Done connecting..." +-msgstr "" +- +-#: curses/wicd-curses.py:1053 +-msgid "" +-"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +-"your user is in the \"$A\" group." +-msgstr "" +-"ERRU: wicd-curses denegóse-y l'accesu al degorriu wicd: por favor compreba " +-"que'l to usuariu ta nel grupu \"$A'" +- +-#: curses/wicd-curses.py:461 gtk/gui.py:266 +-msgid "ESSID" +-msgstr "" +- +-#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +-msgid "Enable debug mode" +-msgstr "Activar mou depuración" +- +-#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +-msgid "Establishing connection..." +-msgstr "Coneutándose..." +- +-#: curses/prefs_curses.py:51 data/wicd.ui:1398 +-msgid "External Programs" +-msgstr "Programes esternos" +- +-#: wicd/misc.py:84 +-msgid "Flushing the routing table..." +-msgstr "" +- +-#: curses/wicd-curses.py:210 +-msgid "For more detailed help, consult the wicd-curses(8) man page." +-msgstr "" +-"P'aida más detallada, consulta les maldiciones wicd-curses(8) del manual." +- +-#: curses/netentry_curses.py:52 gtk/netentry.py:77 +-msgid "Gateway" +-msgstr "Puerta d'enllaz" +- +-#: curses/prefs_curses.py:50 data/wicd.ui:1018 +-msgid "General Settings" +-msgstr "Axustes xenerales" +- +-#: wicd/misc.py:85 +-msgid "Generating PSK..." +-msgstr "Xenerando PSK..." +- +-#: wicd/misc.py:86 +-msgid "Generating WPA configuration file..." +-msgstr "Xenerando archivu configuración de WPA" +- +-#: gtk/netentry.py:233 +-msgid "Global DNS has not been enabled in general preferences." +-msgstr "Les DNS globales nun foron activaes nes preferencies xenerales." +- +-#: curses/prefs_curses.py:72 +-msgid "Global DNS servers" +-msgstr "Sirvidores globales DNS" +- +-#: curses/wicd-curses.py:555 +-msgid "Help" +-msgstr "Aida" +- +-#: curses/wicd-curses.py:563 +-msgid "Hidden" +-msgstr "Anubríu" +- +-#: gtk/gui.py:357 +-msgid "Hidden Network ESSID" +-msgstr "Rede ESSID anubría" +- +-#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +-#: gtk/netentry.py:74 +-msgid "IP" +-msgstr "IP" +- +-#: wicd/translations.py:79 +-msgid "Identity" +-msgstr "Identidá" +- +-#: gtk/wicd-client.py:500 +-msgid "Information about the current connection" +-msgstr "Información tocante la conexón actual" +- +-#: gtk/netentry.py:167 +-msgid "Invalid IP address entered." +-msgstr "Puesta direición IP inválida" +- +-#: gtk/gui.py:631 gtk/gui.py:639 +-msgid "Invalid address in $A entry." +-msgstr "Direición inválida na entrada $A." +- +-#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +-msgid "Key" +-msgstr "Clave" +- +-#: curses/netentry_curses.py:51 gtk/netentry.py:76 +-msgid "Netmask" +-msgstr "Mázcara de rede" +- +-#: curses/prefs_curses.py:66 +-msgid "Network Interfaces" +-msgstr "Interfaces de rede" +- +-#: gtk/netentry.py:818 +-msgid "Never connect to this network" +-msgstr "Tanina coneutar pa esta rede" +- +-#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +-msgid "No wireless networks found." +-msgstr "Nun s'alcontró rede inalámbrica dala." +- +-#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +-#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +-msgid "Not connected" +-msgstr "Non coneutáu" +- +-#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +-#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +-#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +-msgid "OK" +-msgstr "Val" +- +-#: wicd/misc.py:91 +-msgid "Obtaining IP address..." +-msgstr "Obteniendo direición IP" +- +-#: curses/wicd-curses.py:278 +-msgid "" +-"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +-"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +-"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +-"respectively. Note that you will be specifying the full path to the scripts " +-"- not the actual script contents. You will need to add/edit the script " +-"contents separately. Refer to the wicd manual page for more information." +-msgstr "" +- +-#: wicd/translations.py:81 +-msgid "Passphrase" +-msgstr "Fras de pasu" +- +-#: wicd/translations.py:82 +-msgid "Password" +-msgstr "Conseña" +- +-#: wicd/translations.py:83 +-msgid "Path to CA cert" +-msgstr "Parchear pal certificáu CA" +- +-#: wicd/translations.py:85 +-msgid "Path to PAC file" +-msgstr "Parchear pal archivu PAC" +- +-#: wicd/translations.py:84 +-msgid "Path to client cert" +-msgstr "Parchear pal certificáu de cliente" +- +-#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +-msgid "Ping static gateways after connecting to verify association" +-msgstr "" +- +-#: curses/configscript_curses.py:57 gtk/configscript.py:129 +-msgid "Post-connection Script" +-msgstr "" +- +-#: curses/configscript_curses.py:59 gtk/configscript.py:132 +-msgid "Post-disconnection Script" +-msgstr "" +- +-#: curses/configscript_curses.py:56 gtk/configscript.py:128 +-msgid "Pre-connection Script" +-msgstr "" +- +-#: curses/configscript_curses.py:58 gtk/configscript.py:130 +-msgid "Pre-disconnection Script" +-msgstr "" +- +-#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +-msgid "Preferences" +-msgstr "Preferencies" +- +-#: curses/wicd-curses.py:219 +-msgid "Preferences dialog" +-msgstr "Diálogu preferencies" +- +-#: curses/wicd-curses.py:562 +-msgid "Prefs" +-msgstr "Prefs" +- +-#: wicd/translations.py:86 +-msgid "Preshared key" +-msgstr "Preshared key" +- +-#: curses/wicd-curses.py:229 +-msgid "Press any key to return." +-msgstr "Primi cualaquier tecla pa tornar." +- +-#: wicd/translations.py:87 +-msgid "Private key" +-msgstr "Cnoseña acutada" +- +-#: wicd/translations.py:88 +-msgid "Private key password" +-msgstr "Llave la conseña acutada" +- +-#: curses/prefs_curses.py:83 gtk/prefs.py:343 +-msgid "Prompt for profile on wired autoconnect" +-msgstr "" +- +-#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +-msgid "Properties" +-msgstr "Propiedaes" +- +-#: wicd/misc.py:87 +-msgid "Putting interface down..." +-msgstr "" +- +-#: wicd/misc.py:88 +-msgid "Putting interface up..." +-msgstr "Poniendo la interfaz a..." +- +-#: curses/wicd-curses.py:565 +-msgid "Quit" +-msgstr "Colar" +- +-#: curses/wicd-curses.py:227 +-msgid "Quit wicd-curses" +-msgstr "Colar de wicd-curses" +- +-#: gtk/wicd-client.py:502 +-msgid "Quit wicd-tray-icon" +-msgstr "Colar del iconu la bandexa" +- +-#: curses/wicd-curses.py:561 +-msgid "Refresh" +-msgstr "Anovar" +- +-#: curses/wicd-curses.py:218 +-msgid "Refresh network list" +-msgstr "Anovar llista de rede" +- +-#: curses/wicd-curses.py:441 +-msgid "Rename wired profile" +-msgstr "Renomar perfil cableáu" +- +-#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +-msgid "Required encryption information is missing." +-msgstr "La información d'encriptación requería ta perdía" +- +-#: wicd/misc.py:90 +-msgid "Resetting IP address..." +-msgstr "Reaniciando direición IP" +- +-#: curses/wicd-curses.py:558 +-msgid "RfKill" +-msgstr "RfKill" +- +-#: curses/prefs_curses.py:103 +-msgid "Route Table Flushing" +-msgstr "Tables de ruta Flushing" +- +-#: curses/wicd-curses.py:629 +-msgid "Scan" +-msgstr "Desaminar" +- +-#: curses/wicd-curses.py:222 +-msgid "Scan for hidden networks" +-msgstr "Desaminar por redes anubríes" +- +-#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +-msgid "Scanning" +-msgstr "Desaminando" +- +-#: curses/wicd-curses.py:526 +-msgid "Scanning networks... stand by..." +-msgstr "Desaminando redes... aparar..." +- +-#: gtk/netentry.py:102 +-msgid "Scripts" +-msgstr "Scripts" +- +-#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +-msgid "Search domain" +-msgstr "Guetar dominiu" +- +-#: gtk/netentry.py:960 gtk/netentry.py:1082 +-msgid "Secured" +-msgstr "Seguro" +- +-#: curses/wicd-curses.py:629 +-msgid "Select Hidden Network ESSID" +-msgstr "Esbillar rede ESSID anubría" +- +-#: gtk/gui.py:103 +-msgid "Select or create a wired profile to connect with" +-msgstr "Esbillar o criar un perfil cableáu con conexón con" +- +-#: curses/wicd-curses.py:223 +-msgid "Select scripts" +-msgstr "Esbillar sripts" +- +-#: curses/wicd-curses.py:224 +-msgid "Set up Ad-hoc network" +-msgstr "" +- +-#: wicd/misc.py:92 +-msgid "Setting broadcast address..." +-msgstr "" +- +-#: wicd/misc.py:93 +-msgid "Setting static DNS servers..." +-msgstr "" +- +-#: wicd/misc.py:94 +-msgid "Setting static IP addresses..." +-msgstr "" +- +-#: gtk/prefs.py:333 data/wicd.ui:571 +-msgid "Show never connect networks" +-msgstr "" +- +-#: gtk/gui.py:104 +-msgid "Stop Showing Autoconnect pop-up temporarily" +-msgstr "" +- +-#: curses/wicd-curses.py:217 +-msgid "Stop a connection in progress" +-msgstr "" +- +-#: gtk/gui.py:315 +-msgid "Switch Off Wi-Fi" +-msgstr "" +- +-#: gtk/gui.py:312 +-msgid "Switch On Wi-Fi" +-msgstr "" +- +-#: curses/wicd-curses.py:603 +-msgid "Tab Left" +-msgstr "" +- +-#: curses/wicd-curses.py:604 +-msgid "Tab Right" +-msgstr "" +- +-#: curses/wicd-curses.py:94 +-msgid "Terminated by user" +-msgstr "" +- +-#: gtk/gui.py:85 gtk/wicd-client.py:984 +-msgid "" +-"The wicd daemon has shut down. The UI will not function properly until it is " +-"restarted." +-msgstr "" +- +-#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +-msgid "This network requires encryption to be enabled." +-msgstr "" +- +-#: curses/wicd-curses.py:272 +-msgid "" +-"To avoid various complications, wicd-curses does not support directly " +-"editing the scripts. However, you can edit them manually. First, (as root), " +-"open the \"$A\" config file, and look for the section labeled by the $B in " +-"question. In this case, this is:" +-msgstr "" +- +-#: gtk/netentry.py:635 +-msgid "" +-"To connect to a wired network, you must create a network profile. To create " +-"a network profile, type a name that describes this network, and press Add." +-msgstr "" +- +-#: gtk/wicd-client.py:94 +-msgid "" +-"Unable to contact the Wicd daemon due to an access denied error from DBus. " +-"Please check that your user is in the $A group." +-msgstr "" +- +-#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +-msgid "Unsecured" +-msgstr "" +- +-#: curses/netentry_curses.py:62 +-msgid "Use DHCP Hostname" +-msgstr "" +- +-#: curses/netentry_curses.py:256 gtk/netentry.py:356 +-msgid "Use Encryption" +-msgstr "" +- +-#: curses/wicd-curses.py:466 gtk/gui.py:263 +-msgid "Use Encryption (WEP only)" +-msgstr "" +- +-#: curses/netentry_curses.py:54 gtk/netentry.py:89 +-msgid "Use Static DNS" +-msgstr "" +- +-#: curses/netentry_curses.py:49 gtk/netentry.py:88 +-msgid "Use Static IPs" +-msgstr "" +- +-#: curses/netentry_curses.py:190 gtk/netentry.py:636 +-msgid "Use as default profile (overwrites any previous default)" +-msgstr "" +- +-#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +-msgid "Use dBm to measure signal strength" +-msgstr "" +- +-#: curses/prefs_curses.py:82 gtk/prefs.py:341 +-msgid "Use default profile on wired autoconnect" +-msgstr "" +- +-#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +-#: data/wicd.ui:882 +-msgid "Use global DNS servers" +-msgstr "" +- +-#: curses/prefs_curses.py:84 gtk/prefs.py:345 +-msgid "Use last used profile on wired autoconnect" +-msgstr "" +- +-#: curses/netentry_curses.py:255 gtk/netentry.py:357 +-msgid "Use these settings for all networks sharing this essid" +-msgstr "" +- +-#: wicd/translations.py:89 +-msgid "Username" +-msgstr "" +- +-#: wicd/misc.py:96 +-msgid "Validating authentication..." +-msgstr "" +- +-#: wicd/misc.py:97 +-msgid "Verifying access point association..." +-msgstr "" +- +-#: curses/prefs_curses.py:108 +-msgid "WPA Supplicant" +-msgstr "" +- +-#: curses/wicd-curses.py:528 +-msgid "Wicd Curses Interface" +-msgstr "" +- +-#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +-msgid "Wicd daemon unreachable" +-msgstr "" +- +-#: wicd/misc.py:196 +-msgid "Wicd needs to access your computer's network cards." +-msgstr "" +- +-#: gtk/wicd-client.py:628 +-msgid "" +-"Wired\n" +-"IP:\n" +-"RX:\n" +-"TX:" +-msgstr "" +- +-#: curses/prefs_curses.py:81 +-msgid "Wired Autoconnect Settings" +-msgstr "" +- +-#: curses/prefs_curses.py:67 +-msgid "Wired Interface" +-msgstr "" +- +-#: curses/prefs_curses.py:99 +-msgid "Wired Link Detection" +-msgstr "" +- +-#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +-#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +-msgid "Wired Network" +-msgstr "" +- +-#: curses/wicd-curses.py:533 +-msgid "Wired Networks" +-msgstr "" +- +-#: gtk/gui.py:97 +-msgid "Wired connection detected" +-msgstr "" +- +-#: gtk/wicd-client.py:633 +-msgid "" +-"Wireless\n" +-"SSID:\n" +-"Speed:\n" +-"IP:\n" +-"Strength:\n" +-"RX:\n" +-"TX:" +-msgstr "" +- +-#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +-msgid "Wireless Interface" +-msgstr "" +- +-#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +-msgid "Wireless Kill Switch Enabled" +-msgstr "" +- +-#: curses/wicd-curses.py:535 +-msgid "Wireless Networks" +-msgstr "" +- +-#: curses/wicd-curses.py:277 +-msgid "" +-"You can also configure the wireless networks by looking for the " +-"\"[]\" field in the config file." +-msgstr "" +- +-#: gtk/netentry.py:300 gtk/netentry.py:408 +-msgid "You must enter your password to configure scripts" +-msgstr "" +- +-#: curses/prefs_curses.py:111 +-msgid "You should almost always use wext as the WPA supplicant driver" +-msgstr "" +- +-#: gtk/wicd-client.py:499 +-msgid "_Connection Info" +-msgstr "" +- +-#: gtk/wicd-client.py:502 data/wicd.ui:151 +-msgid "_Quit" +-msgstr "" +- +-#: curses/wicd-curses.py:428 +-msgid "" +-"wicd-curses does not support deleting the last wired profile. Try renaming " +-"it (\"F2\")" +-msgstr "" +- +-#: curses/wicd-curses.py:206 +-msgid "wicd-curses help" +-msgstr "" +- +-#: data/wicd.ui:9 +-msgid "Wicd Network Manager" +-msgstr "" +- +-#: data/wicd.ui:46 +-msgid "Create an ad-hoc network" +-msgstr "" +- +-#: data/wicd.ui:55 +-msgid "Find a hidden network" +-msgstr "" +- +-#: data/wicd.ui:57 +-msgid "Enter a hidden network to try to locate." +-msgstr "" +- +-#: data/wicd.ui:79 +-msgid "_Switch Off Wi-Fi" +-msgstr "" +- +-#: data/wicd.ui:94 +-msgid "_Disconnect All" +-msgstr "" +- +-#: data/wicd.ui:108 +-msgid "_Refresh" +-msgstr "" +- +-#: data/wicd.ui:122 +-msgid "_Preferences" +-msgstr "" +- +-#: data/wicd.ui:136 +-msgid "_About" +-msgstr "" +- +-#: data/wicd.ui:213 data/wicd.ui:215 +-msgid "Connecting..." +-msgstr "" +- +-#: data/wicd.ui:228 +-msgid "Cancel the current connection attempt" +-msgstr "" +- +-#: data/wicd.ui:260 +-msgid "Configure Scripts" +-msgstr "" +- +-#: data/wicd.ui:279 +-msgid "Configure scripts to run for this network:" +-msgstr "" +- +-#: data/wicd.ui:296 +-msgid "Pre-connection Script:" +-msgstr "" +- +-#: data/wicd.ui:329 +-msgid "Post-connection Script:" +-msgstr "" +- +-#: data/wicd.ui:362 +-msgid "Pre-disconnection Script:" +-msgstr "" +- +-#: data/wicd.ui:395 +-msgid "Post-disconnection Script:" +-msgstr "" +- +-#: data/wicd.ui:514 +-msgid "Always switch to a wired connection when available" +-msgstr "" +- +-#: data/wicd.ui:519 +-msgid "" +-"If selected, wicd will automatically connect to a wired network\n" +-"as soon as a cable is plugged in, even if a wireless connection \n" +-"is already active." +-msgstr "" +- +-#: data/wicd.ui:542 +-msgid "DNS domain:" +-msgstr "" +- +-#: data/wicd.ui:590 +-msgid "Never Connect" +-msgstr "" +- +-#: data/wicd.ui:606 +-msgid "Automatically reconnect on network connection loss" +-msgstr "" +- +-#: data/wicd.ui:625 +-msgid "Automatic Reconnection" +-msgstr "" +- +-#: data/wicd.ui:641 +-msgid "Use last wired network profile" +-msgstr "" +- +-#: data/wicd.ui:663 +-msgid "Prompt for wired network profile" +-msgstr "" +- +-#: data/wicd.ui:686 +-msgid "Use default wired network profile" +-msgstr "" +- +-#: data/wicd.ui:707 +-msgid "Wired automatic connection" +-msgstr "" +- +-#: data/wicd.ui:725 +-msgid "Wired interface:" +-msgstr "" +- +-#: data/wicd.ui:743 +-msgid "Wireless interface:" +-msgstr "" +- +-#: data/wicd.ui:783 +-msgid "Network Interfaces" +-msgstr "" +- +-#: data/wicd.ui:799 +-msgid "DNS server 3:" +-msgstr "" +- +-#: data/wicd.ui:830 +-msgid "DNS server 2:" +-msgstr "" +- +-#: data/wicd.ui:848 +-msgid "DNS server 1:" +-msgstr "" +- +-#: data/wicd.ui:866 +-msgid "Search domain:" +-msgstr "" +- +-#: data/wicd.ui:901 +-msgid "Global DNS Servers" +-msgstr "" +- +-#: data/wicd.ui:960 +-msgid "" +-"If enabled, the wired network interface will always be displayed in the main " +-"window. This can be useful if your wired network card does not detect when " +-"the interface is connected to a cable." +-msgstr "" +- +-#: data/wicd.ui:976 +-msgid "Notifications" +-msgstr "" +- +-#: data/wicd.ui:1050 +-msgid "Route Table Flushing" +-msgstr "" +- +-#: data/wicd.ui:1063 +-msgid "Wired Link Detection" +-msgstr "" +- +-#: data/wicd.ui:1289 +-msgid "DHCP Client" +-msgstr "" +- +-#: data/wicd.ui:1300 +-msgid "Graphical Sudo Application" +-msgstr "" +- +-#: data/wicd.ui:1421 +-msgid "" +-"Hover your mouse over the selected backend \n" +-"to read its description." +-msgstr "" +- +-#: data/wicd.ui:1474 +-msgid "Driver:" +-msgstr "" +- +-#: data/wicd.ui:1530 +-msgid "Wireless Interface" +-msgstr "" +- +-#: data/wicd.ui:1544 +-msgid "WPA Supplicant" +-msgstr "" +- +-#: data/wicd.ui:1556 +-msgid "Debugging" +-msgstr "" +- +-#: data/wicd.ui:1574 +-msgid "Backend:" +-msgstr "" +- +-#: data/wicd.ui:1601 +-msgid "Backend" +-msgstr "" +- +-#: data/wicd.ui:1615 +-msgid "" +-"You should almost always use wext as the\n" +-"WPA supplicant driver." +-msgstr "" + From ee921d9df413b7634229e79630b7ca9217a1cb2d Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sun, 31 Mar 2013 12:57:28 +0400 Subject: [PATCH 03/32] wicd: fix missing application icon --- pkgs/tools/networking/wicd/default.nix | 1 + pkgs/tools/networking/wicd/fix-app-icon.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/networking/wicd/fix-app-icon.patch diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index b080018f1cb0..0b63f40a95be 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ./no-optimization.patch ./dhclient.patch ./no-ast-transl.patch + ./fix-app-icon.patch ]; # Should I be using pygtk's propogated build inputs? diff --git a/pkgs/tools/networking/wicd/fix-app-icon.patch b/pkgs/tools/networking/wicd/fix-app-icon.patch new file mode 100644 index 000000000000..154d7da35108 --- /dev/null +++ b/pkgs/tools/networking/wicd/fix-app-icon.patch @@ -0,0 +1,19 @@ +Someone forgot to pack wicd.png icon. We will replace it with existing one. + +diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py +--- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-30 21:47:19.802907553 +0000 ++++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 08:13:32.876871673 +0000 +@@ -205,8 +205,10 @@ + + self.status_area.hide_all() + +- if os.path.exists(os.path.join(wpath.images, "wicd.png")): +- self.window.set_icon_from_file(os.path.join(wpath.images, "wicd.png")) ++ if os.path.exists(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")): ++ self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")) ++ else: ++ print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png") + self.statusID = None + self.first_dialog_load = True + self.is_visible = True + From 6901f6346dedac38ca2b11ce17de2c9f3d03aa4d Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sun, 31 Mar 2013 18:07:40 +0000 Subject: [PATCH 04/32] wicd: [HACK] fix various gtk issues * hack around s.translate situation * fix KeyError exception in error dialog * fix Russian translation --- pkgs/tools/networking/wicd/default.nix | 1 + .../networking/wicd/fix-gtk-issues.patch | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/networking/wicd/fix-gtk-issues.patch diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 0b63f40a95be..f8d3186f3a91 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ./dhclient.patch ./no-ast-transl.patch ./fix-app-icon.patch + ./fix-gtk-issues.patch ]; # Should I be using pygtk's propogated build inputs? diff --git a/pkgs/tools/networking/wicd/fix-gtk-issues.patch b/pkgs/tools/networking/wicd/fix-gtk-issues.patch new file mode 100644 index 000000000000..31e553b46b50 --- /dev/null +++ b/pkgs/tools/networking/wicd/fix-gtk-issues.patch @@ -0,0 +1,47 @@ +diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py +--- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-31 17:01:29.367001288 +0000 ++++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 17:55:20.826028396 +0000 +@@ -35,7 +35,7 @@ + from wicd import misc + from wicd import wpath + from wicd import dbusmanager +-from wicd.misc import noneToString ++from wicd.misc import noneToString, _status_dict + from wicd.translations import _, language + import prefs + from prefs import PreferencesDialog +@@ -250,7 +250,7 @@ + + def handle_connection_results(self, results): + if results not in ['success', 'aborted'] and self.is_visible: +- error(self.window, language[results], block=False) ++ error(self.window, misc._status_dict[results], block=False) + + def create_adhoc_network(self, widget=None): + """ Shows a dialog that creates a new adhoc network. """ +diff -ruN wicd-1.7.2.4.orig/po/ru.po wicd-1.7.2.4/po/ru.po +--- wicd-1.7.2.4.orig/po/ru.po 2013-03-31 17:01:29.362001288 +0000 ++++ wicd-1.7.2.4/po/ru.po 2013-03-31 17:43:37.909022515 +0000 +@@ -173,7 +173,7 @@ + + #: wicd/misc.py:79 + msgid "Connection Failed: Bad password" +-msgstr "Ошибка соединения: Неверный пароль:" ++msgstr "Ошибка соединения: Неверный пароль" + + #: wicd/misc.py:89 + msgid "Connection Failed: No DHCP offers received." +diff -ruN wicd-1.7.2.4.orig/wicd/misc.py wicd-1.7.2.4/wicd/misc.py +--- wicd-1.7.2.4.orig/wicd/misc.py 2013-03-31 17:01:29.369001288 +0000 ++++ wicd-1.7.2.4/wicd/misc.py 2013-03-31 17:23:56.822012593 +0000 +@@ -430,7 +430,9 @@ + """ Sanitize property names to be used in config-files. """ + allowed = string.ascii_letters + '_' + string.digits + table = string.maketrans(allowed, ' ' * len(allowed)) +- return s.translate(None, table) ++ #return s.translate(None, table) ++ #return s.translate(table) ++ return s + + def sanitize_escaped(s): + """ Sanitize double-escaped unicode strings. """ From 7ce97cc443485c8d455312652dc0765f08107cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 1 Apr 2013 18:12:32 +0200 Subject: [PATCH 05/32] udisks: split to udisks1 (stays default) and udisks2 --- .../udisks/{default.nix => 1-default.nix} | 0 pkgs/os-specific/linux/udisks/2-default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 41 insertions(+), 1 deletion(-) rename pkgs/os-specific/linux/udisks/{default.nix => 1-default.nix} (100%) create mode 100644 pkgs/os-specific/linux/udisks/2-default.nix diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/1-default.nix similarity index 100% rename from pkgs/os-specific/linux/udisks/default.nix rename to pkgs/os-specific/linux/udisks/1-default.nix diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix new file mode 100644 index 000000000000..b7be51c56fcc --- /dev/null +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, intltool +, expat, acl, udev, glib, libatasmart, polkit +, libxslt, docbook_xsl, utillinux, mdadm +}: + +stdenv.mkDerivation rec { + name = "udisks-2.1.0"; + + src = fetchurl { + url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2"; + sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii"; + }; + + postPatch = + '' + substituteInPlace src/main.c --replace \ + "/sbin:/bin:/usr/sbin:/usr/bin" \ + "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" + ''; + + nativeBuildInputs = [ pkgconfig intltool ]; + + propagatedBuildInputs = [ expat acl udev glib libatasmart polkit ]; # in closure anyway + + buildInputs = [ libxslt docbook_xsl ]; + + configureFlags = [ + "--localstatedir=/var" + "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" + "--with-udevdir=$(out)/lib/udev" + ]; + + meta = { + homepage = http://www.freedesktop.org/wiki/Software/udisks; + description = "A daemon and command-line utility for querying and manipulating storage devices"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c75a98a6f24d..3e0c04b035ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6254,7 +6254,9 @@ let udev145 = callPackage ../os-specific/linux/udev/145.nix { }; udev = pkgs.systemd; - udisks = callPackage ../os-specific/linux/udisks { }; + udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; + udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; + udisks = udisks1; untie = callPackage ../os-specific/linux/untie { }; From dd2cd2785e957471331f1fa5e2a4bb9d25d50297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 1 Apr 2013 18:08:28 +0200 Subject: [PATCH 06/32] libgphoto2: update and add libxml2 --- .../libraries/libgphoto2/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 3edc8d0ac6ca..e1feda6abd4a 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,18 +1,20 @@ -{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: +{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.14"; + name = "libgphoto2-2.5.1.1"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; + sha256 = "057dnyrxr0vy2zs4fhscpig42kvlsy9fg4gj20fhvjcvp3pak8xl"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg ]; + buildInputs = [ libtool libjpeg libxml2 ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb libexif ]; + propagatedBuildInputs = [ libusb1 libexif ]; + + NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; # bogus detection again meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; @@ -20,10 +22,10 @@ stdenv.mkDerivation rec { longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. + from digital cameras. ''; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; From 94c741c7ad69615862fdcf77c08ad313f069efc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 1 Apr 2013 18:09:51 +0200 Subject: [PATCH 07/32] gvfs: add globally, lightWeight by default HeavyWeight will be fixed after gnome3 from x-updates. --- pkgs/development/libraries/gvfs/default.nix | 33 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/gvfs/default.nix diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix new file mode 100644 index 000000000000..3940e90c310e --- /dev/null +++ b/pkgs/development/libraries/gvfs/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libtool +, glib, dbus, udev, udisks2, libgcrypt +, libgphoto2, avahi, libarchive, fuse, libcdio +, libxml2, libxslt, docbook_xsl +, lightWeight ? true, gnome, samba }: + +stdenv.mkDerivation rec { + name = "gvfs-1.14.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; + sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; + }; + + nativeBuildInputs = [ pkgconfig intltool libtool ]; + + buildInputs = + [ glib dbus.libs udev udisks2 libgcrypt + libgphoto2 avahi libarchive fuse libcdio + libxml2 libxslt docbook_xsl + # ToDo: a ligther version of libsoup to have FTP/HTTP support? + ] ++ stdenv.lib.optionals (!lightWeight) (with gnome; [ + gtk libsoup libgnome_keyring gconf samba + # ToDo: not working and probably useless until gnome3 from x-updates + ]); + + enableParallelBuilding = true; + + meta = { + description = "Virtual Filesystem support library" + stdenv.lib.optionalString lightWeight " (light-weight)"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e0c04b035ce..ef0e1bef2247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3960,6 +3960,8 @@ let gts = callPackage ../development/libraries/gts { }; + gvfs = callPackage ../development/libraries/gvfs { }; + gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; # TODO : Add MIT Kerberos and let admin choose. From 979f2b01102f9d3049d696805a399aec3a57f979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 1 Apr 2013 18:15:34 +0200 Subject: [PATCH 08/32] xfce: ./support/ not needed anymore --- pkgs/desktops/xfce/default.nix | 10 +- pkgs/desktops/xfce/support/gvfs.nix | 22 --- pkgs/desktops/xfce/support/libgdu-only.patch | 144 ------------------- pkgs/desktops/xfce/support/libgdu.nix | 34 ----- pkgs/top-level/release-python.nix | 1 - 5 files changed, 1 insertion(+), 210 deletions(-) delete mode 100644 pkgs/desktops/xfce/support/gvfs.nix delete mode 100644 pkgs/desktops/xfce/support/libgdu-only.patch delete mode 100644 pkgs/desktops/xfce/support/libgdu.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 03e0def78532..808266ec82bc 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -5,21 +5,13 @@ callPackage = newScope (deps // xfce_self); deps = rec { # xfce-global dependency overrides should be here inherit (pkgs.gnome) libglade libwnck vte gtksourceview; inherit (pkgs.perlPackages) URI; - - # The useful bits from ‘gnome-disk-utility’. - libgdu = callPackage ./support/libgdu.nix { }; - - # Gvfs is required by Thunar for the trash feature and for volume - # mounting. Should use the one from Gnome, but I don't want to mess - # with the Gnome packages (or pull in a zillion Gnome dependencies). - gvfs = callPackage ./support/gvfs.nix { }; }; xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach #### NixOS support - inherit (deps) gvfs; + inherit (pkgs) gvfs; xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc"; #### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2" diff --git a/pkgs/desktops/xfce/support/gvfs.nix b/pkgs/desktops/xfce/support/gvfs.nix deleted file mode 100644 index af70aea755af..000000000000 --- a/pkgs/desktops/xfce/support/gvfs.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse -, libxml2, libxslt, docbook_xsl, libgphoto2, libtool }: - -stdenv.mkDerivation rec { - name = "gvfs-1.14.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; - sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; - }; - - buildInputs = - [ pkgconfig glib dbus.libs intltool udev libgdu fuse libxml2 libxslt - docbook_xsl libgphoto2 libtool - ]; - - meta = { - description = "Virtual Filesystem support library (for Xfce)"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce/support/libgdu-only.patch b/pkgs/desktops/xfce/support/libgdu-only.patch deleted file mode 100644 index c5873c716811..000000000000 --- a/pkgs/desktops/xfce/support/libgdu-only.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac gnome-disk-utility-2.30.1/configure.ac ---- gnome-disk-utility-2.30.1-orig/configure.ac 2010-03-22 16:54:09.000000000 +0100 -+++ gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.000000000 +0200 -@@ -106,17 +106,6 @@ - # GNOME - # ***** - --GNOME_COMMON_INIT --GNOME_DOC_INIT --GNOME_DEBUG_CHECK --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -- --AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc], -- [use gtk-doc to build documentation [default=yes]]),, -- enable_gtk_doc=yes) --GTK_DOC_CHECK([1.3]) -- - # *************************** - # Check for required packages - # *************************** -@@ -130,7 +119,6 @@ - UNIQUE_REQUIRED=1.0 - LIBNOTIFY_REQUIRED=0.3.0 - NAUTILUS_REQUIRED=2.24.0 --AVAHI_UI_REQUIRED=0.6.25 - - UDISKS_REQUIRED=1.0.0 - UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0 -@@ -144,13 +132,7 @@ - PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED]) - PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED]) - PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) --PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED]) --PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED]) --PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) - PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) --PKG_CHECK_MODULES(X11, [x11]) --PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) --PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED]) - - # ************* - # Remote Access -@@ -183,21 +165,10 @@ - AC_SUBST(GNOME_KEYRING_CFLAGS) - AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"]) - --# ************* --# Documentation --# ************* -- --AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) --if test x$SCROLLKEEPER_CONFIG = xno; then -- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) --fi -- - # ******************** - # Internationalization - # ******************** - --IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED]) -- - GETTEXT_PACKAGE=gnome-disk-utility - AC_SUBST([GETTEXT_PACKAGE]) - AM_GLIB_GNU_GETTEXT -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am gnome-disk-utility-2.30.1/doc/Makefile.am ---- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02 20:52:38.000000000 +0100 -+++ gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.000000000 +0200 -@@ -70,9 +70,7 @@ - Makefile.in \ - $(NULL) - --include $(top_srcdir)/gtk-doc.make -- --CLEANFILES += *~ \ -+CLEANFILES = *~ \ - gnome-disk-utility-scan* \ - gnome-disk-utility.args \ - gnome-disk-utility.hierarchy \ -@@ -91,4 +89,4 @@ - $(NULL) - - # Version information for marking the documentation --EXTRA_DIST += version.xml.in -+EXTRA_DIST = version.xml.in -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/gtk-doc.make gnome-disk-utility-2.30.1/gtk-doc.make ---- gnome-disk-utility-2.30.1-orig/gtk-doc.make 2010-03-16 00:08:20.000000000 +0100 -+++ gnome-disk-utility-2.30.1/gtk-doc.make 2011-09-06 02:15:33.000000000 +0200 -@@ -4,15 +4,9 @@ - # Everything below here is generic # - #################################### - --if GTK_DOC_USE_LIBTOOL --GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --GTKDOC_RUN = $(LIBTOOL) --mode=execute --else - GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - GTKDOC_RUN = --endif - - # We set GPATH here; this gives us semantics for GNU make - # which are more like other make's VPATH, when it comes to -@@ -49,22 +43,7 @@ - - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - --if ENABLE_GTK_DOC --if GTK_DOC_BUILD_HTML --HTML_BUILD_STAMP=html-build.stamp --else --HTML_BUILD_STAMP= --endif --if GTK_DOC_BUILD_PDF --PDF_BUILD_STAMP=pdf-build.stamp --else --PDF_BUILD_STAMP= --endif -- --all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) --else - all-local: --endif - - docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) - -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/help/Makefile.am gnome-disk-utility-2.30.1/help/Makefile.am ---- gnome-disk-utility-2.30.1-orig/help/Makefile.am 2009-09-23 20:35:01.000000000 +0200 -+++ gnome-disk-utility-2.30.1/help/Makefile.am 2011-09-06 02:18:13.000000000 +0200 -@@ -1,4 +1,3 @@ --include $(top_srcdir)/gnome-doc-utils.make - dist-hook: doc-dist-hook - - DOC_MODULE = palimpsest -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/Makefile.am gnome-disk-utility-2.30.1/Makefile.am ---- gnome-disk-utility-2.30.1-orig/Makefile.am 2010-03-16 00:12:39.000000000 +0100 -+++ gnome-disk-utility-2.30.1/Makefile.am 2011-09-06 02:17:34.000000000 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = src data doc help po -+SUBDIRS = src data - - EXTRA_DIST = \ - autogen.sh \ diff --git a/pkgs/desktops/xfce/support/libgdu.nix b/pkgs/desktops/xfce/support/libgdu.nix deleted file mode 100644 index 32835f0434ab..000000000000 --- a/pkgs/desktops/xfce/support/libgdu.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, gnome, pkgconfig, glib, dbus_glib, intltool, udev, gtk -, libnotify, udisks, libatasmart, avahi -, autoconf, automake, libtool }: - -let version = "2.30.1"; in - -stdenv.mkDerivation rec { - name = "libgdu-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/2.30/gnome-disk-utility-${version}.tar.bz2"; - sha256 = "df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7"; - }; - - # Only build libgdu, not all that Gnome crap. - patches = [ ./libgdu-only.patch ]; - - buildInputs = - [ pkgconfig glib dbus_glib udisks - autoconf automake libtool - ]; - - preConfigure = - '' - substituteInPlace src/gdu/Makefile.am --replace /usr/share/dbus-1/interfaces ${udisks}/share/dbus-1/interfaces - autoreconf -f -i - ''; - - postConfigure = "cd src/gdu"; - - meta = { - description = "Xfce/Gvfs support library for mounting filesystems"; - }; -} diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 9d8319141dde..c51f45d6c5fb 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1806,7 +1806,6 @@ in gigolo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gtk_xfce_engine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgdu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libxfce4ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libxfce4util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libxfcegui4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From b1386e4a0920ba7d29b07ea5c620236961bbb235 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 2 Apr 2013 15:37:32 +0400 Subject: [PATCH 09/32] fix udisks2 paths --- pkgs/os-specific/linux/udisks/2-default.nix | 6 +++++- pkgs/os-specific/linux/udisks/force-path.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/udisks/force-path.patch diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index b7be51c56fcc..28cdbe189783 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -11,10 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii"; }; + patches = [ ./force-path.patch ]; + + # FIXME remove /var/run/current-system/sw/* references + # FIXME add references to parted, cryptsetup, etc (see the sources) postPatch = '' substituteInPlace src/main.c --replace \ - "/sbin:/bin:/usr/sbin:/usr/bin" \ + "@path@" \ "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" ''; diff --git a/pkgs/os-specific/linux/udisks/force-path.patch b/pkgs/os-specific/linux/udisks/force-path.patch new file mode 100644 index 000000000000..16c7ea5322fa --- /dev/null +++ b/pkgs/os-specific/linux/udisks/force-path.patch @@ -0,0 +1,13 @@ +diff -ruN udisks-2.1.0.orig/src/main.c udisks-2.1.0/src/main.c +--- udisks-2.1.0.orig/src/main.c 2013-04-02 10:43:41.629332135 +0000 ++++ udisks-2.1.0/src/main.c 2013-04-02 11:04:55.635342823 +0000 +@@ -140,8 +140,7 @@ + } + } + +- if (g_getenv ("PATH") == NULL) +- g_setenv ("PATH", "/usr/bin:/bin:/usr/sbin:/sbin", TRUE); ++ g_setenv ("PATH", "@path@", TRUE); + + udisks_notice ("udisks daemon version %s starting", PACKAGE_VERSION); + From 18681ae58e678a1bb61d264d5cfad1464ea07d08 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Thu, 4 Apr 2013 13:43:09 +0400 Subject: [PATCH 10/32] wicd: remove unused patches, remove ast with plain rm --- pkgs/tools/networking/wicd/default.nix | 4 +- .../networking/wicd/mkdir-networks.patch | 12 - .../tools/networking/wicd/no-ast-transl.patch | 1040 ----------------- pkgs/tools/networking/wicd/no-trans.patch | 15 - 4 files changed, 1 insertion(+), 1070 deletions(-) delete mode 100644 pkgs/tools/networking/wicd/mkdir-networks.patch delete mode 100644 pkgs/tools/networking/wicd/no-ast-transl.patch delete mode 100644 pkgs/tools/networking/wicd/no-trans.patch diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index f8d3186f3a91..ff3df9efb745 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -18,12 +18,9 @@ stdenv.mkDerivation rec { patches = [ ./no-var-install.patch - #./no-trans.patch - #./mkdir-networks.patch ./pygtk.patch ./no-optimization.patch ./dhclient.patch - ./no-ast-transl.patch ./fix-app-icon.patch ./fix-gtk-issues.patch ]; @@ -44,6 +41,7 @@ stdenv.mkDerivation rec { sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in + rm po/ast.po ''; configurePhase = '' diff --git a/pkgs/tools/networking/wicd/mkdir-networks.patch b/pkgs/tools/networking/wicd/mkdir-networks.patch deleted file mode 100644 index 01563fd55dab..000000000000 --- a/pkgs/tools/networking/wicd/mkdir-networks.patch +++ /dev/null @@ -1,12 +0,0 @@ -wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time, -but we cannot do that, so we make it at runtime instead. - ---- wicd-1.7.0/in/scripts=wicd.in 2010-01-14 23:49:11.000000000 -0500 -+++ wicd-1.7.0/in/scripts=wicd.in 2010-11-16 22:35:50.272555487 -0500 -@@ -1,3 +1,6 @@ - #!/bin/bash - -+mkdir -p %NETWORKS% -+ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default -+ - exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@ diff --git a/pkgs/tools/networking/wicd/no-ast-transl.patch b/pkgs/tools/networking/wicd/no-ast-transl.patch deleted file mode 100644 index eafb0ecf8c53..000000000000 --- a/pkgs/tools/networking/wicd/no-ast-transl.patch +++ /dev/null @@ -1,1040 +0,0 @@ -Remove asturian translation since it causes failure in pybabel. - -diff -ruN wicd-1.7.2.4.orig/po/ast.po wicd-1.7.2.4/po/ast.po ---- wicd-1.7.2.4.orig/po/ast.po 2013-03-30 21:47:19.799907554 +0000 -+++ wicd-1.7.2.4/po/ast.po 1970-01-01 00:00:00.000000000 +0000 -@@ -1,1033 +0,0 @@ --# Asturian translation for wicd --# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 --# This file is distributed under the same license as the wicd package. --# FIRST AUTHOR , 2011. --# --msgid "" --msgstr "" --"Project-Id-Version: wicd\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2011-12-07 23:04+0100\n" --"PO-Revision-Date: 2012-01-17 22:23+0000\n" --"Last-Translator: ASTUR2000 \n" --"Language-Team: Asturian \n" --"MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=UTF-8\n" --"Content-Transfer-Encoding: 8bit\n" --"X-Launchpad-Export-Date: 2012-04-25 05:02+0000\n" --"X-Generator: Launchpad (build 15139)\n" --"Language: ast\n" -- --#: gtk/wicd-client.py:610 --msgid "" --"$A\n" --"$B\n" --"$C\n" --"$D\n" --"$E KB/s\n" --"$F KB/s" --msgstr "" --"$A\n" --"$B\n" --"$C\n" --"$D\n" --"$E KB/s\n" --"$F KB/s" -- --#: gtk/wicd-client.py:603 --msgid "" --"$A\n" --"$B KB/s\n" --"$C KB/s" --msgstr "" --"$A\n" --"$B KB/s\n" --"$C KB/s" -- --#: curses/wicd-curses.py:564 --msgid "About" --msgstr "Tocante a" -- --#: curses/wicd-curses.py:201 --msgid "About Wicd" --msgstr "Tocantes a Wicd" -- --#: curses/wicd-curses.py:465 gtk/gui.py:272 --msgid "Activate Internet Connection Sharing" --msgstr "Activar compartición de conexón" -- --#: curses/wicd-curses.py:378 --msgid "Add a new profile" --msgstr "Añader un perfil" -- --#: curses/wicd-curses.py:411 --msgid "Add a new wired profile" --msgstr "Añader un perfil cableáu" -- --#: curses/prefs_curses.py:52 data/wicd.ui:1669 --msgid "Advanced Settings" --msgstr "Configuración avanzao" -- --#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 --msgid "Always show wired interface" --msgstr "Amosar siempres perfil cableáu" -- --#: curses/prefs_curses.py:70 --msgid "Always switch to wired connection when available" --msgstr "Camudar siempres pa una conexón cableada cuando tean disponibles" -- --#: wicd/translations.py:77 --msgid "Authentication" --msgstr "Identificación" -- --#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 --#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 --#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 --msgid "Automatic (recommended)" --msgstr "Automático (encamentao)" -- --#: curses/prefs_curses.py:86 --msgid "Automatic Reconnection" --msgstr "Reconexón automática" -- --#: curses/netentry_curses.py:257 gtk/netentry.py:817 --msgid "Automatically connect to this network" --msgstr "Coneutar namás pa esta rede" -- --#: curses/prefs_curses.py:87 gtk/prefs.py:331 --msgid "Automatically reconnect on connection loss" --msgstr "Reconeutar namás perder la conexón" -- --#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 --msgid "Backend" --msgstr "" -- --#: curses/wicd-curses.py:195 --msgid "Brought to you by:" --msgstr "Sofitáu por:" -- --#: curses/wicd-curses.py:1029 --msgid "Can't connect to the daemon, trying to start it automatically..." --msgstr "Nun pue coneutase col degorriu, tentando pa entamalo automáticamente" -- --#: curses/configscript_curses.py:74 curses/curses_misc.py:535 --#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 --#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 --msgid "Cancel" --msgstr "Atayar" -- --#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 --#: gtk/netentry.py:1088 --msgid "Channel" --msgstr "Canal" -- --#: gtk/gui.py:188 data/wicd.ui:173 --msgid "Choose from the networks below:" --msgstr "Esbilla dende les redes d'emabxo" -- --#: curses/wicd-curses.py:556 --msgid "Config" --msgstr "Config" -- --#: curses/wicd-curses.py:225 --msgid "Configure selected network" --msgstr "Configurar rede esbillada" -- --#: curses/netentry_curses.py:196 --msgid "Configuring preferences for wired profile \"$A\"" --msgstr "Configurando preferencies pal perfil cableáu \"$A\"" -- --#: curses/netentry_curses.py:272 --msgid "Configuring preferences for wireless network \"$A\" ($B)" --msgstr "Configurando preferencies pal perfil inalámbricu \"$A\" ($B)" -- --#: wicd/misc.py:80 --msgid "Configuring wireless interface..." --msgstr "Configurando rede inalámbrica" -- --#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 --msgid "Connect" --msgstr "Coneutase" -- --#: curses/wicd-curses.py:215 --msgid "Connect to selected network" --msgstr "Coneutase a la rede esbillada" -- --#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 --msgid "Connected to $A at $B (IP: $C)" --msgstr "Coneutáu a $A en $B (IP: $C)" -- --#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 --msgid "Connected to wired network (IP: $A)" --msgstr "Coneutáu a la rede cableada (IP: $A)" -- --#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 --msgid "Connecting" --msgstr "Coneutando" -- --#: wicd/misc.py:77 --msgid "Connection Cancelled" --msgstr "Conexón atayada" -- --#: wicd/misc.py:83 --msgid "Connection Failed." --msgstr "Conexón fallía." -- --#: wicd/misc.py:79 --msgid "Connection Failed: Bad password" --msgstr "Conexón fallía: conseña mala" -- --#: wicd/misc.py:89 --msgid "Connection Failed: No DHCP offers received." --msgstr "Conexón fallía: ensin ufiertes DHCP recivies." -- --#: wicd/misc.py:81 --msgid "Connection Failed: Unable to Get IP Address" --msgstr "Conexón fallía: Nun pue consiguise una direición IP" -- --#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 --msgid "Connection established" --msgstr "Conexón establecida" -- --#: wicd/misc.py:78 --msgid "Connection failed: Could not contact the wireless access point." --msgstr "Conexón fallía: Nun pudo contautase col puntu d'accesu inalámbricu." -- --#: wicd/misc.py:95 --msgid "Connection successful." --msgstr "Conexón correcha." -- --#: gtk/gui.py:65 gtk/wicd-client.py:955 --msgid "" --"Could not connect to wicd's D-Bus interface. Check the wicd log for error " --"messages." --msgstr "" --"Nun pudo coneutase a la interfaz D-Bus de Wicd. Agüeya'l log de Wicd pa " --"mensaxes d'erros" -- --#: gtk/netentry.py:303 gtk/netentry.py:411 --msgid "" --"Could not find a graphical sudo program. The script editor could not be " --"launched. You'll have to edit scripts directly your configuration file." --msgstr "" --"Nun pudo alcontrase un programa gráficu sudo. L'editor de scripts nun " --"s'anició. Tienes d'editar los scripts direutamente dende l'archivu de " --"configuración." -- --#: curses/wicd-curses.py:488 gtk/gui.py:258 --msgid "Create an Ad-Hoc Network" --msgstr "Criar una rede Ad-Hoc" -- --#: curses/wicd-curses.py:99 --msgid "" --"DBus failure! This is most likely caused by the wicd daemon stopping while " --"wicd-curses is running. Please restart the daemon, and then restart wicd-" --"curses." --msgstr "" -- --#: curses/prefs_curses.py:92 --msgid "DHCP Client" --msgstr "Cliente DHCP" -- --#: curses/netentry_curses.py:63 --msgid "DHCP Hostname" --msgstr "Viesu d'agospiu DHCP" -- --#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 --msgid "DNS domain" --msgstr "Dominiu DNS" -- --#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 --#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 --#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 --#: gtk/netentry.py:81 gtk/netentry.py:82 --msgid "DNS server" --msgstr "Sirvidor DNS" -- --#: curses/prefs_curses.py:117 --msgid "Debugging" --msgstr "Depuración" -- --#: curses/wicd-curses.py:560 --msgid "Disconn" --msgstr "Descon" -- --#: curses/wicd-curses.py:216 --msgid "Disconnect from all networks" --msgstr "Desconeutar toles redes" -- --#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 --msgid "Disconnected" --msgstr "Desconeutáu" -- --#: gtk/gui.py:725 --msgid "Disconnecting active connections..." --msgstr "" -- --#: curses/wicd-curses.py:226 --msgid "Display 'about' dialog" --msgstr "Amosar dialogu 'tocante a'" -- --#: gtk/prefs.py:349 data/wicd.ui:992 --msgid "Display notifications about connection status" --msgstr "Amosar notificaciones sobro l'estáu conexón" -- --#: curses/wicd-curses.py:214 --msgid "Display this help dialog" --msgstr "Amosar esti dialogu d'aida" -- --#: wicd/translations.py:78 --msgid "Domain" --msgstr "Dominiu" -- --#: wicd/misc.py:82 --msgid "Done connecting..." --msgstr "" -- --#: curses/wicd-curses.py:1053 --msgid "" --"ERROR: wicd-curses was denied access to the wicd daemon: please check that " --"your user is in the \"$A\" group." --msgstr "" --"ERRU: wicd-curses denegóse-y l'accesu al degorriu wicd: por favor compreba " --"que'l to usuariu ta nel grupu \"$A'" -- --#: curses/wicd-curses.py:461 gtk/gui.py:266 --msgid "ESSID" --msgstr "" -- --#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 --msgid "Enable debug mode" --msgstr "Activar mou depuración" -- --#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 --msgid "Establishing connection..." --msgstr "Coneutándose..." -- --#: curses/prefs_curses.py:51 data/wicd.ui:1398 --msgid "External Programs" --msgstr "Programes esternos" -- --#: wicd/misc.py:84 --msgid "Flushing the routing table..." --msgstr "" -- --#: curses/wicd-curses.py:210 --msgid "For more detailed help, consult the wicd-curses(8) man page." --msgstr "" --"P'aida más detallada, consulta les maldiciones wicd-curses(8) del manual." -- --#: curses/netentry_curses.py:52 gtk/netentry.py:77 --msgid "Gateway" --msgstr "Puerta d'enllaz" -- --#: curses/prefs_curses.py:50 data/wicd.ui:1018 --msgid "General Settings" --msgstr "Axustes xenerales" -- --#: wicd/misc.py:85 --msgid "Generating PSK..." --msgstr "Xenerando PSK..." -- --#: wicd/misc.py:86 --msgid "Generating WPA configuration file..." --msgstr "Xenerando archivu configuración de WPA" -- --#: gtk/netentry.py:233 --msgid "Global DNS has not been enabled in general preferences." --msgstr "Les DNS globales nun foron activaes nes preferencies xenerales." -- --#: curses/prefs_curses.py:72 --msgid "Global DNS servers" --msgstr "Sirvidores globales DNS" -- --#: curses/wicd-curses.py:555 --msgid "Help" --msgstr "Aida" -- --#: curses/wicd-curses.py:563 --msgid "Hidden" --msgstr "Anubríu" -- --#: gtk/gui.py:357 --msgid "Hidden Network ESSID" --msgstr "Rede ESSID anubría" -- --#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 --#: gtk/netentry.py:74 --msgid "IP" --msgstr "IP" -- --#: wicd/translations.py:79 --msgid "Identity" --msgstr "Identidá" -- --#: gtk/wicd-client.py:500 --msgid "Information about the current connection" --msgstr "Información tocante la conexón actual" -- --#: gtk/netentry.py:167 --msgid "Invalid IP address entered." --msgstr "Puesta direición IP inválida" -- --#: gtk/gui.py:631 gtk/gui.py:639 --msgid "Invalid address in $A entry." --msgstr "Direición inválida na entrada $A." -- --#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 --msgid "Key" --msgstr "Clave" -- --#: curses/netentry_curses.py:51 gtk/netentry.py:76 --msgid "Netmask" --msgstr "Mázcara de rede" -- --#: curses/prefs_curses.py:66 --msgid "Network Interfaces" --msgstr "Interfaces de rede" -- --#: gtk/netentry.py:818 --msgid "Never connect to this network" --msgstr "Tanina coneutar pa esta rede" -- --#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 --msgid "No wireless networks found." --msgstr "Nun s'alcontró rede inalámbrica dala." -- --#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 --#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 --msgid "Not connected" --msgstr "Non coneutáu" -- --#: curses/configscript_curses.py:73 curses/curses_misc.py:527 --#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 --#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 --msgid "OK" --msgstr "Val" -- --#: wicd/misc.py:91 --msgid "Obtaining IP address..." --msgstr "Obteniendo direición IP" -- --#: curses/wicd-curses.py:278 --msgid "" --"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " --"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " --"change the preconnect, postconnect, predisconnect and postdisconnect scripts " --"respectively. Note that you will be specifying the full path to the scripts " --"- not the actual script contents. You will need to add/edit the script " --"contents separately. Refer to the wicd manual page for more information." --msgstr "" -- --#: wicd/translations.py:81 --msgid "Passphrase" --msgstr "Fras de pasu" -- --#: wicd/translations.py:82 --msgid "Password" --msgstr "Conseña" -- --#: wicd/translations.py:83 --msgid "Path to CA cert" --msgstr "Parchear pal certificáu CA" -- --#: wicd/translations.py:85 --msgid "Path to PAC file" --msgstr "Parchear pal archivu PAC" -- --#: wicd/translations.py:84 --msgid "Path to client cert" --msgstr "Parchear pal certificáu de cliente" -- --#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 --msgid "Ping static gateways after connecting to verify association" --msgstr "" -- --#: curses/configscript_curses.py:57 gtk/configscript.py:129 --msgid "Post-connection Script" --msgstr "" -- --#: curses/configscript_curses.py:59 gtk/configscript.py:132 --msgid "Post-disconnection Script" --msgstr "" -- --#: curses/configscript_curses.py:56 gtk/configscript.py:128 --msgid "Pre-connection Script" --msgstr "" -- --#: curses/configscript_curses.py:58 gtk/configscript.py:130 --msgid "Pre-disconnection Script" --msgstr "" -- --#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 --msgid "Preferences" --msgstr "Preferencies" -- --#: curses/wicd-curses.py:219 --msgid "Preferences dialog" --msgstr "Diálogu preferencies" -- --#: curses/wicd-curses.py:562 --msgid "Prefs" --msgstr "Prefs" -- --#: wicd/translations.py:86 --msgid "Preshared key" --msgstr "Preshared key" -- --#: curses/wicd-curses.py:229 --msgid "Press any key to return." --msgstr "Primi cualaquier tecla pa tornar." -- --#: wicd/translations.py:87 --msgid "Private key" --msgstr "Cnoseña acutada" -- --#: wicd/translations.py:88 --msgid "Private key password" --msgstr "Llave la conseña acutada" -- --#: curses/prefs_curses.py:83 gtk/prefs.py:343 --msgid "Prompt for profile on wired autoconnect" --msgstr "" -- --#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 --msgid "Properties" --msgstr "Propiedaes" -- --#: wicd/misc.py:87 --msgid "Putting interface down..." --msgstr "" -- --#: wicd/misc.py:88 --msgid "Putting interface up..." --msgstr "Poniendo la interfaz a..." -- --#: curses/wicd-curses.py:565 --msgid "Quit" --msgstr "Colar" -- --#: curses/wicd-curses.py:227 --msgid "Quit wicd-curses" --msgstr "Colar de wicd-curses" -- --#: gtk/wicd-client.py:502 --msgid "Quit wicd-tray-icon" --msgstr "Colar del iconu la bandexa" -- --#: curses/wicd-curses.py:561 --msgid "Refresh" --msgstr "Anovar" -- --#: curses/wicd-curses.py:218 --msgid "Refresh network list" --msgstr "Anovar llista de rede" -- --#: curses/wicd-curses.py:441 --msgid "Rename wired profile" --msgstr "Renomar perfil cableáu" -- --#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 --msgid "Required encryption information is missing." --msgstr "La información d'encriptación requería ta perdía" -- --#: wicd/misc.py:90 --msgid "Resetting IP address..." --msgstr "Reaniciando direición IP" -- --#: curses/wicd-curses.py:558 --msgid "RfKill" --msgstr "RfKill" -- --#: curses/prefs_curses.py:103 --msgid "Route Table Flushing" --msgstr "Tables de ruta Flushing" -- --#: curses/wicd-curses.py:629 --msgid "Scan" --msgstr "Desaminar" -- --#: curses/wicd-curses.py:222 --msgid "Scan for hidden networks" --msgstr "Desaminar por redes anubríes" -- --#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 --msgid "Scanning" --msgstr "Desaminando" -- --#: curses/wicd-curses.py:526 --msgid "Scanning networks... stand by..." --msgstr "Desaminando redes... aparar..." -- --#: gtk/netentry.py:102 --msgid "Scripts" --msgstr "Scripts" -- --#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 --msgid "Search domain" --msgstr "Guetar dominiu" -- --#: gtk/netentry.py:960 gtk/netentry.py:1082 --msgid "Secured" --msgstr "Seguro" -- --#: curses/wicd-curses.py:629 --msgid "Select Hidden Network ESSID" --msgstr "Esbillar rede ESSID anubría" -- --#: gtk/gui.py:103 --msgid "Select or create a wired profile to connect with" --msgstr "Esbillar o criar un perfil cableáu con conexón con" -- --#: curses/wicd-curses.py:223 --msgid "Select scripts" --msgstr "Esbillar sripts" -- --#: curses/wicd-curses.py:224 --msgid "Set up Ad-hoc network" --msgstr "" -- --#: wicd/misc.py:92 --msgid "Setting broadcast address..." --msgstr "" -- --#: wicd/misc.py:93 --msgid "Setting static DNS servers..." --msgstr "" -- --#: wicd/misc.py:94 --msgid "Setting static IP addresses..." --msgstr "" -- --#: gtk/prefs.py:333 data/wicd.ui:571 --msgid "Show never connect networks" --msgstr "" -- --#: gtk/gui.py:104 --msgid "Stop Showing Autoconnect pop-up temporarily" --msgstr "" -- --#: curses/wicd-curses.py:217 --msgid "Stop a connection in progress" --msgstr "" -- --#: gtk/gui.py:315 --msgid "Switch Off Wi-Fi" --msgstr "" -- --#: gtk/gui.py:312 --msgid "Switch On Wi-Fi" --msgstr "" -- --#: curses/wicd-curses.py:603 --msgid "Tab Left" --msgstr "" -- --#: curses/wicd-curses.py:604 --msgid "Tab Right" --msgstr "" -- --#: curses/wicd-curses.py:94 --msgid "Terminated by user" --msgstr "" -- --#: gtk/gui.py:85 gtk/wicd-client.py:984 --msgid "" --"The wicd daemon has shut down. The UI will not function properly until it is " --"restarted." --msgstr "" -- --#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 --msgid "This network requires encryption to be enabled." --msgstr "" -- --#: curses/wicd-curses.py:272 --msgid "" --"To avoid various complications, wicd-curses does not support directly " --"editing the scripts. However, you can edit them manually. First, (as root), " --"open the \"$A\" config file, and look for the section labeled by the $B in " --"question. In this case, this is:" --msgstr "" -- --#: gtk/netentry.py:635 --msgid "" --"To connect to a wired network, you must create a network profile. To create " --"a network profile, type a name that describes this network, and press Add." --msgstr "" -- --#: gtk/wicd-client.py:94 --msgid "" --"Unable to contact the Wicd daemon due to an access denied error from DBus. " --"Please check that your user is in the $A group." --msgstr "" -- --#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 --msgid "Unsecured" --msgstr "" -- --#: curses/netentry_curses.py:62 --msgid "Use DHCP Hostname" --msgstr "" -- --#: curses/netentry_curses.py:256 gtk/netentry.py:356 --msgid "Use Encryption" --msgstr "" -- --#: curses/wicd-curses.py:466 gtk/gui.py:263 --msgid "Use Encryption (WEP only)" --msgstr "" -- --#: curses/netentry_curses.py:54 gtk/netentry.py:89 --msgid "Use Static DNS" --msgstr "" -- --#: curses/netentry_curses.py:49 gtk/netentry.py:88 --msgid "Use Static IPs" --msgstr "" -- --#: curses/netentry_curses.py:190 gtk/netentry.py:636 --msgid "Use as default profile (overwrites any previous default)" --msgstr "" -- --#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 --msgid "Use dBm to measure signal strength" --msgstr "" -- --#: curses/prefs_curses.py:82 gtk/prefs.py:341 --msgid "Use default profile on wired autoconnect" --msgstr "" -- --#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 --#: data/wicd.ui:882 --msgid "Use global DNS servers" --msgstr "" -- --#: curses/prefs_curses.py:84 gtk/prefs.py:345 --msgid "Use last used profile on wired autoconnect" --msgstr "" -- --#: curses/netentry_curses.py:255 gtk/netentry.py:357 --msgid "Use these settings for all networks sharing this essid" --msgstr "" -- --#: wicd/translations.py:89 --msgid "Username" --msgstr "" -- --#: wicd/misc.py:96 --msgid "Validating authentication..." --msgstr "" -- --#: wicd/misc.py:97 --msgid "Verifying access point association..." --msgstr "" -- --#: curses/prefs_curses.py:108 --msgid "WPA Supplicant" --msgstr "" -- --#: curses/wicd-curses.py:528 --msgid "Wicd Curses Interface" --msgstr "" -- --#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 --msgid "Wicd daemon unreachable" --msgstr "" -- --#: wicd/misc.py:196 --msgid "Wicd needs to access your computer's network cards." --msgstr "" -- --#: gtk/wicd-client.py:628 --msgid "" --"Wired\n" --"IP:\n" --"RX:\n" --"TX:" --msgstr "" -- --#: curses/prefs_curses.py:81 --msgid "Wired Autoconnect Settings" --msgstr "" -- --#: curses/prefs_curses.py:67 --msgid "Wired Interface" --msgstr "" -- --#: curses/prefs_curses.py:99 --msgid "Wired Link Detection" --msgstr "" -- --#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 --#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 --msgid "Wired Network" --msgstr "" -- --#: curses/wicd-curses.py:533 --msgid "Wired Networks" --msgstr "" -- --#: gtk/gui.py:97 --msgid "Wired connection detected" --msgstr "" -- --#: gtk/wicd-client.py:633 --msgid "" --"Wireless\n" --"SSID:\n" --"Speed:\n" --"IP:\n" --"Strength:\n" --"RX:\n" --"TX:" --msgstr "" -- --#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 --msgid "Wireless Interface" --msgstr "" -- --#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 --msgid "Wireless Kill Switch Enabled" --msgstr "" -- --#: curses/wicd-curses.py:535 --msgid "Wireless Networks" --msgstr "" -- --#: curses/wicd-curses.py:277 --msgid "" --"You can also configure the wireless networks by looking for the " --"\"[]\" field in the config file." --msgstr "" -- --#: gtk/netentry.py:300 gtk/netentry.py:408 --msgid "You must enter your password to configure scripts" --msgstr "" -- --#: curses/prefs_curses.py:111 --msgid "You should almost always use wext as the WPA supplicant driver" --msgstr "" -- --#: gtk/wicd-client.py:499 --msgid "_Connection Info" --msgstr "" -- --#: gtk/wicd-client.py:502 data/wicd.ui:151 --msgid "_Quit" --msgstr "" -- --#: curses/wicd-curses.py:428 --msgid "" --"wicd-curses does not support deleting the last wired profile. Try renaming " --"it (\"F2\")" --msgstr "" -- --#: curses/wicd-curses.py:206 --msgid "wicd-curses help" --msgstr "" -- --#: data/wicd.ui:9 --msgid "Wicd Network Manager" --msgstr "" -- --#: data/wicd.ui:46 --msgid "Create an ad-hoc network" --msgstr "" -- --#: data/wicd.ui:55 --msgid "Find a hidden network" --msgstr "" -- --#: data/wicd.ui:57 --msgid "Enter a hidden network to try to locate." --msgstr "" -- --#: data/wicd.ui:79 --msgid "_Switch Off Wi-Fi" --msgstr "" -- --#: data/wicd.ui:94 --msgid "_Disconnect All" --msgstr "" -- --#: data/wicd.ui:108 --msgid "_Refresh" --msgstr "" -- --#: data/wicd.ui:122 --msgid "_Preferences" --msgstr "" -- --#: data/wicd.ui:136 --msgid "_About" --msgstr "" -- --#: data/wicd.ui:213 data/wicd.ui:215 --msgid "Connecting..." --msgstr "" -- --#: data/wicd.ui:228 --msgid "Cancel the current connection attempt" --msgstr "" -- --#: data/wicd.ui:260 --msgid "Configure Scripts" --msgstr "" -- --#: data/wicd.ui:279 --msgid "Configure scripts to run for this network:" --msgstr "" -- --#: data/wicd.ui:296 --msgid "Pre-connection Script:" --msgstr "" -- --#: data/wicd.ui:329 --msgid "Post-connection Script:" --msgstr "" -- --#: data/wicd.ui:362 --msgid "Pre-disconnection Script:" --msgstr "" -- --#: data/wicd.ui:395 --msgid "Post-disconnection Script:" --msgstr "" -- --#: data/wicd.ui:514 --msgid "Always switch to a wired connection when available" --msgstr "" -- --#: data/wicd.ui:519 --msgid "" --"If selected, wicd will automatically connect to a wired network\n" --"as soon as a cable is plugged in, even if a wireless connection \n" --"is already active." --msgstr "" -- --#: data/wicd.ui:542 --msgid "DNS domain:" --msgstr "" -- --#: data/wicd.ui:590 --msgid "Never Connect" --msgstr "" -- --#: data/wicd.ui:606 --msgid "Automatically reconnect on network connection loss" --msgstr "" -- --#: data/wicd.ui:625 --msgid "Automatic Reconnection" --msgstr "" -- --#: data/wicd.ui:641 --msgid "Use last wired network profile" --msgstr "" -- --#: data/wicd.ui:663 --msgid "Prompt for wired network profile" --msgstr "" -- --#: data/wicd.ui:686 --msgid "Use default wired network profile" --msgstr "" -- --#: data/wicd.ui:707 --msgid "Wired automatic connection" --msgstr "" -- --#: data/wicd.ui:725 --msgid "Wired interface:" --msgstr "" -- --#: data/wicd.ui:743 --msgid "Wireless interface:" --msgstr "" -- --#: data/wicd.ui:783 --msgid "Network Interfaces" --msgstr "" -- --#: data/wicd.ui:799 --msgid "DNS server 3:" --msgstr "" -- --#: data/wicd.ui:830 --msgid "DNS server 2:" --msgstr "" -- --#: data/wicd.ui:848 --msgid "DNS server 1:" --msgstr "" -- --#: data/wicd.ui:866 --msgid "Search domain:" --msgstr "" -- --#: data/wicd.ui:901 --msgid "Global DNS Servers" --msgstr "" -- --#: data/wicd.ui:960 --msgid "" --"If enabled, the wired network interface will always be displayed in the main " --"window. This can be useful if your wired network card does not detect when " --"the interface is connected to a cable." --msgstr "" -- --#: data/wicd.ui:976 --msgid "Notifications" --msgstr "" -- --#: data/wicd.ui:1050 --msgid "Route Table Flushing" --msgstr "" -- --#: data/wicd.ui:1063 --msgid "Wired Link Detection" --msgstr "" -- --#: data/wicd.ui:1289 --msgid "DHCP Client" --msgstr "" -- --#: data/wicd.ui:1300 --msgid "Graphical Sudo Application" --msgstr "" -- --#: data/wicd.ui:1421 --msgid "" --"Hover your mouse over the selected backend \n" --"to read its description." --msgstr "" -- --#: data/wicd.ui:1474 --msgid "Driver:" --msgstr "" -- --#: data/wicd.ui:1530 --msgid "Wireless Interface" --msgstr "" -- --#: data/wicd.ui:1544 --msgid "WPA Supplicant" --msgstr "" -- --#: data/wicd.ui:1556 --msgid "Debugging" --msgstr "" -- --#: data/wicd.ui:1574 --msgid "Backend:" --msgstr "" -- --#: data/wicd.ui:1601 --msgid "Backend" --msgstr "" -- --#: data/wicd.ui:1615 --msgid "" --"You should almost always use wext as the\n" --"WPA supplicant driver." --msgstr "" - diff --git a/pkgs/tools/networking/wicd/no-trans.patch b/pkgs/tools/networking/wicd/no-trans.patch deleted file mode 100644 index a4c5018e181c..000000000000 --- a/pkgs/tools/networking/wicd/no-trans.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- wicd-1.7.2.4/setup.py 2013-03-14 21:28:21.360580941 +0100 -+++ wicd-1.7.2.4/setup.py 2013-03-14 21:22:50.125721943 +0100 -@@ -599,12 +599,6 @@ - if not wpath.no_install_pmutils: - data.append((wpath.pmutils, ['other/55wicd'])) - print 'Using pid path', os.path.basename(wpath.pidfile) -- print 'Language support for', -- for pofile in glob('po/*.po'): -- language = pofile.replace('po/', '').replace('.po', '') -- print language, -- data.append((wpath.translations + language + '/LC_MESSAGES/', -- ['translations/' + language + '/LC_MESSAGES/wicd.mo'])) - print - except Exception, e: - print str(e) From b4fdd210a69180fd8209f39703c2e20804a05602 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 5 Apr 2013 15:26:27 +0400 Subject: [PATCH 11/32] gvfs: allow gvfs-network to access it's gconf schemas gvfs-network fails to start until it stores some setting in Gconf (memory backend is used by default). Unfortunately, it needs schemas for to work correctly. By default, glib searches for schemas in /usr/share/glib-2.0/schemas OR under GSETTINGS_SCHEMA_DIR. This patch sets this variable to let gvfs find it's precious. --- pkgs/development/libraries/gvfs/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 3940e90c310e..067d3dc93834 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , glib, dbus, udev, udisks2, libgcrypt , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl -, lightWeight ? true, gnome, samba }: +, lightWeight ? true, gnome, samba, makeWrapper }: stdenv.mkDerivation rec { name = "gvfs-1.14.2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool libtool ]; buildInputs = - [ glib dbus.libs udev udisks2 libgcrypt + [ makeWrapper glib dbus.libs udev udisks2 libgcrypt libgphoto2 avahi libarchive fuse libcdio libxml2 libxslt docbook_xsl # ToDo: a ligther version of libsoup to have FTP/HTTP support? @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # ToDo: one probably should specify schemas for samba and others here + fixupPhase = '' + wrapProgram $out/libexec/gvfsd --set GSETTINGS_SCHEMA_DIR "$out/share/glib-2.0/schemas" + ''; + meta = { description = "Virtual Filesystem support library" + stdenv.lib.optionalString lightWeight " (light-weight)"; platforms = stdenv.lib.platforms.linux; From d1cb67a6291598bc34fc1c8f7af77f859804429a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 6 Apr 2013 00:01:02 -0700 Subject: [PATCH 12/32] spl-0.6.1, zfs-0.6.1 --- pkgs/os-specific/linux/spl/default.nix | 14 +- .../linux/spl/install_prefix.patch | 285 ++++++++++++++++- .../linux/spl/install_prefix_2.patch | 32 -- .../os-specific/linux/spl/module_prefix.patch | 33 -- pkgs/os-specific/linux/zfs/default.nix | 12 +- .../linux/zfs/kerneldir_path.patch | 299 +++++++++++++----- 6 files changed, 496 insertions(+), 179 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/install_prefix_2.patch delete mode 100644 pkgs/os-specific/linux/spl/module_prefix.patch diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 3d949511af0a..c01a4d33502d 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.0-rc14-${kernelDev.version}"; + name = "spl-0.6.1-${kernelDev.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz; - sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g"; + url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz"; + sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb"; }; - patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; + patches = [ ./install_prefix.patch ]; buildInputs = [ perl kernelDev autoconf automake libtool ]; @@ -16,12 +16,12 @@ stdenv.mkDerivation { preConfigure = '' ./autogen.sh - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/spl/spl-module.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" ''; configureFlags = '' diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index 9a7393b7170c..6b3bd515bd05 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -1,19 +1,274 @@ -*** spl-0.6.0-rc10/Makefile.am.old Fri Aug 17 14:49:16 2012 ---- spl-0.6.0-rc10/Makefile.am Fri Aug 17 14:51:06 2012 +diff -rc spl-0.6.1.orig/include/fs/Makefile.am spl-0.6.1/include/fs/Makefile.am +*** spl-0.6.1.orig/include/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/fs/Makefile.am 2013-04-05 22:10:41.436764000 -0700 *************** -*** 32,38 **** +*** 8,13 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + if CONFIG_KERNEL - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - done ---- 32,38 ---- +! kerneldir = /usr/src/spl-$(VERSION)/include/fs + kernel_HEADERS = $(KERNEL_H) + endif +--- 8,13 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + if CONFIG_KERNEL - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ +! kerneldir = @prefix@/libexec/spl/include/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/linux/Makefile.am spl-0.6.1/include/linux/Makefile.am +*** spl-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/linux/Makefile.am 2013-04-05 22:10:27.789139000 -0700 +*************** +*** 23,28 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/linux + kernel_HEADERS = $(KERNEL_H) + endif +--- 23,28 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/linux + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/Makefile.am spl-0.6.1/include/Makefile.am +*** spl-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/Makefile.am 2013-04-05 22:10:45.108623000 -0700 +*************** +*** 16,21 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include + kernel_HEADERS = $(KERNEL_H) + endif +--- 16,21 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/rpc/Makefile.am spl-0.6.1/include/rpc/Makefile.am +*** spl-0.6.1.orig/include/rpc/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/rpc/Makefile.am 2013-04-05 22:11:08.724410000 -0700 +*************** +*** 9,14 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/rpc + kernel_HEADERS = $(KERNEL_H) + endif +--- 9,14 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/rpc + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/sharefs/Makefile.am spl-0.6.1/include/sharefs/Makefile.am +*** spl-0.6.1.orig/include/sharefs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sharefs/Makefile.am 2013-04-05 22:10:38.852722000 -0700 +*************** +*** 8,13 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sharefs + kernel_HEADERS = $(KERNEL_H) + endif +--- 8,13 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sharefs + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/sys/fm/Makefile.am spl-0.6.1/include/sys/fm/Makefile.am +*** spl-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sys/fm/Makefile.am 2013-04-05 22:10:59.964334000 -0700 +*************** +*** 9,14 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm + kernel_HEADERS = $(KERNEL_H) + endif +--- 9,14 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sys/fm + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/sys/fs/Makefile.am spl-0.6.1/include/sys/fs/Makefile.am +*** spl-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sys/fs/Makefile.am 2013-04-05 22:10:57.860366000 -0700 +*************** +*** 8,13 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs + kernel_HEADERS = $(KERNEL_H) + endif +--- 8,13 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sys/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/sys/Makefile.am spl-0.6.1/include/sys/Makefile.am +*** spl-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sys/Makefile.am 2013-04-05 22:11:05.788303000 -0700 +*************** +*** 104,110 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sys + kernel_HEADERS = $(KERNEL_H) + endif + +--- 104,110 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sys + kernel_HEADERS = $(KERNEL_H) + endif + +diff -rc spl-0.6.1.orig/include/sys/sysevent/Makefile.am spl-0.6.1/include/sys/sysevent/Makefile.am +*** spl-0.6.1.orig/include/sys/sysevent/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sys/sysevent/Makefile.am 2013-04-05 22:10:54.364458000 -0700 +*************** +*** 8,13 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent + kernel_HEADERS = $(KERNEL_H) + endif +--- 8,13 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sys/sysevent + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/util/Makefile.am spl-0.6.1/include/util/Makefile.am +*** spl-0.6.1.orig/include/util/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/util/Makefile.am 2013-04-05 22:10:49.452569000 -0700 +*************** +*** 9,14 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/util + kernel_HEADERS = $(KERNEL_H) + endif +--- 9,14 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/util + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/vm/Makefile.am spl-0.6.1/include/vm/Makefile.am +*** spl-0.6.1.orig/include/vm/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/vm/Makefile.am 2013-04-05 22:10:47.444535000 -0700 +*************** +*** 10,15 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/vm + kernel_HEADERS = $(KERNEL_H) + endif +--- 10,15 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/vm + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/Makefile.am spl-0.6.1/Makefile.am +*** spl-0.6.1.orig/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/Makefile.am 2013-04-05 22:09:52.429676000 -0700 +*************** +*** 9,18 **** + if CONFIG_KERNEL + SUBDIRS += module + +! extradir = /usr/src/spl-$(VERSION) + extra_HEADERS = spl.release.in spl_config.h.in + +! kerneldir = /usr/src/spl-$(VERSION)/$(LINUX_VERSION) + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) + endif + +--- 9,18 ---- + if CONFIG_KERNEL + SUBDIRS += module + +! extradir = @prefix@/libexec/spl + extra_HEADERS = spl.release.in spl_config.h.in + +! kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) + endif + +diff -rc spl-0.6.1.orig/module/Makefile.in spl-0.6.1/module/Makefile.in +*** spl-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/module/Makefile.in 2013-03-28 10:21:59.093481000 -0700 +*************** +*** 21,41 **** + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ +! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) + @# Remove extraneous build products when packaging +! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ + if [ -n $$kmoddir ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi + + modules_uninstall: + @# Uninstall the kernel modules +! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ + list='$(subdir-m)'; for subdir in $$list; do \ + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ + done +--- 21,41 ---- + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ +! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) + @# Remove extraneous build products when packaging +! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ + if [ -n $$kmoddir ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi + + modules_uninstall: + @# Uninstall the kernel modules +! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ + list='$(subdir-m)'; for subdir in $$list; do \ + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ done diff --git a/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch deleted file mode 100644 index 6068ad1d69c2..000000000000 --- a/pkgs/os-specific/linux/spl/install_prefix_2.patch +++ /dev/null @@ -1,32 +0,0 @@ -*** git-export/include/Makefile.am Tue Mar 6 00:05:28 2012 ---- git-export/include/Makefile.am.new Tue Mar 6 00:04:46 2012 -*************** -*** 16,22 **** - - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - instfiles=`find . -name '*.h'`; \ - for instfile in $$instfiles; do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ ---- 16,22 ---- - - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - instfiles=`find . -name '*.h'`; \ - for instfile in $$instfiles; do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ -*************** -*** 24,28 **** - - uninstall-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - $(RM) -R $$instdest ---- 24,28 ---- - - uninstall-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - $(RM) -R $$instdest diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch deleted file mode 100644 index dd40711ccdb8..000000000000 --- a/pkgs/os-specific/linux/spl/module_prefix.patch +++ /dev/null @@ -1,33 +0,0 @@ -*** git-export/module/Makefile.in Wed Dec 31 16:00:01 1969 ---- git-export/module/Makefile.in.new Sat Jan 28 21:42:06 2012 -*************** -*** 17,30 **** - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=$(DESTDIR) \ - INSTALL_MOD_DIR=addon/spl $@ - @# Remove extraneous build products when packaging -! if [ -n "$(DESTDIR)" ]; then \ -! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi ---- 17,30 ---- - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=@prefix@ \ - INSTALL_MOD_DIR=addon/spl $@ - @# Remove extraneous build products when packaging -! if [ -n "@prefix@" ]; then \ -! find @prefix@/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8da4906f8fe1..b330ddab8fcf 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.0-rc14-${kernelDev.version}"; + name = "zfs-0.6.1-${kernelDev.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz; - sha256 = "0ny2lbhyfsfwfcasa1iv2hz12hzcskx9mv641955d844dh32z9fg"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz; + sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0"; }; - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; + patches = [ ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; buildInputs = [ kernelDev spl perl autoconf automake libtool zlib libuuid coreutils ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; - NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated"; preConfigure = '' ./autogen.sh @@ -31,8 +30,7 @@ stdenv.mkDerivation { configureFlags = '' --with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build - --with-spl=${spl}/libexec/spl/${kernelDev.modDirVersion} - ${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""} + --with-spl=${spl}/libexec/spl ''; meta = { diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/kerneldir_path.patch index 4503ac4ca48b..af4b94e355d7 100644 --- a/pkgs/os-specific/linux/zfs/kerneldir_path.patch +++ b/pkgs/os-specific/linux/zfs/kerneldir_path.patch @@ -1,85 +1,214 @@ -diff --git a/Makefile.am b/Makefile.am -index 9ffd6be..8e51412 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,7 +34,7 @@ distclean-local:: - if CONFIG_KERNEL - install-data-local: - release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ -- instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ -+ instdest=$(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION); \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - done -diff --git a/include/Makefile.am b/include/Makefile.am -index 8f9c8d7..5fc44d5 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -27,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) -+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 6e481a1..1107809 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux -+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 651e68b..b80bb55 100644 ---- a/include/sys/Makefile.am -+++ b/include/sys/Makefile.am -@@ -89,6 +89,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys -+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am -index 900ed93..8d9bed2 100644 ---- a/include/sys/fm/Makefile.am -+++ b/include/sys/fm/Makefile.am -@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm -+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am -index d82d076..b4ae3ee 100644 ---- a/include/sys/fm/fs/Makefile.am -+++ b/include/sys/fm/fs/Makefile.am -@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs -+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am -index b702679..3c747f4 100644 ---- a/include/sys/fs/Makefile.am -+++ b/include/sys/fs/Makefile.am -@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs -+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif +diff -rc zfs-0.6.1.orig/include/linux/Makefile.am zfs-0.6.1/include/linux/Makefile.am +*** zfs-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:47.000000000 -0700 +--- zfs-0.6.1/include/linux/Makefile.am 2013-03-28 11:07:10.099129000 -0700 +*************** +*** 16,21 **** + endif + + if CONFIG_KERNEL +! kerneldir = /usr/src/zfs-$(VERSION)/include/linux + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +--- 16,21 ---- + endif + + if CONFIG_KERNEL +! kerneldir = @prefix@/include/linux + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff -rc zfs-0.6.1.orig/include/Makefile.am zfs-0.6.1/include/Makefile.am +*** zfs-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:47.000000000 -0700 +--- zfs-0.6.1/include/Makefile.am 2013-03-28 11:07:38.810870000 -0700 +*************** +*** 28,33 **** + endif + + if CONFIG_KERNEL +! kerneldir = /usr/src/zfs-$(VERSION)/include + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +--- 28,33 ---- + endif + + if CONFIG_KERNEL +! kerneldir = @prefix@/include + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff -rc zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am zfs-0.6.1/include/sys/fm/fs/Makefile.am +*** zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700 +--- zfs-0.6.1/include/sys/fm/fs/Makefile.am 2013-03-28 11:07:36.074756000 -0700 +*************** +*** 13,18 **** + endif + + if CONFIG_KERNEL +! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm/fs + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +--- 13,18 ---- + endif + + if CONFIG_KERNEL +! kerneldir = @prefix@/include/sys/fm/fs + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff -rc zfs-0.6.1.orig/include/sys/fm/Makefile.am zfs-0.6.1/include/sys/fm/Makefile.am +*** zfs-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:47.000000000 -0700 +--- zfs-0.6.1/include/sys/fm/Makefile.am 2013-03-28 11:07:32.265896000 -0700 +*************** +*** 16,21 **** + endif + + if CONFIG_KERNEL +! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +--- 16,21 ---- + endif + + if CONFIG_KERNEL +! kerneldir = @prefix@/include/sys/fm + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff -rc zfs-0.6.1.orig/include/sys/fs/Makefile.am zfs-0.6.1/include/sys/fs/Makefile.am +*** zfs-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700 +--- zfs-0.6.1/include/sys/fs/Makefile.am 2013-03-28 11:07:27.592339000 -0700 +*************** +*** 13,18 **** + endif + + if CONFIG_KERNEL +! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fs + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +--- 13,18 ---- + endif + + if CONFIG_KERNEL +! kerneldir = @prefix@/include/sys/fs + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff -rc zfs-0.6.1.orig/include/sys/Makefile.am zfs-0.6.1/include/sys/Makefile.am +*** zfs-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:47.000000000 -0700 +--- zfs-0.6.1/include/sys/Makefile.am 2013-03-28 11:07:19.045717000 -0700 +*************** +*** 91,96 **** + endif + + if CONFIG_KERNEL +! kerneldir = /usr/src/zfs-$(VERSION)/include/sys + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +--- 91,96 ---- + endif + + if CONFIG_KERNEL +! kerneldir = @prefix@/include/sys + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff -rc zfs-0.6.1.orig/Makefile.am zfs-0.6.1/Makefile.am +*** zfs-0.6.1.orig/Makefile.am 2013-03-26 09:37:47.000000000 -0700 +--- zfs-0.6.1/Makefile.am 2013-04-05 23:49:39.763623000 -0700 +*************** +*** 9,18 **** + if CONFIG_KERNEL + SUBDIRS += module + +! extradir = /usr/src/zfs-$(VERSION) + extra_HEADERS = zfs.release.in zfs_config.h.in + +! kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION) + nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) + endif + +--- 9,18 ---- + if CONFIG_KERNEL + SUBDIRS += module + +! extradir = @prefix@/libexec/zfs-$(VERSION) + extra_HEADERS = zfs.release.in zfs_config.h.in + +! kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION) + nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) + endif + +diff -rc zfs-0.6.1.orig/module/Makefile.in zfs-0.6.1/module/Makefile.in +*** zfs-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:47.000000000 -0700 +--- zfs-0.6.1/module/Makefile.in 2013-04-05 23:50:41.497876000 -0700 +*************** +*** 18,26 **** + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ + "*** Missing spl symbols ensure you have built the spl:\n" \ +--- 18,26 ---- + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ + "*** Missing spl symbols ensure you have built the spl:\n" \ +*************** +*** 28,33 **** +--- 28,35 ---- + "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \ + exit 1; \ + fi ++ @# when copying a file out of the nix store, we need to make it writable again. ++ chmod +w @SPL_SYMBOLS@ + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@ + + clean: +*************** +*** 42,62 **** + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ +! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) + @# Remove extraneous build products when packaging +! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ + if [ -n $$kmoddir ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi + + modules_uninstall: + @# Uninstall the kernel modules +! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ + list='$(subdir-m)'; for subdir in $$list; do \ + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ + done +--- 44,64 ---- + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ +! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) + @# Remove extraneous build products when packaging +! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ + if [ -n $$kmoddir ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi + + modules_uninstall: + @# Uninstall the kernel modules +! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ + list='$(subdir-m)'; for subdir in $$list; do \ + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ + done From 4c37edd6f3b6ec6e586539e61d3395307196b843 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 6 Apr 2013 00:06:27 -0700 Subject: [PATCH 13/32] Don't need NIX_CFLAGS_COMPILE in spl build anymore, consolodate zfs patches. --- pkgs/os-specific/linux/spl/default.nix | 2 - pkgs/os-specific/linux/zfs/default.nix | 2 +- .../linux/zfs/module_perm_prefix.patch | 70 ------------------- .../{kerneldir_path.patch => nix-build.patch} | 0 .../zfs/no_absolute_paths_to_coreutils.patch | 25 ------- 5 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 pkgs/os-specific/linux/zfs/module_perm_prefix.patch rename pkgs/os-specific/linux/zfs/{kerneldir_path.patch => nix-build.patch} (100%) delete mode 100644 pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index c01a4d33502d..75ff28939722 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation { buildInputs = [ perl kernelDev autoconf automake libtool ]; - NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated"; - preConfigure = '' ./autogen.sh diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index b330ddab8fcf..ac07474d3f4b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0"; }; - patches = [ ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; + patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; buildInputs = [ kernelDev spl perl autoconf automake libtool zlib libuuid coreutils ]; diff --git a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch deleted file mode 100644 index 07cd04d1dded..000000000000 --- a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch +++ /dev/null @@ -1,70 +0,0 @@ -*** git-export/module/Makefile.in.orig Wed Dec 31 16:00:01 1969 ---- git-export/module/Makefile.in Tue Mar 6 00:23:07 2012 -*************** -*** 11,19 **** - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ - "*** Missing spl symbols ensure you have built the spl:\n" \ ---- 11,21 ---- - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ -! chmod +w @SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ -! chmod +w @SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ - "*** Missing spl symbols ensure you have built the spl:\n" \ -*************** -*** 35,55 **** - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=$(DESTDIR) \ - INSTALL_MOD_DIR=addon/zfs $@ - @# Remove extraneous build products when packaging -! if [ -n "$(DESTDIR)" ]; then \ -! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -! $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs - - distdir: - ---- 37,57 ---- - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=@prefix@ \ - INSTALL_MOD_DIR=addon/zfs $@ - @# Remove extraneous build products when packaging -! if [ -n "@prefix@" ]; then \ -! find @prefix@/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -! $(RM) -R @prefix@/lib/modules/@LINUX_VERSION@/addon/zfs - - distdir: - diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/nix-build.patch similarity index 100% rename from pkgs/os-specific/linux/zfs/kerneldir_path.patch rename to pkgs/os-specific/linux/zfs/nix-build.patch diff --git a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch deleted file mode 100644 index e223e34c3a43..000000000000 --- a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** git-export/module/Makefile.in.old Tue Mar 6 01:04:48 2012 ---- git-export/module/Makefile.in Tue Mar 6 01:04:59 2012 -*************** -*** 11,20 **** - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - chmod +w @SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - chmod +w @SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ ---- 11,20 ---- - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - chmod +w @SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - chmod +w @SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ From 8b3b208f3380a1c7c5524d2f170dd2714832588a Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 9 Apr 2013 09:26:31 +0400 Subject: [PATCH 14/32] wicd: rename icons/hicolour to icons/hicolor --- pkgs/tools/networking/wicd/default.nix | 2 +- pkgs/tools/networking/wicd/fix-app-icon.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index ff3df9efb745..0297ab295910 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --systemd=$out/lib/systemd/ \ --logrotate=$out/etc/logrotate.d/ \ --desktop=$out/share/applications/ \ - --icons=$out/share/icons/hicolour/ \ + --icons=$out/share/icons/hicolor/ \ --translations=$out/share/locale/ \ --autostart=$out/etc/xdg/autostart/ \ --varlib=$out/var/lib/ \ diff --git a/pkgs/tools/networking/wicd/fix-app-icon.patch b/pkgs/tools/networking/wicd/fix-app-icon.patch index 154d7da35108..31b47bb45881 100644 --- a/pkgs/tools/networking/wicd/fix-app-icon.patch +++ b/pkgs/tools/networking/wicd/fix-app-icon.patch @@ -10,9 +10,9 @@ diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py - if os.path.exists(os.path.join(wpath.images, "wicd.png")): - self.window.set_icon_from_file(os.path.join(wpath.images, "wicd.png")) + if os.path.exists(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")): -+ self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")) ++ self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png")) + else: -+ print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png") ++ print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png") self.statusID = None self.first_dialog_load = True self.is_visible = True From 562cb3f460b7d564fe94315d412bc495101118b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 12 Apr 2013 01:58:38 +0200 Subject: [PATCH 15/32] Add Plymouth: WIP --- pkgs/os-specific/linux/plymouth/default.nix | 46 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/os-specific/linux/plymouth/default.nix diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix new file mode 100644 index 000000000000..b17441f3650b --- /dev/null +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, pango, pkgconfig }: + +stdenv.mkDerivation rec { + name = "plymouth-${version}"; + version = "0.8.8"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2"; + sha256 = "16vm3llgci7h63jaclfskj1ii61d8psq7ny2mncml6m3sghs9b8v"; + }; + + buildInputs = [ + cairo gtk libdrm libpng pango pkgconfig + ]; + + + configurePhase = '' + export DESTDIR=$out + ./configure -sbindir=$out/sbin \ + --prefix=$out \ + --exec-prefix=$out \ + --libdir=$out/lib \ + --libexecdir=$out/lib \ + --with-system-root-install \ + --enable-tracing \ + --with-rhgb-compat-link \ + --sysconfdir=/etc \ + --localstatedir=/var + ''; + + postInstall = '' + cd $out/$out + mv bin/* $out/bin + mv sbin/* $out/sbin + rmdir bin + rmdir sbin + mv * $out/ + ''; + + meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/wiki/Software/Plymouth; + description = "A graphical boot animation"; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e6acb7905bf..9f790930614c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6165,6 +6165,8 @@ let config = config.pcmciaUtils.config or null; }; + plymouth = callPackage ../os-specific/linux/plymouth { }; + pmount = callPackage ../os-specific/linux/pmount { }; pmutils = callPackage ../os-specific/linux/pm-utils { }; From 34b7ddafa80856905103f9025ecdde9f70fe9f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 15 Apr 2013 20:15:47 +0200 Subject: [PATCH 16/32] Plymouth: works quite well with the X11 renderer and from a VT I haven't figured out how to get it into the initrd correctly yet. --- pkgs/os-specific/linux/plymouth/default.nix | 28 ++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index b17441f3650b..bf3da1954676 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, pango, pkgconfig }: +{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, makeWrapper, pango, pkgconfig }: stdenv.mkDerivation rec { name = "plymouth-${version}"; @@ -9,32 +9,42 @@ stdenv.mkDerivation rec { sha256 = "16vm3llgci7h63jaclfskj1ii61d8psq7ny2mncml6m3sghs9b8v"; }; - buildInputs = [ - cairo gtk libdrm libpng pango pkgconfig - ]; - + buildInputs = [ cairo gtk libdrm libpng makeWrapper pango pkgconfig ]; configurePhase = '' export DESTDIR=$out - ./configure -sbindir=$out/sbin \ + ./configure \ + -bindir=$out/bin \ + -sbindir=$out/sbin \ --prefix=$out \ --exec-prefix=$out \ --libdir=$out/lib \ --libexecdir=$out/lib \ - --with-system-root-install \ --enable-tracing \ - --with-rhgb-compat-link \ --sysconfdir=/etc \ - --localstatedir=/var + --localstatedir=/var \ + --without-system-root-install \ + --enable-gtk ''; +# --enable-systemd-integration +# -datadir=/share \ +# --with-rhgb-compat-link \ + + preInstall = "mkdir -p $out/bin $out/sbin"; postInstall = '' cd $out/$out mv bin/* $out/bin mv sbin/* $out/sbin + rmdir bin rmdir sbin mv * $out/ + sed -e "s#> $output##" \ + -e "s#> /dev/stderr##" \ + -i $out/lib/plymouth/plymouth-populate-initrd + wrapProgram $out/lib/plymouth/plymouth-populate-initrd \ + --set PATH $PATH:$out/bin:$out/sbin ''; meta = with stdenv.lib; { From 07a71f7a1ac18a8171f4bb6af46a1bda9dd110dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 15 Apr 2013 21:17:23 +0200 Subject: [PATCH 17/32] eclipse: add Eclipse IDE for C/C++ Developers 4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If you upgrade from 3.7 you might get errors like these: In the Package Explorer: Could not create the view: org.eclipse.jdt.ui And some other stuff in the Error Log; "Unable to resolve plug-in [...]" The solution is to delete your eclipse workspace (or just the hidden setting files in there, if you have important user data). --- pkgs/applications/editors/eclipse/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index a9ee85d905e0..3be08f4496c8 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -160,6 +160,22 @@ in { }; }; + eclipse_cpp_42 = buildEclipse { + name = "eclipse-cpp-4.2"; + description = "Eclipse IDE for C/C++ Developers"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk-x86_64.tar.gz; + sha256 = "1qq04926pf7v9sf3s0z53zvlbl1j0rmmjmbmhqi49473fnjikh7y"; + } + else + fetchurl { + url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk.tar.gz; + sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk"; + }; + }; + eclipse_sdk_42 = buildEclipse { name = "eclipse-sdk-4.2"; description = "Eclipse Classic"; From 384de84023d8167377c39c6a272c83288fd37bb7 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 19 Apr 2013 14:49:19 +0200 Subject: [PATCH 18/32] linux-3.4: upgrade to 3.4.41 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 55b39a306df8..ed13c282639a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.4.40"; + version = "3.4.41"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "16gsqkzhb362lq51wp1j5k9z9mzwhzfnvfc0h2c6wqnk6rwzms9b"; + sha256 = "18zj4biji3vmy7d1gg6lwfpc77856nsfalfpc00vk3pis6yd2k22"; }; config = configWithPlatform stdenv.platform; From 61b65080d9abd5590423e8fecd6ae21e844c82da Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 19 Apr 2013 14:49:36 +0200 Subject: [PATCH 19/32] linux-3.0: upgrade to 3.0.74 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 87427e141ac3..fc681e03ebd8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -231,7 +231,7 @@ in import ./generic.nix ( rec { - version = "3.0.73"; + version = "3.0.74"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -239,7 +239,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1advdnl37jypiv1vyq5b3qapw2vbncm5d7wfc8far9vgvj8hwsqz"; + sha256 = "016a16sfvdkjgzwndr985mgqny7cl3rbyz8mrnsh9l55czckiq5x"; }; config = configWithPlatform stdenv.platform; From da84bc4a89958691068fa7e77023b194138317d0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 19 Apr 2013 10:46:31 -0400 Subject: [PATCH 20/32] rabbitmq-server: Put files in $HOME by default Before, files were put in /var, requiring the server to be run as a privileged user even when just testing locally. This can be overridden by setting the SYS_PREFIX env variable, or on a more coarse-grained basis in /etc/rabbitmq/rabbitmq-env.conf Signed-off-by: Shea Levy --- pkgs/servers/amqp/rabbitmq-server/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 043c69d5cc0e..59788be15d11 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -2,10 +2,12 @@ , docbook_xml_dtd_45, docbook_xsl, zip, unzip }: stdenv.mkDerivation rec { - name = "rabbitmq-server-3.0.3"; + name = "rabbitmq-server-${version}"; + + version = "3.0.3"; src = fetchurl { - url = "http://www.rabbitmq.com/releases/rabbitmq-server/v3.0.3/${name}.tar.gz"; + url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz"; sha256 = "07mp57xvszdrlgw8rgn9r9dpa6vdqdjk7f1dyh6a9sdg8s9fby38"; }; @@ -20,6 +22,14 @@ stdenv.mkDerivation rec { installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man"; + preInstall = + '' + sed -i \ + -e 's|SYS_PREFIX=|SYS_PREFIX=''${SYS_PREFIX-''${HOME}/.rabbitmq/${version}}|' \ + -e 's|CONF_ENV_FILE=''${SYS_PREFIX}\(.*\)|CONF_ENV_FILE=\1|' \ + scripts/rabbitmq-defaults + ''; + postInstall = '' echo 'PATH=${erlang}/bin:${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env From ee45b50eb25ae99d657619be465a2e60e1b026e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Apr 2013 11:31:09 +0200 Subject: [PATCH 21/32] haskell-data-inttrie: update to version 0.1.0 --- pkgs/development/libraries/haskell/data-inttrie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix index a9eaf5471865..b23fdeca69d8 100644 --- a/pkgs/development/libraries/haskell/data-inttrie/default.nix +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-inttrie"; - version = "0.0.8"; - sha256 = "0lzp89lq4gb84rcxqi77yarggz94a206da456208rrr7rhlqxg2x"; + version = "0.1.0"; + sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814"; meta = { homepage = "http://github.com/luqui/data-inttrie"; description = "A lazy, infinite trie of integers"; From be6457fd2c9409a695f88addb8be39494b0bc7fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Apr 2013 11:31:09 +0200 Subject: [PATCH 22/32] haskell-socks: update to version 0.5.1 --- pkgs/development/libraries/haskell/socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index 485b912c2a88..311c8b224134 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socks"; - version = "0.5.0"; - sha256 = "1lk6yvx5a65nz7z89i0sgqzcqw2v6j645nq15kgbpxhcinfdvqs7"; + version = "0.5.1"; + sha256 = "08zwbkglkahjadqn2m7l0k5yp4lcd9h6kgb8k8mjlwxayx82a0ay"; buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; From 88f1e643e348e5073290732b558c7a345fffd0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 19 Apr 2013 22:29:30 +0200 Subject: [PATCH 23/32] git: fix gitweb.cgi runtime dependency on gzip gitweb.cgi uses gzip for creating "snapshots". Without this patch it doesn't work. --- .../version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/git/default.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b6d7c1eb5d3b..81362ec4d04d 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 hardlink; + cpio tcl tk makeWrapper subversionClient hardlink gzip; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk sendEmailSupport = false; # requires plenty of perl libraries 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 b006354a0149..30611f40f07b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep +{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, hardlink , svnSupport, subversionClient, perlLibs, smtpPerlLibs @@ -66,6 +66,11 @@ stdenv.mkDerivation { sed -i -e 's| perl -ne| ${perl}/bin/perl -ne|g' \ -e 's| perl -e| ${perl}/bin/perl -e|g' \ $out/libexec/git-core/{git-am,git-submodule} + + # gzip (and optionally bzip2, xz, zip) are a runtime dependencies for + # gitweb.cgi, need to patch so that it's found + sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ + $out/share/gitweb/gitweb.cgi '' + (if svnSupport then From 1b349b06d8f7722a0e0f1784c473db9678f7bb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 20 Apr 2013 10:25:11 +0200 Subject: [PATCH 24/32] itstool: update --- pkgs/development/tools/misc/itstool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index 2b85260e82ae..f97404f7a014 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, python, libxml2Python }: stdenv.mkDerivation rec { - name = "itstool-1.1.1"; + name = "itstool-1.2.0"; src = fetchurl { url = "http://files.itstool.org/itstool/${name}.tar.bz2"; - sha256 = "1jchgcgxvqwkhr61q0j08adl1k8hw86dzbl207gzmns9fa7vmzqg"; + sha256 = "1akq75aflihm3y7js8biy7b5mw2g11vl8yq90gydnwlwp0zxdzj6"; }; buildInputs = [ python ]; - + patchPhase = '' sed -e '/import libxml2/i import sys\ From 7a25aa94cdc36012edaba59952bff3703baa5fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 20 Apr 2013 12:44:05 +0200 Subject: [PATCH 25/32] gphoto*: update for changed libgphoto version --- pkgs/applications/misc/gphoto2/default.nix | 10 +++++----- pkgs/applications/misc/gphoto2/gphotofs.nix | 10 +++++----- .../misc/gphoto2/src-info-for-gphotofs.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 7c732ab677ae..827488260260 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,16 +3,16 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.4.14"; - + name = "gphoto2-2.5.1"; + src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47"; + sha256 = "12zn677fvw1bmx70pg0vck2vrvkiy7hx1wzlwf6k23mhdnm4ipad"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; - + meta = { description = "a ready to use set of digital camera software applications"; longDescription = '' diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index dc760b8e80b9..32c95ec147bd 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -1,11 +1,11 @@ -a : -let +a : +let fetchurl = a.fetchurl; s = import ./src-info-for-gphotofs.nix; - version = a.lib.attrByPath ["version"] s.version a; + version = a.lib.attrByPath ["version"] s.version a; buildInputs = with a; [ - libgphoto2 fuse pkgconfig glib + libgphoto2 fuse pkgconfig glib libtool ]; in rec { @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - + name = "gphoto2fs-" + version; meta = { description = "Fuse FS to mount a digital camera"; diff --git a/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix b/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix index 2e350b9232f5..1a4cceb6279b 100644 --- a/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix @@ -1,6 +1,6 @@ rec { - advertisedUrl="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2"; - version = "0.4.0"; - url="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2"; - hash = "07zxnawkyzy6np9zas6byp9ksjkbi16d11zqrznqarfkf3fkg3yq"; + advertisedUrl="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2"; + version = "0.5.0"; + url="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2"; + hash = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ae4a08c8149..60096ca007b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7185,7 +7185,7 @@ let gphoto2 = callPackage ../applications/misc/gphoto2 { }; gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix { - inherit libgphoto2 fuse pkgconfig glib; + inherit libgphoto2 fuse pkgconfig glib libtool; }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; From 12b94d549fdcdcbd6dbe833363e1116f0ef3c3f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Apr 2013 18:19:22 +0200 Subject: [PATCH 26/32] haskell-fclabels: update to version 1.1.6 --- pkgs/development/libraries/haskell/fclabels/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 7c64e9a2511b..5f960cbb1f00 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.5"; - sha256 = "0g9h1mayzf8v9dg84b54cqjbz9m9hdmj9a2zh0lg2kbc1v7iwlx1"; + version = "1.1.6"; + sha256 = "0f5zqbqsm89lp1f7wrmcs8pn7hzbbl8id7xa6ny114bgxrfbrwpk"; buildDepends = [ mtl transformers ]; meta = { + homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From b6e3a8dd088877c3f8832502b551b0275f298aa6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Apr 2013 18:19:22 +0200 Subject: [PATCH 27/32] haskell-zeromq3-haskell: update to version 0.3.1 --- .../libraries/haskell/zeromq3-haskell/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 9d92f264930e..5d8a155ea721 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -1,13 +1,15 @@ -{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 -, zeromq +{ cabal, ansiTerminal, checkers, MonadCatchIOTransformers +, QuickCheck, transformers, zeromq }: cabal.mkDerivation (self: { pname = "zeromq3-haskell"; - version = "0.2"; - sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky"; + version = "0.3.1"; + sha256 = "0wr157wl2qpnbfsqy4nlsnd6nbkl063387f7ab4qa07yhj5av80f"; + buildDepends = [ MonadCatchIOTransformers transformers ]; testDepends = [ - QuickCheck testFramework testFrameworkQuickcheck2 + ansiTerminal checkers MonadCatchIOTransformers QuickCheck + transformers ]; extraLibraries = [ zeromq ]; doCheck = false; From 0345b1df709d87bd484068dd3e1fae997aedd44f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Apr 2013 19:19:56 +0200 Subject: [PATCH 28/32] haskell-shakespeare: patch to fix build with GHC 7.0.4 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 3c300cdea03a..302a6720de41 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,4 +1,4 @@ -{ cabal, hspec, parsec, text }: +{ cabal, fetchurl, hspec, parsec, text }: cabal.mkDerivation (self: { pname = "shakespeare"; @@ -6,6 +6,11 @@ cabal.mkDerivation (self: { sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb"; buildDepends = [ parsec text ]; testDepends = [ hspec parsec text ]; + patchFlags = "-p2"; + patches = [ (fetchurl { url = "https://github.com/yesodweb/shakespeare/pull/102.patch"; + sha256 = "02fp87sw7k8zyn8kgmjg8974gi7pp5fyvb4f84i983qycmlmh8xq"; + }) + ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; From 916aa904916e1b021feec871f147878f45525cf5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Apr 2013 20:04:56 +0200 Subject: [PATCH 29/32] haskell-pretty-show: add old version 1.2, which still builds fine with GHC 7.0.4 --- .../libraries/haskell/pretty-show/1.2.nix | 16 ++++++++++++++++ .../haskell/pretty-show/{default.nix => 1.5.nix} | 0 pkgs/top-level/haskell-defaults.nix | 3 +++ pkgs/top-level/haskell-packages.nix | 4 +++- 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix rename pkgs/development/libraries/haskell/pretty-show/{default.nix => 1.5.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix new file mode 100644 index 000000000000..545816a57a02 --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/1.2.nix @@ -0,0 +1,16 @@ +{ cabal, haskellLexer }: + +cabal.mkDerivation (self: { + pname = "pretty-show"; + version = "1.2"; + sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ haskellLexer ]; + meta = { + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived Show instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/1.5.nix similarity index 100% rename from pkgs/development/libraries/haskell/pretty-show/default.nix rename to pkgs/development/libraries/haskell/pretty-show/1.5.nix diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index aa71d75f12e3..a4793077517d 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -53,6 +53,7 @@ cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; + prettyShow = self.prettyShow_1_2; }; ghc703Prefs = @@ -62,6 +63,7 @@ cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; + prettyShow = self.prettyShow_1_2; }; ghc702Prefs = ghc701Prefs; @@ -73,6 +75,7 @@ cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; + prettyShow = self.prettyShow_1_2; }; ghc6123Prefs = ghc6122Prefs; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 82be9a4b7892..fcc6557f4303 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1471,7 +1471,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; + prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; + prettyShow_1_5 = callPackage ../development/libraries/haskell/pretty-show/1.5.nix {}; + prettyShow = self.prettyShow_1_5; punycode = callPackage ../development/libraries/haskell/punycode {}; From 7dd399abc10281a3980ab9bd06ec6a926eb8cb1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Apr 2013 20:21:38 +0200 Subject: [PATCH 30/32] haskell-wai-handler-launch: add version 1.3.1.4 --- .../haskell/wai-handler-launch/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wai-handler-launch/default.nix diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix new file mode 100644 index 000000000000..a3d02329dfdf --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, blazeBuilderConduit, conduit, httpTypes +, transformers, wai, warp, zlibConduit +}: + +cabal.mkDerivation (self: { + pname = "wai-handler-launch"; + version = "1.3.1.4"; + sha256 = "0ii74p2400a4w0pcswk8j57wbasi17alifs4xgwv79b235wnn317"; + buildDepends = [ + blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai + warp zlibConduit + ]; + meta = { + description = "Launch a web app in the default browser"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fcc6557f4303..671a72f82355 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1897,6 +1897,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); waiExtra = callPackage ../development/libraries/haskell/wai-extra {}; + waiHandlerLaunch = callPackage ../development/libraries/haskell/wai-handler-launch {}; + waiLogger = callPackage ../development/libraries/haskell/wai-logger {}; waiTest = callPackage ../development/libraries/haskell/wai-test {}; From 65b95b159e7d08d9d52b0ea48e1faaead2dd4213 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Apr 2013 20:36:57 +0200 Subject: [PATCH 31/32] haskell-checkers: add version 0.3.1 --- .../libraries/haskell/checkers/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/checkers/default.nix diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix new file mode 100644 index 000000000000..4742f5104daa --- /dev/null +++ b/pkgs/development/libraries/haskell/checkers/default.nix @@ -0,0 +1,13 @@ +{ cabal, QuickCheck, random }: + +cabal.mkDerivation (self: { + pname = "checkers"; + version = "0.3.1"; + sha256 = "0lhy8bk8kkj540kjbc76j4x4xsprqwlmxdrss4r0j1bxgmfwha6p"; + buildDepends = [ QuickCheck random ]; + meta = { + description = "Check properties on standard classes and data structures"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 671a72f82355..7c6c237b194b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -606,6 +606,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; + checkers = callPackage ../development/libraries/haskell/checkers {}; + citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; From 3bf0d2b9608b6c2da2996b601783f30afd8e6765 Mon Sep 17 00:00:00 2001 From: Patrick John Wheeler Date: Wed, 17 Apr 2013 00:06:10 +0200 Subject: [PATCH 32/32] ghc-wrapper: install the GHC documentation into the user's profile The freaky implementation was done that way in order to avoid unnecessary re-builds of all Haskell packages by changing the wrapper script used internally in those builds. See for further details. --- pkgs/development/compilers/ghc/wrapper.nix | 11 +++++++++-- pkgs/top-level/haskell-packages.nix | 10 ++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index bc28fdc91319..55fd16be5edb 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, makeWrapper, coreutils }: +{ stdenv, ghc, makeWrapper, coreutils, forUserEnv ? false }: let ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1"; @@ -54,4 +54,11 @@ stdenv.mkDerivation ({ inherit ghc; inherit (ghc) meta; ghcVersion = ghc.version; -} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; })) +} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; }) + // (stdenv.lib.optionalAttrs forUserEnv { + postFixup= '' + ln -s $ghc/lib $out/lib; + mkdir -p $out/share/doc + ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghc.version} + ''; + })) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c6c237b194b..3bf5d3d7f749 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -89,6 +89,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc = ghc; # refers to ghcPlain }; + # The normal GHC wrapper doesn't create links to the documentation in + # ~/.nix-profile. Having this second wrapper allows us to remedy the + # situation without re-building all Haskell packages. At the next + # stdenv-updates merge, this second wrapper will go away. + + ghcUserEnvWrapper = pkgs.appendToName "new" (callPackage ../development/compilers/ghc/wrapper.nix { + ghc = ghc; # refers to ghcPlain + forUserEnv = true; + }); + # An experimental wrapper around ghcPlain that does not automatically # pick up packages from the profile, but instead has a fixed set of packages # in its global database. The set of packages can be specified as an