Fix derivations

Julien LepillerWed Jun 16 15:48:07+0200 2021

33cb03b

Fix derivations

more/packages/binary.scm

4040
  #:use-module (more packages python)
4141
  #:use-module (more packages smt))
4242
43+
(define python2-bitstring (package-with-python2 python-bitstring))
44+
(define python2-utils (package-with-python2 python-utils))
45+
(define python2-progressbar2 (package-with-python2 python-progressbar2))
46+
(define python2-cachetools (package-with-python2 python-cachetools))
47+
4348
(define-public python-pyelftools
4449
  (package
4550
    (name "python-pyelftools")

more/packages/python.scm

6767
6868
(define-public python2-cooldict
6969
  (package-with-python2 python-cooldict))
70-
 
70+
7171
(define-public python-bintrees
7272
  (package
7373
    (name "python-bintrees")

9292
9393
(define-public python2-bintrees
9494
  (package-with-python2 python-bintrees))
95-
 
95+
9696
(define-public python2-dpkt
9797
  (package
9898
    (name "python2-dpkt")

229229
(define-public python2-ana
230230
  (package-with-python2 python-ana))
231231
232+
(define-public python-plumbum
233+
  (package
234+
    (name "python-plumbum")
235+
    (version "1.6.5")
236+
    (source (origin
237+
              (method url-fetch)
238+
              (uri (pypi-uri "plumbum" version))
239+
              (sha256
240+
               (base32
241+
                "1vjbl9qy9fkl3vwiiwpaafmyxfks2sc3b3dhkp4vdgk2pdcv1ayq"))))
242+
    (build-system python-build-system)
243+
    (native-inputs
244+
     `(("pytest" ,python-pytest)))
245+
    (home-page "https://plumbum.readthedocs.io/en/latest")
246+
    (synopsis "Shell script-like programs in Python")
247+
    (description
248+
      "Plumbum (Latin for lead, which was used to create pipes back in the day)
249+
is a small yet feature-rich library for shell script-like programs in Python.
250+
The motto of the library is ???Never write shell scripts again???, and thus it
251+
attempts to mimic the shell syntax (???shell combinators???) where it makes sense,
252+
while keeping it all Pythonic and cross-platform.")
253+
    (license license:expat)))
254+
255+
(define-public python2-plumbum
256+
  (package-with-python2 python-plumbum))
257+
232258
(define-public python-cymruwhois
233259
  (package
234260
    (name "python-cymruwhois")

435461
    (synopsis "")
436462
    (description "")
437463
    (license license:agpl3+)))
464+
465+
(define-public python-neovim
466+
  (package
467+
    (name "python-neovim")
468+
    (version "0.3.2")
469+
    (source (origin
470+
              (method url-fetch)
471+
              (uri (pypi-uri "pynvim" version))
472+
              (sha256
473+
               (base32
474+
                "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g"))))
475+
    (build-system python-build-system)
476+
    (propagated-inputs
477+
     `(("python-greenlet" ,python-greenlet)
478+
       ("python-msgpack" ,python-msgpack)))
479+
    (arguments
480+
     `(#:tests? #f))
481+
    (home-page "https://github.com/neovim/pynvim")
482+
    (synopsis "")
483+
    (description "")
484+
    (license license:asl2.0)))

more/packages/virtualbox.scm

236236
       ("lvm2" ,lvm2)
237237
       ("mesa" ,mesa)
238238
       ("python" ,python-2)
239-
       ("qt" ,qt)
239+
       ("qt" ,qtbase)
240240
       ("openssl" ,openssl)
241241
       ("sdl" ,sdl)))
242242
    (arguments