diff options
Diffstat (limited to 'pkgs')
91 files changed, 3183 insertions, 451 deletions
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index b00355cc9cdb0..bfa8317c9f90e 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config -, libiconv, CoreAudio +, libiconv, CoreAudio, AudioUnit , alsaSupport ? stdenv.isLinux, alsaLib ? null # simple fallback for everyone else @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 0ce0a37d876fc..b760e83f8eea7 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -35,6 +35,7 @@ , libXrender , libXtst , makeWrapper +, ncurses5 , nspr , nss , pciutils @@ -141,9 +142,18 @@ let ]}" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set FONTCONFIG_FILE ${fontsConf} + + # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH + wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + ncurses5 + zlib + ]}" ''; }; + # Causes the shebangs in interpreter scripts deployed to mobile devices to be patched, which Android does not understand + dontPatchShebangs = true; + desktopItem = makeDesktopItem { name = drvName; exec = pname; @@ -161,7 +171,7 @@ let fhsEnv = buildFHSUserEnv { name = "${drvName}-fhs-env"; multiPkgs = pkgs: [ - pkgs.ncurses5 + ncurses5 # Flutter can only search for certs Fedora-way. (runCommand "fedoracert" {} diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 3728216da7ad9..4bfb6a65edc54 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { url = { "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { "i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A="; "x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw="; + "aarch64-linux" = "0932bspm1likky1n0rg15d01gspkm1fns2ma82qyb91yr6d18ddk"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { @@ -46,6 +48,6 @@ stdenv.mkDerivation rec { downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix new file mode 100644 index 0000000000000..29c6df8a72ead --- /dev/null +++ b/pkgs/applications/misc/free42/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gtk3 +, alsaLib +}: + +stdenv.mkDerivation rec { + pname = "free42"; + version = "2.5.24a"; + + src = fetchFromGitHub { + owner = "thomasokken"; + repo = pname; + rev = "v${version}"; + sha256 = "xP0kzpmX6Q5Dg7azvyUZIdoi52AYkUmiCkUA1aVY+nQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 alsaLib ]; + + postPatch = '' + sed -i -e "s|/bin/ls|ls|" gtk/Makefile + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + make -C gtk cleaner + make --jobs=$NIX_BUILD_CORES -C gtk + make -C gtk clean + make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1 + runHook postBuild + ''; + + preInstall = '' + install --directory $out/bin \ + $out/share/doc/${pname} \ + $out/share/${pname}/skins \ + $out/share/icons/hicolor/48x48/apps \ + $out/share/icons/hicolor/128x128/apps + ''; + + installPhase = '' + runHook preInstall + install -m755 gtk/free42dec gtk/free42bin $out/bin + install -m644 gtk/README $out/share/doc/${pname}/README-GTK + install -m644 README $out/share/doc/${pname}/README + + install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps + install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps + install -m644 skins/* $out/share/${pname}/skins + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/thomasokken/free42"; + description = "A software clone of HP-42S Calculator"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index cf14679cd9bbe..391e698dcf7f7 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -4,7 +4,7 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; - version = "1.16.5"; + version = "1.16.7"; name = "${pname}-${version}"; suffix = { @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { - x86_64-linux = "18qcr8zyn20n5zrrha0qwgq2ic10bp189fps87lbnmcjknrkac9g"; - x86_64-darwin = "0crpjkcqgs7q5c814bx2npjh9kpyyb87yagm5wcy9j21kwrbqv6k"; - aarch64-darwin = "1wkf9inrm5qg0c4xrk0s97mx5j21xvlqwwkvydl513gyfzi2g9gp"; + x86_64-linux = "0a4yh2jh9sph17mqqi62gm5jc4yffkysq6yiggyzz5f8xw4p315j"; + x86_64-darwin = "0ix1apddqvz561pw5lx47x091wlfj27zh8k8v7kn5xvm09hswfkr"; + aarch64-darwin = "0p0kql79kcb3w947g1ljhbj15b8aqrwcrbi0cknb12f6iq47lkz7"; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index eabc0601cfabd..c78d81771caaa 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "597"; + version = "598"; src = fetchurl { url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "0d928wvlpzqwdpfksmxyyfkqrhjsij21wx2538bs2i29siwyla61"; + sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M="; }; patches = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1c9ed86d14575..0e41c904abd40 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "90.0.4408.0", - "sha256": "0bg16nz65j13a8sdzrzkmbidlglh7bz7y8s4bi68il9ppbffw3k4", - "sha256bin64": "0ad2xif8ng71ian07vb8h3jsd5wh95xndja43vwswc3072zk5h05", + "version": "90.0.4412.3", + "sha256": "1yjpfircdl38nrjh3an469g7q8178jyvawkfpnzc5aqsgkpkl442", + "sha256bin64": "1asdjicb4l4l2ak3fkxcwdx1avpc1m8wvyhxmj1k3bqa4qmvz3hz", "deps": { "gn": { "version": "2021-01-25", @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "88.0.4324.146", - "sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q", - "sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id", + "version": "88.0.4324.150", + "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", + "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", "deps": { "gn": { "version": "2020-11-05", @@ -55,8 +55,8 @@ "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" }, "ungoogled-patches": { - "rev": "88.0.4324.146-1", - "sha256": "0vp53b3jdsay6a17n27vi6cj10jj6zz94gr9ip4r5zf45qq6jx3w" + "rev": "88.0.4324.150-1", + "sha256": "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y" } } } diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 5f136fef80750..04cf1a21dc18c 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-9mQYJvZU/Ra+LyzfDbWGfopkdGBD7DpS9/yvRvGHDKg="; + sha256 = "sha256-lZr5CHHFLnWZmPfCX6GFdhnSOPqf0BbqirkHu2+yqfM="; }; - vendorSha256 = "sha256-7LQY32hNXLxg/IUBbzzgb67yrbPGLCTNtmNvjE9tUno="; + vendorSha256 = "sha256-+0lsWpQr74GwYfO7UKqTwOoxifGWpAe/FhlZBVQmGog="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index d20da00f76ac5..5bfceefad5a52 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "4.1.1"; + version = "4.2.0"; excludedPackages = "tools"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-ZdPBlGlrgSJQlp6sWUeXm34+O30WtXHy5hvye40qew0="; + sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix deleted file mode 100644 index 58bdb694eed51..0000000000000 --- a/pkgs/applications/networking/cluster/nomad/0.11.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage -, buildGoPackage -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.11.8"; - sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1"; -} diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index b6e053e757de2..82f508c63ee86 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.12.9"; - sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27"; + version = "0.12.10"; + sha256 = "12hlzjkay7y1502nmfvq2qkhp9pq7vp4zxypawnh98qvxbzv149l"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index ff4434399bd7a..6ae59033835c9 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.2"; - sha256 = "1l9j6k5dzh9ym9j75mam10vd9b5qh4xqfj6d63bjp7gkk4hd1jxx"; + version = "1.0.3"; + sha256 = "142rwpli8mbyg4vhhybnym34rk9w1ns4ddfhqjr1ygmxb1rlsngi"; } diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index a2bb9da680548..0f28225ad0125 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl"; + sha256 = "sha256-IY9iJa4HcZ60jDPdP47jjC0FiOJesvf2vEENMAYVd4Q="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 4b29985685ba0..b4f6f96e58783 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-MMFVJoiVrA0zy4RM2nyhlu/JfnzIRpxrA3N1jm2R0jI="; + sha256 = "sha256-nz45vCRhWhgVG2pMA6TZVUIS4d9qBWW7NtTHuEsn4pg="; }; - vendorSha256 = "sha256-UucbEBjIKRbZFd99BsnG6AAEIQ13+vzKe61k6ZPvE0A="; + vendorSha256 = "sha256-v0wFlwODZt3LC+yTuNS1hAAkoedVPfTeEIvs6rUGUa4="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index abef9cf9bfec7..007dd8cb95f99 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "364"; + version = "365"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "0fizaalpv96sc199dfc00696vq18fixqb4fxb3jsard19k96x4pb"; + sha256 = "142glxr1gfq4v5rzmk9fblipha0x7sgdiwh4vyy4wfw00nqd49yn"; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix new file mode 100644 index 0000000000000..9a56f865c3481 --- /dev/null +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, libxcb +, libxkbcommon +, wayland +, wayland-protocols +, wlroots +, enable-xwayland ? true, xwayland, libX11 +, patches ? [ ] +, conf ? null +, writeText +}: + +stdenv.mkDerivation rec { + pname = "dwl"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "djpohly"; + repo = pname; + rev = "v${version}"; + sha256 = "QoKaeF5DbSX0xciwc/0VKpubn/001cJjoZ+UzVDX4qE="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libxcb + libxkbcommon + wayland + wayland-protocols + wlroots + ] ++ lib.optionals enable-xwayland [ xwayland libX11 ]; + + # Allow users to set their own list of patches + inherit patches; + + prePatch = lib.optionalString enable-xwayland '' + sed -i -e '$ s|^#||' config.mk + ''; + + # Allow users to set an alternative config.def.h + postPatch = let + configFile = if lib.isDerivation conf || builtins.isPath conf + then conf + else writeText "config.def.h" conf; + in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + install -d $out/bin + install -m755 dwl $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/djpohly/dwl/"; + description = "Dynamic window manager for Wayland"; + longDescription = '' + dwl is a compact, hackable compositor for Wayland based on wlroots. It is + intended to fill the same space in the Wayland world that dwm does in X11, + primarily in terms of philosophy, and secondarily in terms of + functionality. Like dwm, dwl is: + + - Easy to understand, hack on, and extend with patches + - One C source file (or a very small number) configurable via config.h + - Limited to 2000 SLOC to promote hackability + - Tied to as few external dependencies as possible + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} +# TODO: custom patches from upstream website +# TODO: investigate the modifications in the upstream unstable version diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index eb349e6f3b176..2c3ed2e47e884 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,34 +1,46 @@ -{lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: +{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [ ], conf ? null}: -with lib; - -let - name = "dwm-6.2"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "dwm"; + version = "6.2"; src = fetchurl { - url = "https://dl.suckless.org/dwm/${name}.tar.gz"; + url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p"; }; buildInputs = [ libX11 libXinerama libXft ]; - prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; + prePatch = '' + sed -i "s@/usr/local@$out@" config.mk + ''; # Allow users set their own list of patches inherit patches; # Allow users to set the config.def.h file containing the configuration - postPatch = let configFile = if isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; - in optionalString (conf!=null) "cp ${configFile} config.def.h"; - - meta = { - homepage = "https://suckless.org/"; - description = "Dynamic window manager for X"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; all; + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.def.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + + meta = with lib; { + homepage = "https://dwm.suckless.org/"; + description = "An extremely fast, small, and dynamic window manager for X"; + longDescription = '' + dwm is a dynamic window manager for X. It manages windows in tiled, + monocle and floating layouts. All of the layouts can be applied + dynamically, optimising the environment for the application in use and the + task performed. + Windows are grouped by tags. Each window can be tagged with one or + multiple tags. Selecting certain tags displays all windows with these + tags. + ''; + license = licenses.mit; + maintainers = with maintainers; [ viric ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix deleted file mode 100644 index a13fc78fbfb44..0000000000000 --- a/pkgs/applications/window-managers/dwm/git.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, writeText, patches ? [ ] -, conf ? null }: - -stdenv.mkDerivation { - pname = "dwm-git"; - version = "20200303"; - - src = fetchgit { - url = "git://git.suckless.org/dwm"; - rev = "61bb8b2241d4db08bea4261c82e27cd9797099e7"; - sha256 = "1j3vly8dln35vnwnwwlaa8ql9fmnlmrv43jcyc8dbfhfxiw6f34l"; - }; - - buildInputs = [ libX11 libXinerama libXft ]; - - prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; - - # Allow users set their own list of patches - inherit patches; - - # Allow users to set the config.def.h file containing the configuration - postPatch = let - configFile = if lib.isDerivation conf || builtins.isPath conf then - conf - else - writeText "config.def.h" conf; - in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; - - meta = with lib; { - homepage = "https://suckless.org/"; - description = "Dynamic window manager for X, development version"; - license = licenses.mit; - maintainers = with maintainers; [ xeji ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index d4ffdca3ae331..3f87473a4a15c 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2020-11-16"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0qp65py1p93f5bxbf0jgc1d2lwrjhb7d0vzkivm73haji197l9p5"; + sha256 = "1pilq939bqzxysw4ixd279c49bp7l74bykpprrhgc5f2klpjg1zn"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/Qogir-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 8db532b4211ff..ac1a52e1bba36 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8sIF+jvhRoKNfvPs/WjMZmysAeEjOKaiqi7bY0Bbcxw="; + sha256 = "sha256-NLPmuS7HTPY8OfeppqVhrj4iVZix4orr1oYilcXaAqI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 7141849a5e572..208c74981dcb4 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.2"; + version = "2021.Q1.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "+oAetAHJ530e3IFPJDQiQn5vbUKeI1z0oF3Gy6mRVGM="; + sha256 = "x9VzPALIlgE3eIKY4/qbFg5w+zd2W/jbqFXgJfpvLP4="; }; buildInputs = [ diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 5166efea21f67..0a9a4684e1257 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2"; + version = "1.2.18"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "0nilqf3cssi6z8bxxpmc7zxsh7apgwmx8mm7nfc6c5d40z3nyjpk"; + sha256 = "sha256-ENR+YJhs/FH4Fw+p6rpDEU7r3eC6bmscSBPYbwIaqt0="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/development/libraries/libaudec/default.nix new file mode 100644 index 0000000000000..a243e56c2fe3b --- /dev/null +++ b/pkgs/development/libraries/libaudec/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub +, libsndfile, libsamplerate +, meson, ninja, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libaudec"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "zrythm"; + repo = "libaudec"; + rev = "v${version}"; + sha256 = "1570m2dfia17dbkhd2qhx8jjihrpm7g8nnyg6n4wif4vv229s7dz"; + }; + + buildInputs = [ libsndfile libsamplerate ]; + nativeBuildInputs = [ meson ninja pkg-config ]; + + meta = with lib; { + homepage = "https://www.zrythm.org"; + description = "A library for reading and resampling audio files"; + license = licenses.agpl3Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 59916bfb33f77..d99cf6ef6214e 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkg-config, fetchpatch +, exiv2, libgsf, rpm, pkg-config , gstreamerSupport ? true, gst_all_1 ? null # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -20,28 +20,15 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg_3 != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.9"; + pname = "libextractor"; + version = "1.11"; src = fetchurl { - url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"; + url = "mirror://gnu/libextractor/${pname}-${version}.tar.gz"; + sha256 = "sha256-FvYzq4dGo4VHxKHaP0WRGSsIJa2DxDNvBXW4WEPYvY8="; }; - patches = [ - ./fix-gcc8-build.patch - # Fixes build with exiv2 0.27 - (fetchpatch { - name = "libextractor-exiv2-0.27.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53"; - sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6"; - }) - (fetchpatch { - name = "CVE-2019-15531.patch"; - url = "https://git.gnunet.org/libextractor.git/patch/?id=d2b032452241708bee68d02aa02092cfbfba951a"; - sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw"; - excludes = [ "ChangeLog" ]; - }) - ] ++ lib.optionals gstreamerSupport [ + patches = lib.optionals gstreamerSupport [ # Libraries cannot be wrapped so we need to hardcode the plug-in paths. (substituteAll { @@ -76,12 +63,11 @@ stdenv.mkDerivation rec { # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. - # FIXME: Tests currently fail and the test framework appears to be deeply - # broken anyway. doCheck = false; - #postInstall = "make check"; + doInstallCheck = true; + installCheckPhase = "make check"; - meta = { + meta = with lib; { description = "Simple library for keyword extraction"; longDescription = @@ -105,9 +91,9 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = lib.licenses.gpl2Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = lib.platforms.linux; + maintainers = [ maintainers.jorsn ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libextractor/fix-gcc8-build.patch b/pkgs/development/libraries/libextractor/fix-gcc8-build.patch deleted file mode 100644 index e04d09be89981..0000000000000 --- a/pkgs/development/libraries/libextractor/fix-gcc8-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c -index 072ffc5..a105840 100644 ---- a/src/plugins/ole2_extractor.c -+++ b/src/plugins/ole2_extractor.c -@@ -345,9 +345,8 @@ process_star_office (GsfInput *src, - gsf_input_read (src, size, (unsigned char*) buf); - if ( (buf[0] != 0x0F) || - (buf[1] != 0x0) || -- (0 != strncmp (&buf[2], -- "SfxDocumentInfo", -- strlen ("SfxDocumentInfo"))) || -+ (0 != strcmp (&buf[2], -+ "SfxDocumentInfo")) || - (buf[0x11] != 0x0B) || - (buf[0x13] != 0x00) || /* pw protected! */ - (buf[0x12] != 0x00) ) diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix new file mode 100644 index 0000000000000..6531414601db9 --- /dev/null +++ b/pkgs/development/libraries/reproc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, cmake +}: + +stdenv.mkDerivation rec { + pname = "reproc"; + version = "14.1.0"; + + src = fetchFromGitHub { + owner = "DaanDeMeyer"; + repo = "reproc"; + rev = "v${version}"; + sha256 = "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_SHARED_LIBS=ON" + "-DREPROC++=ON" + "-DREPROC_TEST=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/DaanDeMeyer/reproc"; + description = "A cross-platform (C99/C++11) process library"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix new file mode 100644 index 0000000000000..1aec97251e1b1 --- /dev/null +++ b/pkgs/development/php-packages/smbclient/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs }: +buildPecl { + pname = "smbclient"; + version = "1.0.4"; + sha256 = "07p72m5kbdyp3r1mfxhiayzdvymhc8afwcxa9s86m96sxbmlbbp8"; + + # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66 + LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0"; + + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.samba ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 8269f09a24621..cc8ee94625043 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b22d500f674c084cefd73acd233fe12b816c8446f1da3cff58d7876477b862a3"; + sha256 = "sha256-Wd8Qq/jE/C/zx1CRuKLt5Tz8VHY/4bwUa229aDcCFjk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 66c66535a127b..b5028e4bebc3a 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.0.11"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "11ygrhkqm524i4qp2myjvpsmg1lsn32nsqxqla96sbj84qfnhv0q"; + sha256 = "sha256-NH53FaOJx79q5IIYeiz976H9Q8Vnw13qFw4zgRc2TTw="; }; # Upstream hasn't release the tests yet diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 2bba1aa171c7b..8d7f450be2cee 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.1"; # N.B: if you change this, change botocore too + version = "1.17.4"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-WKRA9MlqHy8HZXfHCFI3hUum20GnyR5KM/swBo+NRpI="; + sha256 = "sha256-ZVFEJ/X4SSRcmicvoGpaAUrjlFMz9PQHSJ0DT7mdxh8="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index e5179e6ace7a1..0c61e658a8f40 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.1"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.4"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-lIi6NeLU0XN19nuP0wDfXsL4MXopJAMpAQCcmZ1WO1k="; + sha256 = "sha256-YWV6Hks83alicIQYS9+dykY3wVI9rq0xo2l0vg1RaG0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix new file mode 100644 index 0000000000000..1812ddff95201 --- /dev/null +++ b/pkgs/development/python-modules/claripy/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, cachetools +, decorator +, fetchFromGitHub +, future +, nose +, pysmt +, pythonOlder +, pytestCheckHook +, z3 +}: + +buildPythonPackage rec { + pname = "claripy"; + version = "9.0.5739"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "1aym01f99zwb9w8qwy8gz631ka7g6akzdld0m4ykc5ip0rq70mki"; + }; + + # Use upstream z3 implementation + postPatch = '' + substituteInPlace setup.py --replace "z3-solver>=4.8.5.0" "" + ''; + + propagatedBuildInputs = [ + cachetools + decorator + future + pysmt + z3 + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "claripy" ]; + + meta = with lib; { + description = "Python abstraction layer for constraint solvers"; + homepage = "https://github.com/angr/claripy"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index d3846ad4f429c..3bc5f185e4944 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w"; + sha256 = "b19f0556c252b805a52c976e3317c53d91e36f56dc8d28192eea190627faf343"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix index b89df0bd2ce03..89f49d9cf6247 100644 --- a/pkgs/development/python-modules/icmplib/default.nix +++ b/pkgs/development/python-modules/icmplib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "icmplib"; - version = "2.0.1"; + version = "2.0.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h"; + sha256 = "0djsbksgml2h18w6509w59s88730w1xaxdxzws12alq4m5v4hirr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index 51ee529e234be..481f302d66af2 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "16bbyihap2ygsi7xg58rwdn14ms1j0jy2kxbdljpg39s9q1rz6ps"; + sha256 = "sha256-woYs8EYUfALCtqHUCVfF5z1v1UIc9D8Iep9n4NrNIlg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix index 4343899e040cd..5dc77a2661bad 100644 --- a/pkgs/development/python-modules/pkce/default.nix +++ b/pkgs/development/python-modules/pkce/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pkce"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "RomeoDespres"; repo = pname; rev = version; - sha256 = "15fzpp3b5qmj27hpgnwkzjwllgwwdfccizz8ydmliakm2hdr1xpn"; + sha256 = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix new file mode 100644 index 0000000000000..dc35aea6cd117 --- /dev/null +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, prometheus_client +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prometheus-flask-exporter"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "rycus86"; + repo = "prometheus_flask_exporter"; + rev = version; + sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370"; + }; + + propagatedBuildInputs = [ flask prometheus_client ]; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/" ]; + + meta = with lib; { + description = "Prometheus exporter for Flask applications"; + homepage = "https://github.com/rycus86/prometheus_flask_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ lbpdt ]; + }; +} diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix new file mode 100644 index 0000000000000..ce5b6b8673a0e --- /dev/null +++ b/pkgs/development/python-modules/pysmt/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "pysmt"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "051j36kpz11ik9bhvp5jgxzc3h7f18i1pf5ssdhjwyabr0n0zra3"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "pysmt" ]; + + meta = with lib; { + description = "Python library for SMT formulae manipulation and solving"; + homepage = "https://github.com/pysmt/pysmt"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 83f9c7a9980b5..ae912df37fe1c 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "yq"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl"; + sha256 = "sha256-HSrUA1BNMGtSWLhsaY+YVtetWLe7F6K4dWkaanuMTCA="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix new file mode 100644 index 0000000000000..5482db67caee8 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -0,0 +1,639 @@ +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +# this package (through the fixpoint glass) +, bazel_self +# needed only for the updater +, bazel_3 +, lr, xe, zip, unzip, bash, writeCBin, coreutils +, which, gawk, gnused, gnutar, gnugrep, gzip, findutils +# updater +, python27, python3, writeScript +# Apple dependencies +, cctools, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk, runJdk +, buildJdkName +, runtimeShell +# Downstream packages for tests +, bazel-watcher +# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). +# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). +, enableNixHacks ? false +, gcc-unwrapped +, autoPatchelfHook +, file +, substituteAll +, writeTextFile +}: + +let + version = "4.0.0"; + sourceRoot = "."; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "1lfdx54dpzwrqysg5ngqhq7a0i01xk981crd4pdk4jb5f07ghl6k"; + }; + + # Update with `eval $(nix-build -A bazel.updater)`, + # then add new dependencies from the dict in ./src-deps.json as required. + srcDeps = lib.attrsets.attrValues srcDepsSet; + srcDepsSet = + let + srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { + urls = d.urls; + sha256 = d.sha256; + }); + in builtins.listToAttrs (map toFetchurl [ + srcs.desugar_jdk_libs + srcs.io_bazel_skydoc + srcs.bazel_skylib + srcs.io_bazel_rules_sass + srcs.platforms + (if stdenv.hostPlatform.isDarwin + then srcs."java_tools_javac11_darwin-v10.5.zip" + else srcs."java_tools_javac11_linux-v10.5.zip") + srcs."coverage_output_generator-v2.5.zip" + srcs.build_bazel_rules_nodejs + srcs."android_tools_pkg-0.19.0rc3.tar.gz" + srcs.bazel_toolchains + srcs.com_github_grpc_grpc + srcs.upb + srcs.com_google_protobuf + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java + srcs.rules_proto + srcs.com_google_absl + srcs.com_github_google_re2 + srcs.com_github_cares_cares + ]); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip python27 python3 ]; + + # Java toolchain used for the build and tests + javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}"; + + platforms = lib.platforms.linux ++ lib.platforms.darwin; + + # This repository is fetched by bazel at runtime + # however it contains prebuilt java binaries, with wrong interpreter + # and libraries path. + # We prefetch it, patch it, and override it in a global bazelrc. + system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; + arch = stdenv.hostPlatform.parsed.cpu.name; + + remote_java_tools = stdenv.mkDerivation { + name = "remote_java_tools_${system}"; + + src = srcDepsSet."java_tools_javac11_${system}-v10.5.zip"; + + nativeBuildInputs = [ autoPatchelfHook unzip ]; + buildInputs = [ gcc-unwrapped ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir $out; + ''; + + installPhase = '' + cp -Ra * $out/ + touch $out/WORKSPACE + ''; + }; + + bazelRC = writeTextFile { + name = "bazel-rc"; + text = '' + startup --server_javabase=${runJdk} + + # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 + # Most commands inherit from 'build' anyway. + build --distdir=${distDir} + fetch --distdir=${distDir} + query --distdir=${distDir} + + build --override_repository=${remote_java_tools.name}=${remote_java_tools} + fetch --override_repository=${remote_java_tools.name}=${remote_java_tools} + query --override_repository=${remote_java_tools.name}=${remote_java_tools} + + # Provide a default java toolchain, this will be the same as ${runJdk} + build --host_javabase='@local_jdk//:jdk' + + # load default location for the system wide configuration + try-import /etc/bazel.bazelrc + ''; + }; + +in +stdenv.mkDerivation rec { + pname = "bazel"; + inherit version; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel/"; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + maintainers = [ maintainers.mboes ]; + inherit platforms; + }; + + inherit src; + inherit sourceRoot; + patches = [ + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' + # This is breaking the build of any C target. This patch removes the last + # argument if it's found to be an empty string. + ../trim-last-argument-to-gcc-if-empty.patch + + # On Darwin, using clang 6 to build fails because of a linker error (see #105573), + # but using clang 7 fails because libarclite_macosx.a cannot be found when linking + # the xcode_locator tool. + # This patch removes using the -fobjc-arc compiler option and makes the code + # compile without automatic reference counting. Caveat: this leaks memory, but + # we accept this fact because xcode_locator is only a short-lived process used during the build. + ./no-arc.patch + + # --experimental_strict_action_env (which may one day become the default + # see bazelbuild/bazel#2574) hardcodes the default + # action environment to a non hermetic value (e.g. "/usr/local/bin"). + # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. + # So we are replacing this bazel paths by defaultShellPath, + # improving hermeticity and making it work in nixos. + (substituteAll { + src = ../strict_action_env.patch; + strictActionEnvPatch = defaultShellPath; + }) + + # bazel reads its system bazelrc in /etc + # override this path to a builtin one + (substituteAll { + src = ../bazel_rc.patch; + bazelSystemBazelRCPath = bazelRC; + }) + ] ++ lib.optional enableNixHacks ../nix-hacks.patch; + + + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. + passthru.tests = + let + runLocal = name: attrs: script: + let + attrs' = removeAttrs attrs [ "buildInputs" ]; + buildInputs = [ python3 ] ++ (attrs.buildInputs or []); + in + runCommandCC name ({ + inherit buildInputs; + preferLocalBuild = true; + meta.platforms = platforms; + } // attrs') script; + + # bazel wants to extract itself into $install_dir/install every time it runs, + # so let’s do that only once. + extracted = bazelPkg: + let install_dir = + # `install_base` field printed by `bazel info`, minus the hash. + # yes, this path is kinda magic. Sorry. + "$HOME/.cache/bazel/_bazel_nixbld"; + in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' + export HOME=$(mktemp -d) + touch WORKSPACE # yeah, everything sucks + install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" + # assert it’s actually below install_dir + [[ "$install_base" =~ ${install_dir} ]] \ + || (echo "oh no! $install_base but we are \ + trying to copy ${install_dir} to $out instead!"; exit 1) + cp -R ${install_dir} $out + ''; + + bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: + let + be = extracted bazelPkg; + in runLocal name { inherit buildInputs; } ( + # skip extraction caching on Darwin, because nobody knows how Darwin works + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # set up home with pre-unpacked bazel + export HOME=$(mktemp -d) + mkdir -p ${be.install_dir} + cp -R ${be}/install ${be.install_dir} + + # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 + # Bazel checks whether the mtime of the install dir files + # is >9 years in the future, otherwise it extracts itself again. + # see PosixFileMTime::IsUntampered in src/main/cpp/util + # What the hell bazel. + ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} + '') + + + '' + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + + ${bazelScript} + + touch $out + ''); + + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; + + bazel-examples = fetchFromGitHub { + owner = "bazelbuild"; + repo = "examples"; + rev = "4183fc709c26a00366665e2d60d70521dc0b405d"; + sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; + }; + + in (if !stdenv.hostPlatform.isDarwin then { + # `extracted` doesn’t work on darwin + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + } else {}) // { + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + # downstream packages using buildBazelPackage + # fixed-output hashes of the fetch phase need to be spot-checked manually + downstream = recurseIntoAttrs ({ + inherit bazel-watcher; + } + # dm-sonnet is only packaged for linux + // (lib.optionalAttrs stdenv.isLinux { + # TODO(timokau) dm-sonnet is broken currently + # dm-sonnet-linux = python3.pkgs.dm-sonnet; + })); + }; + + src_for_updater = stdenv.mkDerivation rec { + name = "updater-sources"; + inherit src; + buildInputs = [ unzip ]; + inherit sourceRoot; + installPhase = '' + cp -r . "$out" + ''; + }; + # update the list of workspace dependencies + passthru.updater = writeScript "update-bazel-deps.sh" '' + #!${runtimeShell} + (cd "${src_for_updater}" && + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ + "${bazel_3}"/bin/bazel \ + query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ + --loading_phase_threads=1 \ + --output build) \ + | "${python3}"/bin/python3 "${./update-srcDeps.py}" \ + "${builtins.toString ./src-deps.json}" + ''; + + # Necessary for the tests to pass on Darwin with sandbox enabled. + # Bazel starts a local server and needs to bind a local address. + __darwinAllowLocalNetworking = true; + + # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. + customBash = writeCBin "bash" '' + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <unistd.h> + + extern char **environ; + + int main(int argc, char *argv[]) { + char *path = getenv("PATH"); + char *pathToAppend = "${defaultShellPath}"; + char *newPath; + if (path != NULL) { + int length = strlen(path) + 1 + strlen(pathToAppend) + 1; + newPath = malloc(length * sizeof(char)); + snprintf(newPath, length, "%s:%s", path, pathToAppend); + } else { + newPath = pathToAppend; + } + setenv("PATH", newPath, 1); + execve("${bash}/bin/bash", argv, environ); + return 0; + } + ''; + + postPatch = let + + darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails + export GCOV=${coreutils}/bin/false + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' "" + + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead + sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done + ''; + + genericPatches = '' + # Substitute j2objc and objc wrapper's python shebang to plain python path. + # These scripts explicitly depend on Python 2.7, hence we use python27. + # See also `postFixup` where python27 is added to $out/nix-support + substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + + # md5sum is part of coreutils + sed -i 's|/sbin/md5|md5sum|' \ + src/BUILD + + # replace initial value of pythonShebang variable in BazelPythonSemantics.java + substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ + --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" + + # substituteInPlace is rather slow, so prefilter the files with grep + grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + # If you add more replacements here, you must change the grep above! + # Only files containing /bin are taken into account. + # We default to python3 where possible. See also `postFixup` where + # python3 is added to $out/nix-support + substituteInPlace "$path" \ + --replace /bin/bash ${customBash}/bin/bash \ + --replace "/usr/bin/env bash" ${customBash}/bin/bash \ + --replace "/usr/bin/env python" ${python3}/bin/python \ + --replace /usr/bin/env ${coreutils}/bin/env \ + --replace /bin/true ${coreutils}/bin/true + done + + # bazel test runner include references to /bin/bash + substituteInPlace tools/build_rules/test_rules.bzl \ + --replace /bin/bash ${customBash}/bin/bash + + for i in $(find tools/cpp/ -type f) + do + substituteInPlace $i \ + --replace /bin/bash ${customBash}/bin/bash + done + + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/bash ${customBash}/bin/bash + + # add nix environment vars to .bazelrc + cat >> .bazelrc <<EOF + # Limit the resources Bazel is allowed to use during the build to 1/2 the + # available RAM and 3/4 the available CPU cores. This should help avoid + # overwhelming the build machine. + build --local_ram_resources=HOST_RAM*.5 + build --local_cpu_resources=HOST_CPUS*.75 + + build --distdir=${distDir} + fetch --distdir=${distDir} + build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" + build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" + build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" + build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" + build --host_javabase='@local_jdk//:jdk' + build --host_java_toolchain='${javaToolchain}' + build --verbose_failures + EOF + + # add the same environment vars to compile.sh + sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ + -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \ + -e "/\$command \\\\$/a --verbose_failures \\\\" \ + -i scripts/bootstrap/compile.sh + + # This is necessary to avoid: + # "error: no visible @interface for 'NSDictionary' declares the selector + # 'initWithContentsOfURL:error:'" + # This can be removed when the apple_sdk is upgraded beyond 10.13+ + sed -i '/initWithContentsOfURL:versionPlistUrl/ { + N + s/error:nil\];/\];/ + }' tools/osx/xcode_locator.m + + # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash + echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp + cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp + mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + + patchShebangs . + ''; + in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + + genericPatches; + + buildInputs = [ + buildJdk + python3 + ]; + + # when a command can’t be found in a bazel build, you might also + # need to add it to `defaultShellPath`. + nativeBuildInputs = [ + installShellFiles + zip + python3 + unzip + makeWrapper + which + customBash + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + + # Bazel makes extensive use of symlinks in the WORKSPACE. + # This causes problems with infinite symlinks if the build output is in the same location as the + # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a + # subdirectory. + # Failing to do this causes "infinite symlink expansion detected" + preBuildPhases = ["preBuildPhase"]; + preBuildPhase = '' + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + ''; + # Needed to build fish completion + propagatedBuildInputs = [ python3.pkgs.absl-py ]; + buildPhase = '' + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + + # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md + # and `git rev-parse --short HEAD` which would result in + # "3.7.0- (@non-git)" due to non-git build and incomplete changelog. + # Actual bazel releases use scripts/release/common.sh which is based + # on branch/tag information which we don't have with tarball releases. + # Note that .bazelversion is always correct and is based on bazel-* + # executable name, version checks should work fine + export EMBED_LABEL="${version}- (@non-git)" + ${customBash}/bin/bash ./bazel_src/compile.sh + ./bazel_src/scripts/generate_bash_completion.sh \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.bash \ + --prepend=./bazel_src/scripts/bazel-complete-header.bash \ + --prepend=./bazel_src/scripts/bazel-complete-template.bash + ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.fish + ''; + + installPhase = '' + mkdir -p $out/bin + + # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel + # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} + # The binary _must_ exist with this naming if your project contains a .bazelversion + # file. + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + + # shell completion files + installShellCompletion --bash \ + --name bazel.bash \ + ./bazel_src/output/bazel-complete.bash + installShellCompletion --zsh \ + --name _bazel \ + ./bazel_src/scripts/zsh_completion/_bazel + installShellCompletion --fish \ + --name bazel.fish \ + ./bazel_src/output/bazel-complete.fish + ''; + + doInstallCheck = true; + installCheckPhase = '' + export TEST_TMPDIR=$(pwd) + + hello_test () { + $out/bin/bazel test \ + --test_output=errors \ + --java_toolchain='${javaToolchain}' \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + } + + cd ./bazel_src + + # test whether $WORKSPACE_ROOT/tools/bazel works + + mkdir -p tools + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exit 1 + EOF + chmod +x tools/bazel + + # first call should fail if tools/bazel is used + ! hello_test + + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exec "$BAZEL_REAL" "$@" + EOF + + # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} + hello_test + ''; + + # Save paths to hardcoded dependencies so Nix can detect them. + postFixup = '' + mkdir -p $out/nix-support + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + # Some of the scripts explicitly depend on Python 2.7. Otherwise, we + # default to using python3. Therefore, both python27 and python3 are + # runtime dependencies. + echo "${python27}" >> $out/nix-support/depends + echo "${python3}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends + ''; + + dontStrip = true; + dontPatchELF = true; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch new file mode 100644 index 0000000000000..012e613c2f19e --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch @@ -0,0 +1,34 @@ +--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100 ++++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100 +@@ -21,10 +21,6 @@ + // 6,6.4,6.4.1 = 6.4.1 + // 6.3,6.3.0 = 6.3 + +-#if !defined(__has_feature) || !__has_feature(objc_arc) +-#error "This file requires ARC support." +-#endif +- + #import <CoreServices/CoreServices.h> + #import <Foundation/Foundation.h> + +--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100 ++++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100 +@@ -123,7 +123,6 @@ + "macosx", + "clang", + "-mmacosx-version-min=10.9", +- "-fobjc-arc", + "-framework", + "CoreServices", + "-framework", +--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100 ++++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100 +@@ -27,7 +27,7 @@ + ]) + + DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ +- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ ++ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ + -framework Foundation -o $@ $< + """ + diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json new file mode 100644 index 0000000000000..43ad41003152c --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json @@ -0,0 +1,1498 @@ +{ + "1.25.0.zip": { + "name": "1.25.0.zip", + "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" + ] + }, + "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { + "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, + "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": { + "name": "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "sha256": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" + ] + }, + "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { + "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" + ] + }, + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { + "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": { + "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" + ] + }, + "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { + "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "urls": [ + "https://mirror.bazel.build/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + ] + }, + "android_tools": { + "name": "android_tools", + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + }, + "android_tools_for_testing": { + "name": "android_tools_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + }, + "android_tools_pkg-0.19.0rc3.tar.gz": { + "name": "android_tools_pkg-0.19.0rc3.tar.gz", + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "urls": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + ] + }, + "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { + "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + ] + }, + "bazel-skylib-1.0.3.tar.gz": { + "name": "bazel-skylib-1.0.3.tar.gz", + "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" + ] + }, + "bazel-toolchains-3.1.0.tar.gz": { + "name": "bazel-toolchains-3.1.0.tar.gz", + "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" + ] + }, + "bazel_j2objc": { + "name": "bazel_j2objc", + "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", + "strip_prefix": "j2objc-2.5", + "urls": [ + "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", + "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" + ] + }, + "bazel_skylib": { + "name": "bazel_skylib", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" + ] + }, + "bazel_toolchains": { + "name": "bazel_toolchains", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", + "strip_prefix": "bazel-toolchains-3.1.0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" + ] + }, + "bazel_website": { + "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n", + "name": "bazel_website", + "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4", + "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42", + "urls": [ + "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz" + ] + }, + "boringssl": { + "generator_function": "grpc_deps", + "generator_name": "boringssl", + "name": "boringssl", + "sha256": "81333e496d7b74a60aa6fa622c028ba382a0a6b9c815cc6ccb221042383b9a9b", + "strip_prefix": "boringssl-412844d75b14b9090b58423fd5f5ed8c2fd80212", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz", + "https://github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz" + ] + }, + "build_bazel_apple_support": { + "generator_function": "grpc_deps", + "generator_name": "build_bazel_apple_support", + "name": "build_bazel_apple_support", + "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz", + "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz" + ] + }, + "build_bazel_rules_apple": { + "generator_function": "grpc_deps", + "generator_name": "build_bazel_rules_apple", + "name": "build_bazel_rules_apple", + "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e", + "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz", + "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz" + ] + }, + "build_bazel_rules_nodejs": { + "name": "build_bazel_rules_nodejs", + "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz" + ] + }, + "com_github_cares_cares": { + "build_file": "@com_github_grpc_grpc//third_party:cares/cares.BUILD", + "generator_function": "grpc_deps", + "generator_name": "com_github_cares_cares", + "name": "com_github_cares_cares", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, + "com_github_gflags_gflags": { + "generator_function": "grpc_deps", + "generator_name": "com_github_gflags_gflags", + "name": "com_github_gflags_gflags", + "sha256": "63ae70ea3e05780f7547d03503a53de3a7d2d83ad1caaa443a31cb20aea28654", + "strip_prefix": "gflags-28f50e0fed19872e0fd50dd23ce2ee8cd759338e", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz", + "https://github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz" + ] + }, + "com_github_google_benchmark": { + "generator_function": "grpc_deps", + "generator_name": "com_github_google_benchmark", + "name": "com_github_google_benchmark", + "sha256": "f68aec93154d010324c05bcd8c5cc53468b87af88d87acb5ddcfaa1bba044837", + "strip_prefix": "benchmark-090faecb454fbd6e6e17a75ef8146acb037118d4", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz", + "https://github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz" + ] + }, + "com_github_google_re2": { + "generator_function": "grpc_deps", + "generator_name": "com_github_google_re2", + "name": "com_github_google_re2", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + ] + }, + "com_github_grpc_grpc": { + "name": "com_github_grpc_grpc", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/grpc:grpc_1.32.0.patch" + ], + "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "strip_prefix": "grpc-1.32.0", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + ] + }, + "com_google_absl": { + "generator_function": "grpc_deps", + "generator_name": "com_google_absl", + "name": "com_google_absl", + "sha256": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", + "strip_prefix": "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz" + ] + }, + "com_google_googletest": { + "name": "com_google_googletest", + "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", + "strip_prefix": "googletest-release-1.10.0", + "urls": [ + "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", + "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" + ] + }, + "com_google_protobuf": { + "name": "com_google_protobuf", + "patch_args": [ + "-p1" + ], + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "patches": [ + "//third_party/protobuf:3.13.0.patch" + ], + "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", + "strip_prefix": "protobuf-3.13.0", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" + ] + }, + "coverage_output_generator-v2.5.zip": { + "name": "coverage_output_generator-v2.5.zip", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "cython": { + "build_file": "@com_github_grpc_grpc//third_party:cython.BUILD", + "generator_function": "grpc_deps", + "generator_name": "cython", + "name": "cython", + "sha256": "d68138a2381afbdd0876c3cb2a22389043fa01c4badede1228ee073032b07a27", + "strip_prefix": "cython-c2b80d87658a8525ce091cbe146cb7eaa29fed5c", + "urls": [ + "https://github.com/cython/cython/archive/c2b80d87658a8525ce091cbe146cb7eaa29fed5c.tar.gz" + ] + }, + "desugar_jdk_libs": { + "name": "desugar_jdk_libs", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": { + "name": "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "sha256": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz" + ] + }, + "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { + "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { + "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "urls": [ + "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, + "enum34": { + "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD", + "generator_function": "grpc_deps", + "generator_name": "enum34", + "name": "enum34", + "sha256": "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1", + "strip_prefix": "enum34-1.1.6", + "urls": [ + "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz" + ] + }, + "envoy_api": { + "generator_function": "grpc_deps", + "generator_name": "envoy_api", + "name": "envoy_api", + "sha256": "9150f920abd3e710e0e58519cd769822f13d7a56988f2c34c2008815ec8d9c88", + "strip_prefix": "data-plane-api-8dcc476be69437b505af181a6e8b167fdb101d7e", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz" + ] + }, + "futures": { + "build_file": "@com_github_grpc_grpc//third_party:futures.BUILD", + "generator_function": "grpc_deps", + "generator_name": "futures", + "name": "futures", + "sha256": "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794", + "strip_prefix": "futures-3.3.0", + "urls": [ + "https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00/futures-3.3.0.tar.gz" + ] + }, + "io_bazel_rules_go": { + "generator_function": "grpc_deps", + "generator_name": "io_bazel_rules_go", + "name": "io_bazel_rules_go", + "sha256": "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz" + ] + }, + "io_bazel_rules_python": { + "generator_function": "grpc_deps", + "generator_name": "io_bazel_rules_python", + "name": "io_bazel_rules_python", + "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", + "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz" + }, + "io_bazel_rules_sass": { + "name": "io_bazel_rules_sass", + "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", + "strip_prefix": "rules_sass-1.25.0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" + ] + }, + "io_bazel_skydoc": { + "name": "io_bazel_skydoc", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, + "io_opencensus_cpp": { + "generator_function": "grpc_deps", + "generator_name": "io_opencensus_cpp", + "name": "io_opencensus_cpp", + "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1", + "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz", + "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" + ] + }, + "java_tools_javac11_darwin-v10.5.zip": { + "name": "java_tools_javac11_darwin-v10.5.zip", + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "java_tools_javac11_linux-v10.5.zip": { + "name": "java_tools_javac11_linux-v10.5.zip", + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "java_tools_javac11_windows-v10.5.zip": { + "name": "java_tools_javac11_windows-v10.5.zip", + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + ] + }, + "java_tools_langtools_javac11": { + "name": "java_tools_langtools_javac11", + "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" + ] + }, + "jekyll_tree_0_17_1": { + "name": "jekyll_tree_0_17_1", + "sha256": "02256ddd20eeaf70cf8fcfe9b2cdddd7be87aedd5848d549474fb0358e0031d3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.1.tar" + ] + }, + "jekyll_tree_0_17_2": { + "name": "jekyll_tree_0_17_2", + "sha256": "13b35dd309a0d52f0a2518a1193f42729c75255f5fae40cea68e4d4224bfaa2e", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.2.tar" + ] + }, + "jekyll_tree_0_18_1": { + "name": "jekyll_tree_0_18_1", + "sha256": "98b77f48e37a50fc6f83100bf53f661e10732bb3ddbc226e02d0225cb7a9a7d8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.18.1.tar" + ] + }, + "jekyll_tree_0_19_1": { + "name": "jekyll_tree_0_19_1", + "sha256": "ec892c59ba18bb8de1f9ae2bde937db144e45f28d6d1c32a2cee847ee81b134d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.1.tar" + ] + }, + "jekyll_tree_0_19_2": { + "name": "jekyll_tree_0_19_2", + "sha256": "3c2d9f21ec2fd1c0b8a310f6eb6043027c838810cdfc2457d4346a0e5cdcaa7a", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.2.tar" + ] + }, + "jekyll_tree_0_20_0": { + "name": "jekyll_tree_0_20_0", + "sha256": "bb79a63810bf1b0aa1f89bd3bbbeb4a547a30ab9af70c9be656cc6866f4b015b", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.20.0.tar" + ] + }, + "jekyll_tree_0_21_0": { + "name": "jekyll_tree_0_21_0", + "sha256": "23ec39c0138d358c544151e5c81586716d5d1c6124f10a742bead70516e6eb93", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.21.0.tar" + ] + }, + "jekyll_tree_0_22_0": { + "name": "jekyll_tree_0_22_0", + "sha256": "bec5cfaa5560e082e41e33bde276cf93f0f7bcfd2914a3e868f921df8b3ab725", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.22.0.tar" + ] + }, + "jekyll_tree_0_23_0": { + "name": "jekyll_tree_0_23_0", + "sha256": "56c80fcf49dc606fab8ed5e737a7409e9a486585b7b98673be69b5a4984dd774", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.23.0.tar" + ] + }, + "jekyll_tree_0_24_0": { + "name": "jekyll_tree_0_24_0", + "sha256": "988fa567906a73e50d3669909285187ef88c76ecd4aa277f4d1f355fc06a90c8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.24.0.tar" + ] + }, + "jekyll_tree_0_25_0": { + "name": "jekyll_tree_0_25_0", + "sha256": "e8ab61c047225e808982a564ecd692fd63bd243dccc88a8768ed069a5362a685", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.25.0.tar" + ] + }, + "jekyll_tree_0_26_0": { + "name": "jekyll_tree_0_26_0", + "sha256": "3907dfc6fb27d246e67877e553e8951fac239bb49f2dec7e06b6b09cb0b98b8d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.26.0.tar" + ] + }, + "jekyll_tree_0_27_0": { + "name": "jekyll_tree_0_27_0", + "sha256": "97e2633fefee389daade775da43907aa68699b32212f4e48cb095abe18aa7e65", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.27.0.tar" + ] + }, + "jekyll_tree_0_28_0": { + "name": "jekyll_tree_0_28_0", + "sha256": "64b3fc267fb1f4c56345d96f0ad9f07a2efe43bd15361f818368849cf941b3b7", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.28.0.tar" + ] + }, + "jekyll_tree_0_29_0": { + "name": "jekyll_tree_0_29_0", + "sha256": "99d7a6bf9ef0145c59c54b4319fb31cb855681782080a5490909c4a5463c7215", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.0.tar" + ] + }, + "jekyll_tree_0_29_1": { + "name": "jekyll_tree_0_29_1", + "sha256": "cf0a517f1660a7c4fd26a7ef6f3594bbefcf2b670bc0ed610bf3bb6ec3a9fdc3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.1.tar" + ] + }, + "jekyll_tree_1_0_0": { + "name": "jekyll_tree_1_0_0", + "sha256": "61ef65c738a8cd65059f58f2ee5f7eef493136ac4d5e5c3464787d17043febdf", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.0.0.tar" + ] + }, + "jekyll_tree_1_1_0": { + "name": "jekyll_tree_1_1_0", + "sha256": "46d82c9249896903ee6be2295fc52a1346a9ee82f61f89b8a2181232c3bd999b", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.1.0.tar" + ] + }, + "jekyll_tree_1_2_0": { + "name": "jekyll_tree_1_2_0", + "sha256": "d402a8391ca2624673f124ff42ba8d0d40d4139e5d23111f3995dc6c5f70f63d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.2.0.tar" + ] + }, + "jekyll_tree_2_0_0": { + "name": "jekyll_tree_2_0_0", + "sha256": "7d7c424ede503856c61b645d8fdc2513ec6ea8600d76c5e87c45a9a45c16de3e", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.0.0.tar" + ] + }, + "jekyll_tree_2_1_0": { + "name": "jekyll_tree_2_1_0", + "sha256": "b0fd257b1d6b1b05705742d55a13b9a20d3e99f49c89334750c872d620e5b88f", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.1.0.tar" + ] + }, + "jekyll_tree_2_2_0": { + "name": "jekyll_tree_2_2_0", + "sha256": "4c1506786ab98df8039ec7354b82da7b586b2ae4ab7f7e7d08f3caf74ff28e3d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.2.0.tar" + ] + }, + "jekyll_tree_3_0_0": { + "name": "jekyll_tree_3_0_0", + "sha256": "bd1096ad609c253fa7b1473edf4a3aa51f36243e188dbb62c68d8ed4aca2419d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.0.0.tar" + ] + }, + "jekyll_tree_3_1_0": { + "name": "jekyll_tree_3_1_0", + "sha256": "f9d2e22e24af426d6c9de163d91abe6d8af7eb1eabb1d7ff5e9cf4bededf465a", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.1.0-807b377.tar" + ] + }, + "jekyll_tree_3_2_0": { + "name": "jekyll_tree_3_2_0", + "sha256": "6cff8654e739a0c3062183a5a6cc82fcf9a77323051f8c007866d7f4101052a6", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.2.0.tar" + ] + }, + "jekyll_tree_3_3_0": { + "name": "jekyll_tree_3_3_0", + "sha256": "36b81e8ddf4f3caccf41acc82d9e49f000c1be9e92c9cc82793d60ff70636176", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.3.0.tar" + ] + }, + "jekyll_tree_3_4_0": { + "name": "jekyll_tree_3_4_0", + "sha256": "af82e775d911135bcff76e500bb003c4a9fccb949f8ddf4d93c58eca195bf5e8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.4.0.tar" + ] + }, + "jekyll_tree_3_5_0": { + "name": "jekyll_tree_3_5_0", + "sha256": "aa96cbad14cfab0b422d1d17eac3107a75eb05854d40ab4f1379a6fc87b2e1f8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.0.tar" + ] + }, + "jekyll_tree_3_5_1": { + "name": "jekyll_tree_3_5_1", + "sha256": "1c949ba8da353c93c74a70638e5cb321ea1cd5582eda1b6ad88c6d2d0b569f2f", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.1.tar" + ] + }, + "jekyll_tree_3_6_0": { + "name": "jekyll_tree_3_6_0", + "sha256": "1b7a16a2098ca0c290c208a11db886e950d6c523b2cac2d0a0cba4a04aa832f3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.6.0.tar" + ] + }, + "jekyll_tree_3_7_0": { + "name": "jekyll_tree_3_7_0", + "sha256": "a534d37ef3867c92fae8692852f92820a34f63a5f9092bbbec6505c0f69d8094", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar" + ] + }, + "openjdk11_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_darwin_archive", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "openjdk11_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_linux_archive", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "openjdk11_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_windows_archive", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "openjdk14_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_darwin_archive", + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "openjdk14_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_linux_archive", + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "openjdk14_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_windows_archive", + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "openjdk15_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_darwin_archive", + "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" + ] + }, + "openjdk15_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_linux_archive", + "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" + ] + }, + "openjdk15_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_windows_archive", + "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" + ] + }, + "openjdk_linux": { + "downloaded_file_path": "zulu-linux.tar.gz", + "name": "openjdk_linux", + "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz" + ] + }, + "openjdk_linux_aarch64": { + "downloaded_file_path": "zulu-linux-aarch64.tar.gz", + "name": "openjdk_linux_aarch64", + "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" + ] + }, + "openjdk_linux_aarch64_minimal": { + "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", + "name": "openjdk_linux_aarch64_minimal", + "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" + ] + }, + "openjdk_linux_aarch64_vanilla": { + "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", + "name": "openjdk_linux_aarch64_vanilla", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "openjdk_linux_minimal": { + "downloaded_file_path": "zulu-linux-minimal.tar.gz", + "name": "openjdk_linux_minimal", + "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" + ] + }, + "openjdk_linux_ppc64le_vanilla": { + "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", + "name": "openjdk_linux_ppc64le_vanilla", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "openjdk_linux_s390x_vanilla": { + "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz", + "name": "openjdk_linux_s390x_vanilla", + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "openjdk_linux_vanilla": { + "downloaded_file_path": "zulu-linux-vanilla.tar.gz", + "name": "openjdk_linux_vanilla", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "openjdk_macos": { + "downloaded_file_path": "zulu-macos.tar.gz", + "name": "openjdk_macos", + "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" + ] + }, + "openjdk_macos_minimal": { + "downloaded_file_path": "zulu-macos-minimal.tar.gz", + "name": "openjdk_macos_minimal", + "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" + ] + }, + "openjdk_macos_vanilla": { + "downloaded_file_path": "zulu-macos-vanilla.tar.gz", + "name": "openjdk_macos_vanilla", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "openjdk_win": { + "downloaded_file_path": "zulu-win.zip", + "name": "openjdk_win", + "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" + ] + }, + "openjdk_win_minimal": { + "downloaded_file_path": "zulu-win-minimal.zip", + "name": "openjdk_win_minimal", + "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" + ] + }, + "openjdk_win_vanilla": { + "downloaded_file_path": "zulu-win-vanilla.zip", + "name": "openjdk_win_vanilla", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "platforms": { + "name": "platforms", + "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", + "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" + ] + }, + "remote_coverage_tools": { + "name": "remote_coverage_tools", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "remote_coverage_tools_for_testing": { + "name": "remote_coverage_tools_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "remote_java_tools_darwin": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_darwin", + "name": "remote_java_tools_darwin", + "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip" + ] + }, + "remote_java_tools_darwin_for_testing": { + "name": "remote_java_tools_darwin_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_darwin": { + "name": "remote_java_tools_javac11_test_darwin", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_linux": { + "name": "remote_java_tools_javac11_test_linux", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_windows": { + "name": "remote_java_tools_javac11_test_windows", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + ] + }, + "remote_java_tools_linux": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_linux", + "name": "remote_java_tools_linux", + "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip" + ] + }, + "remote_java_tools_linux_for_testing": { + "name": "remote_java_tools_linux_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "remote_java_tools_windows": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_windows", + "name": "remote_java_tools_windows", + "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip" + ] + }, + "remote_java_tools_windows_for_testing": { + "name": "remote_java_tools_windows_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip" + ] + }, + "remotejdk11_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux", + "name": "remotejdk11_linux", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "remotejdk11_linux_aarch64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_aarch64", + "name": "remotejdk11_linux_aarch64", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "remotejdk11_linux_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "remotejdk11_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "remotejdk11_linux_ppc64le": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_ppc64le", + "name": "remotejdk11_linux_ppc64le", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_ppc64le_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_ppc64le_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_s390x", + "name": "remotejdk11_linux_s390x", + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_s390x_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_macos", + "name": "remotejdk11_macos", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "remotejdk11_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "remotejdk11_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_win", + "name": "remotejdk11_win", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "remotejdk11_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "remotejdk14_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_linux", + "name": "remotejdk14_linux", + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "remotejdk14_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "remotejdk14_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_macos", + "name": "remotejdk14_macos", + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "remotejdk14_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "remotejdk14_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_win", + "name": "remotejdk14_win", + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "remotejdk14_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "remotejdk15_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" + ] + }, + "remotejdk15_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" + ] + }, + "remotejdk15_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" + ] + }, + "rules_cc": { + "name": "rules_cc", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + ] + }, + "rules_java": { + "name": "rules_java", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "rules_nodejs-2.2.2.tar.gz": { + "name": "rules_nodejs-2.2.2.tar.gz", + "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz" + ] + }, + "rules_pkg": { + "name": "rules_pkg", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" + ] + }, + "rules_pkg-0.2.4.tar.gz": { + "name": "rules_pkg-0.2.4.tar.gz", + "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" + ] + }, + "rules_proto": { + "name": "rules_proto", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", + "strip_prefix": "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" + ] + }, + "six": { + "build_file": "@com_github_grpc_grpc//third_party:six.BUILD", + "generator_function": "grpc_deps", + "generator_name": "six", + "name": "six", + "sha256": "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", + "urls": [ + "https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz" + ] + }, + "upb": { + "generator_function": "grpc_deps", + "generator_name": "upb", + "name": "upb", + "sha256": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", + "strip_prefix": "upb-382d5afc60e05470c23e8de19b19fc5ad231e732", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" + ] + }, + "v1.32.0.tar.gz": { + "name": "v1.32.0.tar.gz", + "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + ] + }, + "v3.13.0.tar.gz": { + "name": "v3.13.0.tar.gz", + "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" + ] + }, + "zlib": { + "build_file": "@com_github_grpc_grpc//third_party:zlib.BUILD", + "generator_function": "grpc_deps", + "generator_name": "zlib", + "name": "zlib", + "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", + "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz", + "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": { + "name": "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": { + "name": "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-win_x64.zip": { + "name": "zulu11.37.17-ca-jdk11.0.6-win_x64.zip", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": { + "name": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + } +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py new file mode 100755 index 0000000000000..9e998e05875e7 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 +import sys +import json + +if len(sys.argv) != 2: + print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr) + print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr) + print("Hail Eris.", file=sys.stderr) + sys.exit(1) + +http_archives = [] + +# just the kw args are the dict { name, sha256, urls … } +def http_archive(**kw): + http_archives.append(kw) +# like http_file +def http_file(**kw): + http_archives.append(kw) + +# this is inverted from http_archive/http_file and bundles multiple archives +def distdir_tar(**kw): + for archive_name in kw['archives']: + http_archives.append({ + "name": archive_name, + "sha256": kw['sha256'][archive_name], + "urls": kw['urls'][archive_name] + }) + +# TODO? +def git_repository(**kw): + print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr) + sys.exit(1) + +# execute the WORKSPACE like it was python code in this module, +# using all the function stubs from above. +exec(sys.stdin.read()) + +# transform to a dict with the names as keys +d = { el['name']: el for el in http_archives } + +def has_urls(el): + return ('url' in el and el['url']) or ('urls' in el and el['urls']) +def has_sha256(el): + return 'sha256' in el and el['sha256'] +bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values())) +if bad_archives: + print('Following bazel dependencies are missing url or sha256', file=sys.stderr) + print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr) + for el in bad_archives: + print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr) + sys.exit(1) + +with open(sys.argv[1], "w") as f: + print(json.dumps(d, sort_keys=True, indent=4), file=f) diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix index 30b957eb5e30d..11931a197c0c2 100644 --- a/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -38,7 +38,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-cpp"; + name = "bazel-test-java"; inherit workspaceDir; bazelPkg = bazel; buildInputs = [ openjdk8 ]; diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 0784de4cfd39a..3858a681659b2 100644 --- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -17,15 +17,29 @@ let com_google_protobuf = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf"; - rev = "v3.7.0"; - sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh"; + rev = "v3.13.0"; + sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd"; }; bazel_skylib = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-skylib"; - rev = "f83cb8dd6f5658bc574ccd873e25197055265d1c"; - sha256 = "091fb0ky0956wgv8gghy9ay3yfx6497mb72qvibf0y9dllmxyn9l"; + rev = "2ec2e6d715e993d96ad6222770805b5bd25399ae"; + sha256 = "1z2r2vx6kj102zvp3j032djyv99ski1x1sl4i3p6mswnzrzna86s"; + }; + + rules_python = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_python"; + rev = "c8c79aae9aa1b61d199ad03d5fe06338febd0774"; + sha256 = "1zn58wv5wcylpi0xj7riw34i1jjpqahanxx8y9srwrv0v93b6pqz"; + }; + + rules_proto = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_proto"; + rev = "a0761ed101b939e19d83b2da5f59034bffc19c12"; + sha256 = "09lqfj5fxm1fywxr5w8pnpqd859gb6751jka9fhxjxjzs33glhqf"; }; net_zlib = fetchurl rec { @@ -40,7 +54,9 @@ let load("//:proto-support.bzl", "protobuf_deps") protobuf_deps() - ''; + load("@rules_proto//proto:repositories.bzl", "rules_proto_toolchains") + rules_proto_toolchains() + ''; protoSupport = writeText "proto-support.bzl" '' """Load dependencies needed to compile the protobuf library as a 3rd-party consumer.""" @@ -62,13 +78,17 @@ let name = "bazel_skylib", path = "${bazel_skylib}", ) - - native.bind( - name = "zlib", - actual = "@net_zlib//:zlib", + native.local_repository( + name = "rules_proto", + path = "${rules_proto}", + ) + native.local_repository( + name = "rules_python", + path = "${rules_python}", ) + http_archive( - name = "net_zlib", + name = "zlib", build_file = "@com_google_protobuf//:third_party/zlib.BUILD", sha256 = "${net_zlib.sha256}", strip_prefix = "zlib-1.2.11", @@ -89,6 +109,8 @@ let ''; personBUILD = writeText "BUILD" '' + load("@rules_proto//proto:defs.bzl", "proto_library") + proto_library( name = "person_proto", srcs = ["person.proto"], diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 18d41d6f74077..68c1e94519177 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-mHr+FuDMxLA5Y7BNbDN75mdHVP6Ah1/S5vXg6cC/dcE="; + sha256 = "0hyjyk3yw2yjb47j9kd6as5bsa2wkjricnx0803sg2p4qc8rb72f"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index ed1171458b106..5ba6718a6bd2d 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -2,16 +2,16 @@ makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "1z8hiamg3h1fnsmr8j5l9q6c8cd81lqmd00gcmz4spw73pqfxg3r"; + sha256 = "sha256-JfOCht+awc0I22vtRD5hgowgdVkcJR3qSxnxLoc3XZY="; }; - vendorSha256 = "1kxnpn4py8a2rz1gwg0y3yiwcwphj38pkp2k9z1p85ccm2wblljz"; + vendorSha256 = "sha256-4zKe8y+9fedvCt/XmPf0HxtyqLz+FP4Ylt6k9KBjaIw="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index e96d8f38af4ee..38439e62473f9 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,25 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "4B72VYQ+HBvhGQNl577DuZpvWNIvv/6fejRQtVKtFKY="; + sha256 = "sha256-K8jeX1/Wn6mbf48GIR2wRAwiwg1rxtbtCPjjH+4dPYw="; }; - cargoSha256 = "uOOpDRWPSoH49NTu82rDxxDR/2icoe4ECxVQb/J/45w="; + cargoSha256 = "sha256-a9SBeX3oesdoC5G+4dK2tbt+W7VA4jPqCM9tOAex4DI="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' installManPage man/just.1 - installShellCompletion --bash --name just.bash completions/just.bash - installShellCompletion --fish --name just.fish completions/just.fish - installShellCompletion --zsh --name _just completions/just.zsh + installShellCompletion --cmd just \ + --bash completions/just.bash \ + --fish completions/just.fish \ + --zsh completions/just.zsh ''; checkInputs = [ coreutils bash ]; diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/development/tools/knightos/z80e/default.nix index a089511fb6849..6d66f141e9122 100644 --- a/pkgs/development/tools/knightos/z80e/default.nix +++ b/pkgs/development/tools/knightos/z80e/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z80e"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "KnightOS"; repo = "z80e"; rev = version; - sha256 = "0gdv17ynjd6zf3i4hkimd89xkrd8kxas3bf8d5sq54fdicapvkzc"; + sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; }; nativeBuildInputs = [ cmake knightos-scas ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 7bd25a6868e86..85ab64a230ef2 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vlE0tN6m/PZtDZiIs/glTWYP+E4qzD0MAeQjX+OAcHY="; + sha256 = "sha256-HgFm58zdaycOH65jfu3QsfFemhXymp3OTekISih+8WA="; }; vendorSha256 = "sha256-9LEyxIBe4c938RQbLOQOsAb9MGNtjngm48P3P83BTNw="; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index ce054da0d40c1..1fa288f55f011 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.02.05-15.32.53"; + version = "2021.02.07-22.51.26"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "sha256-kKjgAO3DEpZOm91Tzkhj4rmNOaacZi74o/qfp8n11Z4="; + sha256 = "sha256-6EiWyoH7voRjjDNWnWkyBV2eOPuoabRE7Os/JRE/LUk="; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/development/tools/misc/edb/default.nix new file mode 100644 index 0000000000000..ec65ca62fa30b --- /dev/null +++ b/pkgs/development/tools/misc/edb/default.nix @@ -0,0 +1,42 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, boost, capstone +, double-conversion, graphviz, qtxmlpatterns }: + +mkDerivation rec { + pname = "edb"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "eteran"; + repo = "edb-debugger"; + rev = "1.3.0"; + fetchSubmodules = true; + sha256 = "fFUau8XnsRFjC83HEsqyhrwCCBOfDmV6oACf3txm7O8="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ boost.dev capstone double-conversion graphviz qtxmlpatterns ]; + + postPatch = '' + # Remove CMAKE_INSTALL_PREFIX from DEFAULT_PLUGIN_PATH otherwise the nix store path will appear twice. + substituteInPlace ./src/CMakeLists.txt --replace \ + '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_PREFIX}/''${CMAKE_INSTALL_LIBDIR}/edb\"' \ + '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_LIBDIR}/edb\"' + + # The build script checks for the presence of .git to determine whether + # submodules were fetched and will throw an error if it's not there. + # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic. + mkdir -p src/qhexview/.git + + # Change default optional terminal program path to one that is more likely to work on NixOS. + substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm"; + ''; + + meta = with lib; { + description = "Cross platform AArch32/x86/x86-64 debugger"; + homepage = "https://github.com/eteran/edb-debugger"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lihop maxxk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index c68a1c1547cc9..c41ab92fb97df 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,37 +1,26 @@ -{ stdenv -, lib -, fetchFromGitHub -, cargo -, rustc -, rustPlatform -, pkg-config -, glib -, openssl -, darwin -}: +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { - version = "0.2.14"; + version = "0.2.15"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; - rev = version; - sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind"; + rev = "v${version}"; + sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb"; }; - cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda"; + + cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; cargoBuildFlags = [ "--features=all" ]; - nativeBuildInputs = [ - pkg-config cargo rustc - ]; - buildInputs = [ - openssl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 - checkPhase = null; + doCheck = false; meta = with lib; { description = "Ccache with Cloud Storage"; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 5576016d5323e..e4eb2965fd6f0 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-/tZUYJaNvJ7H3xAc9ygcJD6meK1Em87VYqqYqY1l4zE="; + sha256 = "sha256-RrDwq5VufMDsPlqRmBP3x2RUWU740L0L18noByO1IDY="; }; - cargoSha256 = "sha256-/6nr+UNQPa8+cEnAMgyjuCV1JjfqXcNLfuqi4/kgmk0="; + cargoSha256 = "sha256-W6+RGzCYJF9f44QaFDOI414/vCfKIuIOXoH+GYY0GwY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 67c8509fd70e2..10804980041b6 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l"; + sha256 = "sha256-GXnhI8nd4ciFd22989ypqGy5pozKJm+dzg8MaDDvuZg="; }; vendorSha256 = null; diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index 5085346e3eb63..df343f30785bb 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "sha256-/DKDg2lJO6PikF7+kbwRX8ClS8rflH8KdrZNx7AR36g="; + sha256 = "sha256-bZWyAZrAYG45fqmEQYXsk8YLKurpppaahOkALAQXGhY="; }; # the integration tests will try to clone a remote repos diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index cef9cd928778c..495ac311b88d2 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.23.2"; - sha256 = "1iyvs56x5zvvqmpr6kkamgpfj70n2rj1fh7afc7q8hj3bq7f1985"; + version = "10.23.3"; + sha256 = "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 410be6a2495d8..ee8ea72c05eab 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.15.4"; - sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd"; + version = "14.15.5"; + sha256 = "0nv576mlmnf8pfs6yn7vsvwyg0a0xvs7m9pm4k131zjqx501v6z1"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index ca4dc3b9a17c8..6f3cdab9ab45c 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -29,27 +29,27 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "123.1"; + version = "124.1"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "0qpgilb0v93zcik12idwzdd5b5lw74431iywq4d55gn5i6gb6bh1"; + sha256 = "1k4k559y8l6wmj9m4980f7xmaaxzx84x86rqc77j4nd3y3x53546"; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "146wvm0dahygnq327pspr62lq29irwrhc8ylgwdwwasrvlsscdp5"; + sha256 = "08v929sgxy1pclzc00p7l7fak2h9l306447w5k5db3719kacj059"; }; soloud = fetchFromGitHub { owner = "Anuken"; repo = "soloud"; # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39 - rev = "73860909189c9c42924eb82e9b4a0eab2a4d5e1c"; - sha256 = "1gm3r16a539hm8jbc14mfxn7v88dv40vr7nzwmpifnz54qarkg3m"; + rev = "b33dfc5178fcb2613ee68136f4a4869cadc0b06a"; + sha256 = "1vf68i3pnsixch37285ib7afkwmlrc05v783395jsdjzj9i67lj3"; }; patches = [ @@ -114,7 +114,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "18r2gd1y79cy571f5hvlablfwrlz10cf7ssc9ckkvkk92i0323gk"; + outputHash = "18yfchv55f0fza6gdxd3f6gm0m4wy2a9jkw5wgl84id518jal6la"; }; in diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b491f01d0929f..a3f280942baa6 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-02-02"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "9b5c09047361f3ec2cf18afbb6d1e03047a59778"; - sha256 = "0bdqr1k3cllgqclshxsmcd16ba63bw0ig3sqj46an3mgpvd6v4xd"; + rev = "388cf3374312b05122151bc68691bf09a69ff840"; + sha256 = "1jzfdbfw333r929l5bl1ca1dv9b6yyhsjhk3gdf7wxklbzcrww3p"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-01-28"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "16d201f8a789a5591ae980ac707a31241062ed52"; - sha256 = "18fbqqjb0cn89wkm4dfhwh3xzpf6gdnav78lrs59kzfggppkpn8l"; + rev = "4fbb34ccc09354ec09033719133c32d531111934"; + sha256 = "0blpw88d0b7arxnz18glppwwgs0gynq0l7yd2a2jm45wqvlfh8ld"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -207,6 +207,18 @@ let meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; + auto-session = buildVimPluginFrom2Nix { + pname = "auto-session"; + version = "2021-02-05"; + src = fetchFromGitHub { + owner = "rmagatti"; + repo = "auto-session"; + rev = "691155697a809af8797c1b935aa4e73187516d42"; + sha256 = "199rcp3wcqg40a6lsrk83lv2kxgmnbapd5zw16jcxg4svy30dhfg"; + }; + meta.homepage = "https://github.com/rmagatti/auto-session/"; + }; + autoload_cscope-vim = buildVimPluginFrom2Nix { pname = "autoload_cscope-vim"; version = "2011-01-28"; @@ -377,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-02-05"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "c592de172d6e9ed36c8ca38814b3bb2a8ffde901"; - sha256 = "1hs38ri6j6bfnl5ll8jcd3wcpv95h1rf19vd42x3h0i4npxba9hz"; + rev = "fb65c78edbc6a4bfaa8c7a9df45b2a955497247e"; + sha256 = "1g1jhfn2nzx9g03kv5n8kwqsh3icf6s9ldkhsv5w1k1ang56zpn1"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -473,12 +485,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-02-02"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "16fcaba5e3ee67b4149bf4ce6bd0c76991e982c2"; - sha256 = "0r23i855f01c3isfhv4j5r34xj777ffyqn420m44077dyr7r3m9k"; + rev = "8c839426885e290ff5f63d87778f6325339ecf1f"; + sha256 = "03ssv8b5pq44dnj9iplpc76js5mpwg0l77wg4zal5gx0ashgm39p"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -497,12 +509,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-02-03"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "14f4162f20e0d1dc7344e0620ffd11f3c811d4b2"; - sha256 = "01xqvksvs61vg8sc6wpiilp833g61sza455297vg0im0cz7i8wpc"; + rev = "9fd7f97b9696e53066a8e62f528f26b6bc1858b0"; + sha256 = "0lnkz1janblic4a15lr9fm6r62691wpgggdq8hyc5dz0m32jr0hn"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -604,6 +616,18 @@ let meta.homepage = "https://github.com/rhysd/committia.vim/"; }; + compe-tabnine = buildVimPluginFrom2Nix { + pname = "compe-tabnine"; + version = "2021-02-08"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "compe-tabnine"; + rev = "0b884f2b0bc965826e69d4377cd06a48a36995ec"; + sha256 = "0mwqk9ixirjybv9b2f1n08052iv6hcdr5l73f7jij35nc5anclad"; + }; + meta.homepage = "https://github.com/tzachar/compe-tabnine/"; + }; + completion-buffers = buildVimPluginFrom2Nix { pname = "completion-buffers"; version = "2021-01-17"; @@ -666,12 +690,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-01-28"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0aa1e8f78e8e0746a6026260f4d9a64a0bdfbf7a"; - sha256 = "163hgvc64bjc18kf6biwy5slhkfg8rw7pvrjsq4kfmcszvkbhgap"; + rev = "831334312237a305d92e54092bfab447376cc844"; + sha256 = "1y0a43j1rhqzfm9qmd7dax6bn1mg9vwvh3rc355k94ix3x82n93j"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -846,12 +870,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-02-02"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "fe855a14eaf4ede5c040704770202fe954addbda"; - sha256 = "1f7gg77q8h227kbbf73d697v1x8w42szfckxmyskwb5wrvsxinpc"; + rev = "4d2353619262fe487a052288859f3eea64cd229c"; + sha256 = "1nxh1pqrnvzdw02fb8bncb8gswfr3p2n1h8yfnfjlljqiapkvhdq"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -894,12 +918,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-02-05"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c56b0a7c0ff040f1de7e0bb48d76af56b4a4d2c1"; - sha256 = "1yg3qawbfpi7jjl8bkl8yif245c03lz3vm52w2z7c970n3y6v2pm"; + rev = "fcf4415c701cb9e05d1f2c3dee4afeeba1d625fc"; + sha256 = "0kfb41k3gimjnqv9l288clwbqwznrgqqy3xanaw8306sgsjg7rs1"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1040,12 +1064,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-12-26"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e"; - sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a"; + rev = "e526dbecda137e37c45492ce72fa92ea32314154"; + sha256 = "03dwis03zx88j4dan1y39b03rvf7f2q7hykhgqsfcx1zj8lp8s7n"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1112,12 +1136,12 @@ let deoplete-vim-lsp = buildVimPluginFrom2Nix { pname = "deoplete-vim-lsp"; - version = "2021-02-04"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = "deoplete-vim-lsp"; - rev = "4e369aee9c443f31b3974c945f807ad93d27cb5c"; - sha256 = "14vfa6zvxprrrdi82dwnayhr2wxmifd7h5w8cl0hfw5zyrs5qsr0"; + rev = "fd80985bfd9f140c8e38b303ab325ec86c05b976"; + sha256 = "1h9xprfqrfnfs50hgiah0c2y9lafhc2lldvmc7cl8xa5p9bslxj3"; }; meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; @@ -1136,12 +1160,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-01-25"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "2e3f5b5c24152d9aa4a0299ce6d1b7a6b76327eb"; - sha256 = "0yf35ak46pnknas6isvi4gpyc9n757a46kjvwwyh32pznfqpl41p"; + rev = "27af4ab2de157f80c8a8391aebb60061318814ea"; + sha256 = "12gjf3pcds7ms568pxmwrlnfijrm18h3pnb1x1a1gmf7bwj7xyfc"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1354,12 +1378,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-01-31"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "fa8a10607a39f41a16071561901b963836cd8706"; - sha256 = "0cg0ri14jmgx063j950m5kfvsy81qwzvxibar8fq9bkpk63xrip3"; + rev = "b71eaccd050f4f6422cf09594cd69067cacadd4c"; + sha256 = "0c8j6qd0aaa6cva1ca36rdybrv7zrvxip2k9w44f37gakrzgmh50"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1487,12 +1511,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-02-04"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "ee34f7fed7e2c8801a8c1a9101ab9392bc4e70a2"; - sha256 = "0lc94z24bpvfkyip76s4yprhfgprqhzviywhp2ds2dlm7xr6bwj5"; + rev = "e30c355aaf6d2ca9aaa3a246eb87c7ceb4c42855"; + sha256 = "09w6gvy9hg0cgrs6661g8kfyjd4waz0ajx983p5jqr6l9a96111k"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1511,24 +1535,24 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2020-12-16"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "4cc031a5d3384ee9cc3225ff038a633be6b7125f"; - sha256 = "0pdska6qkk734hplhyp2cw89xn2c897vgw72fgn2239pqryz5g4n"; + rev = "762f31ff620eb822ae4ca43c5dc2a62ca621f5fe"; + sha256 = "035nj257r2nkwriqq5l4qjn5z1a04l39k4i9s1yz0mgv902kmics"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-01-31"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "3f4a7cc9f50a179158cd8a9ea10ba56cae73514b"; - sha256 = "1afgq5kj98qhgsvpf556zs478s3776i0kjq3zr6zwxr36dp8455n"; + rev = "298c69898c11c2da574a6d2c32e195b0adc6f356"; + sha256 = "1999c3x2bpif0ppv1i452fcklgmjdxrvj510sy7dv8aym93vpmax"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1571,12 +1595,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-02-02"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "fe58abc2d82328d489ac1678d2ac99c4ad94321e"; - sha256 = "03sm5a9pis0m2qbqzl6x6zf6limr0pbzcxmdf7hk83q8zg2y91wb"; + rev = "3ab17a8e829b1c6c0d53f6a22e35c185bf7360de"; + sha256 = "0c73382ighhv18nn3zrdq09ayyh8pq0adcy6icgmx71qlszc5572"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2208,12 +2232,12 @@ let lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; - version = "2021-01-05"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "5215ea78a5949b42b86bf474d33608de6b7594a3"; - sha256 = "05h8n0ggi55g4ri9jsa4210knds0rxp8ym2knlq3njy40q0jjaxd"; + rev = "187c492c492f8b57c1a66b82904785141b01d5ac"; + sha256 = "0i8j37i2lkrsjlya9g5i8wr3gjlfkb9g9sqzq6a0132s6rpqdhmz"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; @@ -2230,26 +2254,38 @@ let meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; + lspkind-nvim = buildVimPluginFrom2Nix { + pname = "lspkind-nvim"; + version = "2021-02-06"; + src = fetchFromGitHub { + owner = "onsails"; + repo = "lspkind-nvim"; + rev = "953ca895203c095e13f97a8ece790bf546c82d1c"; + sha256 = "15rfzcmfwig7x8pbgc1maimqkqwqr4dbpf7498a0s16vng673bgk"; + }; + meta.homepage = "https://github.com/onsails/lspkind-nvim/"; + }; + lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-02-05"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "f50c266b285aec9a2645f9f48f55db2de0ccef94"; - sha256 = "149jwbwhzxvh6mvbkbhkkwh3y5gzfh2r2jc3p00y2arhxsx478fa"; + rev = "c2fb66a23659349b9c36d21892e5c8f67ed65d62"; + sha256 = "1mrajhf7jnjgp68dqcrghhgf21shylili6sis8svfp7ls7x87wk2"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-02-05"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "66ab809e0ecdf38cc5eaaab56a3f3d2f1369e1ac"; - sha256 = "0lcvxlxlr0inl93k5kvpphmacg6iprx9ym5jivmqnkvqsfzzv860"; + rev = "0325203fa9c522fbe4297acc6992778ae3b41391"; + sha256 = "0ykrz9yhxxc428d39bg1j9xvlxikzd0xr6zh7hci2apvv96a6mh3"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2316,12 +2352,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-01-04"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "3e9ba8aae59441ed82b50b186f608e03aecb4f0e"; - sha256 = "1z264hr0vbsdc0ffaiflzq952xv4h1g55i08dnlifvpizhqbalv6"; + rev = "551a13f9677dde911bd4436c038a1fa64e814cc4"; + sha256 = "17ni56fs94x60qpd0ikwi2hz9nsh0icwm7438i84kswmysfx3gn8"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2616,24 +2652,24 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-01-20"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "c1d63f047c2fc1dba638a80c24d9b9b44ceb9f50"; - sha256 = "1q92lxdy8mgiv3ffp2gxsf0acp98hk3yh3lkvsaj6crdwbrq1ss9"; + rev = "a75d96054618c47fbafef964d4d705525e8e37b9"; + sha256 = "0c7k1fhw1fjgby4h99r22sbzn639v76r12dl66fhdrnkvrk0709n"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-02-05"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "f3740d68852557b64da832969bc2302c10759eb7"; - sha256 = "1spgcvj25m5h6r4k6a41m233zl3wavj6yj84jpsjmg7xabw75c14"; + rev = "53f22813fb3e60a4175ee44de55732b93c2903de"; + sha256 = "0441hafqkqz11666cwkrgp90zmxgx7pjcl6n4bshyp82x3glw1nj"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2880,12 +2916,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-02-05"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "b5e4239d19f6e5d69df724cb9a924a9b7cb1b739"; - sha256 = "1vn637x06ar3rnjgfwlsm7c59gfs4bia177x4gzj9kj4kl0aadcp"; + rev = "a85c6461ddf73fbe307a73b06855e336e298b152"; + sha256 = "1kqw6ynhl36mwkghgs3yjw0q4yp578hb03hb1nwiyxdjh72v6a2v"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -2904,12 +2940,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-02-02"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c0245b577f09173d18a8931c36e7299f10eaf232"; - sha256 = "0gqa9kmb35vpididwv1ylk1ja8pcy4vxn30zfw1myc0jsxwknhlx"; + rev = "10a740b2364efc9acff78f4e7466902f153e584b"; + sha256 = "1w4dvdd9fmi8gmgdq4zkrhrwdii4k7ns782gv4abpkzss5v6s66h"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2988,24 +3024,24 @@ let nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-02-02"; + version = "2021-02-05"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "3437cc5696f6c6f1a46b1ad1445d9c917d3fa4bc"; - sha256 = "1i53c7wrbx52ybm9v1m6p8n8894gyb2hylv7iac063nkhnhl7v6h"; + rev = "9198402f3417b0dbf26e73cac8cb53e074c163f1"; + sha256 = "17gqdrskr744b1z26fjf01a9nvfasd4fhaa9dmmi4g4br8556cyj"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-02-04"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e0ee3364c02c5eb739ce7af5a13e8cc50aae8d3d"; - sha256 = "0kcdy6scrxb01rwajcimay7257n7xiwrl48pm24nlb3k2fzmsr9s"; + rev = "041dfd7fb648d24c80cb8829dda2469f66f88490"; + sha256 = "105xswyz91sphqr59kzg2df9dhs01d5g2nwmlnnbq0fpbdfjnylb"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3060,12 +3096,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-02-04"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "93854135974cec0bba9a6026b28c1ec84fe70a00"; - sha256 = "0681d0d17c7lz2nqlsbn8n8j1gkfbhzahg3f0qw5sg0f5likrx57"; + rev = "6533fb9af7f881c18b761ae94b2a502606f27989"; + sha256 = "1rj9ndcvm24yirxg59y7sp6gs4dkyk0waa37j378liya5ia1cw48"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3108,12 +3144,12 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-02-02"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "d3532beb184b64696095f101678e737277df8d1e"; - sha256 = "12wxajgrzs3qjdjig55c56pa7va6sqnklq9hzi26z4k5isghbc3z"; + rev = "eb8c49ee380bcdf477734911fe032fc141606a6b"; + sha256 = "0ix27jdh6nvc352wwck8gjn4wsrf1y8ra89mrhf10mgm2ijr2xvs"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3168,12 +3204,12 @@ let oceanic-next = buildVimPluginFrom2Nix { pname = "oceanic-next"; - version = "2021-01-26"; + version = "2021-02-05"; src = fetchFromGitHub { owner = "mhartington"; repo = "oceanic-next"; - rev = "f47fa3d4f63f1ce60bba13af81d97ee98ec31ceb"; - sha256 = "064d2ip2fvkkqh0z8x0mykycbcwmdajflr5qz0pl4f5q0rlsnbb8"; + rev = "5ef31a34204f84714885ae9036f66a626036c3dc"; + sha256 = "1wazbyxaq71mlpyvyxrbrpyb9vgkcsj2y2zf1sba9gfjjszph482"; }; meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; @@ -3240,12 +3276,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-02-03"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c5b7f23e0b406767c1918d6888962fdb97f951e8"; - sha256 = "01w01543af4mbaa5hy5gfvbyz14sibf391dal987rn7zzjlsby7f"; + rev = "5c43fcc1496112bf6fd569c3b5c7dda7f501b0ac"; + sha256 = "0ghnnv2wyg3simvwxghlx3gafgnbm0qr48chfr89c2z4xsvn8rqc"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3336,12 +3372,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-02-03"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a022a1b11c3a74a18df383894ddab58169c5ace0"; - sha256 = "0k395lm8azlyyrnnkjgyyidhf7s33alm5n2rffcpmygbh5i4665d"; + rev = "2ea0101080985ec34019a79e7a4b30f6c45b0f3c"; + sha256 = "0ijvib9ngydfifbzywxiac9xxvpjyp3jvym9mw3jf6hp4k4dh9sw"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3360,12 +3396,12 @@ let popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2021-01-07"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "9ab0aa5f186a2a2429c55f1512e2fd8b536183f0"; - sha256 = "0ks9hxc506ybwrvk5qkl1qkj634ms5icy8cg0w3b1q5qzgz5k0wn"; + rev = "efcd82cbae750aa743619bfae7453fbec9366b87"; + sha256 = "0041c9xnnhw24ablwqw9p9vlcmbfrp9l9r6i4ayh8id666ylsln9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; @@ -4083,12 +4119,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-02-05"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "5f1d16acf6716261bd52466733e096a49b9eadad"; - sha256 = "1ybn9c6lxry5gs7rhnziv5i8gm45w4yrnkbvpzf898h5y6ifs5l5"; + rev = "993e383dd5356bf10c5cf2b5d0ac88f9c7746181"; + sha256 = "1db21n32y6hib3r0ncci3920wyb631yi57q3s58swlcqpjf20wli"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4276,12 +4312,12 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2021-01-08"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "c455008595a15c7ccc2c9f2ea309ba2bf5d3fe63"; - sha256 = "054h0yrb2wffmirvqql2v34rfr5q0rx20p2y2wbrpx2w1vcwr2rc"; + rev = "b08814362624ded3b462addba4711647879ca308"; + sha256 = "0hk5xhn9zfas074hgv0y6lbc1jyj5kqjg4zdix8am3s97aqr96ms"; }; meta.homepage = "https://github.com/Shougo/unite.vim/"; }; @@ -4852,12 +4888,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-02-01"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "01d0a16456a5a3daeb88a66b12e160d4b8aec8e8"; - sha256 = "1xmsp2rf5av9vfn8ynzm5kgxz0cv2wnnjmsmp4m2p5yjdwjxn669"; + rev = "1d25223d6d54b266a3bbe95e33bad845845247e2"; + sha256 = "13ii654rp7sgpxqd4vyr61v2868g948cllcnrf8cmf7kwhmhik62"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5488,12 +5524,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-02-05"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "2a47359fe7eca7655747ad871530a66f7fdd22f8"; - sha256 = "1769lf2xgy11cmyg8n46xb7d4qn8c9b2ygiibj7skdyx9m88y4fw"; + rev = "93083ed4395aaa47e2484947017e7da1ff4fe2fd"; + sha256 = "0sb3pz85dy0z3ixv9hqv286dl8hq4ddc4fdgasswz8pq1a3jzrl5"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5608,12 +5644,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-01-26"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "ff9d134f0c69e25d391138036051b2c5e6bac864"; - sha256 = "1xpqhhvxf13nk4hd7jn0ydkkdk7r14w72h8hmpxzhhji1d0pcy43"; + rev = "d249be7f3c04fe1970f8a50d1c219f1112f18676"; + sha256 = "1y40zjnvvn4qkg5wdp906a71fnk5dnnk2p2dl3igd0bcxswvqqwf"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -6150,12 +6186,12 @@ let vim-LanguageTool = buildVimPluginFrom2Nix { pname = "vim-LanguageTool"; - version = "2021-01-24"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "dpelle"; repo = "vim-LanguageTool"; - rev = "f92e2577ab937f437c06d91639100952b540365b"; - sha256 = "09jw26mmbyvjlz5fw1gj9q0dwmv0aqwbl288h4hcliyx56snijhl"; + rev = "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a"; + sha256 = "00476l49lczj1rw5gb6vs7s9r0zi1khw0g1v6bsfwl5r32699l7r"; }; meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; @@ -6715,12 +6751,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-01-29"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "4980c987647523defbc20b3377993d34526f3911"; - sha256 = "089gp0abfqipz8rrh5jdcgrzg1a65cxchq1cadkxncmb8vcymh0r"; + rev = "fdbac11f36172d6e47e212385d2f4482e472f815"; + sha256 = "1mbs8v8k7698qnck5n38lqaz8sl07d1p31c84injb460l6jfv1s7"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -6847,12 +6883,12 @@ let vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2020-07-29"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "dad5a3626ab68039f2676c46e7a1635e0669cc63"; - sha256 = "1s1vxzqc5gvch2rfibn7ksmxj81gscfzg0bpvnq34jp430adzdc7"; + rev = "2135374d48a7cb89efd5e818c12bb0ff450dfbb4"; + sha256 = "17wgin33fj40brdb3zhm70qls2j2vssc4yrrv36y1qxwi7gdzn0f"; }; meta.homepage = "https://github.com/reedes/vim-pencil/"; }; @@ -6883,12 +6919,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-12-14"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "8b45742540f92ba902c97ad1d3d8862ba3305438"; - sha256 = "0ashl6qixnhgj5pnss9ri8w7fzixcsd0h4cmb2jpfrfma8s7xn3b"; + rev = "cffcfe150bda75177920530c5f1911b52f70a065"; + sha256 = "0sgfnxi1f5mnzcbklcmq6x17r1z1kz8s7h2h94girmd4aga3gcp0"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -7363,12 +7399,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2021-01-17"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "f83a157552a3bf393a7c034df1d21e3555123a4c"; - sha256 = "090rl4mfww5rmv04v25f58jfv3yx23bwi0pijkwxr442yhbg3rg2"; + rev = "10fd0aa57d176718bc2c570f121ab523c4429a25"; + sha256 = "18zn29mkgdiddn3il393xzg7hpa0x25yvais1l29jq2711sg4rdc"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -7411,12 +7447,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-01-30"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "adff0bf675e17d5b94ec7d10b5cd8a0dd74a61b0"; - sha256 = "0yvk6d147rvp8gwsbls39dp3qblmkk0wz5prrx3k5j3dlh5l7fcp"; + rev = "1b687b29ecf97125becae8f3fcce0c77c48951d6"; + sha256 = "154a06p1hkg42f1imsw5swbm78xx7v5x7v4yivpva9lg23bccqhh"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -8180,12 +8216,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-01-10"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "52eff3265181bbbe5338818dc5bc196e234cea45"; - sha256 = "1j4f3762zpw4qvqiyrq1ym4lk78w3r93ya70id7g6w4pviaqcv1j"; + rev = "7f77842ab89524d2d3b45a4fe7198fb51ac9e0a8"; + sha256 = "0njsncynnbyqwcj0lr13ycz7kl9yg0blmb1dizlvki5gwqlj881r"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8193,12 +8229,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-02-02"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7a25a6b7f8c51eabe5d4d47951c73fde7d2ece72"; - sha256 = "0vqpj2jg0nmjra0icm90p2dwf6jx87qjvch6hmvxj0m3g8kjs1cl"; + rev = "5ac1abada4f931f2440476ad5d99a6d7600baca0"; + sha256 = "1d9whpvs29mmjq5v3w2qgv370grak993lwka8k54anjxary9q4wz"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8241,12 +8277,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-02-05"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "d5b19ed3db6fd3e9598b399d8a9977ff926ad24e"; - sha256 = "0idd04aj76f3in8h5ljgxqkf9rpv29cbg58j8wbm874hfy72mm2i"; + rev = "4387164845165634a06941b17c2b4f398cffd193"; + sha256 = "0j7cwfkkvf0knni48p14lg0dg1y1xaw6dyz2f3dmn5kvw5fh80vc"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8374,12 +8410,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-12-31"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "2434b104065be4590f07ad950d0943b7194f01e6"; - sha256 = "0hhwqb5w84bi28h27wmisx4mb91xc6jbdh004d5994bl2098yrf8"; + rev = "dbf67638cb7084883c7463b0d6226be9d9159b9a"; + sha256 = "1qxwgjfhzz7ymkbbnjm3xrp368rmcphdaj4lxrkkbp9d2pn9g8s7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -8423,12 +8459,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-01-13"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "bc1a7584b435b9921e245c3621ab7524be370b2d"; - sha256 = "0fvgky7i6m5n4h4l73xdisxhpcc8cv9pq8jrvz571gmyjsh1rrrv"; + rev = "e3646fc3124e33da4909e30caaad1167523e0c53"; + sha256 = "0a200497js325343prx638rkzg6544lxrrr3ij5g0i6dvazzwg21"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index c7aff3c97ae1b..7f519f5101894 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -741,6 +741,15 @@ self: super: { meta.platforms = lib.platforms.all; }); + compe-tabnine = super.compe-tabnine.overrideAttrs (old: { + buildInputs = [ tabnine ]; + + postFixup = '' + mkdir $target/binaries + ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) + ''; + }); + completion-tabnine = super.completion-tabnine.overrideAttrs (old: { buildInputs = [ tabnine ]; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cded72abf2990..815d12d0861a6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -429,6 +429,7 @@ octol/vim-cpp-enhanced-highlight ojroques/vim-oscyank@main Olical/aniseed Olical/conjure +onsails/lspkind-nvim OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu @@ -481,6 +482,7 @@ rhysd/vim-grammarous rhysd/vim-operator-surround RishabhRD/nvim-lsputils RishabhRD/popfix +rmagatti/auto-session@main rodjek/vim-puppet romainl/vim-cool romainl/vim-qf @@ -618,6 +620,7 @@ Twinside/vim-hoogle tyru/caw.vim tyru/open-browser-github.vim tyru/open-browser.vim +tzachar/compe-tabnine@main uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/os-specific/linux/aseq2json/default.nix new file mode 100644 index 0000000000000..015419ee07a6c --- /dev/null +++ b/pkgs/os-specific/linux/aseq2json/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, alsaLib, glib, json-glib }: + +stdenv.mkDerivation { + pname = "aseq2json"; + version = "unstable-2018-04-28"; + src = fetchFromGitHub { + owner = "google"; + repo = "midi-dump-tools"; + rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a"; + sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA="; + }; + sourceRoot = "source/aseq2json"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib glib json-glib ]; + + installPhase = '' + install -D --target-directory "$out/bin" aseq2json + ''; + + meta = with lib; { + description = "Listens for MIDI events on the Alsa sequencer and outputs as JSON to stdout"; + homepage = "https://github.com/google/midi-dump-tools"; + license = licenses.asl20; + maintainers = [ maintainers.queezle ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix index b1c6f5a8f9566..f835b9a9ec9d9 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "compsize"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "kilobyte"; repo = pname; rev = "v${version}"; - sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126"; + sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8="; }; buildInputs = [ btrfs-progs ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "btrfs: Find compression type/ratio on a file or set of files"; homepage = "https://github.com/kilobyte/compsize"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ CrazedProgrammer ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 979f55cc35166..95998c694fb9e 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "firejail"; - version = "0.9.64.2"; + version = "0.9.64.4"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; rev = version; - sha256 = "1adizsb7pxr101bvvd359hxympnv36rnikp78npdr5dcvwddv3dv"; + sha256 = "sha256-q/XL8cznHlUXdubUEptEAVma1jRUqFb5XcLAV0RVCzs="; }; buildInputs = [ which ]; diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix index 2774c8d1f2897..99f6af4684565 100644 --- a/pkgs/servers/adminer/default.nix +++ b/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, php }: stdenv.mkDerivation rec { - version = "4.7.8"; + version = "4.7.9"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "0k794agvd8pa3mwl0076i7753fzxd41lhr23aih4l2lbdgnzi68z"; + sha256 = "sha256-V7cPdCcCjFlA3ykWe+F/fUO7+kZiOpqMgP0hHy6WDJE="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 558efe2fb019d..02d2f241bae59 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "2.3.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rwoEZnxh0x+xaggJuoeSjE1ctF43ChW5awcDJyoWioA="; + sha256 = "sha256-AojemBU3BUuMqokLH9mhYf+sH5Q+zSYeoGmuI5/6vPw="; }; - cargoSha256 = "sha256-ey/fUHkPoWjWlLjh1WNpwMKOkdQKgFYcLwQdx2RQ3CI="; + cargoSha256 = "sha256-TFSD+G0i5EAu7D7gOtRzwFxO214CBPdh2Y6rRt39FVo="; meta = with lib; { homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index de3f58fc06f34..72c6286af3f2f 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; + sha256 = "sha256-/4jA5acNpHpdQ9kb/1A9thtoUCqsYFxSCr4JLmFYdt4="; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 9b276afa4bc12..b4dfc4791b766 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.39.0"; + version = "0.40.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0ngqlb9d8xml0vnjsn6vpi02sjqldsiirlrzfncrh3hlcrhk4fcn"; + sha256 = "sha256-sBITCHyji55OnopNlDCNypSf/j8LKtarSGPYz5fQZys="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 8d3b8891104a6..145a1927f2c4f 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -11,15 +11,15 @@ , zlib }: stdenv.mkDerivation rec { name = "roon-server"; - version = "100700710"; + version = "100800753"; # N.B. The URL is unstable. I've asked for them to provide a stable URL but # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "https://web.archive.org/web/20210202130624/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; - sha256 = "sha256-S1c3RvN/HE8zwpGZARYRy/Gu4OTG0CjWbxJhZ3cKoVE="; + url = "https://web.archive.org/web/20210209195555/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; + sha256 = "sha256-uas1vqIDWlYr7jgsrlBeJSPjMxwzVnrkCD9jJljkFZs="; }; buildInputs = [ diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 614393af8ff4a..3d2ce1622dcf8 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.1"; # N.B: if you change this, change botocore to a matching version too + version = "1.19.4"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-8T0zFxR7hLdt2ZZvkshckIO2XNGZIbQuwfeGxqQs7rs="; + sha256 = "sha256-fXQ6In3BBMvy1Jz6+OO8CXYVefIVrsVAUQHbNEroSII="; }; postPatch = '' diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 2545a051080b5..3d91847a9a69e 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TE6+X2UEvHyUiPB61JA9JHCJTDOvHhyt5A44cgd2Meo="; + sha256 = "sha256-fR4MFEytYZA4zt4WFGnEp9YDCtX6peQoI+NynqyReT8="; }; vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU="; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 3d9772de404d6..f35c7a44b586e 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "JmBTwI/wUEytkhu0SYbTX6/dDQG6xvN2odEYTVpztok="; + sha256 = "sha256-Lr2c24hZU8A/Cd8xGA7rfqga67ghz0XJ/cs/z/hSlPU="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index e092961a7621c..1e2efc7f9cd36 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "sha256-+HxezUWQHyL9r4QZkJyWzWnjquq/ux5W5j2B5prH8Fg="; + sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 6611b3e9210a2..febaa4415a25c 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.155.0"; + version = "0.155.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wVHBcxbrU6WvBAegQYDRDvLbuoU49/Cm19ujghNyi2A="; + sha256 = "sha256-eVRsDyPlUvVhEnN8aJW8vPw4UqvK2/6pblgnwH2RhkY="; }; - vendorSha256 = "sha256-k4TphR8z3DtoqJm6o6QILvQ1rHIldi1BpQJbEyWKv9U="; + vendorSha256 = "sha256-VFFwp+n13NL3YpzdWPVzgrH8d4BQHffwpRXvYn9MSaQ="; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/misc/iotools/default.nix b/pkgs/tools/misc/iotools/default.nix new file mode 100644 index 0000000000000..f123d54a02388 --- /dev/null +++ b/pkgs/tools/misc/iotools/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "iotools"; + version = "unstable-2017-12-11"; + + src = fetchFromGitHub { + owner = "adurbin"; + repo = pname; + rev = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"; + sha256 = "0vymnah44d5bzsjhfmxkcrlrikkp0db22k7a1s8bknz7glk9fldn"; + }; + + makeFlags = [ "DEBUG=0" "STATIC=0" ]; + + installPhase = '' + install -Dm755 iotools -t $out/bin + ''; + + meta = with lib; { + description = "Set of simple command line tools which allow access to + hardware device registers"; + longDescription = '' + Provides a set of simple command line tools which allow access to + hardware device registers. Supported register interfaces include PCI, + IO, memory mapped IO, SMBus, CPUID, and MSR. Also included are some + utilities which allow for simple arithmetic, logical, and other + operations. + ''; + homepage = "https://github.com/adurbin/iotools"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ felixsinger ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/jstest-gtk/default.nix b/pkgs/tools/misc/jstest-gtk/default.nix new file mode 100644 index 0000000000000..6824753c73ce5 --- /dev/null +++ b/pkgs/tools/misc/jstest-gtk/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, gtkmm3, libsigcxx, xorg }: + +stdenv.mkDerivation rec { + pname = "jstest-gtk"; + version = "2018-07-10"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "62f6e2d7d44620e503149510c428df9e004c9f3b"; + sha256 = "0icbbhrj5aqljhiavdy3hic60vp0zzfzyg0d6vpjaqkbzd5pv9d8"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtkmm3 libsigcxx xorg.libX11 ]; + + meta = with lib; { + description = "A simple joystick tester based on Gtk+"; + longDescription = '' + It provides you with a list of attached joysticks, a way to display which + buttons and axis are pressed, a way to remap axis and buttons and a way + to calibrate your joystick. + ''; + homepage = "https://jstest-gtk.gitlab.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 419846a9d3741..64ae387e1a6d2 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "0q0qs07kmkpjv68j2bjgsrv6shl76mssnchfv82vjf8abkf8343b"; + sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo="; }; dontBuild = true; diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index 21fa038707c6d..d8380340caea5 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -55,10 +55,10 @@ let inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "connman"; - version = "1.38"; + version = "1.39"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"; + sha256 = "sha256-n2KnFpt0kcZwof8uM1sNlmMI+y9i4oXHgRBeuQ8YGvM="; }; buildInputs = [ diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index d43c121bbf564..68a6660db9f30 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.33.9"; + version = "0.34.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1q3w2wv4lTIYPTO3weuZ0C2KeXcFWVV5KRJw2YRNWSE="; + sha256 = "sha256-XwXGhFyPsJWHWea3Cj3X6mOV/oseaRAMaEHoppX+WRw="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 7c3495e608eea..709d16672098d 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.11-3"; + version = "0.9.12-3"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-vkW0LphgJsIVsdI7CjA2hOvxnjO77GA5eEKElIR4PkU="; + hash = "sha256-IK4BuZKM2U8vz7m8waJhoh3tQ539wGLcIDNiYGUou24="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index e0499681848bb..f0eda76821dbb 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,18 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.4.0"; - - goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "1ghl2vms9wmvczdl2raqhy0gffxmk24h158gjb5mlw7rggzvb7bg"; + sha256 = "1xfc3a0dik4930va30sbl6687v6i5irv96fwis9lrqh5rjqnblqp"; }; + vendorSha256 = null; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ]; + + subPackages = [ "cmd/aws-iam-authenticator" ]; + meta = with lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; description = "AWS IAM credentials for Kubernetes authentication"; diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index bef7fc8d6be4e..57f52d91bb060 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.17.1"; + version = "2.18.1b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1kd21higniszk1na5ag7q4g0l7h6ddl91gpbjbwym28hsbjvxla7"; + sha256 = "sha256-MwHTx4ITr2GuBS6qXD4m3aCinpJHQa0Wp0Bbmgg7ATQ="; }; buildCommand = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Integrates the web vault into bitwarden_rs"; homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; - license = licenses.gpl3; - maintainers = with maintainers; [ msteen ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ msteen mic92 ]; }; } diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index f8c5b4a9f12f2..24115ba923f4e 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9"; + sha256 = "sha256-WOdbdJAcMZHSnf7AkGnEumjaDut9J8VwSJYjqLUtPXs="; }; buildInputs = [ cryptsetup ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang}/lib" ''; - cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k"; + cargoSha256 = "sha256-4VuM1bPkl9XCI9XsZIJvw3kHSKgT4P7x6I83F2KCFD0="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 7f24be893bf19..b941c5f7275bc 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.3.00-1"; + version = "3.3.01-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "sha256-P1AYo4Ao9lDxJXyZd64wBxNgQIvEcT00ThjtcB2v52I="; + sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs="; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index c91d2f2081641..dbfb85fc5831d 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "5.0"; + version = "5.2"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-PN7YSpTl7RoW5zgoYjXHDFB6sTroSA3TNpTCsOsdB34="; + sha256 = "sha256-bjDQwtIsY+Dvv270DACvyU+MNPyI7EZcob6F/aebVac="; }; - vendorSha256 = "sha256-1YQD+QwCOAPOsj946DNF92LYKfRgXZXcfhIADP8s2CY="; + vendorSha256 = "sha256-l6zHsis2fais5HQJQdfsSC0sPdcF4BeWoUznpl3Fh1g="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 4da6bf7745128..805373e8ee6c6 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,23 +2,25 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.8.0"; + version = "0.8.1"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "17w0hldlg7x0f4946bz1pmgkpp08dha3myz8pk0rx8n2lqlw76f3n9giq69kw82sgzg7qqy31sl9mxvgaxyf6hcdgmxnkr7h8d9xmak"; + sha512 = "28kwj053lm3510cq7pg4rqx6linv5zphhm2h6r9icigclfq7j9ybnd7vqbn2v4ay0r8ghac5cjbqab5zy8cjlgllwhwsxg0dnk75x2i"; }; nativeBuildInputs = [ which ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; configurePhase = '' + runHook preConfigure ./configure PREFIX=''${!outputDev} \ BINDIR=''${!outputBin}/bin \ LIBDIR=''${!outputLib}/lib \ MANDIR=''${!outputMan}/share/man + runHook postConfigure ''; # Fix lib extension so that fixDarwinDylibNames detects it diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6452b0e49a168..796563a432bce 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -150,6 +150,7 @@ mapAliases ({ dydisnix = throw "dydisnix has been removed."; # added 2021-01-27 dysnomia = throw "dysnomia has been removed."; # added 2021-01-27 dwarf_fortress = dwarf-fortress; # added 2016-01-23 + dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc17ba17f54d5..b9dfb884c0e8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2460,6 +2460,8 @@ in interlock = callPackage ../servers/interlock {}; + iotools = callPackage ../tools/misc/iotools { }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; @@ -4352,6 +4354,8 @@ in gtk = gtk3; }; + free42 = callPackage ../applications/misc/free42 { }; + galen = callPackage ../development/tools/galen {}; gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; @@ -6507,16 +6511,13 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = nomad_0_12; + nomad = nomad_1_0; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. - nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { - buildGoPackage = buildGo114Package; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; + # Upstream partially documents used Go versions here + # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; inherit (linuxPackages) nvidia_x11; @@ -11746,6 +11747,16 @@ in bazel_self = bazel_3; }; + bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk11_headless; + buildJdkName = "java11"; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + bazel_self = bazel_4; + }; + bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; buildozer = bazel-buildtools; @@ -12120,6 +12131,8 @@ in editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; + edb = libsForQt5.callPackage ../development/tools/misc/edb { }; + eggdbus = callPackage ../development/tools/misc/eggdbus { }; effitask = callPackage ../applications/misc/effitask { }; @@ -14532,6 +14545,8 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; + libaudec = callPackage ../development/libraries/libaudec { }; + libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; @@ -18650,6 +18665,8 @@ in libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches; + aseq2json = callPackage ../os-specific/linux/aseq2json {}; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; @@ -21432,7 +21449,7 @@ in cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { - inherit (darwin.apple_sdk.frameworks) CoreAudio; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; ffmpeg = ffmpeg_2; }; @@ -21670,14 +21687,9 @@ in inherit (gnome2) libgnomeui; }; - dwm = callPackage ../applications/window-managers/dwm { - patches = config.dwm.patches or []; - }; + dwl = callPackage ../applications/window-managers/dwl { }; - dwm-git = callPackage ../applications/window-managers/dwm/git.nix { - patches = config.dwm.patches or []; - conf = config.dwm.conf or null; - }; + dwm = callPackage ../applications/window-managers/dwm { }; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; @@ -23905,6 +23917,8 @@ in rep-gtk = callPackage ../development/libraries/rep-gtk { }; + reproc = callPackage ../development/libraries/reproc { }; + sawfish = callPackage ../applications/window-managers/sawfish { }; sc68 = callPackage ../applications/audio/sc68 { }; @@ -28719,6 +28733,8 @@ in libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix + jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; + keynav = callPackage ../tools/X11/keynav { }; kmon = callPackage ../tools/system/kmon { }; @@ -29673,7 +29689,9 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - sccache = callPackage ../development/tools/misc/sccache { }; + sccache = callPackage ../development/tools/misc/sccache { + inherit (darwin.apple_sdk.frameworks) Security; + }; sequeler = callPackage ../applications/misc/sequeler { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 932c2a867f028..f2d39811a7a06 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -134,6 +134,8 @@ lib.makeScope pkgs.newScope (self: with self; { redis = callPackage ../development/php-packages/redis { }; + smbclient = callPackage ../development/php-packages/smbclient { }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; v8 = buildPecl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5129ce5c1bf90..e019628d1e2b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1283,6 +1283,8 @@ in { class-registry = callPackage ../development/python-modules/class-registry { }; + claripy = callPackage ../development/python-modules/claripy { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -5083,6 +5085,8 @@ in { prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; + promise = callPackage ../development/python-modules/promise { }; prompt_toolkit = let @@ -5953,6 +5957,8 @@ in { pysmi = callPackage ../development/python-modules/pysmi { }; + pysmt = callPackage ../development/python-modules/pysmt { }; + pysnmp = callPackage ../development/python-modules/pysnmp { }; pysnooper = callPackage ../development/python-modules/pysnooper { }; |