diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bd95c545a4d7..0f736ea4bc08 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13885,6 +13885,12 @@ githubId = 120451; name = "Urban Skudnik"; }; + usrfriendly = { + name = "Arin Lares"; + email = "arinlares@gmail.com"; + github = "usrfriendly"; + githubId = 2502060; + }; utdemir = { email = "me@utdemir.com"; github = "utdemir"; diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-launcher/default.nix similarity index 57% rename from pkgs/games/enyo-doom/default.nix rename to pkgs/games/enyo-launcher/default.nix index eeb4086f924e..170777cf5a35 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-launcher/default.nix @@ -1,14 +1,14 @@ { mkDerivation, lib, fetchFromGitLab, cmake, qtbase }: mkDerivation rec { - pname = "enyo-doom"; - version = "2.0.2"; + pname = "enyo-launcher"; + version = "2.0.5"; src = fetchFromGitLab { owner = "sdcofer70"; - repo = "enyo-doom"; + repo = "enyo-launcher"; rev = version; - sha256 = "1s1vpwrrpb9c7r2b0k1j7dlsfasfzmi6prcwql4mxwixrl7f8ms1"; + sha256 = "sha256-qdVP5QN2t0GK4VBWuFGrnRfgamQDZGRjwaAe6TIK604="; }; nativeBuildInputs = [ cmake ]; @@ -16,10 +16,10 @@ mkDerivation rec { buildInputs = [ qtbase ]; meta = { - homepage = "https://gitlab.com/sdcofer70/enyo-doom"; + homepage = "https://gitlab.com/sdcofer70/enyo-launcher"; description = "Frontend for Doom engines"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.tadfisher ]; + maintainers = [ lib.maintainers.usrfriendly ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b4f1034387db..605eff766916 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -325,6 +325,8 @@ mapAliases ({ enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 + envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 + enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = libepoxy; # Added 2021-11-11 epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15 etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3aef6eb81fd2..9bbe9fe977da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33468,7 +33468,7 @@ with pkgs; endless-sky = callPackage ../games/endless-sky { }; - enyo-doom = libsForQt5.callPackage ../games/enyo-doom { }; + enyo-launcher = libsForQt5.callPackage ../games/enyo-launcher { }; eternity = callPackage ../games/eternity-engine { };