From 195ac60c4e4a0acbf8f0ac12bc2b44e4ce27459c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 22 Jan 2022 00:40:07 -0300
Subject: [PATCH 1/2] reorder games section

---
 pkgs/top-level/all-packages.nix | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca23986b519b..aa1f047bde5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8841,8 +8841,6 @@ with pkgs;
 
   poly2tri-c = callPackage ../development/libraries/poly2tri-c { };
 
-  polymc = libsForQt5.callPackage ../games/polymc { };
-
   ponysay = callPackage ../tools/misc/ponysay { };
 
   popfile = callPackage ../tools/text/popfile { };
@@ -15721,6 +15719,8 @@ with pkgs;
 
   nsis = callPackage ../development/tools/nsis { };
 
+  tockloader = callPackage ../development/tools/misc/tockloader { };
+
   ### DEVELOPMENT / LIBRARIES
 
   a52dec = callPackage ../development/libraries/a52dec { };
@@ -16278,6 +16278,14 @@ with pkgs;
 
   eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
 
+  vapoursynth = callPackage ../development/libraries/vapoursynth {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+  };
+
+  vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { };
+
+  vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { };
+
   vmmlib = callPackage ../development/libraries/vmmlib {
     inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
   };
@@ -28951,8 +28959,6 @@ with pkgs;
 
   tetraproc = callPackage ../applications/audio/tetraproc { };
 
-  tetrio-desktop = callPackage ../games/tetrio-desktop { };
-
   tev = callPackage ../applications/graphics/tev { };
 
   themechanger = callPackage ../applications/misc/themechanger { };
@@ -30949,10 +30955,14 @@ with pkgs;
 
   portmod = callPackage ../games/portmod { };
 
+  tetrio-desktop = callPackage ../games/tetrio-desktop { };
+
   tr-patcher = callPackage ../games/tr-patcher { };
 
   tes3cmd = callPackage ../games/tes3cmd { };
 
+  otto-matic = callPackage ../games/otto-matic { };
+
   openraPackages = import ../games/openra pkgs;
 
   openra = openraPackages.engines.release;
@@ -31006,6 +31016,8 @@ with pkgs;
 
   planetary_annihilation = callPackage ../games/planetaryannihilation { };
 
+  polymc = libsForQt5.callPackage ../games/polymc { };
+
   pong3d = callPackage ../games/pong3d { };
 
   pokerth = libsForQt5.callPackage ../games/pokerth { };
@@ -31252,8 +31264,6 @@ with pkgs;
 
   tinyfugue = callPackage ../games/tinyfugue { };
 
-  tockloader = callPackage ../development/tools/misc/tockloader { };
-
   tome2 = callPackage ../games/tome2 { };
 
   tome4 = callPackage ../games/tome4 { };
@@ -31320,14 +31330,6 @@ with pkgs;
 
   ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
 
-  vapoursynth = callPackage ../development/libraries/vapoursynth {
-    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
-  };
-
-  vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { };
-
-  vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { };
-
   vassal = callPackage ../games/vassal { };
 
   vdrift = callPackage ../games/vdrift { };
@@ -32208,8 +32210,6 @@ with pkgs;
 
   otter = callPackage ../applications/science/logic/otter {};
 
-  otto-matic = callPackage ../games/otto-matic { };
-
   picosat = callPackage ../applications/science/logic/picosat {};
 
   libpoly = callPackage ../applications/science/logic/poly {};

From 1d49580806f3dc8651d14c423dbee83d7fb96e83 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 22 Jan 2022 16:18:01 -0300
Subject: [PATCH 2/2] src: switch to Python3

According to most recent changelog, src now explicitly requires Python3.
---
 .../version-management/src/default.nix        | 24 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 086ebc8069fd..a39a1fd79d84 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchurl, python2, rcs, git, makeWrapper }:
+{ lib
+, stdenv
+, fetchurl
+, python
+, rcs
+, git
+, makeWrapper
+}:
 
 stdenv.mkDerivation rec {
   pname = "src";
@@ -9,8 +16,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Tc+qBhLtC9u23BrqVniAprAV8YhXELvbMn+XxN5BQkE=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ python2 rcs git ];
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildInputs = [
+    python
+    rcs
+    git
+  ];
 
   preConfigure = ''
     patchShebangs .
@@ -24,6 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    homepage = "http://www.catb.org/esr/src/";
     description = "Simple single-file revision control";
     longDescription = ''
       SRC, acronym of Simple Revision Control, is RCS/SCCS reloaded with a
@@ -33,10 +48,9 @@ stdenv.mkDerivation rec {
       will seem familiar to Subversion/Git/hg users, and no binary blobs
       anywhere.
     '';
-    homepage = "http://www.catb.org/esr/src/";
     changelog = "https://gitlab.com/esr/src/raw/${version}/NEWS";
     license = licenses.bsd2;
-    platforms = platforms.all;
     maintainers = with maintainers; [ calvertvl AndersonTorres ];
+    inherit (python.meta) platforms;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa1f047bde5c..00961118df3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28734,6 +28734,7 @@ with pkgs;
 
   src = callPackage ../applications/version-management/src {
     git = gitMinimal;
+    python = python3;
   };
 
   sslyze = with python3Packages; toPythonApplication sslyze;