Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-22 12:16:58 +00:00 committed by GitHub
commit 8b6e6ae050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 220 additions and 23 deletions

View File

@ -6,6 +6,7 @@ import ./make-test-python.nix {
services.bind.extraOptions = "empty-zones-enable no;";
services.bind.zones = lib.singleton {
name = ".";
master = true;
file = pkgs.writeText "root.zone" ''
$TTL 3600
. IN SOA ns.example.org. admin.example.org. ( 1 3h 1h 1w 1d )

View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
version = "0.9.12-3";
version = "0.9.13";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
hash = "sha256-IK4BuZKM2U8vz7m8waJhoh3tQ539wGLcIDNiYGUou24=";
hash = "sha256-VdbdmpLiQGVFH3q6baE2yuuKz11Tn0gMpkGDI9KI3HQ=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
--replace "/bin/sh" "${bash}/bin/sh" \
--replace "cat" "${coreutils}/bin/cat" \
--replace "chattr" "${e2fsprogs}/bin/chattr" \
--replace "mv" "${coreutils}/bin/mv" \
--replace "mv " "${coreutils}/bin/mv " \
--replace "pkill" "${procps}/bin/pkill"
done
@ -145,7 +145,7 @@ stdenv.mkDerivation rec {
--replace "/bin/sh" "${bash}/bin/sh" \
--replace "/opt/" "$out/opt/" \
--replace "chattr" "${e2fsprogs}/bin/chattr" \
--replace "mv" "${coreutils}/bin/mv"
--replace "mv " "${coreutils}/bin/mv "
done
substituteInPlace $out/lib/systemd/system/appgatedriver.service \
@ -174,7 +174,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Appgate SDP (Software Defined Perimeter) desktop client";
homepage = https://www.appgate.com/support/software-defined-perimeter-support;
homepage = "https://www.appgate.com/support/software-defined-perimeter-support";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ ymatsiuk ];

View File

@ -5,9 +5,9 @@
# overridable. This is useful when the upstream archive was replaced
# and nixpkgs is not in sync yet.
, officeVersion ? {
version = "980";
version = "982";
edition = "2018";
sha256 = "19pgil86aagiz6z4kx22gd4cxbbmrx42ix42arkfb6p6hav1plby";
hash = "sha256-euoZfAaDDTXzoaNLc/YdTngreTiYOBi7sGU161GP83w=";
}
, ... } @ args:
@ -19,7 +19,7 @@ callPackage ./generic.nix (args // rec {
suiteName = "FreeOffice";
src = fetchurl {
inherit (officeVersion) sha256;
inherit (officeVersion) hash;
url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
};

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems
{ lib, stdenv, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems
# Dynamic Libraries
, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender

View File

@ -6,9 +6,9 @@
# Softmaker Office or when the upstream archive was replaced and
# nixpkgs is not in sync yet.
, officeVersion ? {
version = "1020";
version = "1030";
edition = "2021";
sha256 = "1v227pih1p33x7axsw7wz8pz5walpbqnk0iqng711ixk883nqxn5";
hash = "sha256-bpnyPyZnJc9RFVrFM2o3M7Gc4PSKFGpaM1Yo8ZKGHrE=";
}
, ... } @ args:
@ -20,7 +20,7 @@ callPackage ./generic.nix (args // rec {
suiteName = "SoftMaker Office";
src = fetchurl {
inherit (officeVersion) sha256;
inherit (officeVersion) hash;
url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz";
};

View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "phpstan";
version = "0.12.76";
version = "0.12.78";
in
mkDerivation {
inherit pname version;
src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "sha256-UYQvzWAnbaD77yDXVTui+fQEwOfOFXKLf5Bt/81mQI4=";
sha256 = "sha256-YPCh6HAVuFf2rJhUj/uzfqkWKN+Jd2iPfugSiTh65zc=";
};
phases = [ "installPhase" ];

View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "psalm";
version = "4.5.0";
version = "4.6.1";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
sha256 = "sha256-FVgUxeV+N5Hqn5KQmI+KuQnKmvNScz9A+g02WNMxgmA=";
sha256 = "sha256-YFeTSIfZ2u1KmpoKV5I7pMMvCk3u5ILktsunvoDnBsg=";
};
phases = [ "installPhase" ];

View File

@ -0,0 +1,34 @@
{ lib
, aioredis
, buildPythonPackage
, fetchFromGitHub
, msgpack
}:
buildPythonPackage rec {
pname = "aiocache";
version = "0.11.1";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = version;
sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx";
};
propagatedBuildInputs = [
aioredis
msgpack
];
# aiomcache would be required but last release was in 2017
doCheck = false;
pythonImportsCheck = [ "aiocache" ];
meta = with lib; {
description = "Python API Rate Limit Decorator";
homepage = "https://github.com/tomasbasham/ratelimit";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,56 @@
{ lib
, aiohttp
, aresponses
, aiocache
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytest-asyncio
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
, msgpack
, ujson
}:
buildPythonPackage rec {
pname = "pyflunearyou";
version = "2.0.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "18vxwfyvicbx8idpa0h0alp4ygnwfph6g4kq93hfm0fc94gi6h94";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
aiohttp
aiocache
msgpack
ujson
];
checkInputs = [
aresponses
pytest-asyncio
pytest-aiohttp
pytestCheckHook
];
# Ignore the examples directory as the files are prefixed with test_.
# disabledTestFiles doesn't seem to work here
pytestFlagsArray = [ "--ignore examples/" ];
pythonImportsCheck = [ "pyflunearyou" ];
meta = with lib; {
description = "Python library for retrieving UV-related information from Flu Near You";
homepage = "https://github.com/bachya/pyflunearyou";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -1,13 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, attrs, boto3, google-pasta
, importlib-metadata, numpy, protobuf, protobuf3-to-dict, smdebug-rulesconfig }:
{ lib
, buildPythonPackage
, fetchPypi
, attrs
, boto3
, google-pasta
, importlib-metadata
, numpy
, protobuf
, protobuf3-to-dict
, smdebug-rulesconfig
}:
buildPythonPackage rec {
pname = "sagemaker";
version = "2.24.5";
version = "2.25.1";
src = fetchPypi {
inherit pname version;
sha256 = "1j1a058ic00yxnf0cc364fzn82pacih5ffrh5s4dw1q4s3by4cvd";
sha256 = "sha256-xQ1nt8FcjuoilzM5PbU8KHgirPyj9us+ykyjfgEqZhg=";
};
doCheck = false;

View File

@ -0,0 +1,28 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "spicy";
version = "unstable-2020-02-21";
goPackagePath = "github.com/trhodeos/spicy";
src = fetchFromGitHub {
owner = "trhodeos";
repo = "spicy";
rev = "47409fb73e0b20b323c46cc06a3858d0a252a817";
sha256 = "022r8klmr21vaz5qd72ndrzj7pyqpfxc3jljz7nzsa50fjf82c3a";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "A Nintendo 64 segment assembler";
longDescription = ''
An open-source version of the Nintendo64 sdk's mild.exe. Assembles
segments into an n64-compatible rom.
'';
homepage = "https://github.com/trhodeos/spicy";
license = licenses.mit;
maintainers = [ maintainers._414owen];
};
}

56
pkgs/development/tools/spicy/deps.nix generated Normal file
View File

@ -0,0 +1,56 @@
[
{
goPackagePath = "github.com/alecthomas/participle";
fetch = {
type = "git";
url = "https://github.com/alecthomas/participle.git";
rev = "fed0e8fbb638b11091014aa838748210dc9ff576";
sha256 = "0yhhm42lis8ak9m6x6aai280xq0652vcq5v17pibbf74dalxyims";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus.git";
rev = "f104497f2b2129ab888fd274891f3a278756bcde";
sha256 = "0gr2c7s3ffdaynzn1zplp79zz16qgqpnsq2z9zg79wxksq5mz5l1";
};
}
{
goPackagePath = "github.com/ogier/pflag";
fetch = {
type = "git";
url = "https://github.com/ogier/pflag.git";
rev = "73e519546fc0bce0c395610afcf6aa4e5aec88eb";
sha256 = "114zpgl6l47gsz0sifpq62hi2i6k0ra9hi8wx7d39giablf9i4ii";
};
}
{
goPackagePath = "github.com/trhodeos/n64rom";
fetch = {
type = "git";
url = "https://github.com/trhodeos/n64rom.git";
rev = "504dba7b4d4675bd3396c052d64016c5725c2f5e";
sha256 = "01hybm8nxh1lym0wc9sxrms3wyqhhs0dm1a2nwz6xc60lkjcp8kb";
};
}
{
goPackagePath = "github.com/trhodeos/ecoff";
fetch = {
type = "git";
url = "https://github.com/trhodeos/ecoff.git";
rev = "e54570a0fac23c0fa7f605681345611f345ce0f6";
sha256 = "0pc0yj7hy43m00br0q0f1y5a3bc3a134imcyy2jvzim45g6g12kj";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://github.com/golang/sys";
rev = "9a76102bfb4322425a1228caa377974426e82c84";
sha256 = "07qn19yla2w604p3dc8h1c75xj2pxc4fajvg0mf0d4c72d5qiss4";
};
}
]

View File

@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
version = "9.16.11";
version = "9.16.12";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-ARH2TdfY9RXPoSnhgczpb/ggcNGyfxGiH2hWEQ0GmcE=";
sha256 = "sha256-mRSvkxH9NJyrRBCXiY2U+yjQv9m/btBP4fl/BCZE2n8=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

View File

@ -265,7 +265,7 @@
"flo" = ps: with ps; [ aioflo ];
"flock" = ps: with ps; [ ];
"flume" = ps: with ps; [ pyflume ];
"flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou
"flunearyou" = ps: with ps; [ pyflunearyou ];
"flux" = ps: with ps; [ ];
"flux_led" = ps: with ps; [ flux-led ];
"folder" = ps: with ps; [ ];

View File

@ -26,6 +26,12 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_XXHASH=1"
];
preFixup = ''
for f in $out/share/hashcat/OpenCL/*.cl; do
sed "s|#include \"\(.*\)\"|#include \"$out/share/hashcat/OpenCL/\1\"|g" -i "$f"
done
'';
postFixup = ''
wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib
'';

View File

@ -8005,6 +8005,8 @@ in
spglib = callPackage ../development/libraries/spglib { };
spicy = callPackage ../development/tools/spicy { };
ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { };
sshguard = callPackage ../tools/security/sshguard {};

View File

@ -210,6 +210,8 @@ in {
aioasuswrt = callPackage ../development/python-modules/aioasuswrt { };
aiocache = callPackage ../development/python-modules/aiocache { };
aiocoap = callPackage ../development/python-modules/aiocoap { };
aioconsole = callPackage ../development/python-modules/aioconsole { };
@ -5466,6 +5468,8 @@ in {
pyflume = callPackage ../development/python-modules/pyflume { };
pyflunearyou = callPackage ../development/python-modules/pyflunearyou { };
pyfma = callPackage ../development/python-modules/pyfma { };
pyfribidi = callPackage ../development/python-modules/pyfribidi { };