diff options
42 files changed, 305 insertions, 153 deletions
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 75aef2b27924..ac58eed5fa89 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.0.4"; + version = "5.0.7"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-IkhUkKO+Ay1WceZNekII6aHLOmgcgGfx0hGo5ldFE5Y="; + sha256 = "sha256-jsHGUAVRUiz9soffW1PvF6UUGzbGhltaKtEW5ynq/Xk="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 85c05446ee86..b16f9eae5a88 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1633,6 +1633,17 @@ self: super: { --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" ''; }; + LeaderF = super.LeaderF.overrideAttrs { + buildInputs = [ python3 ]; + # rm */build/ to prevent dependencies on gcc + # strip the *.so to keep files small + buildPhase = '' + patchShebangs . + ./install.sh + rm autoload/leaderf/fuzzyMatch_C/build/ -r + ''; + stripDebugList = [ "autoload/leaderf/python" ]; + }; } // ( let diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 3fb0de1bf9ff..94a04de14c91 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.16"; + version = "1.16.1"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-41FAInCMmgO4vxzpFKVZtITs8piQLJgBJBbGVKEd97o="; + sha256 = "sha256-bKRb7a5lEfE1uUeVl7i1He3qLJ4wI5HmKmWAk2oKdYI="; }; postPatch = '' diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 8b1b4966ddab..2e84a8f2091c 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio - ++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama + ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 @@ -93,8 +93,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon ]) - ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ - libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext + ++ lib.optionals (x11Support) (with pkgs.xorg; [ + libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm ]) ++ lib.optionals waylandSupport (with pkgs; [ wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index d3b285f36d78..06c2b7486cd2 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -37,6 +37,7 @@ usbSupport ? false, mingwSupport ? wineRelease != "stable", waylandSupport ? wineRelease == "wayland", + x11Support ? stdenv.isLinux, embedInstallers ? false, # The Mono and Gecko MSI installers moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily }: @@ -46,12 +47,14 @@ let wine-build = build: release: wineRelease = release; supportFlags = { inherit - cupsSupport gettextSupport dbusSupport cairoSupport - odbcSupport netapiSupport cursesSupport vaSupport pcapSupport - v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport - alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport - tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport - sdlSupport usbSupport mingwSupport waylandSupport embedInstallers; + alsaSupport cairoSupport cupsSupport cursesSupport dbusSupport + embedInstallers fontconfigSupport gettextSupport gphoto2Support + gstreamerSupport gtkSupport krb5Support mingwSupport netapiSupport + odbcSupport openclSupport openglSupport pcapSupport + pulseaudioSupport saneSupport sdlSupport tlsSupport udevSupport + usbSupport v4lSupport vaSupport vulkanSupport waylandSupport + x11Support xineramaSupport + ; }; inherit moltenvk; }); diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/applications/graphics/vimiv-qt/default.nix index 1c2dd7c95c37..83bbbecdc65b 100644 --- a/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/pkgs/applications/graphics/vimiv-qt/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vimiv-qt"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "karlch"; repo = pname; rev = "v${version}"; - sha256 = "1pj3gak7nxkw9r9m71zsfvcaq8dk9crbk5rz4n7pravxkl5hs2bg"; + sha256 = "sha256-28sk5qDVmrgXYX2wm5G8zv564vG6GwxNp+gjrFHCRfU="; }; nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook python3.pkgs.setuptools ]; diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix index 4c94fa83485c..d5023c64fd1b 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/applications/misc/HentaiAtHome/default.nix @@ -10,12 +10,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "HentaiAtHome"; - version = "1.6.1"; + version = "1.6.2"; src = fetchzip { url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; - hash = - "sha512-j+B0kx6fjUibI3MjVJ5PVTq9xxtSOTTY/XizAJKjeNkpExJF9DIV4VCwf+sfLlg+7W4UBosnyb8hZNNoidRBKA=="; + hash = "sha256-ioL/GcnbYjt1IETH8521d1TcLGtENdFzceJui1ywXTY="; stripRoot = false; }; diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index dde8f05d6239..94e0741f79a5 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-sAr51+8hFnpIq0jDd8dB5uiy00N09ufkFgWkFtW7ErU="; + hash = "sha256-0KLya2B+gs7aoOvkQdHuJuQtCHLUeSYATToBfIDhm/c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix index eda4816abe98..45dd0cc8dc15 100644 --- a/pkgs/by-name/na/nawk/package.nix +++ b/pkgs/by-name/na/nawk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nawk"; - version = "20230909"; + version = "20230911"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; - rev = finalAttrs.version; - hash = "sha256-sBJ+ToFkhU5Ei84nqzbS0bUbsa+60iLSz2oeV5+PXEk="; + rev = "2ndEdition"; + hash = "sha256-9SxeYsTFrsJ+Cg43QjQihi2Ij0qdJvTnyGGhUHJHjuU="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -43,9 +43,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/onetrueawk/awk"; description = "The one, true implementation of AWK"; longDescription = '' - This is the version of awk described in "The AWK Programming Language", by - Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN - 0-201-07981-X). + This is the version of awk described in "The AWK Programming Language", + Second Edition, by Al Aho, Brian Kernighan, and Peter Weinberger + (Addison-Wesley, 2023, ISBN 0-13-826972-6). ''; changelog = "https://github.com/onetrueawk/awk/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.mit; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 35cb0759c5e1..f73804874cc6 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,6 +1,5 @@ import ./generic.nix { - version = "2.100.2"; - dmdSha256 = "sha256-o4+G3ARXIGObYHtHooYZKr+Al6kHpiwpMIog3i4BlDM="; - druntimeSha256 = "sha256-qXvY1ECN4mPwOGgOE1FWwvxoRvlSww3tGLWgBdhzAKo="; - phobosSha256 = "sha256-kTHRaAKG7cAGb4IE/NGHWaZ8t7ZceKj03l6E8wLzJzs="; + version = "2.105.2"; + dmdSha256 = "sha256-IjzIQZttB1711VayKDWcpYvf1MAan+GWGTdpdDTgo1k="; + phobosSha256 = "sha256-2hAq48sBC1qvS1XBWZhGIPUlsA4pGcn4pHNok6lC8R0="; } diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index 3f8871df4f96..d2679c184da7 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -1,6 +1,5 @@ { version , dmdSha256 -, druntimeSha256 , phobosSha256 }: @@ -21,7 +20,7 @@ , installShellFiles , git , unzip -, HOST_DMD ? "${callPackage ./bootstrap.nix { }}/bin/dmd" +, dmd_bin ? "${callPackage ./bootstrap.nix { }}/bin" }: let @@ -60,13 +59,6 @@ stdenv.mkDerivation rec { }) (fetchFromGitHub { owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = druntimeSha256; - name = "druntime"; - }) - (fetchFromGitHub { - owner = "dlang"; repo = "phobos"; rev = "v${version}"; sha256 = phobosSha256; @@ -88,53 +80,36 @@ stdenv.mkDerivation rec { extraPrefix = "dmd/"; sha256 = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; }) - ] ++ lib.optionals (lib.versionOlder version "2.092.2") [ - # Fixes C++ tests that compiled on older C++ but not on the current one - (fetchpatch { - url = "https://github.com/dlang/druntime/commit/438990def7e377ca1f87b6d28246673bb38022ab.patch"; - stripLen = 1; - extraPrefix = "druntime/"; - sha256 = "sha256-/pPKK7ZK9E/mBrxm2MZyBNhYExE8p9jz8JqBdZSE6uY="; - }) ]; postPatch = '' - patchShebangs dmd/test/{runnable,fail_compilation,compilable,tools}{,/extra-files}/*.sh - - rm dmd/test/runnable/gdb1.d - rm dmd/test/runnable/gdb10311.d - rm dmd/test/runnable/gdb14225.d - rm dmd/test/runnable/gdb14276.d - rm dmd/test/runnable/gdb14313.d - rm dmd/test/runnable/gdb14330.d - rm dmd/test/runnable/gdb15729.sh - rm dmd/test/runnable/gdb4149.d - rm dmd/test/runnable/gdb4181.d + patchShebangs dmd/compiler/test/{runnable,fail_compilation,compilable,tools}{,/extra-files}/*.sh + + rm dmd/compiler/test/runnable/gdb1.d + rm dmd/compiler/test/runnable/gdb10311.d + rm dmd/compiler/test/runnable/gdb14225.d + rm dmd/compiler/test/runnable/gdb14276.d + rm dmd/compiler/test/runnable/gdb14313.d + rm dmd/compiler/test/runnable/gdb14330.d + rm dmd/compiler/test/runnable/gdb15729.sh + rm dmd/compiler/test/runnable/gdb4149.d + rm dmd/compiler/test/runnable/gdb4181.d # Disable tests that rely on objdump whitespace until fixed upstream: # https://issues.dlang.org/show_bug.cgi?id=23317 - rm dmd/test/runnable/cdvecfill.sh - rm dmd/test/compilable/cdcmp.d - - # Grep'd string changed with gdb 12 - # https://issues.dlang.org/show_bug.cgi?id=23198 - substituteInPlace druntime/test/exceptions/Makefile \ - --replace 'in D main (' 'in _Dmain (' - - # We're using gnused on all platforms - substituteInPlace druntime/test/coverage/Makefile \ - --replace 'freebsd osx' 'none' + rm dmd/compiler/test/runnable/cdvecfill.sh + rm dmd/compiler/test/compilable/cdcmp.d '' + lib.optionalString (lib.versionOlder version "2.091.0") '' # This one has tested against a hardcoded year, then against a current year on # and off again. It just isn't worth it to patch all the historical versions # of it, so just remove it until the most recent change. - rm dmd/test/compilable/ddocYear.d + rm dmd/compiler/test/compilable/ddocYear.d '' + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") '' - rm dmd/test/dshell/test6952.d + rm dmd/compiler/test/dshell/test6952.d '' + lib.optionalString (lib.versionAtLeast version "2.092.2") '' - substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" + substituteInPlace dmd/compiler/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" '' + lib.optionalString stdenv.isLinux '' @@ -179,8 +154,7 @@ stdenv.mkDerivation rec { buildJobs=1 fi - make -C dmd -f posix.mak $buildFlags -j$buildJobs HOST_DMD=${HOST_DMD} - make -C druntime -f posix.mak $buildFlags -j$buildJobs DMD=${pathToDmd} + ${dmd_bin}/rdmd dmd/compiler/src/build.d -j$buildJobs HOST_DMD=${dmd_bin}/dmd $buildFlags echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile echo ${lib.getLib curl}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile make -C phobos -f posix.mak $buildFlags -j$buildJobs DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" @@ -205,10 +179,7 @@ stdenv.mkDerivation rec { fi NIX_ENFORCE_PURITY= \ - make -C dmd/test $checkFlags CC=$CXX SHELL=$SHELL -j$checkJobs N=$checkJobs - - NIX_ENFORCE_PURITY= \ - make -C druntime -f posix.mak unittest $checkFlags -j$checkJobs + make -C dmd/compiler/test $checkFlags CC=$CXX SHELL=$SHELL -j$checkJobs N=$checkJobs NIX_ENFORCE_PURITY= \ make -C phobos -f posix.mak unittest $checkFlags -j$checkJobs DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" @@ -244,7 +215,7 @@ stdenv.mkDerivation rec { # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; - maintainers = with maintainers; [ ThomasMader lionello dukc ]; + maintainers = with maintainers; [ ThomasMader lionello dukc jtbx ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix index ce785e5d140d..81bf2b0aebc5 100644 --- a/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -5,18 +5,20 @@ , nix-update-script }: -stdenv.mkDerivation ( rec { +stdenv.mkDerivation (finalAttrs: { pname = "corral"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ponylang"; - repo = pname; - rev = "f31353a9ec9cd7eab6ee89079ae6a782192fd4b5"; - hash = "sha256-jTx/7iFvmwOdjGVf/6NUy+FTkv6Mkv8DeotJ67pvmtc="; + repo = "corral"; + rev = finalAttrs.version; + hash = "sha256-+pHg5BFHlScC1suad0/3RqKAnxoEVZNUNj1EDLvbsfA="; }; - buildInputs = [ ponyc ]; + strictDeps = true; + + nativeBuildInputs = [ ponyc ]; installFlags = [ "prefix=${placeholder "out"}" "install" ]; @@ -25,9 +27,9 @@ stdenv.mkDerivation ( rec { meta = with lib; { description = "Corral is a dependency management tool for ponylang (ponyc)"; homepage = "https://www.ponylang.io"; - changelog = "https://github.com/ponylang/corral/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/ponylang/corral/blob/${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ redvers ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + inherit (ponyc.meta) platforms; }; }) diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index b27efe501944..1586474f3910 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,24 +1,26 @@ { lib, fetchurl, buildDunePackage , menhir, menhirLib , fmt +, qcheck }: buildDunePackage rec { pname = "dolmen"; - version = "0.6"; + version = "0.9"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-v${version}.tbz"; - sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; + url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-${version}.tbz"; + hash = "sha256-AD21OFS6zDoz+lXtac95gXwQNppPfGvpRK8dzDZXigo="; }; nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; - # Testr are not compatible with menhir 20211128 - doCheck = false; + doCheck = true; + + checkInputs = [ qcheck ]; meta = { description = "An OCaml library providing clean and flexible parsers for input languages"; diff --git a/pkgs/development/ocaml-modules/dolmen/loop.nix b/pkgs/development/ocaml-modules/dolmen/loop.nix new file mode 100644 index 000000000000..11e49ad9ee8d --- /dev/null +++ b/pkgs/development/ocaml-modules/dolmen/loop.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, dolmen, dolmen_type +, gen +, pp_loc +}: + +buildDunePackage { + pname = "dolmen_loop"; + inherit (dolmen) src version; + + propagatedBuildInputs = [ dolmen dolmen_type gen pp_loc ]; + + meta = dolmen.meta // { + description = "A tool library for automated deduction tools"; + }; +} diff --git a/pkgs/development/ocaml-modules/dolmen/type.nix b/pkgs/development/ocaml-modules/dolmen/type.nix new file mode 100644 index 000000000000..ce2fe7616da4 --- /dev/null +++ b/pkgs/development/ocaml-modules/dolmen/type.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, dolmen +, spelll +, uutf +}: + +buildDunePackage { + pname = "dolmen_type"; + inherit (dolmen) src version; + + propagatedBuildInputs = [ dolmen spelll uutf ]; + + meta = dolmen.meta // { + description = "A typechecker for automated deduction languages"; + }; +} diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 9fc2beef2c0d..36d4dbd5b192 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.13.1"; + version = "1.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FTg5LHjti6Srmz1LcPU0bepNzn2tpmdSBM3Y2BzZEms="; + hash = "sha256-nWXtXhF2pUBxHdrivi4DA7+bFiZPyxb2nqsiN3j4HdI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index ffcd7ba3f01c..13e1e8d93f8f 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.28"; + version = "2.5.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pGSXXsA+gIIIZbnwa22EmizZT65MqZrWd3+o47VatBs="; + hash = "sha256-eCOgOXzbjP2yTLKYcnjnWFes4P2jvr9rGfQuHuqxLDc="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/kotsu/default.nix b/pkgs/development/python-modules/kotsu/default.nix new file mode 100644 index 000000000000..47d78c8b916f --- /dev/null +++ b/pkgs/development/python-modules/kotsu/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pandas +, typing-extensions +, pytestCheckHook +, pytest-mock +, scikit-learn +}: + +buildPythonPackage rec { + pname = "kotsu"; + version = "0.3.3"; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "datavaluepeople"; + repo = "kotsu"; + rev = "v${version}"; + hash = "sha256-V5OkgiLUTRNbNt6m94+aYUZd9Nw+/60LfhrqqdFhiUw="; + }; + + patches = [ + ./disable-pytest-coverage-flags.patch + ]; + + propagatedBuildInputs = [ pandas typing-extensions ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + scikit-learn + ]; + pythonImportsCheck = [ "kotsu" ]; + + meta = with lib; { + description = "Lightweight framework for structured and repeatable model validation"; + homepage = "https://github.com/datavaluepeople/kotsu"; + changelog = "https://github.com/datavaluepeople/kotsu/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch b/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch new file mode 100644 index 000000000000..f035ab0e6553 --- /dev/null +++ b/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch @@ -0,0 +1,18 @@ +diff --git a/setup.cfg b/setup.cfg +index 3ab277a..b253e18 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -50,13 +50,6 @@ convention = google + add_ignore = D105, D107 + #add_ignore = D100,D101,D102,D103,D104,D200 - start with no ignored errors and add as required + +-[tool:pytest] +-addopts = --cov=./kotsu --cov-report xml --cov-report term +- +-[coverage:run] +-# Omit auto-generated versioneer file from test coverage +-omit = kotsu/_version.py +- + [versioneer] + VCS = git + style = pep440 diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index af7ae5d6e87a..1dae9f126b92 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-6ZnYI6GlFkMjBLsZhhFg8G9j3I/DfjLAnKsRFEua7uU="; + hash = "sha256-IbBuQuKWFjWUpVRdo5rl2Wq8vCAngg9/TKLuljRmKAU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix new file mode 100644 index 000000000000..3bbe69f2d4e5 --- /dev/null +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cython +, fftw +, pandas +, scikit-learn +, numpy +}: + +buildPythonPackage rec { + pname = "mrsqm"; + version = "0.0.4"; + format = "setuptools"; + + disable = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kg9GSgtBpnCF+09jyP5TRwZh0tifxx4WRtQGn8bLH8c="; + }; + + buildInputs = [ fftw ]; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + pandas + scikit-learn + numpy + ]; + + doCheck = false; # Package has no tests + pythonImportsCheck = [ "mrsqm" ]; + + meta = with lib; { + description = "MrSQM (Multiple Representations Sequence Miner) is a time series classifier"; + homepage = "https://pypi.org/project/mrsqm"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 71070e2decd5..9415343d6ea7 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-3b6uwojekWthH5AsAVfS/ue+yAoIMac1LQff1mrM9PM="; + hash = "sha256-cyD68GsAuJKmbVxWCCJVWz/VErB9LEdRzz9IT8ir+U0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index bed7f75832d6..c180e5349b04 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.5.8"; + version = "0.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-6NGEXglo3J9Buz4Qm5tOHnXWvEf/NHSp2utfHZOPWT4="; + hash = "sha256-vzFN8b+F4CO/f/7CbUpX/Xj8wZMEpz2veUXsPHYzPxE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index 62e048639273..ac879c12886a 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -20,19 +20,19 @@ buildPythonPackage rec { pname = "sourmash"; - version = "4.8.3"; + version = "4.8.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-LIMpL9cLafytRFyPam/FBNi757j1v6o1FG/K2JknDQY="; + hash = "sha256-Q1hMESwzEHGXcd4XW4nLqU8cLTCxrqRgAOr1qB77roo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mcJzFRYkdxuqqXH+ryg5v+9tQtuN1hkEeW2DF+wEJ/w="; + hash = "sha256-HisWvJgx15OfYoMzzqYm1JyY1/jmGXBSZZmuNaKTDjI="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 14ef623c3f19..55a1454d77bd 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.41"; + version = "2.4.42"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yL0xGNLIT2zrk6c8herlDJFkaoLvpVS77llL0z5fDVk="; + hash = "sha256-5G7ErzWxyQ17rn5k+3BpLhrGmU6YSBZ6BEK9y0cpki4="; }; patches = [ diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index 18075335664a..beb21a027497 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.63.0"; + version = "0.63.1"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-Or7KjJVi0N8edO+Q8bBCNrNAE974ClJfXT7Co8YXWjI="; + sha256 = "sha256-+ymdt0FPrhZu5mUjRHhfzMtROX0eBVYsAOiB6g06mn0="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index 3a5d1da615cd..3833946651cc 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -13,7 +13,7 @@ (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) (fetchNuGet { pname = "dotnet-reportgenerator-globaltool"; version = "5.0.2"; sha256 = "0grzjd6h82f3whx8iax23v9dvq5c5qvqraadnrpkxsfc8p1z0ynh"; }) (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.1.1"; sha256 = "0wa0xwbwv1lzjmqwg1vq06vrpb9kkbv3xw5nq50savj0dzhqakzq"; }) - (fetchNuGet { pname = "Expecto"; version = "9.0.4"; sha256 = "0wvxd5blm70k40kn5gzfp65wzzpp2bwf5lpagb73wqjna97fcrkg"; }) + (fetchNuGet { pname = "Expecto"; version = "10.1.0"; sha256 = "127yy5i0p2lybhm5xcy2wa6j1rcahk61mb1nbym687b23pgizrq9"; }) (fetchNuGet { pname = "Expecto.Diff"; version = "9.0.4"; sha256 = "06g6nbr5kdr7hyayh24ry6xfghxpcfkqc8kma5qa5lcvhmy56f7j"; }) (fetchNuGet { pname = "fake-cli"; version = "5.23.0"; sha256 = "1bmw5kyc9q1sqd08pamibgk0qm5xwylawc5nfrnfx3pl1pifd71y"; }) (fetchNuGet { pname = "Fake.Api.GitHub"; version = "5.20.4"; sha256 = "1hgzqin7bm5fm0n97w7s9cq3zcxyncjmd6xk2da3p12wi7kghx0v"; }) @@ -208,5 +208,5 @@ (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) - (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.13.3"; sha256 = "0y9bhgws3m2idj8cr53rn0155wwi6nhgbp6hmci0gc2w7fp3387c"; }) + (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.14.2"; sha256 = "1877gr3f8wl1x3njhgss9psxm21xpqv6cpg625f2mvvak79fzrra"; }) ] diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 91c9d76c66d1..e8536ea784f3 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "inotify-tools"; - version = "4.23.8.0"; + version = "4.23.9.0"; src = fetchFromGitHub { repo = "inotify-tools"; owner = "inotify-tools"; rev = finalAttrs.version; - hash = "sha256-aD5jzUbDfB57wE1PSA3a+79owspSn7rcoRe5HsPDSXI="; + hash = "sha256-6kM2JzxRcwUjUmbUWGnQ+gAvZcn7C32/enRwiYiuQGU="; }; configureFlags = [ diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 2e3b1b3b0e7a..22f64b383f00 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.18.10"; + version = "1.18.12"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-xkpoVFZWlqhSSDn62MbhBYU6X+l5MmPxtrewg9xKuJc="; + hash = "sha256-akeW03+IdRvt3Fs3gF6TcYv9gD33DHPtpmiiMa0b92k="; }; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 136cf1c755f7..c12a0f9df73e 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -8,32 +8,22 @@ buildGoModule rec { pname = "mattermost"; - version = "7.10.3"; + version = "7.10.5"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-nzQUkcCFEZYvqMLRv1d81pfoz/MDYjWetGLtFXf8H/Q="; + hash = "sha256-7R2ivfF0wC4Y5NMcBhcmbwwULuaTUTP7hq1idwYsLYs="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-oD67sTyTvB0DVcw3e6x79Y4K8xlX75YreRwnc9olTy4="; + hash = "sha256-WTcQPXx9KYNDdA+cX46HWV2Cnq8ojUrsg0zn4IegR94="; }; vendorHash = "sha256-7YxbBmkKeb20a3BNllB3RtvjAJLZzoC2OBK4l1Ud1bw="; - patches = [ - (fetchpatch { - # Current version was set to 7.10.4 in the v7.10.3 tag, reverting it so `mattermost version` exposes the correct version - # and to make smoke tests happy - url = "https://github.com/mattermost/mattermost/commit/fbdadeacc85ae47145f69ffb766d4105aede69d5.patch"; - hash = "sha256-9BNEc5VefRuPKb3/rQNiekNbAIBRsjAtdCKUVrh9BuY="; - revert = true; - }) - ]; - subPackages = [ "cmd/mattermost" ]; ldflags = [ diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index e638886bc20f..f667d61511e4 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "unstable-2023-07-16"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; - rev = "543b50e73918918d1fabac67891dd80d97080942"; - hash = "sha256-Y6nwryPenNQa68Rh2KPUHQrv6rnapj8x19FdgLXutm8="; + rev = "v${version}"; + hash = "sha256-8uleN7L3fgNqqRjva3kJU7fLPJZpO6b0J4z0RxZ9B64="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 1a0845e8752d..e0db6f3c0841 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-I1qM1hq6bnBgbtfzgWvySairfr+Q6TthMIQM+Mregc8="; + hash = "sha256-GWtci/OiipaUFzzha3GvkoKmN1lb9Fg3i+X1ZFkGKtc="; }; buildInputs = [ olm ]; - vendorHash = "sha256-TH353K6BOTzFC/iPIf1S7rV0DSIxjJEg42ru5H8NbSE="; + vendorHash = "sha256-IEBSY61Bjuc42GqQUvChqLayO1hiDEDBxlMoAKJo12E="; doCheck = false; diff --git a/pkgs/tools/misc/dgoss/default.nix b/pkgs/tools/misc/dgoss/default.nix index 3c5c2ff8bbab..0ca97c9f63f1 100644 --- a/pkgs/tools/misc/dgoss/default.nix +++ b/pkgs/tools/misc/dgoss/default.nix @@ -9,13 +9,13 @@ resholve.mkDerivation rec { pname = "dgoss"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "goss-org"; repo = "goss"; rev = "refs/tags/v${version}"; - hash = "sha256-dpMTUBMEG5tDi7E6ZRg1KHqIj5qDlvwfwJEgq/5z7RE="; + hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM="; }; dontConfigure = true; diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/tools/misc/goss/default.nix index 11d0b584357b..55fafb1059be 100644 --- a/pkgs/tools/misc/goss/default.nix +++ b/pkgs/tools/misc/goss/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "goss"; # Don't forget to update dgoss to the same version. - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "goss-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dpMTUBMEG5tDi7E6ZRg1KHqIj5qDlvwfwJEgq/5z7RE="; + hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM="; }; vendorHash = "sha256-n+k7f9e2iqf4KrcDkzX0CWk+Bq2WE3dyUEid4PTP1FA="; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 57584ff7c90e..388a407a52b7 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -23,14 +23,13 @@ let cups ]; in -stdenv.mkDerivation rec { - version = "6.0.0"; +stdenv.mkDerivation (finalAttrs: { + version = "6.0.1"; pname = "staruml"; - src = - fetchurl { - url = "https://files.staruml.io/releases-v6/StarUML_${version}_amd64.deb"; - sha256 = "sha256-g35d9YcZrP4D8X9NU84Fz0qmb/2lUUOuZ30iIwgThA0="; + src = fetchurl { + url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; + sha256 = "sha256-LxulOfYjdJrDjRL661S0W9slIXvhLc+kXZN6e3TfXVs="; }; nativeBuildInputs = [ wrapGAppsHook dpkg ]; @@ -77,4 +76,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kashw2 ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/tools/networking/cfspeedtest/default.nix new file mode 100644 index 000000000000..33b1c0046f1a --- /dev/null +++ b/pkgs/tools/networking/cfspeedtest/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cfspeedtest"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "code-inflation"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-uQe9apG4SdFEUT2aOrzF2C8bbrl0fOiqnMZrWDQvbxk="; + }; + + cargoSha256 = "sha256-wJmLUPXGSg90R92iW9R02r3E3e7XU1gJwd8IqIC+QMA="; + + meta = with lib; { + description = "Unofficial CLI for speed.cloudflare.com"; + homepage = "https://github.com/code-inflation/cfspeedtest"; + license = with licenses; [ mit ]; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index 493738559cfe..812d3bb5068d 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - hash = "sha256-Z1MwI76jOJft68+/yX4QEO7zYkUyQY7+DdZlejtNA8k="; + hash = "sha256-AxgvZdsJX16sZi4g8LnfceKuw/wBwvj6uoF/5zKldBk="; }; - vendorHash = "sha256-1RJAmz3Tw6c2Y7lXlXvq/aEkVLO+smkwuNJbi7aBUNo="; + vendorHash = "sha256-kOLeaEKtpI3l0qLphRTnm27Ms63ID4LJ6VkUHJzGAcc="; ldflags = [ "-s" diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index a63f80c68ad1..bbadd0d9e5d6 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -19,13 +19,13 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.06c"; + version = "4.08c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; - rev = version; - sha256 = "sha256-Gb1nYDBnwLS+m8e1UD0WLIrnp8KRgliGQVvQD22JXrQ="; + rev = "v${version}"; + sha256 = "sha256-r1elJlvGuVrMFLECYCfMsZVEJcCPYRdkljMbF4uRHQY="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 89e537766ddb..f412b8e40499 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "AFLplusplus"; repo = "qemuafl"; - rev = "0569eff8a12dec73642b96757f6b5b51a618a03a"; - sha256 = "sha256-nYWHyRfOH2p9znRxjxsiyw11uZuMBiuJfEc7FHM5X7M="; + rev = "a1321713c7502c152dd7527555e0f8a800d55225"; + sha256 = "sha256-HLlOHqT2vrHjHyu4n83IzVzKv9ErinephLLev1E10nM="; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 972e1fcd2c4e..143ea568abde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1699,6 +1699,8 @@ with pkgs; cf-vault = callPackage ../tools/admin/cf-vault { }; + cfspeedtest = callPackage ../tools/networking/cfspeedtest { }; + cfonts = callPackage ../tools/misc/cfonts { }; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 696143c8ab27..cffb020d4684 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -337,6 +337,10 @@ let dolmen = callPackage ../development/ocaml-modules/dolmen { }; + dolmen_loop = callPackage ../development/ocaml-modules/dolmen/loop.nix { }; + + dolmen_type = callPackage ../development/ocaml-modules/dolmen/type.nix { }; + dolog = callPackage ../development/ocaml-modules/dolog { }; domain-local-await = callPackage ../development/ocaml-modules/domain-local-await { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc07cf6a8f11..c062db7259cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5858,6 +5858,8 @@ self: super: with self; { konnected = callPackage ../development/python-modules/konnected { }; + kotsu = callPackage ../development/python-modules/kotsu { }; + korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; kornia = callPackage ../development/python-modules/kornia { }; @@ -6905,6 +6907,8 @@ self: super: with self; { mrjob = callPackage ../development/python-modules/mrjob { }; + mrsqm = callPackage ../development/python-modules/mrsqm { }; + ms-active-directory = callPackage ../development/python-modules/ms-active-directory { }; ms-cv = callPackage ../development/python-modules/ms-cv { }; |