Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-04-21 00:15:20 +00:00 committed by GitHub
commit 99c7bab106
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 522 additions and 115 deletions

View file

@ -116,6 +116,44 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n
After that you can install your special grafted `myVim` or `myNeovim` packages.
### What if your favourite Vim plugin isn't already packaged?
If one of your favourite plugins isn't packaged, you can package it yourself:
```
{ config, pkgs, ... }:
let
easygrep = pkgs.vimUtils.buildVimPlugin {
name = "vim-easygrep";
src = pkgs.fetchFromGitHub {
owner = "dkprice";
repo = "vim-easygrep";
rev = "d0c36a77cc63c22648e792796b1815b44164653a";
sha256 = "0y2p5mz0d5fhg6n68lhfhl8p4mlwkb82q337c22djs4w5zyzggbc";
};
};
in
{
environment.systemPackages = [
(
pkgs.neovim.override {
configure = {
packages.myPlugins = with pkgs.vimPlugins; {
start = [
vim-go # already packaged plugin
easygrep # custom package
];
opt = [];
};
# ...
};
}
)
];
}
```
## Managing plugins with vim-plug
To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim

View file

@ -2195,6 +2195,16 @@
githubId = 4971975;
name = "Janne Heß";
};
dasisdormax = {
email = "dasisdormax@mailbox.org";
github = "dasisdormax";
githubId = 3714905;
keys = [{
longkeyid = "rsa4096/0x02BA0D4480CA6C44";
fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44";
}];
name = "Maximilian Wende";
};
dasj19 = {
email = "daniel@serbanescu.dk";
github = "dasj19";

View file

@ -163,7 +163,8 @@ in
# List packages installed in system profile. To search, run:
# \$ nix search wget
# environment.systemPackages = with pkgs; [
# wget vim
# nano vim # don't forget to add an editor to edit configuration.nix!
# wget
# firefox
# ];

View file

@ -5,6 +5,8 @@ with lib;
let
cfg = config.services.redis;
ulimitNofile = cfg.maxclients + 32;
mkValueString = value:
if value == true then "yes"
else if value == false then "no"
@ -14,8 +16,8 @@ let
listsAsDuplicateKeys = true;
mkKeyValue = generators.mkKeyValueDefault { inherit mkValueString; } " ";
} cfg.settings);
in
{
in {
imports = [
(mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
(mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
@ -121,6 +123,12 @@ in
description = "Set the number of databases.";
};
maxclients = mkOption {
type = types.int;
default = 10000;
description = "Set the max number of connected clients at the same time.";
};
save = mkOption {
type = with types; listOf (listOf int);
default = [ [900 1] [300 10] [60 10000] ];
@ -253,6 +261,7 @@ in
logfile = cfg.logfile;
syslog-enabled = cfg.syslog;
databases = cfg.databases;
maxclients = cfg.maxclients;
save = map (d: "${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}") cfg.save;
dbfilename = "dump.rdb";
dir = "/var/lib/redis";
@ -295,6 +304,34 @@ in
StateDirectoryMode = "0700";
# Access write directories
UMask = "0077";
# Capabilities
CapabilityBoundingSet = "";
# Security
NoNewPrivileges = true;
# Process Properties
LimitNOFILE = "${toString ulimitNofile}";
# Sandboxing
ProtectSystem = "strict";
ProtectHome = true;
PrivateTmp = true;
PrivateDevices = true;
PrivateUsers = true;
ProtectClock = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectControlGroups = true;
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
RestrictNamespaces = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @privileged @raw-io @reboot @resources @setuid @swap";
};
};
};

View file

@ -214,7 +214,8 @@ in {
PrivateMounts = true;
SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap";
SystemCallArchitectures = "native";
RestrictAddressFamilies = "AF_INET AF_INET6";
# AF_UNIX is required to connect to a postgres socket.
RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
};
};

View file

@ -90,10 +90,10 @@ in
package = mkOption {
type = types.package;
default = pkgs.oauth2_proxy;
defaultText = "pkgs.oauth2_proxy";
default = pkgs.oauth2-proxy;
defaultText = "pkgs.oauth2-proxy";
description = ''
The package that provides oauth2_proxy.
The package that provides oauth2-proxy.
'';
};

View file

@ -1,23 +1,25 @@
{ lib, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }:
{ lib, mkDerivation, cmake, hunspell, pkg-config, qttools, qtbase, qtsvg, qtx11extras
, fetchFromGitHub }:
mkDerivation rec {
pname = "featherpad";
version = "0.10.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "tsujan";
repo = "FeatherPad";
rev = "V${version}";
sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p";
sha256 = "0av96yx9ir1ap5adn2cvr6n5y7qjrspk73and21m65dmpwlfdiqb";
};
nativeBuildInputs = [ qmake pkg-config qttools ];
buildInputs = [ qtbase qtsvg qtx11extras ];
nativeBuildInputs = [ cmake pkg-config qttools ];
buildInputs = [ hunspell qtbase qtsvg qtx11extras ];
meta = with lib; {
description = "Lightweight Qt5 Plain-Text Editor for Linux";
homepage = "https://github.com/tsujan/FeatherPad";
platforms = platforms.linux;
maintainers = [ maintainers.flosse ];
license = licenses.gpl3;
license = licenses.gpl3Plus;
};
}

View file

@ -1,6 +1,9 @@
{ lib, stdenv, callPackage, fetchurl
, jdk, cmake, libxml2, zlib, python3, ncurses5
, dotnet-sdk_3
, autoPatchelfHook
, glib
, libdbusmenu
, vmopts ? null
}:
@ -25,6 +28,15 @@ let
platforms = platforms.linux;
};
}).overrideAttrs (attrs: {
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [
autoPatchelfHook
];
buildInputs = (attrs.buildInputs or []) ++ optionals (stdenv.isLinux) [
python3
stdenv.cc.cc
libdbusmenu
];
dontAutoPatchelf = true;
postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) ''
(
cd $out/clion-${version}
@ -32,45 +44,7 @@ let
rm -rf bin/cmake/linux
ln -s ${cmake} bin/cmake/linux
lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
ln -s ${ncurses5.out}/lib/libtinfo.so.5 $lldbLibPath/libtinfo.so.5
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
bin/lldb/linux/bin/lldb-server
for i in LLDBFrontend lldb lldb-argdumper; do
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
"bin/lldb/linux/bin/$i"
done
patchelf \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so
patchelf \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
bin/lldb/linux/lib/liblldb.so
gdbLibPath=$out/clion-${version}/bin/gdb/linux/lib
patchelf \
--set-rpath "$gdbLibPath" \
bin/gdb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$gdbLibPath" \
bin/gdb/linux/bin/gdb
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$gdbLibPath" \
bin/gdb/linux/bin/gdbserver
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \
bin/clang/linux/clangd
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \
bin/clang/linux/clang-tidy
autoPatchelf $PWD/bin
wrapProgram $out/bin/clion \
--set CL_JDK "${jdk}"

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "1nrbz049nizrrfxdpws05gj0bqk47l4mrl4wcvfb6nwispc74ib0";
sha256 = "0lx6sx3zkjq9855va1vxbd5g47viqkrchk5d2rb6xj7zywwm4mgb";
};
vendorSha256 = "0j2jy7n7hca5ybwwgh7cvm77j96ngaq1a1l5bl70vjpd8hz2qapc";
vendorSha256 = "1zmyd566xcksgqm0f7mq0rkfnxk0fmf39k13fcp9jy30c1y9681v";
nativeBuildInputs = [ installShellFiles ];

View file

@ -0,0 +1,37 @@
{ lib, stdenvNoCC, fetchFromGitHub, youtube-dl }:
stdenvNoCC.mkDerivation rec {
pname = "mpv-playlistmanager";
version = "unstable-2021-03-09";
src = fetchFromGitHub {
owner = "jonniek";
repo = "mpv-playlistmanager";
rev = "c15a0334cf6d4581882fa31ddb1e6e7f2d937a3e";
sha256 = "uxcvgcSGS61UU8MmuD6qMRqpIa53iasH/vkg1xY7MVc=";
};
postPatch = ''
substituteInPlace playlistmanager.lua \
--replace "'youtube-dl'" "'${youtube-dl}/bin/youtube-dl'" \
'';
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/mpv/scripts
cp playlistmanager.lua $out/share/mpv/scripts
runHook postInstall
'';
passthru.scriptName = "playlistmanager.lua";
meta = with lib; {
description = "Mpv lua script to create and manage playlists";
homepage = "https://github.com/jonniek/mpv-playlistmanager";
license = licenses.unlicense;
platforms = platforms.all;
maintainers = with maintainers; [ lunik1 ];
};
}

View file

@ -0,0 +1,37 @@
{ lib
, fetchFromGitHub
, stdenv
, srt
, zlib
}:
stdenv.mkDerivation rec {
pname = "srt-live-server";
version = "1.4.8";
src = fetchFromGitHub {
owner = "Edward-Wu";
repo = "srt-live-server";
rev = "V${version}";
sha256 = "0x48sxpgxznb1ymx8shw437pcgk76ka5rx0zhn9b3cyi9jlq1yld";
};
patches = [
# https://github.com/Edward-Wu/srt-live-server/pull/94
./fix-insecure-printfs.patch
];
buildInputs = [ srt zlib ];
makeFlags = [
"PREFIX=$(out)"
];
meta = with lib; {
description = "srt live server for low latency";
license = licenses.mit;
homepage = "https://github.com/Edward-Wu/srt-live-server";
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,61 @@
diff --color -ur a/Makefile b/Makefile
--- a/Makefile 2021-04-16 13:02:41.416453040 +0200
+++ b/Makefile 2021-04-16 13:21:23.020089623 +0200
@@ -1,3 +1,4 @@
+PREFIX = /usr/local
SHELL = /bin/sh
MAIN_NAME=sls
CLIENT_NAME=slc
@@ -64,3 +65,16 @@
rm -f $(OUTPUT_PATH)/*.o
rm -rf $(BIN_PATH)/*
+install: all
+ @echo installing executable files to ${DESTDIR}${PREFIX}/bin
+ @mkdir -p "${DESTDIR}${PREFIX}/bin"
+ @cp -f ${BIN_PATH}/${MAIN_NAME} "${DESTDIR}${PREFIX}/bin"
+ @chmod 755 "${DESTDIR}${PREFIX}/bin/${MAIN_NAME}"
+ @cp -f ${BIN_PATH}/${CLIENT_NAME} "${DESTDIR}${PREFIX}/bin"
+ @chmod 755 "${DESTDIR}${PREFIX}/bin/${CLIENT_NAME}"
+
+uninstall:
+ @echo removing executable files from ${DESTDIR}${PREFIX}/bin
+ @rm -f "${DESTDIR}${PREFIX}/bin/${MAIN_NAME}"
+ @rm -f "${DESTDIR}${PREFIX}/bin/${CLIENT_NAME}"
+
diff --color -ur a/slscore/HttpClient.cpp b/slscore/HttpClient.cpp
--- a/slscore/HttpClient.cpp 2021-04-16 13:02:41.416453040 +0200
+++ b/slscore/HttpClient.cpp 2021-04-16 13:11:40.343866698 +0200
@@ -90,7 +90,7 @@
goto FUNC_END;
}
if (NULL != method && strlen(method) > 0) {
- sprintf(m_http_method, method);
+ strcpy(m_http_method, method);
}
m_interval = interval;
diff --color -ur a/slscore/SLSLog.cpp b/slscore/SLSLog.cpp
--- a/slscore/SLSLog.cpp 2021-04-16 13:02:41.416453040 +0200
+++ b/slscore/SLSLog.cpp 2021-04-16 13:08:16.836119519 +0200
@@ -85,7 +85,7 @@
vsnprintf (buf , 4095 , fmt , vl);
//sprintf(buf_info, "%s %s: %s\n" , cur_time, LOG_LEVEL_NAME[level], buf);
sprintf(buf_info, "%s:%03d %s %s: %s\n" , cur_time, cur_time_msec, APP_NAME, LOG_LEVEL_NAME[level], buf);
- printf(buf_info);
+ puts(buf_info);
if (m_log_file) {
fwrite(buf_info, strlen(buf_info), 1, m_log_file);
diff --color -ur a/slscore/SLSSrt.cpp b/slscore/SLSSrt.cpp
--- a/slscore/SLSSrt.cpp 2021-04-16 13:02:41.417452995 +0200
+++ b/slscore/SLSSrt.cpp 2021-04-16 13:10:11.004957820 +0200
@@ -124,7 +124,7 @@
std::map<int, std::string>::iterator it;
for(it=map_error.begin(); it!=map_error.end(); ++it) {
sprintf(szBuf, "%d: %s\n", it->first, it->second.c_str());
- printf(szBuf);
+ puts(szBuf);
}
printf("----------end------------\n");
map_error.clear();

View file

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "0.19";
version = "0.19.1";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
sha256 = "sha256-G9asWedX03cP5Qg5HIzlSIwwqNL16kiyWairk+6Kabw=";
sha256 = "sha256-v5uESTEspIc8rhZXrQqLEVMDvvPcfHuFoj6lI4M5z70=";
fetchSubmodules = true;
};

View file

@ -1,13 +1,14 @@
{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
version = "51";
version = "52";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
sha256 = "0mic7h5l19ly79l02inm33992ffkxsh618d6zbr39gvn4405g6wk";
sha256 = "1zahng79m2gw27fb2sw8zyk2n07qc0hbn02g5mfqzhwk62g97v4y";
};
uuid = "unite@hardpixel.eu";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls }:
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls, Security }:
let
ocamlDependencies = version:
@ -31,7 +31,8 @@ let
inherit version;
buildInputs = [ zlib pcre neko ]
++ lib.optional (lib.versionAtLeast version "4.1") [ mbedtls ]
++ lib.optional (lib.versionAtLeast version "4.1") mbedtls
++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security
++ ocamlDependencies version;
src = fetchFromGitHub {

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.5.0";
version = "3.6.0";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
sha256 = "sha256-QJeb9+iiS4QZ7poOBp5oKD5KuagkG6cfTalbNRwrI1M=";
sha256 = "sha256-096bMTAh5d2wikrmlDcUspD9GYZlPHbdDcf/e/BLAHI=";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -1,6 +1,7 @@
{ lib
, asysocks
, buildPythonPackage
, colorama
, fetchPypi
, minikerberos
, prompt_toolkit
@ -13,22 +14,23 @@
buildPythonPackage rec {
pname = "aiosmb";
version = "0.2.37";
version = "0.2.41";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0daf1fk7406vpywc0yxv0wzf4nw986js9lc2agfyfxz0q7s29lf0";
sha256 = "sha256-hiLLoFswh0rm5f5TsaX+zyRDkOIyzGXVO0M5J5d/gtQ=";
};
propagatedBuildInputs = [
minikerberos
winsspi
six
asysocks
tqdm
colorama
minikerberos
prompt_toolkit
six
tqdm
winacl
winsspi
];
# Project doesn't have tests

View file

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "minidump";
version = "0.0.16";
version = "0.0.17";
src = fetchPypi {
inherit pname version;
sha256 = "65a71ca1da2b73ee96daa9d52e4fb9c9b80a849475502c6a1c2a80a68bd149b0";
sha256 = "sha256-nlPW83Tr3aec1tSYHgcZTwd+ydN12S6WNwK7gdwdatY=";
};
# Upstream doesn't have tests

View file

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "minikerberos";
version = "0.2.9";
version = "0.2.11";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-woYs8EYUfALCtqHUCVfF5z1v1UIc9D8Iep9n4NrNIlg=";
sha256 = "sha256-OC+Cnk47GFzK1QaDEDxntRVrakpFiBuNelM/R5t/AUY=";
};
propagatedBuildInputs = [

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "msldap";
version = "0.3.28";
version = "0.3.29";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-0sMi5PpwMWf/W+Hu0akQVF/1ZkbanfOzYDC3R6lZrSE=";
sha256 = "0khwyhylh28qvz35pdckr5fdd82zsybv0xmzlzjbgcv99cyy1a94";
};
propagatedBuildInputs = [

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pypykatz";
version = "0.4.7";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "0il5sj47wyf9gn76alm8v1l63rqw2vsd27v6f7q1dpn0wq209syi";
sha256 = "sha256-1p8v4Qi0MNqMUpcErWnxveYu4d4N5BUBCDBsw1xX96I=";
};
propagatedBuildInputs = [

View file

@ -1011,6 +1011,20 @@ in with lib.licenses;
makefile = "Makefile";
};
thepowdertoy = mkLibRetroCore rec {
core = "thepowdertoy";
src = fetchRetro {
repo = "ThePowderToy";
rev = "0ff547e89ae9d6475b0226db76832daf03eec937";
sha256 = "kDpmo/RPYRvROOX3AhsB5pIl0MfHbQmbyTMciLPDNew=";
};
description = "Port of The Powder Toy to libretro";
license = gpl3Only;
extraNativeBuildInputs = [ cmake ];
makefile = "Makefile";
postBuild = "cd src/";
};
tic80 = mkLibRetroCore {
core = "tic80";
src = fetchRetro {

View file

@ -1643,12 +1643,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-04-19";
version = "2021-04-20";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "6e6e4d0199611ddaffb03cec62b56ca179357f32";
sha256 = "1ls4fcwwxshpiyw2jgz9xgmq1swspf50q1w5br79wbhv2f0sfkxc";
rev = "499e20ff35493801a50b6e3401fe793f7cdb5b4c";
sha256 = "0f1w858y9yvixdbpbnl37xfmy5fgi2p70pvdcy4xy60qjsckiglp";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2356,8 +2356,8 @@ let
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
rev = "9e2492fd0772767db6d81c9f6eaac800f596cb51";
sha256 = "1qzzj6903p4jyb9mcncsra74dab37yffb22y9dzs2ihx7pd8w3by";
rev = "e6cc09c2e95cc361babb64c113cc3e9355ea1130";
sha256 = "1jf68z7vh467fr5arbcsk5g65gjpc0dqn584hbg0cpzfmdlrbj4n";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@ -2748,12 +2748,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-04-17";
version = "2021-04-20";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "e49801be0a76f8bcc17fc76d41963dd9a0da05f1";
sha256 = "11jk3bddybyzmx7gr8as05g34h9rgv7vqb22yirxspvvxh1bsrx6";
rev = "cb846809d81c360b3f9658ee89a9342450c99da2";
sha256 = "0r35flvb70y4ankp8v8p6jm0s9mrbg6i94n0v8avaw92xrcgl4ph";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -3276,24 +3276,24 @@ let
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
version = "2021-04-19";
version = "2021-04-20";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
rev = "2c54f8c73c4d2c9a115691a9518262dcdaac0c71";
sha256 = "18qbzj16czy1jyqmm1if22z04xyslljhqp026x01crp77kkz6ccf";
rev = "7c9d8c51841c3335818d04b684e93c655b5d61c9";
sha256 = "04j34wyv7q9n7yld7k7cxxm92al3h7x3rkcnm1q61scwb1xf354r";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
version = "2021-04-19";
version = "2021-04-20";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "c995d65b7dc0935d0e1c04302d9b4494c5eb56bf";
sha256 = "09pb1znd1vfqj8g90805zsb1ffxkj9xfycc5aximm06dcsiv8dgi";
rev = "983963779d6696c5b6b4aa14f874d85f00941b4e";
sha256 = "16viqhsh1xn5grv631i6fy5kav65g472yyyz0m4wy4gvi2mb7sf2";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
@ -3851,6 +3851,18 @@ let
meta.homepage = "https://github.com/gu-fan/riv.vim/";
};
rnvimr = buildVimPluginFrom2Nix {
pname = "rnvimr";
version = "2020-10-02";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "rnvimr";
rev = "d83f5a8e070a1fc7e7af0aeea58e71b78956daab";
sha256 = "0iwj01p9c2kczhx69vxrh1qd4z41ymcgfq5235b1l0rnz4d6v82y";
};
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
};
robotframework-vim = buildVimPluginFrom2Nix {
pname = "robotframework-vim";
version = "2017-04-14";
@ -5606,6 +5618,18 @@ let
meta.homepage = "https://github.com/tpope/vim-dispatch/";
};
vim-dispatch-neovim = buildVimPluginFrom2Nix {
pname = "vim-dispatch-neovim";
version = "2017-01-18";
src = fetchFromGitHub {
owner = "radenling";
repo = "vim-dispatch-neovim";
rev = "c8c4e21a95c25032a041002f9bf6e45a75a73021";
sha256 = "111n3f7lv9nkpj200xh0fwbi3scjqyivpw5fwdjdyiqzd6qabxml";
};
meta.homepage = "https://github.com/radenling/vim-dispatch-neovim/";
};
vim-docbk = buildVimPluginFrom2Nix {
pname = "vim-docbk";
version = "2015-04-01";
@ -6447,6 +6471,18 @@ let
meta.homepage = "https://github.com/fisadev/vim-isort/";
};
vim-jack-in = buildVimPluginFrom2Nix {
pname = "vim-jack-in";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "clojure-vim";
repo = "vim-jack-in";
rev = "80c69cc021486d1cfa5dac7d9d6ab6954ff20c27";
sha256 = "11dw8kngzznzf91n6iyvw7yi1l35vgpva32dck3n25vpxc24krpn";
};
meta.homepage = "https://github.com/clojure-vim/vim-jack-in/";
};
vim-janah = buildVimPluginFrom2Nix {
pname = "vim-janah";
version = "2018-10-01";
@ -6851,8 +6887,8 @@ let
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "2f5dfd852f01118861a3cd964494c1522a62eef5";
sha256 = "0s69n9rmrg8103xcc623n7mbxp1qgbf9x1qm4r3n98fn0x6j8vpl";
rev = "5bdf7690ed9afda4684f30aa4b9e7a84827b6fdb";
sha256 = "1jbzaflx1y6c32m59irj5p29nd1p9krb3jgv6hi9w4002vp48f0y";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -8586,6 +8622,18 @@ let
meta.homepage = "https://github.com/andrep/vimacs/";
};
vimade = buildVimPluginFrom2Nix {
pname = "vimade";
version = "2021-04-07";
src = fetchFromGitHub {
owner = "TaDaa";
repo = "vimade";
rev = "9b9254340e39dab3dad64c05b10af0fd85490b71";
sha256 = "0sbk9lf5w136lwl3ca866m594993s23zad5ss4whzm9j0qknihl3";
};
meta.homepage = "https://github.com/TaDaa/vimade/";
};
vimagit = buildVimPluginFrom2Nix {
pname = "vimagit";
version = "2020-11-18";
@ -8636,12 +8684,12 @@ let
vimoutliner = buildVimPluginFrom2Nix {
pname = "vimoutliner";
version = "2020-10-26";
version = "2021-04-20";
src = fetchFromGitHub {
owner = "vimoutliner";
repo = "vimoutliner";
rev = "d198aa72c70270f1330f4237bbf853efaaa79723";
sha256 = "05wcqs36qn8f3vcy9xi2cf0yyp7yzawlxqvpjhbad6lm52vzsabs";
rev = "054f957779dff8e5fbb859e8cfbca06f1ed9e7f0";
sha256 = "1bsfrma06mkigr1jhzic98z4v1gckzrjv908vx2wlbjq9cdv7d39";
};
meta.homepage = "https://github.com/vimoutliner/vimoutliner/";
};

View file

@ -63,6 +63,7 @@ christoomey/vim-sort-motion
christoomey/vim-tmux-navigator
chuling/ci_dark
ckarnell/antonys-macro-repeater
clojure-vim/vim-jack-in
cloudhead/neovim-fuzzy
CoatiSoftware/vim-sourcetrail
cocopon/iceberg.vim
@ -272,6 +273,7 @@ keith/rspec.vim
keith/swift.vim
kevinhwang91/nvim-bqf@main
kevinhwang91/nvim-hlslens@main
kevinhwang91/rnvimr
kien/rainbow_parentheses.vim
knubie/vim-kitty-navigator
konfekt/fastfold
@ -496,6 +498,7 @@ qnighy/lalrpop.vim
qpkorr/vim-bufkill
Quramy/tsuquyomi
racer-rust/vim-racer
radenling/vim-dispatch-neovim
rafaqz/ranger.vim
rafi/awesome-vim-colorschemes
raghur/fruzzy
@ -579,6 +582,7 @@ sunaku/vim-dasht
svermeulen/vim-subversive
t9md/vim-choosewin
t9md/vim-smalls
TaDaa/vimade
takac/vim-hardtime
tami5/compe-conjure
tami5/lispdocs.nvim

View file

@ -10,12 +10,12 @@
buildGoModule rec {
pname = "oci-seccomp-bpf-hook";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "containers";
repo = "oci-seccomp-bpf-hook";
rev = "v${version}";
sha256 = "0zbrpv6j4gd4l36zl2dljazdm85qlqwchf0xvmnaywcj8c8b49xw";
sha256 = "sha256-SRphs8zwKz6jlAixVZkHdww0jroaBNK82kSLj1gs6Wg=";
};
vendorSha256 = null;

View file

@ -74,7 +74,7 @@ let
meta = with lib; {
description = "Software implementation of a telephone private branch exchange (PBX)";
homepage = "https://www.asterisk.org/";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ auntie DerTim1 yorickvp ];
};
};
@ -105,8 +105,8 @@ in rec {
asterisk = asterisk_18;
asterisk_13 = common {
version = "13.38.0";
sha256 = "1kxff6pbry8nydkspi0mqllidz2lw3d3g3r127x8jwgx021x0rik";
version = "13.38.2";
sha256 = "1v7wgsa9vf7qycg3xpvmn2bkandkfh3x15pr8ylg0w0gvfkkf5b9";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@ -114,8 +114,8 @@ in rec {
};
asterisk_16 = common {
version = "16.15.0";
sha256 = "12nc7ywm6w1xyn720kdc1sqz5wkjjrkxr25wisl02f4v5wz8py7m";
version = "16.17.0";
sha256 = "1bzlsk9k735qf8a693b6sa548my7m9ahavmdicwmc14px70wrvnw";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@ -123,8 +123,8 @@ in rec {
};
asterisk_17 = common {
version = "17.9.0";
sha256 = "1fnm1z7g45m883ivkm36r4kqb7163bzazi70mwf0fc2rc28jd1z4";
version = "17.9.3";
sha256 = "0nhk0izrxx24pz806fwnhidjmciwrkcrsvxvhrdvibiqyvfk8yk7";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@ -132,8 +132,8 @@ in rec {
};
asterisk_18 = common {
version = "18.1.0";
sha256 = "1pq2nrf60xnvh2h1rv82bdfbxxxd277g68xas0vbfgr4531gc4nc";
version = "18.3.0";
sha256 = "1xb953i9ay82vcdv8izi5dd5xnspcsvg10ajiyph377jw2xnd5fb";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;

View file

@ -0,0 +1,71 @@
{ lib
, gccStdenv
, fetchFromGitHub
, cmake
, simdExtensions ? null
}:
with rec {
# SIMD instruction sets to compile for. If none are specified by the user,
# an appropriate one is selected based on the detected host system
isas = with gccStdenv.hostPlatform;
if simdExtensions != null then lib.toList simdExtensions
else if avx2Support then [ "AVX2" ]
else if sse4_1Support then [ "SSE41" ]
else if isx86_64 then [ "SSE2" ]
else if isAarch64 then [ "NEON" ]
else [ "NONE" ];
archFlags = lib.optionals gccStdenv.hostPlatform.isAarch64 [ "-DARCH=aarch64" ];
# CMake Build flags for the selected ISAs. For a list of flags, see
# https://github.com/ARM-software/astc-encoder/blob/main/Docs/Building.md
isaFlags = map ( isa: "-DISA_${isa}=ON" ) isas;
# The suffix of the binary to link as 'astcenc'
mainBinary = builtins.replaceStrings
[ "AVX2" "SSE41" "SSE2" "NEON" "NONE" ]
[ "avx2" "sse4.1" "sse2" "neon" "none" ]
( builtins.head isas );
};
gccStdenv.mkDerivation rec {
pname = "astc-encoder";
version = "2.5";
src = fetchFromGitHub {
owner = "ARM-software";
repo = "astc-encoder";
rev = version;
sha256 = "0ff5jh40w942dz7hmgvznmpa9yhr1j4i9qqj5wy6icm2jb9j4pak";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = isaFlags ++ archFlags ++ [
"-DCMAKE_BUILD_TYPE=Release"
];
# Link binaries into environment and provide 'astcenc' link
postInstall = ''
mv $out/astcenc $out/bin
ln -s $out/bin/astcenc-${mainBinary} $out/bin/astcenc
'';
meta = with lib; {
homepage = "https://github.com/ARM-software/astc-encoder";
description = "An encoder for the ASTC texture compression format";
longDescription = ''
The Adaptive Scalable Texture Compression (ASTC) format is
widely supported by mobile and desktop graphics hardware and
provides better quality at a given bitrate compared to ETC2.
This program supports both compression and decompression in LDR
and HDR mode and can read various image formats. Run `astcenc
-help` to see all the options.
'';
platforms = platforms.unix;
license = licenses.asl20;
maintainers = with maintainers; [ dasisdormax ];
};
}

View file

@ -0,0 +1,38 @@
{ stdenv, lib, fetchFromGitHub, tmux, installShellFiles }:
stdenv.mkDerivation rec {
pname = "wemux";
version = "unstable-2021-04-16";
src = fetchFromGitHub {
owner = "zolrath";
repo = "wemux";
rev = "01c6541f8deceff372711241db2a13f21c4b210c";
sha256 = "1y962nzvs7sf720pl3wa582l6irxc8vavd0gp4ag4243b2gs4qvm";
};
nativeBuildInputs = [ installShellFiles ];
installPhase = ''
runHook preInstall
substituteInPlace wemux \
--replace tmux ${tmux}/bin/tmux \
--replace "/usr/local/etc" "/etc"
substituteInPlace man/wemux.1 --replace "/usr/local/etc" "/etc"
install -Dm755 wemux -t $out/bin
installManPage man/wemux.1
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/zolrath/wemux";
description = "Multi-user tmux made easy";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ bsima ];
};
}

View file

@ -1,23 +1,34 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "qrcp";
version = "0.7.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "claudiodangelis";
repo = "qrcp";
rev = version;
sha256 = "0rx0pzy7p3dklayr2lkmyfdc00x9v4pd5xnzydbjx12hncnkpw4l";
sha256 = "001w15hj5xb7p9gpvw1216lp26g5018qdi8mq6i84akb7zfd2q01";
};
vendorSha256 = "0iffy43x3njcahrxl99a71v8p7im102nzv8iqbvd5c6m14rsckqa";
vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4";
subPackages = [ "." ];
nativeBuildInputs = [
installShellFiles
];
postInstall = ''
installShellCompletion --bash --cmd qrcp <($out/bin/qrcp completion bash)
installShellCompletion --fish --cmd qrcp <($out/bin/qrcp completion fish)
installShellCompletion --zsh --cmd qrcp <($out/bin/qrcp completion zsh)
'';
meta = with lib; {
homepage = "https://claudiodangelis.com/qrcp/";
description = "Transfer files over wifi by scanning a QR code from your terminal";

View file

@ -7,6 +7,7 @@
, requests
, pyyaml
, setuptools
, installShellFiles
}:
let
@ -48,14 +49,21 @@ buildPythonApplication rec {
cp data-3 linodecli/
'';
# requires linode access token for unit tests, and running executable
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/linode-cli --skip-config --version | grep ${version} > /dev/null
'';
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd linode-cli --bash <($out/bin/linode-cli --skip-config completion bash)
'';
meta = with lib; {
homepage = "https://github.com/linode/linode-cli";
description = "The Linode Command Line Interface";
license = licenses.bsd3;
maintainers = with maintainers; [ ryantm ];
maintainers = with maintainers; [ ryantm superherointj ];
};
}

View file

@ -481,6 +481,7 @@ mapAliases ({
nologin = shadow; # added 2018-04-25
nxproxy = nx-libs; # added 2019-02-15
nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
oauth2_proxy = oauth2-proxy; # added 2021-04-18
opencascade_oce = opencascade; # added 2018-04-25
oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
opencl-icd = ocl-icd; # added 2017-01-20

View file

@ -1050,6 +1050,8 @@ in
asls = callPackage ../development/tools/misc/asls { };
astc-encoder = callPackage ../tools/graphics/astc-encoder { };
asymptote = callPackage ../tools/graphics/asymptote {
texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo; };
gsl = gsl_1;
@ -8463,6 +8465,8 @@ in
srcml = callPackage ../applications/version-management/srcml { };
srt-live-server = callPackage ../applications/video/srt-live-server { };
srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { };
sourcehut = callPackage ../applications/version-management/sourcehut { };
@ -9229,6 +9233,8 @@ in
welkin = callPackage ../tools/graphics/welkin {};
wemux = callPackage ../tools/misc/wemux { };
wf-recorder = callPackage ../applications/video/wf-recorder { };
whipper = callPackage ../applications/audio/whipper { };
@ -10620,7 +10626,9 @@ in
graphviz = graphviz-nox;
});
inherit (callPackage ../development/compilers/haxe { })
inherit (callPackage ../development/compilers/haxe {
inherit (darwin.apple_sdk.frameworks) Security;
})
haxe_4_2
haxe_4_1
haxe_4_0
@ -18744,7 +18752,7 @@ in
nsq = callPackage ../servers/nsq { };
oauth2_proxy = callPackage ../servers/oauth2_proxy {
oauth2-proxy = callPackage ../servers/oauth2-proxy {
buildGoModule = buildGo115Module;
};
@ -24637,6 +24645,7 @@ in
autoload = callPackage ../applications/video/mpv/scripts/autoload.nix {};
convert = callPackage ../applications/video/mpv/scripts/convert.nix {};
mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {};
mpv-playlistmanager = callPackage ../applications/video/mpv/scripts/mpv-playlistmanager.nix {};
mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {};
simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {};
sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};
@ -26814,6 +26823,7 @@ in
++ optional (cfg.enableStella or false) stella
++ optional (cfg.enableStella2014 or false) stella2014
++ optional (cfg.enableTGBDual or false) tgbdual
++ optional (cfg.enableThePowderToy or false) the-powder-toy
++ optional (cfg.enableTIC80 or false) tic80
++ optional (cfg.enableVbaNext or false) vba-next
++ optional (cfg.enableVbaM or false) vba-m