diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix
index c9b2deaeea42..b6aba202b7d8 100644
--- a/pkgs/development/beam-modules/elvis-erlang/default.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/default.nix
@@ -1,36 +1,35 @@
 {
-  fetchFromGitHub,
-  fetchgit,
-  fetchHex,
-  rebar3Relx,
   buildRebar3,
-  writeScript,
+  fetchFromGitHub,
+  fetchHex,
+  fetchgit,
   lib,
+  rebar3Relx,
+  writeScript,
 }:
 
-let
-  owner = "inaka";
-  repo = "elvis";
-in
 rebar3Relx rec {
   releaseType = "escript";
-  # The package name "elvis" is already taken
   pname = "elvis-erlang";
-  version = "3.2.6";
+  version = "4.0.0";
+
   src = fetchFromGitHub {
-    inherit owner repo;
-    sha256 = "13QM6UbH+1PxzhY/ufi5PEP2pKqSl5+g6tMvKmOUMb0=";
-    rev = version;
+    owner = "inaka";
+    repo = "elvis";
+    hash = "sha256-HJH/p8EHE4zor0LOczpOlDy6sPSI+WVWIS22hGhjQ0s=";
+    tag = version;
   };
+
   beamDeps = builtins.attrValues (
     import ./rebar-deps.nix {
       inherit fetchHex fetchgit fetchFromGitHub;
       builder = buildRebar3;
     }
   );
+
   passthru.updateScript = writeScript "update.sh" ''
     #!/usr/bin/env nix-shell
-    #!nix-shell -i bash -p bash common-updater-scripts git nix-prefetch-git gnutar gzip "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}"
+    #!nix-shell -i bash -p bash common-updater-scripts git nix-prefetch-git gnutar gzip "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" nixfmt-rfc-style
 
     set -euo pipefail
 
@@ -42,15 +41,17 @@ rebar3Relx rec {
       tmpdir=$(mktemp -d)
       cp -R $(nix-build $nixpkgs --no-out-link -A elvis-erlang.src)/* "$tmpdir"
       (cd "$tmpdir" && HOME=. rebar3 nix lock -o "$nix_path/rebar-deps.nix")
+      nixfmt "$nix_path/rebar-deps.nix"
     else
-      echo "${repo} is already up-to-date"
+      echo "elvis-erlang is already up-to-date"
     fi
   '';
-  meta = with lib; {
+
+  meta = {
     homepage = "https://github.com/inaka/elvis";
     description = "Erlang Style Reviewer";
-    platforms = platforms.unix;
-    license = licenses.asl20;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dlesl ];
     mainProgram = "elvis";
   };
diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
index 7b54b5231b90..0f53e0ea4ed7 100644
--- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
@@ -84,11 +84,11 @@ let
     };
     zipper = builder {
       name = "zipper";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchHex {
         pkg = "zipper";
-        version = "1.0.1";
-        sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
+        version = "1.1.0";
+        sha256 = "sha256-RkTIOug+88CYYMte1Zewx1n7vNZK1bAKYvUa5IrvdTU=";
       };
       beamDeps = [ ];
     };
@@ -104,11 +104,11 @@ let
     };
     katana_code = builder {
       name = "katana_code";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchHex {
         pkg = "katana_code";
-        version = "2.1.0";
-        sha256 = "sha256-rju6yhh1EViPaWlan/IiUcssxnL9zMGAKJd5vdJRde8=";
+        version = "2.1.1";
+        sha256 = "sha256-BoDzNSW5qILm9NMCJRixXEb2SL17Db6GkAmA/hwpFAQ=";
       };
       beamDeps = [ ];
     };
@@ -152,21 +152,21 @@ let
     };
     getopt = builder {
       name = "getopt";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchHex {
         pkg = "getopt";
-        version = "1.0.2";
-        sha256 = "sha256-oAKa6kMi+4KmH2h2ptnGbcmHi2y2H6oT3zGHOE/U6iY=";
+        version = "1.0.3";
+        sha256 = "sha256-fgHekKxUDyFJT/cnkrHjFi05mWbrv8Z0tM5Sy49JMk8=";
       };
       beamDeps = [ ];
     };
     elvis_core = builder {
       name = "elvis_core";
-      version = "3.2.3";
+      version = "4.0.0";
       src = fetchHex {
         pkg = "elvis_core";
-        version = "3.2.3";
-        sha256 = "sha256-oPDWgczZNVoWXDWXNnVVHxAhaHz5kvFcW/9mtmZO3gQ=";
+        version = "4.0.0";
+        sha256 = "sha256-+i7jDyRkRm01mfsfz6phXImVn8UBmkVhnvett+1CC+U=";
       };
       beamDeps = [
         katana_code