Merge master into staging-next

2021-02-08 06:16:44 +00:00
parent 1c86cb40e9 31af77bddd
commit f6ef5ce473
36 changed files with 218 additions and 131 deletions
@@ -12,13 +12,13 @@ let

 in stdenv.mkDerivation rec {
  pname = "freeciv";
-  version = "2.6.2.1";
+  version = "2.6.3";

  src = fetchFromGitHub {
    owner = "freeciv";
    repo = "freeciv";
    rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "1nra6b6sk2gciaw1fpwx7qa20hky8cwcdwlshcl1zsikg577hyg5";
+    sha256 = "sha256-tRjik2LONwKFZOcIuyFDoE1fD23UnZHMdNLo0DdYyOc=";
  };

  postPatch = ''