From 252e4bdb8320fcafcd8de58fe775166cba9daa37 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 27 Nov 2023 13:59:37 +0530 Subject: [PATCH 1/2] fnc: 0.15 -> 0.16 - switch to finalAttrs --- pkgs/applications/version-management/fnc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 31a71d5b8ad7..1ab1d3b84ae2 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fnc"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; - sha256 = "sha256-8up844ekIOMcPlfB2DJzR/GgJY9s/sBeYpG+YtdauvU="; + url = "https://fnc.bsdbox.org/tarball/${finalAttrs.version}/fnc-${finalAttrs.version}.tar.gz"; + hash = "sha256-6I6wtSMHaKdnlUK4pYiaybJeODGu2P+smYW8lQDIWGM="; }; buildInputs = [ libiconv ncurses zlib ]; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbe ]; mainProgram = "fnc"; }; -} +}) From 51007d534f0b124109f01bb6389abdad243dc815 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 9 Dec 2023 20:50:42 +0100 Subject: [PATCH 2/2] fnc: fix build on x86_64-darwin --- pkgs/applications/version-management/fnc/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 1ab1d3b84ae2..e07b53854400 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.isDarwin [ + # error: 'strtonum' is only available on macOS 11.0 or newer + "-Wno-error=unguarded-availability-new" ]); preInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c72fc1749793..3171ad4bd6bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31611,7 +31611,7 @@ with pkgs; fmsynth = callPackage ../applications/audio/fmsynth { }; - fnc = callPackage ../applications/version-management/fnc { }; + fnc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/fnc { }; focus = callPackage ../tools/X11/focus { };