##// END OF EJS Templates
release: Merge default into stable for release preparation
marcink -
r881:667fe9cb merge stable
parent child
Show More
@@ -1,6 +1,5
1 [bumpversion]
1 [bumpversion]
2 current_version = 4.20.1
2 current_version = 4.21.0
3 message = release: Bump version {current_version} to {new_version}
3 message = release: Bump version {current_version} to {new_version}
4
4
5 [bumpversion:file:vcsserver/VERSION]
5 [bumpversion:file:vcsserver/VERSION]
6
@@ -5,12 +5,10 done = false
5 done = true
5 done = true
6
6
7 [task:fixes_on_stable]
7 [task:fixes_on_stable]
8 done = true
9
8
10 [task:pip2nix_generated]
9 [task:pip2nix_generated]
11 done = true
12
10
13 [release]
11 [release]
14 state = prepared
12 state = in_progress
15 version = 4.20.1
13 version = 4.21.0
16
14
@@ -2,10 +2,10 self: super: {
2
2
3 # bump GIT version
3 # bump GIT version
4 git = super.lib.overrideDerivation super.git (oldAttrs: {
4 git = super.lib.overrideDerivation super.git (oldAttrs: {
5 name = "git-2.24.1";
5 name = "git-2.27.0";
6 src = self.fetchurl {
6 src = self.fetchurl {
7 url = "https://www.kernel.org/pub/software/scm/git/git-2.24.1.tar.xz";
7 url = "https://www.kernel.org/pub/software/scm/git/git-2.27.0.tar.xz";
8 sha256 = "0ql5z31vgl7b785gwrf00m129mg7zi9pa65n12ij3mpxx3f28gvj";
8 sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk";
9 };
9 };
10
10
11 # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git
11 # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git
@@ -784,7 +784,7 self: super: {
784 };
784 };
785 };
785 };
786 "rhodecode-vcsserver" = super.buildPythonPackage {
786 "rhodecode-vcsserver" = super.buildPythonPackage {
787 name = "rhodecode-vcsserver-4.20.1";
787 name = "rhodecode-vcsserver-4.20.0";
788 buildInputs = [
788 buildInputs = [
789 self."pytest"
789 self."pytest"
790 self."py"
790 self."py"
@@ -1,1 +1,1
1 4.20.1 No newline at end of file
1 4.21.0 No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now