nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-31 22:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #165255 from rien/master

Browse Source
This commit is contained in:
Matthieu Coudron 2022-03-25 16:35:55 +01:00 committed by GitHub
commit b861f07f82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/mailreaders/alot/default.nix
View File

@ -9,13 +9,7 @@
, withManpage ? false , withManpage ? false
}: }:
with python3.pkgs; with python3.pkgs; buildPythonApplication rec {
let
notmuch2 = callPackage ./notmuch.nix {
inherit notmuch;
};
in
buildPythonApplication rec {
pname = "alot"; pname = "alot";
version = "0.10"; version = "0.10";

7
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -62,7 +62,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
makeFlags = [ "V=1" ]; makeFlags = [ "V=1" ];
outputs = [ "out" "man" "info" ] postConfigure = ''
mkdir ${placeholder "bindingconfig"}
cp bindings/python-cffi/_notmuch_config.py ${placeholder "bindingconfig"}/
'';
outputs = [ "out" "man" "info" "bindingconfig" ]
++ lib.optional withEmacs "emacs" ++ lib.optional withEmacs "emacs"
++ lib.optional withRuby "ruby"; ++ lib.optional withRuby "ruby";

6
pkgs/applications/networking/mailreaders/alot/notmuch.nix → pkgs/development/python-modules/notmuch2/default.nix
View File

@ -14,6 +14,12 @@ buildPythonPackage {
buildInputs = [ python notmuch cffi ]; buildInputs = [ python notmuch cffi ];
# since notmuch 0.35, this package expects _notmuch_config.py that is
# generated by notmuch's configure script
postPatch = ''
cp ${notmuch.bindingconfig}/_notmuch_config.py .
'';
# no tests # no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "notmuch2" ]; pythonImportsCheck = [ "notmuch2" ];

4
pkgs/top-level/python-packages.nix
View File

@ -5617,6 +5617,10 @@ in {
inherit (pkgs) notmuch; inherit (pkgs) notmuch;
}; };
notmuch2 = callPackage ../development/python-modules/notmuch2 {
inherit (pkgs) notmuch;
};
nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; nototools = callPackage ../data/fonts/noto-fonts/tools.nix { };
notus-scanner = callPackage ../development/python-modules/notus-scanner { }; notus-scanner = callPackage ../development/python-modules/notus-scanner { };