From 24d1f8489139d969b3f11826975c93b10e62266e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 22 Jan 2025 14:41:14 +0100 Subject: [PATCH] etlegacy: 2.83.1 -> 2.83.2 --- pkgs/by-name/et/etlegacy-assets/package.nix | 2 +- pkgs/by-name/et/etlegacy-unwrapped/package.nix | 15 ++------------- pkgs/by-name/et/etlegacy/package.nix | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix index fbdb9fabd615..3fc776a80ee1 100644 --- a/pkgs/by-name/et/etlegacy-assets/package.nix +++ b/pkgs/by-name/et/etlegacy-assets/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "etlegacy-assets"; - version = "2.83.1"; + version = "2.83.2"; srcs = let diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 78e24187eddf..a9b1b93c2041 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -3,7 +3,6 @@ stdenv, writeShellApplication, fetchFromGitHub, - fetchpatch, cjson, cmake, git, @@ -24,7 +23,7 @@ zlib, }: let - version = "2.83.1"; + version = "2.83.2"; fakeGit = writeShellApplication { name = "git"; @@ -43,19 +42,9 @@ stdenv.mkDerivation { owner = "etlegacy"; repo = "etlegacy"; tag = "v${version}"; - hash = "sha256-k1H3irA9UVOICY3keKGVJMtBczW/b5ObyNvB7fGAcFA="; + hash = "sha256-hZwLYaYV0j3YwFi8KRr4DZV73L2yIwFJ3XqCyq6L7hE="; }; - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - # Fix compilation on Darwin archs - # Reported upstream at https://github.com/etlegacy/etlegacy/pull/3005 - # Remove this patch when the PR is merged - (fetchpatch { - url = "https://github.com/etlegacy/etlegacy/commit/2767d15c67fe0680178d9cc85ed4cf2ad1d88ad0.patch?full_index=1"; - hash = "sha256-rGfNIWb9zohk1QJLrYg9nqw6sMvXM0IbIl9kvYXRBuk="; - }) - ]; - nativeBuildInputs = [ cjson cmake diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix index e708de08c34c..c2f225a73471 100644 --- a/pkgs/by-name/et/etlegacy/package.nix +++ b/pkgs/by-name/et/etlegacy/package.nix @@ -8,7 +8,7 @@ symlinkJoin { name = "etlegacy"; - version = "2.83.1"; + version = "2.83.2"; paths = [ etlegacy-assets etlegacy-unwrapped