texlive.withPackages: use revision number for detailed version (#499901)

pkgs/tools/typesetting/tex/texlive/build-tex-env.nix

@@ -3,7 +3,7 @@
   tl,
   bin,
 
-  version,
+  tlpdbVersion,
 
   lib,
   buildEnv,
@@ -49,10 +49,9 @@ lib.fix (
       args:
       (buildEnv (
         {
-          pname = name;
-          version = "${toString version.texliveYear}-unstable-${version.year}-${version.month}-${version.day}";
+          inherit pname version;
 
-          inherit (args) name paths;
+          inherit (args) paths;
         }
         // lib.optionalAttrs (args ? extraOutputsToInstall) { inherit (args) extraOutputsToInstall; }
         // lib.optionalAttrs (args ? pathsToLink) { inherit (args) pathsToLink; }
@@ -216,11 +215,20 @@ lib.fix (
       ]
     ) pkgList.bin;
 
-    name =
+    pname =
       if __combine then
-        "texlive-${__extraName}-${bin.texliveYear}${__extraVersion}" # texlive.combine: old name name
+        "texlive-${__extraName}" # texlive.combine: old name
       else
-        "texlive-${bin.texliveYear}-" + (if __formatsOf != null then "${__formatsOf.pname}-fmt" else "env");
+        "texlive";
+    version =
+      if __combine then
+        "${toString tlpdbVersion.year}${__extraVersion}" # texlive.combine: old version
+      else
+        "${toString tlpdbVersion.year}-r${toString tlpdbVersion.revision}-"
+        + (lib.optionalString tlpdbVersion.frozen "final-")
+        + (if __formatsOf != null then "${__formatsOf.pname}-fmt" else "env");
+
+    name = "${pname}-${version}";
 
     texmfdist = buildEnv' {
       name = "${name}-texmfdist";

pkgs/tools/typesetting/tex/texlive/default.nix

@@ -198,7 +198,7 @@ let
   # function for creating a working environment
   buildTeXEnv = import ./build-tex-env.nix {
     inherit bin tl;
-    inherit version;
+    inherit tlpdbVersion;
     ghostscript = ghostscript_headless;
     inherit
       lib