git.iko.soy/typeable/nixpkgs
on master help sign in
jetbrains.mps: 2019.1.5 -> 2019.2
commitcc1fcec27829ba02495c95a010a65231c6ec48ab authorAlexey Shmalko <rasen.dubi@gmail.com> dateTue 27 Aug 2019, 12:21 (7 years ago) parent7a8bbb6
3 files changed+32−112
pkgs/applications/editors/jetbrains/default.nix+32−35 pkgs/development/compilers/jetbrains-jdk/8.nix−75 pkgs/top-level/all-packages.nix−2
pkgs/applications/editors/jetbrains/default.nix+32−35
@@ -1,6 +1,6 @@
11{ lib, stdenv, callPackage, fetchurl
22, python
3−, jdk, jdk8, cmake, libxml2, zlib, python3, ncurses
3+, jdk, cmake, libxml2, zlib, python3, ncurses
44}:
55
66with stdenv.lib;
@@ -138,6 +138,24 @@ let
138138 };
139139 });
140140
141+ buildMps = { name, version, src, license, description, wmClass, ... }:
142+ (mkJetBrainsProduct rec {
143+ inherit name version src wmClass jdk;
144+ product = "MPS";
145+ meta = with stdenv.lib; {
146+ homepage = https://www.jetbrains.com/mps/;
147+ inherit license description;
148+ longDescription = ''
149+ A metaprogramming system which uses projectional editing
150+ which allows users to overcome the limits of language
151+ parsers, and build DSL editors, such as ones with tables and
152+ diagrams.
153+ '';
154+ maintainers = with maintainers; [ rasendubi ];
155+ platforms = platforms.linux;
156+ };
157+ });
158+
141159 buildPhpStorm = { name, version, src, license, description, wmClass, ... }:
142160 (mkJetBrainsProduct {
143161 inherit name version src wmClass jdk;
@@ -243,27 +261,6 @@ let
243261 rm -r jre64
244262 '';
245263 });
246−
247− buildMps = { name, version, src, license, description, wmClass, ... }:
248− (mkJetBrainsProduct rec {
249− inherit name version src wmClass;
250− # MPS does not yet work with jbrsdk11 as of 2019.1.5 (it starts
251− # but is unable to generate any project)
252− jdk = jdk8;
253− product = "MPS";
254− meta = with stdenv.lib; {
255− homepage = https://www.jetbrains.com/mps/;
256− inherit license description;
257− longDescription = ''
258− A metaprogramming system which uses projectional editing
259− which allows users to overcome the limits of language
260− parsers, and build DSL editors, such as ones with tables and
261− diagrams.
262− '';
263− maintainers = with maintainers; [ rasendubi ];
264− platforms = platforms.linux;
265− };
266− });
267264in
268265
269266{
@@ -334,6 +331,19 @@ in
334331 update-channel = "IntelliJ IDEA RELEASE";
335332 };
336333
334+ mps = buildMps rec {
335+ name = "mps-${version}";
336+ version = "2019.2";
337+ description = "Create your own domain-specific language";
338+ license = stdenv.lib.licenses.unfree;
339+ src = fetchurl {
340+ url = "https://download.jetbrains.com/mps/2019.2/MPS-${version}.tar.gz";
341+ sha256 = "0rph3bibj74ddbyrn0az1npn4san4g1alci8nlq4gaqdlcz6zx22";
342+ };
343+ wmClass = "jetbrains-mps";
344+ update-channel = "MPS RELEASE";
345+ };
346+
337347 phpstorm = buildPhpStorm rec {
338348 name = "phpstorm-${version}";
339349 version = "2019.1.3"; /* updated by script */
@@ -412,17 +422,4 @@ in
412422 update-channel = "WebStorm RELEASE";
413423 };
414424
415− mps = buildMps rec {
416− name = "mps-${version}";
417− version = "2019.1.5";
418− description = "Create your own domain-specific language";
419− license = stdenv.lib.licenses.unfree;
420− src = fetchurl {
421− url = "https://download.jetbrains.com/mps/2019.1/MPS-${version}.tar.gz";
422− sha256 = "0bq1gxciw9p9nd2h9vcill8rb6ghkjjj7b0dh812vx75rsfwsvl4";
423− };
424− wmClass = "jetbrains-mps";
425− update-channel = "MPS RELEASE";
426− };
427−
428425}
pkgs/development/compilers/jetbrains-jdk/8.nixdeleted−75
@@ -1,75 +0,0 @@
1−{ stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
2−, libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
3−, gdk-pixbuf, atk, zlib }:
4−
5−# TODO: Investigate building from source instead of patching binaries.
6−# TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux
7−
8−let drv = stdenv.mkDerivation rec {
9− pname = "jbrsdk8";
10− version = "212-1586.12";
11−
12− src = if stdenv.hostPlatform.system == "x86_64-linux" then
13− fetchurl {
14− url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-8u${lib.head (lib.splitString "-" version)}-linux-x64-b${lib.elemAt (lib.splitString "-" version) 1}.tar.gz";
15− sha256 = "1vdqhkx3fz26s7bj7vw3cbq8856crj19535ix0szvwjpjg6ca8zk";
16− }
17− else
18− throw "unsupported system: ${stdenv.hostPlatform.system}";
19−
20− nativeBuildInputs = [ file ];
21−
22− unpackCmd = "mkdir jdk; pushd jdk; tar -xzf $src; popd";
23−
24− installPhase = ''
25− cd ..
26−
27− mv $sourceRoot $out
28− jrePath=$out/jre
29− '';
30−
31− postFixup = let
32− arch = "amd64";
33− rSubPaths = [
34− "lib/${arch}/jli"
35− "lib/${arch}/server"
36− "lib/${arch}/xawt"
37− "lib/${arch}"
38− ];
39− in ''
40− rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
41− find $out -type f -perm -0100 \
42− -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
43− --set-rpath "$rpath" {} \;
44− find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
45− '';
46−
47− rpath = lib.makeLibraryPath ([
48− stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
49− alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk
50− (placeholder "out")
51− ] ++ (with xorg; [
52− libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
53− ]));
54−
55− passthru.home = drv;
56−
57− meta = with stdenv.lib; {
58− description = "An OpenJDK fork to better support Jetbrains's products.";
59− longDescription = ''
60− JetBrains Runtime is a runtime environment for running IntelliJ Platform
61− based products on Windows, Mac OS X, and Linux. JetBrains Runtime is
62− based on OpenJDK project with some modifications. These modifications
63− include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI
64− support, ligatures, some fixes for native crashes not presented in
65− official build, and other small enhancements.
66−
67− JetBrains Runtime is not a certified build of OpenJDK. Please, use at
68− your own risk.
69− '';
70− homepage = https://bintray.com/jetbrains/intellij-jbr/;
71− license = licenses.gpl2;
72− maintainers = with maintainers; [ rasendubi ];
73− platforms = with platforms; [ "x86_64-linux" ];
74− };
75−}; in drv
pkgs/top-level/all-packages.nix−2
@@ -18430,10 +18430,8 @@ in
1843018430
1843118431 jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
1843218432 jdk = jetbrains.jdk;
18433− jdk8 = jetbrains.jdk8;
1843418433 }) // {
1843518434 jdk = callPackage ../development/compilers/jetbrains-jdk { };
18436− jdk8 = callPackage ../development/compilers/jetbrains-jdk/8.nix { };
1843718435 });
1843818436
1843918437 libquvi = callPackage ../applications/video/quvi/library.nix { };