diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/editors')
59 files changed, 751 insertions, 775 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/default.nix index e8d8eb900262..d94ad070536a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -9,19 +9,19 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.1.0.19"; # "Android Studio 4.1.0" - build = "201.6858069"; - sha256Hash = "sha256-S5Uh/EpjE61l/z4UsPP7UEJ9Rk/hQidVVWX0bg/60gI="; + version = "4.1.1.0"; # "Android Studio 4.1.1" + build = "201.6953283"; + sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os="; }; betaVersion = { - version = "4.1.0.18"; # "Android Studio 4.1 RC 3" - build = "201.6823847"; - sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; + version = "4.2.0.17"; # "Android Studio 4.2 Beta 1" + build = "202.6987402"; + sha256Hash = "07qr0b1zdzpc1nsi6593518dxp89dcjfp4lznb1d3id8vbqla4i7"; }; latestVersion = { # canary & dev - version = "4.2.0.13"; # "Android Studio 4.2 Canary 13" - build = "202.6863838"; - sha256Hash = "sha256-avkRelP5/sDXW7pdVrOknmb3PtR6XQEmQXivZFljpLc="; + version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2" + build = "202.7006259"; + sha256Hash = "1d4brfx1fh1vlcjkb0x8hjj2qgz2dl5wbaiy8dj8w03vcf493nc5"; }; in { # Attributes are named by their corresponding release channels diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/bluefish/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/bluefish/default.nix index c7ac671c15bf..48c83b053108 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/bluefish/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/bluefish/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bluefish-2.2.11"; + name = "bluefish-2.2.12"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1zy2ppdg3nq9iy3zgfhnw93bq5zbbhyampf7bk3grpfvq5zqfk25"; + sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/default.nix index a1af859af819..af3f087dae26 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -30,22 +30,21 @@ let deps = lib.mapAttrs (name: spec: fetchFromGitHub { - owner = "Alexey-T"; repo = name; - inherit (spec) rev sha256; + inherit (spec) owner rev sha256; } ) (builtins.fromJSON (builtins.readFile ./deps.json)); in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.111.0"; + version = "1.115.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "1ai0g8fmw4m237dqh5dkr8w9qqricyvp49ijz2ivvmg9dsdfzjfp"; + sha256 = "0q7gfpzc97fvyvabjdb9a4d3c2qhm4zf5bqgnsj73vkly80kgww8"; }; patches = [ @@ -74,6 +73,7 @@ stdenv.mkDerivation rec { cp -r --no-preserve=mode ${dep} ${name} '') deps) + '' lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ + bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ EncConv/encconv/encconv_package.lpk \ ATBinHex-Lazarus/atbinhex/atbinhex_package.lpk \ ATFlatControls/atflatcontrols/atflatcontrols_package.lpk \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 9c3270bb28a2..02418d25842d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -1,42 +1,57 @@ { "EncConv": { + "owner": "Alexey-T", "rev": "2020.06.15", "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3" }, "ATBinHex-Lazarus": { + "owner": "Alexey-T", "rev": "2020.09.05", "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072" }, "ATFlatControls": { - "rev": "2020.08.23", - "sha256": "1axzwiz5h62v11ncynxcg431dfbky9pwyha7cd6kpizjdjagfklw" + "owner": "Alexey-T", + "rev": "2020.09.20", + "sha256": "09svn8yyqp6znvfpcxrsybkclh828h5rvah7nhbhk7nrfzj8i63x" }, "ATSynEdit": { - "rev": "2020.09.05", - "sha256": "0qn0fp7rbi48f3nrysb0knkd7a3a6pl5w72yf95g5iibal4zrib2" + "owner": "Alexey-T", + "rev": "2020.10.12", + "sha256": "07vznwwfa3c1jr1cd32yppw0mmmm1ja9bmsxhxlcbnc2nb30n9zr" }, "ATSynEdit_Cmp": { - "rev": "2020.09.05", - "sha256": "1bd25zc97001b7lg0bvi8va9mazkr6jih6d2ddkabcxcnsj0dxnq" + "owner": "Alexey-T", + "rev": "2020.10.11", + "sha256": "11vx685i85izp7wzb34dalcwlkmkbz1vzva5j9cf2yz1jff1v4qw" }, "EControl": { - "rev": "2020.09.05", - "sha256": "1n7s1zkhrr216gqdqvq6wq0n3jq7s78mwpi5s5j8054p0fak1ywi" + "owner": "Alexey-T", + "rev": "2020.10.04", + "sha256": "0ypbaca3y5biw2207yh3x5p28gm8g51qf7glm5622w3cgbrf9mdq" }, "ATSynEdit_Ex": { - "rev": "2020.09.05", - "sha256": "17y2cx5syj3jvrszjgdyf1p6vilp2qgaggz4y8yqnz99cvd0shs7" + "owner": "Alexey-T", + "rev": "2020.10.04", + "sha256": "0z66cm9pgdi7whqaim6hva4aa08zrr1881n1fal7lnz6wlla824k" }, "Python-for-Lazarus": { + "owner": "Alexey-T", "rev": "2020.07.31", "sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j" }, "Emmet-Pascal": { + "owner": "Alexey-T", "rev": "2020.09.05", "sha256": "0qfiirxnk5g3whx8y8hp54ch3h6gkkd01yf79m95bwar5qvdfybg" }, "CudaText-lexers": { + "owner": "Alexey-T", "rev": "2020.08.10", "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6" + }, + "bgrabitmap": { + "owner": "bgrabitmap", + "rev": "v11.2.4", + "sha256": "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md" } } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch b/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch index 44912160b268..5c896bc046c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch @@ -1,8 +1,8 @@ diff --git i/app/formmain.pas w/app/formmain.pas -index 8c1131680..6c6c0043f 100644 +index f6f37febb..cf993d75e 100644 --- i/app/formmain.pas +++ w/app/formmain.pas -@@ -2135,6 +2135,7 @@ begin +@@ -2156,6 +2156,7 @@ begin false {$endif}; *) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix index 218fbe8fc1fc..0282dc95f72e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,6 +1,6 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender , zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk -, makeWrapper, ... }: +, makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }: @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications mkdir -p $out/share/pixmaps ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm + + # ensure eclipse.ini does not try to use a justj jvm, as those aren't compatible with nix + ${perl}/bin/perl -i -p0e 's|-vm\nplugins/org.eclipse.justj.*/jre/bin\n||' $out/eclipse/eclipse.ini ''; # */ meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/default.nix index 87ac29b58e94..0afbecb84cf3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -10,13 +10,16 @@ assert stdenv ? glibc; # https://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions +# +# to test: +# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done let platform_major = "4"; - platform_minor = "16"; + platform_minor = "17"; year = "2020"; - month = "06"; - timestamp = "${year}${month}040540"; + month = "09"; + timestamp = "${year}${month}021800"; gtk = gtk3; in rec { @@ -34,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "0vfxzsvfv9zmd0ckrdpziijzskh13g8kgk8ibkwmhmqmj14a3visk6yvn5q2s0knkswl1zy9arinw0mxvqh72dfj63vwc01vhp06lyr"; + sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh"; }; }; @@ -46,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "29nr1x3fgdw5ygrppfma6yi1iaqvad24jyb58sag735z1nz4ymajcwakg52mlv3s19d4w8cxpskh1r459mwz7j769qplymspqifvlkd"; + sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y"; }; }; @@ -58,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2pm4xam0jn9x34k1hr5rn67fpvc6snlkpcfn4bzdcf2xjv9f3dr2039mkcrhri5nv2bj6fkbai6aga6fmmrb3na33b7ir7sqlqqn61b"; + sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9"; }; }; @@ -83,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "195c07yabmi2a42qxfmpbv6ychpj15bbpgyp40s1pcdb3p875vcqjinq9dqy2sixzwjhfdrggpvwihav87rkih9arzmk2s4cm31mjqd"; + sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k"; }; }; @@ -95,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3n8jllgxarrxgz16n7zb4bgaqxk0m9frcxrgdxvy25ar2iw8js4q4ir3cc20y4ri3ii74rf3jy6n4ndhm57miwqh4p2wqzhfjlinirb"; + sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q"; }; }; @@ -107,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "1l0gc7srpvn3r0yrbrp1pjv1a3n1y7q5fqww5fmzyw1d6j3hjkqj74c9bff16579cpf7z6d4wmj6kr7z89p0ignrx319gc8p0hivi1y"; + sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1"; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index 4edb7a7ebc4f..43ab2a796ebd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "9.11.1"; + version = "10.0.1"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.11/${name}/${name}.zip"; - sha256 = "00cpaal6jm9xb4nbkljrf381r3lf1rb1p06vrbn4l0lxnbckb9df"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip"; + sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5"; }; meta = with stdenv.lib; { @@ -355,9 +355,6 @@ rec { 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 {} \; @@ -475,12 +472,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.16"; + version = "4.17"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202006040540/org.eclipse.jdt-${version}.zip"; - sha256 = "0g349hg2nv1y628daxf84396wpf33z52wxv0gawlgrirbbizaznd"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip"; + sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/edbrowse/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/edbrowse/default.nix index c43640b65245..4e727e9a22a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/edbrowse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/edbrowse/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "edbrowse"; - version = "3.7.6"; + version = "3.7.7"; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "CMB"; repo = "edbrowse"; rev = "v${version}"; - sha256 = "0yk4djb9q8ll94fs57y706bsqlar4pfx6ysasvkzj146926lrh8a"; + sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf"; }; meta = with stdenv.lib; { description = "Command Line Editor Browser"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/elvis/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/elvis/default.nix index 3a6c8c97b221..df8f255de5e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/elvis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/elvis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { configureFlags = [ "--ioctl=termios" ]; meta = { - homepage = "http://elvis.vi-editor.org/"; + homepage = "http://elvis.the-little-red-haired-girl.org/"; description = "A vi clone for Unix and other operating systems"; license = stdenv.lib.licenses.free; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix index 7f5a097daa93..66ab98302375 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "prolog-mode-1.25"; + pname = "prolog-mode"; + version = "1.28"; src = fetchurl { url = "http://bruda.ca/_media/emacs/prolog.el"; - sha256 = "0hfd2dr3xc5qxgvc08nkb2l5a05hfldahdc6ymi9vd8798cc46yh"; + sha256 = "oCMzks4xuor8Il8Ll8PXh1zIvMl5qN0RCFJ9yKiHOHU="; }; buildCommand = '' @@ -17,8 +18,5 @@ stdenv.mkDerivation { homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; license = stdenv.lib.licenses.gpl2Plus; - - # Has wrong sha256 - broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/generic.nix index f2904f3e012b..0e09b0c20ee0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -22,6 +22,7 @@ , srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false +, withImageMagick ? lib.versionOlder version "27" && (withX || withNS) , toolkit ? ( if withGTK2 then "gtk2" else if withGTK3 then "gtk3" @@ -101,7 +102,8 @@ in stdenv.mkDerivation { ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft gconf cairo ] - ++ lib.optionals (withX || withNS) [ imagemagick librsvg ] + ++ lib.optionals (withX || withNS) [ librsvg ] + ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] @@ -126,6 +128,7 @@ in stdenv.mkDerivation { "--with-gif=no" "--with-tiff=no" ]) ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-nativecomp" + ++ lib.optional withImageMagick "--with-imagemagick" ; installTargets = [ "tags" "install" ]; @@ -142,7 +145,7 @@ in stdenv.mkDerivation { rm -rf $siteVersionDir '' + lib.optionalString withCsrc '' for srcdir in src lisp lwlib ; do - dstdir=$siteVersionDir/$srcdir + dstdir=$out/share/emacs/$siteVersionDir/$srcdir mkdir -p $dstdir find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; cp $srcdir/TAGS $dstdir @@ -151,6 +154,8 @@ in stdenv.mkDerivation { '' + lib.optionalString withNS '' mkdir -p $out/Applications mv nextstep/Emacs.app $out/Applications + '' + lib.optionalString (nativeComp && withNS) '' + ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp ''; postFixup = lib.concatStringsSep "\n" [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/site-start.el b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/site-start.el index de4708b88908..2f02d6d1a86d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/site-start.el +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/site-start.el @@ -52,9 +52,6 @@ least specific (the system profile)" (file-name-directory load-file-name)))) ; .../emacs/site-lisp/ (version (file-name-as-directory - (concat - (number-to-string emacs-major-version) - "." - (number-to-string emacs-minor-version)))) + emacs-version)) (src (file-name-as-directory "src"))) (setq find-function-C-source-directory (concat emacs version src))) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/geany/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/geany/default.nix index d3cc36244193..124d4ee0417a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/geany/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/geany/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "geany"; - version = "1.36"; + version = "1.37.1"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://download.geany.org/${pname}-${version}.tar.bz2"; - sha256 = "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i"; + sha256 = "060sachn33xpx3a609f09y97qq5ky17gvv686zbvrn618ij7bi8q"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/glow/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/glow/default.nix index 0bb8b4eb18ac..d941c85e2c6f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.0.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 ="0jyl5ln7c2naawmw7bljzrldr96xyb5rbis6y6blmyghr0vx07zb"; + sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh"; }; - vendorSha256 = "0z3r8fvpy36ybgb18sr0lril1sg8z7s99xv1a6g1v3zdnj3zimav"; + vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z"; doCheck = false; @@ -21,6 +21,6 @@ buildGoModule rec { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; license = licenses.mit; - maintainers = with maintainers; [ ehmry filalex77 penguwin ]; + maintainers = with maintainers; [ Br1ght0ne penguwin ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index a94ab58a78fe..6704702837a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.36.1"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2"; + sha256 = "06wcyfrwcjyj2vcqyw0z3sy1r4qxpcdpwqq1qmpsaphpz8acycjn"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix index 695a13eecabd..ffdeb21de7f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let - version = "3.36.0"; + version = "3.38.0"; pname = "gnome-latex"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1869kr1zhcp04mzbi67lwgk497w840dbbc7427i9yh9b9s7j6mqn"; + sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/greenfoot/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/greenfoot/default.nix new file mode 100644 index 000000000000..8205d52b43a1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/greenfoot/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, makeWrapper, jdk }: + +stdenv.mkDerivation rec { + pname = "greenfoot"; + version = "3.6.1"; + src = fetchurl { + # We use the deb here. First instinct might be to go for the "generic" JAR + # download, but that is actually a graphical installer that is much harder + # to unpack than the deb. + url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; + sha256 = "112h6plpclj8kbv093m4pcczljhpd8d47d7a2am1yfgbyckx6hf0"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + + installPhase = '' + mkdir -p $out + cp -r usr/* $out + rm -r $out/share/greenfoot/jdk + rm -r $out/share/greenfoot/javafx + + makeWrapper ${jdk}/bin/java $out/bin/greenfoot \ + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/greenfoot/bluej.jar\" bluej.Boot -greenfoot=true -bluej.compiler.showunchecked=false -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API" + ''; + + meta = with stdenv.lib; { + description = "A simple integrated development environment for Java"; + homepage = "https://www.greenfoot.org/"; + license = licenses.gpl2ClasspathPlus; + maintainers = [ maintainers.charvp ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index d54513971a8a..78e6ad30b711 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -90,7 +90,7 @@ let It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more. ''; - maintainers = with maintainers; [ loskutov ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }); @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.5"; /* 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 = "1kdlmdsfxmwks3rk2dzm5q30vwzpxcwzpyjsir122k36xnqvaqxq"; /* updated by script */ + sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.3"; /* 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 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */ + sha256 = "1j0mlsiqh80mspi2x9mi0h5hxhg5gw6395hyl9w33q8dxm95mx2d"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.3"; /* 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 = "0kbn9q7fvhrzb1w6l8i2nv4cx8qrj74jp7fidj9yk8vkv9lfijg6"; /* updated by script */ + sha256 = "0x1nsjw1m03iq7sd9i2qqlyribrzgi8yh6k5hnb630kvrxr8pxy6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.3"; /* 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 = "1196zrcbgrr9271kjrzd2mzvhvxd7hkr1d2a4ij4h8f97qmsd6r6"; /* updated by script */ + sha256 = "1l6bvfgzp27113rjy1y3jvp09cqx8gpnbgpwp83vsph7x0dhx8a3"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; - sha256 = "06c0yv9vvz0y5njh1sghn7ijpn1d81mxsyk5xjpj29bvvg511pjs"; /* updated by script */ + sha256 = "1wd3d8pc155m54y5p2056p0x93v2nv9457i7la53ibbs7rj1j7kw"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.4"; /* 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 = "14hz6w5lgn8ddscicm4s9xhi07j5adsq0bmyr8amzmj5q6jgw4p9"; /* updated by script */ + sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.5"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1a1vhlc2q5n3dxli0x6ppxx3mgary4gpakcxdp9nylmixjzjph6v"; /* updated by script */ + sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.5"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0v64f5sbv1639d6fjg0shfgdy40f1xc2zbn0jqfrx6xmkg7wgsz9"; /* updated by script */ + sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* 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 = "01namzd29chj975w3awanlzf38hh30cfjzyljqfkp6y3djn0if1r"; /* updated by script */ + sha256 = "1anl48ifv5ayqn876dqckxc1b5fw1271pvamzf1vvk501wv6dpaf"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.3"; /* 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 = "11v26hpf891nq5vj8i0ad4shhzpy8b7rvyrkr3l29dwfnd83lgpz"; /* updated by script */ + sha256 = "0ij6j9bxfqzj8gnrhhdgai22s1n5swd4waxd5zjvmv7q9j9cb2l5"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.3"; /* 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 = "1w17cf0qj0vyizkzj1frcmi52q5qxbf31msg8df38wy2l8r0b928"; /* updated by script */ + sha256 = "0sk7slwfr9jasid09hxw81sik5srn35vif3pbzpybig3yszbv6ld"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/default.nix index eec14f286ba7..f1f811066597 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -30,6 +30,15 @@ stdenv.mkDerivation rec { $out/bin/kak -ui json -E "kill 0" ''; + postInstall = '' + # make share/kak/autoload a directory, so we can use symlinkJoin with plugins + cd "$out/share/kak" + autoload_target=$(readlink autoload) + rm autoload + mkdir autoload + ln -s --relative "$autoload_target" autoload + ''; + meta = { homepage = "http://kakoune.org/"; description = "A vim inspired text editor"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix index 20df2872628f..6a2ef200e6e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Ease navigation between opened buffers in Kakoune"; + description = "Case convention conversion for Kakoune"; homepage = "https://gitlab.com/FlyingWombat/case.kak"; license = licenses.unlicense; maintainers = with maintainers; [ eraserhd ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix index 3926973f7ead..168c1d06b31e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix @@ -1,7 +1,7 @@ -{ pkgs, parinfer-rust }: +{ pkgs, parinfer-rust, rep }: { - inherit parinfer-rust; + inherit parinfer-rust rep; case-kak = pkgs.callPackage ./case.kak.nix { }; kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; @@ -12,4 +12,5 @@ kak-powerline = pkgs.callPackage ./kak-powerline.nix { }; kak-prelude = pkgs.callPackage ./kak-prelude.nix { }; kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; + openscad-kak = pkgs.callPackage ./openscad.kak.nix { }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix index 512f1f09207b..4b67f7609769 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "kak-auto-pairs"; - version = "2019-07-27"; + version = "2020-07-14"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "886449b1a04d43e5deb2f0ef4b1aead6084c7a5f"; - sha256 = "0knfhdvslzw1f1r1k16733yhkczrg3yijjz6n2qwira84iv3239j"; + rev = "5b4b3b723c34c8b7f40cee60868204974349bf9f"; + sha256 = "1wgrv03f1lkzflbbaz8n23glij5rvfxf8pcqysd668mbx1hcrk9i"; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix index ee9c125827c8..8fd5fba7d7ed 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/share/kak/autoload/plugins - cp -r rc $out/share/kak/autoload/plugins/auto-pairs + cp -r rc $out/share/kak/autoload/plugins/prelude ''; meta = with stdenv.lib; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix new file mode 100644 index 000000000000..21c8b7a60cca --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "openscad.kak"; + version = "unstable-2019-11-08"; + + src = fetchFromGitHub { + owner = "mayjs"; + repo = "openscad.kak"; + rev = "d9143d5e7834e3356b49720664d5647cab9db7cc"; + sha256 = "0j4dqhrn56z77hdalfdxagwz8h6nwr8s9i4w0bs2644k72lsm2ix"; + }; + + installPhase = '' + install -Dm644 rc/openscad.kak -t $out/share/kak/autoload/plugins/ + ''; + + meta = with stdenv.lib; { + description = "Syntax highlighting for OpenSCAD files"; + homepage = "https://github.com/mayjs/openscad.kak"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix index b4cc823880e7..7ac56d9cb1e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix @@ -1,44 +1,31 @@ -{ stdenv, bash }: -with stdenv.lib; - -kakoune: +{ symlinkJoin, makeWrapper, kakoune, plugins ? [], configure ? {} }: let - getPlugins = { plugins ? [] }: plugins; + # "plugins" is the preferred way, but some configurations may be + # using "configure.plugins", so accept both + requestedPlugins = plugins ++ (configure.plugins or []); - wrapper = { configure ? {} }: - stdenv.mkDerivation rec { - pname = "kakoune"; - version = getVersion kakoune; +in + symlinkJoin { + name = "kakoune-${kakoune.version}"; - src = ./.; - buildCommand = '' - mkdir -p $out/share/kak - for plugin in ${strings.escapeShellArgs (getPlugins configure)}; do - if [[ -d $plugin/share/kak/autoload ]]; then - find "$plugin/share/kak/autoload" -type f -name '*.kak'| while read rcfile; do - printf 'source "%s"\n' "$rcfile" - done - fi - done >>$out/share/kak/plugins.kak + buildInputs = [ makeWrapper ]; - mkdir -p $out/bin - substitute ${src}/wrapper.sh $out/bin/kak \ - --subst-var-by bash "${bash}" \ - --subst-var-by kakoune "${kakoune}" \ - --subst-var-by out "$out" - chmod +x $out/bin/kak - ''; + paths = [ kakoune ] ++ requestedPlugins; - preferLocalBuild = true; - buildInputs = [ bash kakoune ]; - passthru = { unwrapped = kakoune; }; + postBuild = '' + # location of kak binary is used to find ../share/kak/autoload, + # unless explicitly overriden with KAKOUNE_RUNTIME + rm "$out/bin/kak" + makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" --set KAKOUNE_RUNTIME "$out/share/kak" - meta = kakoune.meta // { - # prefer wrapper over the package - priority = (kakoune.meta.priority or 0) - 1; - hydraPlatforms = []; - }; - }; -in - makeOverridable wrapper + # currently kakoune ignores doc files if they are symlinks, so workaround by + # copying doc files over, so they become regular files... + mkdir "$out/DELETE_ME" + mv "$out/share/kak/doc" "$out/DELETE_ME" + cp -r --dereference "$out/DELETE_ME/doc" "$out/share/kak" + rm -Rf "$out/DELETE_ME" + ''; + + meta = kakoune.meta // { priority = (kakoune.meta.priority or 0) - 1; }; + } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.sh b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.sh deleted file mode 100644 index 48a971a10c6e..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!@bash@/bin/bash - -# We use the -E option to load plugins. This only makes sense when we are -# starting a new session, so we detect that. Also, Kakoune can only handle -# one -E option, so we prepend loading plugins to an existing one. -args=( "$@" ) -loadPlugins=true -EValueOffset=-1 -pluginScript='@out@/share/kak/plugins.kak' - -for (( i = 0; i < ${#args[@]}; i++ )); do - case "${args[i]}" in - -n|-c|-l|-p|-clear|-version) loadPlugins=false;; - -E) EValueOffset=$(( i + 1 ));; - --) break;; - esac - case "${args[i]}" in - -E|-c|-e|-s|-p|-f|-i|-ui|-debug) i=$(( i + 1 ));; - esac -done - -if [[ $loadPlugins = true ]]; then - if (( EValueOffset >= 0 )); then - args[EValueOffset]="source '$pluginScript'"$'\n'"${args[EValueOffset]}" - else - args=( "-E" "source '$pluginScript'" "${args[@]}" ) - fi -fi - -exec @kakoune@/bin/kak "${args[@]}" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix index b4e4044bea6a..524835402f4e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.5.2"; + version = "5.6.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0z32x0297g078jk3jhzb4vrf8jhw0qprvqzm9p097h8x0026w42l"; + sha256 = "1j5m9mhjzp2r4wdwnnnckms8ic536s6y0iyry2zdndbsy215hqlz"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix index 9fb251d52957..9af12b386a0b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.5.2"; + version = "5.6.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1qxvsz19iv5fr0nvz75b13knmsbkhkgvlvrhip8y4j66ypscs652"; + sha256 = "1bm6jk7gkl4vi579x99mja4znrzzp15zk66ss600dn8aq11jrxv2"; }; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix index e07e7300048a..d8f41664e665 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.5.2"; + version = "5.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2"; + sha256 = "0cpmavxz5fi0f1rjinvn6id1nplvjwg00l0n36s0ybygqkacgb9q"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kibi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kibi/default.nix index 85ad49a01d67..7945dedc52e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kibi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kibi/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; - version = "0.2.0"; + version = "0.2.1"; - cargoSha256 = "0zyqzb3k4ak7h58zjbg9b32hz1vgbbn9i9l85j4vd4aw8mhsz0n9"; + cargoSha256 = "1cbiidq0w5f9ynb09b6828p7p7y5xhpgz47n2jsl8mp96ydhy5lv"; src = fetchFromGitHub { owner = "ilai-deutel"; repo = "kibi"; rev = "v${version}"; - sha256 = "1cqnzw6gpsmrqcz82zn1x5i6najcr3i7shj0wnqzpwppff9a6yac"; + sha256 = "1x5bvvq33380k2qhs1bwz3f9zl5q1sl7iic47pxfkzv24bpjnypb"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kile/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kile/default.nix index fa25252fc6f8..6819c4337f4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kile/default.nix @@ -29,14 +29,17 @@ mkDerivation rec { sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; }; - nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; + nativeBuildInputs = [ + extra-cmake-modules + wrapGAppsHook + kdoctools + ]; - propagatedBuildInputs = [ + buildInputs = [ kconfig kcrash kdbusaddons kdelibs4support - kdoctools kguiaddons kiconthemes kinit @@ -48,11 +51,15 @@ mkDerivation rec { poppler qtscript ]; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; propagatedUserEnvPkgs = [ konsole ]; meta = { - description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment"; + description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment"; homepage = "https://www.kde.org/applications/office/kile/"; maintainers = with lib.maintainers; [ fridh ]; license = lib.licenses.gpl2Plus; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/leo-editor/default.nix index f09fd2ec2779..e583671bcb40 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/leo-editor/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/leo-editor/default.nix @@ -62,6 +62,6 @@ mkDerivation rec { 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 = licenses.mit; - maintainers = with maintainers; [ leonardoce ramkromberg ]; + maintainers = with maintainers; [ leonardoce ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/lite/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/lite/default.nix index 908ecf2bdd71..2f4397234984 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/lite/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/lite/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "A lightweight text editor written in Lua"; homepage = "https://github.com/rxi/lite"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/marker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/marker/default.nix new file mode 100644 index 000000000000..19ffdbd2c2c1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/marker/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gtk3 +, gtksourceview +, gtkspell3 +, webkitgtk +, pandoc +}: + +stdenv.mkDerivation rec { + pname = "marker"; + version = "2020.04.04"; + + src = fetchFromGitHub { + owner = "fabiocolacio"; + repo = "Marker"; + rev = version; + fetchSubmodules = true; + sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + gtksourceview + gtkspell3 + webkitgtk + pandoc + ]; + + meta = with stdenv.lib; { + homepage = "https://fabiocolacio.github.io/Marker/"; + description = "Markdown editor for the Linux desktop"; + maintainers = with maintainers; [ trepetti ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${version}"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/micro/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/micro/default.nix index ffef5d5fdde2..f3506b0cb985 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -1,40 +1,33 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "micro"; - version = "2.0.7"; - - goPackagePath = "github.com/zyedidia/micro"; + version = "2.0.8"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb"; - fetchSubmodules = true; + sha256 = "1b51fvc9hrjfl8acr3yybp66xfll7d43412qwi76wxwarn06gkci"; }; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/micro" ]; - buildFlagsArray = let t = "${goPackagePath}/internal/util"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.CommitHash=${src.rev} - ''; + vendorSha256 = "19iqvl63g9y6gkzfmv87rrgj4c4y6ngh467ss94rzrhaybj2b2d8"; - goDeps = ./deps.nix; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; postInstall = '' - installManPage $src/assets/packaging/micro.1 + installManPage assets/packaging/micro.1 + install -Dt $out/share/applications assets/packaging/micro.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; } - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/micro/deps.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/micro/deps.nix deleted file mode 100644 index d1cb91c29590..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/micro/deps.nix +++ /dev/null @@ -1,345 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "v1.0.0"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "v1.0.1"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "95032a82bc51"; - sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "v1.0.3"; - sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.7"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "c382bd3c16ff"; - sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.1.0"; - sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/xo/terminfo"; - fetch = { - type = "git"; - url = "https://github.com/xo/terminfo"; - rev = "454e5b68f9e8"; - sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "ab39c6098bdb"; - sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; - }; - } - { - goPackagePath = "github.com/zyedidia/clipboard"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/clipboard"; - rev = "v1.0.3"; - sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q"; - }; - } - { - goPackagePath = "github.com/zyedidia/glob"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/glob"; - rev = "dd4023a66dc3"; - sha256 = "1vqw4xbqq6j8p5m7mwxvb448w69vjvgzx0ndsfzdh2cxfirwp3y7"; - }; - } - { - goPackagePath = "github.com/zyedidia/highlight"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/highlight"; - rev = "201131ce5cf5"; - sha256 = "0blaynf32swmqddx2hcrifrfssj9c04kwnbdy42h3kzxihrwz4ps"; - }; - } - { - goPackagePath = "github.com/zyedidia/json5"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/json5"; - rev = "2da050b1a98d"; - sha256 = "1sgydazf3npr788b4w17ydmlh3fd1zmpriv9b69967ww90ckh2kz"; - }; - } - { - goPackagePath = "github.com/zyedidia/poller"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/poller"; - rev = "v1.0.1"; - sha256 = "10cjrqfk1j0l55bdbpm7kv4mqc665pngc8avai0p9chq03y2654g"; - }; - } - { - goPackagePath = "github.com/zyedidia/pty"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/pty"; - rev = "v2.0.0"; - sha256 = "1n946ld8y2v2wfbwsxv8rfaicxbw3w8pk11ryc8iybmw7hkmmf79"; - }; - } - { - goPackagePath = "github.com/zyedidia/tcell"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/tcell"; - rev = "v2.0.2"; - sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z"; - }; - } - { - goPackagePath = "github.com/zyedidia/terminal"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/terminal"; - rev = "533c623e2415"; - sha256 = "16l628f3zgl5yp9z5zkfy2hyl2sckw4d6mg3iqv2jjvh4i8yhrsm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "33540a1f6037"; - sha256 = "0fjcv0vzvi6za0b4xmnk3932pr9f9gczzf03y0kgq3ry9rqg169y"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.7"; - sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; - }; - } - { - goPackagePath = "layeh.com/gopher-luar"; - fetch = { - type = "git"; - url = "https://github.com/layeh/gopher-luar"; - rev = "v1.0.7"; - sha256 = "1rdbni3q7zajmiy62ccvbfgqjzppk5212wpwks2ba726hvyf85mj"; - }; - } -] diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/default.nix index 6909af712fa0..bd8ad4b3d20d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -1,10 +1,6 @@ -{ stdenv, fetchurl, fetchFromGitHub -, ncurses -, texinfo -, gettext ? null -, enableNls ? true -, enableTiny ? false -}: +{ stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript +, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests +, gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); @@ -20,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0lj3fcfzprmv9raydx8yq25lw81bs6g40rhd0fv9d6idcb7wphf5"; + sha256 = "1sc6xl9935k9s9clkv83hapijka4qknfnj6f15c3b1i2n84396gy"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -44,13 +40,42 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + tests = { inherit (nixosTests) nano; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + git + nixfmt + nix + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git://git.savannah.gnu.org/nano.git '*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + + if [ ! "$oldVersion" = "$latestTag" ]; then + update-source-version ${pname} "$latestTag" --version-key=version --print-changes + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix" + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + meta = { homepage = "https://www.nano-editor.org/"; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ - joachifm - ]; + maintainers = with maintainers; [ joachifm nequissimus ]; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix index 4d4b093233bd..54442fc21f43 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts +, coreutils, git, gnused, nix, nixfmt }: -stdenv.mkDerivation { +let + owner = "scopatz"; + repo = "nanorc"; +in stdenv.mkDerivation rec { pname = "nanorc"; - version = "2020-01-25"; + version = "2020-10-10"; src = fetchFromGitHub { - owner = "scopatz"; - repo = "nanorc"; - rev = "2020.1.25"; - sha256 = "1y8jk3jsl4bd6r4hzmxzcf77hv8bwm0318yv7y2npkkd3a060z8d"; + inherit owner repo; + rev = builtins.replaceStrings [ "-" ] [ "." ] version; + sha256 = "3B2nNFYkwYHCX6pQz/hMO/rnVqlCiw1BSNmGmJ6KCqE="; }; dontBuild = true; @@ -19,6 +22,32 @@ stdenv.mkDerivation { install *.nanorc $out/share/ ''; + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"' | sed 's|\\.|-|g')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:${owner}/${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix" + newTag=$(echo $latestTag | sed 's|\.|-|g') + update-source-version ${pname} "$newTag" --version-key=version --print-changes + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + meta = { description = "Improved Nano Syntax Highlighting Files"; homepage = "https://github.com/scopatz/nanorc"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix index e16fe8a8adc7..bb9930b6c718 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation { cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications" # Sed needs a writable directory to do inplace modifications chmod u+rw "$out/share/applications" - for file in $out/share/applications/*.desktop; do - sed -e "s|Exec=.\\+gnvim\\>|Exec=$out/bin/gnvim|" -i "$file" - done + sed -e "s|Exec=.\\+gnvim\\>|Exec=gnvim|" -i $out/share/applications/*.desktop ''; preferLocalBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/utils.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/utils.nix new file mode 100644 index 000000000000..d992ccd3f6a4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/utils.nix @@ -0,0 +1,160 @@ +{ lib +, vimUtils +, nodejs +, neovim-unwrapped +, bundlerEnv +, ruby +, pythonPackages +, python3Packages +, writeText +, wrapNeovimUnstable +}: +let + # returns everything needed for the caller to wrap its own neovim: + # - the generated content of the future init.vim + # - the arguments to wrap neovim with + # The caller is responsible for writing the init.vim and adding it to the wrapped + # arguments (["-u" writeText "init.vim" GENERATEDRC)]). + # This makes it possible to write the config anywhere: on a per-project basis + # .nvimrc or in $XDG_CONFIG_HOME/nvim/init.vim to avoid sideeffects. + # Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded + # anymore, $MYVIMRC wont be set etc + makeNeovimConfig = + { + withPython2 ? false + /* the function you would have passed to python.withPackages */ + , extraPython2Packages ? (_: [ ]) + , withPython3 ? true + /* the function you would have passed to python3.withPackages */ + , extraPython3Packages ? (_: [ ]) + , withNodeJs ? false + , withRuby ? true + + # same values as in vimUtils.vimrcContent + , configure ? { } + + # for forward compability, when adding new environments, haskell etc. + , ... + }@args: + let + rubyEnv = bundlerEnv { + name = "neovim-ruby-env"; + gemdir = ./ruby_provider; + postBuild = '' + ln -sf ${ruby}/bin/* $out/bin + ''; + }; + + requiredPlugins = vimUtils.requiredPlugins configure; + getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); + + pluginPython2Packages = getDeps "pythonDependencies" requiredPlugins; + python2Env = pythonPackages.python.withPackages (ps: + [ ps.pynvim ] + ++ (extraPython2Packages ps) + ++ (lib.concatMap (f: f ps) pluginPython2Packages)); + + pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; + python3Env = python3Packages.python.withPackages (ps: + [ ps.pynvim ] + ++ (extraPython3Packages ps) + ++ (lib.concatMap (f: f ps) pluginPython3Packages)); + + + # Mapping a boolean argument to a key that tells us whether to add or not to + # add to nvim's 'embedded rc' this: + # let g:<key>_host_prog=$out/bin/nvim-<key> + # Or this: + # let g:loaded_${prog}_provider=1 + # While the latter tells nvim that this provider is not available + hostprog_check_table = { + node = withNodeJs; + python = withPython2; + python3 = withPython3; + ruby = withRuby; + }; + ## Here we calculate all of the arguments to the 1st call of `makeWrapper` + # We start with the executable itself NOTE we call this variable "initial" + # because if configure != {} we need to call makeWrapper twice, in order to + # avoid double wrapping, see comment near finalMakeWrapperArgs + makeWrapperArgs = + let + binPath = lib.makeBinPath (lib.optionals withRuby [ rubyEnv ] ++ lib.optionals withNodeJs [ nodejs ]); + + flags = lib.concatLists (lib.mapAttrsToList ( + prog: withProg: [ + "--cmd" (genProviderSettings prog withProg) + ] + ) + hostprog_check_table); + in + [ + "--argv0" "$0" "--add-flags" (lib.escapeShellArgs flags) + ] ++ lib.optionals withRuby [ + "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" + ] ++ lib.optionals (binPath != "") [ + "--suffix" "PATH" ":" binPath + ]; + + manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; }); + neovimRcContent = vimUtils.vimrcContent configure; + in + args // { + wrapperArgs = makeWrapperArgs; + inherit neovimRcContent; + inherit manifestRc; + inherit python2Env; + inherit python3Env; + inherit withNodeJs; + } // lib.optionalAttrs withRuby { + inherit rubyEnv; + }; + + genProviderSettings = prog: withProg: + if withProg then + "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'" + else + "let g:loaded_${prog}_provider=1" + ; + + # to keep backwards compatibility + legacyWrapper = neovim: { + extraMakeWrapperArgs ? "" + , withPython ? true + /* the function you would have passed to python.withPackages */ + , extraPythonPackages ? (_: []) + /* the function you would have passed to python.withPackages */ + , withPython3 ? true, extraPython3Packages ? (_: []) + , withNodeJs ? false + , withRuby ? true + , vimAlias ? false + , viAlias ? false + , configure ? {} + }: + let + /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ + compatFun = funOrList: (if builtins.isList funOrList then + (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) + else funOrList); + + res = makeNeovimConfig { + withPython2 = withPython; + extraPythonPackages = compatFun extraPythonPackages; + inherit withPython3; + extraPython3Packages = compatFun extraPython3Packages; + inherit withNodeJs withRuby viAlias vimAlias; + inherit configure; + }; + in + wrapNeovimUnstable neovim (res // { + wrapperArgs = lib.escapeShellArgs ( + res.wrapperArgs ++ lib.optionals (configure != {}) [ + "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" + ]) + " " + extraMakeWrapperArgs + ; + }); +in +{ + inherit makeNeovimConfig; + inherit legacyWrapper; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index e3c03c92e58c..111e84e63437 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -1,5 +1,6 @@ { stdenv, symlinkJoin, lib, makeWrapper , vimUtils +, writeText , bundlerEnv, ruby , nodejs , nodePackages @@ -12,129 +13,45 @@ neovim: let wrapper = { - extraMakeWrapperArgs ? "" - , withPython ? true, extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ - , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */ - , withNodeJs? false - , withRuby ? true + # should contain all args but the binary + wrapperArgs ? "" + , manifestRc ? null + , withPython2 ? true, python2Env ? null + , withPython3 ? true, python3Env ? null + , withNodeJs ? false + , rubyEnv ? null , vimAlias ? false , viAlias ? false - , configure ? {} + , ... }: let - rubyEnv = bundlerEnv { - name = "neovim-ruby-env"; - gemdir = ./ruby_provider; - postBuild = '' - ln -sf ${ruby}/bin/* $out/bin - ''; - }; - - /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ - compatFun = funOrList: (if builtins.isList funOrList then - (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) - else funOrList); - extraPythonPackagesFun = compatFun extraPythonPackages; - extraPython3PackagesFun = compatFun extraPython3Packages; - - requiredPlugins = vimUtils.requiredPlugins configure; - getDeps = attrname: map (plugin: plugin.${attrname} or (_:[])); - - pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins; - pythonEnv = pythonPackages.python.withPackages(ps: - [ ps.pynvim ] - ++ (extraPythonPackagesFun ps) - ++ (concatMap (f: f ps) pluginPythonPackages)); - - pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; - python3Env = python3Packages.python.withPackages (ps: - [ ps.pynvim ] - ++ (extraPython3PackagesFun ps) - ++ (concatMap (f: f ps) pluginPython3Packages)); - - binPath = makeBinPath (optionals withRuby [rubyEnv] ++ optionals withNodeJs [nodejs]); - - # Mapping a boolean argument to a key that tells us whether to add or not to - # add to nvim's 'embedded rc' this: - # - # let g:<key>_host_prog=$out/bin/nvim-<key> - # - # Or this: - # - # let g:loaded_${prog}_provider=1 - # - # While the later tells nvim that this provider is not available - # - hostprog_check_table = { - node = withNodeJs; - python = withPython; - python3 = withPython3; - ruby = withRuby; - }; - ## Here we calculate all of the arguments to the 1st call of `makeWrapper` - # We start with the executable itself NOTE we call this variable "initial" - # because if configure != {} we need to call makeWrapper twice, in order to - # avoid double wrapping, see comment near finalMakeWrapperArgs - initialMakeWrapperArgs = - let - flags = lib.concatLists (lib.mapAttrsToList ( - prog: - withProg: - [ - "--cmd" - (if withProg then - "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'" - else - "let g:loaded_${prog}_provider=1" - ) - ] - ) hostprog_check_table); - in [ - "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" - "--argv0" "$0" - "--add-flags" (lib.escapeShellArgs flags) - ] ++ lib.optionals withRuby [ - "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" - ] ++ lib.optionals (binPath != "") [ - "--suffix" "PATH" ":" binPath - ]; # If configure != {}, we can't generate the rplugin.vim file with e.g # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in # the wrapper. That's why only when configure != {} (tested both here and # when postBuild is evaluated), we call makeWrapper once to generate a # wrapper with most arguments we need, excluding those that cause problems to # generate rplugin.vim, but still required for the final wrapper. - finalMakeWrapperArgs = initialMakeWrapperArgs - # this relies on a patched neovim, see - # https://github.com/neovim/neovim/issues/9413 - ++ lib.optionals (configure != {}) [ - "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" - "--add-flags" "-u ${vimUtils.vimrcFile configure}" - ] - ; + finalMakeWrapperArgs = + [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ + [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]; in symlinkJoin { name = "neovim-${stdenv.lib.getVersion neovim}"; # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon - postBuild = '' - rm $out/bin/nvim - makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} - '' - + lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.isLinux '' rm $out/share/applications/nvim.desktop substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ - --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ --replace 'Name=Neovim' 'Name=WrappedNeovim' '' - + optionalString withPython '' - makeWrapper ${pythonEnv}/bin/python $out/bin/nvim-python --unset PYTHONPATH + + optionalString withPython2 '' + makeWrapper ${python2Env}/bin/python $out/bin/nvim-python --unset PYTHONPATH '' + optionalString withPython3 '' makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH '' - + optionalString withRuby '' + + optionalString (rubyEnv != null) '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' + optionalString withNodeJs '' @@ -146,9 +63,14 @@ let + optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi '' - + optionalString (configure != {}) '' + + optionalString (manifestRc != null) (let + manifestWrapperArgs = + [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ]; + in '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim + makeWrapper ${lib.escapeShellArgs manifestWrapperArgs} ${wrapperArgs} + # Some plugins assume that the home directory is accessible for # initializing caches, temporary files, etc. Even if the plugin isn't # actively used, it may throw an error as soon as Neovim is launched @@ -164,8 +86,8 @@ let # (swap/viminfo) and redirect errors to stderr. # Only display the log on error since it will contain a few normally # irrelevant messages. - if ! $out/bin/nvim \ - -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \ + if ! $out/bin/nvim-wrapper \ + -u ${writeText "manifest.vim" manifestRc} \ -i NONE -n \ -E -V1rplugins.log -s \ +UpdateRemotePlugins +quit! > outfile 2>&1; then @@ -173,7 +95,11 @@ let echo -e "\nGenerating rplugin.vim failed!" exit 1 fi - makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${extraMakeWrapperArgs} + rm "${placeholder "out"}/bin/nvim-wrapper" + '') + + '' + rm $out/bin/nvim + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgs} ''; paths = [ neovim ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/quilter/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/quilter/default.nix index 4d1cf5dafb76..b69d20850ad2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/quilter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0622mh46z3fi6zvipmgj8k4d4gj1c2781l10frk7wqq1sysjrxps"; + sha256 = "0ya1iwzfzvrci083zyrjj6ac4ys25j90slpk8yydw9n99kb750rk"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/qxmledit/qxmledit.json b/infra/libkookie/nixpkgs/pkgs/applications/editors/qxmledit/qxmledit.json index 3b50532d6a0d..88d2e3c4c2b9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/qxmledit/qxmledit.json +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/qxmledit/qxmledit.json @@ -3,4 +3,4 @@ "repo": "qxmledit", "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1", "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834" -}
\ No newline at end of file +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/rednotebook/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/rednotebook/default.nix index 0cfa2b62dce3..a6e69cf869e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/rednotebook/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.19"; + version = "2.20"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "1y5slcwgs6p5n52whhhjg0c7053688311wnc9wqrk7vjk10qkx9d"; + sha256 = "1n0zwrzrjh6sg8vmb95mgscsqrylhgm51zsirblqmpvs392jxrk3"; }; # We have not packaged tests. diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/sigil/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/sigil/default.nix index 869c20c1d6c4..18437f5ff49e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.3.0"; + version = "1.4.3"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "02bkyi9xpaxdcivm075y3praxgvfay9z0189gvr6g8yc3ml1miyr"; + sha256 = "1hk8kmhvkwfimbxzhwbnb8qdpf4n36cdzl9wfvi574i9pps36hnz"; }; pythonPath = with python3Packages; [ lxml ]; @@ -24,6 +24,10 @@ mkDerivation rec { python3Packages.lxml ]; + prePatch = '' + sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install + ''; + dontWrapQtApps = true; preFixup = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/texmacs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/texmacs/default.nix index 91e2427a6c84..9c37d00c9ee1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/texmacs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/texmacs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, callPackage, - fetchurl, guile_1_8, qt4, xmodmap, which, makeWrapper, freetype, +{ lib, mkDerivation, callPackage, fetchFromGitHub, + guile_1_8, qtbase, xmodmap, which, freetype, libjpeg, sqlite, tex ? null, @@ -16,32 +16,27 @@ let pname = "TeXmacs"; - version = "1.99.11"; + version = "1.99.15"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; in -stdenv.mkDerivation { +mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "12bp0f34izzqimz49lfpgf4lyz3h45s9xbmk8v6zsawdjki76alg"; + src = fetchFromGitHub { + owner = "texmacs"; + repo = "texmacs"; + rev = "v${version}"; + sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; }; - cmakeFlags = [ - # Texmacs' cmake build as of writing defaults to Qt5, - # but we haven't updated to that yet. - "-DTEXMACS_GUI=Qt4" - ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ guile_1_8 - qt4 - makeWrapper + qtbase ghostscriptX freetype libjpeg @@ -51,18 +46,26 @@ stdenv.mkDerivation { ]; NIX_LDFLAGS = "-lz"; - postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + - (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + - (if aspell == null then "" else "${aspell}/bin:") + - (if tex == null then "" else "${tex}/bin:") + - (if git == null then "" else "${git}/bin:") + - (if python3 == null then "" else "${python3}/bin:") + - "${xmodmap}/bin:${which}/bin"; + qtWrapperArgs = [ + "--suffix" "PATH" ":" (lib.makeBinPath [ + xmodmap + which + ghostscriptX + aspell + tex + git + python3 + ]) + ]; + + postFixup = '' + wrapQtApp $out/bin/texmacs + ''; inherit (common) postPatch; meta = common.meta // { - maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = [ lib.maintainers.roconnor ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/10/default.nix index bb771c89010b..0456d013bbbe 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/10/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: + stdenv.mkDerivation rec { - version = "10.2"; + version = "10.8"; pname = "textadept"; nativeBuildInputs = [ pkgconfig ]; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = "http://foicica.com/hg/textadept"; rev = "textadept_${version}"; - sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl"; + sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s="; }; preConfigure = @@ -19,10 +20,6 @@ stdenv.mkDerivation rec { "ln -s ${fetchurl params} $PWD/src/${name}" ) (import ./deps.nix)) + '' - # work around trying to download stuff in `make deps` - function wget() { true; } - export -f wget - cd src make deps ''; @@ -31,12 +28,17 @@ stdenv.mkDerivation rec { make curses ''; + preInstall = '' + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + ''; + postInstall = '' make curses install PREFIX=$out MAKECMDGOALS=curses ''; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" ]; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/10/deps.nix index 80306191ff12..3ab778dddb2a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/deps.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/10/deps.nix @@ -1,23 +1,23 @@ { - "542782a4df7d.zip" = { - url = "http://foicica.com/hg/scintilla/archive/542782a4df7d.zip"; - sha256 = "1qwxxcj86z9y7ij05j60lcp1awy2c9ck0vnn9z6c732sqjza0zx5"; + "99fa62b828ee.zip" = { + url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip"; + sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc="; }; "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"; + "lpeg-1.0.2.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; }; - "v_1_6_3.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip"; - sha256 = "044s125im2irb4i42nnc5shvjj25fp4vsdbzd6b0va5igj0f6h4y"; + "v1_7_0_2.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; + sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg="; }; - "6435a42450c7.zip" = { - url = "http://foicica.com/hg/gtdialog/archive/6435a42450c7.zip"; - sha256 = "1vxn89sif3qccksb6x5iprysqhjg69g7nyxlgrg31q397dmsg1ym"; + "db67f8a489e8.zip" = { + url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip"; + sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM="; }; "cdk-5.0-20150928.tgz" = { url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/default.nix new file mode 100644 index 000000000000..487f1b3767f1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: + +stdenv.mkDerivation rec { + version = "11.0_beta"; + pname = "textadept11"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + gtk2 ncurses glib unzip zip + ]; + + src = fetchFromGitHub { + name = "textadept11"; + owner = "orbitalquark"; + repo = "textadept"; + rev = "8da5f6b4a13f14b9dd3cb9dc23ad4f7bf41e91c1"; + sha256 = "0v11v3x8g6v696m3l1bm52zy2g9xzz7hlmn912sn30nhcag3raxs"; + }; + + preConfigure = + lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: + "ln -s ${fetchurl params} $PWD/src/${name}" + ) (import ./deps.nix)) + '' + + cd src + make deps + ''; + + postBuild = '' + make curses + ''; + + preInstall = '' + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + ''; + + postInstall = '' + make curses install PREFIX=$out MAKECMDGOALS=curses + ''; + + makeFlags = [ + "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" + ]; + + meta = with stdenv.lib; { + description = "An extensible text editor based on Scintilla with Lua scripting. Version 11_beta"; + homepage = "http://foicica.com/textadept"; + license = licenses.mit; + maintainers = with maintainers; [ raskin mirrexagon ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix new file mode 100644 index 000000000000..2ab72574bbd0 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix @@ -0,0 +1,50 @@ +{ + "scintilla445.tgz" = { + url = "https://www.scintilla.org/scintilla445.tgz"; + sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag"; + }; + "9e2ffa159299899c9345aea15c17ba1941953871.zip" = { + url = "https://github.com/orbitalquark/scinterm/archive/9e2ffa159299899c9345aea15c17ba1941953871.zip"; + sha256 = "12h7prgp689w45p4scxd8vvsyw8fkv27g6gvgis55xr44daa6122"; + }; + "scintillua_4.4.5-1.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip"; + sha256 = "095wpbid2kvr5xgkhd5bd4sd7ljgk6gd9palrjkmdcwfgsf1lp04"; + }; + "lua-5.3.5.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; + sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; + }; + "lpeg-1.0.2.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; + }; + "v1_7_0_2.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; + sha256 = "0y44ymc7higz5dd2w3c6ib7mwmpr6yvszcl7lm12nf8x3y4snx4i"; + }; + "64587546482a1a6324706d75c80b77d2f87118a4.zip" = { + url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip"; + sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9"; + }; + "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"; + }; + "pdcurs39.zip" = { + url = "https://github.com/wmcbrine/PDCurses/archive/3.9.zip"; + sha256 = "0ydsa15d6fgk15zcavbxsi4vj3knlr2495dc5v4f5xzvv2qwlb2w"; + }; + "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/infra/libkookie/nixpkgs/pkgs/applications/editors/thonny/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/thonny/default.nix index 706d3fd71763..c3710cf5b22b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/thonny/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.2.7"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0gzvdgg5l4j0wgkh7lp4wjabrpxvvs5m7mnpszqixxijdffjd4cj"; + sha256 = "1k1iy01az65w463j6id7iyrbinjbjd220i100mrnxyn569dxmf34"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/tiled/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/tiled/default.nix index 4b032d48ebf4..10c0ed9ea79b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0b3xjcc86vs9lfxr7xann9d43dz3v3x1g7j1mcn31sy2n68a1wx3"; + sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/uemacs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/uemacs/default.nix deleted file mode 100644 index e14a07eb6835..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/uemacs/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchgit, ncurses }: - -stdenv.mkDerivation { - pname = "uemacs"; - version = "2014-12-08"; - - src = fetchgit { - url = "git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git"; - rev = "8841922689769960fa074fbb053cb8507f2f3ed9"; - sha256 = "14yq7kpkax111cg6k7i3mnqk7sq7a65krq6qizzj7vvnm7bsj3sd"; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace "-lcurses" "-lncurses" \ - --replace "CFLAGS=-O2" "CFLAGS+=" \ - --replace "BINDIR=/usr/bin" "BINDIR=$out/bin" \ - --replace "LIBDIR=/usr/lib" "LIBDIR=$out/share/uemacs" - substituteInPlace epath.h \ - --replace "/usr/global/lib/" "$out/share/uemacs/" \ - --replace "/usr/local/bin/" "$out/bin/" \ - --replace "/usr/local/lib/" "$out/share/uemacs/" \ - --replace "/usr/local/" "$out/bin/" \ - --replace "/usr/lib/" "$out/share/uemacs/" - mkdir -p $out/bin $out/share/uemacs - ''; - - buildInputs = [ ncurses ]; - - meta = with stdenv.lib; { - homepage = "https://git.kernel.org/cgit/editors/uemacs/uemacs.git"; - description = "Torvalds Micro-emacs fork"; - longDescription = '' - uEmacs/PK 4.0 is a full screen editor based on MicroEMACS 3.9e - ''; - license = licenses.unfree; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/configurable.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/configurable.nix index 77d7ca983cdd..aa8120470d14 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/configurable.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/configurable.nix @@ -1,5 +1,5 @@ { source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext -, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby +, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -62,8 +62,6 @@ let common = callPackage ./common.nix {}; - isPython3 = python.isPy3 or false; - in stdenv.mkDerivation rec { pname = "vim_configurable"; @@ -106,9 +104,10 @@ in stdenv.mkDerivation rec { "--with-luajit" ] ++ stdenv.lib.optionals pythonSupport [ - "--enable-python${if isPython3 then "3" else ""}interp=yes" - "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib" - "--disable-python${if (!isPython3) then "3" else ""}interp" + "--enable-python3interp=yes" + "--with-python3-config-dir=${python3}/lib" + # Disables Python 2 + "--disable-pythoninterp" ] ++ stdenv.lib.optional nlsSupport "--enable-nls" ++ stdenv.lib.optional perlSupport "--enable-perlinterp" @@ -134,7 +133,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] ++ stdenv.lib.optional luaSupport lua - ++ stdenv.lib.optional pythonSupport python + ++ stdenv.lib.optional pythonSupport python3 ++ stdenv.lib.optional tclSupport tcl ++ stdenv.lib.optional rubySupport ruby; @@ -163,7 +162,7 @@ in stdenv.mkDerivation rec { ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' - wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" + wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' rewrap () { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/macvim.nix index ef6c6a144071..d2cc14c30c48 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -94,6 +94,19 @@ stdenv.mkDerivation { + '' unset LD '' + # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use + # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath + # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim + # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default + # behavior to build the first target in the project. Experimentally, there seems to be a scheme + # called MacVim, so we'll explicitly select that. We also need to specify the configuration too + # as the scheme seems to have the wrong default. + + '' + configureFlagsArray+=( + XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" + --with-xcodecfg="Release" + ) + '' ; # Because we're building with system clang, this means we're building against Xcode's SDK and diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/generic.nix index d0933905bcd1..eea34cacfc04 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -24,7 +24,7 @@ in desktopName = longName; comment = "Code Editing. Redefined."; genericName = "Text Editor"; - exec = "${executableName} %U"; + exec = "${executableName} %F"; icon = "code"; startupNotify = "true"; categories = "Utility;TextEditor;Development;IDE;"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 528a0496d915..70f621177105 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0mpb4641icr3z89y2rlh5anli40p1f48sl5xagr7h3nb5c84k10x"; - x86_64-darwin = "1azmc79zf72007qc1xndp9wdkd078mvqgv35hf231q7kdi6wzxcp"; + x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n"; + x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.50.1"; + version = "1.51.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 650e88a260b4..b8ca7e3f262e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1sarih1yah69ympp12bmgyb0y9ybrxasppb47l58w05iz1wpn6v0"; - x86_64-darwin = "1pj041kccj2i77v223i86xxqj9bg88k0sfbshm7qiynwyj9p05ji"; + x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb"; + x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.50.1"; + version = "1.51.1"; pname = "vscodium"; executableName = "codium"; |