diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index 7a0d4e5f096d..69137cb8f030 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index e1adecd90f34..7f1d5af1e664 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -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" ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 7b151f0751b6..0e61f4aaeca7 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -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 diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 8b3d28d53566..d1bf1adde1e9 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -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 = '' diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix new file mode 100644 index 000000000000..c2b928e851c8 --- /dev/null +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -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. +*/ + diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 59b4258420cb..b90987899085 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -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 diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index eb934fde1129..508426ea1a3d 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -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 = [ diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 0fe62f5c6525..3aacacbb5175 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index cd5e90af73f3..74c9de9f11f3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -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; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 50cc97de1f3e..522c845c471d 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -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; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 427bdb597aa9..fc4efcfe56a1 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -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? diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 961ae748b250..76c56f4a4c1e 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -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; diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 4a7c3ed1a000..e1420916382f 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -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"; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index de37fef3a506..22b5cde7f451 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -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 [ diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 4d65a406e53a..939e5c8c72fa 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -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 ]; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 07dafb37ccc6..1b9e182542b9 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -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="; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index ecd3290f5643..5fa7aa96e682 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab9cd5969237..37f2bc538762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };