diff options
Diffstat (limited to 'pkgs/applications/editors')
22 files changed, 157 insertions, 119 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b60687c50bac..2ae7d421bba1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.1.3.0"; # "Android Studio 3.1.3" - build = "173.4819257"; - sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; + version = "3.1.4.0"; # "Android Studio 3.1.4" + build = "173.4907809"; + sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; }; betaVersion = { version = "3.2.0.22"; # "Android Studio 3.2 Beta 5" @@ -18,9 +18,9 @@ let sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9"; }; latestVersion = { # canary & dev - version = "3.3.0.2"; # "Android Studio 3.3 Canary 3" - build = "181.4884283"; - sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh"; + version = "3.3.0.5"; # "Android Studio 3.3 Canary 6" + build = "182.4954005"; + sha256Hash = "0b8ias75f3p5nrmgp7iqz4n4r4dbwhgagqmyc1fqfd36wbglyaf4"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 83f0f1e82220..bc3f8baf5108 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }: let common = pname: {version, sha256, beta ? null}: @@ -14,7 +14,19 @@ let inherit sha256; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + ]; + + buildInputs = [ + gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix "PATH" : "${gvfs}/bin" \ + ) + ''; buildCommand = '' mkdir -p $out/usr/ @@ -25,9 +37,6 @@ let rm -r $out/share/lintian rm -r $out/usr/ sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} - # sed -i "s/'${pname}'/'.${pname}-wrapped'/" $out/bin/${pname} - wrapProgram $out/bin/${pname} \ - --prefix "PATH" : "${gvfs}/bin" fixupPhase diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index b9bd529930f2..078b8a03b5d9 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - configureFlags = "--ioctl=termios"; + configureFlags = [ "--ioctl=termios" ]; meta = { homepage = http://elvis.vi-editor.org/; diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index 0ab11b5bf204..689bcfc9adfd 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./install-infodir.patch ]; buildInputs = [emacs texinfo ctags]; - configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; + configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ]; preInstall = "mkdir -p $out/info"; installTargets = "install-pkg texinfo"; postInstall = '' diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index 70693d039c58..9b737a938a12 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [emacs]; - configureFlags = "--with-lispdir=$$out/share/emacs/site-lisp"; + configureFlags = [ "--with-lispdir=$$out/share/emacs/site-lisp" ]; meta = { description = "Emacs mode for the programming language Maude"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 56b17a865df8..bec845b815ce 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -52,19 +52,9 @@ self: # part of a larger package caml = dontConfigure super.caml; - # part of a larger package - # upstream issue: missing package version - cmake-mode = markBroken (dontConfigure super.cmake-mode); - # Expects bash to be at /bin/bash company-rtags = markBroken super.company-rtags; - # upstream issue: missing file header - connection = markBroken super.connection; - - # upstream issue: missing file header - dictionary = markBroken super.dictionary; - easy-kill-extras = super.easy-kill-extras.override { inherit (self.melpaPackages) easy-kill; }; @@ -79,6 +69,17 @@ self: inherit (self.melpaPackages) ess ctable popup; }; + evil-magit = super.evil-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + # missing dependencies + evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: { + packageRequires = with self; [ evil highlight ]; + }); + # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; @@ -108,6 +109,11 @@ self: # upstream issue: missing file header initsplit = super.initsplit; + # tries to write a log file to $HOME + insert-shebang = super.insert-shebang.overrideAttrs (attrs: { + HOME = "/tmp"; + }); + # Expects bash to be at /bin/bash ivy-rtags = markBroken super.ivy-rtags; @@ -115,9 +121,6 @@ self: jsfmt = markBroken super.jsfmt; # upstream issue: missing file header - link = markBroken super.link; - - # upstream issue: missing file header maxframe = markBroken super.maxframe; magit = @@ -131,6 +134,18 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; @@ -154,8 +169,10 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; })); - # upstream issue: truncated file - powershell = markBroken super.powershell; + # tries to write to $HOME + php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { + HOME = "/tmp"; + }); # upstream issue: mismatched filename processing-snippets = markBroken super.processing-snippets; @@ -185,6 +202,12 @@ self: # missing OCaml utop = markBroken super.utop; + vdiff-magit = + (super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing file header voca-builder = markBroken super.voca-builder; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index f3b77c708a7b..61086b96230e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -194,6 +194,12 @@ self: # missing OCaml utop = markBroken super.utop; + vdiff-magit = + (super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing file header voca-builder = markBroken super.voca-builder; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 01eaac7be5d1..0a304fabe600 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf +, systemd ? null , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null -, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null +, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -16,7 +17,7 @@ assert withGTK2 -> withX || stdenv.isDarwin; assert withGTK3 -> withX || stdenv.isDarwin; assert withGTK2 -> !withGTK3 && gtk2 != null; assert withGTK3 -> !withGTK2 && gtk3 != null; -assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null; +assert withXwidgets -> withGTK3 && webkitgtk != null; let toolkit = @@ -52,14 +53,14 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] - ++ lib.optionals stdenv.isLinux [ dbus libselinux ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf ] + imagemagick gconf m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2 ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index ed77e6f4b471..24954a602ccc 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { - Plugin interface ''; homepage = https://www.geany.org/; - license = "GPL"; + license = licenses.gpl2; maintainers = []; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index 7689ebad0f01..ac35560c7f63 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,7 @@ { runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in -runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } " +runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " mkdir -p $out ln -s ${geany}/share $out makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 29c0b665aa35..36259593463d 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ghostwriter"; - version = "1.7.2"; + version = "1.7.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = "v${version}"; - sha256 = "1zhzibn4g79i98mjfqspf3iac2biz3r18jf29g0izq5snn7xj0fc"; + sha256 = "1xkxd59rw2dn6xphgcl06zzmfgs1zna2w0pxrk0f49ywffvkvs72"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index de1e5e4c64bc..e59def88de55 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,26 +1,22 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, gnomeSupport ? false # build support for Gnome(gnome-vfs) -, stdenv, fetchurl, pkgconfig -, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool -, gnome_vfs ? null}: +, stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; - in stdenv.mkDerivation rec { - - name = "gobby-0.5.0"; - src = fetchurl { - url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; + name = "gobby-unstable-2018-04-03"; + src = fetchFromGitHub { + owner = "gobby"; + repo = "gobby"; + rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b"; + sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] - ++ stdenv.lib.optional gnomeSupport gnome_vfs; - - configureFlags = '' - ''; + nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ]; + buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; + + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d77f8f2e7a6a..b46dddfc73e9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -249,12 +249,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "08kjlmldnd6rnk8m12klfp9vbkbvcsgaknpi55r248nzglnbx9gz"; /* updated by script */ + sha256 = "1wjrki0awjyjmv7hh5rkhbpx40yqjssgh4nv61fvg189aric4rzj"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -262,12 +262,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "1byf46vni8s6qf3wlsnscxipgndl6ic48nizwiaqasnhhszqssxs"; /* updated by script */ + sha256 = "0sfcl6bcq5hzwx1fdn8zfyl4qqjcmjmzwspa7v7niyqhbj5zdba9"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip 2018.2"; @@ -275,12 +275,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "0z7a06892c3hcq5zxvkfnyf0ablwq51710x1f12v6r297l4mfra0"; /* updated by script */ + sha256 = "0k96v00cbxkgxs9xby5m4dxl4w2kkm2lii54z1hqjwqmc9kxa2ia"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand Release"; @@ -288,12 +288,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "0r5fsai77w74vhfs449yff56pi4vynl8w25amn23k6hddlqxph2s"; /* updated by script */ + sha256 = "1495zkccss1bkh803p6065nypqj72zra9dbnlx3iz4kkbawr7j15"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; @@ -301,12 +301,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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-jdk.tar.gz"; - sha256 = "1xq97dcf7xcs8fsrjsqqrzxf2gnrll8bbqkzrpg85bqxap0hvb45"; /* updated by script */ + sha256 = "04jzsmnfmxxf264dla6scshk576z8w8sv78mpzb2mc1ndwviwflx"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; @@ -314,12 +314,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "15czwk15c1gnf7xrgm423xafsw55083dd6g15g69zs0l9psrss31"; /* updated by script */ + sha256 = "1sjxavkfjg4g9rgjqjjb9d6wg53dwfs8n65w3qbp87c7x3pl006r"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm 2018.2"; @@ -327,12 +327,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "0a5dsr2piw0vgm9lvc2k18sdnvii55xdyi90z95hzg5syhsm1a94"; /* updated by script */ + sha256 = "0nq4xwqczppdrswi826yzjdzqpiwl4iyi70d7g6ncqd9wyiay4z4"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm Release"; @@ -340,12 +340,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "0azjrbxpwank09i7riflbkgrgm23f0q6hgisca6d14ldcbr933aj"; /* updated by script */ + sha256 = "1cf8z1wb532qhxlf0z4d791x084drfxzlaxq28hzy4f450bqbkp7"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm Release"; @@ -353,25 +353,25 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2018.1.3"; /* updated by script */ + version = "2018.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "00wskr60mjipyp44wrpc3pn6awc92djn7rwhc08nrar3zv0j4mgg"; /* updated by script */ + sha256 = "0yigw9g53i6xamwva8vcd38f0aysxqkf77avms4l7l63dkap99nq"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "Rider 2018.1.3"; + update-channel = "Rider 2018.2"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "0la83cqf3aknrc62ddpij0gg50rws5l2g4iasyrvfhn4wnmj6n4q"; /* updated by script */ + sha256 = "1gwcadjgs4cw5i3h1xn92ng415vzr5cxyrpgckr1qy37d5f4bhqg"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine 2018.2"; @@ -379,12 +379,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.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 = "024schngx26ik8cvmkijfzzmpkajckl2dbyz31ajnmixpn07pwi6"; /* updated by script */ + sha256 = "1a31q7wrg4ihap8j6n2cg98ml1zic78drkrp0p554rgsnh7v4hwr"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm Release"; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 83598bd7eb17..ad408081e1fd 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2018-05-21"; + version = "2018-08-05"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "878d2a4bdb674a5e7703a66e530520f48efba641"; - sha256 = "0pwy6ilsb62s1792gjyvhvq8shj60l8lx26b58zvpfb54an4s6rk"; + rev = "ae75032936ed9ffa2bf14589fef115d3d684a7c6"; + sha256 = "1qm6i8vzr4wjxxdvhr54pan0ysxq1sn880bz8p2w9y6qa91yd3m3"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 96a9cea09c76..86134687ba31 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { outputs = [ "out" "info" ]; - configureFlags = '' - --sysconfdir=/etc - ${optionalString (!enableNls) "--disable-nls"} - ${optionalString enableTiny "--enable-tiny"} - ''; + configureFlags = [ + "--sysconfdir=/etc" + (stdenv.lib.enableFeature enableNls "nls") + (stdenv.lib.enableFeature enableTiny "tiny") + ]; postInstall = '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 39d96775ebcd..6fff6df8cdda 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/nedit; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a0a14e89860b..6690e4c9c1b9 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv +{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv , libuv, luaPackages, ncurses, pkgconfig , unibilium, xsel, gperf , libvterm-neovim @@ -25,7 +25,7 @@ let buildInputs = [ libtermkey libuv - libmsgpack + msgpack ncurses libvterm-neovim unibilium diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 48f7b29f407f..d17d5c1e85df 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper -, libmsgpack, neovim, pythonPackages, qtbase }: +, msgpack, neovim, pythonPackages, qtbase }: stdenv.mkDerivation rec { name = "neovim-qt-${version}"; @@ -13,12 +13,11 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include" - "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so" + "-DUSE_SYSTEM_MSGPACK=1" ]; buildInputs = with pythonPackages; [ - neovim qtbase libmsgpack + neovim qtbase msgpack ] ++ (with pythonPackages; [ jinja2 msgpack python ]); @@ -28,13 +27,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - # avoid cmake trying to download libmsgpack - echo "" > third-party/CMakeLists.txt # we rip out a number of tests that fail in the build env # the GUI tests will never work but the others should - they did before neovim 0.2.0 # was released sed -i test/CMakeLists.txt \ -e '/^add_xtest_gui/d' \ + -e '/tst_neovimobject/d' \ -e '/tst_neovimconnector/d' \ -e '/tst_callallmethods/d' \ -e '/tst_encoding/d' @@ -42,7 +40,14 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' + postInstall = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/nvim-qt.app $out/Applications + rmdir $out/bin || : + + wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \ + --prefix PATH : "${neovim}/bin" + '' else '' wrapProgram "$out/bin/nvim-qt" \ --prefix PATH : "${neovim}/bin" ''; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index abbffeb91807..efe728f68494 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "17.12.3"; + version = "0.25.2"; src = fetchurl { - url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz"; - sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; + url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; + sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p"; }; - + nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; buildInputs = [ shared-mime-info ]; - + propagatedBuildInputs = [ kconfig kinit @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { karchive kcrash ]; - + meta = with stdenv.lib; { license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg bkchr ]; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index a6f454deaf5c..ef0d98455f27 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { - sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw"; + sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7a700e0956b8..3711b3cdcee4 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -6,6 +6,7 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , libICE , vimPlugins , makeWrapper +, wrapGAppsHook # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -73,15 +74,6 @@ in stdenv.mkDerivation rec { src = builtins.getAttr source { "default" = common.src; # latest release - - "vim-nox" = - { - # vim nox branch: client-server without X by uing sockets - # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; } - src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; }); - name = "vim-nox-hg-2082fc3"; - # END - }.src; }; patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; @@ -131,6 +123,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional wrapPythonDrv makeWrapper ++ stdenv.lib.optional nlsSupport gettext ++ stdenv.lib.optional perlSupport perl + ++ stdenv.lib.optional (guiSupport == "gtk3") wrapGAppsHook ; buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau @@ -161,6 +154,10 @@ in stdenv.mkDerivation rec { ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" + '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' + rm "$out/bin/gvim" + echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" -g "$@"' > "$out/bin/gvim" + chmod a+x "$out/bin/gvim" ''; preInstall = '' diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 7f16ce3596d9..a775fb3bd79a 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem, - gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }: + gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.25.1"; + version = "1.26.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1qljnajk4h9ki5gvydh1b557fvhvcryvkrvypvz0pr804lpdqsmg"; - "x86_64-linux" = "0f1lpwyxfchmbymzzxv97w9cy1z5pdljhwm49mc5v84aygmvnmjq"; - "x86_64-darwin" = "1dgda1drij1c114xzv4hs44k7rx4x1vzghlxgii0h2rg641n6pbn"; + "i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n"; + "x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy"; + "x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; @@ -49,8 +49,8 @@ in }; buildInputs = if stdenv.system == "x86_64-darwin" - then [ unzip makeWrapper libXScrnSaver libsecret ] - else [ makeWrapper libXScrnSaver libxkbfile libsecret ]; + then [ unzip libXScrnSaver libsecret ] + else [ wrapGAppsHook libXScrnSaver libxkbfile libsecret ]; installPhase = if stdenv.system == "x86_64-darwin" then '' |