From b45912b3d9d80ef269628ed6101135b174fcad21 Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Mon, 12 Jan 2026 07:01:46 -0600 Subject: [PATCH 1/3] odamex: 11.2.0 -> 12.1.0 --- pkgs/by-name/od/odamex/package.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index 2e32151b459e..fcda5bf69749 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, copyDesktopItems, @@ -52,26 +51,16 @@ in stdenv.mkDerivation (finalAttrs: { pname = "odamex"; - version = "11.2.0"; + version = "12.1.0"; src = fetchFromGitHub { owner = "odamex"; repo = "odamex"; tag = finalAttrs.version; - hash = "sha256-f9st852Sqmdmb/qNP1ioBY9MApt9Ruw8dBjkkyGM5Qs="; + hash = "sha256-kLI1gdGH5NXJ8YI1tR0N5W6yvGZ+7302z0QLl2j+b0k="; fetchSubmodules = true; }; - patches = [ - # fix file-open panel on Darwin - # https://github.com/odamex/odamex/pull/1402 - # TODO: remove on next release - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/odamex/odamex/pull/1402.patch"; - hash = "sha256-JrcQ0rYkaFP5aKNWeXbrY2TN4r8nHpue19qajNXJXg4="; - }) - ]; - nativeBuildInputs = [ cmake copyDesktopItems From 8b2c59ec9ca3a04115c12dcb39295c3c88d1fa16 Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Mon, 12 Jan 2026 07:06:01 -0600 Subject: [PATCH 2/3] odamex: add meta.changelog, correct homepage --- pkgs/by-name/od/odamex/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index fcda5bf69749..bcd30a4b8795 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -197,8 +197,9 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - homepage = "http://odamex.net/"; + homepage = "https://odamex.net"; description = "Client/server port for playing old-school Doom online"; + changelog = "https://github.com/odamex/odamex/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ eljamm ]; From d919d30c4c62442cc69710a53e429bea02b4f555 Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Sat, 24 Jan 2026 13:42:49 -0600 Subject: [PATCH 3/3] odamex: mark broken on Darwin --- pkgs/by-name/od/odamex/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index bcd30a4b8795..83ceb829e46e 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -202,6 +202,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/odamex/odamex/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; maintainers = with lib.maintainers; [ eljamm ]; mainProgram = "odalaunch"; };