diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 45feaa5a4d5f..3f07ec28fb00 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "382e3ffce6880e89a8786f5c25a173f25d03df58", - "hash": "sha256-OeEAMRtZA/8ctRxSmnq4OR+5i6vDKSWITFnYiJdwac4=" + "rev": "9c9b44a7b9b373f2d8f9a3f16bc8373d6469cf98", + "hash": "sha256-XQ7EVPj0Eprs94yjqaUGCphHteRdbcv2nqp3gojYjzc=" }, - "version": "unstable-2024-03-22" + "version": "unstable-2024-04-12" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "cb370363935458e723e0594fb03380c04e7f455b", - "hash": "sha256-u0kBdqfUu7QmZBbuLaDJRnsDUJLZiURF6BSkwOX8zpU=" + "rev": "97f01ed6075b6034aeb16829a2a259bbe8a254f9", + "hash": "sha256-qXym7CzAXfOSK+hmq6JfCIrq9w11uA2UQ2Ps+lFHrfI=" }, - "version": "unstable-2024-04-08" + "version": "unstable-2024-04-15" }, "fceumm": { "fetcher": "fetchFromGitHub", @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "9d6eab74e1eb182d627f63e1db79752852e9d230", - "hash": "sha256-Zi98lszi42XV6u0RhOnt6TVqAfdSaZRcpJIJDwI+ThU=", + "rev": "7438094d7cdf191e6eb2a39e73cb0f512ea2a714", + "hash": "sha256-T19GJbN/MKC03Q/yS1C6qL5Rv++OlaBol4UYf9//l3s=", "fetchSubmodules": true }, - "version": "unstable-2024-04-05" + "version": "unstable-2024-04-12" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -408,10 +408,10 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "3aa1ff0d6c087ac35530572d09bc42a2591ff78f", - "hash": "sha256-pSBaheo3R5Oxn3nAG8AqodaRtYDIcmT4QVIzLjefa3c=" + "rev": "170929e08e13fef6f5284efb0a5ec781a2af08ed", + "hash": "sha256-92p6fKN1/kl101qrNMzjOCQJJznTdbteqXpbas36S2c=" }, - "version": "unstable-2024-04-05" + "version": "unstable-2024-04-10" }, "mame2000": { "fetcher": "fetchFromGitHub", @@ -438,10 +438,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "bf250331362db8fa08a5b3ef60decffba90bf564", - "hash": "sha256-7KxQtmmjJuDzoYzpQi/z6eYtThop3Qc1wY0JpUyv26A=" + "rev": "7ca870c4168e69819923f73ae0289c38d57b01dc", + "hash": "sha256-eoLzRNsZtIo6Pc9SovQGh9sHxdXhBSQj71RDcQqjji0=" }, - "version": "unstable-2024-04-09" + "version": "unstable-2024-04-13" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -630,10 +630,10 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "4cc48a6b324ff1d025768bb5436279831e4bf319", - "hash": "sha256-bW/soI5/HgV71L7SdouAeR5ex54veJCTdCXCMwfxHIk=" + "rev": "2f326fa15ff26df057ef10da232ebc07a410803a", + "hash": "sha256-mnJJ1NzxZoA3kwfPOyvpP65SKI0I/9FCPNW8TR8NY8k=" }, - "version": "unstable-2024-04-06" + "version": "unstable-2024-04-14" }, "picodrive": { "fetcher": "fetchFromGitHub", @@ -651,22 +651,22 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "8f9fab334eb4ae6faf9cfd88f802cad68674792b", - "hash": "sha256-KzRj7Xjfqoi/m+eEHk6Lfk/6FHk4YtrGkY++sjUvT/Y=", + "rev": "5c8f4a818be5c1e4df568abfec169c2b08df6674", + "hash": "sha256-IyxqH0ZAAiJ8V9kaVSwhf1zJnVlxhJWghr51AXcvQvs=", "fetchSubmodules": true }, - "version": "unstable-2024-04-09" + "version": "unstable-2024-04-10" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "1bcb15576252ac4b253c39f7c34ea372a3637d96", - "hash": "sha256-bc0gJi2C+ZBlF7qczSQ+L4bZD5zt7NNIESEwdpqOhTY=", + "rev": "efe2302548fcbd2dc68c9b5b1fb39dc7976532fd", + "hash": "sha256-zwC3HniJO11/6ApBo0UNn6WMu4Jmj099XaUY4QuKaZI=", "fetchSubmodules": true }, - "version": "unstable-2024-04-09" + "version": "unstable-2024-04-14" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -693,10 +693,10 @@ "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "5f683ae67b998fcadd69fa8f65f2440fa8ef135f", - "hash": "sha256-SvV18vqMf9ZtGzrK3bnE0h2ImYi1QuLi7t+ZO91Lm6Y=" + "rev": "3c4f02622bd9ab4bbfc5e90cea9c7e60cf410073", + "hash": "sha256-UMbD1RcgQmilBwwzvakUIWWWwg78sl1YT9EOE3Rhyao=" }, - "version": "unstable-2024-02-22" + "version": "unstable-2024-04-12" }, "quicknes": { "fetcher": "fetchFromGitHub", @@ -753,10 +753,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "1e1c45be07bf5760e73414d9ed0253d6dedb8605", - "hash": "sha256-gGAsKsI5e9jU6Zo2f72TBsHWdR6Bl+3Y1Om1zsbIjqs=" + "rev": "9d22dbb8d866f10042fe564db7dc7b41078a580b", + "hash": "sha256-y2kPj1BugXVZGzyxs0Ph/qM5SMe82kjxnQA25DIpzac=" }, - "version": "unstable-2024-02-14" + "version": "unstable-2024-04-13" }, "snes9x2002": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix index 9ec985fca59d..b4e60fdcaba8 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-joypad-autoconfig"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-joypad-autoconfig"; rev = "v${version}"; - hash = "sha256-VZbdR9Tvc8FofBjApTskEZVwUzInEDM3YhZ14VWTyC0="; + hash = "sha256-eWfSqHusTri1HQUkSxY/iAceF/9PFVMC0rhLu/4W35k="; }; makeFlags = [ diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index dc55a4d02f69..5e10050078d6 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "1.9.1"; + version = "2.0.0"; pname = "orca-slicer"; # Don't inherit patches from bambu-studio @@ -13,7 +13,7 @@ bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { owner = "SoftFever"; repo = "OrcaSlicer"; rev = "v${finalAttrs.version}"; - hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; + hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/tfupdate/default.nix b/pkgs/applications/networking/cluster/tfupdate/default.nix index e7a4250f9444..25a547402104 100644 --- a/pkgs/applications/networking/cluster/tfupdate/default.nix +++ b/pkgs/applications/networking/cluster/tfupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfupdate"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${version}"; - sha256 = "sha256-WVYWoojNRAKmFt5kTaE86TNgodTld/vZ4O2LmLcU6sA="; + sha256 = "sha256-RewBCiUNdXA30gwcnBu+wBoMNbVjaIWkCQV+Bat6l0o="; }; - vendorHash = "sha256-BjusVkp7gN/w2uC1ZyUDaqvXvjEN6BVYNcwNZFOLjDc="; + vendorHash = "sha256-fs61aMsRGF2zmyLro5ySWi3P1qPPgvISTqCvuVWAvz0="; # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ba2f1c3d516d..fa32108963f3 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -623,7 +623,7 @@ stdenv.mkDerivation { # For clang, this is handled in add-clang-cc-cflags-before.sh # TODO: aarch64-darwin has mcpu incompatible with gcc - + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) && + + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(targetPlatform.isDarwin && targetPlatform.isAarch64) && isGccArchSupported targetPlatform.gcc.arch) '' echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before '' @@ -632,7 +632,7 @@ stdenv.mkDerivation { # instead of march. On all other platforms you should use mtune # and march instead. # TODO: aarch64-darwin has mcpu incompatible with gcc - + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(stdenv.isDarwin && stdenv.isAarch64))) '' + + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(targetPlatform.isDarwin && targetPlatform.isAarch64))) '' echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before '' diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix new file mode 100644 index 000000000000..85a60640d711 --- /dev/null +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + bison, + cmake, + curl, + doxygen, + fetchFromGitHub, + git, + glib, + gnutls, + gpgme, + gvm-libs, + json-glib, + libbsd, + libclang, + libgcrypt, + libksba, + libpcap, + libsepol, + libssh, + libtasn1, + net-snmp, + p11-kit, + paho-mqtt-c, + pandoc, + pcre2, + pkg-config, + util-linux, +}: + +stdenv.mkDerivation rec { + pname = "openvas-scanner"; + version = "23.0.1"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = "openvas-scanner"; + rev = "refs/tags/v${version}"; + hash = "sha256-pqbwi3btNEM+qiTqtjIxiDv2wMf1LerltFvLCybiW0Y="; + }; + + nativeBuildInputs = [ + cmake + git + doxygen + pandoc + pkg-config + ]; + + buildInputs = [ + bison + curl + glib + gnutls + gpgme + gvm-libs + json-glib + libbsd + libclang + libgcrypt + libksba + libpcap + libsepol + libssh + libtasn1 + net-snmp + p11-kit + paho-mqtt-c + pcre2 + util-linux + ]; + + cmakeFlags = [ + "-DGVM_RUN_DIR=$out/run/gvm" + "-DLOCALSTATEDIR=$out/var" + "-DSYSCONFDIR=$out/etc" + "-DOPENVAS_RUN_DIR=$out/run/ospd" + "-DOPENVAS_FEED_LOCK_PATH=$out/var/lib/openvas/feed-update.lock" + ]; + + meta = with lib; { + description = "Scanner component for Greenbone Community Edition"; + homepage = "https://github.com/greenbone/openvas-scanner"; + changelog = "https://github.com/greenbone/openvas-scanner/blob/${src.rev}/changelog.toml"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "openvas-scanner"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix new file mode 100644 index 000000000000..2386693e11f2 --- /dev/null +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -0,0 +1,62 @@ +{ + lib, + fetchFromGitHub, + git, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "troubadix"; + version = "24.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = "troubadix"; + rev = "refs/tags/v${version}"; + hash = "sha256-I/c26dqD7cJ0AtLhJK4XaR5vvud/NsoeXr6/k6+Dezk="; + }; + + pythonRelaxDeps = [ "validators" ]; + + build-system = with python3.pkgs; [ poetry-core ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + + dependencies = with python3.pkgs; [ + chardet + charset-normalizer + pkgs.codespell + gitpython + pontos + python-magic + validators + ]; + + nativeCheckInputs = with python3.pkgs; [ + git + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "troubadix" ]; + + disabledTests = [ + # AssertionError + "test_ok" + # TypeError + "testgit" + ]; + + meta = with lib; { + description = "A linting tool for NASL files"; + homepage = "https://github.com/greenbone/troubadix"; + changelog = "https://github.com/greenbone/troubadix/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "troubadix"; + }; +} diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index 101f29e85be9..775657e5a64a 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "uplosi"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "edgelesssys"; repo = pname; rev = "v${version}"; - hash = "sha256-RqjaI/1Sx36JfpvnLblt8hPfgSral3Gvp8M6BshKVwo="; + hash = "sha256-TrHREV/bmrjwlE4bsXZDKvIQKa68AnUSktnqCKdvOe8="; }; - vendorHash = "sha256-eZ0/piSxMUC1ZM7qBhFW40l9p8ZPMIj1HyrS2Dy4wJQ="; + vendorHash = "sha256-0uQBhNRP3OGn3hw6Mx6tRliTqIhoBnyfRmdtdtuYwaY="; CGO_ENABLED = "0"; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix index be35d1c544bb..ef69114c855e 100644 --- a/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -18,7 +18,7 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black" "rimless" "normal" "float" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" "all" "black" "rimless" "normal" "float" ] tweaks stdenvNoCC.mkDerivation rec { inherit pname; diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 85b4fc5fca00..e6aac226f531 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -67,7 +67,7 @@ in rec { gnome46Extensions = mapUuidNames (produceExtensionsList "46"); # Keep the last three versions in here - gnomeExtensions = lib.trivial.pipe (gnome44Extensions // gnome45Extensions // gnome46Extensions) [ + gnomeExtensions = lib.trivial.pipe (gnome44Extensions // gnome45Extensions) [ (v: builtins.removeAttrs v [ "__attrsFailEvaluation" ]) # Apply some custom patches for automatically packaged extensions (callPackage ./extensionOverrides.nix {}) diff --git a/pkgs/development/coq-modules/iris-named-props/default.nix b/pkgs/development/coq-modules/iris-named-props/default.nix index c4d167750432..4499e435230c 100644 --- a/pkgs/development/coq-modules/iris-named-props/default.nix +++ b/pkgs/development/coq-modules/iris-named-props/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.16" "8.18"; out = "2023-08-14"; } + { case = range "8.16" "8.19"; out = "2023-08-14"; } ] null; release."2023-08-14".sha256 = "sha256-gu9qOdHO0qJ2B9Y9Vf66q08iNJcfuECJO66fizFB08g="; release."2023-08-14".rev = "ca1871dd33649f27257a0fbf94076acc80ecffbc"; diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 30d3cb8e51da..ae6798243b6a 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,12 +6,14 @@ mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.18" "8.19"; out = "4.2.0"; } { case = range "8.16" "8.18"; out = "4.1.0"; } { case = range "8.13" "8.17"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."4.2.0".sha256 = "sha256-HuiHIe+5letgr1NN1biZZFq0qlWUbFmoVI7Q91+UIfM="; release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo="; release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg="; release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj"; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 370ab6e95f5a..6eb8f77149cc 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,12 +6,14 @@ mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.18" "8.19"; out = "1.10.0"; } { case = range "8.16" "8.18"; out = "1.9.0"; } { case = range "8.13" "8.17"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I="; release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI="; release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU="; release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"; diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index a8141d278600..b31d08fbda3a 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -1,9 +1,17 @@ -{ callPackage, ... }@_args: +{ callPackage, fetchpatch, ... }@_args: let base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // { version = "8.1.28"; hash = "sha256-i+RQCW4BU8R9dThOfdWVzIl/HVPOAGBwjOlYm8wxQe4="; + extraPatches = [ + # Fix build with libxml 2.12+. + # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 + (fetchpatch { + url = "https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch"; + hash = "sha256-HvpTL7aXO9gr4glFdhqUWQPrG8TYTlvbNINq33M3zS0="; + }) + ]; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 651dc26ca1ae..e8cae3fa727b 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -1,24 +1,26 @@ -{ lib -, stdenv -, cmake -, doxygen -, fetchFromGitHub -, glib -, glib-networking -, gnutls -, gpgme -, hiredis -, libgcrypt -, libnet -, libpcap -, libssh -, libuuid -, libxcrypt -, libxml2 -, paho-mqtt-c -, pkg-config -, zlib -, freeradius +{ + lib, + stdenv, + cmake, + doxygen, + fetchFromGitHub, + glib, + glib-networking, + gnutls, + gpgme, + hiredis, + libgcrypt, + libnet, + libpcap, + libssh, + libuuid, + libxcrypt, + libxml2, + openldap, + paho-mqtt-c, + pkg-config, + radcli, + zlib, }: stdenv.mkDerivation rec { @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "gvm-libs"; rev = "refs/tags/v${version}"; hash = "sha256-nFqYpt9OWEPgSbaNsHLhs9mg7ChQcmfcgHh7nFfQh18="; }; @@ -45,20 +47,19 @@ stdenv.mkDerivation rec { gpgme hiredis libgcrypt - freeradius libnet libpcap libssh libuuid libxcrypt libxml2 + openldap paho-mqtt-c + radcli zlib ]; - cmakeFlags = [ - "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" - ]; + cmakeFlags = [ "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 4ece5feea365..43a7f7950473 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -133,7 +133,6 @@ effectiveStdenv.mkDerivation rec { nlohmann_json microsoft-gsl ] ++ lib.optionals pythonSupport (with python3Packages; [ - gtest numpy pybind11 packaging @@ -150,7 +149,9 @@ effectiveStdenv.mkDerivation rec { cuda_cudart ]); - nativeCheckInputs = lib.optionals pythonSupport (with python3Packages; [ + nativeCheckInputs = [ + gtest + ] ++ lib.optionals pythonSupport (with python3Packages; [ pytest sympy onnx @@ -179,7 +180,7 @@ effectiveStdenv.mkDerivation rec { "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" "-Donnxruntime_BUILD_SHARED_LIB=ON" - "-Donnxruntime_BUILD_UNIT_TESTS=ON" + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) "-Donnxruntime_ENABLE_LTO=ON" "-Donnxruntime_USE_FULL_PROTOBUF=OFF" (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) @@ -190,6 +191,7 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1") ]; env = lib.optionalAttrs effectiveStdenv.cc.isClang { @@ -224,6 +226,7 @@ effectiveStdenv.mkDerivation rec { ''; passthru = { + inherit cudaSupport cudaPackages; # for the python module protobuf = protobuf_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index 0c1abce558a8..7bdd692ac2d6 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -1,21 +1,22 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, oss2 -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, requests -, setuptools -, setuptools-scm +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + oss2, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + requests, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.10"; + version = "0.2.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-xlbOLqillSpN6DHYn7bqTL7qMlicYCXGxO30Z/tiKJY="; + hash = "sha256-6tkJG6Jjvo2OaN9cRbs/7ApcrKiZ5tGSPUfugAx7iJU="; }; pythonRelaxDeps = [ @@ -33,11 +34,12 @@ buildPythonPackage rec { ]; build-system = [ - pythonRelaxDepsHook setuptools setuptools-scm ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + dependencies = [ aiohttp oss2 @@ -50,9 +52,7 @@ buildPythonPackage rec { requests ]; - pythonImportsCheck = [ - "aiooss2" - ]; + pythonImportsCheck = [ "aiooss2" ]; disabledTestPaths = [ # Tests require network access diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 9f71aac25354..929280a61b05 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.7.5"; + version = "1.7.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CsNLJwCdXGJeh9M+yF+ldwYrV/O87W1yI+F8Wvu0Dmg="; + hash = "sha256-B38JMJzIpskGPb1hSzQ4B9Un1UZpO3/o/FpEM1Av6mw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index c8abe86e5ebf..9540e9d315da 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crc"; - version = "6.1.1"; + version = "6.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Nicoretti"; repo = "crc"; rev = "refs/tags/${version}"; - hash = "sha256-GlXDDG8NZ3Lp0IwYKS0+fZG85uVdo4V8mZnCa+za02U="; + hash = "sha256-d946yBMrOIgMXGOr2ej5bvn59D5iAGMese24qdv8l/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 7ad1ad90b9ee..8e4eb71a97dc 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-0N2aimDj9HF0y1pitg7E2OzGk4o4kopSlvXy9x6jplk="; + hash = "sha256-CIEv3srjyVWQ1UGKVRwPXpzrND/8hTbw6HSlko9+AIk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix new file mode 100644 index 000000000000..f023b498c05a --- /dev/null +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, certifi +, fetchFromGitHub +, pyarrow +, pytestCheckHook +, python-dateutil +, pythonOlder +, reactivex +, setuptools +, urllib3 +}: + +buildPythonPackage rec { + pname = "influxdb3-python"; + version = "0.3.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "InfluxCommunity"; + repo = "influxdb3-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZKN3chJvtOenk2jp02rvw+HooJcee0hwxWoLvEYjfcg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + certifi + pyarrow + python-dateutil + reactivex + urllib3 + ]; + + # Missing ORC support + # https://github.com/NixOS/nixpkgs/issues/212863 + # nativeCheckInputs = [ + # pytestCheckHook + # ]; + # + # pythonImportsCheck = [ + # "influxdb_client_3" + # ]; + + meta = with lib; { + description = "Python module that provides a simple and convenient way to interact with InfluxDB 3.0"; + homepage = "https://github.com/InfluxCommunity/influxdb3-python"; + changelog = "https://github.com/InfluxCommunity/influxdb3-python/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index b244a79114c0..1b071aadb59c 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchFromGitHub -, hypothesis , lib , pytestCheckHook }: @@ -18,7 +17,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index c31ec174efa8..3aae1bc641ff 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.28.post1"; + version = "0.10.29"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-BOpKaOP0DdBdVB0bMrAwXG5xaZ3AXnHX3/sHt1GRWJs="; + hash = "sha256-4Tamo5r7EKmLIVymFX9UbFY6vxhgl3dY7xntmDeGn4M="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index f62da3ce969f..26ecb5a6594f 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.16"; + version = "0.1.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-fyW4/drxqRusBsZnJ7kTtI4m72hxT81RlwUbP3EPTPo="; + hash = "sha256-JAZgypPAQ4P8Suv6nJva60N5ClM+aIa0Yxpfx/ABkMo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index cf3d309420eb..644724c4126f 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-kHfkKhxrRB6lUHhQb4NVXdpdbIFu9JMIQdcdI54+DF4="; + hash = "sha256-kniEDoRPXXgLWsxUAMv2PZfKrM+OtEKlXr2aA+JSLV4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index 8fea2e6d9117..0982a12c4572 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -53,7 +53,13 @@ buildPythonPackage { oneDNN re2 onnxruntime.protobuf - ]; + ] ++ lib.optionals onnxruntime.passthru.cudaSupport (with onnxruntime.passthru.cudaPackages; [ + libcublas # libcublasLt.so.XX libcublas.so.XX + libcurand # libcurand.so.XX + libcufft # libcufft.so.XX + cudnn # libcudnn.soXX + cuda_cudart # libcudart.so.XX + ]); propagatedBuildInputs = [ coloredlogs diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 3d38c9a17ccb..a27a512a448f 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "5.1.1"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-BhAI/bGzaSckyZJq7GYUldziotr2bMlA5cWgQEwiUcQ="; + hash = "sha256-qq58ZSrKVQ00rtXMe4L9xfz0QB+UpjGOhPo1srPYIY4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index aaf000b79f13..7f48c4d034ce 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -318,6 +318,9 @@ in rec { rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb"; sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY="; }; + + # overwrite all patches, since patches for newer version do not apply + patches = [ ../6/0001-Compile-transupp.c-as-part-of-the-library.patch ]; }; }; diff --git a/pkgs/development/rocm-modules/5/mivisionx/default.nix b/pkgs/development/rocm-modules/5/mivisionx/default.nix index 39fd4f5b76e3..b7d976286979 100644 --- a/pkgs/development/rocm-modules/5/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/5/mivisionx/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U="; }; + patches = [ + ../../6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch + ]; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch b/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch new file mode 100644 index 000000000000..0a09a8845c13 --- /dev/null +++ b/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch @@ -0,0 +1,104 @@ +From 4a0584f7c05641143151ebdc1be1163bebf9d35d Mon Sep 17 00:00:00 2001 +From: Las +Date: Sun, 3 Jan 2021 18:35:37 +0000 +Subject: [PATCH] Compile transupp.c as part of the library + +The exported symbols are made weak to not conflict with users +of the library that already vendor this functionality. +--- + CMakeLists.txt | 4 ++-- + transupp.c | 14 +++++++------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ca6f98..a9a0fae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -533,7 +533,7 @@ set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c + jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c + jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c + jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c +- jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c) ++ jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c transupp.c) + + if(WITH_ARITH_ENC OR WITH_ARITH_DEC) + set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c) +@@ -1489,7 +1489,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h + ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h +- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/transupp.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + include(cmakescripts/BuildPackages.cmake) +diff --git a/transupp.c b/transupp.c +index 6e86077..2da49a7 100644 +--- a/transupp.c ++++ b/transupp.c +@@ -1386,7 +1386,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result) + * This code is loosely based on XParseGeometry from the X11 distribution. + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec) + { + info->crop = FALSE; +@@ -1486,7 +1486,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height) + * and transformation is not perfect. Otherwise returns TRUE. + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_request_workspace(j_decompress_ptr srcinfo, + jpeg_transform_info *info) + { +@@ -2033,7 +2033,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width, + * to jpeg_write_coefficients(). + */ + +-GLOBAL(jvirt_barray_ptr *) ++GLOBAL(jvirt_barray_ptr *) __attribute__((weak)) + jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jpeg_transform_info *info) +@@ -2152,7 +2152,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * Note that some transformations will modify the source data arrays! + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jpeg_transform_info *info) +@@ -2264,7 +2264,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * (may use custom action then) + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, + int MCU_width, int MCU_height, + JXFORM_CODE transform) +@@ -2303,7 +2303,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, + * This must be called before jpeg_read_header() to have the desired effect. + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) + { + #ifdef SAVE_MARKERS_SUPPORTED +@@ -2331,7 +2331,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) + * JFIF APP0 or Adobe APP14 markers if selected. + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JCOPY_OPTION option) + { +-- +2.29.2 + diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 194ce9fd8ce1..567b5bee4f72 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -316,6 +316,9 @@ in rec { rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb"; sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY="; }; + + # overwrite all patches, since patches for newer version do not apply + patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ]; }; }; diff --git a/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch b/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch new file mode 100644 index 000000000000..18946835e12e --- /dev/null +++ b/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch @@ -0,0 +1,25 @@ +From f0e66bd446d44df1d30faaad520613f5fb7f5916 Mon Sep 17 00:00:00 2001 +From: Martin Schwaighofer +Date: Sat, 30 Mar 2024 15:36:52 +0100 +Subject: [PATCH] set __STDC_CONSTANT_MACROS to make rocAL compile + +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42b139b6..509915f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,6 +149,8 @@ message("-- ${Cyan} -D MIGRAPHX=${MIGRAPHX} [Turn ON/OFF MIGraphX Module (de + message("-- ${Cyan} -D BACKEND=${BACKEND} [Select MIVisionX Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}") + message("-- ${Cyan} -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:OFF)]${ColourReset}") + ++add_definitions(-D__STDC_CONSTANT_MACROS) ++ + add_subdirectory(amd_openvx) + add_subdirectory(amd_openvx_extensions) + add_subdirectory(utilities) +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/6/mivisionx/default.nix index e3e6172709fe..8459dff1c892 100644 --- a/pkgs/development/rocm-modules/6/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/6/mivisionx/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-d32lcJq24MXeIWbNbo6putWaol5kF2io6cz4ZuL+DbE="; }; + patches = [ + ./0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch + ]; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix index 0416bfdde9d8..6fd920e8b00c 100644 --- a/pkgs/development/tools/subxt/default.nix +++ b/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.35.2"; + version = "0.35.3"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-nMdpMvNoynioCzD7wXbF1W3mwCfOClAZyjbF/3eworw="; + hash = "sha256-5G5gFxr7CIvZ1RfkLIEF/z4t+wTj09fJXTNr2v0vuyg="; }; - cargoHash = "sha256-sXiMgooOSGDl0L0i5VncCYuoSzjRSogRGqteE+b6jkc="; + cargoHash = "sha256-5lAs2J5hkPhBN3tORt6N7834brS/dAkKsXvZ6C1K+OY="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index a003c0e9bfb9..c4a97a47a4b6 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -19,8 +19,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.20.1"; - sha256 = "sha256-xthnqfJeY1SBDv+4IB+BR6FbKAAOUHkP2gDRyhX0m4o="; + version = "18.20.2"; + sha256 = "sha256-iq6nycfpJ/sJ2RSY2jEbbk0YIzOQ4jxyOlO4kfrUxz8="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index f7882c452672..dedda892a918 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.7.2"; - sha256 = "sha256-tLHioH6W+F9s40ovv+o0hpGu/lyyGappUeI8zJkfni8="; + version = "21.7.3"; + sha256 = "08csswa1h55l9zvfjc4g1ksicgl42pbz7g1bc9hgy77w3gxjd2v6"; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 1ff37ef1b494..63e78c8a2221 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lantern"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "lanterndata"; repo = "lantern"; rev = "v${finalAttrs.version}"; - hash = "sha256-viTI8hIdtoLefXyBPyFAKWr1suCvuU7rjXQOIZKLBHw="; + hash = "sha256-d5CdS11Z0u8+oPvjH6gVx6k8y05SS6wU3PnafcEgQeY="; fetchSubmodules = true; }; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 08cded664254..1214d0101383 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -574,6 +574,12 @@ let "The β€˜env’ attribute set can only contain derivation, string, boolean or integer attributes. The β€˜${n}’ attribute is of type ${builtins.typeOf v}."; v) env; + # Fixed-output derivations may not reference other paths, which means that + # for a fixed-output derivation, the corresponding inputDerivation should + # *not* be fixed-output. To achieve this we simply delete the attributes that + # would make it fixed-output. + deleteFixedOutputRelatedAttrs = lib.flip builtins.removeAttrs [ "outputHashAlgo" "outputHash" "outputHashMode" ]; + in extendDerivation @@ -584,7 +590,7 @@ extendDerivation # This allows easy building and distributing of all derivations # needed to enter a nix-shell with # nix-build shell.nix -A inputDerivation - inputDerivation = derivation (derivationArg // { + inputDerivation = derivation (deleteFixedOutputRelatedAttrs derivationArg // { # Add a name in case the original drv didn't have one name = derivationArg.name or "inputDerivation"; # This always only has one output diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index 3882eb2b625c..e06759fa28bd 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -166,6 +166,28 @@ in touch $out ''; + test-inputDerivation-fixed-output = let + inherit (stdenv.mkDerivation { + dep1 = derivation { name = "dep1"; builder = "/bin/sh"; args = [ "-c" ": > $out" ]; system = builtins.currentSystem; }; + dep2 = derivation { name = "dep2"; builder = "/bin/sh"; args = [ "-c" ": > $out" ]; system = builtins.currentSystem; }; + name = "meow"; + outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + buildCommand = '' + touch $out + ''; + passAsFile = [ "dep2" ]; + }) inputDerivation; + in + runCommand "test-inputDerivation" { + exportReferencesGraph = [ "graph" inputDerivation ]; + } '' + grep ${inputDerivation.dep1} graph + grep ${inputDerivation.dep2} graph + touch $out + ''; + test-prepend-append-to-var = testPrependAndAppendToVar { name = "test-prepend-append-to-var"; stdenv' = bootStdenv; diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 390bfbc19735..cc4674bcd2c9 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -18,16 +18,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "18.1.8"; + version = "18.1.9"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-cxeYwewxn8c3yy/9T6MbWTCdNsK56684OPe6gIFWfxs="; + hash = "sha256-yf4QkuFt5Fpegyru05S79Q3hFaLc45unxrk+SJzwWg0="; }; - npmDepsHash = "sha256-Yul97/UlgpV5Rk2ax9rRRNLeLgwdxftuU9IKvy5lSIk="; + npmDepsHash = "sha256-lTaKW5Tsw9df0bd/chr8nSL2PROp1sSs+fuMr3Cz+a4="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index cc025806f738..e5c2e9407c79 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.47.3"; + version = "2.47.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-Z9NXYtYaV4jhUK2JEpxleYVG6Vo/nKeD/qBqagzkmNE="; + hash = "sha256-clhW/Y+OJ7iQVK8I2xwoVT9rXF2CXRBaUxDZrREAjYc="; }; - vendorHash = "sha256-IbNEKj8wJpsQO9bXrsH4OJUIhez9merFSWydhSHbvRQ="; + vendorHash = "sha256-8Puy1IKLMENduWyOAJtvpd7FV1a0IdmkMYztIJdeaBs="; doCheck = false; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 96f1882e4e2a..236d7e9b72c6 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-gys6dye137dW/WkoaLQXnrEwU0mXYfHOhuyeg452Tro="; + hash = "sha256-4LYIQ1WIt9btQI255nnTnGjz/GSUl/5mI6TEq99zNCM="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e2ae52985a50..916b939b93cc 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-XecMHKi5JMWx3RHQRk2FqS3SjyR6KzWjfyQ5JCI45xM="; + hash = "sha256-b8B05aj0+c620K6ftCXx1EGUt8mdqQYTE0D9aPU+/wA="; }; - vendorHash = "sha256-ZEwB2GKohmOx8xosj14VII6sQ4a82s7+h9r620MKEeU="; + vendorHash = "sha256-Ho2jVD/U/2BFt3BF5w+KHp5nSVmukx0o2l3ISDGDSt0="; CGO_ENABLED = 0; diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index 5875035955ec..260ba3de5650 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.5.1"; + version = "3.5.2"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-NNQ7yB0JPVDSWMNxkpvEK/meLa3Db78qxUDDTJa6YgM="; + sha256 = "sha256-qN4GtQhiQpXZIagtphcn+oSYXroA9kk7E34IKoKMu7c="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 071ce4c46f46..3ff25cafc31f 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-W31eKA6v7pAJZ9El/CxEDMONTcpRfzn/Ldh1yIql+NQ="; + hash = "sha256-Df30R6/dKihB1F3NR9zH4AFe7IozN27xaGMe6M7hoDA="; }; vendorHash = "sha256-HJEZ1VrKS1MXKtpDjVorMiecb94+f1mBWPkWng4YqZk="; diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 4fdbad950ab0..3c7b66fcbf5e 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -1,50 +1,44 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.1.5"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "darkoperator"; - repo = pname; - rev = version; - hash = "sha256-W7ZFc+kF00ANoYVTlsY+lJ9FjMEGbqYfNojoZFiRHU8="; + repo = "dnsrecon"; + rev = "refs/tags/${version}"; + hash = "sha256-XboRxq3ZDIDtuECVSnncQ2Pa8YAvva4KUNm0O5ED6rc="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "flake8" "" \ - --replace "pytest" "" - ''; + build-system = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ dnspython netaddr lxml setuptools ]; - preFixup = '' - # Install wordlists, etc. - install -vD namelist.txt subdomains-*.txt snoop.txt -t $out/share/wordlists - ''; - # Tests require access to /etc/resolv.conf doCheck = false; - pythonImportsCheck = [ - "dnsrecon" - ]; + pythonImportsCheck = [ "dnsrecon" ]; meta = with lib; { description = "DNS Enumeration script"; - mainProgram = "dnsrecon"; homepage = "https://github.com/darkoperator/dnsrecon"; + changelog = "https://github.com/darkoperator/dnsrecon/releases/tag/${version}"; license = licenses.gpl2Only; - maintainers = with maintainers; [ c0bw3b fab ]; + maintainers = with maintainers; [ + c0bw3b + fab + ]; + mainProgram = "dnsrecon"; }; } diff --git a/pkgs/tools/security/zlint/default.nix b/pkgs/tools/security/zlint/default.nix index 838e866de20a..ee764fdadd80 100644 --- a/pkgs/tools/security/zlint/default.nix +++ b/pkgs/tools/security/zlint/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zlint"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "zmap"; repo = "zlint"; rev = "v${version}"; - hash = "sha256-8iZUEUU+HY8cJrBwiGNE4e6hXQvNwAt0cPnBjAVDcHo="; + hash = "sha256-UwtWYDWbln64nE4KDV+gWIhhdbyvlrs0fM96otnfqfE="; }; modRoot = "v3"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3cbf34968448..824307057a5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5717,6 +5717,8 @@ self: super: with self; { influxdb-client = callPackage ../development/python-modules/influxdb-client { }; + influxdb3-python = callPackage ../development/python-modules/influxdb3-python { }; + inform = callPackage ../development/python-modules/inform { }; iniconfig = callPackage ../development/python-modules/iniconfig { };