interpreters/lua: replace sourceVersion with lib.versions

3 files changed, 23 insertions, 21 deletions

diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix
index 3df2ac457c07..daa298761762 100644
--- a/pkgs/development/interpreters/luajit/2.0.nix
+++ b/pkgs/development/interpreters/luajit/2.0.nix
@@ -1,13 +1,18 @@
-{ self, callPackage, lib, passthruFun }:
+{ self, callPackage, fetchFromGitHub, lib, passthruFun }:
+
 callPackage ./default.nix {
-  sourceVersion = { major = "2"; minor = "0"; patch = "5"; };
-  inherit self passthruFun;
   version = "2.0.5-2022-09-13";
-  rev = "46e62cd963a426e83a60f691dcbbeb742c7b3ba2";
   isStable = true;
-  hash = "sha256-/XR9+6NjXs2TrUVKJNkH2h970BkDNFqMDJTWcy/bswU=";
+  src = fetchFromGitHub {
+    owner = "LuaJIT";
+    repo = "LuaJIT";
+    rev = "46e62cd963a426e83a60f691dcbbeb742c7b3ba2";
+    hash = "sha256-/XR9+6NjXs2TrUVKJNkH2h970BkDNFqMDJTWcy/bswU=";
+  };
+
   extraMeta = { # this isn't precise but it at least stops the useless Hydra build
     platforms = with lib; filter (p: !hasPrefix "aarch64-" p)
       (platforms.linux ++ platforms.darwin);
   };
+  inherit self passthruFun;
 }
diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix
index d2233f15819f..8362aab55e0f 100644
--- a/pkgs/development/interpreters/luajit/2.1.nix
+++ b/pkgs/development/interpreters/luajit/2.1.nix
@@ -1,9 +1,13 @@
-{ self, callPackage, passthruFun }:
+{ self, callPackage, fetchFromGitHub, passthruFun }:
 callPackage ./default.nix {
-  sourceVersion = { major = "2"; minor = "1"; patch = "0"; };
-  inherit self passthruFun;
   version = "2.1.0-2022-10-04";
-  rev = "6c4826f12c4d33b8b978004bc681eb1eef2be977";
   isStable = false;
-  hash = "sha256-GMgoSVHrfIuLdk8mW9XgdemNFsAkkQR4wiGGjaAXAKg=";
+  src = fetchFromGitHub {
+    owner = "LuaJIT";
+    repo = "LuaJIT";
+    rev = "6c4826f12c4d33b8b978004bc681eb1eef2be977";
+    hash = "sha256-GMgoSVHrfIuLdk8mW9XgdemNFsAkkQR4wiGGjaAXAKg=";
+  };
+
+  inherit self passthruFun;
 }
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 1f830ac65d0d..64aa0345e80b 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -3,9 +3,8 @@
 , fetchFromGitHub
 , buildPackages
 , isStable
-, hash
-, rev
 , version
+, src
 , extraMeta ? { }
 , callPackage
 , self
@@ -15,7 +14,6 @@
 , pkgsBuildTarget
 , pkgsHostHost
 , pkgsTargetTarget
-, sourceVersion
 , passthruFun
 , enableFFI ? true
 , enableJIT ? true
@@ -28,7 +26,7 @@
 , enableAPICheck ? false
 , enableVMAssertions ? false
 , useSystemMalloc ? false
-, luaAttr ? "luajit_${sourceVersion.major}_${sourceVersion.minor}"
+, luaAttr ? "luajit_${lib.versions.major version}_${lib.versions.minor version}"
 } @ inputs:
 assert enableJITDebugModule -> enableJIT;
 assert enableGDBJITSupport -> enableJIT;
@@ -51,12 +49,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "luajit";
-  inherit version;
-  src = fetchFromGitHub {
-    owner = "LuaJIT";
-    repo = "LuaJIT";
-    inherit hash rev;
-  };
+  inherit version src;
 
   luaversion = "5.1";
 
@@ -113,7 +106,7 @@ stdenv.mkDerivation rec {
     inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs;
     override = attr: let lua = attr.override (inputs' // { self = lua; }); in lua;
   in passthruFun rec {
-    inherit self luaversion packageOverrides luaAttr sourceVersion;
+    inherit self luaversion packageOverrides luaAttr;
     executable = "lua";
     luaOnBuildForBuild = override pkgsBuildBuild.${luaAttr};
     luaOnBuildForHost = override pkgsBuildHost.${luaAttr};