diff --git a/plugins/addgrain/default.nix b/plugins/addgrain/default.nix
index b94d4eb..e7eb30f 100644
--- a/plugins/addgrain/default.nix
+++ b/plugins/addgrain/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-addgrain";
-  version = "r8";
+  version = "8";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = "VapourSynth-AddGrain";
-    rev = version;
+    rev = "r${version}";
     sha256 = "0qfazdifs1nq5ll6nvfvy3w9m28s2llm5i203ak6qf0bf98jnh4j";
   };
 
diff --git a/plugins/beziercurve/default.nix b/plugins/beziercurve/default.nix
index 6230fce..4446834 100644
--- a/plugins/beziercurve/default.nix
+++ b/plugins/beziercurve/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-beziercurve";
-  version = "r3";
+  version = "3";
 
   src = fetchFromGitHub {
     owner = "kewenyu";
     repo = "VapourSynth-BezierCurve";
-    rev = version;
+    rev = "r${version}";
     sha256 = "1513ndj7sxwihyxx6x9ciyd8jhw9vs6lhzw7fpl7cz7fdj49wwi6";
   };
 
diff --git a/plugins/bilateral/default.nix b/plugins/bilateral/default.nix
index 1acc854..1f59b5b 100644
--- a/plugins/bilateral/default.nix
+++ b/plugins/bilateral/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-bilateral";
-  version = "r3";
+  version = "3";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = "VapourSynth-Bilateral";
-    rev = version;
+    rev = "r${version}";
     sha256 = "05rhbg84z74rk3jcxa6abgqcqnjzgmjw03wljxa55jc358h9a6f0";
   };
 
diff --git a/plugins/bm3d/default.nix b/plugins/bm3d/default.nix
index a9d51b1..a96ed4f 100644
--- a/plugins/bm3d/default.nix
+++ b/plugins/bm3d/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-bm3d";
-  version = "r9";
+  version = "9";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = "VapourSynth-BM3D";
-    rev = version;
+    rev = "r${version}";
     sha256 = "sha256-i7Kk7uFt2Wo/EWpVkGyuYgGZxBuQgOT3JM+WCFPHVrc=";
   };
 
diff --git a/plugins/cas/default.nix b/plugins/cas/default.nix
index 9d6221f..7b66062 100644
--- a/plugins/cas/default.nix
+++ b/plugins/cas/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "VapourSynth-CAS";
-  version = "r2";
+  version = "2";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "0zcqz6vgfqy4lshc0cvf8hijs2y7c4nvm5nzmb8fl8si38d96rf5";
   };
 
diff --git a/plugins/ctmf/default.nix b/plugins/ctmf/default.nix
index 032fc84..a929fee 100644
--- a/plugins/ctmf/default.nix
+++ b/plugins/ctmf/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "VapourSynth-CTMF";
-  version = "r5";
+  version = "5";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "138gbag1m3cg2bizc5ncxgriz3aw7dkqh1fpky3grlkspn5jc9x5";
   };
 
diff --git a/plugins/dctfilter/default.nix b/plugins/dctfilter/default.nix
index 032ec5a..bea2eb5 100644
--- a/plugins/dctfilter/default.nix
+++ b/plugins/dctfilter/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "VapourSynth-DCTFilter";
-  version = "r2.1";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "032l2dh28jznplh8ww8hzr0fmm6hx34f0k29gqyyjksmn3ympr00";
   };
 
diff --git a/plugins/deblock/default.nix b/plugins/deblock/default.nix
index 071c9f3..d2412c2 100644
--- a/plugins/deblock/default.nix
+++ b/plugins/deblock/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "VapourSynth-Deblock";
-  version = "r6.1";
+  version = "6.1";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "0s2aqfak8mxylkhfl350mm8abspp7sgfacnigf7qksvhdx232k2c";
   };
 
diff --git a/plugins/descale/default.nix b/plugins/descale/default.nix
index 5aa5c2a..8ff474d 100644
--- a/plugins/descale/default.nix
+++ b/plugins/descale/default.nix
@@ -3,12 +3,12 @@
 # required to make python.buildEnv use descale’s python module
 python.pkgs.toPythonModule (stdenv.mkDerivation rec {
   pname = "vapoursynth-descale";
-  version = "r6";
+  version = "6";
 
   src = fetchFromGitHub {
     owner = "Irrational-Encoding-Wizardry";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "093dk125y4gacvhrh10x1i5g2qbsjl4spz74gjjm7xbvrvi1sc72";
   };
 
diff --git a/plugins/dfttest/default.nix b/plugins/dfttest/default.nix
index 35c8ce8..8726b56 100644
--- a/plugins/dfttest/default.nix
+++ b/plugins/dfttest/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "VapourSynth-DFTTest";
-  version = "r7";
+  version = "7";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "1a13lziplfn8czn0rzpdj8pki8hjs2j1450xki3j09lb2ql2fm6q";
   };
 
diff --git a/plugins/eedi2/default.nix b/plugins/eedi2/default.nix
index 81751ec..251b8ad 100644
--- a/plugins/eedi2/default.nix
+++ b/plugins/eedi2/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-eedi2";
-  version = "r7.1";
+  version = "7.1";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = "VapourSynth-EEDI2";
-    rev = version;
+    rev = "r${version}";
     sha256 = "10yfndb4q5zd450v5di331r3hm1mfikw370jvxydd98b0lbjpp8f";
   };
 
diff --git a/plugins/eedi3m/default.nix b/plugins/eedi3m/default.nix
index 2d9e92e..3deedbc 100644
--- a/plugins/eedi3m/default.nix
+++ b/plugins/eedi3m/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-eedi3";
-  version = "r4";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = "VapourSynth-EEDI3";
-    rev = version;
+    rev = "r${version}";
     sha256 = "1q79l27arcfl7k49czsspb4z7zfr616xsxsb04x9b4d9l763716x";
   };
 
diff --git a/plugins/fmtconv/default.nix b/plugins/fmtconv/default.nix
index a26540c..ca85f4a 100644
--- a/plugins/fmtconv/default.nix
+++ b/plugins/fmtconv/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "fmtconv";
-  version = "r29";
+  version = "29";
 
   src = fetchFromGitHub {
     owner = "EleonoreMizo";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "sha256-V2iY8mBIFtkLkiHXlN/KrlBmzCEpGStHYaOcJSTU9LE=";
   };
 
diff --git a/plugins/havsfunc/default.nix b/plugins/havsfunc/default.nix
index c6073dd..190ad9f 100644
--- a/plugins/havsfunc/default.nix
+++ b/plugins/havsfunc/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "havsfunc";
-  version = "r33";
+  version = "33";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "14132gcy0zw348c40y2i8c7n3i1ygcnv9xrf83jp6m3b9v557z7p";
   };
 
diff --git a/plugins/imwri/default.nix b/plugins/imwri/default.nix
index 1e6b37e..5b7fe7e 100644
--- a/plugins/imwri/default.nix
+++ b/plugins/imwri/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vs-imwri";
-  version = "R1";
+  version = "1";
 
   src = fetchFromGitHub {
     owner = "vapoursynth";
     repo = pname;
-    rev = version;
+    rev = "R${version}";
     sha256 = "sha256-3nNX7OxAwHPJ6JwaTZJTH13eWktPI/XBmEC/OETCun4=";
   };
 
diff --git a/plugins/mvsfunc/default.nix b/plugins/mvsfunc/default.nix
index f7bd2e0..a6e42d8 100644
--- a/plugins/mvsfunc/default.nix
+++ b/plugins/mvsfunc/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "mvsfunc";
-  version = "r10";
+  version = "10";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "sha256-J68NMBE3MdAd9P0UJH32o0YwQx+7I5+13j8Jc5rbQtc=";
   };
 
diff --git a/plugins/nnedi3cl/default.nix b/plugins/nnedi3cl/default.nix
index a87bb3a..9665fa5 100644
--- a/plugins/nnedi3cl/default.nix
+++ b/plugins/nnedi3cl/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "VapourSynth-NNEDI3CL";
-  version = "r8";
+  version = "8";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "0j99ihxy295plk1x5flgwzjkcjwyzqdmxnxmda9r632ksq9flvyd";
   };
 
diff --git a/plugins/readmpls/default.nix b/plugins/readmpls/default.nix
index 8a309fd..6122572 100644
--- a/plugins/readmpls/default.nix
+++ b/plugins/readmpls/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "VapourSynth-ReadMpls";
-  version = "r4";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "0v1hs0wgpv9raacsslmwhsw81c49c52mhc6py2ydxb0b359rqg2n";
   };
 
diff --git a/plugins/rekt/default.nix b/plugins/rekt/default.nix
index 9ba985a..00a05a8 100644
--- a/plugins/rekt/default.nix
+++ b/plugins/rekt/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "rekt";
-  version = "r39";
+  version = "39";
 
   src = fetchFromGitLab {
     owner = "Ututu";
diff --git a/plugins/retinex/default.nix b/plugins/retinex/default.nix
index db96386..67d0cd9 100644
--- a/plugins/retinex/default.nix
+++ b/plugins/retinex/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-retinex";
-  version = "r4";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = "VapourSynth-Retinex";
-    rev = version;
+    rev = "r${version}";
     sha256 = "108jmawfn87ydabpxkb0srbk2r8vgpfn0kiby4g56msbc0rpvc6g";
   };
 
diff --git a/plugins/sangnom/default.nix b/plugins/sangnom/default.nix
index 5839fcb..08d8642 100644
--- a/plugins/sangnom/default.nix
+++ b/plugins/sangnom/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-sangnom";
-  version = "r42";
+  version = "42";
 
   src = fetchFromGitHub {
     owner = "dubhater";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "0g9gr4lj5krwlkxb6fc1b408zj5gnl8v36hr66r27h9ndg12flfs";
   };
 
diff --git a/plugins/subtext/default.nix b/plugins/subtext/default.nix
index 7a88104..7231e20 100644
--- a/plugins/subtext/default.nix
+++ b/plugins/subtext/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "subtext";
-  version = "R3";
+  version = "3";
 
   src = fetchFromGitHub {
     owner = "vapoursynth";
     repo = pname;
-    rev = version;
+    rev = "R${version}";
     sha256 = "sha256-Tux8WFbUn4Bt1EL9r+f+Y/av9w9Y23gc79m1JcZWj50=";
   };
 
diff --git a/plugins/tcanny/default.nix b/plugins/tcanny/default.nix
index 62af76b..a5c7c93 100644
--- a/plugins/tcanny/default.nix
+++ b/plugins/tcanny/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth-tcanny";
-  version = "r12";
+  version = "12";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = "VapourSynth-TCanny";
-    rev = version;
+    rev = "r${version}";
     sha256 = "1jsvgxb94klqwh40820zfw8radrnlr3w3lf2kkzjp6r97kgr5i37";
   };
 
diff --git a/plugins/ttempsmooth/default.nix b/plugins/ttempsmooth/default.nix
index c149de7..9848fc4 100644
--- a/plugins/ttempsmooth/default.nix
+++ b/plugins/ttempsmooth/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "VapourSynth-TTempSmooth";
-  version = "r3.1";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "0h7wxqr3kpq92pr2kbzjljlkg57l1a40w662p322l4r7587x4zdz";
   };
 
diff --git a/plugins/znedi3/default.nix b/plugins/znedi3/default.nix
index df12fec..d2ec9a3 100644
--- a/plugins/znedi3/default.nix
+++ b/plugins/znedi3/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "znedi3";
-  version = "r2";
+  version = "2";
 
   src = fetchFromGitHub {
     owner = "sekrit-twc";
     repo = pname;
-    rev = version;
+    rev = "r${version}";
     sha256 = "1p6563s1b52qisvvwid047jd376sz737lggwfhanci0sqxxphhrb";
     fetchSubmodules = true;
   };