From f8d8fd75291431103c91ba683dfe80cd0445c3e4 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 17 May 2022 21:55:19 -0400 Subject: [PATCH 01/14] kitty-themes: 2022-02-03 -> 2022-05-04 --- pkgs/misc/kitty-themes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/kitty-themes/default.nix b/pkgs/misc/kitty-themes/default.nix index 16bfa3a54b7f..7c794122e9b4 100644 --- a/pkgs/misc/kitty-themes/default.nix +++ b/pkgs/misc/kitty-themes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kitty-themes"; - version = "unstable-2022-02-03"; + version = "unstable-2022-05-04"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = pname; - rev = "337d6fcb3ad7e38544edfb8d0f6447894b7e5f58"; - sha256 = "ZP5GrT2QCdXtC5swqI0SXzIlqIcQNsxBlzEplj/hpz4="; + rev = "fb48041b0ff5ce60e8f10e7067a407ad99a4862e"; + sha256 = "/JCLty73YHsTkNxZP6EwhhoiHi2HjtyMZphAPhHe5h0="; }; installPhase = '' From ba2290852fa19a73e9122559de177c72e5510ad2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 May 2022 04:20:00 +0000 Subject: [PATCH 02/14] dash: 0.5.11.4 -> 0.5.11.5 --- pkgs/shells/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index f33fd5520f86..3b362b4bdeee 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "dash"; - version = "0.5.11.4"; + version = "0.5.11.5"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; - sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af"; + sha256 = "sha256-23eBEIkfeTeYXym/I0EP4cXWaVAnYPWE5U4OeynhI70="; }; hardeningDisable = [ "format" ]; From 77696cf87fb29b15383bd7352d4b91e253024654 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 11:20:21 +0000 Subject: [PATCH 03/14] chezmoi: 2.15.2 -> 2.16.0 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 1562a68067de..782efb24f48d 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.15.2"; + version = "2.16.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-zvr1O/HMSoZMtA/+dRO+co8Uy70qV8RPIDK3z8dRD28="; + sha256 = "sha256-J5L4xFdRV8eOJgILQqK0DhvP5/AXAmr7spzokhd4kcg="; }; - vendorSha256 = "sha256-UAjXCXypR1/SIJIZOS53LTyioKrXOECK9vh9t61W5gc="; + vendorSha256 = "sha256-y+xPuW8l3XvpnlqdlNIWdweNXMsAOrwbXHq2cJQRcOY="; doCheck = false; From ba5adb55e060bad6c53779028a57aa97d611c512 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 26 May 2022 10:05:45 +0800 Subject: [PATCH 04/14] biliass: init at 1.3.4 --- .../python-modules/biliass/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/biliass/default.nix diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix new file mode 100644 index 000000000000..fe2cd731a1ce --- /dev/null +++ b/pkgs/development/python-modules/biliass/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, protobuf +}: + +buildPythonPackage rec { + pname = "biliass"; + version = "1.3.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4="; + }; + + propagatedBuildInputs = [ protobuf ]; + + pythonImportsCheck = [ "biliass" ]; + + meta = with lib; { + homepage = "https://github.com/yutto-dev/biliass"; + description = "Convert Bilibili XML/protobuf danmaku to ASS subtitle"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ linsui ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9a20d8406cd..56890eb660f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2660,6 +2660,8 @@ with pkgs; bicon = callPackage ../applications/misc/bicon { }; + biliass = with python3.pkgs; toPythonApplication biliass; + bindfs = callPackage ../tools/filesystems/bindfs { }; binwalk = with python3Packages; toPythonApplication binwalk; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f10b43dfd67..edb98f6edf00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1225,6 +1225,8 @@ in { bids-validator = callPackage ../development/python-modules/bids-validator { }; + biliass = callPackage ../development/python-modules/biliass { }; + billiard = callPackage ../development/python-modules/billiard { }; bimmer-connected = callPackage ../development/python-modules/bimmer-connected { }; From 845591e71bfddb8751c0afb583e90b415d14f3d3 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 26 May 2022 10:06:05 +0800 Subject: [PATCH 05/14] yutto: init at 2.0.0b13 --- pkgs/tools/misc/yutto/default.nix | 51 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 55 insertions(+) create mode 100644 pkgs/tools/misc/yutto/default.nix diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix new file mode 100644 index 000000000000..3d60bad0a4cc --- /dev/null +++ b/pkgs/tools/misc/yutto/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pythonOlder +, poetry-core +, aiohttp +, aiofiles +, biliass +, dicttoxml +, colorama +, ffmpeg +, makeWrapper +}: + +buildPythonApplication rec { + pname = "yutto"; + version = "2.0.0b13"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-XqfbvlaJoRPpwnaUA52KloOsEOIt3YM0cq36DZN6lR8="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + aiofiles + biliass + dicttoxml + colorama + ]; + + preFixup = '' + makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) + ''; + + pythonImportsCheck = [ "yutto" ]; + + meta = with lib; { + description = "A Bilibili downloader"; + homepage = "https://github.com/yutto-dev/yutto"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ linsui ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56890eb660f8..7f520a38f426 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30938,6 +30938,8 @@ with pkgs; ytmdl = callPackage ../tools/misc/ytmdl { }; + yutto = with python3.pkgs; toPythonApplication yutto; + yuview = libsForQt5.yuview; zam-plugins = callPackage ../applications/audio/zam-plugins { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index edb98f6edf00..15671d171dc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11341,6 +11341,8 @@ in { yubico-client = callPackage ../development/python-modules/yubico-client { }; + yutto = callPackage ../tools/misc/yutto { }; + z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; z3 = (toPythonModule (pkgs.z3.override { From d0635186fe059a40d1155182bfd33ca0f265c40c Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 28 May 2022 13:31:56 +0800 Subject: [PATCH 06/14] eksctl: 0.98.0 -> 0.99.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index cbc2f4c900f2..cc2cffa82b2a 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.98.0"; + version = "0.99.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-9X7rk8+OSBZME9MsKQiTUVws+QaNSXZrVsZSXTSh4+I="; + sha256 = "sha256-J2d3Uyc/gYciQaZJnOw0piO90ixtqgdnC0gprIoWmvs="; }; - vendorSha256 = "sha256-YdXgfwQaYu/0V/ZO9lfusDdZBh1h26+DsA1HUODsKzU="; + vendorSha256 = "sha256-sRtFfJ7umVK8ruCpZ7TcTVcY9gr3Fldcf3KEdmbgkX4="; doCheck = false; From 45109ffcb8c2ef1998129cd52bd9685f0763b11d Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 28 May 2022 11:18:33 +0000 Subject: [PATCH 07/14] snowflake: 2.0.1 -> 2.2.0 --- pkgs/tools/networking/snowflake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 8535f18567da..fb343fac5a57 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "snowflake"; - version = "2.0.1"; + version = "2.2.0"; src = fetchgit { url = "https://git.torproject.org/pluggable-transports/${pname}"; rev = "v${version}"; - hash = "sha256-ULkqsh0DeFI1GsaVaHGSjoEY38EktvDVC52Sx6cQLOE="; + sha256 = "0iazamrfixv6yxc5m49adm97biq93pn6hwwpbh8yq558hrc6bh70"; }; - vendorSha256 = "D5A19UHL1WEE1ODT80jKT+PJ5CTXPjc9Eg6v2Nfm4aw="; + vendorSha256 = "1v7cpg3kny0vqmdbgcc7i61wi5gx5wvrv0hmjykjrqgrvyq764c1"; meta = with lib; { description = "System to defeat internet censorship"; From f0eb6d2059d307ff1a8fa2758b23bf2cdcde9897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 May 2022 22:23:56 +0000 Subject: [PATCH 08/14] python310Packages.pikepdf: fix build on aarch64-darwin --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index aa5a66826cbe..b3d34d823361 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -51,6 +51,10 @@ buildPythonPackage rec { }) ]; + postPatch = '' + sed -i 's|\S*/opt/homebrew.*|pass|' setup.py + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ From 57436c50ee9f1cb4bb9b6b18220d83f2dd5e4e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 May 2022 22:08:29 +0000 Subject: [PATCH 09/14] python310Packages.miniaudio: fix build on Darwin --- pkgs/development/python-modules/miniaudio/default.nix | 8 ++++++++ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index f0e5db4f0ecd..e18396accfcc 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -1,9 +1,12 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub , cffi , pytestCheckHook +, AudioToolbox +, CoreAudio }: buildPythonPackage rec { @@ -19,6 +22,11 @@ buildPythonPackage rec { sha256 = "16llwmbbd9445rwhl4v66kf5zd7yl3a94zm9xyllq6ij7vnhg5jb"; }; + buildInputs = lib.optionals stdenv.isDarwin [ + AudioToolbox + CoreAudio + ]; + propagatedNativeBuildInputs = [ cffi ]; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0ee37cbd6ab..e654aea72561 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5326,7 +5326,9 @@ in { minexr = callPackage ../development/python-modules/minexr { }; - miniaudio = callPackage ../development/python-modules/miniaudio { }; + miniaudio = callPackage ../development/python-modules/miniaudio { + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; + }; minidb = callPackage ../development/python-modules/minidb { }; From ab71980f5ce9dfae2004cd1b320fcb0166febfd5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 May 2022 04:20:00 +0000 Subject: [PATCH 10/14] ocrmypdf: install completions --- pkgs/development/python-modules/ocrmypdf/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 1a427dc379fd..3e75bb7fb8e2 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -18,11 +18,11 @@ , reportlab , setuptools-scm , setuptools-scm-git-archive -, stdenv , substituteAll , tesseract4 , tqdm , unpaper +, installShellFiles }: buildPythonPackage rec { @@ -35,7 +35,7 @@ buildPythonPackage rec { rev = "v${version}"; # The content of .git_archival.txt is substituted upon tarball creation, # which creates indeterminism if master no longer points to the tag. - # See https://github.com/jbarlow83/OCRmyPDF/issues/841 + # See https://github.com/ocrmypdf/OCRmyPDF/issues/841 postFetch = '' rm "$out/.git_archival.txt" ''; @@ -58,6 +58,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm-git-archive setuptools-scm + installShellFiles ]; propagatedBuildInputs = [ @@ -84,6 +85,12 @@ buildPythonPackage rec { "ocrmypdf" ]; + postInstall = '' + installShellCompletion --cmd ocrmypdf \ + --bash misc/completion/ocrmypdf.bash \ + --fish misc/completion/ocrmypdf.fish + ''; + meta = with lib; { homepage = "https://github.com/ocrmypdf/OCRmyPDF"; description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; From 65450988a59dc253a93148e6d9cd739a0e9e2083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 May 2022 23:57:50 +0000 Subject: [PATCH 11/14] python310Packages.ocrmypdf: fix build on Darwin With enabled sandbox we get PermissionError: [Errno 1] Operation not permitted when calling os.nice(). --- pkgs/development/python-modules/ocrmypdf/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 1a427dc379fd..738a5e43a02f 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , coloredlogs , fetchFromGitHub +, fetchpatch , ghostscript , img2pdf , importlib-metadata @@ -53,6 +54,11 @@ buildPythonPackage rec { tesseract = "${lib.getBin tesseract4}/bin/tesseract"; unpaper = "${lib.getBin unpaper}/bin/unpaper"; }) + # https://github.com/ocrmypdf/OCRmyPDF/pull/973 + (fetchpatch { + url = "https://github.com/ocrmypdf/OCRmyPDF/commit/808b24d59f5b541a335006aa6ea7cdc3c991adc0.patch"; + hash = "sha256-khsH70fWk5fStf94wcRKKX7cCbgD69LtKkngJIqA3+w="; + }) ]; nativeBuildInputs = [ From 213cac429ffc20729ac1e47cb5ba0baf701e4160 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 May 2022 03:35:27 +0000 Subject: [PATCH 12/14] gnome.eog: 42.1 -> 42.2 --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 5a2c410c2c06..b15c8e557cd1 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "42.1"; + version = "42.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/LEtXbyFYY3xSzDmMB5eHO+Dgq4nItL1WmQ1Adx8n60="; + sha256 = "sha256-Dk1Kai7hokCui1hEnwK6LGS3+ZSQ0LiRXX9SyQpYBF4="; }; patches = [ From d64d4c8fcc585abe3dc159a4d7091c0cc6cd5f10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 May 2022 03:46:59 +0000 Subject: [PATCH 13/14] gnome.gnome-maps: 42.1 -> 42.2 --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index a0d566c7ef9e..3ed33be4e98a 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CC+ElBAf080xvU8a6YgXEOMqUz+y3belcSJ5bJRm0q4="; + sha256 = "sha256-Xm0bDKfMk56pGq39pWM6hl6oX6VlADaGGyv+8L/QabE="; }; doCheck = true; From 64da60d311b10c2106dd2e1d05b58e20c6a9a8b3 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 13 May 2022 23:35:22 -0400 Subject: [PATCH 14/14] passage: init at unstable-2022-05-01 --- pkgs/tools/security/passage/default.nix | 44 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/security/passage/default.nix diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/tools/security/passage/default.nix new file mode 100644 index 000000000000..033b5e2028d1 --- /dev/null +++ b/pkgs/tools/security/passage/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper, bash, age, git ? null +, xclip ? null }: + +stdenv.mkDerivation { + pname = "passage"; + version = "unstable-2022-05-01"; + + src = fetchFromGitHub { + owner = "FiloSottile"; + repo = "passage"; + rev = "1262d308f09db9b243513a428ab4b8fb1c30d31d"; + sha256 = "1val8wl9kzlxj4i1rrh2iiyf97w9akffvr0idvbkdb09hfzz4lz8"; + }; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + extraPath = lib.makeBinPath [ age git xclip ]; + + # Using $0 is bad, it causes --help to mention ".passage-wrapped". + postInstall = '' + substituteInPlace $out/bin/passage --replace 'PROGRAM="''${0##*/}"' 'PROGRAM=passage' + wrapProgram $out/bin/passage --prefix PATH : $extraPath --argv0 $pname + ''; + + installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; + + meta = with lib; { + description = "Stores, retrieves, generates, and synchronizes passwords securely"; + homepage = "https://github.com/FiloSottile/passage"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kaction ]; + platforms = platforms.unix; + + longDescription = '' + passage is a fork of password-store (https://www.passwordstore.org) that uses + age (https://age-encryption.org) as a backend instead of GnuPG. + + It keeps passwords inside age(1) encrypted files inside a simple + directory tree and provides a series of commands for manipulating the + password store, allowing the user to add, remove, edit and synchronize + passwords. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa41be37c439..2dd27171968e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2392,6 +2392,8 @@ with pkgs; pass = callPackage ../tools/security/pass { }; + passage = callPackage ../tools/security/passage { }; + passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { };