cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-05-15 18:01:22 +00:00 committed by GitHub
commit 4d302fe767
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 93 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/p2pool/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "p2pool";
version = "1.9";
version = "2.0";
src = fetchFromGitHub {
owner = "SChernykh";
repo = "p2pool";
rev = "v${version}";
sha256 = "sha256-nqJ0F99QjrpwXHRPxZ7kLCYA9VJWGH2ahcr/MBQrhyY=";
sha256 = "sha256-lJJZ0ZsPTPEaYyzi8chAPo1OlZQ6p9QVqwtSOyJD7W4=";
fetchSubmodules = true;
};

2
pkgs/development/php-packages/memcached/default.nix
View file

@ -13,8 +13,6 @@ buildPecl rec {
internalDeps = [
php.extensions.session
] ++ lib.optionals (lib.versionOlder php.version "7.4") [
php.extensions.hash
];
configureFlags = [

1
pkgs/development/php-packages/openswoole/default.nix
View file

@ -9,7 +9,6 @@ buildPecl {
sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg=";
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];
internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
meta = with lib; {
changelog = "https://pecl.php.net/package/openswoole/${version}";

2
pkgs/development/php-packages/redis/default.nix
View file

@ -10,8 +10,6 @@ buildPecl {
session
] ++ lib.optionals (lib.versionOlder php.version "8.0") [
json
] ++ lib.optionals (lib.versionOlder php.version "7.4") [
hash
];
meta = with lib; {

2
pkgs/development/php-packages/snuffleupagus/default.nix
View file

@ -22,8 +22,6 @@ buildPecl rec {
internalDeps = with php.extensions; [
session
] ++ lib.optionals (lib.versionOlder php.version "7.4") [
hash
];
patches = [

1
pkgs/development/php-packages/swoole/default.nix
View file

@ -7,7 +7,6 @@ buildPecl {
sha256 = "sha256-SnhDRC7/a7BTHn87c6YCz/R8jI6aES1ibSD6YAl6R+I=";
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];
internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
doCheck = true;
checkTarget = "tests";

20
pkgs/development/python-modules/pymbolic/default.nix
View file

@ -2,17 +2,21 @@
, buildPythonPackage
, fetchPypi
, matchpy
, pytools
, pytestCheckHook
, pythonOlder
, pytools
}:
buildPythonPackage rec {
pname = "pymbolic";
version = "2022.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI=";
hash = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI=";
};
propagatedBuildInputs = [
@ -24,10 +28,20 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
# pytest is a test requirement not a run-time one
substituteInPlace setup.py \
--replace '"pytest>=2.3",' ""
'';
pythonImportsCheck = [
"pymbolic"
];
meta = with lib; {
description = "A package for symbolic computation";
homepage = "https://documen.tician.de/pymbolic/";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

3
pkgs/development/python-modules/pynetdicom/default.nix
View file

@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pydicom";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM=";
hash = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM=";
};
propagatedBuildInputs = [
@ -41,6 +41,7 @@ buildPythonPackage rec {
"TestEchoSCP"
"TestEchoSCPCLI"
"TestEventHandlingAcceptor"
"TestEventHandlingRequestor"
"TestFindSCP"
"TestFindSCPCLI"
"TestGetSCP"

5
pkgs/development/tools/electron/generic.nix
View file

@ -63,6 +63,7 @@ let
electronLibPath = with lib; makeLibraryPath (
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ]
++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ]
++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]
++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ]
++ optionals (versionAtLeast version "17.0.0") [ libglvnd ]
@ -95,9 +96,7 @@ let
$out/lib/electron/electron \
${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" }
wrapProgram $out/lib/electron/electron \
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
"''${gappsWrapperArgs[@]}"
wrapProgram $out/lib/electron/electron "''${gappsWrapperArgs[@]}"
'';
};

4
pkgs/games/fheroes2/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "fheroes2";
version = "0.9.14";
version = "0.9.15";
src = fetchFromGitHub {
owner = "ihhub";
repo = "fheroes2";
rev = version;
sha256 = "sha256-M5sUEOKU7KSenAAE7dUI8algB5XsbQQ1s3sDflZLsiA=";
sha256 = "sha256-bT6asrre16NuavG7X28aHdEPeHdxMBdz2o2KCB+mrbg=";
};
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

13
pkgs/servers/dendrite/default.nix
View file

@ -1,17 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub, fetchurl, nixosTests, postgresql, postgresqlTestHook }:
{ lib, buildGoModule, fetchFromGitHub
, nixosTests, postgresql, postgresqlTestHook }:
buildGoModule rec {
pname = "matrix-dendrite";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "dendrite";
rev = "v${version}";
sha256 = "sha256-w4un+TdFTzfVZltvo6ZAPQ3B9HJvnGlJW+LmZHuYk1M=";
sha256 = "sha256-MPWvBUI6Mqt3f5UY6lpTBwPpihW+QSNq1M3FnIff+mM=";
};
vendorSha256 = "sha256-AJ7Hn23aji/cXioDaOSyF8XD3Mr135DZf7KbUW1SoJ4=";
vendorSha256 = "sha256-OXy2xuwTLPNvBnVB6wj/YRW/XMiekjTubRRPVX9bxdQ=";
checkInputs = [
postgresqlTestHook
@ -31,8 +32,8 @@ buildGoModule rec {
};
meta = with lib; {
homepage = "https://matrix.org";
description = "Dendrite is a second-generation Matrix homeserver written in Go!";
homepage = "https://matrix-org.github.io/dendrite";
description = "A second-generation Matrix homeserver written in Go";
license = licenses.asl20;
maintainers = teams.matrix.members;
platforms = platforms.unix;

10
pkgs/tools/networking/boundary/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
version = "0.7.6";
version = "0.8.0";
src =
let
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
aarch64-darwin = "darwin_arm64";
};
sha256 = selectSystem {
x86_64-linux = "sha256-nsc8S63OUEo9db/hs9oA53Lk+amIsxB/O4TJCs4zdNw=";
aarch64-linux = "sha256-KttqYuF7xC88L49f7JKKr77FbKBihptoBIoemgFInm0=";
x86_64-darwin = "sha256-ov4CtiWsOU/AWfAo7x99RshW6+eU9lFD5ypo6MKyPM0=";
aarch64-darwin = "sha256-3E9fv8BSu7XXIwRmTrDECLNQKdoeUqitKbsTrXs+tTE=";
x86_64-linux = "sha256-cZ41+VwbTQ/X/A0+OL1ZVXVv3eu90H5kMLiHqyc3688=";
aarch64-linux = "sha256-2svJx3rp0swyuXz3WCLRvDTRkweLMVIKrgYekcG8LdE=";
x86_64-darwin = "sha256-zkSESscsapyoMlFdaTzmooOEjUTte8MDNIGVhy9knzc=";
aarch64-darwin = "sha256-A7KNhTWuLjNaO2GyldCDquRur0i5KoXl6GZYQIqt0cI=";
};
in
fetchzip {

64
pkgs/tools/networking/zerotierone/default.nix
View file

@ -1,15 +1,37 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }:
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, fetchurl
stdenv.mkDerivation rec {
, buildPackages
, iproute2
, lzo
, openssl
, pkg-config
, ronn
, zlib
}:
let
pname = "zerotierone";
version = "1.8.4";
version = "1.8.9";
src = fetchFromGitHub {
owner = "zerotier";
repo = "ZeroTierOne";
rev = version;
sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A=";
sha256 = "sha256-N1VqzjaFJRJiSG4qHqRy4Fs8TlkUqyDoq0/3JQdGwfA=";
};
in stdenv.mkDerivation {
inherit pname version src;
cargoDeps = rustPlatform.fetchCargoTarball {
src = "${src}/zeroidc";
name = "${pname}-${version}";
sha256 = "sha256-PDsJtz279P2IpgiL0T92IbcANeGSUnGKhEH1dj9VtbM=";
};
postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock";
preConfigure = ''
patchShebangs ./doc/build.sh
@ -20,9 +42,19 @@ stdenv.mkDerivation rec {
--replace 'armv5' 'armv6'
'';
nativeBuildInputs = [ ronn ];
buildInputs = [ openssl lzo zlib iproute2 ];
nativeBuildInputs = [
pkg-config
ronn
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
];
buildInputs = [
iproute2
lzo
openssl
zlib
];
enableParallelBuilding = true;
@ -30,18 +62,20 @@ stdenv.mkDerivation rec {
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkPhase = ''
runHook preCheck
./zerotier-selftest
runHook postCheck
'';
installPhase = ''
install -Dt "$out/bin/" zerotier-one
ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool
ln -s $out/bin/zerotier-one $out/bin/zerotier-cli
installFlags = [ "DESTDIR=$$out/upstream" ];
mkdir -p $man/share/man/man8
for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do
cat doc/$cmd | gzip -9n > $man/share/man/man8/$cmd.gz
done
postInstall = ''
mv $out/upstream/usr/sbin $out/bin
mkdir -p $man/share
mv $out/upstream/usr/share/man $man/share/man
rm -rf $out/upstream
'';
outputs = [ "out" "man" ];

14
pkgs/tools/text/xurls/default.nix
View file

@ -1,24 +1,24 @@
{ buildGoPackage, lib, fetchFromGitHub }:
{ buildGoModule, lib, fetchFromGitHub }:
buildGoPackage rec {
version = "2.3.0";
buildGoModule rec {
pname = "xurls";
version = "2.4.0";
src = fetchFromGitHub {
owner = "mvdan";
repo = "xurls";
rev = "v${version}";
sha256 = "sha256-+oWYW7ZigkNS6VADNmVwarIsYyd730RAdDwnNIAYvlA=";
sha256 = "sha256-lyDcwbdVKyFRfsYCcPAgIgvrEEdwK0lxmJTvMJcFBCw=";
};
goPackagePath = "mvdan.cc/xurls/v2";
subPackages = [ "cmd/xurls" ];
vendorSha256 = "sha256-lJzgJxW/GW3J09uKQGoEX+UsHnB1pGG71U/zy4b9rXo=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Extract urls from text";
homepage = "https://github.com/mvdan/xurls";
maintainers = with maintainers; [ koral ];
platforms = platforms.unix;
license = licenses.bsd3;
};
}