Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d9c847236b91
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 741faf7d9068
Choose a head ref
  • 9 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 24, 2020

  1. jetbrains.jdk: 485.1 -> 520.30

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    f1a7a7b View commit details

  2. jetbrains.clion: 2019.3.2 -> 2019.3.3

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    d92862c View commit details

  3. jetbrains.datagrip: 2019.3.1 -> 2019.3.2

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    6218486 View commit details

  4. jetbrains.idea-community: 2019.3.1 -> 2019.3.2

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    60e24ff View commit details

  5. jetbrains.idea-ultimate: 2019.3.1 -> 2019.3.2

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    206003c View commit details

  6. jetbrains.phpstorm: 2019.3.1 -> 2019.3.2

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    a7ebd84 View commit details

  7. jetbrains.pycharm-community: 2019.3.1 -> 2019.3.2

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    0c36467 View commit details

  8. jetbrains.pycharm-professional: 2019.3.1 -> 2019.3.2

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    b2f6416 View commit details

  9. jetbrains.webstorm: 2019.3.1 -> 2019.3.2

    @liff
    liff authored and Jon committed Jan 24, 2020
    Copy the full SHA
    741faf7 View commit details
Showing with 21 additions and 21 deletions.
  1. +16 −16 pkgs/applications/editors/jetbrains/default.nix
  2. +5 −5 pkgs/development/compilers/jetbrains-jdk/default.nix
32 changes: 16 additions & 16 deletions pkgs/applications/editors/jetbrains/default.nix
View file
Original file line number Diff line number Diff line change
@@ -250,25 +250,25 @@ in

clion = buildClion rec {
name = "clion-${version}";
version = "2019.3.2"; /* updated by script */
version = "2019.3.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "0aksix22cbbxny68650qxjbbm1fmgbsnp97qix5kl5nx4y4yvlii"; /* updated by script */
sha256 = "1dvnb6mb8xgrgqzqxm2zirwm77w4pci6ibwsdh6wqpnzpqksh4iw"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
};

datagrip = buildDataGrip rec {
name = "datagrip-${version}";
version = "2019.3.1"; /* updated by script */
version = "2019.3.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "1h7va6x625kxc2i22mnya64b1kb4vl5xgjxrv3lqwz725q5hkrxa"; /* updated by script */
sha256 = "1aypzs5q9zgggxbpaxfd8r5ds0ck31lb00csn62npndqxa3bj7z5"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@@ -289,64 +289,64 @@ in

idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2019.3.1"; /* updated by script */
version = "2019.3.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "0285jdh350dalvk76ajy57mi1yg1g905cnfhcjlb465bsxaw0z5n"; /* updated by script */
sha256 = "09vicd2czag07f2f7dy0mmcvz5kryv659m32zm9rlsr4nai1i3y3"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
};

idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2019.3.1"; /* updated by script */
version = "2019.3.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
sha256 = "0rb726nh2c7zxnpjcf6fyrpl29y9wgr6qhpb6hjxia2gzxab9jz0"; /* updated by script */
sha256 = "09lgdd7gkx94warjc7wah9w7s9lj81law8clavjjyjas8bhhf1hz"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
};

phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2019.3.1"; /* updated by script */
version = "2019.3.2"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "170ppd0inn3s1yxd5ybspzgx2il78838z900fpg2pznq2hi0rn2h"; /* updated by script */
sha256 = "02qnkcri49chbbpx2f338cfs5w2kg1l7zfn6fa7qrla82zpjsqlm"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
};

pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2019.3.1"; /* updated by script */
version = "2019.3.2"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1cph2v7gaxikrvvdaz7ihk17qgdzrn86jamik9fijb8sjli3695v"; /* updated by script */
sha256 = "06dzqjsq6jqgv8askzskm0bllzm9i8rzmhkjsv4na2phvdxf6qi2"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
};

pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2019.3.1"; /* updated by script */
version = "2019.3.2"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1bjijwc5f1is2920b497d395ckswhpxilmxaljb6pjwq4a2k8yzx"; /* updated by script */
sha256 = "1zp64pnzz2jy232g8fgkqmn34afbhbkkhgyb9z1v1qfb533p39ig"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@@ -380,12 +380,12 @@ in

webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2019.3.1"; /* updated by script */
version = "2019.3.2"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "0qjqd1a44mdlpvv3l4sx2n5clirwxialzh6s2dlb0dibx8zvnckp"; /* updated by script */
sha256 = "0mbfkwjqg2d1mkka0vajx41nv4f07y1w7chk6ii7sylaj7ypzi13"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
10 changes: 5 additions & 5 deletions pkgs/development/compilers/jetbrains-jdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,17 +7,17 @@

let drv = stdenv.mkDerivation rec {
pname = "jetbrainsjdk";
version = "485.1";
version = "520.30";

src = if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_4-linux-x64-b${version}.tar.gz";
sha256 = "18jnn0dra9nsnyllwq0ljxzr58k2pg8d0kg10y39vnxwccic4f76";
url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-linux-x64-b${version}.tar.gz";
sha256 = "0xmr5jjnr4af7byz5w01phyrrdyizfhqmwhs4k8ih566fkhyzj02";
}
else if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl {
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-osx-x64-b${version}.tar.gz";
sha256 = "1ly6kf59knvzbr2pjkc9fqyzfs28pdvnqg5pfffr8zp14xm44zmd";
url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-osx-x64-b${version}.tar.gz";
sha256 = "0wfcw66wv5rkkjzyzi9j7zk7c2fgi33ny09drgihxi2kdzyfrpcb";
}
else
throw "unsupported system: ${stdenv.hostPlatform.system}";