Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-08-06 12:01:51 +00:00 committed by GitHub
commit 151a3b4752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 1119 additions and 833 deletions

View File

@ -21,9 +21,9 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
- [ ] macOS
- [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [21.11 Release Notes (or backporting 21.05 Relase notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)
- [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module

View File

@ -27,7 +27,6 @@ in
version = "1.58.2";
pname = "vscode";
sourceExecutableName = "code";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
shortName = "Code" + lib.optionalString isInsiders " - Insiders";

View File

@ -1,9 +1,9 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
let
humioCtlVersion = "0.28.5";
sha256 = "sha256-h6zQG9jjHpAxaJUaFoVmRyR1A/bk57CKBIkOGPcdJP0=";
vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo=";
humioCtlVersion = "0.28.6";
sha256 = "sha256-15RRoTr+N+DsILYF1KndAwsW329w+UxHfB1VaWnkEFI=";
vendorSha256 = "sha256-fgRQ2n5tzj5s4rT65VIqh61wDwu+x/fWhpaKwyr8XWA=";
in buildGoModule {
name = "humioctl-${humioCtlVersion}";
pname = "humioctl";

View File

@ -1,4 +1,6 @@
{ lib, buildFHSUserEnv, lutris-unwrapped
, extraPkgs ? pkgs: [ ]
, extraLibraries ? pkgs: [ ]
, steamSupport ? true
}:
@ -87,7 +89,8 @@ in buildFHSUserEnv {
soundfont-fluid bzip2 game-music-emu
] ++ qt5Deps pkgs
++ gnomeDeps pkgs
++ lib.optional steamSupport pkgs.steam;
++ lib.optional steamSupport pkgs.steam
++ extraPkgs pkgs;
multiPkgs = pkgs: with pkgs; [
# Common
@ -110,7 +113,8 @@ in buildFHSUserEnv {
# Winetricks
fribidi
] ++ xorgDeps pkgs;
] ++ xorgDeps pkgs
++ extraLibraries pkgs;
extraInstallCommands = ''
mkdir -p $out/share

View File

@ -21,7 +21,7 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://www.github.com/hashicorp/nomad-driver-podman";
description = "Podman task driver for Nomad";
platforms = platforms.unix;
platforms = platforms.linux;
license = licenses.mpl20;
maintainers = with maintainers; [ cpcloud ];
};

View File

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, extra-cmake-modules
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
, qtbase, qtimageformats, gtk3, kwayland, libdbusmenu, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, rnnoise
@ -12,8 +12,6 @@
, xdg-utils, libsysprof-capture, libpsl, brotli
}:
with lib;
# Main reference:
# - This package was originally based on the Arch package but all patches are now upstreamed:
# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop
@ -59,7 +57,7 @@ in mkDerivation rec {
];
buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash
qtbase qtimageformats gtk3 kwayland libdbusmenu lz4 xxHash
ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk jemalloc
rnnoise
@ -85,7 +83,7 @@ in mkDerivation rec {
wrapProgram $out/bin/telegram-desktop \
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \
--prefix PATH : ${xdg-utils}/bin \
--prefix PATH : ${lib.makeBinPath [ xdg-utils]} \
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
sed -i $out/bin/telegram-desktop \
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
@ -96,7 +94,7 @@ in mkDerivation rec {
updateScript = ./update.py;
};
meta = {
meta = with lib; {
description = "Telegram Desktop messaging app";
longDescription = ''
Desktop client for the Telegram messenger, based on the Telegram API and

View File

@ -1,25 +1,22 @@
{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }:
#
# TODO: Declare configuration options for the following optional dependencies:
# - File stores: hg, git, bzr
# - Included plugins depenencies: dot, ditaa, dia, any other?
# - pyxdg: Need to make it work first (see setupPyInstallFlags).
#
python3Packages.buildPythonApplication rec {
name = "zim-${version}";
pname = "zim";
version = "0.73.5";
src = fetchurl {
url = "https://zim-wiki.org/downloads/${name}.tar.gz";
url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
sha256 = "sha256-o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo=";
};
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ];
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
preFixup = ''
export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
'';
@ -28,13 +25,12 @@ python3Packages.buildPythonApplication rec {
doCheck = false;
checkPhase = ''
python test.py
${python3Packages.python.interpreter} test.py
'';
meta = with lib; {
description = "A desktop wiki";
homepage = "http://zim-wiki.org";
homepage = "https://zim-wiki.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ pSub ];
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790

View File

@ -1,13 +0,0 @@
diff -Naur bochs-2.6.10.orig/iodev/network/slirp/slirp.h bochs-2.6.10.mod/iodev/network/slirp/slirp.h
--- bochs-2.6.10.orig/iodev/network/slirp/slirp.h 2019-11-02 16:30:39.843938000 -0300
+++ bochs-2.6.10.mod/iodev/network/slirp/slirp.h 2019-12-29 12:55:49.541630697 -0300
@@ -44,8 +44,8 @@
#endif
#include <sys/types.h>
-#if defined(__OpenBSD__) || defined(__linux__)
#include <stdint.h>
+#if defined(__OpenBSD__) || defined(__linux__)
#include <sys/wait.h>
#endif
#ifdef HAVE_SYS_BITYPES_H

View File

@ -1,29 +0,0 @@
------------------------------------------------------------------------
r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines
Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion).
Index: iodev/display/voodoo_data.h
===================================================================
--- a/iodev/display/voodoo_data.h (revision 13881)
+++ b/iodev/display/voodoo_data.h (revision 13882)
@@ -1837,11 +1837,11 @@
/* fifo content defines */
#define FIFO_TYPES (7 << 29)
-#define FIFO_WR_REG (1 << 29)
-#define FIFO_WR_TEX (2 << 29)
-#define FIFO_WR_FBI_32 (3 << 29)
-#define FIFO_WR_FBI_16L (4 << 29)
-#define FIFO_WR_FBI_16H (5 << 29)
+#define FIFO_WR_REG (1U << 29)
+#define FIFO_WR_TEX (2U << 29)
+#define FIFO_WR_FBI_32 (3U << 29)
+#define FIFO_WR_FBI_16L (4U << 29)
+#define FIFO_WR_FBI_16H (5U << 29)
BX_CPP_INLINE void fifo_reset(fifo_state *f)
{
------------------------------------------------------------------------

View File

@ -20,22 +20,13 @@
stdenv.mkDerivation rec {
pname = "bochs";
version = "2.6.11";
version = "2.7";
src = fetchurl {
url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3";
url = "mirror://sourceforge/project/bochs/bochs/${version}/bochs-${version}.tar.gz";
hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo=";
};
patches = [
# A flip between two lines of code, in order to compile with GLIBC 2.26
./bochs-2.6.11-glibc-2.26.patch
# Fix compilation for MSYS2 GCC 10; remove it when the next version arrives
./bochs_fix_narrowing_conv_warning.patch
# SMP-enabled configs; remove it when the next version arrives
./fix-build-smp.patch
];
nativeBuildInputs = [
docbook_xml_dtd_45
docbook_xsl
@ -62,7 +53,6 @@ stdenv.mkDerivation rec {
"--with-rfb=no"
"--with-vncsrv=no"
"--with-svga=no" # it doesn't compile on NixOS
# These will always be "yes" on NixOS
"--enable-ltdl-install=yes"
@ -92,7 +82,6 @@ stdenv.mkDerivation rec {
"--enable-cpu-level=6" # from 3 to 6
"--enable-debugger" #conflicts with gdb-stub option
"--enable-debugger-gui"
"--enable-disasm"
"--enable-e1000"
"--enable-es1370"
"--enable-evex"
@ -105,7 +94,7 @@ stdenv.mkDerivation rec {
"--enable-largefile"
"--enable-ne2000"
"--enable-pci"
"--enable-plugins=no" # Plugins are a bit buggy in Bochs
"--enable-plugins=yes"
"--enable-pnic"
"--enable-repeat-speedups"
"--enable-sb16"
@ -126,11 +115,6 @@ stdenv.mkDerivation rec {
++ lib.optionals (ncurses != null) [ "--with-term" ]
++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ];
NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/";
NIX_LDFLAGS="-L${libtool.lib}/lib";
hardeningDisable = [ "format" ];
enableParallelBuilding = true;
meta = with lib; {
@ -146,5 +130,5 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
};
}
# TODO: plugins
# TODO: a better way to organize the options
# TODO: docbook (install docbook-tools from RedHat mirrors can help)

View File

@ -1,21 +0,0 @@
Description: A fix for SMP-enable configurations
Inspired in: https://sourceforge.net/p/bochs/code/13778/
============
diff -Naur bochs-2.6.11-old/bx_debug/dbg_main.cc bochs-2.6.11-new/bx_debug/dbg_main.cc
--- bochs-2.6.11-old/bx_debug/dbg_main.cc 2019-12-20 04:57:59.818924000 -0300
+++ bochs-2.6.11-new/bx_debug/dbg_main.cc 2020-03-30 23:20:29.402195707 -0300
@@ -1494,11 +1494,11 @@
{
char cpu_param_name[16];
- Bit32u index = BX_ITLB_INDEX_OF(laddr);
+ Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr);
sprintf(cpu_param_name, "ITLB.entry%d", index);
bx_dbg_show_param_command(cpu_param_name, 0);
- index = BX_DTLB_INDEX_OF(laddr, 0);
+ index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr);
sprintf(cpu_param_name, "DTLB.entry%d", index);
bx_dbg_show_param_command(cpu_param_name, 0);
}

View File

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
, wrapGAppsHook, libgee }:
, wrapGAppsHook, libgee, vala_0_40 }:
let
pname = "caribou";
@ -21,9 +21,19 @@ in stdenv.mkDerivation rec {
url = "https://bugzilla.gnome.org/attachment.cgi?id=364774";
sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd";
})
(fetchurl {
name = "fix-build-modern-vala.patch";
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch";
sha256 = "0qy27zk7889hg51nx40afgppcx9iaihxbg3aqz9w35d6fmhr2k2y";
})
(fetchurl {
name = "CVE-2021-3567.patch";
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/d41c8e44b12222a290eaca16703406b113a630c6.patch";
sha256 = "1vd2j3823k2p3msv7fq2437p3jvxzbd7hyh07i80g9754ylh92y8";
})
];
nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ];
nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala_0_40 ];
buildInputs = [
glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3

View File

@ -266,6 +266,7 @@
, "unified-language-server"
, "vega-cli"
, "vega-lite"
, "vercel"
, "vim-language-server"
, "vls"
, "vscode-css-languageserver-bin"

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, fetchFromGitHub
, substituteAll
, git
, gitdb
@ -11,13 +10,15 @@
}:
buildPythonPackage rec {
pname = "GitPython";
version = "3.1.19";
disabled = isPy27;
pname = "gitpython";
version = "3.1.20";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0lqf5plm02aw9zl73kffk7aa4mp4girm3f2yfk27nmmmjsdh7x0q";
src = fetchFromGitHub {
owner = "gitpython-developers";
repo = "GitPython";
rev = version;
sha256 = "1ygrxn8br2ff87j02ibijxzxa0ax9lgjdviwddslqxiarfggik9h";
};
patches = [

View File

@ -0,0 +1,37 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "adax";
version = "0.1.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyadax";
rev = version;
sha256 = "06qk8xbv8lsaabdpi6pclnbkp3vmb4k18spahldazqj8235ii237";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "adax" ];
meta = with lib; {
description = "Python module to communicate with Adax";
homepage = "https://github.com/Danielhiversen/pyAdax";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "mdformat";
version = "0.7.7";
version = "0.7.8";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "executablebooks";
repo = pname;
rev = version;
sha256 = "sha256-1qwluHxZnSuyNJENzeJzkuhIQN5njTOch2Wz45J0qRI=";
sha256 = "0zvgz2c517ig31hcrf05gv4h68zpqk56asnmwx072ld8gk2ff8ag";
};
nativeBuildInputs = [

View File

@ -0,0 +1,37 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "open-garage";
version = "0.1.5";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyOpenGarage";
rev = version;
sha256 = "1iqcqkbb1ik5lmsvwgy6i780x6y3wlm1gx257anxyvp1b21gm24p";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "opengarage" ];
meta = with lib; {
description = "Python module to communicate with opengarage.io";
homepage = "https://github.com/Danielhiversen/pyOpenGarage";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,39 @@
{ lib
, aiohttp
, backoff
, buildPythonPackage
, click
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyprosegur";
version = "0.0.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dgomes";
repo = pname;
rev = version;
sha256 = "0bpzxm8s548fw6j36brp7bcx9481x2hrypcw3yyg4ihsjhka5qln";
};
propagatedBuildInputs = [
aiohttp
backoff
click
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pyprosegur" ];
meta = with lib; {
description = "Python module to communicate with Prosegur Residential Alarms";
homepage = "https://github.com/dgomes/pyprosegur";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.17";
version = "0.12.18";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-wZOBjNOgGmwIQNCrhzwGPmI/fW/yZiDqq8l4oSDTvZs=";
sha256 = "sha256-sq5gdsrcakghd71+nXrtI980mlA6+GZW36tJkJkaJ2U=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

View File

@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-08-04";
version = "2021-08-06";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "9eb39348e928e6a89938784e67ba4168c5a295c0";
sha256 = "18j5zpkkir9yxcvmyggglh76fzny1i9z6pkj2bdszvz8rxw8z88y";
rev = "10f984673c51d2affbf8dc69d79a6280d7b69060";
sha256 = "1gj2hg9qpkxnqks395a4rvgy40a7qg4q260xa8a8zymdf476h57f";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -281,12 +281,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
version = "2021-08-03";
version = "2021-08-06";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
rev = "f677f1d93be06c41eaabc87d845cdd5bd46a259f";
sha256 = "1crd8gyzqgycbcb9aipn31kphz3j1y1rlzqivfvgk2zqf550dqis";
rev = "fbe62f62bbe16c871073868fe29d7ffdd3d1251e";
sha256 = "14hzbpgkalia7j42zr0gnddbh2rnxv149xvlzl39wkzjk7gxjz0y";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@ -425,12 +425,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-08-05";
version = "2021-08-06";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "681950778d7b4e18cb28d5cc7ba54bc480aad232";
sha256 = "11g7a86sprfdch68xwabkfr5gv9jpmji587cw1h5cabbzxslrvcg";
rev = "7db60eee751787035a3f152040fdf6b48104453e";
sha256 = "08hqx031gd8sd7lvzx4n429311p3nihhp1k1knsq3yn8yfrj915m";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -1667,12 +1667,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2021-08-04";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "97942a726bf7e4851d8d1812e910e8f9d489f909";
sha256 = "1mqgy6jps6g69x1jj3x60hcr3szpfnwvvyjyafqbd3wpc313pnwq";
rev = "bf2ebdfba23a10a7b9dea62b23dfaa7a1bc0852d";
sha256 = "100iif4is145fgr3hzqk4k9d3jhdl3lh6nbl4n7xrahkh9fxw6s8";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -1871,12 +1871,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-08-03";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "f8786ea3bfe69fccadec6ef7fa64d4188f788729";
sha256 = "028l9x94yi5ffjp44vsjyyalxnax0691aiiy22c143pcd5wv5w3q";
rev = "8d284060170bcc96987b3c431a7c8fa3aef9e1cc";
sha256 = "1x2pwb8d8azfmpfpyhx9anfh6ji2viwi98zfgqp12q7bq9rvf9h3";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2231,12 +2231,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim";
version = "2021-08-04";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "f452ba25ecae318c591b4e6983aa5bd9ac6fd8e6";
sha256 = "13aqr4gigpjjz0g25y8q48hb0sfa6xxgp0lr8hk1ykv8w0nwlgra";
rev = "134a1ace3274e14cf3f2c9b845f6a62c58d2f2de";
sha256 = "1n3cbfvm4jdiwhv2hc6379xqjpjpdfzvz9zs2zpb1pj9qjdznqcc";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@ -2592,12 +2592,12 @@ final: prev:
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
version = "2021-06-09";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
rev = "ce6b2e1e09654af34a80af774879eac4708cc11e";
sha256 = "0cv5845d1gg9mv5pcp8c9afydvgihgfyk7ibjr3fgkqacwcfzjmy";
rev = "2d2e57009a613c3c6cb7a2112d822ef91024cc38";
sha256 = "066x2hkav2k83rjdnv3hmmm7fx4rrp4ab8704sc7p57q965kpwgc";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@ -2712,12 +2712,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-08-04";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "444f5e0a27ca58040c33715be8c3b6051db17230";
sha256 = "0rijkdsnxdkyrrpib0qlszjkkx33cm3nb9spcmjrcqi6674kyq88";
rev = "04126aa17cbe863a4fe8ca43653cd9ef70f29c18";
sha256 = "0w2jxbbmgdlh9hakzjy2i229qlcj7krh1xb7b1ds7y27prb1h144";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@ -3144,12 +3144,12 @@ final: prev:
neco-vim = buildVimPluginFrom2Nix {
pname = "neco-vim";
version = "2021-08-03";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neco-vim";
rev = "fb97a98717450fca16e5d2f8db667f7df227ba3c";
sha256 = "1d0l7d2mlm0dq6m13mr8958qc257bhhgl0y4xilpdkfgx35vir34";
rev = "ec50b3cbb4537625c2aaba7601232a53ccd779aa";
sha256 = "0k5l9phs211xw6c3q9q52x6m6gfhk4b2fxhyr3m19mghbzmichha";
};
meta.homepage = "https://github.com/Shougo/neco-vim/";
};
@ -3180,12 +3180,12 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2021-07-23";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "b676afbf57bd3fb256a7a45605cac06407eff5a1";
sha256 = "1ln4sqj00xw2dnn3gwshxdzaq5gaknbs59cksrr7i7mj902lqr8v";
rev = "1ff0099c62dad62f1126dba15b61b35d54aa607f";
sha256 = "18xczksv70v18xh6f40d5bad2f890vm8gyg5xqh7sh2vh9jdg0jz";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
@ -3708,12 +3708,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2021-08-04";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "9465c24cb8f4293569f6a4e937a3a38a4416a072";
sha256 = "0l484w17bb0kdk1k7dhxj5322a8xsh374ma6yci92jh7sv3dp60f";
rev = "929cb313e90589576348c3a2e9a18bac8a56999c";
sha256 = "0j48zy517px40w119xad97zja0p7fspapnd1n70w3lq9ank0l7a1";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -3768,12 +3768,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-08-01";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "4bcc485e2e6ccb4ed7bdd9f1e12c9c4ad6fe1f0e";
sha256 = "18csqavwmdz7yn6j1wp9ypmpdkw6147xvn4gmd50wkphfh74bc67";
rev = "662159eeb112c076d90b2c3fe799f16a8165e4a6";
sha256 = "0jazw69444zcvvzj7j8k2zjqwyymgcsvz42pxq10ll58apmjrzri";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3804,12 +3804,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
version = "2021-08-04";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
rev = "bc18fb4552f051639eade5318f1d538ffe0302f5";
sha256 = "1l5fi8c59zqyjgkikbrxas4klfa11j17bl72qxg3kj8isnfalspj";
rev = "14029645caaecaa4392a6f89bf087a4aec5672cd";
sha256 = "0pviz0dh519yaddrb3lrsa8pg1q4dp4h2a2chzh2nnwhr7973qjr";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@ -3982,6 +3982,18 @@ final: prev:
meta.homepage = "https://github.com/roxma/nvim-yarp/";
};
nvim_context_vt = buildVimPluginFrom2Nix {
pname = "nvim_context_vt";
version = "2021-08-03";
src = fetchFromGitHub {
owner = "haringsrob";
repo = "nvim_context_vt";
rev = "7e93fc59c2af9e36d64a230ec77c1ef1ebe47c57";
sha256 = "0mgafpcx5mz9hw7pv3a4v74kdikcrf9mv10mqnp5pg71m0f6sjmn";
};
meta.homepage = "https://github.com/haringsrob/nvim_context_vt/";
};
nvimdev-nvim = buildVimPluginFrom2Nix {
pname = "nvimdev-nvim";
version = "2019-10-09";
@ -4092,12 +4104,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-08-01";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "2794f0767920c884736b746d1c0824cc55874f4b";
sha256 = "19cwjm98nq0f9z0kxc8l4350pkaw3m2dv5wb7nlwcz0m9w3dri0w";
rev = "a6901b9d15dc17be94a2caf6b2fb8d1323278a74";
sha256 = "0lyq8pi0c9665gjhg3wzx8889xq649fjld1cbv5bm2znmq000c8j";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -4887,12 +4899,12 @@ final: prev:
sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim";
version = "2021-07-19";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "tami5";
repo = "sql.nvim";
rev = "9983108bc9941af842d3b847b60564d180fc8e4b";
sha256 = "1f1f1v107w61b86pdrs9qvchyg286nif31c5cp3yx6rq22fynbgd";
rev = "527a306000c02f81075045d461349efcfa26c022";
sha256 = "1v99ibx1ypijpm1icy0lsyfvf41rz0zhv18rvhrinyphr0jl546j";
};
meta.homepage = "https://github.com/tami5/sql.nvim/";
};
@ -4983,12 +4995,12 @@ final: prev:
swift-vim = buildVimPluginFrom2Nix {
pname = "swift-vim";
version = "2021-05-30";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "keith";
repo = "swift.vim";
rev = "7ef452b47f14a2bfed26324793777cf12d2a8d78";
sha256 = "0s12iv8vmqp8yr8fg7a6yf73kgq84i9zy18fhgb0jcc6cwwwz3iq";
rev = "e83ca052e88805b8b20bc2558e7995461665e306";
sha256 = "1in7dz0h9a4phw57a3fk7h2lmn3hrcn17vaqjimpp7hwlc160467";
};
meta.homepage = "https://github.com/keith/swift.vim/";
};
@ -5152,12 +5164,12 @@ final: prev:
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim";
version = "2021-08-04";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
rev = "31e8158d54ce945dc416b1f53df827aa3c096c55";
sha256 = "1q2bf21gymjjx603159x59sg1ahwgsqais6q5laz4cpcwmxmwq7f";
rev = "459041fb42d81c65444b147d25b1e28b0c8ac8f9";
sha256 = "0n4bv22azqgvqk00dcnxzafpx1mkdfm6ds3w6pyn0mflkfninfb7";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@ -5321,12 +5333,12 @@ final: prev:
todo-comments-nvim = buildVimPluginFrom2Nix {
pname = "todo-comments-nvim";
version = "2021-07-11";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
rev = "4a27e05519827ba1594d5ce3fde874040f005bfe";
sha256 = "0g6dxyd7vh89rg4xfdl20djfdcv1scq44mvxd3imzb7yhrhdpa95";
rev = "808a2e524b3720804716a99fd900986b9d727d4d";
sha256 = "1j1ls4d6c3shbm9pd0b6lwmccxsvlr8j12c3fhn9q6dizkir08qx";
};
meta.homepage = "https://github.com/folke/todo-comments.nvim/";
};
@ -5346,12 +5358,12 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight-nvim";
version = "2021-07-21";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
rev = "0ee0bcf14d8c7c70081a0e9967c211121c4300c7";
sha256 = "0rkw544dzgyp76ag3zrh8d3n0mri5c0cjpy8mvbfpgyj87w18m8d";
rev = "a5b3cbe750ed6a05a018ac81782bb01de512a6c9";
sha256 = "1zggbj1xkqigc9rk6mm6jdwk67kcq1avrrq3hxy7jkfc11ynbl91";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@ -5394,12 +5406,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble-nvim";
version = "2021-07-22";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
rev = "169b2ec3a4d0cac01f22cc8f7332f1d0a11f1fa4";
sha256 = "08r1ivzw6v5bfyhd7cy6kysryd123f68aa3kpamzy168ixvihbii";
rev = "51dd9175eb506b026189c70f81823dfa77defe86";
sha256 = "0cd3xiiwsqivy8vx408wdz622i7kcvxw6whmkm1dcw6lnsp4bcg1";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@ -5430,12 +5442,12 @@ final: prev:
twilight-nvim = buildVimPluginFrom2Nix {
pname = "twilight-nvim";
version = "2021-07-17";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "folke";
repo = "twilight.nvim";
rev = "f722fa24411d0423a3d2daf6f1b5f8b11df9db2b";
sha256 = "0k2vbhs960h346w37ky2mpv1syzjxi19zl9zmnvlsy6annqd892x";
rev = "0ac66e85f2d8d7c6eb7d263ffc39fa19b56d882f";
sha256 = "0a0bbj9lwpxwql8m56qxr1qjvfb3qb1cj6knfhdvgaskilv5mlg1";
};
meta.homepage = "https://github.com/folke/twilight.nvim/";
};
@ -6102,12 +6114,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-07-27";
version = "2021-08-06";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "5fa131dc95a7b3e03fa1307802b3a43419571921";
sha256 = "10viqhmyvw8lik53gbslfxfsv36f1vl8qi0vzn7zi6waqdrr3n79";
rev = "cf229cd88ecf9ee9e157d6737770b289de24d3bd";
sha256 = "06cn9z7p39qvp34533azj2xc3jyj6bi8kb4aasq52awizdg3flvz";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -6882,12 +6894,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-08-03";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "7a087725eebedf4c23b621d9a25ca6fac9a0a985";
sha256 = "0gvgi6sp6imjf865jfj5di8zvivm8hsfpg2qjjx0q4kss821yznm";
rev = "e9f913ff8a6f76062e0aa95b60d740ec690f6f4f";
sha256 = "0i2j15yqndzfisf7x1cdszs7s32gh57wravgar3pmk13ffcx4n0s";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -7748,12 +7760,12 @@ final: prev:
vim-maktaba = buildVimPluginFrom2Nix {
pname = "vim-maktaba";
version = "2021-08-03";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "google";
repo = "vim-maktaba";
rev = "92b8483abb3b128b2a64782c60c2a236b2484a99";
sha256 = "1prx8hhjdh4bs1c25jxjis151d1kg3vxdy5f9scwgas9a79ii3lw";
rev = "339ab52b488b2d9ced5dde5ebd734b95bc6500f3";
sha256 = "1191bdrlc2sxwfick7y82cvl2hsxai32sdspxpwskbigyzsd6xks";
};
meta.homepage = "https://github.com/google/vim-maktaba/";
};
@ -9923,12 +9935,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key-nvim";
version = "2021-07-06";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
rev = "dc9c3be7acae2a486c117f5a9f6ada62b2243336";
sha256 = "105fnr3qa64izllb9s4r6lsg5mfddiap784j7zz7gh3znpy43n3m";
rev = "b582c9d78f0d105041ed29ec3a8ee11d98ddfd50";
sha256 = "00k4x121v5zmd70xn24ipiqnpvzlvbv5p089mxsd0wpkng3q31ks";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@ -10056,12 +10068,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
version = "2021-07-28";
version = "2021-08-05";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "8c6081c79b2250467c45f475332e3a3a33028467";
sha256 = "1m0yjngysk0hngrp7awc7m5ahg39yb6hg17zd2fj0ywcf18fw7kf";
rev = "518275b599ab6dd7844c24022f6aec505fb4b07c";
sha256 = "0wkd83xlzfbk3h19gn3jhp6lpkb1wnxrhcdnczhdwhy81lizfq4w";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

View File

@ -651,7 +651,7 @@ self: super: {
libiconv
];
cargoSha256 = "sha256-E16fwBb9ZDRrcs+rZVKG0UESDqrVIcybr+kbFIxrS1o=";
cargoSha256 = "sha256-wYxUo9zfflU7RTsTb7W9wc/WBsXhz3OLjC8CwUkRRiE=";
};
in
''

View File

@ -194,6 +194,7 @@ guns/vim-clojure-highlight
guns/vim-clojure-static
guns/vim-sexp
guns/xterm-color-table.vim
haringsrob/nvim_context_vt
hashivim/vim-packer
hashivim/vim-terraform
hashivim/vim-vagrant

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ipset";
version = "7.14";
version = "7.15";
src = fetchurl {
url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2";
sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA=";
sha256 = "sha256-ClVFqq22QBQsH4iNNmp43fhyR5mWf6IGhqcAU71iF1E=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "headscale";
version = "0.3.6";
version = "0.4.0";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
sha256 = "sha256-cjaA62YRfZSbXwbW1pz51hc/opCLsN26GxWnBcVTvyE=";
sha256 = "sha256-0fa6V85NwURwsW1Mk1eMPtOWNqTe7x9BSuoCUrSJ/s8=";
};
vendorSha256 = "sha256-3cGvp9hnajNJtvDn4K6fkCzLYrEFXQk9ZhQ4n+WnQEo=";

View File

@ -607,7 +607,7 @@
"openerz" = ps: with ps; [ openerz-api ];
"openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi
"openexchangerates" = ps: with ps; [ ];
"opengarage" = ps: with ps; [ ]; # missing inputs: open-garage
"opengarage" = ps: with ps; [ open-garage ];
"openhardwaremonitor" = ps: with ps; [ ];
"openhome" = ps: with ps; [ openhomedevice ];
"opensensemap" = ps: with ps; [ opensensemap-api ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.1.3";
version = "2.1.4";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-F4ad2P4NF7MSp6Lttk9hjAixiMTG/vtMe7YItmXdc4w=";
sha256 = "sha256-+KSLmr6tia22XFHYFmn3leRdT6TTKdrQa9PrGGJNPaw=";
};
vendorSha256 = "sha256-S/aP+oBH+bChoTLqqcB0aDzR7xtg9/qBqxxcLCwAbqY=";
vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y=";
doCheck = false;

View File

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.14.3";
version = "2.14.4";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "sha256-Tste5DdUwCu1CNRzIcBEvyckrvhEg9C8M3y89luIMbE=";
sha256 = "sha256-0L5IiB/J4RO/KGSk/zZKLPpAneNGPDvhmPsNiZxImac=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-iHRPgQtanW2LcFLPPHmr2n1NeAPi0mDmHNeIv524lrM=";
cargoSha256 = "sha256-Mb59ZkIQVAZ01e3njdIR+0pM+PKQgEDaUP4saMGYn/8=";
doCheck = false;

View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "zoxide";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "ajeetdsouza";
repo = "zoxide";
rev = "v${version}";
sha256 = "sha256-M83J28aG4NACBZtCJzYNU7aYNTJILAboaDv5aAo35OM=";
sha256 = "sha256-vw/3pWqb1Qtat+17tzhBvpS+Z2DRe69HGmgzhMQPUw8=";
};
nativeBuildInputs = [ installShellFiles ];
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
--replace '"fzf"' '"${fzf}/bin/fzf"'
'';
cargoSha256 = "sha256-aF0vdudOFBcDrHpgsS7+HNE70GTNPdBOmbvQhLwmsM0=";
cargoSha256 = "sha256-xybP9A2QfhuSSjsBVsJgSfDC/1/OahtF5xfsXAlmpjs=";
postInstall = ''
installManPage man/*

View File

@ -2,12 +2,13 @@
let
inherit (pythonPackages) python;
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "pyunbound";
version = "1.13.1";
src = fetchurl {
url = "http://unbound.net/downloads/unbound-${version}.tar.gz";
url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz";
sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg=";
};
@ -15,9 +16,10 @@ in stdenv.mkDerivation rec {
buildInputs = [ openssl expat libevent python ];
postPatch = ''substituteInPlace Makefile.in \
--replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" \
--replace "\$(LIBTOOL) --mode=install cp _unbound.la" "cp _unbound.la"
postPatch = ''
substituteInPlace Makefile.in \
--replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" \
--replace "\$(LIBTOOL) --mode=install cp _unbound.la" "cp _unbound.la"
'';
preConfigure = "export PYTHON_VERSION=${python.pythonVersion}";
@ -41,7 +43,7 @@ in stdenv.mkDerivation rec {
cp .libs/_unbound.so .libs/libunbound.so* $out/${python.sitePackages}
substituteInPlace _unbound.la \
--replace "-L.libs $PWD/libunbound.la" "-L$out/${python.sitePackages}"
'';
'';
installFlags = [
"configfile=\${out}/etc/unbound/unbound.conf"
@ -56,7 +58,7 @@ in stdenv.mkDerivation rec {
$out/bin/unbound-anchor -l | head -1 > $out/etc/${pname}/root.anchor
$out/bin/unbound-anchor -l | tail --lines=+2 - > $out/etc/${pname}/root.key
# We don't need anything else
rm -fR $out/bin $out/share $out/include $out/etc/unbound
rm -r $out/bin $out/share $out/include $out/etc/unbound
''
# patchelf is only available on Linux and no patching is needed on darwin
+ lib.optionalString stdenv.isLinux ''
@ -66,8 +68,8 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Python library for Unbound, the validating, recursive, and caching DNS resolver";
license = licenses.bsd3;
homepage = "http://www.unbound.net";
homepage = "https://www.unbound.net";
maintainers = with maintainers; [ leenaars ];
platforms = lib.platforms.unix;
platforms = platforms.unix;
};
}

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cri-tools";
version = "1.21.0";
version = "1.22.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-chU7qNapmM4Gm8lYcdUreg1ZP93UM0LpIEk+w5cutlg=";
sha256 = "sha256-+36lGLpNnTQnwwmXoVNPt3RMcnE46AdXOpghvhP0Bq0=";
};
vendorSha256 = null;

View File

@ -2043,7 +2043,9 @@ in
boca = callPackage ../development/libraries/boca { };
bochs = callPackage ../applications/virtualization/bochs { };
bochs = callPackage ../applications/virtualization/bochs {
wxGTK = wxGTK30;
};
bubblewrap = callPackage ../tools/admin/bubblewrap { };
@ -27525,7 +27527,7 @@ in
taskopen = callPackage ../applications/misc/taskopen { };
tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
inherit (xorg) libpthreadstubs libXdmcp;
};

View File

@ -189,6 +189,8 @@ in {
adal = callPackage ../development/python-modules/adal { };
adax = callPackage ../development/python-modules/adax { };
adb-enhanced = callPackage ../development/python-modules/adb-enhanced { };
adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { };
@ -4994,6 +4996,8 @@ in {
onnx = callPackage ../development/python-modules/onnx { };
open-garage = callPackage ../development/python-modules/open-garage { };
openant = callPackage ../development/python-modules/openant { };
openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { };
@ -6461,6 +6465,8 @@ in {
pyproj = callPackage ../development/python-modules/pyproj { };
pyprosegur = callPackage ../development/python-modules/pyprosegur { };
pyptlib = callPackage ../development/python-modules/pyptlib { };
pypubsub = callPackage ../development/python-modules/pypubsub { };