tinc{,_pre}: migrate to by-name, modernize derivation (#525959)

pkgs/by-name/ti/tinc/package.nix

@@ -7,13 +7,13 @@
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.0.36";
   pname = "tinc";
 
   src = fetchurl {
-    url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "021i2sl2mjscbm8g59d7vs74iw3gf0m48wg7w3zhwj6czarkpxs0";
+    url = "https://www.tinc-vpn.org/packages/tinc-${finalAttrs.version}.tar.gz";
+    hash = "sha256-QPc7s/rMSA7/4OdxRCpwb/BIjt6npfJQXUzLKqgWMQg=";
   };
 
   buildInputs = [
@@ -42,4 +42,4 @@ stdenv.mkDerivation rec {
     mainProgram = "tincd";
     platforms = lib.platforms.unix;
   };
-}
+})

pkgs/by-name/ti/tinc_pre/package.nix

@@ -12,14 +12,14 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tinc";
   version = "1.1pre18";
 
   src = fetchFromGitHub {
     owner = "gsliepen";
     repo = "tinc";
-    rev = "release-${version}";
+    tag = "release-${finalAttrs.version}";
     hash = "sha256-1anjTUlVLx57FlUqGwBd590lfkZ2MmrM1qRcMl4P7Sg=";
   };
 
@@ -43,10 +43,10 @@ stdenv.mkDerivation rec {
 
   # needed so the build doesn't need to run git to find out the version.
   prePatch = ''
-    substituteInPlace configure.ac --replace UNKNOWN ${version}
-    echo "${version}" > configure-version
-    echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${version}" > ChangeLog
-    sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac
+    substituteInPlace configure.ac --replace UNKNOWN ${finalAttrs.version}
+    echo "${finalAttrs.version}" > configure-version
+    echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${finalAttrs.version}" > ChangeLog
+    sed -i '/AC_INIT/s/m4_esyscmd_s.*/${finalAttrs.version})/' configure.ac
   '';
 
   configureFlags = [
@@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
       mic92
     ];
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -3195,10 +3195,6 @@ with pkgs;
     extraFonts = true;
   };
 
-  tinc = callPackage ../tools/networking/tinc { };
-
-  tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
-
   tldr-hs = haskellPackages.tldr;
 
   tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });