Merge master into staging-next

Changed files
+426 -23
maintainers
nixos
modules
programs
pkgs
applications
misc
rootbar
networking
appgate-sdp
browsers
science
math
qalculate-gtk
version-management
tortoisehg
development
libraries
ocaml-modules
csexp
python-modules
libcst
pydexcom
tools
fedora-coreos-config-transpiler
misc
nimlsp
servers
home-assistant
web-apps
jirafeau
tools
top-level
+10
maintainers/maintainer-list.nix
···
github = "ymarkus";
githubId = 62380378;
+
ymatsiuk = {
+
name = "Yurii Matsiuk";
+
email = "ymatsiuk@users.noreply.github.com";
+
github = "ymatsiuk";
+
githubId = 24990891;
+
keys = [{
+
longkeyid = "rsa4096/0x61302290298601AA";
+
fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA";
+
}];
+
};
ymeister = {
name = "Yuri Meister";
email = "47071325+ymeister@users.noreply.github.com";
+23
nixos/modules/programs/appgate-sdp.nix
···
+
{ config, pkgs, lib, ... }:
+
+
with lib;
+
+
{
+
options = {
+
programs.appgate-sdp = {
+
enable = mkEnableOption
+
"AppGate SDP VPN client";
+
};
+
};
+
+
config = mkIf config.programs.appgate-sdp.enable {
+
boot.kernelModules = [ "tun" ];
+
environment.systemPackages = [ pkgs.appgate-sdp ];
+
services.dbus.packages = [ pkgs.appgate-sdp ];
+
systemd = {
+
packages = [ pkgs.appgate-sdp ];
+
# https://github.com/NixOS/nixpkgs/issues/81138
+
services.appgatedriver.wantedBy = [ "multi-user.target" ];
+
};
+
};
+
}
+45
pkgs/applications/misc/rootbar/default.nix
···
+
{ stdenv
+
, fetchhg
+
, pkg-config
+
, meson
+
, ninja
+
, gtk3
+
, json_c
+
, libpulseaudio
+
, wayland
+
, wrapGAppsHook
+
}:
+
+
stdenv.mkDerivation rec {
+
pname = "rootbar";
+
version = "unstable-2020-11-13";
+
+
src = fetchhg {
+
url = "https://hg.sr.ht/~scoopta/rootbar";
+
rev = "a018e10cfc5e";
+
sha256 = "sha256-t6oDIYCVaCxaYy4bS1vxESaFDNxsx5JQLQK77eVuafE=";
+
};
+
+
nativeBuildInputs = [
+
meson ninja pkg-config wrapGAppsHook
+
];
+
+
buildInputs = [
+
gtk3
+
json_c
+
libpulseaudio
+
wayland
+
];
+
+
meta = with stdenv.lib; {
+
homepage = "https://github.com/alexays/waybar";
+
description = "A bar for Wayland WMs";
+
longDescription = ''
+
Root Bar is a bar for wlroots based wayland compositors such as sway and
+
was designed to address the lack of good bars for wayland.
+
'';
+
license = licenses.gpl3Plus;
+
maintainers = with maintainers; [ AndersonTorres ];
+
platforms = platforms.unix;
+
};
+
}
+169
pkgs/applications/networking/appgate-sdp/default.nix
···
+
{ alsaLib
+
, at-spi2-atk
+
, at-spi2-core
+
, atk
+
, bash
+
, cairo
+
, coreutils
+
, cups
+
, curl
+
, dbus
+
, dnsmasq
+
, dpkg
+
, e2fsprogs
+
, expat
+
, fetchurl
+
, gdk-pixbuf
+
, glib
+
, gtk3
+
, icu
+
, iproute
+
, krb5
+
, lib
+
, libX11
+
, libXScrnSaver
+
, libXcomposite
+
, libXcursor
+
, libXdamage
+
, libXext
+
, libXfixes
+
, libXi
+
, libXrandr
+
, libXrender
+
, libXtst
+
, libsecret
+
, libuuid
+
, libxcb
+
, lttng-ust
+
, makeWrapper
+
, networkmanager
+
, nspr
+
, nss
+
, openssl
+
, pango
+
, procps
+
, python37
+
, python37Packages
+
, stdenv
+
, systemd
+
, zlib
+
}:
+
with stdenv.lib;
+
let
+
deps = [
+
alsaLib
+
at-spi2-atk
+
at-spi2-core
+
atk
+
cairo
+
cups
+
curl
+
dbus
+
expat
+
gdk-pixbuf
+
glib
+
gtk3
+
icu
+
krb5
+
libX11
+
libXScrnSaver
+
libXcomposite
+
libXcursor
+
libXdamage
+
libXext
+
libXfixes
+
libXi
+
libXrandr
+
libXrender
+
libXtst
+
libsecret
+
libuuid
+
libxcb
+
lttng-ust
+
nspr
+
nss
+
openssl
+
pango
+
stdenv.cc.cc
+
systemd
+
zlib
+
];
+
rpath = stdenv.lib.makeLibraryPath deps ;
+
in
+
stdenv.mkDerivation rec {
+
pname = "appgate-sdp";
+
version = "5.1.2";
+
+
src = fetchurl {
+
url = "https://bin.appgate-sdp.com/5.1/client/appgate-sdp_${version}_amd64.deb";
+
sha256 = "0v4vfibg1giml3vfz2w7qypqzymvfchi5qm6vfagah2vfbkw7xc2";
+
};
+
+
dontConfigure = true;
+
dontBuild = true;
+
enableParallelBuilding = true;
+
+
buildInputs = [
+
python37
+
python37Packages.dbus-python
+
];
+
+
nativeBuildInputs = [
+
makeWrapper
+
dpkg
+
];
+
+
unpackPhase = ''
+
dpkg-deb -x $src $out
+
'';
+
+
installPhase = ''
+
mkdir -p $out/bin
+
ln -s "$out/opt/appgate/appgate" "$out/bin/appgate"
+
cp -r $out/usr/share $out/share
+
+
for file in $out/opt/appgate/linux/appgate-resolver.pre \
+
$out/opt/appgate/linux/appgate-dumb-resolver.pre \
+
$out/lib/systemd/system/appgatedriver.service \
+
$out/lib/systemd/system/appgate-dumb-resolver.service \
+
$out/lib/systemd/system/appgate-resolver.service
+
do
+
substituteInPlace $file \
+
--replace "/bin/sh" "${bash}/bin/sh" \
+
--replace "/opt/" "$out/opt/" \
+
--replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" \
+
--replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media" \
+
--replace "cat" "${coreutils}/bin/cat" \
+
--replace "chattr" "${e2fsprogs}/bin/chattr" \
+
--replace "mv" "${coreutils}/bin/mv" \
+
--replace "pkill" "${procps}/bin/pkill"
+
done
+
+
substituteInPlace $out/opt/appgate/linux/nm.py --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
+
substituteInPlace $out/opt/appgate/linux/set_dns \
+
--replace "service appgate-resolver stop" "${systemd.out}/bin/systemctl stop appgate-resolver" \
+
--replace "/etc/appgate.conf" "$out/etc/appgate.conf"
+
+
'';
+
+
postFixup = ''
+
find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
+
for binary in $out/opt/appgate/appgate-driver \
+
$out/opt/appgate/appgate \
+
$out/opt/appgate/service/createdump \
+
$out/opt/appgate/service/appgateservice.bin
+
do
+
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary
+
done
+
+
wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${stdenv.lib.makeBinPath [ iproute networkmanager dnsmasq ]}
+
wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH
+
'';
+
meta = with stdenv.lib; {
+
description = "Appgate SDP (Software Defined Perimeter) desktop client";
+
homepage = https://www.appgate.com/support/software-defined-perimeter-support;
+
license = licenses.unfree;
+
platforms = platforms.linux;
+
maintainers = with maintainers; [ ymatsiuk ];
+
};
+
}
+3 -3
pkgs/applications/networking/browsers/chromium/upstream-info.json
···
}
},
"beta": {
-
"version": "88.0.4324.50",
-
"sha256": "17v0qp05785xc4whsbw6fmf0x5ccjx2mk6n4qy6z2mx2yjjjfv8q",
-
"sha256bin64": "01cphbd56l7g3cdmrvwynkzrpx9h3v7pz6ac76sxlp6irjzhbnva",
+
"version": "88.0.4324.79",
+
"sha256": "1xmssngzg370gazvqngw5mzhfq476fan5y3sp4ggs8fx5anh6jlz",
+
"sha256bin64": "16m2k4kr92236yvfnl276cy77d5324b7ca3grsw990c0b2kgizq7",
"deps": {
"gn": {
"version": "2020-11-05",
+2 -2
pkgs/applications/science/math/qalculate-gtk/default.nix
···
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
-
version = "3.15.0";
+
version = "3.16.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
-
sha256 = "1w0r9vv1h3zbfdvk8965g5plfkz5clf81riil5b394ms9vsw0bx5";
+
sha256 = "1vqzrh5zxwfvih6c3lak0wkkw6bajl88xzl1zk84gxsk9wdymrk4";
};
hardeningDisable = [ "format" ];
+4 -4
pkgs/applications/version-management/tortoisehg/default.nix
···
let
tortoisehgSrc = fetchurl rec {
meta.name = "tortoisehg-${meta.version}";
-
meta.version = "5.2.1";
-
url = "https://bitbucket.org/tortoisehg/thg/get/14221e991a5b623e0072d3bd340b759dbe9072ca.tar.gz";
-
sha256 = "01rpzf5z99izcdda1ps9bhqvhw6qghagd8c1y7x19rv223zi05dv";
+
meta.version = "5.6";
+
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz";
+
sha256 = "031bafj88wggpvw0lgvl0djhlbhs9nls9vzwvni8yn0m0bgzc9gr";
};
tortoiseMercurial = mercurial.overridePythonAttrs (old: rec {
inherit (tortoisehgSrc.meta) version;
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-
sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q";
+
sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz";
};
});
+3 -1
pkgs/development/libraries/gpgme/default.nix
···
sha256 = "00d4sxq63601lzdp2ha1i8fvybh7dzih4531jh8bx07fab3sw65g";
})
# Disable python tests on Darwin as they use gpg (see configureFlags below)
-
] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch;
+
] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch
+
# Fix _AC_UNDECLARED_WARNING for autoconf≥2.70. See https://lists.gnupg.org/pipermail/gnupg-devel/2020-November/034643.html
+
++ lib.optional stdenv.cc.isClang ./fix-clang-autoconf-undeclared-warning.patch;
outputs = [ "out" "dev" "info" ];
outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
+36
pkgs/development/libraries/gpgme/fix-clang-autoconf-undeclared-warning.patch
···
+
diff -Naur gpgme.old/configure.ac gpgme.new/configure.ac
+
--- gpgme.old/configure.ac 2020-11-12 04:19:50.000000000 -0500
+
+++ gpgme.new/configure.ac 2021-01-08 03:04:38.000000000 -0500
+
@@ -166,6 +166,16 @@
+
mym4_minor mym4_micro)
+
AC_SUBST(VERSION_NUMBER)
+
+
+# Try to find a thread-safe version of ttyname().
+
+gnupg_REPLACE_TTYNAME_R
+
+if test "$ac_cv_func_ttyname_r" != yes; then
+
+ AC_MSG_WARN([
+
+***
+
+*** ttyname() is not thread-safe and ttyname_r() does not exist
+
+***])
+
+fi
+
+
+
+
+
# We need to compile and run a program on the build machine. A
+
# comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in
+
# the AC archive is broken for autoconf 2.57. Given that there is no
+
@@ -658,15 +668,6 @@
+
+
AC_FUNC_FSEEKO
+
+
-# Try to find a thread-safe version of ttyname().
+
-gnupg_REPLACE_TTYNAME_R
+
-if test "$ac_cv_func_ttyname_r" != yes; then
+
- AC_MSG_WARN([
+
-***
+
-*** ttyname() is not thread-safe and ttyname_r() does not exist
+
-***])
+
-fi
+
-
+
# Try to find a thread-safe version of getenv().
+
have_thread_safe_getenv=no
+
jm_GLIBC21
+2
pkgs/development/libraries/libfprint/default.nix
···
nss
];
+
NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
+
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
];
+3 -2
pkgs/development/libraries/libqalculate/default.nix
···
stdenv.mkDerivation rec {
pname = "libqalculate";
-
version = "3.14.0";
+
version = "3.16.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
-
sha256 = "1j4sr9s7152xmci677pnz64spv8s3ia26fbp5cqx8ydv7swlivh2";
+
sha256 = "0nrf03q3qrsvxf6kjpv69l49yfal79834a3jv75mzi6y674ach9g";
};
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ];
buildInputs = [ curl gettext libiconv readline ];
+
configureFlags = ["--with-readline=${readline.dev}"];
propagatedBuildInputs = [ libxml2 mpfr icu ];
enableParallelBuilding = true;
+2
pkgs/development/ocaml-modules/csexp/default.nix
···
pname = "csexp";
version = "1.3.2";
+
useDune2 = true;
+
minimumOCamlVersion = "4.02.3";
src = fetchurl {
+3 -2
pkgs/development/python-modules/libcst/default.nix
···
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, black, isort
-
, pytestCheckHook, pyyaml, typing-extensions, typing-inspect }:
+
, pytestCheckHook, pyyaml, typing-extensions, typing-inspect, dataclasses }:
buildPythonPackage rec {
pname = "libcst";
···
disabled = pythonOlder "3.6";
-
propagatedBuildInputs = [ pyyaml typing-inspect ];
+
propagatedBuildInputs = [ pyyaml typing-inspect ]
+
++ lib.optional (pythonOlder "3.7") dataclasses;
checkInputs = [ black isort pytestCheckHook ];
+30
pkgs/development/python-modules/pydexcom/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchFromGitHub
+
, requests
+
}:
+
+
buildPythonPackage rec {
+
pname = "pydexcom";
+
version = "0.2.0";
+
+
src = fetchFromGitHub {
+
owner = "gagebenne";
+
repo = pname;
+
rev = version;
+
sha256 = "19h7r0qbsqd6k6g4nz6z3k9kdmk0sx5zpsrgxwnhsff5fqi0y2ls";
+
};
+
+
propagatedBuildInputs = [ requests ];
+
+
# tests are interacting with the Dexcom API
+
doCheck = false;
+
pythonImportsCheck = [ "pydexcom" ];
+
+
meta = with lib; {
+
description = "Python API to interact with Dexcom Share service";
+
homepage = "https://github.com/gagebenne/pydexcom";
+
license = with licenses; [ mit ];
+
maintainers = with maintainers; [ fab ];
+
};
+
}
+2 -2
pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
···
buildGoModule rec {
pname = "fcct";
-
version = "0.8.0";
+
version = "0.9.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "fcct";
rev = "v${version}";
-
sha256 = "0w3vhfjpmpahb08fp6czixhlqhk6izglmwdpj2l19ksz8fc8aq54";
+
sha256 = "0kdsnsp9nzkkfwakcx64md66yz2k7cpw8bkhdv798yirbrqprgp6";
};
vendorSha256 = null;
+48
pkgs/development/tools/misc/nimlsp/default.nix
···
+
{ stdenv, fetchFromGitHub, srcOnly, nim }:
+
let
+
astpatternmatching = fetchFromGitHub {
+
owner = "krux02";
+
repo = "ast-pattern-matching";
+
rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96";
+
sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq";
+
};
+
+
jsonschema = fetchFromGitHub {
+
owner = "PMunch";
+
repo = "jsonschema";
+
rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf";
+
sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz";
+
};
+
in
+
stdenv.mkDerivation rec {
+
pname = "nimlsp";
+
version = "0.2.6";
+
+
src = fetchFromGitHub {
+
owner = "PMunch";
+
repo = "nimlsp";
+
rev = "v${version}";
+
sha256 = "13kw3zjh0iqymwqxwhyj8jz6hgswwahf1rjd6iad7c6gcwrrg6yl";
+
};
+
+
nativeBuildInputs = [ nim ];
+
+
buildPhase = ''
+
export HOME=$TMPDIR
+
nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \
+
c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \
+
-d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp
+
'';
+
+
installPhase = ''
+
install -Dt $out/bin src/nimlsp
+
'';
+
+
meta = with stdenv.lib; {
+
description = "Language Server Protocol implementation for Nim";
+
homepage = "https://github.com/PMunch/nimlsp";
+
license = licenses.mit;
+
platforms = nim.meta.platforms;
+
maintainers = [ maintainers.marsam ];
+
};
+
}
+1 -1
pkgs/servers/home-assistant/component-packages.nix
···
"device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ];
"device_tracker" = ps: with ps; [ ];
"devolo_home_control" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: devolo-home-control-api
-
"dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom
+
"dexcom" = ps: with ps; [ pydexcom ];
"dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
"dialogflow" = ps: with ps; [ aiohttp-cors ];
"digital_ocean" = ps: with ps; [ digital-ocean ];
+2 -3
pkgs/servers/web-apps/jirafeau/default.nix
···
{ stdenv, fetchFromGitLab, writeText }:
-
let
localConfig = writeText "config.local.php" ''
<?php
···
in
stdenv.mkDerivation rec {
pname = "jirafeau";
-
version = "4.1.1";
+
version = "4.3.0";
src = fetchFromGitLab {
owner = "mojo42";
repo = "Jirafeau";
rev = version;
-
sha256 = "09gq5zhynygpqj0skq7ifnn9yjjg7qnc6kjvaas7f53av2707z4c";
+
hash = "sha256-9v6rtxViXsolx5AKSp2HxcFyU1XJWFSiqzTBl+dQBD4=";
};
installPhase = ''
+2 -1
pkgs/tools/misc/mcrypt/default.nix
···
./overflow_CVE-2012-4409.patch
./segv.patch
./sprintf_CVE-2012-4527.patch
+
./malloc_to_stdlib.patch
];
buildInputs = [ libmcrypt libmhash ];
···
ever-wider range of algorithms and modes.
'';
homepage = "http://mcrypt.sourceforge.net";
-
license = stdenv.lib.licenses.gpl2;
+
license = stdenv.lib.licenses.gpl3Only;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.qknight ];
};
+26
pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch
···
+
From e295844e8ef5c13487996ab700e5f12a7fadb1a6 Mon Sep 17 00:00:00 2001
+
From: Nima Vasseghi <nmv@fb.com>
+
Date: Wed, 30 Dec 2020 16:06:46 -0800
+
Subject: [PATCH] malloc.h to stdlib.h in rfc2440.c
+
+
The malloc.h is deprecated and should not be used
+
---
+
src/rfc2440.c | 2 +-
+
1 file changed, 1 insertion(+), 1 deletion(-)
+
+
diff --git a/src/rfc2440.c b/src/rfc2440.c
+
index 5a1f296..4d6a5db 100644
+
--- a/src/rfc2440.c
+
+++ b/src/rfc2440.c
+
@@ -23,7 +23,7 @@
+
#include <zlib.h>
+
#endif
+
#include <stdio.h>
+
-#include <malloc.h>
+
+#include <stdlib.h>
+
+
#include "xmalloc.h"
+
#include "keys.h"
+
--
+
2.13.5
+
+2 -2
pkgs/tools/misc/youtube-dl/default.nix
···
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
-
version = "2021.01.03";
+
version = "2021.01.08";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-
sha256 = "0qqixcr748nfhnihkjzayzdja26kgrsds45q5s8krmfm3b79ipli";
+
sha256 = "1k870v9xc7g16nvixa272sdjnmc7pl49ymmnn6rdz0mcj2548h3k";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
+6
pkgs/top-level/all-packages.nix
···
nrpl = callPackage ../development/tools/nrpl { };
+
nimlsp = callPackage ../development/tools/misc/nimlsp { };
+
neko = callPackage ../development/compilers/neko { };
nextpnr = callPackage ../development/compilers/nextpnr { };
···
appeditor = callPackage ../applications/misc/appeditor { };
+
appgate-sdp = callPackage ../applications/networking/appgate-sdp { };
+
apostrophe = callPackage ../applications/editors/apostrophe {
pythonPackages = python3Packages;
···
swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };
tiramisu = callPackage ../applications/misc/tiramisu { };
+
+
rootbar = callPackage ../applications/misc/rootbar {};
waybar = callPackage ../applications/misc/waybar {};
+2
pkgs/top-level/python-packages.nix
···
pydenticon = callPackage ../development/python-modules/pydenticon { };
+
pydexcom = callPackage ../development/python-modules/pydexcom { };
+
pydicom = callPackage ../development/python-modules/pydicom { };
pydispatcher = callPackage ../development/python-modules/pydispatcher { };