JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-09-01 12:01:31 +00:00 committed by GitHub
commit c487ddd4e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 117 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/emulators/wibo/default.nix
View File

@ -1,24 +1,45 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchzip
, srcOnly
, cmake
, unzip
}:
stdenv.mkDerivation rec {
pname = "wibo";
version = "0.2.0";
version = "0.2.4";
src = fetchFromGitHub {
owner = "decompals";
repo = "WiBo";
repo = "wibo";
rev = version;
sha256 = "sha256-zv+FiordPo7aho3RJqDEe/1sJtjVt6Vy665VeNul/Kw=";
hash = "sha256-dpfKSiIWE9L5BLPH2t8RsUz7Ufkdo/5zn1dewaEgJl0=";
};
nativeBuildInputs = [
cmake
unzip
];
doCheck = false;
# Test step from https://github.com/decompals/wibo/blob/main/.github/workflows/ci.yml
checkPhase = let
gc = srcOnly {
name = "GC_WII_COMPILERS";
src = fetchzip {
url = "https://cdn.discordapp.com/attachments/727918646525165659/917185027656286218/GC_WII_COMPILERS.zip";
hash = "sha256-o+UrmIbCsa74LxtLofT0DKrTRgT0qDK5/V7GsG2Zprc=";
stripRoot = false;
};
meta.license = lib.licenses.unfree;
};
in lib.optionalString doCheck ''
MWCIncludes=. ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c
file test.o | grep "ELF 32-bit"
'';
meta = with lib; {
description = "Quick-and-dirty wrapper to run 32-bit windows EXEs on linux";
longDescription = ''

6
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.23";
version = "3.24";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
sha256 = "sha256-Pq0t8KDrmPfkJ0sWtpw1iAwycLj+YIuYIanyqEjdf5A=";
sha256 = "sha256-cnaktk2POuSPazvU8ChAJHbIUR0O34NTPEcjDQKHU08=";
};
vendorSha256 = "sha256-YbdGtB6BEo8RoEYXjj1NG8bXMDojddd1UY0IXQK1Kgo=";
vendorSha256 = "sha256-jj1UxohdkmtYjLMoZgkUrIsPmhkOal+KdqKzs8qfRJM=";
subPackages = [ "weed" ];

4
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
View File

@ -2,8 +2,10 @@
, stdenv
, fetchFromGitHub
, cmake
, extra-cmake-modules
, ninja
, wayland
, wayland-scanner
, obs-studio
, libX11
, vulkan-headers
@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
"-DBUILD_PLUGIN=OFF"
];
nativeBuildInputs = [ cmake ninja ];
nativeBuildInputs = [ cmake extra-cmake-modules ninja wayland-scanner ];
buildInputs = [
libGL
libX11

4
pkgs/data/misc/ddccontrol-db/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ddccontrol-db";
version = "20220720";
version = "20220829";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = "ddccontrol-db";
rev = version;
sha256 = "sha256-A681Q0VSBUzxpTq+Dl4/ug+d0O134+Pc1LlcVPsWxmI=";
sha256 = "sha256-mYKHFnFnfolcWqKRiyfmCBrrqwOXRjbYm1M08ltv5mI=";
};
preConfigure = ''

51
pkgs/development/libraries/ngtcp2/gnutls.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, gnutls
, cunit, ncurses
}:
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "0.7.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
rev = "v${version}";
sha256 = "sha256-REAN5TW0miWXI3HFxtW3znTKTrhsBbNqu1VfjC2w0no=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ gnutls ];
configureFlags = [ "--with-gnutls=yes" ];
enableParallelBuilding = true;
doCheck = true;
checkInputs = [ cunit ]
++ lib.optional stdenv.isDarwin ncurses;
meta = with lib; {
homepage = "https://github.com/ngtcp2/ngtcp2";
description = "an effort to implement RFC9000 QUIC protocol.";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ vcunat/* for knot-dns */ ];
};
}
/*
Why split from ./default.nix?
ngtcp2 libs contain helpers to plug into various crypto libs (gnutls, patched openssl, ...).
Building multiple of them while keeping closures separable would be relatively complicated.
Separating the builds is easier for now; the missed opportunity to share the 0.3--0.4 MB
library isn't such a big deal.
Moreover upstream still commonly does incompatible changes, so agreeing
on a single version might be hard sometimes. That's why it seemed simpler
to completely separate the nix expressions, too.
*/

8
pkgs/development/libraries/poppler/default.nix
View File

@ -44,6 +44,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs=";
};
patches = [
(fetchpatch {
name = "CVE-2022-38784.patch";
url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch";
sha256 = "sha256-M12zaHxcgQB/37tHffllqzd+Juq9BH5gpKVGaRY00vI=";
})
];
nativeBuildInputs = [
cmake
ninja

4
pkgs/development/python-modules/west/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "west";
version = "0.13.1";
version = "0.14.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-B6B7shZ8FM5pyXzXknJv9mwr+ERq4kiEzRf5jLTCicM=";
hash = "sha256-mlKnhWX9TWnGS3XFSfYbExiSsbbSbBzBYs3q0aPPS48=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
version = "10.3.2";
version = "10.3.3";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "sha256-VrTjpw/bT5n/ydUt9sK/cGqSi9gZJq1TsRupfm7RS1M=";
sha256 = "sha256-J4Ty6nblCylRfyHcxqDXJ6LAh2g7+cD+uNorW1EmwYc=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "bazel-remote";
version = "2.3.8";
version = "2.3.9";
src = fetchFromGitHub {
owner = "buchgr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iMVBkmZmjk4w5WN1sPBJQWC5Ktbl3Y6g62IpyGuM0Xg=";
sha256 = "sha256-Z6DCe2rkWnTaxvfhLd+ZGxLw2ldjaSPkPz/zHKzI1fs=";
};
vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo=";
vendorSha256 = "sha256-BThOF6Kodmq0PqofiS24GffmTFRangrf6Q1SJ7mDVvY=";
doCheck = false;

4
pkgs/games/unciv/default.nix
View File

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
version = "4.2.5-patch1";
version = "4.2.6";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
sha256 = "sha256-xrFC2HU74+ehoaCZ5Dfgcxq67h6d97/6jtNXIkP4yEQ=";
sha256 = "sha256-AJqD8xF+FIKw34NhcnYCexXRs8aIzL8XDHhs5fGBTn0=";
};
dontUnpack = true;

2
pkgs/servers/dns/knot-dns/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
, ngtcp2-gnutls
, autoreconfHook, nixosTests, knot-resolver
, fetchpatch
}:
@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
nettle libedit
libiconv lmdb libintl
nghttp2 # DoH support in kdig
ngtcp2-gnutls # DoQ support in kdig (and elsewhere but not much use there yet)
libmaxminddb # optional for geoip module (it's tiny)
# without sphinx &al. for developer documentation
# TODO: add dnstap support?

6
pkgs/servers/monitoring/sensu-go/default.nix
View File

@ -4,19 +4,19 @@ let
generic = { subPackages, pname, postInstall ? "", mainProgram }:
buildGoModule rec {
inherit pname;
version = "6.7.5";
version = "6.8.0";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
sha256 = "sha256-xzx6MaTkmCNDJiroaLFlQmaxUF0Zo4ZNT/7huzef61U=";
sha256 = "sha256-T9SR3Ec7Q51Q2L/xJHx35eA0/KcFB3ZxqimIYKwAJLU=";
};
inherit subPackages postInstall;
vendorSha256 = "sha256-ptBGCI3mLAsWhnIA1kUVZxHeBlEpsYoFTSF2kPTq2PM=";
vendorSha256 = "sha256-Y8gYh770p22O1ZLcqZi5NNKWOP4sXHSP3b0d4klrSHg=";
doCheck = false;

4
pkgs/servers/snappymail/default.nix
View File

@ -2,11 +2,11 @@
, dataPath ? "/var/lib/snappymail" }:
stdenv.mkDerivation rec {
pname = "snappymail";
version = "2.17.2";
version = "2.17.3";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
sha256 = "sha256-CKUVi0M9DhhfJRQQIq6gLGspta0BcEK1VpIolhGs3a0=";
sha256 = "sha256-Ajbii8Amd5ziNNbYccL1nM0Yqbo3xF1XOByAebpEMuk=";
};
sourceRoot = "snappymail";

4
pkgs/tools/misc/calamares/default.nix
View File

@ -7,12 +7,12 @@
mkDerivation rec {
pname = "calamares";
version = "3.2.60";
version = "3.2.61";
# release including submodule
src = fetchurl {
url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-nsbEn04jFs0wWNQCwqtl7/8C4/CaACjVDwNZ5RVObIw=";
sha256 = "sha256-dZG5tgc4vbp7neK42lRiqyEAbbBqAG8N0hrFuDJxHdI=";
};
patches = lib.optionals nixos-extensions [

6
pkgs/tools/misc/opentimestamps-client/default.nix
View File

@ -4,7 +4,7 @@
buildPythonApplication rec {
pname = "opentimestamps-client";
version = "0.7.0";
version = "0.7.1";
disabled = (!isPy3k);
# We can't use the pypi source because it doesn't include README.md which is
@ -12,8 +12,8 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "opentimestamps";
repo = "opentimestamps-client";
rev = "opentimestamps-client-v${version}";
sha256 = "1aiq9cwr40md54swzm7wkwj0h65psxmvj2japvw79s9x0pp8iwqs";
rev = "refs/tags/opentimestamps-client-v${version}";
sha256 = "sha256-0dWaXetRlF1MveBdJ0sAdqJ5HCdn08gkbX+nen/ygsQ=";
};
propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ];

4
pkgs/tools/misc/wakatime/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "wakatime";
version = "1.53.4";
version = "1.54.0";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-cli";
rev = "v${version}";
sha256 = "sha256-R5LlRjRSV+Mm5Ga3yN51ch4V0YykSiSAGVaO8AKEL6M=";
sha256 = "sha256-HjhicBNkpyKb2GX4J3crhp2JgRGqmkQPUZe8rHrQG/g=";
};
vendorSha256 = "sha256-8QMrfCq5oAS+fjUccBeGrEGU5y4vtZr2o2HhpDk90K0=";

4
pkgs/tools/system/syslog-ng/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "syslog-ng";
version = "3.37.1";
version = "3.38.1";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-1noyDLiWzV1i8k2eG+wTiEf6RhiuE6OUbK4rdcUo7hQ=";
sha256 = "sha256-VJH2htC4KbabLg/A1mpi9RmRqvruAFR1v6OPqzmUQfc=";
};
nativeBuildInputs = [ pkg-config which ];

1
pkgs/top-level/all-packages.nix
View File

@ -20626,6 +20626,7 @@ with pkgs;
nghttp3 = callPackage ../development/libraries/nghttp3 { };
ngtcp2 = callPackage ../development/libraries/ngtcp2 { };
ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { };
nix-plugins = callPackage ../development/libraries/nix-plugins { };