Use older intellij to reduce errors in kotlin@0

Julien LepillerWed Jun 05 23:45:05+0200 2019

0e899a0

Use older intellij to reduce errors in kotlin@0

more/packages/intellij.scm

4545 
4646 
;(define intellij-community-2013-commit "8bc091c3131a888b5400c63a9e51eb0bc7fbe0fb")
4747 
;; Take a random old commit that has the right files
48-
(define intellij-community-2013-commit "f116b27261f9dea1c0f00b90ad09d58c6e2fa2f2")
48+
;(define intellij-community-2013-commit "f116b27261f9dea1c0f00b90ad09d58c6e2fa2f2")
49+
(define intellij-community-2013-commit "32cf812a36e0efd8d7859378b52c0ea3b1e3e321")
4950 
(define intellij-community-2013-version (git-version "0.0.0" "0"
5051 
                                                     intellij-community-2013-commit))
5152 
…
8485 
(define intellij-community-2013-source (get-intellij-community-source
8586 
                                        intellij-community-2013-commit
8687 
                                        intellij-community-2013-version
87-
                                        "095xj9kyg5x6gzqpswgv48zqzwcy5ijfkmmifshffkilq0m0sqng"))
88+
                                        "1r9jrmbc634zlg3gvqmlqlhi0sf2sjgvgnc3an5wfz1w8izbk6ji"))
8889 
8990 
(define (strip-intellij-variant variant-property base)
9091 
  (package
…
300301 
      (inherit base)
301302 
      (propagated-inputs
302303 
       (append (alist-delete "java-jdom-for-intellij" (package-propagated-inputs base))
303-
               `(("java-batik-1.7" ,java-batik-1.7)
304+
               `(("java-asm" ,java-asm)
305+
                 ("java-batik-1.7" ,java-batik-1.7)
306+
                 ("java-cglib" ,java-cglib)
304307 
                 ("java-iq80-snappy" ,java-iq80-snappy)
305308 
                 ("java-jdom" ,java-jdom-for-intellij-2013)
306309 
                 ("java-jsr166e-for-intellij-2013" ,java-jsr166e-for-intellij-2013)
307-
                 ("java-picocontainer-1" ,java-picocontainer-1))))
310+
                 ("java-picocontainer-1" ,java-picocontainer-1)
311+
                 ("java-xstream" ,java-xstream))))
308312 
      (inputs
309313 
       `(("java-eawtstub" ,java-eawtstub)))
310314 
      (arguments
…
389393 
      (propagated-inputs
390394 
       (append (package-propagated-inputs base)
391395 
               `(("java-asm" ,java-asm)
392-
                 ("java-cglib" ,java-cglib))))
393-
      (arguments
394-
       (append
395-
         (package-arguments base)
396-
         `(#:phases
397-
           (modify-phases %standard-phases
398-
             (add-before 'build 'fix-cglib-asm
399-
               (lambda _
400-
                 ;; needed for platform-impl, but we don't build it
401-
                 (delete-file-recursively "platform/core-api/src/net")
402-
                 #t)))))))))
396+
                 ("java-cglib" ,java-cglib)))))))
403397 
404398 
(define-public java-intellij-platform-boot
405399 
  (package
…
442436 
     `(("java-guava" ,java-guava)
443437 
       ("java-intellij-platform-boot" ,java-intellij-platform-boot)
444438 
       ("java-intellij-platform-core-api" ,java-intellij-platform-core-api)))
439+
    (properties
440+
     `((intellij-2013-variant . ,(delay java-intellij-platform-core-impl-2013))))
445441 
    (home-page "https://github.com/JetBrains/intellij-community")
446442 
    (synopsis "")
447443 
    (description "")
448444 
    (license license:asl2.0)))
449445 
446+
(define-public java-intellij-platform-core-impl-2013
447+
  (let ((base (intellij-2013-package
448+
                (strip-2013-variant java-intellij-platform-core-impl))))
449+
    (package
450+
      (inherit base)
451+
      (propagated-inputs
452+
       (append (package-propagated-inputs base)
453+
               `(("java-snappy" ,java-snappy)))))))
454+
450455 
(define-public java-intellij-java-psi-api
451456 
  (package
452457 
    (name "java-intellij-java-psi-api")
…
525530 
      (inherit base)
526531 
      (arguments
527532 
        (substitute-keyword-arguments (package-arguments base)
533+
          ((#:source-dir _)
534+
           "java/java-psi-impl/src")
528535 
          ((#:phases phases)
529536 
           `(modify-phases ,phases
530537 
              (add-before 'build 'fix-asm