NixOS · Dec 26, 2018 · Dec 26, 2018 · Dec 26, 2018 · Dec 26, 2018 · Dec 26, 2018
diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml
@@ -17,7 +17,7 @@
    </listitem>
    <listitem>
     <para>
-     <link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
+     <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
      Nix has been updated to 1.8.</link>
     </para>
    </listitem>

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "psi-plus-${version}";
-  version = "1.4.404";
+  version = "1.4.504";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = "${version}";
-    sha256 = "05dcr1i7ic6nff70w4zfpdcmwf19kkhgxm7mcznmlr484d5i1v2m";
+    sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
   };
 
   resources = fetchFromGitHub {

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -152,7 +152,7 @@ checkout_ref(){
     if "$deepClone"; then
         # The caller explicitly asked for a deep clone.  Deep clones
         # allow "git describe" and similar tools to work.  See
-        # http://thread.gmane.org/gmane.linux.distributions.nixos/3569
+        # https://marc.info/?l=nix-dev&m=139641582514772
         # for a discussion.
         return 1
     fi

diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   preConfigure =
     stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
 
-  # http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
+  # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
   doCheck = false;
 
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''

diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix
@@ -4,6 +4,7 @@
 , isPy3k
 , oauth2client
 , gdata
+, google_api_python_client
 , simplejson
 , httplib2
 , keyring
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d";
   };
 
-  propagatedBuildInputs = [ oauth2client gdata simplejson httplib2 keyring six rsa ];
+  propagatedBuildInputs = [ oauth2client gdata google_api_python_client simplejson httplib2 keyring six rsa ];
 
   preConfigure = ''
     sed -i '/distribute/d' setup.py

diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage rec {
     sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339";
   };
 
+  doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
+
   meta = with lib; {
     description = "JSON RPC client library - Pelix compatible fork";
     homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/;

diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , six
 , beautifulsoup4
+, lxml
 }:
 
 buildPythonPackage rec {
@@ -14,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
   };
 
-  propagatedBuildInputs = [ six beautifulsoup4 ];
+  propagatedBuildInputs = [ six beautifulsoup4 lxml ];
 
   meta = with stdenv.lib; {
     homepage = "http://sites.google.com/site/ofxparse";

diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix
@@ -1,8 +1,9 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
 , pytestrunner
+, functools32
 , six
 , w3lib
 , lxml
@@ -19,13 +20,13 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ pytest pytestrunner ];
-  propagatedBuildInputs = [ six w3lib lxml cssselect ];
+  propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ];
 
   checkPhase = ''
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/scrapy/parsel";
     description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors";
     license = licenses.bsd3;

diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , buildPythonPackage
+, isPy27
 , fetchPypi
 , six
 , pillow
@@ -18,6 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six pillow pymaging_png ];
   checkInputs = [ mock ];
+  doCheck = isPy27; # https://github.com/lincolnloop/python-qrcode/issues/163
 
   meta = with stdenv.lib; {
     description = "Quick Response code generation for Python";

diff --git a/pkgs/development/python-modules/secretstorage/2.nix b/pkgs/development/python-modules/secretstorage/2.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }:
+
+buildPythonPackage rec {
+  pname = "secretstorage";
+  version = "2.3.1";
+
+  src = fetchPypi {
+    pname = "SecretStorage";
+    inherit version;
+    sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis";
+  };
+
+  propagatedBuildInputs = [ cryptography dbus-python ];
+
+  # Needs a D-Bus Sesison
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/mitya57/secretstorage;
+    description = "Python bindings to FreeDesktop.org Secret Service API";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = https://github.com/mitya57/secretstorage;
     description = "Python bindings to FreeDesktop.org Secret Service API";
-    license = licenses.bsdOriginal;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ teto ];
   };
 }
diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix
@@ -5,6 +5,7 @@
 , tox
 , six
 , dateutil
+, kitchen
 , pytz
 , pkgs
 }:
@@ -28,7 +29,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   buildInputs = [ nose pkgs.taskwarrior tox ];
-  propagatedBuildInputs = [ six dateutil pytz ];
+  propagatedBuildInputs = [ six dateutil kitchen pytz ];
 
   meta = with stdenv.lib; {
     homepage =  https://github.com/ralphbean/taskw;

diff --git a/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch b/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch
@@ -4,45 +4,11 @@ Date:   Sun Nov 16 15:19:38 2014 +0100
 
     Use a template for taskwarrior install path.
 
-diff --git a/taskw/warrior.py b/taskw/warrior.py
-index 21dde88..e0509f2 100644
 --- a/taskw/warrior.py
 +++ b/taskw/warrior.py
-@@ -451,17 +451,17 @@ class TaskWarriorShellout(TaskWarriorBase):
-     def _execute(self, *args):
-         """ Execute a given taskwarrior command with arguments
-
-         Returns a 2-tuple of stdout and stderr (respectively).
-
-         """
-         command = (
-             [
+@@ -449 +449 @@ class TaskWarriorShellout(TaskWarriorBase):
 -                'task',
 +                '@@taskwarrior@@/bin/task',
-                 'rc:%s' % self.config_filename,
-             ]
-             + self.get_configuration_override_args()
-             + [six.text_type(arg) for arg in args]
-         )
-
-         # subprocess is expecting bytestrings only, so nuke unicode if present
-         for i in range(len(command)):
-@@ -525,17 +525,17 @@ class TaskWarriorShellout(TaskWarriorBase):
-         except OSError:
-             # OSError is raised if subprocess.Popen fails to find
-             # the executable.
-             return False
-
-     @classmethod
-     def get_version(cls):
-         taskwarrior_version = subprocess.Popen(
--            ['task', '--version'],
-+            ['@@taskwarrior@@/bin/task', '--version'],
-             stdout=subprocess.PIPE
-         ).communicate()[0]
-         return LooseVersion(taskwarrior_version.decode())
-
-     def sync(self, init=False):
-         if self.get_version() < LooseVersion('2.3'):
-             raise UnsupportedVersionException(
-                 "'sync' requires version 2.3 of taskwarrior or later."
+@@ -553 +553 @@ class TaskWarriorShellout(TaskWarriorBase):
+-                ['task', '--version'],
++                ['@@taskwarrior@@/bin/task', '--version'],
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
   # the build daemon when building in a chroot.  See
-  # <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> for
+  # <https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01056.html> for
   # details.
 
   # The test-suite needs to have a non-empty stdin:

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -19,7 +19,7 @@ with stdenv.lib;
 # make sure libglx.so of ati is used. xorg.xorgserver does provide it as well
 # which is a problem because it doesn't contain the xorgserver patch supporting
 # the XORG_DRI_DRIVER_PATH env var.
-# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a
+# See https://marc.info/?l=nix-dev&m=139641585515351 for a
 # workaround (TODO)
 
 # The gentoo ebuild contains much more "magic" and is usually a great resource to

diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       perlarchname=$(perl -e 'use Config; print $Config{archname};')
       installFlags="INSTALLSITEARCH=$out/lib/perl5/site_perl/$perlversion/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3"
 
-      # http://comments.gmane.org/gmane.network.net-snmp.user/32434
+      # http://article.gmane.org/gmane.network.net-snmp.user/32434
       substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v'
     '';
 

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
     ++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
 
   # The tests are known broken on Cygwin
-  # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
-  # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
+  # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
+  # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
   # and {Open,Free}BSD.
   # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -4258,7 +4258,9 @@ in {
 
   blessings = callPackage ../development/python-modules/blessings { };
 
-  secretstorage = callPackage ../development/python-modules/secretstorage { };
+  secretstorage = if isPy3k
+    then callPackage ../development/python-modules/secretstorage { }
+    else callPackage ../development/python-modules/secretstorage/2.nix { };
 
   semantic = callPackage ../development/python-modules/semantic { };