lol

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
4908c48b 0c860bb4

+559 -162
+30 -30
pkgs/applications/emulators/retroarch/hashes.json
··· 85 85 "src": { 86 86 "owner": "libretro", 87 87 "repo": "beetle-psx-libretro", 88 - "rev": "382e3ffce6880e89a8786f5c25a173f25d03df58", 89 - "hash": "sha256-OeEAMRtZA/8ctRxSmnq4OR+5i6vDKSWITFnYiJdwac4=" 88 + "rev": "9c9b44a7b9b373f2d8f9a3f16bc8373d6469cf98", 89 + "hash": "sha256-XQ7EVPj0Eprs94yjqaUGCphHteRdbcv2nqp3gojYjzc=" 90 90 }, 91 - "version": "unstable-2024-03-22" 91 + "version": "unstable-2024-04-12" 92 92 }, 93 93 "beetle-saturn": { 94 94 "fetcher": "fetchFromGitHub", ··· 287 287 "src": { 288 288 "owner": "libretro", 289 289 "repo": "fbneo", 290 - "rev": "cb370363935458e723e0594fb03380c04e7f455b", 291 - "hash": "sha256-u0kBdqfUu7QmZBbuLaDJRnsDUJLZiURF6BSkwOX8zpU=" 290 + "rev": "97f01ed6075b6034aeb16829a2a259bbe8a254f9", 291 + "hash": "sha256-qXym7CzAXfOSK+hmq6JfCIrq9w11uA2UQ2Ps+lFHrfI=" 292 292 }, 293 - "version": "unstable-2024-04-08" 293 + "version": "unstable-2024-04-15" 294 294 }, 295 295 "fceumm": { 296 296 "fetcher": "fetchFromGitHub", ··· 307 307 "src": { 308 308 "owner": "flyinghead", 309 309 "repo": "flycast", 310 - "rev": "9d6eab74e1eb182d627f63e1db79752852e9d230", 311 - "hash": "sha256-Zi98lszi42XV6u0RhOnt6TVqAfdSaZRcpJIJDwI+ThU=", 310 + "rev": "7438094d7cdf191e6eb2a39e73cb0f512ea2a714", 311 + "hash": "sha256-T19GJbN/MKC03Q/yS1C6qL5Rv++OlaBol4UYf9//l3s=", 312 312 "fetchSubmodules": true 313 313 }, 314 - "version": "unstable-2024-04-05" 314 + "version": "unstable-2024-04-12" 315 315 }, 316 316 "fmsx": { 317 317 "fetcher": "fetchFromGitHub", ··· 408 408 "src": { 409 409 "owner": "libretro", 410 410 "repo": "mame", 411 - "rev": "3aa1ff0d6c087ac35530572d09bc42a2591ff78f", 412 - "hash": "sha256-pSBaheo3R5Oxn3nAG8AqodaRtYDIcmT4QVIzLjefa3c=" 411 + "rev": "170929e08e13fef6f5284efb0a5ec781a2af08ed", 412 + "hash": "sha256-92p6fKN1/kl101qrNMzjOCQJJznTdbteqXpbas36S2c=" 413 413 }, 414 - "version": "unstable-2024-04-05" 414 + "version": "unstable-2024-04-10" 415 415 }, 416 416 "mame2000": { 417 417 "fetcher": "fetchFromGitHub", ··· 438 438 "src": { 439 439 "owner": "libretro", 440 440 "repo": "mame2003-plus-libretro", 441 - "rev": "bf250331362db8fa08a5b3ef60decffba90bf564", 442 - "hash": "sha256-7KxQtmmjJuDzoYzpQi/z6eYtThop3Qc1wY0JpUyv26A=" 441 + "rev": "7ca870c4168e69819923f73ae0289c38d57b01dc", 442 + "hash": "sha256-eoLzRNsZtIo6Pc9SovQGh9sHxdXhBSQj71RDcQqjji0=" 443 443 }, 444 - "version": "unstable-2024-04-09" 444 + "version": "unstable-2024-04-13" 445 445 }, 446 446 "mame2010": { 447 447 "fetcher": "fetchFromGitHub", ··· 630 630 "src": { 631 631 "owner": "libretro", 632 632 "repo": "pcsx_rearmed", 633 - "rev": "4cc48a6b324ff1d025768bb5436279831e4bf319", 634 - "hash": "sha256-bW/soI5/HgV71L7SdouAeR5ex54veJCTdCXCMwfxHIk=" 633 + "rev": "2f326fa15ff26df057ef10da232ebc07a410803a", 634 + "hash": "sha256-mnJJ1NzxZoA3kwfPOyvpP65SKI0I/9FCPNW8TR8NY8k=" 635 635 }, 636 - "version": "unstable-2024-04-06" 636 + "version": "unstable-2024-04-14" 637 637 }, 638 638 "picodrive": { 639 639 "fetcher": "fetchFromGitHub", ··· 651 651 "src": { 652 652 "owner": "jpd002", 653 653 "repo": "Play-", 654 - "rev": "8f9fab334eb4ae6faf9cfd88f802cad68674792b", 655 - "hash": "sha256-KzRj7Xjfqoi/m+eEHk6Lfk/6FHk4YtrGkY++sjUvT/Y=", 654 + "rev": "5c8f4a818be5c1e4df568abfec169c2b08df6674", 655 + "hash": "sha256-IyxqH0ZAAiJ8V9kaVSwhf1zJnVlxhJWghr51AXcvQvs=", 656 656 "fetchSubmodules": true 657 657 }, 658 - "version": "unstable-2024-04-09" 658 + "version": "unstable-2024-04-10" 659 659 }, 660 660 "ppsspp": { 661 661 "fetcher": "fetchFromGitHub", 662 662 "src": { 663 663 "owner": "hrydgard", 664 664 "repo": "ppsspp", 665 - "rev": "1bcb15576252ac4b253c39f7c34ea372a3637d96", 666 - "hash": "sha256-bc0gJi2C+ZBlF7qczSQ+L4bZD5zt7NNIESEwdpqOhTY=", 665 + "rev": "efe2302548fcbd2dc68c9b5b1fb39dc7976532fd", 666 + "hash": "sha256-zwC3HniJO11/6ApBo0UNn6WMu4Jmj099XaUY4QuKaZI=", 667 667 "fetchSubmodules": true 668 668 }, 669 - "version": "unstable-2024-04-09" 669 + "version": "unstable-2024-04-14" 670 670 }, 671 671 "prboom": { 672 672 "fetcher": "fetchFromGitHub", ··· 693 693 "src": { 694 694 "owner": "libretro", 695 695 "repo": "libretro-uae", 696 - "rev": "5f683ae67b998fcadd69fa8f65f2440fa8ef135f", 697 - "hash": "sha256-SvV18vqMf9ZtGzrK3bnE0h2ImYi1QuLi7t+ZO91Lm6Y=" 696 + "rev": "3c4f02622bd9ab4bbfc5e90cea9c7e60cf410073", 697 + "hash": "sha256-UMbD1RcgQmilBwwzvakUIWWWwg78sl1YT9EOE3Rhyao=" 698 698 }, 699 - "version": "unstable-2024-02-22" 699 + "version": "unstable-2024-04-12" 700 700 }, 701 701 "quicknes": { 702 702 "fetcher": "fetchFromGitHub", ··· 753 753 "src": { 754 754 "owner": "snes9xgit", 755 755 "repo": "snes9x", 756 - "rev": "1e1c45be07bf5760e73414d9ed0253d6dedb8605", 757 - "hash": "sha256-gGAsKsI5e9jU6Zo2f72TBsHWdR6Bl+3Y1Om1zsbIjqs=" 756 + "rev": "9d22dbb8d866f10042fe564db7dc7b41078a580b", 757 + "hash": "sha256-y2kPj1BugXVZGzyxs0Ph/qM5SMe82kjxnQA25DIpzac=" 758 758 }, 759 - "version": "unstable-2024-02-14" 759 + "version": "unstable-2024-04-13" 760 760 }, 761 761 "snes9x2002": { 762 762 "fetcher": "fetchFromGitHub",
+2 -2
pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix
··· 6 6 7 7 stdenvNoCC.mkDerivation rec { 8 8 pname = "retroarch-joypad-autoconfig"; 9 - version = "1.18.0"; 9 + version = "1.18.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "libretro"; 13 13 repo = "retroarch-joypad-autoconfig"; 14 14 rev = "v${version}"; 15 - hash = "sha256-VZbdR9Tvc8FofBjApTskEZVwUzInEDM3YhZ14VWTyC0="; 15 + hash = "sha256-eWfSqHusTri1HQUkSxY/iAceF/9PFVMC0rhLu/4W35k="; 16 16 }; 17 17 18 18 makeFlags = [
+2 -2
pkgs/applications/misc/bambu-studio/orca-slicer.nix
··· 1 1 { lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: 2 2 3 3 bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { 4 - version = "1.9.1"; 4 + version = "2.0.0"; 5 5 pname = "orca-slicer"; 6 6 7 7 # Don't inherit patches from bambu-studio ··· 13 13 owner = "SoftFever"; 14 14 repo = "OrcaSlicer"; 15 15 rev = "v${finalAttrs.version}"; 16 - hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; 16 + hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; 17 17 }; 18 18 19 19 meta = with lib; {
+3 -3
pkgs/applications/networking/cluster/tfupdate/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "tfupdate"; 5 - version = "0.8.1"; 5 + version = "0.8.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "minamijoyo"; 9 9 repo = "tfupdate"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-WVYWoojNRAKmFt5kTaE86TNgodTld/vZ4O2LmLcU6sA="; 11 + sha256 = "sha256-RewBCiUNdXA30gwcnBu+wBoMNbVjaIWkCQV+Bat6l0o="; 12 12 }; 13 13 14 - vendorHash = "sha256-BjusVkp7gN/w2uC1ZyUDaqvXvjEN6BVYNcwNZFOLjDc="; 14 + vendorHash = "sha256-fs61aMsRGF2zmyLro5ySWi3P1qPPgvISTqCvuVWAvz0="; 15 15 16 16 # Tests start http servers which need to bind to local addresses: 17 17 # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted
+2 -2
pkgs/build-support/cc-wrapper/default.nix
··· 623 623 # For clang, this is handled in add-clang-cc-cflags-before.sh 624 624 625 625 # TODO: aarch64-darwin has mcpu incompatible with gcc 626 - + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) && 626 + + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(targetPlatform.isDarwin && targetPlatform.isAarch64) && 627 627 isGccArchSupported targetPlatform.gcc.arch) '' 628 628 echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before 629 629 '' ··· 632 632 # instead of march. On all other platforms you should use mtune 633 633 # and march instead. 634 634 # TODO: aarch64-darwin has mcpu incompatible with gcc 635 - + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(stdenv.isDarwin && stdenv.isAarch64))) '' 635 + + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(targetPlatform.isDarwin && targetPlatform.isAarch64))) '' 636 636 echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before 637 637 '' 638 638
+91
pkgs/by-name/op/openvas-scanner/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + bison, 5 + cmake, 6 + curl, 7 + doxygen, 8 + fetchFromGitHub, 9 + git, 10 + glib, 11 + gnutls, 12 + gpgme, 13 + gvm-libs, 14 + json-glib, 15 + libbsd, 16 + libclang, 17 + libgcrypt, 18 + libksba, 19 + libpcap, 20 + libsepol, 21 + libssh, 22 + libtasn1, 23 + net-snmp, 24 + p11-kit, 25 + paho-mqtt-c, 26 + pandoc, 27 + pcre2, 28 + pkg-config, 29 + util-linux, 30 + }: 31 + 32 + stdenv.mkDerivation rec { 33 + pname = "openvas-scanner"; 34 + version = "23.0.1"; 35 + 36 + src = fetchFromGitHub { 37 + owner = "greenbone"; 38 + repo = "openvas-scanner"; 39 + rev = "refs/tags/v${version}"; 40 + hash = "sha256-pqbwi3btNEM+qiTqtjIxiDv2wMf1LerltFvLCybiW0Y="; 41 + }; 42 + 43 + nativeBuildInputs = [ 44 + cmake 45 + git 46 + doxygen 47 + pandoc 48 + pkg-config 49 + ]; 50 + 51 + buildInputs = [ 52 + bison 53 + curl 54 + glib 55 + gnutls 56 + gpgme 57 + gvm-libs 58 + json-glib 59 + libbsd 60 + libclang 61 + libgcrypt 62 + libksba 63 + libpcap 64 + libsepol 65 + libssh 66 + libtasn1 67 + net-snmp 68 + p11-kit 69 + paho-mqtt-c 70 + pcre2 71 + util-linux 72 + ]; 73 + 74 + cmakeFlags = [ 75 + "-DGVM_RUN_DIR=$out/run/gvm" 76 + "-DLOCALSTATEDIR=$out/var" 77 + "-DSYSCONFDIR=$out/etc" 78 + "-DOPENVAS_RUN_DIR=$out/run/ospd" 79 + "-DOPENVAS_FEED_LOCK_PATH=$out/var/lib/openvas/feed-update.lock" 80 + ]; 81 + 82 + meta = with lib; { 83 + description = "Scanner component for Greenbone Community Edition"; 84 + homepage = "https://github.com/greenbone/openvas-scanner"; 85 + changelog = "https://github.com/greenbone/openvas-scanner/blob/${src.rev}/changelog.toml"; 86 + license = licenses.gpl2Only; 87 + maintainers = with maintainers; [ fab ]; 88 + mainProgram = "openvas-scanner"; 89 + platforms = platforms.all; 90 + }; 91 + }
+62
pkgs/by-name/tr/troubadix/package.nix
··· 1 + { 2 + lib, 3 + fetchFromGitHub, 4 + git, 5 + python3, 6 + }: 7 + 8 + python3.pkgs.buildPythonApplication rec { 9 + pname = "troubadix"; 10 + version = "24.4.0"; 11 + pyproject = true; 12 + 13 + src = fetchFromGitHub { 14 + owner = "greenbone"; 15 + repo = "troubadix"; 16 + rev = "refs/tags/v${version}"; 17 + hash = "sha256-I/c26dqD7cJ0AtLhJK4XaR5vvud/NsoeXr6/k6+Dezk="; 18 + }; 19 + 20 + pythonRelaxDeps = [ "validators" ]; 21 + 22 + build-system = with python3.pkgs; [ poetry-core ]; 23 + 24 + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; 25 + 26 + dependencies = with python3.pkgs; [ 27 + chardet 28 + charset-normalizer 29 + pkgs.codespell 30 + gitpython 31 + pontos 32 + python-magic 33 + validators 34 + ]; 35 + 36 + nativeCheckInputs = with python3.pkgs; [ 37 + git 38 + pytestCheckHook 39 + ]; 40 + 41 + preCheck = '' 42 + export HOME=$(mktemp -d) 43 + ''; 44 + 45 + pythonImportsCheck = [ "troubadix" ]; 46 + 47 + disabledTests = [ 48 + # AssertionError 49 + "test_ok" 50 + # TypeError 51 + "testgit" 52 + ]; 53 + 54 + meta = with lib; { 55 + description = "A linting tool for NASL files"; 56 + homepage = "https://github.com/greenbone/troubadix"; 57 + changelog = "https://github.com/greenbone/troubadix/releases/tag/v${version}"; 58 + license = licenses.gpl3Only; 59 + maintainers = with maintainers; [ fab ]; 60 + mainProgram = "troubadix"; 61 + }; 62 + }
+3 -3
pkgs/by-name/up/uplosi/package.nix
··· 5 5 }: 6 6 buildGoModule rec { 7 7 pname = "uplosi"; 8 - version = "0.1.3"; 8 + version = "0.2.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "edgelesssys"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - hash = "sha256-RqjaI/1Sx36JfpvnLblt8hPfgSral3Gvp8M6BshKVwo="; 14 + hash = "sha256-TrHREV/bmrjwlE4bsXZDKvIQKa68AnUSktnqCKdvOe8="; 15 15 }; 16 16 17 - vendorHash = "sha256-eZ0/piSxMUC1ZM7qBhFW40l9p8ZPMIj1HyrS2Dy4wJQ="; 17 + vendorHash = "sha256-0uQBhNRP3OGn3hw6Mx6tRliTqIhoBnyfRmdtdtuYwaY="; 18 18 19 19 CGO_ENABLED = "0"; 20 20 ldflags = [ "-s" "-w" "-X main.version=${version}" ];
+1 -1
pkgs/data/themes/colloid-gtk-theme/default.nix
··· 18 18 lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants 19 19 lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants 20 20 lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants 21 - lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black" "rimless" "normal" "float" ] tweaks 21 + lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" "all" "black" "rimless" "normal" "float" ] tweaks 22 22 23 23 stdenvNoCC.mkDerivation rec { 24 24 inherit pname;
+1 -1
pkgs/desktops/gnome/extensions/default.nix
··· 67 67 gnome46Extensions = mapUuidNames (produceExtensionsList "46"); 68 68 69 69 # Keep the last three versions in here 70 - gnomeExtensions = lib.trivial.pipe (gnome44Extensions // gnome45Extensions // gnome46Extensions) [ 70 + gnomeExtensions = lib.trivial.pipe (gnome44Extensions // gnome45Extensions) [ 71 71 (v: builtins.removeAttrs v [ "__attrsFailEvaluation" ]) 72 72 # Apply some custom patches for automatically packaged extensions 73 73 (callPackage ./extensionOverrides.nix {})
+1 -1
pkgs/development/coq-modules/iris-named-props/default.nix
··· 5 5 owner = "tchajed"; 6 6 inherit version; 7 7 defaultVersion = with lib.versions; lib.switch coq.version [ 8 - { case = range "8.16" "8.18"; out = "2023-08-14"; } 8 + { case = range "8.16" "8.19"; out = "2023-08-14"; } 9 9 ] null; 10 10 release."2023-08-14".sha256 = "sha256-gu9qOdHO0qJ2B9Y9Vf66q08iNJcfuECJO66fizFB08g="; 11 11 release."2023-08-14".rev = "ca1871dd33649f27257a0fbf94076acc80ecffbc";
+2
pkgs/development/coq-modules/iris/default.nix
··· 6 6 owner = "iris"; 7 7 inherit version; 8 8 defaultVersion = with lib.versions; lib.switch coq.coq-version [ 9 + { case = range "8.18" "8.19"; out = "4.2.0"; } 9 10 { case = range "8.16" "8.18"; out = "4.1.0"; } 10 11 { case = range "8.13" "8.17"; out = "4.0.0"; } 11 12 { case = range "8.12" "8.14"; out = "3.5.0"; } 12 13 { case = range "8.11" "8.13"; out = "3.4.0"; } 13 14 { case = range "8.9" "8.10"; out = "3.3.0"; } 14 15 ] null; 16 + release."4.2.0".sha256 = "sha256-HuiHIe+5letgr1NN1biZZFq0qlWUbFmoVI7Q91+UIfM="; 15 17 release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo="; 16 18 release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg="; 17 19 release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj";
+2
pkgs/development/coq-modules/stdpp/default.nix
··· 6 6 domain = "gitlab.mpi-sws.org"; 7 7 owner = "iris"; 8 8 defaultVersion = with lib.versions; lib.switch coq.coq-version [ 9 + { case = range "8.18" "8.19"; out = "1.10.0"; } 9 10 { case = range "8.16" "8.18"; out = "1.9.0"; } 10 11 { case = range "8.13" "8.17"; out = "1.8.0"; } 11 12 { case = range "8.12" "8.14"; out = "1.6.0"; } 12 13 { case = range "8.11" "8.13"; out = "1.5.0"; } 13 14 { case = range "8.8" "8.10"; out = "1.4.0"; } 14 15 ] null; 16 + release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I="; 15 17 release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI="; 16 18 release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU="; 17 19 release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y";
+9 -1
pkgs/development/interpreters/php/8.1.nix
··· 1 - { callPackage, ... }@_args: 1 + { callPackage, fetchpatch, ... }@_args: 2 2 3 3 let 4 4 base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // { 5 5 version = "8.1.28"; 6 6 hash = "sha256-i+RQCW4BU8R9dThOfdWVzIl/HVPOAGBwjOlYm8wxQe4="; 7 + extraPatches = [ 8 + # Fix build with libxml 2.12+. 9 + # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 10 + (fetchpatch { 11 + url = "https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch"; 12 + hash = "sha256-HvpTL7aXO9gr4glFdhqUWQPrG8TYTlvbNINq33M3zS0="; 13 + }) 14 + ]; 7 15 }); 8 16 in 9 17 base.withExtensions ({ all, ... }: with all; ([
+27 -26
pkgs/development/libraries/gvm-libs/default.nix
··· 1 - { lib 2 - , stdenv 3 - , cmake 4 - , doxygen 5 - , fetchFromGitHub 6 - , glib 7 - , glib-networking 8 - , gnutls 9 - , gpgme 10 - , hiredis 11 - , libgcrypt 12 - , libnet 13 - , libpcap 14 - , libssh 15 - , libuuid 16 - , libxcrypt 17 - , libxml2 18 - , paho-mqtt-c 19 - , pkg-config 20 - , zlib 21 - , freeradius 1 + { 2 + lib, 3 + stdenv, 4 + cmake, 5 + doxygen, 6 + fetchFromGitHub, 7 + glib, 8 + glib-networking, 9 + gnutls, 10 + gpgme, 11 + hiredis, 12 + libgcrypt, 13 + libnet, 14 + libpcap, 15 + libssh, 16 + libuuid, 17 + libxcrypt, 18 + libxml2, 19 + openldap, 20 + paho-mqtt-c, 21 + pkg-config, 22 + radcli, 23 + zlib, 22 24 }: 23 25 24 26 stdenv.mkDerivation rec { ··· 27 29 28 30 src = fetchFromGitHub { 29 31 owner = "greenbone"; 30 - repo = pname; 32 + repo = "gvm-libs"; 31 33 rev = "refs/tags/v${version}"; 32 34 hash = "sha256-nFqYpt9OWEPgSbaNsHLhs9mg7ChQcmfcgHh7nFfQh18="; 33 35 }; ··· 45 47 gpgme 46 48 hiredis 47 49 libgcrypt 48 - freeradius 49 50 libnet 50 51 libpcap 51 52 libssh 52 53 libuuid 53 54 libxcrypt 54 55 libxml2 56 + openldap 55 57 paho-mqtt-c 58 + radcli 56 59 zlib 57 60 ]; 58 61 59 - cmakeFlags = [ 60 - "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" 61 - ]; 62 + cmakeFlags = [ "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; 62 63 63 64 # causes redefinition of _FORTIFY_SOURCE 64 65 hardeningDisable = [ "fortify3" ];
+6 -3
pkgs/development/libraries/onnxruntime/default.nix
··· 133 133 nlohmann_json 134 134 microsoft-gsl 135 135 ] ++ lib.optionals pythonSupport (with python3Packages; [ 136 - gtest 137 136 numpy 138 137 pybind11 139 138 packaging ··· 150 149 cuda_cudart 151 150 ]); 152 151 153 - nativeCheckInputs = lib.optionals pythonSupport (with python3Packages; [ 152 + nativeCheckInputs = [ 153 + gtest 154 + ] ++ lib.optionals pythonSupport (with python3Packages; [ 154 155 pytest 155 156 sympy 156 157 onnx ··· 179 180 "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" 180 181 "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" 181 182 "-Donnxruntime_BUILD_SHARED_LIB=ON" 182 - "-Donnxruntime_BUILD_UNIT_TESTS=ON" 183 + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) 183 184 "-Donnxruntime_ENABLE_LTO=ON" 184 185 "-Donnxruntime_USE_FULL_PROTOBUF=OFF" 185 186 (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) ··· 190 191 (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") 191 192 (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") 192 193 (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) 194 + (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1") 193 195 ]; 194 196 195 197 env = lib.optionalAttrs effectiveStdenv.cc.isClang { ··· 224 226 ''; 225 227 226 228 passthru = { 229 + inherit cudaSupport cudaPackages; # for the python module 227 230 protobuf = protobuf_21; 228 231 tests = lib.optionalAttrs pythonSupport { 229 232 python = python3Packages.onnxruntime;
+19 -19
pkgs/development/python-modules/aiooss2/default.nix
··· 1 - { lib 2 - , aiohttp 3 - , buildPythonPackage 4 - , fetchFromGitHub 5 - , oss2 6 - , pytest-asyncio 7 - , pytest-mock 8 - , pytestCheckHook 9 - , pythonOlder 10 - , pythonRelaxDepsHook 11 - , requests 12 - , setuptools 13 - , setuptools-scm 1 + { 2 + lib, 3 + aiohttp, 4 + buildPythonPackage, 5 + fetchFromGitHub, 6 + oss2, 7 + pytest-asyncio, 8 + pytest-mock, 9 + pytestCheckHook, 10 + pythonOlder, 11 + pythonRelaxDepsHook, 12 + requests, 13 + setuptools, 14 + setuptools-scm, 14 15 }: 15 16 16 17 buildPythonPackage rec { 17 18 pname = "aiooss2"; 18 - version = "0.2.10"; 19 + version = "0.2.11"; 19 20 pyproject = true; 20 21 21 22 disabled = pythonOlder "3.8"; ··· 24 25 owner = "karajan1001"; 25 26 repo = "aiooss2"; 26 27 rev = "refs/tags/${version}"; 27 - hash = "sha256-xlbOLqillSpN6DHYn7bqTL7qMlicYCXGxO30Z/tiKJY="; 28 + hash = "sha256-6tkJG6Jjvo2OaN9cRbs/7ApcrKiZ5tGSPUfugAx7iJU="; 28 29 }; 29 30 30 31 pythonRelaxDeps = [ ··· 33 34 ]; 34 35 35 36 build-system = [ 36 - pythonRelaxDepsHook 37 37 setuptools 38 38 setuptools-scm 39 39 ]; 40 + 41 + nativeBuildInputs = [ pythonRelaxDepsHook ]; 40 42 41 43 dependencies = [ 42 44 aiohttp ··· 50 52 requests 51 53 ]; 52 54 53 - pythonImportsCheck = [ 54 - "aiooss2" 55 - ]; 55 + pythonImportsCheck = [ "aiooss2" ]; 56 56 57 57 disabledTestPaths = [ 58 58 # Tests require network access
+2 -2
pkgs/development/python-modules/apprise/default.nix
··· 19 19 20 20 buildPythonPackage rec { 21 21 pname = "apprise"; 22 - version = "1.7.5"; 22 + version = "1.7.6"; 23 23 format = "setuptools"; 24 24 25 25 disabled = pythonOlder "3.7"; 26 26 27 27 src = fetchPypi { 28 28 inherit pname version; 29 - hash = "sha256-CsNLJwCdXGJeh9M+yF+ldwYrV/O87W1yI+F8Wvu0Dmg="; 29 + hash = "sha256-B38JMJzIpskGPb1hSzQ4B9Un1UZpO3/o/FpEM1Av6mw="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/crc/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "crc"; 11 - version = "6.1.1"; 11 + version = "6.1.2"; 12 12 pyproject = true; 13 13 14 14 disabled = pythonOlder "3.8"; ··· 17 17 owner = "Nicoretti"; 18 18 repo = "crc"; 19 19 rev = "refs/tags/${version}"; 20 - hash = "sha256-GlXDDG8NZ3Lp0IwYKS0+fZG85uVdo4V8mZnCa+za02U="; 20 + hash = "sha256-d946yBMrOIgMXGOr2ej5bvn59D5iAGMese24qdv8l/Y="; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/goodwe/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "goodwe"; 12 - version = "0.3.2"; 12 + version = "0.3.3"; 13 13 pyproject = true; 14 14 15 15 disabled = pythonOlder "3.8"; ··· 18 18 owner = "marcelblijleven"; 19 19 repo = "goodwe"; 20 20 rev = "refs/tags/v${version}"; 21 - hash = "sha256-0N2aimDj9HF0y1pitg7E2OzGk4o4kopSlvXy9x6jplk="; 21 + hash = "sha256-CIEv3srjyVWQ1UGKVRwPXpzrND/8hTbw6HSlko9+AIk="; 22 22 }; 23 23 24 24 postPatch = ''
+57
pkgs/development/python-modules/influxdb3-python/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , certifi 4 + , fetchFromGitHub 5 + , pyarrow 6 + , pytestCheckHook 7 + , python-dateutil 8 + , pythonOlder 9 + , reactivex 10 + , setuptools 11 + , urllib3 12 + }: 13 + 14 + buildPythonPackage rec { 15 + pname = "influxdb3-python"; 16 + version = "0.3.6"; 17 + pyproject = true; 18 + 19 + disabled = pythonOlder "3.7"; 20 + 21 + src = fetchFromGitHub { 22 + owner = "InfluxCommunity"; 23 + repo = "influxdb3-python"; 24 + rev = "refs/tags/v${version}"; 25 + hash = "sha256-ZKN3chJvtOenk2jp02rvw+HooJcee0hwxWoLvEYjfcg="; 26 + }; 27 + 28 + nativeBuildInputs = [ 29 + setuptools 30 + ]; 31 + 32 + propagatedBuildInputs = [ 33 + certifi 34 + pyarrow 35 + python-dateutil 36 + reactivex 37 + urllib3 38 + ]; 39 + 40 + # Missing ORC support 41 + # https://github.com/NixOS/nixpkgs/issues/212863 42 + # nativeCheckInputs = [ 43 + # pytestCheckHook 44 + # ]; 45 + # 46 + # pythonImportsCheck = [ 47 + # "influxdb_client_3" 48 + # ]; 49 + 50 + meta = with lib; { 51 + description = "Python module that provides a simple and convenient way to interact with InfluxDB 3.0"; 52 + homepage = "https://github.com/InfluxCommunity/influxdb3-python"; 53 + changelog = "https://github.com/InfluxCommunity/influxdb3-python/releases/tag/v${version}"; 54 + license = licenses.asl20; 55 + maintainers = with maintainers; [ fab ]; 56 + }; 57 + }
-2
pkgs/development/python-modules/json5/default.nix
··· 1 1 { buildPythonPackage 2 2 , fetchFromGitHub 3 - , hypothesis 4 3 , lib 5 4 , pytestCheckHook 6 5 }: ··· 18 17 }; 19 18 20 19 nativeCheckInputs = [ 21 - hypothesis 22 20 pytestCheckHook 23 21 ]; 24 22
+2 -2
pkgs/development/python-modules/llama-index-core/default.nix
··· 31 31 32 32 buildPythonPackage rec { 33 33 pname = "llama-index-core"; 34 - version = "0.10.28.post1"; 34 + version = "0.10.29"; 35 35 pyproject = true; 36 36 37 37 disabled = pythonOlder "3.8"; ··· 40 40 owner = "run-llama"; 41 41 repo = "llama_index"; 42 42 rev = "refs/tags/v${version}"; 43 - hash = "sha256-BOpKaOP0DdBdVB0bMrAwXG5xaZ3AXnHX3/sHt1GRWJs="; 43 + hash = "sha256-4Tamo5r7EKmLIVymFX9UbFY6vxhgl3dY7xntmDeGn4M="; 44 44 }; 45 45 46 46 sourceRoot = "${src.name}/${pname}";
+2 -2
pkgs/development/python-modules/llama-index-readers-file/default.nix
··· 14 14 15 15 buildPythonPackage rec { 16 16 pname = "llama-index-readers-file"; 17 - version = "0.1.16"; 17 + version = "0.1.17"; 18 18 pyproject = true; 19 19 20 20 disabled = pythonOlder "3.8"; ··· 22 22 src = fetchPypi { 23 23 pname = "llama_index_readers_file"; 24 24 inherit version; 25 - hash = "sha256-fyW4/drxqRusBsZnJ7kTtI4m72hxT81RlwUbP3EPTPo="; 25 + hash = "sha256-JAZgypPAQ4P8Suv6nJva60N5ClM+aIa0Yxpfx/ABkMo="; 26 26 }; 27 27 28 28 pythonRelaxDeps = [
+2 -2
pkgs/development/python-modules/myst-nb/default.nix
··· 18 18 19 19 buildPythonPackage rec { 20 20 pname = "myst-nb"; 21 - version = "1.0.0"; 21 + version = "1.1.0"; 22 22 pyproject = true; 23 23 24 24 disabled = pythonOlder "3.9"; ··· 26 26 src = fetchPypi { 27 27 inherit version; 28 28 pname = "myst_nb"; 29 - hash = "sha256-kHfkKhxrRB6lUHhQb4NVXdpdbIFu9JMIQdcdI54+DF4="; 29 + hash = "sha256-kniEDoRPXXgLWsxUAMv2PZfKrM+OtEKlXr2aA+JSLV4="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+7 -1
pkgs/development/python-modules/onnxruntime/default.nix
··· 53 53 oneDNN 54 54 re2 55 55 onnxruntime.protobuf 56 - ]; 56 + ] ++ lib.optionals onnxruntime.passthru.cudaSupport (with onnxruntime.passthru.cudaPackages; [ 57 + libcublas # libcublasLt.so.XX libcublas.so.XX 58 + libcurand # libcurand.so.XX 59 + libcufft # libcufft.so.XX 60 + cudnn # libcudnn.soXX 61 + cuda_cudart # libcudart.so.XX 62 + ]); 57 63 58 64 propagatedBuildInputs = [ 59 65 coloredlogs
+2 -2
pkgs/development/python-modules/vallox-websocket-api/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "vallox-websocket-api"; 16 - version = "5.1.1"; 16 + version = "5.2.0"; 17 17 pyproject = true; 18 18 19 19 disabled = pythonOlder "3.9"; ··· 22 22 owner = "yozik04"; 23 23 repo = "vallox_websocket_api"; 24 24 rev = "refs/tags/${version}"; 25 - hash = "sha256-BhAI/bGzaSckyZJq7GYUldziotr2bMlA5cWgQEwiUcQ="; 25 + hash = "sha256-qq58ZSrKVQ00rtXMe4L9xfz0QB+UpjGOhPo1srPYIY4="; 26 26 }; 27 27 28 28 nativeBuildInputs = [
+3
pkgs/development/rocm-modules/5/default.nix
··· 318 318 rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb"; 319 319 sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY="; 320 320 }; 321 + 322 + # overwrite all patches, since patches for newer version do not apply 323 + patches = [ ../6/0001-Compile-transupp.c-as-part-of-the-library.patch ]; 321 324 }; 322 325 }; 323 326
+4
pkgs/development/rocm-modules/5/mivisionx/default.nix
··· 47 47 hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U="; 48 48 }; 49 49 50 + patches = [ 51 + ../../6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch 52 + ]; 53 + 50 54 nativeBuildInputs = [ 51 55 cmake 52 56 rocm-cmake
+104
pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch
··· 1 + From 4a0584f7c05641143151ebdc1be1163bebf9d35d Mon Sep 17 00:00:00 2001 2 + From: Las <las@protonmail.ch> 3 + Date: Sun, 3 Jan 2021 18:35:37 +0000 4 + Subject: [PATCH] Compile transupp.c as part of the library 5 + 6 + The exported symbols are made weak to not conflict with users 7 + of the library that already vendor this functionality. 8 + --- 9 + CMakeLists.txt | 4 ++-- 10 + transupp.c | 14 +++++++------- 11 + 2 files changed, 9 insertions(+), 9 deletions(-) 12 + 13 + diff --git a/CMakeLists.txt b/CMakeLists.txt 14 + index 0ca6f98..a9a0fae 100644 15 + --- a/CMakeLists.txt 16 + +++ b/CMakeLists.txt 17 + @@ -533,7 +533,7 @@ set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c 18 + jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c 19 + jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c 20 + jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c 21 + - jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c) 22 + + jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c transupp.c) 23 + 24 + if(WITH_ARITH_ENC OR WITH_ARITH_DEC) 25 + set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c) 26 + @@ -1489,7 +1489,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets 27 + 28 + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h 29 + ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h 30 + - ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h 31 + + ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/transupp.h 32 + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 33 + 34 + include(cmakescripts/BuildPackages.cmake) 35 + diff --git a/transupp.c b/transupp.c 36 + index 6e86077..2da49a7 100644 37 + --- a/transupp.c 38 + +++ b/transupp.c 39 + @@ -1386,7 +1386,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result) 40 + * This code is loosely based on XParseGeometry from the X11 distribution. 41 + */ 42 + 43 + -GLOBAL(boolean) 44 + +GLOBAL(boolean) __attribute__((weak)) 45 + jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec) 46 + { 47 + info->crop = FALSE; 48 + @@ -1486,7 +1486,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height) 49 + * and transformation is not perfect. Otherwise returns TRUE. 50 + */ 51 + 52 + -GLOBAL(boolean) 53 + +GLOBAL(boolean) __attribute__((weak)) 54 + jtransform_request_workspace(j_decompress_ptr srcinfo, 55 + jpeg_transform_info *info) 56 + { 57 + @@ -2033,7 +2033,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width, 58 + * to jpeg_write_coefficients(). 59 + */ 60 + 61 + -GLOBAL(jvirt_barray_ptr *) 62 + +GLOBAL(jvirt_barray_ptr *) __attribute__((weak)) 63 + jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 64 + jvirt_barray_ptr *src_coef_arrays, 65 + jpeg_transform_info *info) 66 + @@ -2152,7 +2152,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 67 + * Note that some transformations will modify the source data arrays! 68 + */ 69 + 70 + -GLOBAL(void) 71 + +GLOBAL(void) __attribute__((weak)) 72 + jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 73 + jvirt_barray_ptr *src_coef_arrays, 74 + jpeg_transform_info *info) 75 + @@ -2264,7 +2264,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 76 + * (may use custom action then) 77 + */ 78 + 79 + -GLOBAL(boolean) 80 + +GLOBAL(boolean) __attribute__((weak)) 81 + jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, 82 + int MCU_width, int MCU_height, 83 + JXFORM_CODE transform) 84 + @@ -2303,7 +2303,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, 85 + * This must be called before jpeg_read_header() to have the desired effect. 86 + */ 87 + 88 + -GLOBAL(void) 89 + +GLOBAL(void) __attribute__((weak)) 90 + jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) 91 + { 92 + #ifdef SAVE_MARKERS_SUPPORTED 93 + @@ -2331,7 +2331,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) 94 + * JFIF APP0 or Adobe APP14 markers if selected. 95 + */ 96 + 97 + -GLOBAL(void) 98 + +GLOBAL(void) __attribute__((weak)) 99 + jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 100 + JCOPY_OPTION option) 101 + { 102 + -- 103 + 2.29.2 104 +
+3
pkgs/development/rocm-modules/6/default.nix
··· 316 316 rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb"; 317 317 sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY="; 318 318 }; 319 + 320 + # overwrite all patches, since patches for newer version do not apply 321 + patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ]; 319 322 }; 320 323 }; 321 324
+25
pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch
··· 1 + From f0e66bd446d44df1d30faaad520613f5fb7f5916 Mon Sep 17 00:00:00 2001 2 + From: Martin Schwaighofer <mschwaig@users.noreply.github.com> 3 + Date: Sat, 30 Mar 2024 15:36:52 +0100 4 + Subject: [PATCH] set __STDC_CONSTANT_MACROS to make rocAL compile 5 + 6 + --- 7 + CMakeLists.txt | 2 ++ 8 + 1 file changed, 2 insertions(+) 9 + 10 + diff --git a/CMakeLists.txt b/CMakeLists.txt 11 + index 42b139b6..509915f1 100644 12 + --- a/CMakeLists.txt 13 + +++ b/CMakeLists.txt 14 + @@ -149,6 +149,8 @@ message("-- ${Cyan} -D MIGRAPHX=${MIGRAPHX} [Turn ON/OFF MIGraphX Module (de 15 + message("-- ${Cyan} -D BACKEND=${BACKEND} [Select MIVisionX Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}") 16 + message("-- ${Cyan} -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:OFF)]${ColourReset}") 17 + 18 + +add_definitions(-D__STDC_CONSTANT_MACROS) 19 + + 20 + add_subdirectory(amd_openvx) 21 + add_subdirectory(amd_openvx_extensions) 22 + add_subdirectory(utilities) 23 + -- 24 + 2.43.0 25 +
+4
pkgs/development/rocm-modules/6/mivisionx/default.nix
··· 46 46 hash = "sha256-d32lcJq24MXeIWbNbo6putWaol5kF2io6cz4ZuL+DbE="; 47 47 }; 48 48 49 + patches = [ 50 + ./0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch 51 + ]; 52 + 49 53 nativeBuildInputs = [ 50 54 cmake 51 55 rocm-cmake
+3 -3
pkgs/development/tools/subxt/default.nix
··· 8 8 9 9 rustPlatform.buildRustPackage rec { 10 10 pname = "subxt"; 11 - version = "0.35.2"; 11 + version = "0.35.3"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "paritytech"; 15 15 repo = "subxt"; 16 16 rev = "v${version}"; 17 - hash = "sha256-nMdpMvNoynioCzD7wXbF1W3mwCfOClAZyjbF/3eworw="; 17 + hash = "sha256-5G5gFxr7CIvZ1RfkLIEF/z4t+wTj09fJXTNr2v0vuyg="; 18 18 }; 19 19 20 - cargoHash = "sha256-sXiMgooOSGDl0L0i5VncCYuoSzjRSogRGqteE+b6jkc="; 20 + cargoHash = "sha256-5lAs2J5hkPhBN3tORt6N7834brS/dAkKsXvZ6C1K+OY="; 21 21 22 22 # Only build the command line client 23 23 cargoBuildFlags = [ "--bin" "subxt" ];
+2 -2
pkgs/development/web/nodejs/v18.nix
··· 19 19 in 20 20 buildNodejs { 21 21 inherit enableNpm; 22 - version = "18.20.1"; 23 - sha256 = "sha256-xthnqfJeY1SBDv+4IB+BR6FbKAAOUHkP2gDRyhX0m4o="; 22 + version = "18.20.2"; 23 + sha256 = "sha256-iq6nycfpJ/sJ2RSY2jEbbk0YIzOQ4jxyOlO4kfrUxz8="; 24 24 patches = [ 25 25 ./disable-darwin-v8-system-instrumentation.patch 26 26 ./bypass-darwin-xcrun-node16.patch
+2 -2
pkgs/development/web/nodejs/v21.nix
··· 8 8 in 9 9 buildNodejs { 10 10 inherit enableNpm; 11 - version = "21.7.2"; 12 - sha256 = "sha256-tLHioH6W+F9s40ovv+o0hpGu/lyyGappUeI8zJkfni8="; 11 + version = "21.7.3"; 12 + sha256 = "08csswa1h55l9zvfjc4g1ksicgl42pbz7g1bc9hgy77w3gxjd2v6"; 13 13 patches = [ 14 14 ./disable-darwin-v8-system-instrumentation-node19.patch 15 15 ./bypass-darwin-xcrun-node16.patch
+2 -2
pkgs/servers/sql/postgresql/ext/lantern.nix
··· 8 8 9 9 stdenv.mkDerivation (finalAttrs: { 10 10 pname = "lantern"; 11 - version = "0.2.3"; 11 + version = "0.2.4"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "lanterndata"; 15 15 repo = "lantern"; 16 16 rev = "v${finalAttrs.version}"; 17 - hash = "sha256-viTI8hIdtoLefXyBPyFAKWr1suCvuU7rjXQOIZKLBHw="; 17 + hash = "sha256-d5CdS11Z0u8+oPvjH6gVx6k8y05SS6wU3PnafcEgQeY="; 18 18 fetchSubmodules = true; 19 19 }; 20 20
+7 -1
pkgs/stdenv/generic/make-derivation.nix
··· 574 574 "The ‘env’ attribute set can only contain derivation, string, boolean or integer attributes. The ‘${n}’ attribute is of type ${builtins.typeOf v}."; v) 575 575 env; 576 576 577 + # Fixed-output derivations may not reference other paths, which means that 578 + # for a fixed-output derivation, the corresponding inputDerivation should 579 + # *not* be fixed-output. To achieve this we simply delete the attributes that 580 + # would make it fixed-output. 581 + deleteFixedOutputRelatedAttrs = lib.flip builtins.removeAttrs [ "outputHashAlgo" "outputHash" "outputHashMode" ]; 582 + 577 583 in 578 584 579 585 extendDerivation ··· 584 590 # This allows easy building and distributing of all derivations 585 591 # needed to enter a nix-shell with 586 592 # nix-build shell.nix -A inputDerivation 587 - inputDerivation = derivation (derivationArg // { 593 + inputDerivation = derivation (deleteFixedOutputRelatedAttrs derivationArg // { 588 594 # Add a name in case the original drv didn't have one 589 595 name = derivationArg.name or "inputDerivation"; 590 596 # This always only has one output
+22
pkgs/test/stdenv/default.nix
··· 166 166 touch $out 167 167 ''; 168 168 169 + test-inputDerivation-fixed-output = let 170 + inherit (stdenv.mkDerivation { 171 + dep1 = derivation { name = "dep1"; builder = "/bin/sh"; args = [ "-c" ": > $out" ]; system = builtins.currentSystem; }; 172 + dep2 = derivation { name = "dep2"; builder = "/bin/sh"; args = [ "-c" ": > $out" ]; system = builtins.currentSystem; }; 173 + name = "meow"; 174 + outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; 175 + outputHashMode = "flat"; 176 + outputHashAlgo = "sha256"; 177 + buildCommand = '' 178 + touch $out 179 + ''; 180 + passAsFile = [ "dep2" ]; 181 + }) inputDerivation; 182 + in 183 + runCommand "test-inputDerivation" { 184 + exportReferencesGraph = [ "graph" inputDerivation ]; 185 + } '' 186 + grep ${inputDerivation.dep1} graph 187 + grep ${inputDerivation.dep2} graph 188 + touch $out 189 + ''; 190 + 169 191 test-prepend-append-to-var = testPrependAndAppendToVar { 170 192 name = "test-prepend-append-to-var"; 171 193 stdenv' = bootStdenv;
+3 -3
pkgs/tools/admin/balena-cli/default.nix
··· 18 18 }; 19 19 in buildNpmPackage' rec { 20 20 pname = "balena-cli"; 21 - version = "18.1.8"; 21 + version = "18.1.9"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "balena-io"; 25 25 repo = "balena-cli"; 26 26 rev = "v${version}"; 27 - hash = "sha256-cxeYwewxn8c3yy/9T6MbWTCdNsK56684OPe6gIFWfxs="; 27 + hash = "sha256-yf4QkuFt5Fpegyru05S79Q3hFaLc45unxrk+SJzwWg0="; 28 28 }; 29 29 30 - npmDepsHash = "sha256-Yul97/UlgpV5Rk2ax9rRRNLeLgwdxftuU9IKvy5lSIk="; 30 + npmDepsHash = "sha256-lTaKW5Tsw9df0bd/chr8nSL2PROp1sSs+fuMr3Cz+a4="; 31 31 32 32 postPatch = '' 33 33 ln -s npm-shrinkwrap.json package-lock.json
+3 -3
pkgs/tools/misc/chezmoi/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "chezmoi"; 9 - version = "2.47.3"; 9 + version = "2.47.4"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "twpayne"; 13 13 repo = "chezmoi"; 14 14 rev = "v${version}"; 15 - hash = "sha256-Z9NXYtYaV4jhUK2JEpxleYVG6Vo/nKeD/qBqagzkmNE="; 15 + hash = "sha256-clhW/Y+OJ7iQVK8I2xwoVT9rXF2CXRBaUxDZrREAjYc="; 16 16 }; 17 17 18 - vendorHash = "sha256-IbNEKj8wJpsQO9bXrsH4OJUIhez9merFSWydhSHbvRQ="; 18 + vendorHash = "sha256-8Puy1IKLMENduWyOAJtvpd7FV1a0IdmkMYztIJdeaBs="; 19 19 20 20 doCheck = false; 21 21
+2 -2
pkgs/tools/misc/fluent-bit/default.nix
··· 12 12 13 13 stdenv.mkDerivation (finalAttrs: { 14 14 pname = "fluent-bit"; 15 - version = "3.0.1"; 15 + version = "3.0.2"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "fluent"; 19 19 repo = "fluent-bit"; 20 20 rev = "v${finalAttrs.version}"; 21 - hash = "sha256-gys6dye137dW/WkoaLQXnrEwU0mXYfHOhuyeg452Tro="; 21 + hash = "sha256-4LYIQ1WIt9btQI255nnTnGjz/GSUl/5mI6TEq99zNCM="; 22 22 }; 23 23 24 24 nativeBuildInputs = [ cmake flex bison ];
+3 -3
pkgs/tools/misc/fzf/default.nix
··· 11 11 12 12 buildGoModule rec { 13 13 pname = "fzf"; 14 - version = "0.49.0"; 14 + version = "0.50.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "junegunn"; 18 18 repo = pname; 19 19 rev = version; 20 - hash = "sha256-XecMHKi5JMWx3RHQRk2FqS3SjyR6KzWjfyQ5JCI45xM="; 20 + hash = "sha256-b8B05aj0+c620K6ftCXx1EGUt8mdqQYTE0D9aPU+/wA="; 21 21 }; 22 22 23 - vendorHash = "sha256-ZEwB2GKohmOx8xosj14VII6sQ4a82s7+h9r620MKEeU="; 23 + vendorHash = "sha256-Ho2jVD/U/2BFt3BF5w+KHp5nSVmukx0o2l3ISDGDSt0="; 24 24 25 25 CGO_ENABLED = 0; 26 26
+2 -2
pkgs/tools/misc/pferd/default.nix
··· 5 5 6 6 python3Packages.buildPythonApplication rec { 7 7 pname = "pferd"; 8 - version = "3.5.1"; 8 + version = "3.5.2"; 9 9 format = "pyproject"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "Garmelon"; 13 13 repo = "PFERD"; 14 14 rev = "refs/tags/v${version}"; 15 - sha256 = "sha256-NNQ7yB0JPVDSWMNxkpvEK/meLa3Db78qxUDDTJa6YgM="; 15 + sha256 = "sha256-qN4GtQhiQpXZIagtphcn+oSYXroA9kk7E34IKoKMu7c="; 16 16 }; 17 17 18 18 nativeBuildInputs = with python3Packages; [
+2 -2
pkgs/tools/networking/netbird/default.nix
··· 31 31 in 32 32 buildGoModule rec { 33 33 pname = "netbird"; 34 - version = "0.27.2"; 34 + version = "0.27.3"; 35 35 36 36 src = fetchFromGitHub { 37 37 owner = "netbirdio"; 38 38 repo = pname; 39 39 rev = "v${version}"; 40 - hash = "sha256-W31eKA6v7pAJZ9El/CxEDMONTcpRfzn/Ldh1yIql+NQ="; 40 + hash = "sha256-Df30R6/dKihB1F3NR9zH4AFe7IozN27xaGMe6M7hoDA="; 41 41 }; 42 42 43 43 vendorHash = "sha256-HJEZ1VrKS1MXKtpDjVorMiecb94+f1mBWPkWng4YqZk=";
+18 -24
pkgs/tools/security/dnsrecon/default.nix
··· 1 - { lib 2 - , fetchFromGitHub 3 - , python3 1 + { 2 + lib, 3 + fetchFromGitHub, 4 + python3, 4 5 }: 5 6 6 7 python3.pkgs.buildPythonApplication rec { 7 8 pname = "dnsrecon"; 8 - version = "1.1.5"; 9 - format = "setuptools"; 9 + version = "1.2.0"; 10 + pyproject = true; 10 11 11 12 src = fetchFromGitHub { 12 13 owner = "darkoperator"; 13 - repo = pname; 14 - rev = version; 15 - hash = "sha256-W7ZFc+kF00ANoYVTlsY+lJ9FjMEGbqYfNojoZFiRHU8="; 14 + repo = "dnsrecon"; 15 + rev = "refs/tags/${version}"; 16 + hash = "sha256-XboRxq3ZDIDtuECVSnncQ2Pa8YAvva4KUNm0O5ED6rc="; 16 17 }; 17 18 18 - postPatch = '' 19 - substituteInPlace requirements.txt \ 20 - --replace "flake8" "" \ 21 - --replace "pytest" "" 22 - ''; 19 + build-system = with python3.pkgs; [ setuptools ]; 23 20 24 - propagatedBuildInputs = with python3.pkgs; [ 21 + dependencies = with python3.pkgs; [ 25 22 dnspython 26 23 netaddr 27 24 lxml 28 25 setuptools 29 26 ]; 30 27 31 - preFixup = '' 32 - # Install wordlists, etc. 33 - install -vD namelist.txt subdomains-*.txt snoop.txt -t $out/share/wordlists 34 - ''; 35 - 36 28 # Tests require access to /etc/resolv.conf 37 29 doCheck = false; 38 30 39 - pythonImportsCheck = [ 40 - "dnsrecon" 41 - ]; 31 + pythonImportsCheck = [ "dnsrecon" ]; 42 32 43 33 meta = with lib; { 44 34 description = "DNS Enumeration script"; 45 - mainProgram = "dnsrecon"; 46 35 homepage = "https://github.com/darkoperator/dnsrecon"; 36 + changelog = "https://github.com/darkoperator/dnsrecon/releases/tag/${version}"; 47 37 license = licenses.gpl2Only; 48 - maintainers = with maintainers; [ c0bw3b fab ]; 38 + maintainers = with maintainers; [ 39 + c0bw3b 40 + fab 41 + ]; 42 + mainProgram = "dnsrecon"; 49 43 }; 50 44 }
+2 -2
pkgs/tools/security/zlint/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "zlint"; 10 - version = "3.6.1"; 10 + version = "3.6.2"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "zmap"; 14 14 repo = "zlint"; 15 15 rev = "v${version}"; 16 - hash = "sha256-8iZUEUU+HY8cJrBwiGNE4e6hXQvNwAt0cPnBjAVDcHo="; 16 + hash = "sha256-UwtWYDWbln64nE4KDV+gWIhhdbyvlrs0fM96otnfqfE="; 17 17 }; 18 18 19 19 modRoot = "v3";
+2
pkgs/top-level/python-packages.nix
··· 5717 5717 5718 5718 influxdb-client = callPackage ../development/python-modules/influxdb-client { }; 5719 5719 5720 + influxdb3-python = callPackage ../development/python-modules/influxdb3-python { }; 5721 + 5720 5722 inform = callPackage ../development/python-modules/inform { }; 5721 5723 5722 5724 iniconfig = callPackage ../development/python-modules/iniconfig { };