diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-18 20:36:48 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-18 20:36:48 -0500 |
commit | b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3 (patch) | |
tree | d6eaa4102b8caf97fd924395114f4d9df5d3b4ef /pkgs/applications/editors | |
parent | a808baa5e50e83c64b00f772d0070e5989f6afb9 (diff) | |
parent | 266315c91d5e4a6d7b8465eb44d4f6af30d90b30 (diff) | |
download | nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.gz nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.bz2 nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.lz nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.xz nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.zst nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.zip |
Merge remote-tracking branch 'NixOS/master' into staging
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/dit/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/editors/eclipse/plugins.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs/macport.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/kakoune/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/default.nix | 10 |
5 files changed, 43 insertions, 14 deletions
diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index 33d80a577dbe..12ca7a071406 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -1,22 +1,20 @@ -{ fetchurl, stdenv, coreutils, ncurses, lua }: +{ lib, fetchurl, stdenv, libiconv, ncurses, lua }: stdenv.mkDerivation rec { name = "dit-${version}"; - version = "0.4"; + version = "0.5"; src = fetchurl { url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz"; - sha256 = "0bwczbv7annbbpg7bgbsqd5kwypn81sza4v7v99fin94wwmcn784"; + sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc"; }; - buildInputs = [ coreutils ncurses lua ]; + buildInputs = [ ncurses lua ] + ++ lib.optional stdenv.isDarwin libiconv; + # fix paths prePatch = '' patchShebangs tools/GenHeaders - ''; - - # needs GNU tail for tail -r - postPatch = '' substituteInPlace Prototypes.h --replace 'tail' "$(type -P tail)" ''; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index af0f7e2d8c53..8a5991cc7cd7 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -346,6 +346,33 @@ rec { }; }; + drools = buildEclipseUpdateSite rec { + name = "drools-${version}"; + version = "7.17.0.Final"; + + src = fetchzip { + url = "https://download.jboss.org/drools/release/${version}/droolsjbpm-tools-distribution-${version}.zip"; + sha512 = "2qzc1iszqfrfnw8xip78n3kp6hlwrvrr708vlmdk7nv525xhs0ssjaxriqdhcr0s6jripmmazxivv3763rnk2bfkh31hmbnckpx4r3m"; + extraPostFetch = '' + # work around https://github.com/NixOS/nixpkgs/issues/38649 + chmod go-w $out; + + # update site is a couple levels deep, alongside some other irrelevant stuff + cd $out; + find . -type f -not -path ./binaries/org.drools.updatesite/\* -exec rm {} \; + rmdir sources; + mv binaries/org.drools.updatesite/* .; + rmdir binaries/org.drools.updatesite binaries; + ''; + }; + + meta = with stdenv.lib; { + homepage = https://www.drools.org/; + description = "Drools is a Business Rules Management System (BRMS) solution"; + license = licenses.asl20; + }; + }; + eclemma = buildEclipseUpdateSite rec { name = "eclemma-${version}"; version = "2.3.2.201409141915"; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 4eb0fecec407..486172ac51f4 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation rec { # use newer emacs icon cp nextstep/Cocoa/Emacs.base/Contents/Resources/Emacs.icns mac/Emacs.app/Contents/Resources/Emacs.icns + + # Fix sandbox impurities. + substituteInPlace Makefile.in --replace '/bin/pwd' 'pwd' + substituteInPlace lib-src/Makefile.in --replace '/bin/pwd' 'pwd' ''; configureFlags = [ diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 631287e86a6d..16596056c9a0 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "kakoune-unstable-${version}"; + name = "kakoune-${version}"; version = "2019.01.20"; src = fetchFromGitHub { repo = "kakoune"; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 0c0441f20257..78d7d96d3961 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -18,16 +18,16 @@ let }.${system}; sha256 = { - "i686-linux" = "09mgvff27iljj9z7h0xxmr6152hcxh7qqxl3i7wdc55ra1rsjq1n"; - "x86_64-linux" = "1gvlvg3cjsscx6khy5gxd4wnb069kska00qdfwcq4kn7x1z04xnz"; - "x86_64-darwin" = "1mf9nyjnxgmzai7rfd1rkwk0wvil0ripg3mh8icg4mld2jjz8rsy"; + "i686-linux" = "04kbx1cx40lsy9irxy1arp1rixzk49ldhg34w3llmfbx63a4hchf"; + "x86_64-linux" = "1plvx0mjcbizl6iffib95p5224r9frf0mn6c5xp14p3qnrp32jhm"; + "x86_64-darwin" = "14h9gs6jpxydgd1h16ybq3ifw5jc7k83yg22pw3sk6vhy7hx7pxr"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.31.0"; + version = "1.31.1"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; @@ -126,7 +126,7 @@ in and code refactoring. It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences ''; - homepage = http://code.visualstudio.com/; + homepage = https://code.visualstudio.com/; downloadPage = https://code.visualstudio.com/Updates; license = licenses.unfree; maintainers = with maintainers; [ eadwu ]; |