Merge branch 'master' into staging

2018-06-30 01:41:59 +02:00
parent 3892a3e5a9 2059bf9e39
commit f7781f5293
998 changed files with 16501 additions and 10367 deletions
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
  version = "4.1.2.0";

  src = fetchurl {
-    url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
+    url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
    sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn";
  };