Merge master into staging-next

2020-01-28 10:46:13 +01:00
parent 778f317820 e328078fe0
commit dce0ca29d9
745 changed files with 15146 additions and 15353 deletions
@@ -174,6 +174,8 @@ let

  svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };

+  thicket = callPackage ./thicket { };
+
  tig = callPackage ./tig { };

  topGit = callPackage ./topgit { };
@@ -2,7 +2,7 @@

 buildGoPackage rec {
  pname = "hub";
-  version = "2.13.0";
+  version = "2.14.1";

  goPackagePath = "github.com/github/hub";

@@ -13,7 +13,7 @@ buildGoPackage rec {
    owner = "github";
    repo = pname;
    rev = "v${version}";
-    sha256 = "18b0r16fk5wahvysqvg6vzjr7smyc2sdxp9sf55viby3kkwjfbkh";
+    sha256 = "0b179sp8z2blzh4a0c2pjbbiya68x2i4cnmcci58r8k0mwrx6mw1";
  };

  nativeBuildInputs = [ groff utillinux ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
  '';

  src = fetchurl {
-    url = "http://subgit.com/download/${name}.zip";
+    url = "https://subgit.com/download/${name}.zip";
    sha256 = "0dwd2kymmprci3b61ayr6axzlkc8zgbc40jqxvvyzschfxw9y0v5";
  };
 }
@@ -0,0 +1,26 @@
+{ lib
+, fetchFromGitHub
+, crystal
+}:
+
+crystal.buildCrystalPackage rec {
+  pname = "thicket";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "taylorthurlow";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw";
+  };
+
+  shardsFile = ./shards.nix;
+  crystalBinaries.thicket.src = "src/thicket.cr";
+
+  meta = with lib; {
+    description = "A better one-line git log";
+    homepage = "https://github.com/taylorthurlow/thicket";
+    license = licenses.mit;
+    maintainers = with maintainers; [ filalex77 ];
+  };
+}
@@ -0,0 +1,8 @@
+{
+  ameba = {
+    owner = "veelenga";
+    repo = "ameba";
+    rev = "v0.10.0";
+    sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912";
+  };
+}