Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-12 12:20:20 +00:00 committed by GitHub
commit 15db604744
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 121 additions and 115 deletions

View file

@ -544,12 +544,6 @@
githubId = 638836; githubId = 638836;
name = "Andreas Rammhold"; name = "Andreas Rammhold";
}; };
andreabedini = {
email = "andrea@kzn.io";
github = "andreabedini";
githubId = 69135;
name = "Andrea Bedini";
};
andreasfelix = { andreasfelix = {
email = "fandreas@physik.hu-berlin.de"; email = "fandreas@physik.hu-berlin.de";
github = "andreasfelix"; github = "andreasfelix";

View file

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let let
cfg = config.programs.captive-browser; cfg = config.programs.captive-browser;
in in
@ -27,15 +26,17 @@ in
# the options below are the same as in "captive-browser.toml" # the options below are the same as in "captive-browser.toml"
browser = mkOption { browser = mkOption {
type = types.str; type = types.str;
default = concatStringsSep " " [ "${pkgs.chromium}/bin/chromium" default = concatStringsSep " " [
"--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" ''${pkgs.chromium}/bin/chromium''
''--proxy-server="socks5://$PROXY"'' ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' ''--proxy-server="socks5://$PROXY"''
"--no-first-run" ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"''
"--new-window" ''--no-first-run''
"--incognito" ''--new-window''
"http://cache.nixos.org/" ''--incognito''
]; ''-no-default-browser-check''
''http://cache.nixos.org/''
];
description = '' description = ''
The shell (/bin/sh) command executed once the proxy starts. The shell (/bin/sh) command executed once the proxy starts.
When browser exits, the proxy exits. An extra env var PROXY is available. When browser exits, the proxy exits. An extra env var PROXY is available.
@ -81,42 +82,45 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.captive-browser.dhcp-dns = mkOptionDefault ( programs.captive-browser.dhcp-dns =
if config.networking.networkmanager.enable then let
"${pkgs.networkmanager}/bin/nmcli dev show ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" iface = prefix:
else if config.networking.dhcpcd.enable then optionalString cfg.bindInterface (concatStringsSep " " (map escapeShellArg [ prefix cfg.interface ]));
"${pkgs.dhcpcd}/bin/dhcpcd -U ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" in
else if config.networking.useNetworkd then mkOptionDefault (
"${cfg.package}/bin/systemd-networkd-dns ${escapeShellArg cfg.interface}" if config.networking.networkmanager.enable then
else "${pkgs.networkmanager}/bin/nmcli dev show ${iface ""} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS"
"${config.security.wrapperDir}/udhcpc --quit --now -f -i ${escapeShellArg cfg.interface} -O dns --script ${ else if config.networking.dhcpcd.enable then
pkgs.writeScript "udhcp-script" '' "${pkgs.dhcpcd}/bin/dhcpcd ${iface "-U"} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers"
#!/bin/sh else if config.networking.useNetworkd then
if [ "$1" = bound ]; then "${cfg.package}/bin/systemd-networkd-dns ${iface ""}"
echo "$dns" else
fi "${config.security.wrapperDir}/udhcpc --quit --now -f ${iface "-i"} -O dns --script ${
''}" pkgs.writeShellScript "udhcp-script" ''
); if [ "$1" = bound ]; then
echo "$dns"
fi
''}"
);
security.wrappers.udhcpc = { security.wrappers.udhcpc = {
capabilities = "cap_net_raw+p"; capabilities = "cap_net_raw+p";
source = "${pkgs.busybox}/bin/udhcpc"; source = "${pkgs.busybox}/bin/udhcpc";
}; };
security.wrappers.captive-browser = { security.wrappers.captive-browser = {
capabilities = "cap_net_raw+p"; capabilities = "cap_net_raw+p";
source = pkgs.writeScript "captive-browser" '' source = pkgs.writeShellScript "captive-browser" ''
#!${pkgs.bash}/bin/bash export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' browser = """${cfg.browser}"""
browser = """${cfg.browser}""" dhcp-dns = """${cfg.dhcp-dns}"""
dhcp-dns = """${cfg.dhcp-dns}""" socks5-addr = """${cfg.socks5-addr}"""
socks5-addr = """${cfg.socks5-addr}""" ${optionalString cfg.bindInterface ''
${optionalString cfg.bindInterface '' bind-device = """${cfg.interface}"""
bind-device = """${cfg.interface}""" ''}
''} ''}
''} exec ${cfg.package}/bin/captive-browser
exec ${cfg.package}/bin/captive-browser '';
'';
}; };
}; };
} }

View file

@ -52,7 +52,7 @@ let
# Run the ExecStartPre program. FIXME: this could be a list. # Run the ExecStartPre program. FIXME: this could be a list.
my $preStart = <<END_CMD; my $preStart = <<END_CMD;
${service.serviceConfig.ExecStartPre or ""} ${concatStringsSep "\n" (service.serviceConfig.ExecStartPre or [])}
END_CMD END_CMD
if (defined $preStart && $preStart ne "\n") { if (defined $preStart && $preStart ne "\n") {
print STDERR "running ExecStartPre: $preStart\n"; print STDERR "running ExecStartPre: $preStart\n";
@ -79,7 +79,7 @@ let
# Run the ExecStartPost program. # Run the ExecStartPost program.
my $postStart = <<END_CMD; my $postStart = <<END_CMD;
${service.serviceConfig.ExecStartPost or ""} ${concatStringsSep "\n" (service.serviceConfig.ExecStartPost or [])}
END_CMD END_CMD
if (defined $postStart && $postStart ne "\n") { if (defined $postStart && $postStart ne "\n") {
print STDERR "running ExecStartPost: $postStart\n"; print STDERR "running ExecStartPost: $postStart\n";

View file

@ -0,0 +1,22 @@
{ trivialBuild, lib, fetchurl }:
trivialBuild rec {
pname = "jam-mode";
version = "0.3";
src = fetchurl {
url = "https://dev.gentoo.org/~ulm/distfiles/jam-mode-${version}.el.xz";
sha256 = "1jchgiy2rgvnb3swr6ar72yas6pj4inpgpcq78q01q6snflmi2fh";
};
unpackPhase = ''
xz -cd $src > jam-mode.el
'';
meta = with lib; {
description = "An Emacs major mode for editing Jam files";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ qyliss ];
platforms = platforms.all;
};
}

View file

@ -111,6 +111,8 @@
helm-words = callPackage ./helm-words { }; helm-words = callPackage ./helm-words { };
jam-mode = callPackage ./jam-mode { };
org-mac-link = org-mac-link =
callPackage ./org-mac-link { }; callPackage ./org-mac-link { };

View file

@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
export version="v${version}" export version="v${version}"
''; '';
enableParallelBuilding = true;
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
$out/bin/kak -ui json -e "kill 0" $out/bin/kak -ui json -e "kill 0"

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, openssl }: { lib, stdenv, fetchurl, openssl }:
let let
version = "6.4.15"; version = "6.4.16";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "fetchmail"; pname = "fetchmail";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "sha256-c1shdHSTfhPPzeotQqNGv2hIfg1h7+vk0Nnt3LOia5Y="; sha256 = "sha256-BEuaCsA6+653RJed7+Pi4y45FBvKaP0Mje2i7UCIT7k=";
}; };
buildInputs = [ openssl ]; buildInputs = [ openssl ];

View file

@ -15,13 +15,13 @@
}: }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "visidata"; pname = "visidata";
version = "2.2"; version = "2.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "saulpw"; owner = "saulpw";
repo = "visidata"; repo = "visidata";
rev = "v${version}"; rev = "v${version}";
sha256 = "14169q74vpighxnmpxf3nwi19vrv7p76ybb1zp7h8q2harysxkgl"; sha256 = "1gkvnywjg0n3n7d855ivclsj3d8mzihhkgv9a18srcszkmyix903";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -65,6 +65,17 @@ let
x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf"; x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf";
x64suffix = "12"; x64suffix = "12";
x86suffix = "12"; x86suffix = "12";
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html";
};
"21.01.0" = {
major = "21";
minor = "1";
patch = "0";
x64hash = "01m9g1bs6iiqbd778gjps2zznvqijlyn3mfw38aa0w1rr6ms326a";
x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5";
x64suffix = "14";
x86suffix = "14";
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
}; };
}; };

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-repo"; pname = "git-repo";
version = "2.12.1"; version = "2.12.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "android"; owner = "android";
repo = "tools_repo"; repo = "tools_repo";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9w8kGMgxvbeKpri+zC8mcsbC6pnwqbLbKu1XB5tfBBo="; sha256 = "sha256-E0HGianaTNRVJsFh8tb1wdxEARRXzkFG2OHU6op5oQ4=";
}; };
patches = [ ./import-ssl-module.patch ]; patches = [ ./import-ssl-module.patch ];

View file

@ -16,13 +16,13 @@
buildGoModule rec { buildGoModule rec {
pname = "podman"; pname = "podman";
version = "2.2.1"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "podman"; repo = "podman";
rev = "v${version}"; rev = "v${version}";
sha256 = "166ch73pqx76ppfkhfg3zqxr71jf5pk5asl5bb5rwhyzf7f057q5"; sha256 = "141ii271w2azvhl8ragrgzmir9iq9npl8wmh5dr31kvq4z4syxw1";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -55,8 +55,9 @@ buildGoModule rec {
mv bin/{podman-remote,podman} mv bin/{podman-remote,podman}
'' + '' '' + ''
install -Dm555 bin/podman $out/bin/podman install -Dm555 bin/podman $out/bin/podman
installShellCompletion --bash completions/bash/podman installShellCompletion --bash completions/bash/*
installShellCompletion --zsh completions/zsh/_podman installShellCompletion --fish completions/fish/*
installShellCompletion --zsh completions/zsh/*
MANDIR=$man/share/man make install.man-nobuild MANDIR=$man/share/man make install.man-nobuild
''; '';
@ -65,6 +66,7 @@ buildGoModule rec {
meta = with lib; { meta = with lib; {
homepage = "https://podman.io/"; homepage = "https://podman.io/";
description = "A program for managing pods, containers and container images"; description = "A program for managing pods, containers and container images";
changelog = "https://github.com/containers/podman/blob/v${version}/changelog.txt";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ marsam ] ++ teams.podman.members; maintainers = with maintainers; [ marsam ] ++ teams.podman.members;
platforms = platforms.unix; platforms = platforms.unix;

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl {lib, stdenv, fetchurl, fetchpatch
, libtool, autoconf, automake , libtool, autoconf, automake
, texinfo , texinfo
, gmp, mpfr, libffi, makeWrapper , gmp, mpfr, libffi, makeWrapper
@ -11,10 +11,10 @@ let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="ecl"; baseName="ecl";
version="20.4.24"; version="21.2.1";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz"; url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz";
sha256="01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237"; sha256="000906nnq25177bgsfndiw3iqqgrjc9spk10hzk653sbz3f7anmi";
}; };
buildInputs = [ buildInputs = [
libtool autoconf automake texinfo makeWrapper libtool autoconf automake texinfo makeWrapper
@ -36,37 +36,10 @@ stdenv.mkDerivation {
}; };
patches = [ patches = [
# https://trac.sagemath.org/ticket/22191#comment:237
(fetchurl {
name = "ECL_WITH_LISP_FPE.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/ECL_WITH_LISP_FPE.patch?h=9.2";
sha256 = "0b194613avcmzr1k9gq725z41wdkg5rsa0q21kdw050iqpprcj1c";
})
# https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1 # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1
(fetchurl { (fetchpatch {
name = "write_error.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2";
sha256 = "1lvdvh77blnxp0zbd27dsbq1ljkb5qblabf1illszn4j7qgq88fh"; sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089";
})
# Three patches to fix ecl's unicode handling (https://trac.sagemath.org/ticket/30122)
(fetchurl {
name = "0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch?h=9.2";
sha256 = "0z8pnhawivrrbg4vz144nr2sz64jxp7764hn6df13bgkz84iqbmk";
})
(fetchurl {
name = "0002-cosmetic-fix-some-compiler-warnings.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0002-cosmetic-fix-some-compiler-warnings.patch?h=9.2";
sha256 = "0msx3say9igwr9z5ywnr3gs6vsndnzlx47fmzwzh4l0m274cnia8";
})
(fetchurl {
name = "0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch?h=9.2";
sha256 = "0ln5dsx6p265fkph3bl5wblgfi3f7frb4jl6v473wz3ibvcx1x9a";
}) })
]; ];
@ -96,6 +69,6 @@ stdenv.mkDerivation {
homepage = "https://common-lisp.net/project/ecl/"; homepage = "https://common-lisp.net/project/ecl/";
license = lib.licenses.mit ; license = lib.licenses.mit ;
maintainers = [lib.maintainers.raskin]; maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux; platforms = lib.platforms.unix;
}; };
} }

View file

@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DENABLE_TESTS=OFF" "-DENABLE_TESTS=OFF"
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build:
"-DCONFIG_RUNTIME_CPU_DETECT=OFF" "-DCONFIG_RUNTIME_CPU_DETECT=0"
]; ];
postFixup = '' postFixup = ''

View file

@ -1,28 +1,24 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo, ppx_tools, ppx_deriving { lib, fetchurl, buildDunePackage, cppo, ppx_deriving
, ppxfind }: , ppxlib
}:
if lib.versionAtLeast ocaml.version "4.11"
then throw "ppx_deriving_protobuf is not available for OCaml ${ocaml.version}"
else
buildDunePackage rec { buildDunePackage rec {
pname = "ppx_deriving_protobuf"; pname = "ppx_deriving_protobuf";
version = "2.7"; version = "3.0.0";
src = fetchFromGitHub { useDune2 = true;
owner = "ocaml-ppx";
repo = pname; src = fetchurl {
rev = "v${version}"; url = "https://github.com/ocaml-ppx/ppx_deriving_protobuf/releases/download/v${version}/ppx_deriving_protobuf-v${version}.tbz";
sha256 = "0aq4f3gbkhhai0c8i5mcw2kpqy8l610f4dknwkrxh0nsizwbwryn"; sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj";
}; };
buildInputs = [ cppo ppx_tools ppxfind ppx_deriving ]; buildInputs = [ cppo ppxlib ppx_deriving ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf";
description = "A Protocol Buffers codec generator for OCaml"; description = "A Protocol Buffers codec generator for OCaml";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.vyorkin ]; maintainers = [ maintainers.vyorkin ];
broken = true;
}; };
} }

View file

@ -30,6 +30,5 @@ buildPythonPackage rec {
homepage = "https://github.com/awslabs/serverless-application-model"; homepage = "https://github.com/awslabs/serverless-application-model";
description = "Python library to transform SAM templates into AWS CloudFormation templates"; description = "Python library to transform SAM templates into AWS CloudFormation templates";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = [ lib.maintainers.andreabedini ];
}; };
} }

View file

@ -96,6 +96,6 @@ buildPythonApplication rec {
homepage = "https://github.com/awslabs/aws-sam-cli"; homepage = "https://github.com/awslabs/aws-sam-cli";
description = "CLI tool for local development and testing of Serverless applications"; description = "CLI tool for local development and testing of Serverless applications";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ andreabedini lo1tuma ]; maintainers = with maintainers; [ lo1tuma ];
}; };
} }

View file

@ -3,10 +3,10 @@ let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="eudev"; baseName="eudev";
version = "3.2.9"; version = "3.2.10";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9"; sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wireguard"; pname = "wireguard";
version = "1.0.20201221"; version = "1.0.20210124";
src = fetchzip { src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
sha256 = "sha256-8RPJEk+6NaJP3LNZYEncLlkdrw2jHxNekKwEr+YpHeQ="; sha256 = "sha256-ZiHnKDYziiNvNV1/HjEluC83600RYCvgbUuPiRATRYE=";
}; };
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];

View file

@ -3121,7 +3121,7 @@ in
circus = callPackage ../tools/networking/circus { }; circus = callPackage ../tools/networking/circus { };
citrix_workspace = citrix_workspace_20_12_0; citrix_workspace = citrix_workspace_21_01_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { }) inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_20_04_0 citrix_workspace_20_04_0
@ -3129,6 +3129,7 @@ in
citrix_workspace_20_09_0 citrix_workspace_20_09_0
citrix_workspace_20_10_0 citrix_workspace_20_10_0
citrix_workspace_20_12_0 citrix_workspace_20_12_0
citrix_workspace_21_01_0
; ;
citra = libsForQt5.callPackage ../misc/emulators/citra { }; citra = libsForQt5.callPackage ../misc/emulators/citra { };