diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:37:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:38:04 +0200 |
| commit | 9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c (patch) | |
| tree | 946e5c7626f668079bcf35caf203a52c5d33f3c7 /pkgs/applications/editors | |
| parent | cf8309ef34b9ec18bc9aeca9e63f984e1be19b56 (diff) | |
| parent | 967abfc78660d0e49a32eac8fe19cec4b6b79d5c (diff) | |
| download | nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.gz nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.bz2 nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.lz nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.xz nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.zst nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.zip | |
Merge master into staging
There are larger-rebuild changes: gnutls and samba.
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/idea/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/leo-editor/default.nix | 23 |
2 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index b2b6d2ddde53..5d13cf6a4ce5 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -297,13 +297,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.3"; - build = "PS-139.1348"; + version = "9.0"; + build = "PS-141.1912"; 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 = "1x67nfr3nap93cx7yhdrp02xvp1v6g74zy7hdmhx41sal7hzy49b"; + sha256 = "1n6p8xiv0nrs6yf0250mpga291msnrfamv573dva9f17cc3df2pp"; }; }; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix new file mode 100644 index 000000000000..4c7e3cc08af7 --- /dev/null +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -0,0 +1,23 @@ +{ stdenv, pythonPackages, fetchgit }: +pythonPackages.buildPythonPackage rec { + name = "leo-editor-${version}"; + version = "5.1"; + + namePrefix = ""; + + src = fetchgit { + url = "https://github.com/leo-editor/leo-editor"; + rev = "refs/tags/Leo-${version}-final"; + sha256 = "3cc5259609890bbde9cfee71f4f60b959b3f5b740f7d403c99ea2d9796b4758e"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyqt4 sqlite3 ]; + + meta = { + homepage = "http://leoeditor.com"; + description = "A powerful folding editor"; + longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ leonardoce ]; + }; +} |