Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-18 18:01:12 +00:00 committed by GitHub
commit e15af378fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 141 additions and 86 deletions

View file

@ -581,7 +581,17 @@ rec {
in
mkOptionType rec {
name = "enum";
description = "one of ${concatMapStringsSep ", " show values}";
description =
# Length 0 or 1 enums may occur in a design pattern with type merging
# where an "interface" module declares an empty enum and other modules
# provide implementations, each extending the enum with their own
# identifier.
if values == [] then
"impossible (empty enum)"
else if builtins.length values == 1 then
"value ${show (builtins.head values)} (singular enum)"
else
"one of ${concatMapStringsSep ", " show values}";
check = flip elem values;
merge = mergeEqualOption;
functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); };

View file

@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
version = "2.29.0";
version = "2.30.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
sha256 = "1y4xvnwh2mqbc39pmnpgjg8mlx208s2pipm7dazq4bgmay7k9zh0";
sha256 = "0xh28m3slzg6bp0fm183m62ydzqkvj384j4dwsfalgz4ndwvy595";
};
appimageContents = appimageTools.extractType2 {

View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
version = "7.1.0";
version = "7.1.1";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
rev = "${version}-${rel}";
sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
sha256 = "sha256-mQeeeCOxhUTiUcOJ1OiIiJ+7envAIGO67Bp4EAf4sIE=";
};
extraBuildInputs = [ jsoncpp libhdhomerun ];

View file

@ -8,12 +8,12 @@
}:
buildPythonApplication rec {
version = "1.28.6";
version = "1.29.2";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
sha256 = "1d44906f7ab738ba2d1785130ed31b16111eee6dc5a1dbd7252091dae48c5281";
sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc=";
};
# lots of networking and other fails

View file

@ -1,45 +0,0 @@
From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Tue, 23 Feb 2021 20:25:30 +1100
Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in
use
Closes #475
---
client/renderers/EGL/egl.c | 3 ++-
client/src/main.c | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c
index b7a5644..72ce50d 100644
--- a/client/renderers/EGL/egl.c
+++ b/client/renderers/EGL/egl.c
@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this)
if (!this->formatValid)
return;
- int w, h;
+ int w = 0, h = 0;
+
switch(this->format.rotate)
{
case LG_ROTATE_0:
diff --git a/client/src/main.c b/client/src/main.c
index f05e929..f5d6fad 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -186,8 +186,9 @@ static void updatePositionInfo(void)
if (!g_state.haveSrcSize)
goto done;
- float srcW;
- float srcH;
+ float srcW = 0.0f;
+ float srcH = 0.0f;
+
switch(params.winRotate)
{
case LG_ROTATE_0:
--
2.30.1

View file

@ -1,40 +1,54 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol
, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver
, expat, libbfd
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeDesktopItem, cmake, pkg-config
, SDL, SDL2_ttf, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig
, libXi, libXScrnSaver, libXinerama
, wayland, wayland-protocols
}:
let
desktopItem = makeDesktopItem {
name = "looking-glass-client";
desktopName = "Looking Glass Client";
type = "Application";
exec = "looking-glass-client";
icon = "lg-logo";
terminal = true;
};
in
stdenv.mkDerivation rec {
pname = "looking-glass-client";
version = "B3";
version = "B4";
src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = version;
sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f";
sha256 = "0fwmz0l1dcfwklgvxmv0galgj2q3nss90kc3jwgf6n80x27rsnhf";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols
libffi libGLU libXScrnSaver expat libbfd
SDL SDL2_ttf freefont_ttf spice-protocol
libbfd nettle fontconfig
libXi libXScrnSaver libXinerama
wayland wayland-protocols
];
patches = [
# error: h may be used uninitialized in this function [-Werror=maybe-uninitialized]
# Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3.
# Including our own patch here since upstream commit patch doesnt apply cleanly on B3
./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch
];
patchFlags = "-p2";
sourceRoot = "source/client";
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
postUnpack = ''
echo $version > source/VERSION
export sourceRoot="source/client"
'';
postInstall = ''
mkdir -p $out/share/pixmaps
ln -s ${desktopItem}/share/applications $out/share/
cp $src/resources/lg-logo.png $out/share/pixmaps
'';
meta = with lib; {
description = "A KVM Frame Relay (KVMFR) implementation";
longDescription = ''
@ -46,7 +60,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://looking-glass.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ alexbakker ];
maintainers = with maintainers; [ alexbakker babbaj ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -63,11 +63,19 @@ let
# We can't use the existing fetchCrate function, since it uses a
# recursive hash of the unpacked crate.
fetchCrate = pkg: fetchurl {
name = "crate-${pkg.name}-${pkg.version}.tar.gz";
url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download";
sha256 = pkg.checksum;
};
fetchCrate = pkg:
assert lib.assertMsg (pkg ? checksum) ''
Package ${pkg.name} does not have a checksum.
Please note that the Cargo.lock format where checksums used to be listed
under [metadata] is not supported.
If that is the case, running `cargo update` with a recent toolchain will
automatically update the format along with the crate's depenendencies.
'';
fetchurl {
name = "crate-${pkg.name}-${pkg.version}.tar.gz";
url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download";
sha256 = pkg.checksum;
};
# Fetch and unpack a crate.
mkCrate = pkg:

View file

@ -276,6 +276,11 @@ let
--prefix NODE_PATH : ${self.postcss}/lib/node_modules \
--prefix NODE_PATH : ${self.autoprefixer}/lib/node_modules
'';
passthru.tests = {
simple-execution = pkgs.callPackage ./package-tests/postcss-cli.nix {
inherit (self) postcss-cli;
};
};
meta.mainProgram = "postcss";
};

View file

@ -0,0 +1,45 @@
{ runCommand, postcss-cli }:
let
inherit (postcss-cli) packageName version;
in
runCommand "${packageName}-tests" { meta.timeout = 60; }
''
# get version of installed program and compare with package version
claimed_version="$(${postcss-cli}/bin/postcss --version)"
if [[ "$claimed_version" != "${version}" ]]; then
echo "Error: program version does not match package version ($claimed_version != ${version})"
exit 1
fi
# run basic help command
${postcss-cli}/bin/postcss --help > /dev/null
# basic autoprefixer test
config_dir="$(mktemp -d)"
clean_up() {
rm -rf "$config_dir"
}
trap clean_up EXIT
echo "
module.exports = {
plugins: {
'autoprefixer': { overrideBrowserslist: 'chrome 40' },
},
}
" > "$config_dir/postcss.config.js"
input='a{ user-select: none; }'
expected_output='a{ -webkit-user-select: none; user-select: none; }'
actual_output="$(echo $input | ${postcss-cli}/bin/postcss --no-map --config $config_dir)"
if [[ "$actual_output" != "$expected_output" ]]; then
echo "Error: autoprefixer did not output the correct CSS:"
echo "$actual_output"
echo "!="
echo "$expected_output"
exit 1
fi
# needed for Nix to register the command as successful
touch $out
''

View file

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "docker";
version = "4.4.4";
version = "5.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "d3393c878f575d3a9ca3b94471a3c89a6d960b35feb92f033c0de36cc9d934db";
sha256 = "sha256-PovEdTTgypMx1ywy8ogbsTuT3tC83qs8gz+3z2HAqaU=";
};
nativeBuildInputs = lib.optional isPy27 mock;

View file

@ -49,7 +49,7 @@ buildPythonPackage rec {
"--deselect=tests/test_logging.py::LoggingTest::test_override_app_level"
];
pythonImportCheck = [ "flask_restx" ];
pythonImportsCheck = [ "flask_restx" ];
meta = with lib; {
homepage = "https://flask-restx.readthedocs.io/en/${version}/";

View file

@ -39,7 +39,7 @@ buildPythonPackage rec {
hypothesis
];
pythonImportCheck = [
pythonImportsCheck = [
"h2.connection"
"h2.config"
];

View file

@ -3442,6 +3442,18 @@ final: prev:
meta.homepage = "https://github.com/jlesquembre/nterm.nvim/";
};
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls-nvim";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "56d4b76203d2b442353e25c247f49fa5ca70f42e";
sha256 = "0kmgln5ra2lpdvj9866a11l9h04zc1dmvxcw8gbra6f72ars3jwr";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
numb-nvim = buildVimPluginFrom2Nix {
pname = "numb-nvim";
version = "2021-07-12";

View file

@ -399,6 +399,10 @@ self: super: {
dependencies = with self; [ plenary-nvim ];
});
null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: {
path = "null-ls.nvim";
});
nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: {
dependencies = with self; [ popfix ];
});

View file

@ -258,6 +258,7 @@ jonsmithers/vim-html-template-literals
joonty/vim-xdebug
josa42/coc-lua
josa42/vim-lightline-coc
jose-elias-alvarez/null-ls.nvim@main
joshdick/onedark.vim@main
jpalardy/vim-slime@main
jparise/vim-graphql

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }:
{ lib, stdenv, fetchurl, makeWrapper, jre, which, gawk }:
with lib;
@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre8 which gawk ];
installPhase = ''
mkdir -p "$out/share/neo4j"
@ -24,8 +22,8 @@ stdenv.mkDerivation rec {
do
makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \
"$out/bin/$NEO4J_SCRIPT" \
--prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \
--set JAVA_HOME "$jre8"
--prefix PATH : "${lib.makeBinPath [ jre which gawk ]}" \
--set JAVA_HOME "${jre}"
done
'';

View file

@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/bootandy/dust";
license = licenses.asl20;
maintainers = with maintainers; [ infinisil SuperSandro2000 ];
mainProgram = "dust";
};
}

View file

@ -19978,7 +19978,9 @@ in
check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { };
neo4j = callPackage ../servers/nosql/neo4j { };
neo4j = callPackage ../servers/nosql/neo4j {
jre = jre8_headless;
};
neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };