Merge master into staging-next

3 files changed, 20 insertions, 20 deletions

diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix
index 44b4af440800d..3d420158caf01 100644
--- a/pkgs/development/web/lucky-cli/default.nix
+++ b/pkgs/development/web/lucky-cli/default.nix
@@ -2,13 +2,13 @@
 
 crystal.buildCrystalPackage rec {
   pname = "lucky-cli";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "luckyframework";
     repo = "lucky_cli";
     rev = "v${version}";
-    hash = "sha256-Ky4DmClSyAVBAetpZM5tFnQZ74fchCOgcxBftd+gwlE=";
+    hash = "sha256-mDUx9cQoYpU9kSAls36kzNVYZ8a4aqHEMIWfzS41NBk=";
   };
 
   # the integration tests will try to clone a remote repos
@@ -39,6 +39,6 @@ crystal.buildCrystalPackage rec {
     maintainers = with maintainers; [ peterhoeg ];
     mainProgram = "lucky";
     platforms = platforms.unix;
-    broken = lib.versionOlder crystal.version "0.35.1";
+    broken = lib.versionOlder crystal.version "1.6.0";
   };
 }
diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock
index 9bf2212760ad1..b9956fd780df3 100644
--- a/pkgs/development/web/lucky-cli/shard.lock
+++ b/pkgs/development/web/lucky-cli/shard.lock
@@ -2,17 +2,17 @@ version: 2.0
 shards:
   ameba:
     git: https://github.com/crystal-ameba/ameba.git
-    version: 1.1.0
+    version: 1.5.0
 
   lucky_task:
     git: https://github.com/luckyframework/lucky_task.git
-    version: 0.1.1
+    version: 0.3.0
+
+  lucky_template:
+    git: https://github.com/luckyframework/lucky_template.git
+    version: 0.2.0
 
   nox:
-    git: https://github.com/matthewmcgarvey/nox.git
+    git: https://github.com/crystal-loot/nox.git
     version: 0.2.2
 
-  teeplate:
-    git: https://github.com/luckyframework/teeplate.git
-    version: 0.8.5
-
diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix
index fef8c1602ba14..a06b87c5029ae 100644
--- a/pkgs/development/web/lucky-cli/shards.nix
+++ b/pkgs/development/web/lucky-cli/shards.nix
@@ -1,22 +1,22 @@
 {
   ameba = {
     url = "https://github.com/crystal-ameba/ameba.git";
-    rev = "v1.1.0";
-    sha256 = "0famv413myrshgv6y24mr84ny53rcsr777x323jlaf2isnhdd0b8";
+    rev = "v1.5.0";
+    sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d";
   };
   lucky_task = {
     url = "https://github.com/luckyframework/lucky_task.git";
-    rev = "v0.1.1";
-    sha256 = "0w0rnf22pvj3lp5z8c4sshzwhqgwpbjpm7nry9mf0iz3fa0v48f7";
+    rev = "v0.3.0";
+    sha256 = "0lp2wv01wdcfr3h43n3dqgaymvypy0i6kbffb4mg4l30lijgpfb6";
+  };
+  lucky_template = {
+    url = "https://github.com/luckyframework/lucky_template.git";
+    rev = "v0.2.0";
+    sha256 = "1xix82d0xanq4xkcv83hm56nj5f2rsbrqhk70j5zr37d3kydfypl";
   };
   nox = {
-    url = "https://github.com/matthewmcgarvey/nox.git";
+    url = "https://github.com/crystal-loot/nox.git";
     rev = "v0.2.2";
     sha256 = "1dfq0aknrxwp9wc0glri4w5j8pfbc6b1xrsxkahci109p6dhcna5";
   };
-  teeplate = {
-    url = "https://github.com/luckyframework/teeplate.git";
-    rev = "v0.8.5";
-    sha256 = "1kr05qrp674rph1324wry57gzvgvcvlz0w27brlvdgd3gi4s8sdj";
-  };
 }