diff options
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/js2/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/editors/idea/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/idea/pycharm.nix | 113 |
3 files changed, 117 insertions, 5 deletions
diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index cbd88330434..47e62a281fb 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation { - name = "js2-mode-0-20120712"; + name = "js2-mode-0-20140114"; src = fetchgit { url = "git://github.com/mooz/js2-mode.git"; - rev = "f8cb9c52614e0a8e477f1ac557585ed950246c9b"; - sha256 = "37055b7e8c1d9eee6b86f6b9b9d74ad196cc43701bc2263ffd539a3e44025047"; + sha256 = "dbdc07b864a9506a21af445c7fb1c75fbffadaac980ee7bbf752470d8054bd65"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 165510f3933..e5cfbcdfe17 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -8,7 +8,7 @@ let { name, version, build, src, description, license }: stdenv.mkDerivation rec { - inherit name build src license; + inherit name build src; ideaItem = makeDesktopItem { name = "IDEA"; exec = "idea"; @@ -69,7 +69,7 @@ in { version = "13.1.3"; build = "IC-135.909"; description = "IntelliJ IDEA 13 Community Edition"; - license = stdenv.lib.licenses.asl20.shortName; + license = stdenv.lib.licenses.asl20; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51"; diff --git a/pkgs/applications/editors/idea/pycharm.nix b/pkgs/applications/editors/idea/pycharm.nix new file mode 100644 index 00000000000..d283686765e --- /dev/null +++ b/pkgs/applications/editors/idea/pycharm.nix @@ -0,0 +1,113 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk +, coreutils, gnugrep, which, git, python +}: + +let + + buildPycharm = + { name, version, build, src, description, license }: + + stdenv.mkDerivation rec { + inherit name build src; + desktopItem = makeDesktopItem { + name = "pycharm"; + exec = "pycharm"; + comment = "Powerful Python and Django IDE"; + desktopName = "PyCharm"; + genericName = "Powerful Python and Django IDE"; + categories = "Application;Development;"; + }; + + buildInputs = [ makeWrapper patchelf p7zip ]; + + propagatedUserEnvPkgs = [ python ]; + + patchPhase = '' + interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)" + snappyPath="lib/snappy-java-1.0.5" + + 7z x -o"$snappyPath" "$snappyPath.jar" + if [ "${stdenv.system}" == "x86_64-linux" ]; then + patchelf --set-interpreter "$interpreter" bin/fsnotifier64 + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so" + else + patchelf --set-interpreter "$interpreter" bin/fsnotifier + patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so" + fi + 7z a -tzip "$snappyPath.jar" ./"$snappyPath"/* + rm -vr "$snappyPath" + ''; + + installPhase = '' + mkdir -vp "$out/bin" "$out/$name" + cp -va . "$out/$name" + + jdk="${jdk}/lib/openjdk" + makeWrapper "$out/$name/bin/pycharm.sh" "$out/bin/pycharm" \ + --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ + --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \ + --prefix JDK_HOME : "$jdk" \ + --prefix PYCHARM_JDK : "$jdk" + + cp -a "${desktopItem}"/* "$out" + ''; + + meta = { + homepage = "https://www.jetbrains.com/pycharm/"; + inherit description; + inherit license; + maintainers = [ stdenv.lib.maintainers.jgeerds ]; + platforms = stdenv.lib.platforms.linux; + }; + }; + +in { + + pycharm-community-313 = buildPycharm rec { + name = "pycharm-community-${version}"; + version = "3.1.3"; + build = "133.1347"; + description = "PyCharm 3.1 Community Edition"; + license = stdenv.lib.licenses.asl20; + src = fetchurl { + url = "http://download.jetbrains.com/python/${name}.tar.gz"; + sha256 = "f671ee4c99207c179f168b5b98fa23afe90a94c3a3914367b95a46b0c2881b23"; + }; + }; + + pycharm-community-341 = buildPycharm rec { + name = "pycharm-community-${version}"; + version = "3.4.1"; + build = "135.1057"; + description = "PyCharm 3.4 Community Edition"; + license = stdenv.lib.licenses.asl20; + src = fetchurl { + url = "http://download.jetbrains.com/python/${name}.tar.gz"; + sha256 = "96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64"; + }; + }; + + pycharm-professional-313 = buildPycharm rec { + name = "pycharm-professional-${version}"; + version = "3.1.3"; + build = "133.1347"; + description = "PyCharm 3.1 Professional Edition"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "http://download.jetbrains.com/python/${name}.tar.gz"; + sha256 = "e0c2db8f18cb825a95de6ddc4b0b9f93c5643bf34cca9f1b3c2fa37fd7c14f11"; + }; + }; + + pycharm-professional-341 = buildPycharm rec { + name = "pycharm-professional-${version}"; + version = "3.4.1"; + build = "135.1057"; + description = "PyCharm 3.4 Professional Edition"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "http://download.jetbrains.com/python/${name}.tar.gz"; + sha256 = "e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b"; + }; + }; +} |