diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
commit | 0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch) | |
tree | ad528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/applications/editors | |
parent | 373507e28edeacd168b5c240840db2dac854882a (diff) | |
parent | 2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff) | |
download | nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2 nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip |
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/applications/editors')
10 files changed, 64 insertions, 45 deletions
diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index a7c2c3da444c..714daa3649c5 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.5.0.11"; # "Android Studio 3.5 Canary 12" - build = "191.5471097"; - sha256Hash = "1dz9iy8f12fzqp8wv9c5v01d33djy97aha8rxxp18vi6myak42ca"; + version = "3.5.0.12"; # "Android Studio 3.5 Canary 13" + build = "191.5487692"; + sha256Hash = "0iwd2qa551rs9b0w4rs7wmzdbh3r4j76xvs815l6i5pilk0s47gz"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/nixpkgs/pkgs/applications/editors/atom/default.nix b/nixpkgs/pkgs/applications/editors/atom/default.nix index 63b322b06abf..bc791d63d24b 100644 --- a/nixpkgs/pkgs/applications/editors/atom/default.nix +++ b/nixpkgs/pkgs/applications/editors/atom/default.nix @@ -3,8 +3,8 @@ let versions = { atom = { - version = "1.36.0"; - sha256 = "1ljg39h5xjigk2njvxyinb1gd3sbja21v47c7va6vl9hjr5xb3fr"; + version = "1.36.1"; + sha256 = "1m7q2r3zx463k7kpqb364piqrr69wrhs033ibzxdx9y7r4204qp4"; }; atom-beta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix index 8d39c185acad..8980dc1f0a9a 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix @@ -17,25 +17,41 @@ let }; + libvterm = libvterm-neovim.overrideAttrs(old: rec { + pname = "libvterm-neovim"; + version = "2019-04-27"; + name = pname + "-" + version; + src = fetchFromGitHub { + owner = "neovim"; + repo = "libvterm"; + rev = "89675ffdda615ffc3f29d1c47a933f4f44183364"; + sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy"; + }; + }); + + in stdenv.mkDerivation rec { name = "emacs-libvterm-${version}"; - version = "unstable-2018-11-16"; + version = "unstable-2019-04-28"; src = fetchFromGitHub { owner = "akermu"; repo = "emacs-libvterm"; - rev = "8be9316156be75a685c0636258b2fec2daaf5ab5"; - sha256 = "059js4aa7xgqcpaicgy4gz683hppa1iyp1r98mnms5hd31a304k8"; + rev = "6adcedf3e4aaadeeaff97437044fba17aeb466d4"; + sha256 = "1j6qr5bmajig3idhwsaa3zm72w13q9zn77z2dlrhhx3p4bbds3f8"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ emacs libvterm-neovim ]; + buildInputs = [ emacs libvterm ]; - cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ]; + cmakeFlags = [ + "-DEMACS_SOURCE=${emacsSources}" + "-DUSE_SYSTEM_LIBVTERM=True" + ]; installPhase = '' install -d $out/share/emacs/site-lisp install ../*.el $out/share/emacs/site-lisp - install ./*.so $out/share/emacs/site-lisp + install ../*.so $out/share/emacs/site-lisp ''; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix index 219d5fca86c2..4eb988a782ca 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -75,7 +75,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = [ "--with-modules" ] ++ + configureFlags = [ + "--disable-build-details" # for a (more) reproducible build + "--with-modules" + ] ++ (lib.optional stdenv.isDarwin (lib.withFeature withNS "ns")) ++ (if withNS diff --git a/nixpkgs/pkgs/applications/editors/geany/default.nix b/nixpkgs/pkgs/applications/editors/geany/default.nix index 9f33bd084890..0ff56e9145fb 100644 --- a/nixpkgs/pkgs/applications/editors/geany/default.nix +++ b/nixpkgs/pkgs/applications/editors/geany/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "1.34.1"; + version = "1.35"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.geany.org/${name}.tar.bz2"; - sha256 = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11"; + sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; diff --git a/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix b/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix index 65645dcc9693..a65954d7d2ae 100644 --- a/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix +++ b/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebkit, hunspell }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }: stdenv.mkDerivation rec { pname = "ghostwriter"; - version = "1.7.4"; + version = "1.8.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = "v${version}"; - sha256 = "1pqlr08z5syqcq5p282asxwzrrm7c1w94baxyb467swh8yp3fj5m"; + sha256 = "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran"; }; nativeBuildInputs = [ qmake pkgconfig qttools ]; - buildInputs = [ qtwebkit hunspell ]; + buildInputs = [ qtwebengine hunspell ]; meta = with stdenv.lib; { description = "A cross-platform, aesthetic, distraction-free Markdown editor"; diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 584c12d5ff63..ba3958a43d19 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.1"; /* updated by script */ + version = "2019.1.2"; /* 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 = "1rlqnnv6b7lg18si31zd97ixnslwp8j6imkkjq0j5n9sydsr8xzj"; /* updated by script */ + sha256 = "0x4fmbarckw60issrwk3cd65x5xjkxwrw4xq1qgfzmxfqhzbzvz8"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1.1"; /* 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 = "10sw41kkf2k60xjpwgc73i182y7px3dmqz2awnrl4gffdb9jgzmy"; /* updated by script */ + sha256 = "0w6hasb8vcbxdqmb0pngwr2jg0w14prqb4v7blraa5jf1xyyiayd"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.1"; /* updated by script */ + version = "2019.1.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0aq3x5aixh86h1zvvwrbr2f1nnqdpfvlsadd2ckmf5s5kghvg5r9"; /* updated by script */ + sha256 = "0b8msq0raczm657rhbyqi702zv4zs66yd6dcm7s0l54hnas5ia9r"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.1"; /* updated by script */ + version = "2019.1.1"; /* 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 = "0zyw88dd2v4igp080l99cyq6h0bmyri8a50fjp69ripiz9qaawx1"; /* updated by script */ + sha256 = "0xbdn1q0a2ksb7z26n2l889m6z0lh3b45clya7rdfl4jv2gkiaaq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.1"; /* updated by script */ + version = "2019.1.1"; /* 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 = "0fsdf090cwwrsq3azknc9rpwwsl71cvsx4flivnqwfakb6rh4f1j"; /* updated by script */ + sha256 = "1pglvklbj4w6pmc7ffbjwwfqh7fad54yfx87m9plqk80rmpjzxfi"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.1"; /* updated by script */ + version = "2019.1.1"; /* 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 = "1bv2a16wsc9j82w14qfrfjgszwkihk0jwp8bp8z9618q04c8vmgf"; /* updated by script */ + sha256 = "100whawwj1kiq870dsmkx33qv5ygjpr9977jkbavhqjnc1zhwl1r"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.1"; /* updated by script */ + version = "2019.1.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "173qm2g6pjga2jlw8sa59bxw543b56r56ikqwv2wp0jq5z61v26f"; /* updated by script */ + sha256 = "1zz579kmskvgsjv2lriglxkdlx33mmfv2liw1b9iilspga59izld"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.1"; /* updated by script */ + version = "2019.1.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0gjphdzdxgvflkzaakf3c1wnig86lxhxyx6xk6rg40yj6f2hzi47"; /* updated by script */ + sha256 = "0hcij77j4zb1y1vls5nvxq3lmqrbppm3ml0p9nagbjipy2rmp838"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.3.5"; /* updated by script */ + version = "2019.1.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1gykag8fsfqxv0d6fipn18hhpdvn4qxva2kkb0v330vp73wm2i2w"; /* updated by script */ + sha256 = "0asg0x8xcjyydy0p1fdlhpcwfckdf9719460pv5zwc7yfd8z61yd"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.1"; /* updated by script */ + version = "2019.1.1"; /* 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 = "0r6a9g8ydnxf805gn2wajnwkcyfn0xksbsrs8wq6j4ghipkhscxj"; /* updated by script */ + sha256 = "05lrsjk45l4xqjyinsqlnfr36qnv1nrgg2sskgi0bfjbdrfv9xrv"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/nixpkgs/pkgs/applications/editors/quilter/default.nix b/nixpkgs/pkgs/applications/editors/quilter/default.nix index 8d973b19ff39..b22b04bac655 100644 --- a/nixpkgs/pkgs/applications/editors/quilter/default.nix +++ b/nixpkgs/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "1.8.1"; + version = "1.8.4"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0i8rvvc5g74bgfjgsmmgpj42xmhjaz14jjzl9s5nzwpy1fn7vv0p"; + sha256 = "14qbkkz1l4zj6kwds5d82swnh3ynj6diyvjl0pafgp5i1i27j4rh"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix index 9d7539b5b651..ebceb4a8b352 100644 --- a/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix +++ b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix @@ -5,10 +5,10 @@ let in rec { sublime3-dev = common { - buildVersion = "3203"; + buildVersion = "3208"; dev = true; - x32sha256 = "004hnlm2dvcfagf3bkbfqxlnkgqk46jrm8w9yagpjwkpdy76mgyx"; - x64sha256 = "0dp4vi39s2gq5a7snz0byrf44i0csbzwq6hn7i2zqa6rpvfywa1d"; + x32sha256 = "09k04fjryc0dc6173i6nwhi5xaan89n4lp0n083crvkqwp0qlf2i"; + x64sha256 = "12pn3yfm452m75dlyl0lyf82956j8raz2dglv328m81hbafflrj8"; } {}; sublime3 = common { diff --git a/nixpkgs/pkgs/applications/editors/typora/default.nix b/nixpkgs/pkgs/applications/editors/typora/default.nix index deb4974a9b14..03a8a55c780f 100644 --- a/nixpkgs/pkgs/applications/editors/typora/default.nix +++ b/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.68"; + version = "0.9.70"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "09hkmnh9avzb7nc8i67vhbv6nc1v90kk88aq01mpmyibpdqp03zp"; + sha256 = "08bgllbvgrpdkk9bryj4s16n274ps4igwrzdvsdbyw8wpp44vcy2"; }; nativeBuildInputs = [ |