lol

kpcli: KDBX 4 support (#348984)

authored by

Stig and committed by
GitHub
c82163f6 b87c7d8a

+36 -19
+4 -17
pkgs/development/compilers/z88dk/default.nix
··· 30 30 }; 31 31 }; 32 32 33 - IteratorSimple = perlPackages.buildPerlPackage { 34 - pname = "Iterator-Simple"; 35 - version = "0.07"; 36 - src = fetchurl { 37 - url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; 38 - hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; 39 - }; 40 - meta = { 41 - description = "Simple iterator and utilities"; 42 - license = with lib.licenses; [ artistic1 gpl2Only ]; 43 - }; 44 - }; 45 - 46 33 IteratorSimpleLookahead = perlPackages.buildPerlPackage { 47 34 pname = "Iterator-Simple-Lookahead"; 48 35 version = "0.09"; ··· 50 37 url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz"; 51 38 hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw="; 52 39 }; 53 - propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [ 54 - ClassAccessor 55 - ]); 40 + propagatedBuildInputs = with perlPackages; [ 41 + ClassAccessor IteratorSimple 42 + ]; 56 43 meta = { 57 44 description = "Simple iterator with lookahead and unget"; 58 45 license = with lib.licenses; [ artistic1 gpl2Only ]; ··· 67 54 hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M="; 68 55 }; 69 56 propagatedBuildInputs = [ 70 - IteratorSimple 71 57 IteratorSimpleLookahead 72 58 ] ++ (with perlPackages; [ 59 + IteratorSimple 73 60 TextTemplate 74 61 DataDump 75 62 FileSlurp
+4 -2
pkgs/tools/security/kpcli/default.nix
··· 6 6 7 7 src = fetchurl { 8 8 url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; 9 - sha256 = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8="; 9 + hash = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8="; 10 10 }; 11 11 12 12 nativeBuildInputs = [ makeWrapper ]; ··· 21 21 22 22 makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \ 23 23 "${with perlPackages; makePerlPath ([ 24 - CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser 24 + BHooksEndOfScope CaptureTiny Clipboard Clone CryptRijndael CryptX DevelGlobalDestruction ModuleImplementation 25 + ModuleRuntime SortNaturally SubExporterProgressive TermReadKey TermShellUI TryTiny FileKDBX FileKeePass 26 + PackageStash RefUtil TermReadLineGnu XMLParser boolean namespaceclean 25 27 ] ++ lib.optional stdenv.hostPlatform.isDarwin MacPasteboard)}" 26 28 ''; 27 29
+28
pkgs/top-level/perl-packages.nix
··· 9938 9938 }; 9939 9939 }; 9940 9940 9941 + FileKDBX = buildPerlPackage { 9942 + pname = "File-KDBX"; 9943 + version = "0.906"; 9944 + src = fetchurl { 9945 + url = "mirror://cpan/authors/id/C/CC/CCM/File-KDBX-0.906.tar.gz"; 9946 + hash = "sha256-tHt/kzOrtJHqrsY0WhTn+TlW0UOUTBS4Fkp/0bIkvW8="; 9947 + }; 9948 + propagatedBuildInputs = [ CryptArgon2 CryptX DevelGlobalDestruction FileKeePass IteratorSimple RefUtil XMLLibXML boolean namespaceclean ]; 9949 + buildInputs = [ ScopeGuard TestDeep TestFatal TestWarnings ]; 9950 + meta = { 9951 + description = "Interface to KeePass V3 and V4 database files"; 9952 + license = with lib.licenses; [ artistic1 gpl1Plus ]; 9953 + }; 9954 + }; 9955 + 9941 9956 FileKeePass = buildPerlPackage { 9942 9957 pname = "File-KeePass"; 9943 9958 version = "2.03"; ··· 13314 13329 ''; 13315 13330 license = with lib.licenses; [ artistic2 ]; 13316 13331 broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin 13332 + }; 13333 + }; 13334 + 13335 + IteratorSimple = buildPerlPackage { 13336 + pname = "Iterator-Simple"; 13337 + version = "0.07"; 13338 + src = fetchurl { 13339 + url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; 13340 + hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; 13341 + }; 13342 + meta = { 13343 + description = "Simple iterator and utilities"; 13344 + license = with lib.licenses; [ artistic1 gpl2Only ]; 13317 13345 }; 13318 13346 }; 13319 13347