tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #219067 from fabaff/tang-bump

clevis: 18 -> 19, tang: 7 -> 12

authored by

Fabian Affolter and committed by
GitHub 4954a390 cca003ae

+70 -41
+31 -12
pkgs/servers/tang/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc 2 - , jansson, jose, http-parser, systemd 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , pkg-config 5 + , asciidoc 6 + , jansson 7 + , jose 8 + , http-parser 9 + , systemd 10 + , meson 11 + , ninja 3 12 }: 4 13 5 14 stdenv.mkDerivation rec { 6 15 pname = "tang"; 7 - version = "7"; 16 + version = "12"; 8 17 9 18 src = fetchFromGitHub { 10 19 owner = "latchset"; 11 - repo = pname; 12 - rev = "v${version}"; 13 - sha256 = "0y5w1jrq5djh9gpy2r98ja7676nfxss17s1dk7jvgblsijx9qsd7"; 20 + repo = "tang"; 21 + rev = "refs/tags/v${version}"; 22 + hash = "sha256-wfZFOJrVzjtysh0VKdw5O+DJybYkV9bYJNnaku6YctE="; 14 23 }; 15 24 16 - configureFlags = [ 17 - "--localstatedir=/var" 18 - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" 25 + nativeBuildInputs = [ 26 + asciidoc 27 + meson 28 + ninja 29 + pkg-config 19 30 ]; 20 31 21 - nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; 22 - buildInputs = [ jansson jose http-parser systemd ]; 32 + buildInputs = [ 33 + jansson 34 + jose 35 + http-parser 36 + systemd 37 + ]; 23 38 24 - outputs = [ "out" "man" ]; 39 + outputs = [ 40 + "out" 41 + "man" 42 + ]; 25 43 26 44 meta = { 27 45 description = "Server for binding data to network presence"; 28 46 homepage = "https://github.com/latchset/tang"; 47 + changelog = "https://github.com/latchset/tang/releases/tag/v${version}"; 29 48 maintainers = with lib.maintainers; [ fpletz ]; 30 49 license = lib.licenses.gpl3Plus; 31 50 };
+39 -29
pkgs/tools/security/clevis/default.nix
··· 1 1 { lib 2 2 , stdenv 3 + , asciidoc 4 + , coreutils 5 + , cryptsetup 6 + , curl 3 7 , fetchFromGitHub 4 - , fetchurl 8 + , gnugrep 9 + , gnused 10 + , jansson 11 + , jose 12 + , libpwquality 13 + , luksmeta 14 + , makeWrapper 5 15 , meson 6 16 , ninja 7 17 , pkg-config 8 - , asciidoc 9 - , makeWrapper 10 - , jansson 11 - , jose 12 - , cryptsetup 13 - , curl 14 - , libpwquality 15 - , luksmeta 16 - , coreutils 17 18 , tpm2-tools 18 - , gnugrep 19 - , gnused 20 19 }: 21 20 22 21 stdenv.mkDerivation rec { 23 22 pname = "clevis"; 24 - version = "18"; 23 + version = "19"; 25 24 26 25 src = fetchFromGitHub { 27 26 owner = "latchset"; 28 27 repo = pname; 29 - rev = "v${version}"; 30 - sha256 = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8="; 28 + rev = "refs/tags/v${version}"; 29 + hash = "sha256-3J3ti/jRiv+p3eVvJD7u0ko28rPd8Gte0mCJaVaqyOs="; 31 30 }; 32 - 33 - patches = [ 34 - # sss: use BN_set_word(x, 0) instead of BN_zero(), fixes build issue with different versions of openssl 35 - (fetchurl { 36 - url = "https://github.com/latchset/clevis/commit/ee1dfedb9baca107e66a0fec76693c9d479dcfd9.patch"; 37 - sha256 = "sha256-GeklrWWlAMALDLdnn6+0Bi0l+bXrIbYkgIyI94WEybM="; 38 - }) 39 - ]; 40 31 41 32 postPatch = '' 42 33 for f in $(find src/ -type f); do ··· 42 51 --prefix PATH ':' "${lib.makeBinPath [tpm2-tools jose cryptsetup libpwquality luksmeta gnugrep gnused coreutils]}:${placeholder "out"}/bin" 43 52 ''; 44 53 45 - nativeBuildInputs = [ meson ninja pkg-config asciidoc makeWrapper ]; 46 - buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta tpm2-tools ]; 54 + nativeBuildInputs = [ 55 + asciidoc 56 + makeWrapper 57 + meson 58 + ninja 59 + pkg-config 60 + ]; 47 61 48 - outputs = [ "out" "man" ]; 62 + buildInputs = [ 63 + cryptsetup 64 + curl 65 + jansson 66 + jose 67 + libpwquality 68 + luksmeta 69 + tpm2-tools 70 + ]; 49 71 50 - meta = { 72 + outputs = [ 73 + "out" 74 + "man" 75 + ]; 76 + 77 + meta = with lib; { 51 78 description = "Automated Encryption Framework"; 52 79 homepage = "https://github.com/latchset/clevis"; 53 - maintainers = with lib.maintainers; [ ]; 54 - license = lib.licenses.gpl3Plus; 80 + changelog = "https://github.com/latchset/clevis/releases/tag/v${version}"; 81 + license = licenses.gpl3Plus; 82 + maintainers = with maintainers; [ ]; 55 83 }; 56 84 }