From 3debecb54690ff26e6c53ee1edf7af1598f03885 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 4 Aug 2023 18:18:43 +0200 Subject: [PATCH] flips: unstable-2021-10-28 -> unstable-2023-03-15 --- pkgs/tools/compression/flips/default.nix | 6 +++--- .../compression/flips/use-system-libdivsufsort.patch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index 024ff5fbe9f1..4ba618556a70 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "flips"; - version = "unstable-2021-10-28"; + version = "unstable-2023-03-15"; src = fetchFromGitHub { owner = "Alcaro"; repo = "Flips"; - rev = "3a8733e74c9bdbb6b89da2b45913a0be3d0e1866"; - sha256 = "1jik580mz2spik5mgh60h93ryaj5x8dffncnr1lwija0v803xld7"; + rev = "fdd5c6e34285beef5b9be759c9b91390df486c66"; + hash = "sha256-uuHgpt7aWqiMTUILm5tAEGGeZrls3g/DdylYQgsfpTw="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/pkgs/tools/compression/flips/use-system-libdivsufsort.patch index aa741decb019..d621fe3a9f40 100644 --- a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch +++ b/pkgs/tools/compression/flips/use-system-libdivsufsort.patch @@ -1,12 +1,12 @@ diff --git a/Makefile b/Makefile -index c9d8b6d..9d66b0b 100644 +index b3d5aeb..a5acc08 100644 --- a/Makefile +++ b/Makefile -@@ -79,9 +79,7 @@ endif +@@ -83,9 +83,7 @@ endif + MOREFLAGS := $(CFLAGS_$(TARGET)) - --DIVSUF := libdivsufsort-2.0.1 +-DIVSUF := $(SRCDIR)/libdivsufsort-2.0.1 -SOURCES += $(DIVSUF)/lib/divsufsort.c $(DIVSUF)/lib/sssort.c $(DIVSUF)/lib/trsort.c -MOREFLAGS += -I$(DIVSUF)/include -DHAVE_CONFIG_H -D__STDC_FORMAT_MACROS +MOREFLAGS += -ldivsufsort