From 999a964d09fb888c7aac32fdd23900e33003c228 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 7 Feb 2022 13:50:37 +0100 Subject: [PATCH 1/2] bakelite: unstable-2021-10-19 -> unstable-2022-02-12 --- pkgs/tools/backup/bakelite/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/bakelite/default.nix b/pkgs/tools/backup/bakelite/default.nix index 15ddd3e2ea63..2988ec31667e 100644 --- a/pkgs/tools/backup/bakelite/default.nix +++ b/pkgs/tools/backup/bakelite/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { pname = "bakelite"; - version = "unstable-2021-10-19"; + version = "unstable-2022-02-12"; src = fetchFromGitHub { owner = "richfelker"; repo = pname; - rev = "5fc3cf9704dbaa191b95f97d2a700588ea878a36"; - sha256 = "xoGor8KMG1vU6hP6v6gHcADKjVpaClvkivxkcPUJtss="; + rev = "373901734d114e42aa385e6a7843745674e4ca08"; + hash = "sha256-HBnYlUyTkvPTbdsZD02yCq5C7yXOHYK4l4mDRUkcN5I="; }; hardeningEnable = [ "pie" ]; - buildFlags = [ "CFLAGS=-D_GNU_SOURCE" ]; + preBuild = '' + # pipe2() is only exposed with _GNU_SOURCE + # Upstream makefile explicitly uses -O3 to improve SHA-3 performance + makeFlagsArray+=( CFLAGS="-D_GNU_SOURCE -g -O3" ) + ''; installPhase = '' mkdir -p $out/bin From b237d3275da4f2809ef1827e9d935fd12ae88c56 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 15 Feb 2022 12:51:42 +0100 Subject: [PATCH 2/2] bakelite: extend platforms Since it only relies on the C standard library for POSIX, it should work fine on all unixoid platforms. --- pkgs/tools/backup/bakelite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/bakelite/default.nix b/pkgs/tools/backup/bakelite/default.nix index 2988ec31667e..e022ba942d28 100644 --- a/pkgs/tools/backup/bakelite/default.nix +++ b/pkgs/tools/backup/bakelite/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/richfelker/bakelite"; description = "Incremental backup with strong cryptographic confidentality"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = with maintainers; [ mvs ]; + platforms = platforms.unix; }; }