summary refs log tree commit diff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2022-08-27 15:32:02 -0400
committerGitHub <noreply@github.com>2022-08-27 15:32:02 -0400
commit324c8aaf25b2f2027af7798e5582ce3040a793b6 (patch)
treecc455db1aff2bc0d6962c68664cb9bca3450a7d4
parenta5e05d62460ff0b7627559a8b55ab421041ebf0a (diff)
parenta107d964efb4999f60c573d5d5145d281d5aa4e2 (diff)
downloadnixpkgs-324c8aaf25b2f2027af7798e5582ce3040a793b6.tar
nixpkgs-324c8aaf25b2f2027af7798e5582ce3040a793b6.tar.gz
nixpkgs-324c8aaf25b2f2027af7798e5582ce3040a793b6.tar.bz2
nixpkgs-324c8aaf25b2f2027af7798e5582ce3040a793b6.tar.lz
nixpkgs-324c8aaf25b2f2027af7798e5582ce3040a793b6.tar.xz
nixpkgs-324c8aaf25b2f2027af7798e5582ce3040a793b6.tar.zst
nixpkgs-324c8aaf25b2f2027af7798e5582ce3040a793b6.zip
Merge pull request #188497 from qowoz/stylua
stylua: 0.14.2 -> 0.14.3
-rw-r--r--pkgs/development/tools/stylua/default.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix
index 7e234eef66c..383a6534671 100644
--- a/pkgs/development/tools/stylua/default.nix
+++ b/pkgs/development/tools/stylua/default.nix
@@ -3,20 +3,29 @@
 , rustPlatform
 , lua52Support ? true
 , luauSupport ? false
+, fetchpatch
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "stylua";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "johnnymorganz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-FqtpMRR647YiIIduIf37rKewytXgRl01OCmBUXd/44k=";
+    sha256 = "sha256-l4q6Qlgdxgm4K5+NkWMZI3Hhtx6m/0DG9PE4gvo/ylo=";
   };
 
-  cargoSha256 = "sha256-Z5W1eJUHFFuHRSemXspW3gUhiAieyUg/6lIVvqAL/Oo=";
+  cargoSha256 = "sha256-zlk9KdiSKWknyuJTTqpzCeSJUXJGDK2A0g1ss8AHoYs=";
+
+  cargoPatches = [
+    # fixes broken 0.14.3 lockfile
+    (fetchpatch {
+      url = "https://github.com/JohnnyMorganz/StyLua/commit/834f632f67af6425e7773eaade8d23a880946843.patch";
+      sha256 = "sha256-oM2gaILwiNMqTGFRQBw6/fxbjljNWxeIb0lcXcAJR3w=";
+    })
+  ];
 
   buildFeatures = lib.optional lua52Support "lua52"
     ++ lib.optional luauSupport "luau";