Merge staging-next into staging

2020-08-15 09:12:42 +02:00
parent e3a495f281 1216dff163
commit cfe6081cee
129 changed files with 3856 additions and 2769 deletions
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "joker";
-  version = "0.15.5";
+  version = "0.15.6";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "candid82";
    repo = "joker";
-    sha256 = "0v4mamd5zkw7r9gfl4rzy4mr1d7ni9klryd93izqssgps954bikz";
+    sha256 = "1yi9q8ibia6gz6s30i3bjrbmlhj6knrb3d73113dxrs8abi1mkbh";
  };

  vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl";
@@ -63,19 +63,6 @@ in {
    inherit passthruFun;
  };

-  python35 = callPackage ./cpython {
-    self = python35;
-    sourceVersion = {
-      major = "3";
-      minor = "5";
-      patch = "9";
-      suffix = "";
-    };
-    sha256 = "0jdh9pvx6m6lfz2liwvvhn7vks7qrysqgwn517fkpxb77b33fjn2";
-    inherit (darwin) configd;
-    inherit passthruFun;
-  };
-
  python36 = callPackage ./cpython {
    self = python36;
    sourceVersion = {