From 9fbc67d63ec3730e116e6be64b8029e10c640377 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 2 Jul 2022 11:00:32 +0200 Subject: [PATCH] opensoldat: rename from soldat-unstable Upstream project was [renamed] which removes the ambiguity with Soldat 1.7 as well as Soldat 2. [renamed]: https://github.com/opensoldat/opensoldat/commit/0fec3d86afa15c6c99f3c4a925ca1c27e65970af --- pkgs/games/{soldat-unstable => opensoldat}/default.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/games/{soldat-unstable => opensoldat}/default.nix (100%) diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/opensoldat/default.nix similarity index 100% rename from pkgs/games/soldat-unstable/default.nix rename to pkgs/games/opensoldat/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 24f0572f5e04..22efa20655eb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1293,6 +1293,7 @@ mapAliases ({ smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22 smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04 snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21 + soldat-unstable = opensoldat; # Added 2022-07-02 solr_8 = solr; # Added 2021-01-30 # Added 2020-02-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8328869885b7..5143bac58393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32484,6 +32484,8 @@ with pkgs; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; + opensoldat = callPackage ../games/opensoldat { }; + portmod = callPackage ../games/portmod { }; tetrio-desktop = callPackage ../games/tetrio-desktop { }; @@ -32702,8 +32704,6 @@ with pkgs; solarus = libsForQt5.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; - soldat-unstable = callPackage ../games/soldat-unstable { }; - sollya = callPackage ../development/interpreters/sollya { }; # You still can override by passing more arguments.