gcal: 4.1 -> 4.2.0 (#507738)
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
diff --git a/tests/check_utils.c b/tests/check_utils.c
|
||||
index 7229e4b..a422af4 100644
|
||||
--- a/tests/check_utils.c
|
||||
+++ b/tests/check_utils.c
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include "../config.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "../src/tailor.h"
|
||||
@@ -0,0 +1,17 @@
|
||||
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
||||
index c45abcc..01727ef 100644
|
||||
--- a/tests/Makefile.in
|
||||
+++ b/tests/Makefile.in
|
||||
@@ -2003,11 +2003,7 @@ GCAL_OBJS = \
|
||||
../src/utils.o
|
||||
|
||||
GCAL_GNULIB_OBJS = \
|
||||
- ../lib/fclose.o \
|
||||
- ../lib/fflush.o \
|
||||
- ../lib/fseeko.o \
|
||||
- ../lib/ioctl.o \
|
||||
- ../lib/tmpdir.o
|
||||
+ ../lib/libgnu.a
|
||||
|
||||
check_gcal_SOURCES = check_gcal.c \
|
||||
check_file-io.c \
|
||||
@@ -4,31 +4,45 @@
|
||||
fetchurl,
|
||||
ncurses,
|
||||
gettext,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
check,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gcal";
|
||||
version = "4.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gcal/gcal-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
|
||||
url = "https://www.alteholz.dev/gnu/gcal-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-2L0tdBHnglHWcGSqDxymClI7+FbuPm2J0H2FoSM0eNw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/gcal/raw/master/f/gcal-glibc-no-libio.patch";
|
||||
sha256 = "0l4nw9kgzsay32rsdwvs75pbp4fhx6pfm85paynfbd20cdm2n2kv";
|
||||
})
|
||||
./add-missing-include.patch
|
||||
./fix-gnulib-link.patch
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration";
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration";
|
||||
# For check_gcal
|
||||
NIX_LDFLAGS = "-lm";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
check
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Program for calculating and printing calendars";
|
||||
longDescription = ''
|
||||
|
||||
Reference in New Issue
Block a user