From 1666ffebb1266d7af3e6f1225637c908104b6301 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 13:54:42 +0200 Subject: [PATCH] ocamlPackages.checkseum: 0.3.1 -> 0.3.2 https://github.com/mirage/checkseum/releases/tag/v0.3.2 --- pkgs/development/ocaml-modules/checkseum/default.nix | 8 ++------ .../ocaml-modules/checkseum/makefile-no-opam.patch | 12 ------------ 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index 527afec33eb..3483af1dd41 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -6,7 +6,7 @@ }: buildDunePackage rec { - version = "0.3.1"; + version = "0.3.2"; pname = "checkseum"; useDune2 = true; @@ -15,13 +15,9 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz"; - sha256 = "b9e4d054e17618b1faed8c0eb15afe0614b2f093e58b59a180bda4500a5d2da1"; + sha256 = "9cdd282ea1cfc424095d7284e39e4d0ad091de3c3f2580539d03f6966d45ccd5"; }; - patches = [ - ./makefile-no-opam.patch - ]; - nativeBuildInputs = [ dune-configurator pkg-config diff --git a/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch b/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch deleted file mode 100644 index 49fb41b2e00..00000000000 --- a/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/freestanding/Makefile b/freestanding/Makefile -index d535050..bb286bd 100644 ---- a/freestanding/Makefile -+++ b/freestanding/Makefile -@@ -1,4 +1,6 @@ --PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig -+ifneq (, $(shell command -v opam)) -+PKG_CONFIG_PATH ?= $(shell opam var prefix)/lib/pkgconfig -+endif - - EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?) -