From 72b5746a973d5368dc3f1c3b9f6021d3fd102eac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 23:23:27 +0100 Subject: [PATCH 1/3] clevis: update meta --- pkgs/tools/security/clevis/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 70767373258e..d1d41365b870 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "latchset"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8="; + rev = "refs/tags/v${version}"; + hash = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8="; }; patches = [ @@ -56,10 +56,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - meta = { + meta = with lib; { description = "Automated Encryption Framework"; homepage = "https://github.com/latchset/clevis"; - maintainers = with lib.maintainers; [ ]; - license = lib.licenses.gpl3Plus; + changelog = "https://github.com/latchset/clevis/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; } From 36c9dc57b5efeaba48bc6d52110861d15bbfcf23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 23:27:53 +0100 Subject: [PATCH 2/3] clevis: 18 -> 19 Diff: https://github.com/latchset/clevis/compare/refs/tags/v18...v19 Changelog: https://github.com/latchset/clevis/releases/tag/v19 --- pkgs/tools/security/clevis/default.nix | 59 +++++++++++++++----------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index d1d41365b870..af803a92247b 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -1,43 +1,34 @@ { lib , stdenv +, asciidoc +, coreutils +, cryptsetup +, curl , fetchFromGitHub -, fetchurl +, gnugrep +, gnused +, jansson +, jose +, libpwquality +, luksmeta +, makeWrapper , meson , ninja , pkg-config -, asciidoc -, makeWrapper -, jansson -, jose -, cryptsetup -, curl -, libpwquality -, luksmeta -, coreutils , tpm2-tools -, gnugrep -, gnused }: stdenv.mkDerivation rec { pname = "clevis"; - version = "18"; + version = "19"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8="; + hash = "sha256-3J3ti/jRiv+p3eVvJD7u0ko28rPd8Gte0mCJaVaqyOs="; }; - patches = [ - # sss: use BN_set_word(x, 0) instead of BN_zero(), fixes build issue with different versions of openssl - (fetchurl { - url = "https://github.com/latchset/clevis/commit/ee1dfedb9baca107e66a0fec76693c9d479dcfd9.patch"; - sha256 = "sha256-GeklrWWlAMALDLdnn6+0Bi0l+bXrIbYkgIyI94WEybM="; - }) - ]; - postPatch = '' for f in $(find src/ -type f); do grep -q "/bin/cat" "$f" && substituteInPlace "$f" \ @@ -51,10 +42,28 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${lib.makeBinPath [tpm2-tools jose cryptsetup libpwquality luksmeta gnugrep gnused coreutils]}:${placeholder "out"}/bin" ''; - nativeBuildInputs = [ meson ninja pkg-config asciidoc makeWrapper ]; - buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta tpm2-tools ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + asciidoc + makeWrapper + ]; - outputs = [ "out" "man" ]; + buildInputs = [ + jansson + jose + cryptsetup + curl + libpwquality + luksmeta + tpm2-tools + ]; + + outputs = [ + "out" + "man" + ]; meta = with lib; { description = "Automated Encryption Framework"; From 3ddfa29f5108a75aa47ba320db25b3830dc51f49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 23:28:26 +0100 Subject: [PATCH 3/3] tang: 7 -> 12 Changelogs: https://github.com/latchset/tang/releases/tag/v12 https://github.com/latchset/tang/releases/tag/v11 https://github.com/latchset/tang/releases/tag/v10 https://github.com/latchset/tang/releases/tag/v9 https://github.com/latchset/tang/releases/tag/v8 --- pkgs/servers/tang/default.nix | 43 +++++++++++++++++++------- pkgs/tools/security/clevis/default.nix | 8 ++--- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index 8c5a64f22955..fdcadc4bb28d 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -1,31 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc -, jansson, jose, http-parser, systemd +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, asciidoc +, jansson +, jose +, http-parser +, systemd +, meson +, ninja }: stdenv.mkDerivation rec { pname = "tang"; - version = "7"; + version = "12"; src = fetchFromGitHub { owner = "latchset"; - repo = pname; - rev = "v${version}"; - sha256 = "0y5w1jrq5djh9gpy2r98ja7676nfxss17s1dk7jvgblsijx9qsd7"; + repo = "tang"; + rev = "refs/tags/v${version}"; + hash = "sha256-wfZFOJrVzjtysh0VKdw5O+DJybYkV9bYJNnaku6YctE="; }; - configureFlags = [ - "--localstatedir=/var" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + nativeBuildInputs = [ + asciidoc + meson + ninja + pkg-config ]; - nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; - buildInputs = [ jansson jose http-parser systemd ]; + buildInputs = [ + jansson + jose + http-parser + systemd + ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; meta = { description = "Server for binding data to network presence"; homepage = "https://github.com/latchset/tang"; + changelog = "https://github.com/latchset/tang/releases/tag/v${version}"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index af803a92247b..0498f0599052 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -43,18 +43,18 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + asciidoc + makeWrapper meson ninja pkg-config - asciidoc - makeWrapper ]; buildInputs = [ - jansson - jose cryptsetup curl + jansson + jose libpwquality luksmeta tpm2-tools