gnu: python-notmuch2: Use new style.
* gnu/packages/mail.scm (python-notmuch2)[version]: Explicitly inherit from notmuch. [arguments]: Use list of G-Expressions.
This commit is contained in:
		
							parent
							
								
									8d33d7b42f
								
							
						
					
					
						commit
						7258c90572
					
				
					 1 changed files with 28 additions and 26 deletions
				
			
		| 
						 | 
					@ -1486,34 +1486,36 @@ and search library.")
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (inherit python-notmuch)
 | 
					    (inherit python-notmuch)
 | 
				
			||||||
    (name "python-notmuch2")
 | 
					    (name "python-notmuch2")
 | 
				
			||||||
 | 
					    (version (package-version notmuch))
 | 
				
			||||||
    (propagated-inputs (list python-cffi))
 | 
					    (propagated-inputs (list python-cffi))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:phases
 | 
					     (list
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					      #:phases
 | 
				
			||||||
         ;; This python package lives in a subdirectory of the notmuch source
 | 
					      #~(modify-phases %standard-phases
 | 
				
			||||||
         ;; tree, so chdir into it before building.
 | 
					          ;; This python package lives in a subdirectory of the notmuch source
 | 
				
			||||||
         (add-after 'unpack 'enter-python-dir
 | 
					          ;; tree, so chdir into it before building.
 | 
				
			||||||
           (lambda _ (chdir "bindings/python-cffi")))
 | 
					          (add-after 'unpack 'enter-python-dir
 | 
				
			||||||
         ;; python-build-system does not invoke the configure script
 | 
					            (lambda _ (chdir "bindings/python-cffi")))
 | 
				
			||||||
         ;; so _notmuch_config.py is missing
 | 
					          ;; python-build-system does not invoke the configure script
 | 
				
			||||||
         (add-after 'enter-python-dir 'create-notmuch-config
 | 
					          ;; so _notmuch_config.py is missing
 | 
				
			||||||
           (lambda* (#:key inputs #:allow-other-keys)
 | 
					          (add-after 'enter-python-dir 'create-notmuch-config
 | 
				
			||||||
             (with-output-to-file "_notmuch_config.py"
 | 
					            (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
               (lambda _
 | 
					              (with-output-to-file "_notmuch_config.py"
 | 
				
			||||||
                 (display
 | 
					                (lambda _
 | 
				
			||||||
                  (string-append
 | 
					                  (display
 | 
				
			||||||
                   "NOTMUCH_INCLUDE_DIR="
 | 
					                   (string-append
 | 
				
			||||||
                   "'" (dirname (search-input-file inputs "include/notmuch.h")) "'\n"
 | 
					                    "NOTMUCH_INCLUDE_DIR="
 | 
				
			||||||
                   "NOTMUCH_LIB_DIR="
 | 
					                    "'" (dirname (search-input-file inputs "include/notmuch.h")) "'\n"
 | 
				
			||||||
                   "'" (dirname (search-input-file inputs "lib/libnotmuch.so")) "'"))))))
 | 
					                    "NOTMUCH_LIB_DIR="
 | 
				
			||||||
         ;; version.txt is not included in notmuch, so we patch in the version number
 | 
					                    "'" (dirname (search-input-file inputs "lib/libnotmuch.so")) "'"))))))
 | 
				
			||||||
         (add-after 'create-notmuch-config 'patch-setup.py
 | 
					          ;; version.txt is not included in notmuch, so we patch in the version number
 | 
				
			||||||
           (lambda _
 | 
					          (add-after 'create-notmuch-config 'patch-setup.py
 | 
				
			||||||
             (substitute* "setup.py"
 | 
					            (lambda _
 | 
				
			||||||
               (("NOTMUCH_VERSION_FILE")
 | 
					              (substitute* "setup.py"
 | 
				
			||||||
                "'/dev/null'")
 | 
					                (("NOTMUCH_VERSION_FILE")
 | 
				
			||||||
               (("version=VERSION,")
 | 
					                 "'/dev/null'")
 | 
				
			||||||
                (string-append "version='" ,(package-version this-package) "',"))))))))
 | 
					                (("version=VERSION,")
 | 
				
			||||||
 | 
					                 (string-append "version='" #$version "',"))))))))
 | 
				
			||||||
    (synopsis "Pythonic bindings for the notmuch mail database using CFFI")
 | 
					    (synopsis "Pythonic bindings for the notmuch mail database using CFFI")
 | 
				
			||||||
    (license license:gpl3+)))
 | 
					    (license license:gpl3+)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue