From 08ff0464f9faf549d3943ff2f78059ee4776c165 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Sat, 11 Apr 2026 16:14:03 +0100 Subject: [PATCH] nix: move devshell to flake and run prettier Signed-off-by: oppiliappan --- .envrc | 2 +- flake.nix | 19 ++++++++++++------- shell.nix | 7 ------- src/js/spark-md5.js | 14 +++++++------- 4 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 shell.nix diff --git a/.envrc b/.envrc index 1d953f4..3550a30 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use nix +use flake diff --git a/flake.nix b/flake.nix index 9287134..439530e 100644 --- a/flake.nix +++ b/flake.nix @@ -17,25 +17,18 @@ pname = "tinysub"; version = "0.1.0"; src = ./.; - nativeBuildInputs = with pkgs; [ monolith ]; - buildPhase = '' runHook preBuild - monolith src/index.html -o index.html - runHook postBuild ''; - installPhase = '' runHook preInstall - mkdir -p $out cp index.html $out/ - runHook postInstall ''; }; @@ -43,6 +36,18 @@ formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra); + devShells = forAllSystems (system: let + pkgs = nixpkgsFor."${system}"; + in { + default = pkgs.mkShell { + packages = with pkgs; [ + nodejs + pnpm + prettier + ]; + }; + }); + overlays.default = final: prev: { tinysub = self.packages.${final.system}.default; }; diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 9e4529d..0000000 --- a/shell.nix +++ /dev/null @@ -1,7 +0,0 @@ -{pkgs ? import {}}: -pkgs.mkShell { - buildInputs = with pkgs; [ - nodejs - pnpm - ]; -} diff --git a/src/js/spark-md5.js b/src/js/spark-md5.js index ce42655..dcff29d 100644 --- a/src/js/spark-md5.js +++ b/src/js/spark-md5.js @@ -216,9 +216,9 @@ length = s.length; tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; for (i = 0; i < length; i += 1) { - tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3); + tail[i >> 2] |= s.charCodeAt(i) << (i % 4 << 3); } - tail[i >> 2] |= 128 << ((i % 4) << 3); + tail[i >> 2] |= 128 << (i % 4 << 3); if (i > 55) { md5cycle(state, tail); for (i = 0; i < 16; i += 1) { @@ -250,9 +250,9 @@ length = a.length; tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; for (i = 0; i < length; i += 1) { - tail[i >> 2] |= a[i] << ((i % 4) << 3); + tail[i >> 2] |= a[i] << (i % 4 << 3); } - tail[i >> 2] |= 128 << ((i % 4) << 3); + tail[i >> 2] |= 128 << (i % 4 << 3); if (i > 55) { md5cycle(state, tail); for (i = 0; i < 16; i += 1) { @@ -381,7 +381,7 @@ tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], ret; for (i = 0; i < length; i += 1) { - tail[i >> 2] |= buff.charCodeAt(i) << ((i % 4) << 3); + tail[i >> 2] |= buff.charCodeAt(i) << (i % 4 << 3); } this._finish(tail, length); ret = hex(this._hash); @@ -416,7 +416,7 @@ tmp, lo, hi; - tail[i >> 2] |= 128 << ((i % 4) << 3); + tail[i >> 2] |= 128 << (i % 4 << 3); if (i > 55) { md5cycle(this._hash, tail); for (i = 0; i < 16; i += 1) { @@ -463,7 +463,7 @@ i, ret; for (i = 0; i < length; i += 1) { - tail[i >> 2] |= buff[i] << ((i % 4) << 3); + tail[i >> 2] |= buff[i] << (i % 4 << 3); } this._finish(tail, length); ret = hex(this._hash); -- 2.51.2