From 7d123712d5a3f9bd1813d41faacb22dd029800e2 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 9 Oct 2025 15:21:56 -0300
Subject: [PATCH] freeciv: move to by-name, modernize

---
 .../default.nix => by-name/fr/freeciv/package.nix}     | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/{games/freeciv/default.nix => by-name/fr/freeciv/package.nix} (93%)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/by-name/fr/freeciv/package.nix
similarity index 93%
rename from pkgs/games/freeciv/default.nix
rename to pkgs/by-name/fr/freeciv/package.nix
index 59eba192d76b..8e25266351cb 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/by-name/fr/freeciv/package.nix
@@ -32,21 +32,21 @@
   sqlite,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "freeciv";
   version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "freeciv";
     repo = "freeciv";
-    rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "R${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
     hash = "sha256-IlJ51ryoQ7qzIY9n8dmPQdwH8aPjXvRXXO2COOxWRcc=";
   };
 
   postPatch = ''
     for f in {common,utility}/*.py; do
       substituteInPlace $f \
-        --replace '/usr/bin/env python3' ${python3.interpreter}
+        --replace-fail '/usr/bin/env python3' ${python3.interpreter}
     done
     for f in bootstrap/*.sh; do
       patchShebangs $f
@@ -127,11 +127,11 @@ stdenv.mkDerivation rec {
       prehistory and your mission is to lead your tribe from the stone age
       to the space age...
     '';
-    homepage = "http://www.freeciv.org"; # http only
+    homepage = "https://freeciv.org/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ pierron ];
     platforms = lib.platforms.unix;
     hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin
     broken = qtClient && stdenv.hostPlatform.isDarwin; # Missing Qt5 development files
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a1c7a5c4ce0..7622d2541117 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13431,7 +13431,7 @@ with pkgs;
 
   flightgear = libsForQt5.callPackage ../games/flightgear { };
 
-  freeciv = callPackage ../games/freeciv {
+  freeciv = callPackage ../by-name/fr/freeciv/package.nix {
     sdl2Client = false;
     gtkClient = true;
     qtClient = false;