Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-10-11 18:01:55 +00:00 committed by GitHub
commit 92a15c8929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 489 additions and 313 deletions

View file

@ -6494,6 +6494,12 @@
githubId = 791115;
name = "Linquize";
};
linsui = {
email = "linsui555@gmail.com";
github = "linsui";
githubId = 36977733;
name = "linsui";
};
linus = {
email = "linusarver@gmail.com";
github = "listx";

View file

@ -50,9 +50,8 @@ in
config = mkIf cfg.enable {
# This is enough to make a symlink because the xserver
# module already links all /share/X11 paths.
environment.systemPackages = [ x11Fonts ];
environment.pathsToLink = [ "/share/X11/fonts" ];
services.xserver.filesSection = ''
FontPath "${x11Fonts}/share/X11/fonts"

View file

@ -31,15 +31,39 @@ in
section of git-config(1) for more information.
'';
};
lfs = {
enable = mkEnableOption "git-lfs";
package = mkOption {
type = types.package;
default = pkgs.git-lfs;
defaultText = literalExpression "pkgs.git-lfs";
description = "The git-lfs package to use";
};
};
};
};
config = mkIf cfg.enable {
config = mkMerge [
(mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
environment.etc.gitconfig = mkIf (cfg.config != {}) {
text = generators.toGitINI cfg.config;
};
})
(mkIf (cfg.enable && cfg.lfs.enable) {
environment.systemPackages = [ cfg.lfs.package ];
programs.git.config = {
filter.lfs = {
clean = "git-lfs clean -- %f";
smudge = "git-lfs smudge -- %f";
process = "git-lfs filter-process";
required = true;
};
};
})
];
meta.maintainers = with maintainers; [ figsoda ];
}

View file

@ -0,0 +1,22 @@
{ lib, fetchzip }:
let
version = "7.01";
in
fetchzip {
name = "i.ming-${version}";
url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf";
sha256 = "1b2dj7spkznpkad8a0blqigj9f6ism057r0wn9wdqg5g88yp32vd";
postFetch = ''
install -DT -m444 $downloadedFile $out/share/fonts/truetype/I.Ming/I.Ming.ttf
'';
meta = with lib; {
description = "An open source Pan-CJK serif typeface";
homepage = "https://github.com/ichitenfont/I.Ming";
license = licenses.ipa;
platforms = platforms.all;
maintainers = [ maintainers.linsui ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-emoji-selector";
version = "19";
version = "20";
src = fetchFromGitHub {
owner = "maoschanz";
repo = "emoji-selector-for-gnome";
rev = version;
sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb";
sha256 = "sha256-I5aEHDC5GaGkAoH+1l4eyhBmJ+lmyZZoDw2Fq2SSlmo=";
};
passthru = {

View file

@ -1,6 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "13";
patch_version = "0";
sha256 = "sha256:1f7gnndzs6qcyy2gnzalnhm808pifxhvxg2qp5dnsziz6li7x303";
patch_version = "1";
sha256 = "sha256:1s7xwqidpjwfhnpfma4nb93gxfr7g9jfn03s1j03iyavmpgph7ck";
}

View file

@ -1,36 +1,35 @@
{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo }:
with lib;
{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo, which }:
stdenv.mkDerivation rec {
pname = "tcc";
version = "0.9.27";
upstreamVersion = "release_${concatStringsSep "_" (builtins.splitVersion version)}";
version = "unstable-2021-10-09";
src = fetchFromRepoOrCz {
repo = "tinycc";
rev = upstreamVersion;
sha256 = "12mm1lqywz0akr2yb2axjfbw8lwv57nh395vzsk534riz03ml977";
rev = "ca11849ebb88ef4ff87beda46bf5687e22949bd6";
sha256 = "sha256-xnUDyTYZxbxUCblACyX73boBhU073VRqSy1SWlWsvIw=";
};
nativeBuildInputs = [ perl texinfo ];
nativeBuildInputs = [ perl texinfo which ];
hardeningDisable = [ "fortify" ];
enableParallelBuilding = true;
postPatch = ''
substituteInPlace "texi2pod.pl" \
--replace "/usr/bin/perl" "${perl}/bin/perl"
patchShebangs texi2pod.pl
'';
configureFlags = [
"--cc=cc"
"--crtprefix=${lib.getLib stdenv.cc.libc}/lib"
"--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include"
"--libpaths=${lib.getLib stdenv.cc.libc}/lib"
# build cross compilers
"--enable-cross"
];
preConfigure = ''
echo ${version} > VERSION
configureFlagsArray+=("--cc=cc")
configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)")
configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib")
configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include")
configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib")
'';
postFixup = ''
@ -47,9 +46,8 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "test";
meta = {
meta = with lib; {
description = "Small, fast, and embeddable C compiler and interpreter";
longDescription = ''
TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike
other C compilers, it is meant to be self-sufficient: you do not
@ -73,11 +71,9 @@ stdenv.mkDerivation rec {
With libtcc, you can use TCC as a backend for dynamic code
generation.
'';
homepage = "http://www.tinycc.org/";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
homepage = "https://repo.or.cz/tinycc.git";
license = licenses.lgpl21Only;
platforms = platforms.linux;
maintainers = [ maintainers.joachifm ];
};
}

View file

@ -114,12 +114,12 @@ let
};
self = mkDerivation rec {
version = "6.2.0";
version = "6.3.0";
pname = "octave";
src = fetchurl {
url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
sha256 = "sha256-RX0f2oY0qDni/Xz8VbmL1W82tq5z0xu530Pd4wEsqnw=";
sha256 = "sha256-IyBl86cvwwE/6fF/Qpo99p1nLB9rYHcCmjHI881Ypm4=";
};
buildInputs = [

View file

@ -13,12 +13,18 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = [
"AR=${stdenv.cc.targetPrefix}ar"
"CC=${stdenv.cc.targetPrefix}cc"
"LD=${stdenv.cc.targetPrefix}cc"
"LDDLL=${stdenv.cc.targetPrefix}cc"
] ++ lib.optional stdenv.hostPlatform.isStatic "DLL=no";
installPhase = ''
runHook preInstall
install -D build/brssl $bin/brssl
install -D build/testcrypto $bin/testcrypto
install -Dm644 build/libbearssl.so $lib/lib/libbearssl.so
install -Dm644 build/libbearssl.a $lib/lib/libbearssl.a
install -Dm644 -t $lib/lib build/libbearssl.*
install -Dm644 -t $dev/include inc/*.h
touch $out
runHook postInstall

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
"--with-mysql=${getDev libmysqlclient}/bin/mysql_config"
"--with-geotiff=${libgeotiff}"
"--with-sqlite3=${sqlite.dev}"
"--with-spatialite=${libspatialite}"
"--with-spatialite=${libspatialite.dev}"
"--with-python" # optional
"--with-proj=${proj.dev}" # optional
"--with-geos=${geos}/bin/geos-config" # optional

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "homepluscontrol";
version = "0.0.61";
version = "0.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "chemaaa";
repo = pname;
rev = version;
sha256 = "1g61xj417dz1nz5g5ic8rs34fp424zvbgsymry1zldg3gskaqgvk";
sha256 = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyhaversion";
version = "21.07.0";
version = "21.10.1";
# Only 3.8.0 and beyond are supported
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-LcuMLYekeK9HR+SR8+R+EvuxxaN3RCh7KV969RngZjw=";
sha256 = "sha256-7J7zzJlevNQb7TpFYuGvsk3EWBgwhmV32xPNSLA/LS4=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ec2-metadata-mock";
version = "1.9.2";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-ec2-metadata-mock";
rev = "v${version}";
sha256 = "sha256-k4YzG4M+r6BHc4DdAMXoUvVDTJqmzr8vIL1J6kbJBeY=";
};
vendorSha256 = "sha256-uq0gcpFzAcz1HMwI1ZjHykWU93bV2U5kxC/G+J4ob7Q=";
postInstall = ''
mv $out/bin/{cmd,ec2-metadata-mock}
'';
meta = with lib; {
description = "Amazon EC2 Metadata Mock";
homepage = "https://github.com/aws/amazon-ec2-metadata-mock";
license = licenses.asl20;
maintainers = with maintainers; [ ymatsiuk ];
};
}

View file

@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchgit {
url = "https://review.coreboot.org/coreboot";
rev = "${version}";
rev = version;
sha256 = "00xr74yc0kj9rrqa1a8b7bih865qlp9i4zs67ysavkfrjrwwssxm";
};

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sumneko-lua-language-server";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
owner = "sumneko";
repo = "lua-language-server";
rev = version;
sha256 = "sha256-RhjH/phRVlNO9nPL+TtcrZYpwqNygpXjI/Pdyrxxv/4=";
sha256 = "sha256-PYlHjKMnqnhAJAvmHbH6Bb+qOyNzDH+ewOkXkj2u4CU=";
fetchSubmodules = true;
};
@ -33,13 +33,14 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/extras
cp -r ./{locale,meta,script,*.lua} $out/extras/
cp ./bin/Linux/{bee.so,lpeglabel.so} $out/extras
cp ./bin/Linux/lua-language-server $out/extras/.lua-language-server-unwrapped
makeWrapper $out/extras/.lua-language-server-unwrapped \
install -Dt "$out"/share/lua-language-server/bin/Linux bin/Linux/lua-language-server
install -m644 -t "$out"/share/lua-language-server/bin/Linux bin/Linux/*.*
install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua
cp -r locale meta script "$out"/share/lua-language-server
makeWrapper "$out"/share/lua-language-server/bin/Linux/lua-language-server \
$out/bin/lua-language-server \
--add-flags "-E $out/extras/main.lua \
--add-flags "-E $out/share/lua-language-server/main.lua \
--logpath='~/.cache/sumneko_lua/log' \
--metapath='~/.cache/sumneko_lua/meta'"

View file

@ -8,11 +8,11 @@ assert tlsSupport -> gnutls != null;
stdenv.mkDerivation rec {
pname = "tintin";
version = "2.02.05";
version = "2.02.11";
src = fetchurl {
url = "mirror://sourceforge/tintin/tintin-${version}.tar.gz";
sha256 = "sha256-Y6cAUhItJNade8ASOVdF8aBBLf/UVqjoqrhXBNRL1aE=";
sha256 = "sha256-s5KJ7x4m0vW39+M/cLzYlAYMld2WwVe7l28GPFmosfU=";
};
nativeBuildInputs = lib.optional tlsSupport gnutls.dev;

View file

@ -44,16 +44,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.17";
version = "6.19";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-nbHyQ12AJiw3dzF98HWFWu6j5qUst3xjDsGysfuUjwg=";
sha256 = "sha256-QYLi2WJ3BMw3b0b8MQlYDqkHd5b0T17oPgjj6Wvwq2Y=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "6.3.0";
version = "6.4.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
sha256 = "sha256-pfAtMqAoNpKkpiX1Qc+7tFGIMShHTFyANiOFMXzQmfA=";
sha256 = "sha256-24uF87kQWQ9hrb+gAFqZXWE+KZocxz0AVT1w3IEBDjY=";
};
patches = [
@ -65,7 +65,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-rR5m6D8M3vTXXIHzsF8+o2G5rlRS2HLfCHoatbJwlrQ=";
sha256 = "sha256-1Ng+kFFnqEndlCvI0eG1YmyqPdcolD3cVJ2KU5GU7Z4=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

View file

@ -157,5 +157,6 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.viric ];
mainProgram = "gs";
};
}

File diff suppressed because it is too large Load diff

View file

@ -548,8 +548,8 @@ ojroques/vim-oscyank@main
Olical/aniseed
Olical/conjure
olimorris/onedark.nvim
onsails/diaglist.nvim
onsails/lspkind-nvim
onsails/vimway-lsp-diag.nvim
OrangeT/vim-csharp
osyo-manga/shabadou.vim
osyo-manga/vim-anzu

View file

@ -61,13 +61,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sympa";
version = "6.2.60";
version = "6.2.64";
src = fetchFromGitHub {
owner = "sympa-community";
repo = pname;
rev = version;
sha256 = "0mnpmkvxf3bmrmahkf3d0i5r6sj7xb1yca5v7xdnwnh5wh9vlx7v";
sha256 = "sha256-7bBOhx6sDyln37OEgRLJwgu0rklJm872hINog2EJ/+E=";
};
configureFlags = [

View file

@ -4,12 +4,12 @@
with python3Packages; buildPythonApplication rec {
pname = "synadm";
version = "0.30";
version = "0.31";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "9e7c2e2540fb786c1064a9a2bfe6ef3ec8b0ed27f6fd6beda80ed615c72a6103";
sha256 = "1098a5248a1e2de53ced3c699b3b78ced3327c5f4e0ff092a95ef4940e4f9c6e";
};
postPatch = ''

View file

@ -15,13 +15,13 @@ let
]);
in stdenvNoCC.mkDerivation rec {
pname = "moonraker";
version = "unstable-2021-09-21";
version = "unstable-2021-10-03";
src = fetchFromGitHub {
owner = "Arksine";
repo = "moonraker";
rev = "2447ccab6252fddc829da3eec8b29d1abe3dee60";
sha256 = "qaorF26e2pkOCxiUfo8MOPQVpZjx5G1uo66jFoQpMcs=";
rev = "c3f1b290f8667f771f2d58a3f012e87853c4e85c";
sha256 = "a49sVvgzpGHrjWbSH6GiH5kGeXm1LrLgd+lKv7Xxi9w=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -4,11 +4,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "adafruit-ampy";
version = "1.0.7";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd";
sha256 = "f4cba36f564096f2aafd173f7fbabb845365cc3bb3f41c37541edf98b58d3976";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -46,6 +46,13 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/strongswan/strongswan/pull/150.patch";
sha256 = "1irfxb99blb8v3hs0kmlhzkkwbmds1p0gq319z8lmacz36cgyj2c";
})
# fix build with -fno-common tollchain
(fetchpatch {
name = "fno-common.patch";
url = "https://git.strongswan.org/?p=strongswan.git;a=patch;h=91c6387e69c09beaa9b9ca1e28471751a834fc24";
sha256 = "0jp9walxwffp5cl7q0hb80h3s2gdj1nn3n8bvnbmwgh2s6pi148f";
})
];
postPatch = optionalString stdenv.isLinux ''

View file

@ -0,0 +1,41 @@
{ lib
, buildGoModule
, curl
, fetchFromGitHub
, pkg-config
}:
buildGoModule rec {
pname = "cameradar";
version = "5.0.1";
src = fetchFromGitHub {
owner = "Ullaakut";
repo = pname;
rev = "v${version}";
sha256 = "03nm03cqhq04ixw4rssfkgrin918pa0v7ai26v4h99gz7j8hs7ll";
};
vendorSha256 = "099np130dn51nb4lcyrrm46fihfipxrw0vpqs2jh5g4c6pnbk200";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
curl
];
subPackages = [
"cmd/cameradar"
];
# At least one test is outdated
#doCheck = false;
meta = with lib; {
description = "RTSP stream access tool";
homepage = "https://github.com/Ullaakut/cameradar";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,39 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "mongoaudit";
version = "0.1.1";
disabled = python3.pythonOlder "3.8";
src = fetchFromGitHub {
owner = "stampery";
repo = pname;
rev = version;
sha256 = "17k4vw5d3kr961axl49ywid4cf3n7zxvm885c4lv15w7s2al1425";
};
propagatedBuildInputs = with python3.pkgs; [
pymongo
setuptools
urwid
];
checkInputs = with python3.pkgs; [
pytestCheckHook
];
pythonImportsCheck = [
"mongoaudit"
];
meta = with lib; {
description = "MongoDB auditing and pentesting tool";
homepage = "https://github.com/stampery/mongoaudit";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1375,6 +1375,8 @@ with pkgs;
ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { };
ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { };
ec2-utils = callPackage ../tools/virtualization/ec2-utils { };
exoscale-cli = callPackage ../tools/admin/exoscale-cli { };
@ -2281,6 +2283,8 @@ with pkgs;
calendar-cli = callPackage ../tools/networking/calendar-cli { };
cameradar = callPackage ../tools/security/cameradar { };
candle = libsForQt5.callPackage ../applications/misc/candle { };
capstone = callPackage ../development/libraries/capstone { };
@ -3530,6 +3534,8 @@ with pkgs;
mcrypt = callPackage ../tools/misc/mcrypt { };
mongoaudit = callPackage ../tools/security/mongoaudit { };
mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
@ -22782,6 +22788,8 @@ with pkgs;
ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { };
i-dot-ming = callPackage ../data/fonts/i-dot-ming { };
ibm-plex = callPackage ../data/fonts/ibm-plex { };
iconpack-jade = callPackage ../data/icons/iconpack-jade { };