gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfaketime: 0.9.10 -> 0.9.11

Browse Source 
https://github.com/wolfcw/libfaketime/releases/tag/v0.9.11

Drop the 3 patches, as they're included in this release.

(Detail: The local clang patch also removed "-Werror" from CFLAGS,
compared to upstream, but that seems irrelevant -- the clang build fails
before and after this change. But at least the patchPhase succeeds by
removing the patch.)
This commit is contained in:
Bjørn Forsman
2025-06-01 13:40:33 +02:00
parent 1dab475686
commit abeb33f662
2 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/src/Makefile b/src/Makefile
index 2af4804..bcff809 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -80,7 +80,7 @@ PREFIX ?= /usr/local
LIBDIRNAME ?= /lib/faketime
PLATFORM ?=$(shell uname)
-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
ifeq ($(PLATFORM),SunOS)
CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
endif
pkgs/by-name/li/libfaketime/package.nix
+5 -20
View File
@@ -9,33 +9,18 @@
stdenv.mkDerivation rec {
pname = "libfaketime";
version = "0.9.10";
version = "0.9.11";
src = fetchFromGitHub {
owner = "wolfcw";
repo = "libfaketime";
rev = "v${version}";
sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
sha256 = "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE=";
};
patches =
[
./nix-store-date.patch
(fetchpatch {
name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch";
url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch";
sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo=";
})
(fetchpatch {
name = "LFS64.patch";
url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch";
hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g=";
})
]
++ (lib.optionals stdenv.cc.isClang [
# https://github.com/wolfcw/libfaketime/issues/277
./0001-Remove-unsupported-clang-flags.patch
]);
patches = [
./nix-store-date.patch
];
postPatch = ''
patchShebangs test src