release: Merge default into stable for release preparation

.bumpversion.cfg

@@ -1,6 +1,5 b''
 [bumpversion]
-current_version = 4.20.1
+current_version = 4.21.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:vcsserver/VERSION]
-

.release.cfg

@@ -5,12 +5,10 b' done = false'
 done = true
 
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [release]
-state = prepared
-version = 4.20.1
+state = in_progress
+version = 4.21.0
 

pkgs/overlays.nix

@@ -2,10 +2,10 b' self: super: {'
 
   # bump GIT version
   git = super.lib.overrideDerivation super.git (oldAttrs: {
-    name = "git-2.24.1";
+    name = "git-2.27.0";
     src = self.fetchurl {
-      url = "https://www.kernel.org/pub/software/scm/git/git-2.24.1.tar.xz";
-      sha256 = "0ql5z31vgl7b785gwrf00m129mg7zi9pa65n12ij3mpxx3f28gvj";
+      url = "https://www.kernel.org/pub/software/scm/git/git-2.27.0.tar.xz";
+      sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk";
     };
 
     # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git

pkgs/python-packages.nix

@@ -784,7 +784,7 b' self: super: {'
     };
   };
   "rhodecode-vcsserver" = super.buildPythonPackage {
-    name = "rhodecode-vcsserver-4.20.1";
+    name = "rhodecode-vcsserver-4.20.0";
     buildInputs = [
       self."pytest"
       self."py"

vcsserver/VERSION

@@ -1,1 +1,1 b''
-4.20.1
  No newline at end of file
+4.21.0
  No newline at end of file