From 8b2c339cbceb2375abc8dbdbad4fe8e0f2110794 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 17 Oct 2024 19:32:42 -0400 Subject: [PATCH 1/5] erlang: 25.3.2.13 -> 25.3.2.15 --- pkgs/development/interpreters/erlang/25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index 2a5f82d6b8f3..d1c6e0aff3c9 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.13"; - sha256 = "sha256-ZBk6oOT0vFY66ttyn4G2zy7Ur5bDKkxPzlTsZPaiosc="; + version = "25.3.2.15"; + sha256 = "sha256-y1QZZ+W5jkAygTRtXVu6FyG4I98SGXXourDfPPlEfg8="; } From b66c26bd3ebc4e36012b5f73632f15f013295542 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 17 Oct 2024 19:35:05 -0400 Subject: [PATCH 2/5] erlang_26: 26.2.5.1 -> 26.2.5.4 --- pkgs/development/interpreters/erlang/26.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index f5fa3522c3ed..e7c256d1de78 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.5.1"; - sha256 = "sha256-oxOynBFW++igiJtIv1ZjoMgtmumgnsWgwyVx4buhxCo="; + version = "26.2.5.4"; + sha256 = "sha256-fvpSvsr7wWgFKa8vODVz4RUn8JKe8NuT9sjvau38B+Y="; } From e7d44d664c11f8baec82a1251b523de2467c50c3 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 17 Oct 2024 19:38:53 -0400 Subject: [PATCH 3/5] erlang_27: 27.0.1 -> 27.1.2 --- pkgs/development/interpreters/erlang/27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index bf392920d555..91845a1bc28a 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.0.1"; - sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ="; + version = "27.1.2"; + sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg="; } From 60d00382ce034aeadbf87ecd826605afd2328826 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 17 Oct 2024 19:38:53 -0400 Subject: [PATCH 4/5] erlang_27: 27.0.1 -> 27.1.2 --- pkgs/development/interpreters/erlang/27.nix | 4 ++-- pkgs/development/interpreters/erlang/generic-builder.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index bf392920d555..91845a1bc28a 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.0.1"; - sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ="; + version = "27.1.2"; + sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 38af8a6e0926..2b363d4a06e6 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -98,6 +98,8 @@ stdenv.mkDerivation ({ inherit src version; + LANG = "C.UTF-8"; + nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ]; buildInputs = [ ncurses opensslPackage ] From 9ed7d6f6eb02b5e3c4a67e8b3954d2b0dceded3c Mon Sep 17 00:00:00 2001 From: chiroptical Date: Sun, 20 Oct 2024 08:30:28 -0400 Subject: [PATCH 5/5] pleroma: support darwin --- pkgs/servers/pleroma/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 565fb8ad52e3..88b0f14741fc 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, beamPackages, fetchFromGitHub, fetchFromGitLab, @@ -11,6 +12,7 @@ vips, pkg-config, glib, + darwin, ... }: @@ -91,10 +93,16 @@ beamPackages.mixRelease rec { vix = prev.vix.override { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - vips - glib.dev - ]; + buildInputs = + [ + vips + glib.dev + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Kerberos + ]; VIX_COMPILATION_MODE = "PLATFORM_PROVIDED_LIBVIPS"; };