Merge pull request #270376 from wahjava/update-fnc

fnc: 0.15 -> 0.16

authored by Weijia Wang and committed by GitHub 4a75ebc3 d56f942e

+9 -6
+8 -5
pkgs/applications/version-management/fnc/default.nix
··· 1 { lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: 2 3 - stdenv.mkDerivation rec { 4 pname = "fnc"; 5 - version = "0.15"; 6 7 src = fetchurl { 8 - url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; 9 - sha256 = "sha256-8up844ekIOMcPlfB2DJzR/GgJY9s/sBeYpG+YtdauvU="; 10 }; 11 12 buildInputs = [ libiconv ncurses zlib ]; ··· 16 env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ 17 # Needed with GCC 12 18 "-Wno-error=maybe-uninitialized" 19 ]); 20 21 preInstall = '' ··· 35 maintainers = with maintainers; [ abbe ]; 36 mainProgram = "fnc"; 37 }; 38 - }
··· 1 { lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: 2 3 + stdenv.mkDerivation (finalAttrs: { 4 pname = "fnc"; 5 + version = "0.16"; 6 7 src = fetchurl { 8 + url = "https://fnc.bsdbox.org/tarball/${finalAttrs.version}/fnc-${finalAttrs.version}.tar.gz"; 9 + hash = "sha256-6I6wtSMHaKdnlUK4pYiaybJeODGu2P+smYW8lQDIWGM="; 10 }; 11 12 buildInputs = [ libiconv ncurses zlib ]; ··· 16 env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ 17 # Needed with GCC 12 18 "-Wno-error=maybe-uninitialized" 19 + ] ++ lib.optionals stdenv.isDarwin [ 20 + # error: 'strtonum' is only available on macOS 11.0 or newer 21 + "-Wno-error=unguarded-availability-new" 22 ]); 23 24 preInstall = '' ··· 38 maintainers = with maintainers; [ abbe ]; 39 mainProgram = "fnc"; 40 }; 41 + })
+1 -1
pkgs/top-level/all-packages.nix
··· 31612 31613 fmsynth = callPackage ../applications/audio/fmsynth { }; 31614 31615 - fnc = callPackage ../applications/version-management/fnc { }; 31616 31617 focus = callPackage ../tools/X11/focus { }; 31618
··· 31612 31613 fmsynth = callPackage ../applications/audio/fmsynth { }; 31614 31615 + fnc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/fnc { }; 31616 31617 focus = callPackage ../tools/X11/focus { }; 31618