diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-13 12:33:29 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-13 12:33:29 +0100 |
commit | 7257dedd7cf28634e08fc0458ed34a183065b70e (patch) | |
tree | 53d0274ecfd0474666bceec021ce059e428a4b47 /pkgs/applications/editors | |
parent | 7c3588d8ddc35909ca56394c3a5464d6e1551fe0 (diff) | |
parent | 563b491ce89bafaa928beba19a37f6381bfc60d0 (diff) | |
download | nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.gz nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.bz2 nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.lz nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.xz nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.zst nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/bvi/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/neovim/neovim-remote.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/texmaker/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/textadept/default.nix | 134 | ||||
-rw-r--r-- | pkgs/applications/editors/textadept/deps.nix | 42 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/default.nix | 67 |
6 files changed, 84 insertions, 165 deletions
diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index f3f44f769a99..f5e14ff1e096 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = http://bvi.sourceforge.net/download.html; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 1444d53da077..cda45c2c739d 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -2,7 +2,7 @@ with stdenv.lib; -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; version = "2.1.4"; disabled = !pythonPackages.isPy3k; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 036bd8e546c4..79ece9d62a98 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = http://www.xm1math.net/texmaker/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ cfouche ]; + maintainers = with maintainers; [ cfouche markuskowa ]; }; } diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index f17f5a9a26a4..79cad6a9782c 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,139 +1,29 @@ -{ stdenv, fetchhg, fetchurl, fetchzip, gtk2, glib, pkgconfig, unzip, ncurses, zip }: -let - # Textadept requires a whole bunch of external dependencies. - # The build system expects to be able to download them with wget. - # This expression gets Nix to fetch them instead. - - - cached_url = url: sha256: fetchurl { - inherit sha256 url; - }; - - get_url = url: sha256: let - store_path = cached_url url sha256; - in '' - local_path=$(basename ${store_path} | sed -e 's@^[0-9a-z]\+-@@') - - # Copy the file from the Nix store and remove the hash part. - cp ${store_path} $local_path - - # Update its access and modified times. - touch $local_path - ''; - - cached_url_zip = url: sha256: fetchzip { - inherit sha256 url; - }; - - get_url_zip = url: sha256: let - store_path = cached_url_zip url sha256; - in '' - ( - build_dir=$PWD - cd $TMPDIR - - local_path=$(basename ${url} .zip) - - cp -r ${store_path} $local_path - chmod u+rwX -R $local_path - zip -r $build_dir/$local_path.zip $local_path - touch $local_path - ) - ''; - - - # These lists are taken from the Makefile. - scintilla_tgz = "scintilla373.tgz"; - tre_zip = "cdce45e8dd7a3b36954022b4a4d3570e1ac5a4f8.zip"; - scinterm_zip = "scinterm_1.8.zip"; - scintillua_zip = "33298b6cbce3.zip"; - lua_tgz = "lua-5.3.4.tar.gz"; - lpeg_tgz = "lpeg-1.0.0.tar.gz"; - lfs_zip = "v_1_6_3.zip"; - lspawn_zip = "lspawn_1.5.zip"; - luajit_tgz = "LuaJIT-2.0.3.tar.gz"; - libluajit_tgz = "libluajit_2.0.3.x86_64.tgz"; - gtdialog_zip = "gtdialog_1.3.zip"; - cdk_tgz = "cdk-5.0-20150928.tgz"; - termkey_tgz = "libtermkey-0.17.tar.gz"; - - scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip; - tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip; - #scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip; - scintillua_url = "http://foicica.com/hg/scintillua/archive/" + scintillua_zip; - gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip; - lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip; - - scintilla_url = "mirror://sourceforge/scintilla/" + scintilla_tgz; - lua_url = "http://www.lua.org/ftp/" + lua_tgz; - lpeg_url = "http://www.inf.puc-rio.br/~roberto/lpeg/" + lpeg_tgz; - lfs_url = "https://github.com/keplerproject/luafilesystem/archive/" + lfs_zip; - luajit_url = "http://luajit.org/download/" + luajit_tgz; - libluajit_url = "http://foicica.com/textadept/download/" + libluajit_tgz; - cdk_url = "http://invisible-mirror.net/archives/cdk/" + cdk_tgz; - bombay_url = "http://foicica.com/hg/bombay/archive/tip.zip"; - termkey_url = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz; - - - get_scintilla = get_url scintilla_url "0rkczxzj6bqxks4jcbxbyrarjhfjh95nwxxiqprfid1kaamgkfm2"; - get_tre = get_url tre_url "0mw8npwk5nnhc33352j4akannhpx77kqvfam8jdq1n4yf8js1gi7"; - get_scinterm = get_url scinterm_url "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi"; - get_scintillua = get_url scintillua_url "1kx113dpjby1p9jcsqlnlzwj01z94f9szw4b38077qav3bj4lk6g"; - get_lua = get_url lua_url "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; - get_lpeg = get_url lpeg_url "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; - get_lfs = get_url_zip lfs_url "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; - get_lspawn = get_url lspawn_url "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi"; - get_luajit = get_url luajit_url "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"; - get_libluajit = get_url libluajit_url "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy"; - get_gtdialog = get_url gtdialog_url "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; - get_cdk = get_url cdk_url "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; - get_bombay = get_url_zip bombay_url "0illabngrrxidkprgz268wgjqknrds34nhm6hav95xc1nmsdr6jj" - + "mv tip.zip bombay.zip\n"; - get_termkey = get_url termkey_url "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538"; - - - get_deps = get_scintilla - + get_tre - + get_scinterm - + get_scintillua - + get_lua - + get_lpeg - + get_lfs - + get_lspawn - + get_luajit - + get_libluajit - + get_gtdialog - + get_cdk - + get_bombay - + get_termkey; -in +{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: stdenv.mkDerivation rec { - version = "9.3"; + version = "10.2"; name = "textadept-${version}"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 glib unzip ncurses zip + gtk2 ncurses glib unzip zip ]; src = fetchhg { url = http://foicica.com/hg/textadept; rev = "textadept_${version}"; - sha256 = "18x79pazm86agn1khdxfnf87la6kli3xasi7dcjx7l6yyz19y14d"; + sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl"; }; - preConfigure = '' - cd src - - # Make a dummy wget. - mkdir wget - echo '#! ${stdenv.shell}' > wget/wget - chmod a+x wget/wget - export PATH="$PATH:$PWD/wget" + preConfigure = + lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: + "ln -s ${fetchurl params} $PWD/src/${name}" + ) (import ./deps.nix)) + '' - ${get_deps} + # work around trying to download stuff in `make deps` + function wget() { true; } + export -f wget - # Let the build system do whatever setup it needs to do with these files. + cd src make deps ''; diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/deps.nix new file mode 100644 index 000000000000..80306191ff12 --- /dev/null +++ b/pkgs/applications/editors/textadept/deps.nix @@ -0,0 +1,42 @@ +{ + "542782a4df7d.zip" = { + url = "http://foicica.com/hg/scintilla/archive/542782a4df7d.zip"; + sha256 = "1qwxxcj86z9y7ij05j60lcp1awy2c9ck0vnn9z6c732sqjza0zx5"; + }; + "lua-5.3.5.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; + sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; + }; + "lpeg-1.0.0.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.0.tar.gz"; + sha256 = "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; + }; + "v_1_6_3.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip"; + sha256 = "044s125im2irb4i42nnc5shvjj25fp4vsdbzd6b0va5igj0f6h4y"; + }; + "6435a42450c7.zip" = { + url = "http://foicica.com/hg/gtdialog/archive/6435a42450c7.zip"; + sha256 = "1vxn89sif3qccksb6x5iprysqhjg69g7nyxlgrg31q397dmsg1ym"; + }; + "cdk-5.0-20150928.tgz" = { + url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; + sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; + }; + "libtermkey-0.20.tar.gz" = { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; + sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc"; + }; + "pdcurs36.zip" = { + url = "http://prdownloads.sourceforge.net/pdcurses/pdcurs36.zip"; + sha256 = "0y91zpygrxms7d1l5ksrz42bkvq8jd2xqlj5j7wgyxcl58chcw9b"; + }; + "bombay.zip" = { + url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip"; + sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h"; + }; + "cloc-1.60.pl" = { + url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl"; + sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a"; + }; +} diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 08c8561abeda..0c0441f20257 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,39 +1,33 @@ -{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem, - gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret, - isInsiders ? false }: +{ stdenv, lib, fetchurl, makeDesktopItem +, unzip, libsecret, libXScrnSaver, wrapGAppsHook +, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook +, systemd, fontconfig +, isInsiders ? false }: let executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; shortName = "Code" + lib.optionalString isInsiders " - Insiders"; + inherit (stdenv.hostPlatform) system; + plat = { "i686-linux" = "linux-ia32"; "x86_64-linux" = "linux-x64"; "x86_64-darwin" = "darwin"; - }.${stdenv.hostPlatform.system}; + }.${system}; sha256 = { - "i686-linux" = "1g73fay6fxlqhalkqq5m6rjbp68k9npk0rrxrkhdj8mw0cz74dpm"; - "x86_64-linux" = "0mil8n5i2ajdyrgq862wq59ajy2122rvvn7m7mxq4ab92sk26rix"; - "x86_64-darwin" = "07r52scs1sgafzxqal39r8vf9p9qqvwwx8f6z09gqcf6clr6k48q"; - }.${stdenv.hostPlatform.system}; - - archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz"; - - rpath = lib.concatStringsSep ":" [ - atomEnv.libPath - "${lib.makeLibraryPath [gtk2]}" - "${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0" - "${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1" - "${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1" - "$out/lib/vscode" - ]; + "i686-linux" = "09mgvff27iljj9z7h0xxmr6152hcxh7qqxl3i7wdc55ra1rsjq1n"; + "x86_64-linux" = "1gvlvg3cjsscx6khy5gxd4wnb069kska00qdfwcq4kn7x1z04xnz"; + "x86_64-darwin" = "1mf9nyjnxgmzai7rfd1rkwk0wvil0ripg3mh8icg4mld2jjz8rsy"; + }.${system}; + archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.30.2"; + version = "1.31.0"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; @@ -83,12 +77,18 @@ in ''; }; - buildInputs = if stdenv.hostPlatform.system == "x86_64-darwin" - then [ unzip libXScrnSaver libsecret ] - else [ wrapGAppsHook libXScrnSaver libxkbfile libsecret ]; + buildInputs = (if stdenv.isDarwin + then [ unzip ] + else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) + ++ [ libsecret libXScrnSaver ]; + + nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; + + dontBuild = true; + dontConfigure = true; installPhase = - if stdenv.hostPlatform.system == "x86_64-darwin" then '' + if system == "x86_64-darwin" then '' mkdir -p $out/lib/vscode $out/bin cp -r ./* $out/lib/vscode ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin @@ -110,22 +110,8 @@ in cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png ''; - postFixup = lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" \ - $out/lib/vscode/${executableName} - - patchelf \ - --set-rpath "${rpath}" \ - $out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node - - patchelf \ - --set-rpath "${rpath}" \ - "$out/lib/vscode/resources/app/node_modules.asar.unpacked/native-keymap/build/Release/\ - keymapping.node" - - ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0 + preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ systemd fontconfig ]}) ''; meta = with stdenv.lib; { @@ -143,6 +129,7 @@ in homepage = http://code.visualstudio.com/; downloadPage = https://code.visualstudio.com/Updates; license = licenses.unfree; + maintainers = with maintainers; [ eadwu ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } |