diff options
18 files changed, 501 insertions, 107 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 8836ab912e631..ee71488263a93 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -650,6 +650,13 @@ in mkLicense lset) ({ free = true; }; + fairsource09 = { + fullName = "Fair Source License, version 0.9"; + url = "https://fair.io/v0.9.txt"; + free = false; + redistributable = true; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index c5750c6136bc4..132e7edcc3940 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,5 +1,8 @@ { stdenv , lib +, openexr +, jemalloc +, c-blosc , binutils , fetchFromGitHub , cmake @@ -21,33 +24,50 @@ , ilmbase , libpng , mpfr +, nanosvg , nlopt , opencascade-occt , openvdb , pcre , qhull -, tbb -, wxGTK31 +, tbb_2021_8 +, wxGTK32 , xorg , fetchpatch , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: let - wxGTK-prusa = wxGTK31.overrideAttrs (old: rec { + wxGTK-prusa = wxGTK32.overrideAttrs (old: rec { pname = "wxwidgets-prusa3d-patched"; - version = "3.1.4"; + version = "3.2.0"; + configureFlags = old.configureFlags ++ [ "--disable-glcanvasegl" ]; + patches = [ ./wxWidgets-Makefile.in-fix.patch ]; src = fetchFromGitHub { owner = "prusa3d"; repo = "wxWidgets"; - rev = "489f6118256853cf5b299d595868641938566cdb"; - hash = "sha256-xGL5I2+bPjmZGSTYe1L7VAmvLHbwd934o/cxg9baEvQ="; + rev = "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26"; + hash = "sha256-rYvmNmvv48JSKVT4ph9AS+JdstnLSRmcpWz1IdgBzQo="; fetchSubmodules = true; }; }); + nanosvg-fltk = nanosvg.overrideAttrs (old: rec { + pname = "nanosvg-fltk"; + version = "unstable-2022-12-22"; + + src = fetchFromGitHub { + owner = "fltk"; + repo = "nanosvg"; + rev = "abcd277ea45e9098bed752cf9c6875b533c0892f"; + hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY="; + }; + }); + openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { + buildInputs = [ openexr boost tbb_2021_8 jemalloc c-blosc ilmbase ]; + }); in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.5.2"; + version = "2.6.0"; nativeBuildInputs = [ cmake @@ -72,35 +92,19 @@ stdenv.mkDerivation rec { ilmbase libpng mpfr + nanosvg-fltk nlopt opencascade-occt - openvdb + openvdb_tbb_2021_8 pcre - tbb + qhull + tbb_2021_8 wxGTK-prusa xorg.libX11 ] ++ lib.optionals withSystemd [ systemd ] ++ nativeCheckInputs; - patches = [ - # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355 - (fetchpatch { - url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; - sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; - }) - # Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238 - # Can be removed with the next version update - (fetchpatch { - url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch"; - sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8="; - }) - (fetchpatch { - url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch"; - sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20="; - }) - ]; - doCheck = true; nativeCheckInputs = [ gtest ]; @@ -125,10 +129,8 @@ stdenv.mkDerivation rec { # now seems to be integrated into the main lib. sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake - # Disable test_voronoi.cpp as the assembler hangs during build, - # likely due to commit e682dd84cff5d2420fcc0a40508557477f6cc9d3 - # See issue #185808 for details. - sed -i 's|test_voronoi.cpp||g' tests/libslic3r/CMakeLists.txt + # Disable slic3r_jobs_tests.cpp as the test fails sometimes + sed -i 's|slic3r_jobs_tests.cpp||g' tests/slic3rutils/CMakeLists.txt # prusa-slicer expects the OCCTWrapper shared library in the same folder as # the executable when loading STEP files. We force the loader to find it in @@ -138,6 +140,10 @@ stdenv.mkDerivation rec { substituteInPlace src/libslic3r/Format/STEP.cpp \ --replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";' fi + # https://github.com/prusa3d/PrusaSlicer/issues/9581 + if [ -f "cmake/modules/FindEXPAT.cmake" ]; then + rm cmake/modules/FindEXPAT.cmake + fi # Fix resources folder location on macOS substituteInPlace src/PrusaSlicer.cpp \ @@ -147,10 +153,18 @@ stdenv.mkDerivation rec { sed -i '/libslic3r/d' tests/CMakeLists.txt ''; + patches = [ + # wxWidgets: CheckResizerFlags assert fix + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/24a5ebd65c9d25a0fd69a3716d079fd1b00eb15c.patch"; + hash = "sha256-MNGtaI7THu6HEl9dMwcO1hkrCtIkscoNh4ulA2cKtZA="; + }) + ]; + src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "sha256-oQRBVAbA2wOYZkQiYIgbd3UcKAkXjnNXo6gB5QbPDAs="; + hash = "sha256-6AZdwNcgddHePyB0bNS7xGmpz38uzhAwUxgo48OQLuU="; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch b/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch new file mode 100644 index 0000000000000..aadf9765882d8 --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch @@ -0,0 +1,112 @@ +diff --git a/Makefile.in b/Makefile.in +index 8f33aa2ff4..39928382da 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_msw_utils.o \ + monodll_utilsexc.o \ + monodll_fswatcher.o \ +- monodll_msw_secretstore.o ++ monodll_msw_secretstore.o \ + monodll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ +@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ +@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ +@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_msw_utils.o \ + monolib_utilsexc.o \ + monolib_fswatcher.o \ +- monolib_msw_secretstore.o ++ monolib_msw_secretstore.o \ + monolib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ +@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ +@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ +@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_msw_utils.o \ + basedll_utilsexc.o \ + basedll_fswatcher.o \ +- basedll_msw_secretstore.o ++ basedll_msw_secretstore.o \ + basedll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ +@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_msw_utils.o \ + baselib_utilsexc.o \ + baselib_fswatcher.o \ +- baselib_msw_secretstore.o ++ baselib_msw_secretstore.o \ + baselib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ +@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ +@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ +@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ +@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix new file mode 100644 index 0000000000000..ad0cfa8df547f --- /dev/null +++ b/pkgs/applications/virtualization/tart/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeWrapper +# Softnet support ("--net-softnet") is disabled by default as it requires +# passwordless-sudo when installed through nix. Alternatively users may install +# softnet through other means with "setuid"-bit enabled. +# See https://github.com/cirruslabs/softnet#installing +, enableSoftnet ? false, softnet +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tart"; + version = "1.6.0"; + + src = fetchurl { + url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; + sha256 = "1n052nwsccc3sr0jqnvhyl0six8wi46vysxjchwrdm8brnsdpf84"; + }; + sourceRoot = "."; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + # ./tart.app/Contents/MacOS/tart binary is required to be used in order to + # trick macOS to pick tart.app/Contents/embedded.provision profile for elevated + # privileges that Tart needs + mkdir -p $out/bin $out/Applications + cp -r tart.app $out/Applications/tart.app + makeWrapper $out/Applications/tart.app/Contents/MacOS/tart $out/bin/tart \ + --prefix PATH : ${lib.makeBinPath (lib.optional enableSoftnet softnet)} + install -Dm444 LICENSE $out/share/tart/LICENSE + + runHook postInstall + ''; + + meta = with lib; { + description = "macOS VMs on Apple Silicon to use in CI and other automations"; + homepage = "https://tart.run"; + license = licenses.fairsource09; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = [ "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/development/libraries/nanosvg/default.nix b/pkgs/development/libraries/nanosvg/default.nix new file mode 100644 index 0000000000000..2033069d77e28 --- /dev/null +++ b/pkgs/development/libraries/nanosvg/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation { + pname = "nanosvg"; + version = "unstable-2022-12-04"; + + src = fetchFromGitHub { + owner = "memononen"; + repo = "nanosvg"; + rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; + hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Simple stupid SVG parser"; + homepage = "https://github.com/memononen/nanosvg"; + license = licenses.zlib; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index ab357dc618568..b64c7e103a7e1 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lMgD315movmr+u+8BMaqhb1L46Wf0Ak56VAT2jpg1kM="; + hash = "sha256-qt2/Wf9qolNF83tf2G5xGFJiLTbOWLPbtCnDfIrKvoI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 33886f82f4f14..fef50c9646732 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.25.1"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-I7lsyMJ6akQvpzXEcUrWfomTX+oFYCX7YiE4cf6KAuE="; + hash = "sha256-zGlfkp7xOIpQKl0xL8EqtbMZfgCsi+txcsC/HW4ViEg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 14ce73b05dfab..a0ede8a0b9643 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.22.4"; + version = "2.23.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-oqxobClWwPNeZZhFdoX2tzD2/unG/XmvSp6hU+zzyos="; + sha256 = "sha256-RBe9S6eHnKhtar/rLoLs6gl2TJtCNfoGrYLDbE6CpRI="; }; dontConfigure = true; dontBuild = true; 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 44da96d5b4b10..c731a1d2e723c 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.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aC1I+33jEmgjtidA5CQXpwePsavwlx97abpsc68RkBI="; + sha256 = "sha256-7zAeGJyMfMdrVDCuTWU3zikXjM/ydjnGj6Ctjckd32c="; }; - vendorHash = "sha256-4vNRtFqtzoDHjDQwPe1/sJNzcCU+b7XHgQ5YqEzNhjI="; + vendorHash = "sha256-SxGBfWcV10L6xC5XPIfv/HJWQy5g3AoV8z4/ae23DEc="; doCheck = false; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e75e290271502..ef56724d7a023 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.40"; + version = "0.1.43"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-TqLxx69mnc6fN0TdhFsMjTbTBP9Asr0IFVCJlgnCB+U="; + hash = "sha256-mvB5TCPkRWDAkDd4PV50EKjtlaZSFqTl6IDMTnPDrng="; }; - vendorHash = "sha256-Ml+ODoJqRkOiqPqLltpxrMvkTFV+iSoCrdr4PuvkMCY="; + vendorHash = "sha256-2us72JBzLXaxJ6X6T/Hc2y4YVoAJ6YvJVJdO3KzsbkE="; subPackages = [ "." ]; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 2e0a9cfd8c463..2c9eb76b45483 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.3.4"; #zen + version = "6.4.1"; #zen suffix = "zen1"; #zen - sha256 = "1dj5pk8fqf4plk5nri6cajwvdcs9b6gpfk1y620vi3g7w15p1gvx"; #zen + sha256 = "05a3dplzz6vy5gjz9yd1hz7n4xf3mlr2q112kf3yabg8k8izqnys"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.3.4"; #lqx - suffix = "lqx1"; #lqx - sha256 = "06xkcrd4wjpj23dnrfbyxyx1699vxzswb3r6p2xjwmpy44j5wjgf"; #lqx + version = "6.3.11"; #lqx + suffix = "lqx2"; #lqx + sha256 = "0hpzafw2zwy25ss4cwj6mm8pr1nnv680m8bfcal29f7gaxbm96k8"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 5efc654337ffc..529c905e385bf 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.83.1"; + version = "0.84.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-GZLkz2aadUiSD+v69vLq5BDgn0MSnHVkeGeAFLNDWgM="; + hash = "sha256-1/8M4z/ezyyZRG+amzErOGIv2kRZ/sfx7AAB7V7aPX8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-hv+0qLzGd31CTDGd3STszSUO2BOMRfppyewbJKzGDTg="; + vendorHash = "sha256-WDxHDf+F0QdM/kK2WrStjgzq6h4IPFdsZFbO5qpILp4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 9f1b76badbbaf..9c8e33d182de5 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,33 +1,99 @@ -{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles, fetchpatch -, abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc -, e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar -, gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R -, radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd +{ lib +, stdenv +, abootimg +, acl +, apksigcopier +, apksigner +, apktool +, binutils-unwrapped-all-targets +, bzip2 +, cbfstool +, cdrkit +, colord +, colordiff +, coreutils +, cpio +, db +, diffutils +, docutils +, dtc +, e2fsprogs , enableBloat ? true , enableUnfree ? false -# updater only +, enjarify +, fetchurl +, file +, findutils +, fontforge-fonttools +, ffmpeg +, fpc +, gettext +, ghc +, ghostscriptX +, giflib +, gnumeric +, gnupg +, gnutar +, gzip +, hdf5 +, help2man +, html2text +, imagemagick +, installShellFiles +, jdk +, libarchive +, libcaca +, libxmlb +, llvm +, lz4 +, lzip +, mono +, ocaml +, odt2txt +, oggvideotools +, openssh +, openssl +, pdftk +, pgpdump +, poppler_utils +, procyon +, python3 +, qemu +, R +, radare2 +, sng +, sqlite +, squashfsTools +, tcpdump +, ubootTools +, unzip +, wabt +, xmlbeans +, xxd +, xz +, zip +, zstd + # updater only , writeScript }: # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "233"; + version = "243"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4="; + hash = "sha256-lqI9MOZJxgHZ87kax343t6Wylzv1NWcQZ1cMWgmpnRo="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; patches = [ ./ignore_links.patch - # test_text_proper_indentation requires file >= 5.44 - (fetchpatch { - url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9fdb78ec0bbc69f1980499dfdcbf6f1dd5e55cc8.patch"; - sha256 = "sha256-F0N3L9yymj2NjeIKtSnOEDsxPe+ZTb0m/M4f8LPRHg0="; - }) ]; postPatch = '' @@ -38,43 +104,127 @@ python3Packages.buildPythonApplication rec { substituteInPlace doc/Makefile --replace "../bin" "$out/bin" ''; - nativeBuildInputs = [ docutils help2man installShellFiles ]; + nativeBuildInputs = [ + docutils + help2man + installShellFiles + ]; # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # - # Still missing these tools: docx2txt lipo otool r2pipe + # Still missing these tools: + # aapt2 + # dexdump + # docx2txt + # getfacl + # lipo + # otool + # r2pipe + # # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([ - binutils-unwrapped-all-targets bzip2 colordiff coreutils cpio db diffutils - e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip - html2text libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd - xz zip zstd cdrkit dtc + binutils-unwrapped-all-targets + bzip2 + cdrkit + colordiff + coreutils + cpio + db + diffutils + dtc + e2fsprogs + file + findutils + fontforge-fonttools + gettext + gnutar + gzip + html2text + libarchive + libxmlb + lz4 + lzip + openssl + pgpdump + sng + sqlite + squashfsTools + unzip + xxd + xz + zip + zstd + ] + ++ (with python3.pkgs; [ + argcomplete + debian + defusedxml + jsbeautifier + jsondiff + libarchive-c + progressbar33 + pypdf2 + python-magic + pyxattr + rpm + tlsh + ]) + ++ lib.optionals enableBloat ( + [ + abootimg + apksigcopier + apksigner + cbfstool + colord + enjarify + ffmpeg + fpc + ghc + ghostscriptX + giflib + gnupg + hdf5 + imagemagick + jdk + libcaca + llvm + mono + ocaml + odt2txt + openssh + pdftk + poppler_utils + procyon + qemu + R + radare2 + tcpdump + ubootTools + wabt + xmlbeans ] - ++ (with python3Packages; [ - argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c - python-magic progressbar33 pypdf2 tlsh pyxattr rpm + ++ (with python3.pkgs; [ + androguard + binwalk + guestfs + h5py + pdfminer-six ]) - ++ lib.optionals enableBloat ( - [ - apksigcopier apksigner enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg pdftk - hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt openssh - poppler_utils procyon qemu R tcpdump wabt radare2 xmlbeans - abootimg cbfstool colord ubootTools - ] - ++ (with python3Packages; [ androguard binwalk h5py pdfminer-six guestfs ]) - # oggvideotools is broken on Darwin, please put it back when it will be fixed? - ++ lib.optionals stdenv.isLinux [ oggvideotools ] - # This doesn't work on aarch64-darwin - ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] - # `apktool` depend on `build-tools` which requires Android SDK acceptance, therefore, the whole thing is unfree. - ++ lib.optionals enableUnfree [ apktool ] - )); - - nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; + # oggvideotools is broken on Darwin, please put it back when it will be fixed? + ++ lib.optionals stdenv.isLinux [ oggvideotools ] + # This doesn't work on aarch64-darwin + ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] + # apktool depend on build-tools which requires Android SDK acceptance, therefore, the whole thing is unfree + ++ lib.optionals enableUnfree [ apktool ] + )); + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ] ++ pythonPath; pytestFlagsArray = [ - # always show more information when tests fail + # Always show more information when tests fail "-vv" ]; @@ -88,7 +238,7 @@ python3Packages.buildPythonApplication rec { "test_diff_meta" "test_diff_meta2" - # fails because it fails to determine llvm version + # Fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin @@ -97,7 +247,7 @@ python3Packages.buildPythonApplication rec { "test_symlink_root" ]; - # flaky tests on Darwin + # Flaky tests on Darwin disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/comparators/test_git.py" "tests/comparators/test_java.py" @@ -106,7 +256,7 @@ python3Packages.buildPythonApplication rec { "tests/comparators/test_macho.py" ]; - passthru = { + passthru = { updateScript = writeScript "update-diffoscope" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pcre common-updater-scripts @@ -117,7 +267,7 @@ python3Packages.buildPythonApplication rec { newVersion="$(curl -s https://diffoscope.org/ | pcregrep -o1 'Latest release: ([0-9]+)')" update-source-version ${pname} "$newVersion" ''; - }; + }; meta = with lib; { description = "Perform in-depth comparison of files, archives, and directories"; @@ -132,6 +282,7 @@ python3Packages.buildPythonApplication rec { project and was formerly known as "debbindiff". ''; homepage = "https://diffoscope.org/"; + changelog = "https://diffoscope.org/news/diffoscope-${version}-released/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dezgeg danielfullmer raitobezarius ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/softnet/default.nix b/pkgs/tools/networking/softnet/default.nix new file mode 100644 index 0000000000000..b1a9cb3a97f76 --- /dev/null +++ b/pkgs/tools/networking/softnet/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchurl +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "softnet"; + version = "0.7.1"; + + src = fetchurl { + url = "https://github.com/cirruslabs/softnet/releases/download/${finalAttrs.version}/softnet.tar.gz"; + sha256 = "1g274x524xc85hfzxi3vb4xp720bjgk740bp6hc92d1ikmp0b664"; + }; + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + install -D softnet $out/bin/softnet + install -Dm444 -t $out/share/softnet README.md LICENSE + + runHook postInstall + ''; + + meta = with lib; { + description = "Software networking with isolation for Tart"; + homepage = "https://github.com/cirruslabs/softnet"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ emilytrau ]; + platforms = [ "aarch64-darwin" ]; + # Source build will be possible after darwin SDK 12.0 bump + # https://github.com/NixOS/nixpkgs/pull/229210 + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index f82705cdd3e1a..14041ba7e7f06 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EqL5/PVQm/lfviojKoYKDnzilx7KQZ7T3EEx/or6y7E="; + hash = "sha256-zkZ8Glny9eERfU4DGtTOc66O7LOk5NISqUR5muxb2m0="; }; vendorHash = "sha256-lgccNq1cSg8rrHW0aMLcC5HrZXf8TvdFSmk6pbGXNqQ="; diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/tools/security/oauth2c/default.nix index 9ab132481b294..e73aed4dfe8ef 100644 --- a/pkgs/tools/security/oauth2c/default.nix +++ b/pkgs/tools/security/oauth2c/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-ecG7+b1chHAJVB7WTilA1dowtisLHj2E/ORUoXXxqNY="; + hash = "sha256-+R3NViAnrHg/9dthF0e2dEppX5MLzHeRMYFiZutE1mU="; }; vendorHash = "sha256-euEmslrSbXPVDNZkIguq+ukt74Um4H0+lIXEyCBorjE="; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index b420263c209b2..04aad0b277393 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -2,17 +2,18 @@ let version = "3.99.5"; - suffix = "SP13"; + suffix = "SP15"; tarBall = "${version}final.${suffix}"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "pcsc-cyberjack"; inherit version; src = fetchurl { url = - "http://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.gz"; - sha256 = "1lx4bfz4riz7j77sl65akyxzww0ygm63w0c1b75knr1pijlv8d3b"; + "https://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.bz2"; + sha256 = "sha256-rLfCgyRQcYdWcTdnxLPvUAgy1lLtUbNRELkQsR69Rno="; }; outputs = [ "out" "tools" ]; @@ -36,7 +37,7 @@ in stdenv.mkDerivation rec { description = "REINER SCT cyberJack USB chipcard reader user space driver"; homepage = "https://www.reiner-sct.com/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ aszlig ]; + maintainers = with maintainers; [ aszlig flokli ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 871a9f84c0b9f..4cac45c1deba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12848,6 +12848,8 @@ with pkgs; sockperf = callPackage ../tools/networking/sockperf { }; + softnet = callPackage ../tools/networking/softnet { }; + solaar = callPackage ../applications/misc/solaar { }; solanum = callPackage ../servers/irc/solanum { @@ -23512,6 +23514,8 @@ with pkgs; nanomsg = callPackage ../development/libraries/nanomsg { }; + nanosvg = callPackage ../development/libraries/nanosvg { }; + nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; nanotts = callPackage ../tools/audio/nanotts { }; @@ -34621,6 +34625,8 @@ with pkgs; sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { }; + tart = callPackage ../applications/virtualization/tart { }; + tecoc = callPackage ../applications/editors/tecoc { }; viber = callPackage ../applications/networking/instant-messengers/viber { }; |