Change intellij-2013 to intellij-130

Julien LepillerSat Sep 07 22:12:30+0200 2019

ea62e68

Change intellij-2013 to intellij-130

more/packages/intellij.scm

4343 
  #:use-module (gnu packages xml)
4444 
  #:use-module (more packages java))
4545 
46-
;(define intellij-community-2013-commit "8bc091c3131a888b5400c63a9e51eb0bc7fbe0fb")
47-
;; Take a random old commit that has the right files
48-
;(define intellij-community-2013-commit "f116b27261f9dea1c0f00b90ad09d58c6e2fa2f2")
49-
(define intellij-community-2013-commit "32cf812a36e0efd8d7859378b52c0ea3b1e3e321")
50-
(define intellij-community-2013-version (git-version "0.0.0" "0"
51-
                                                     intellij-community-2013-commit))
46+
(define intellij-community-130-commit "de6f73b5706c3c23c8f46bcf3761e48fa3e0f95b")
47+
(define intellij-community-130-version (git-version "130" "0"
48+
                                                     intellij-community-130-commit))
5249 
5350 
;; The release page on github is a mess
5451 
(define intellij-community-version "182.5262.8")
…
7875 
                                    intellij-community-commit
7976 
                                    intellij-community-version
8077 
                                    "17qzhh2kw6sxwkyj7ng7hrpbcf2rjs2xjbsrg1bgkg90r5kb8sm4"))
81-
;(define intellij-community-2013-source (get-intellij-community-source
82-
;                                        intellij-community-2013-commit
83-
;                                        intellij-community-2013-version
84-
;                                        "0z5rq713lf7q2x0c0sb0r1ha2pszcyygddh7r12wyzf5p0iiy1im"))
85-
(define intellij-community-2013-source (get-intellij-community-source
86-
                                        intellij-community-2013-commit
87-
                                        intellij-community-2013-version
88-
                                        "1r9jrmbc634zlg3gvqmlqlhi0sf2sjgvgnc3an5wfz1w8izbk6ji"))
78+
(define intellij-community-130-source (get-intellij-community-source
79+
				       intellij-community-130-commit
80+
				       intellij-community-130-version
81+
				       "153sasksydpm0i8ppmg71fdh17ycnvdz3mny987vmq4jdm0a4djp"))
8982 
9083 
(define (strip-intellij-variant variant-property base)
9184 
  (package
…
118111 
        (propagated-inputs (map-inputs (package-propagated-inputs base)))
119112 
        (inputs (map-inputs (package-inputs base)))))))
120113 
121-
(define-public (intellij-2013-package base)
122-
  (package-intellij-for-explicit-version intellij-community-2013-version
123-
                                         intellij-community-2013-source
124-
                                         'intellij-2013-variant
114+
(define-public (intellij-130-package base)
115+
  (package-intellij-for-explicit-version intellij-community-130-version
116+
                                         intellij-community-130-source
117+
                                         'intellij-130-variant
125118 
                                         base))
126-
(define-public (strip-2013-variant base)
127-
  (strip-intellij-variant 'intellij-2013-variant base))
119+
(define-public (strip-130-variant base)
120+
  (strip-intellij-variant 'intellij-130-variant base))
128121 
129122 
(define-public java-intellij-compiler-instrumentation-util
130123 
  (package
…
152145 
    (description "")
153146 
    (license license:asl2.0)))
154147 
155-
(define-public java-jdom-for-intellij-2013
148+
(define-public java-jdom-for-intellij-130
156149 
  (package
157150 
    (inherit java-jdom)
158151 
    (version "0")
…
160153 
              (method url-fetch)
161154 
              (uri (string-append "https://github.com/JetBrains/"
162155 
                                  "intellij-community/raw/"
163-
                                  intellij-community-2013-commit
156+
                                  intellij-community-130-commit
164157 
                                  "/lib/src/jdom.zip"))
165158 
              (sha256
166159 
               (base32
…
174167 
    (native-inputs
175168 
     `(("unzip" ,unzip)))))
176169 
177-
(define-public java-jsr166e-for-intellij-2013
170+
(define-public java-jsr166e-for-intellij-130
178171 
  (package
179172 
    (name "java-jsr166e")
180173 
    (version "0")
…
182175 
              (method url-fetch)
183176 
              (uri (string-append "https://github.com/JetBrains/"
184177 
                                  "intellij-community/raw/"
185-
                                  intellij-community-2013-commit
178+
                                  intellij-community-130-commit
186179 
                                  "/lib/src/jsr166e_src.jar"))
187180 
              (sha256
188181 
               (base32
…
289282 
       ("java-trove4j-intellij" ,java-trove4j-intellij)
290283 
       ("java-w3c-svg" ,java-w3c-svg)))
291284 
    (properties
292-
     `((intellij-2013-variant . ,(delay java-intellij-platform-util-2013))))
285+
     `((intellij-130-variant . ,(delay java-intellij-platform-util-130))))
293286 
    (home-page "https://github.com/JetBrains/intellij-community")
294287 
    (synopsis "")
295288 
    (description "")
296289 
    (license license:asl2.0)))
297290 
298-
(define-public java-intellij-platform-util-2013
299-
  (let ((base (intellij-2013-package (strip-2013-variant java-intellij-platform-util))))
291+
(define-public java-intellij-platform-util-130
292+
  (let ((base (intellij-130-package (strip-130-variant java-intellij-platform-util))))
300293 
    (package
301294 
      (inherit base)
302295 
      (propagated-inputs
…
305298 
                 ("java-batik-1.7" ,java-batik-1.7)
306299 
                 ("java-cglib" ,java-cglib)
307300 
                 ("java-iq80-snappy" ,java-iq80-snappy)
308-
                 ("java-jdom" ,java-jdom-for-intellij-2013)
309-
                 ("java-jsr166e-for-intellij-2013" ,java-jsr166e-for-intellij-2013)
301+
                 ("java-jdom" ,java-jdom-for-intellij-130)
302+
                 ("java-jsr166e-for-intellij-130" ,java-jsr166e-for-intellij-130)
310303 
                 ("java-picocontainer-1" ,java-picocontainer-1)
311304 
                 ("java-xstream" ,java-xstream))))
312305 
      (inputs
313306 
       `(("java-eawtstub" ,java-eawtstub)))
314307 
      (arguments
315-
        (substitute-keyword-arguments (package-arguments base)
316-
          ((#:phases phases)
317-
           `(modify-phases ,phases
318-
              (delete 'remove-apple)
319-
              (add-before 'build 'fix-newer-jdk
320-
                (lambda _
321-
                  (substitute* "platform/util/src/com/intellij/ui/mac/foundation/Foundation.java"
322-
                    (("public static class NSRect extends Structure implements Structure.ByValue.*")
323-
                     "public static class NSRect extends Structure implements Structure.ByValue {
308+
       `(;#:jdk ,icedtea-7
309+
         ,@(substitute-keyword-arguments (package-arguments base)
310+
            ((#:phases phases)
311+
             `(modify-phases ,phases
312+
                (delete 'remove-apple)
313+
                (add-before 'build 'fix-newer-jdk
314+
                  (lambda _
315+
                    (substitute* "platform/util/src/com/intellij/ui/mac/foundation/Foundation.java"
316+
                      (("public static class NSRect extends Structure implements Structure.ByValue.*")
317+
                       "public static class NSRect extends Structure implements Structure.ByValue {
324318 
@Override
325319 
protected java.util.List<String> getFieldOrder() {
326320 
  return java.util.Arrays.asList(new String[]{\"origin\", \"size\"});
327321 
}")
328-
                    (("public static class NSPoint extends Structure implements Structure.ByValue.*")
329-
                     "public static class NSPoint extends Structure implements Structure.ByValue {
322+
                      (("public static class NSPoint extends Structure implements Structure.ByValue.*")
323+
                       "public static class NSPoint extends Structure implements Structure.ByValue {
330324 
@Override
331325 
protected java.util.List<String> getFieldOrder() {
332326 
  return java.util.Arrays.asList(new String[]{\"x\", \"y\"});
333327 
}")
334-
                    (("public static class NSSize extends Structure implements Structure.ByValue.*")
335-
                     "public static class NSSize extends Structure implements Structure.ByValue {
328+
                      (("public static class NSSize extends Structure implements Structure.ByValue.*")
329+
                       "public static class NSSize extends Structure implements Structure.ByValue {
336330 
@Override
337331 
protected java.util.List<String> getFieldOrder() {
338332 
  return java.util.Arrays.asList(new String[]{\"width\", \"height\"});
339333 
}"))
340-
                  #t)))))))))
334+
                    #t))))))))))
341335 
342336 
(define-public java-intellij-platform-extensions
343337 
  (package
…
379373 
       ("java-jetbrains-annotations" ,java-jetbrains-annotations)
380374 
       ("java-trove4j-intellij" ,java-trove4j-intellij)))
381375 
    (properties
382-
     `((intellij-2013-variant . ,(delay java-intellij-platform-core-api-2013))))
376+
     `((intellij-130-variant . ,(delay java-intellij-platform-core-api-130))))
383377 
    (home-page "https://github.com/JetBrains/intellij-community")
384378 
    (synopsis "")
385379 
    (description "")
386380 
    (license license:asl2.0)))
387381 
388-
(define-public java-intellij-platform-core-api-2013
389-
  (let ((base (intellij-2013-package
390-
                (strip-2013-variant java-intellij-platform-core-api))))
382+
(define-public java-intellij-platform-core-api-130
383+
  (let ((base (intellij-130-package
384+
                (strip-130-variant java-intellij-platform-core-api))))
391385 
    (package
392386 
      (inherit base)
393387 
      (propagated-inputs
…
437431 
       ("java-intellij-platform-boot" ,java-intellij-platform-boot)
438432 
       ("java-intellij-platform-core-api" ,java-intellij-platform-core-api)))
439433 
    (properties
440-
     `((intellij-2013-variant . ,(delay java-intellij-platform-core-impl-2013))))
434+
     `((intellij-130-variant . ,(delay java-intellij-platform-core-impl-130))))
441435 
    (home-page "https://github.com/JetBrains/intellij-community")
442436 
    (synopsis "")
443437 
    (description "")
444438 
    (license license:asl2.0)))
445439 
446-
(define-public java-intellij-platform-core-impl-2013
447-
  (let ((base (intellij-2013-package
448-
                (strip-2013-variant java-intellij-platform-core-impl))))
440+
(define-public java-intellij-platform-core-impl-130
441+
  (let ((base (intellij-130-package
442+
                (strip-130-variant java-intellij-platform-core-impl))))
449443 
    (package
450444 
      (inherit base)
451445 
      (propagated-inputs
…
517511 
       ("java-jetbrains-annotations" ,java-jetbrains-annotations)
518512 
       ("java-streamex" ,java-streamex)))
519513 
    (properties
520-
     `((intellij-2013-variant . ,(delay java-intellij-java-psi-impl-2013))))
514+
     `((intellij-130-variant . ,(delay java-intellij-java-psi-impl-130))))
521515 
    (home-page "https://github.com/JetBrains/intellij-community")
522516 
    (synopsis "")
523517 
    (description "")
524518 
    (license license:asl2.0)))
525519 
526-
(define-public java-intellij-java-psi-impl-2013
527-
  (let ((base (intellij-2013-package
528-
                (strip-2013-variant java-intellij-java-psi-impl))))
520+
(define-public java-intellij-java-psi-impl-130
521+
  (let ((base (intellij-130-package
522+
                (strip-130-variant java-intellij-java-psi-impl))))
529523 
    (package
530524 
      (inherit base)
531525 
      (arguments
more/packages/kotlin.scm
7171 
(define-public kotlin-0
7272 
  (package
7373 
    (name "kotlin")
74-
    (version "0.4.424")
74+
    (version "0.6.717")
7575 
    (source (origin
7676 
              (method git-fetch)
7777 
              (uri (git-reference
7878 
                     (url "https://github.com/JetBrains/kotlin")
7979 
                     ;; build-0.4.424
80-
                     (commit "2f47e30a1a12347759dbb8707f5137178de65696")))
80+
                     (commit (string-append "build-" version))))
8181 
              (file-name (git-file-name name version))
8282 
              (sha256
8383 
               (base32
84-
                "0f60v3swyrkh41c4lhha64njivvsnr7p6yz7i1vjmvs697pjvqg2"))
84+
                "1a45yr5b0rc4girkva4d6x57iqzs174dw6wsdiwyllqkllp5k16y"))
8585 
              ;(patches
8686 
              ;  (search-patches "kotlin-Update-for-dependencies.patch"))
8787 
              (modules '((guix build utils)))
…
148148 
       ("java-asm-commons" ,java-asm-commons-7)
149149 
       ("java-former-dart-ast" ,java-former-dart-ast)
150150 
       ("java-guava" ,java-guava)
151-
       ("java-intellij-java-psi-api" ,(intellij-2013-package java-intellij-java-psi-api))
152-
       ("java-intellij-java-psi-impl" ,(intellij-2013-package java-intellij-java-psi-impl))
153-
       ("java-intellij-platform-core-api" ,(intellij-2013-package java-intellij-platform-core-api))
154-
       ("java-intellij-platform-core-impl" ,(intellij-2013-package java-intellij-platform-core-impl))
155-
       ("java-intellij-platform-extensions" ,(intellij-2013-package java-intellij-platform-extensions))
156-
       ("java-intellij-platform-util" ,(intellij-2013-package java-intellij-platform-util))
157-
       ("java-intellij-platform-util-rt" ,(intellij-2013-package java-intellij-platform-util-rt))
151+
       ("java-intellij-java-psi-api" ,(intellij-130-package java-intellij-java-psi-api))
152+
       ("java-intellij-java-psi-impl" ,(intellij-130-package java-intellij-java-psi-impl))
153+
       ("java-intellij-platform-core-api" ,(intellij-130-package java-intellij-platform-core-api))
154+
       ("java-intellij-platform-core-impl" ,(intellij-130-package java-intellij-platform-core-impl))
155+
       ("java-intellij-platform-extensions" ,(intellij-130-package java-intellij-platform-extensions))
156+
       ("java-intellij-platform-util" ,(intellij-130-package java-intellij-platform-util))
157+
       ("java-intellij-platform-util-rt" ,(intellij-130-package java-intellij-platform-util-rt))
158158 
       ("java-javax-inject" ,java-javax-inject)
159159 
       ("java-jline-2" ,java-jline-2)
160160 
       ("java-jsr305" ,java-jsr305)