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: 422f99b9a65e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 30d9de941fdd
Choose a head ref
  • 6 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 5, 2018

  1. idea-community: 2017.3.3 -> 2017.3.4

    @jokogr
    jokogr committed Feb 5, 2018
    Copy the full SHA
    f79fe0c View commit details

  2. idea-ultimate: 2017.3.3 -> 2017.3.4

    @jokogr
    jokogr committed Feb 5, 2018
    Copy the full SHA
    3fc60ef View commit details

  3. phpstorm: 2017.3.3 -> 2017.3.4

    @jokogr
    jokogr committed Feb 5, 2018
    Copy the full SHA
    44cd5c5 View commit details

  4. webstorm: 2017.3.3 -> 2017.3.4

    @jokogr
    jokogr committed Feb 5, 2018
    Copy the full SHA
    0901062 View commit details

  5. clion: 2017.3.2 -> 2017.3.3

    @jokogr
    jokogr committed Feb 5, 2018
    Copy the full SHA
    12ccb81 View commit details

  6. Merge pull request #34622 from jokogr/u/jetbrains-2017.3.4 

    jetbrains-editor: 2017.3.2 -> 2017.3.4
    @andir
    andir authored Feb 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    30d9de9 View commit details
Showing with 10 additions and 10 deletions.
  1. +10 −10 pkgs/applications/editors/jetbrains/default.nix
20 changes: 10 additions & 10 deletions pkgs/applications/editors/jetbrains/default.nix
View file
Original file line number Diff line number Diff line change
@@ -234,12 +234,12 @@ in

clion = buildClion rec {
name = "clion-${version}";
version = "2017.3.2"; /* updated by script */
version = "2017.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 = "0lv0nwfgm6h67mxhh0a2154ym7wcbm1qp3k1k1i00lg0lwig1rcw"; /* updated by script */
sha256 = "0j090863y68ppw34qkldm8h4lpbhalhqn70gb0ifj9bglf17503d"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -273,38 +273,38 @@ in

idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2017.3.3"; /* updated by script */
version = "2017.3.4"; /* 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 = "1wxaz25609wri2d91s9wy00gngplyjg7gzix3mzdhgysm00qizf1"; /* updated by script */
sha256 = "15qsfirzmmjhwzkhx36zr4n0z5lhs021n2n3wim01g309ymr4gl9"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release";
};

idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2017.3.3"; /* updated by script */
version = "2017.3.4"; /* 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-jdk.tar.gz";
sha256 = "01d5a6m927q9bnjlpz8va8bfjnj52k8q6i3im5ygj6lwadbzawyf"; /* updated by script */
sha256 = "0f937s6zc1sv0gdlxf9kkc8l8rg78a5mxsfr2laab0g37rfy8c99"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
};

phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2017.3.3"; /* updated by script */
version = "2017.3.4"; /* 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 = "0mk4d2c41qvfz7sqxqw7adak86pm95wvhzxrfg32y01r5i5q0av7"; /* updated by script */
sha256 = "1hxkn0p0lp021bbysypwn8s69iggb76iwq38jv5a1ql7v5r1nwvd"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PS2017.3";
@@ -364,12 +364,12 @@ in

webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2017.3.3"; /* updated by script */
version = "2017.3.4"; /* 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 = "1fhs13944928rqcqbv8d29qm1y0zzry4drr9gqqmj814y2vkbpnl"; /* updated by script */
sha256 = "0d5whqa6c76l6g5yj0yq8a3k1x6d9kxwnac1dwsiy5dbr5jk0cyj"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WS_Release";