Commit 47ea10ea authored by magicquark's avatar magicquark
Browse files

locust: fix build errors 

- Upstream moved from `yarn` to `yarn berry` in
https://github.com/locustio/locust/commit/a863a60d5838cbe678620968cbc28e2ecf21213a

- The version bump of `locust` from 2.33.1 to 2.37.14 in
https://github.com/NixOS/nixpkgs/commit/0c5bbee473da46c8426bb573535824533205fa84,
did not update the `webui.nix` file that inherits the source in
`default.nix`. The
diff (https://github.com/locustio/locust/compare/2.33.1...2.37.14) shows
that the change to yarn berry was made in between the version bump.

- A new dependency was added during the version bump to `locust` of
  `locust-cloud`.

- Resolves: https://github.com/NixOS/nixpkgs/issues/441033

- Add back in a preBuild hook, slightly reworked, that was removed in
  PR 388942.
parent 0d54c602

pkgs/development/python-modules/locust/default.nix

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  gevent,

  geventhttpclient,

  msgpack,

  locust-cloud,

  psutil,

  pyquery,

  pyzmq,
@@ -49,6 +50,11 @@ buildPythonPackage rec { 
    src = "${src}/locust/webui";

  };



  preBuild = ''

    mkdir -p $out/${python.sitePackages}/locust/webui/dist

    ln -sf ${webui}/dist/* $out/${python.sitePackages}/locust/webui/dist

  '';



  build-system = [

    hatchling

    hatch-vcs
@@ -57,6 +63,8 @@ buildPythonPackage rec { 
  pythonRelaxDeps = [

    # version 0.7.0.dev0 is not considered to be >= 0.6.3

    "flask-login"

    # version 6.0.1 is listed as 0.0.1 in the dependency check and 0.0.1 is not >= 3.0.10

    "flask-cors"

  ];



  dependencies = [
@@ -67,6 +75,7 @@ buildPythonPackage rec { 
    gevent

    geventhttpclient

    msgpack

    locust-cloud

    psutil

    pyzmq

    requests

pkgs/development/python-modules/locust/missing-hashes.json

0 → 100644
+76 −0
Original line number Diff line number Diff line 
{

  "@esbuild/aix-ppc64@npm:0.25.1": "6de3a364b7f79f21f66d606d4d29c72ef81c741d71ab4bb941c4eabe7b6a809b1340f4dd5c943827005e421912880741320b9617d17fce762d204cfb94175223",

  "@esbuild/android-arm64@npm:0.25.1": "716c98ad3220c71cbaedcfa34aa7c877a3fae911938c3776a66600d7f65980e384799a6832a1b9aea96c6d5a8880610f54744bd0813e743c511d44056ef528d6",

  "@esbuild/android-arm@npm:0.25.1": "d2c9e95dd2027f6e14250a90a11136d9ce73a2157a8d104df4a9dd199d3c50cd91f25813536b4776630acb78596bd5a025976962c6d624df7594c32f2d9c1395",

  "@esbuild/android-x64@npm:0.25.1": "92f1bec801b414ecdc4b73adfbb4482f4f2cfba423d33296914fa59ffdafb81facc445a7f65d1eea813c078220a0606f4be02252843bb9039ceb2755f643387c",

  "@esbuild/darwin-arm64@npm:0.25.1": "9c4cd09c0bd8479e27e04e2397edccebae928184c463684490137d2b7ea3171051b66596db229af2ad3e6a911c1c8a9d10b8aed30d11d0aa155ac0d309fd5dd6",

  "@esbuild/darwin-x64@npm:0.25.1": "31b64c02be9438e175e8b343c52e0bbc7964f08a1b44e0adbfa2a1b229ccd0ad0184cdb8313272b4590298833ea0b197d82a909466caffe90105f8acb30402d0",

  "@esbuild/freebsd-arm64@npm:0.25.1": "e04018ffd760dd101a5931e0248751bdfca98e3f29be9b41051d55278907f52a3e5ab80c32168e208c2ff287510d6d5b765d3adc841bfd621af7930c10a547e6",

  "@esbuild/freebsd-x64@npm:0.25.1": "438215bea2dc716d2c9ffe9b921bbde06e77d96ec0c837fd79f46bc6e195aa50e5f55490228f7433df7aa47810eec5c602a9d9cf956c1794778018632b196f34",

  "@esbuild/linux-arm64@npm:0.25.1": "c839788b6db471f144bc2627a117083c9a50402c76cde2f0e5411faaeb3a5cde4972bb7336b87de67cd0a65d4d5b00759668407a03b5d4ed3130d4984837429a",

  "@esbuild/linux-arm@npm:0.25.1": "ecf9fd9028d2166619b9a45161a987eebb6ef3dcb0159a2607ab164c58c26a15cf274e0b1088834c07ef9166349276d595fdad5c42bce8d03a55cb213d947efa",

  "@esbuild/linux-ia32@npm:0.25.1": "36f208e10a4b778a28a9002338872e52d24dfc18e25d3b41dc53892279c3ee842d76c7b608a30620f128d85344acac0dc86f203f5de7082a21fa2e908c96b68c",

  "@esbuild/linux-loong64@npm:0.25.1": "75d95e6ee995c9f2abb202ca430685e5d58fbe9b0b5b01a69b498c9b360d309026d15bae7831de9c0c4f02e45028a92ffb169117c3b56dd1ac7ea8c6ef50628d",

  "@esbuild/linux-mips64el@npm:0.25.1": "7fc22eb8a7dc9ee743113cb327eef3591bced4753f416f8dd722794a198a053ab6e120b3b13c1bb6cc89cbd02ea502187b1a3c9ebe8187407665c78995153740",

  "@esbuild/linux-ppc64@npm:0.25.1": "84f914a776774bf209c5f96a3708e52477e1966b689a880c0256530063bc581125b5cc04b9700f4aa892e7770ba47c5a950a4be9f1bb3ccbe60a500383602156",

  "@esbuild/linux-riscv64@npm:0.25.1": "97f47cd5695686254b58f950ca973df1fcecfebf3bd585629121a65323ffaa7f95cf821392011ee069da492b46fdff771be332c699a438cf123351610e12d621",

  "@esbuild/linux-s390x@npm:0.25.1": "10760a999d432d092a8ebe5f09752ee7e8ea77a1afa5f1adfe7f9ccb5bbf77d6e0da6dce5d1a4a7cd731d89b6075723c2bc0328f446ed129c4b63c6441ba22ae",

  "@esbuild/linux-x64@npm:0.25.1": "4cdb1625726580eb42432878912d5480a0321559ef2c6425c1db55f89f3fe1c35fb03b3adec92c3f52a4db751d7535f23086b80ed7b219d1edbb254ffbe96e68",

  "@esbuild/netbsd-arm64@npm:0.25.1": "f2427b094e072d2db7944b1d2a988dd9f17627976a395b941f225aec2d0565da2ea110a845eafae960af08e3eea74eb327e5eb9dbe06dc1e14f4439596c3b47c",

  "@esbuild/netbsd-x64@npm:0.25.1": "c8347ecc18b175923a3cbdaef61b64815ffe0cf2cc285f4034337c2df83e78a118ebfdf2ac3a46a8d8a19ce6a0e0605d27d11570d1758ab90074c99047b82fc0",

  "@esbuild/openbsd-arm64@npm:0.25.1": "719812786b4f3ab4471a306c930ab1bf31e9d92f933ea2a34566f07d6269df5058e7d48408127daa197e6fdb21e30697303127d259b76b18936d534619a3eb15",

  "@esbuild/openbsd-x64@npm:0.25.1": "21590cbeda028e9b9f8131c54c36bab65a5d5bd5dd4e6bd9f80438045a655e9ac634bb3535a8650b694db267fe23bd2318a59cdec2fae1ba389ed1a00cc0bbe7",

  "@esbuild/sunos-x64@npm:0.25.1": "e20ce3891d8717fe2cb885d92d16e9409802316eaa91071be5c7d75164d23dbc5a502be3691039051843d94192e8cf43ade61014a8bce298cfc13a8d3ddd85b0",

  "@esbuild/win32-arm64@npm:0.25.1": "749a211eae6a47e5ceb71898df668d083bdec2ed762116fea7772824281f793aceb0487946e20ff604d7e102d1fc8538a73f15b476ca36e07f7ddfb601f6dfa1",

  "@esbuild/win32-ia32@npm:0.25.1": "bb45fd889d858678ec68114bfc398965ed8d44e46a9517fcd9f7b397101c2cf94d78938a2640f6f2a1fe65de4ae8830fd426cd21a28302bb92333913b3c16c85",

  "@esbuild/win32-x64@npm:0.25.1": "e33291b9834095e6460bd20bb15c49361758bf66d28ccffe0c06a1565211c91f668d9cfc0cbd5bd7a5def693fe7272dbe290b08d4eadba29e750c8a9c739f564",

  "@rollup/rollup-android-arm-eabi@npm:4.34.8": "1d21d3ba13ed2cff8b4955b9d7c5fb91fa954be9cdd8f4e5bedc4e1d95733af3249bb7f3f000b9c69e89128a9439bb35990fd5c737372bc9b7fdbea906ac63dd",

  "@rollup/rollup-android-arm-eabi@npm:4.40.0": "723053f558eaeeb0a1fbf3b3063b930d3b1267a6aba211719927b0467f48513a514a05391689298a64624e98daa005e4685ef668787ebc228fd0527a5f17b419",

  "@rollup/rollup-android-arm64@npm:4.34.8": "b3c44e5aaab2b429716d58b93353b0429a131a0b7e08ee39f25ceca1faf3cc453346c9cb91dd1cc278eb5621fb701da87608cc3ce323c24d5f3d191781694ec3",

  "@rollup/rollup-android-arm64@npm:4.40.0": "2562821c7032d2d95b891f47f02291d714d072fd91b3dbd07c528a7543f5e7d2458903cc38829feec311f1ebca6e34624262ae2e10aa32a0532b83c564db94cc",

  "@rollup/rollup-darwin-arm64@npm:4.34.8": "a117920a3f06b6fb3e57f3a240a38ea3184811f931105185942e1cb9865d609662e3849ee53bdf7265d4555b9c9d2b6723fb4c94a9b1e494b522253246767b72",

  "@rollup/rollup-darwin-arm64@npm:4.40.0": "cde6c2f4fe819131f65f5d19f8d1fd4889a4b8cc130cb30582fde72c79e388ef4644f57c7b03f453d4048043524ca067d5e2b4b505a5568840c73021fb74b572",

  "@rollup/rollup-darwin-x64@npm:4.34.8": "70862e22270122f61690fcf69f07a32f3cce9028c7c296cc6a37bd5ae2fe2e021cf86df877274acf07a927889faf3ffc8721871d749087ea86941853c66a1f27",

  "@rollup/rollup-darwin-x64@npm:4.40.0": "28c269104ff10f0ab87a30c93139662780b0b6b4877a95cede7d66e833d478d1eb2f5aa275f60decb8383b2c05161f315902ad8fa1a52fa76283a05ceb32bf6b",

  "@rollup/rollup-freebsd-arm64@npm:4.34.8": "42e5a9a8fb20585ee5fc1a94f758fdfe4d1dde03a4f6476686b1a8835167e2e210192fb8ffd733dd12baaec928a3fc753bf05609798df99bb4d8b2f6ea44f997",

  "@rollup/rollup-freebsd-arm64@npm:4.40.0": "27e99df8d1c5f0dfaead8fa6ce3025c5f959b4803e7683d95183761b1ecada4d877bd7f36465c424657ef650eac6199ddcf4911eda6367555633819454a5548d",

  "@rollup/rollup-freebsd-x64@npm:4.34.8": "984baffa0968907090146b0237697ee76b64eb18dbde512304e83d793030f2cec01bb08658ccb2e12ff6ecd88dccc4886acaaf8117345e564c9b7752c20a7d51",

  "@rollup/rollup-freebsd-x64@npm:4.40.0": "3422ce75f0fe774925763b1b63dded9aee56038d167af0b7f8ca0e468a8fae86d6a8aecd0b86a79718b8fc78c5ad987ba5b98be17b95fdcd48e4307749376e1b",

  "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.8": "3a7fe8a7c80608ee54bc2c5b40424b15b0a3da8ec8201e3303f56bedbf3a34f8446b9968da849705373c02c3bd35c56ca22117c3549c8968b2cd1ad54f2d82ed",

  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "b32cd2a73db75926722dfd42a6c5c6f2f1631f70a8d261317a0ce54e2c5dcee849c0a59cd85de0c0c7bbea9defb4f6649b1354871e6ac7f637cc22673d1486c1",

  "@rollup/rollup-linux-arm-musleabihf@npm:4.34.8": "27fbc7ec1a8ac9d44661d4024d704bc1af8c257bd454b3b56cbcf43afe60a617ac4dec50e6c5906a07945d2bed60c8d44b972aee9f53186b24b7df2b9c99e3f3",

  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "1c1d95fe81ee31d0d9cd75258865d35d2afccd8255b856c0da9a3c8afa012feb6b9557d1c234af8f4cc5dfd9d397564c650fe2e8769cb4407f626058c2e19d9c",

  "@rollup/rollup-linux-arm64-gnu@npm:4.34.8": "7ce7073fa830540fc67616b44b3155bacfe84463268ba948aa68719a197684da4ef60882ac1623d168597c3178f936262386de67425c60d645bf66eabf743351",

  "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "a8d071163d135e992023a374660a72cc94af4d77a711e7720d4e3fc544a7af037add4839ef8d061503e5320ee80defd35b43a68cebad0105d16cfd870387934c",

  "@rollup/rollup-linux-arm64-musl@npm:4.34.8": "1acb2a29e1a190c2df27c5e1a30424f22ca98dd5c4e12c2103e2810659c95b8e027b5b34dd0127e55b8c818bb28c49dfc9fe6586c508f85b98350ded6bb60717",

  "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "5582761d9426caccee50beb1fdb06ebb16fba540eabde06e21d18f59667f7c6c99ca0c2743d1b9cdb54a3d0b28445befad52c76412632bf0d79f280022acc630",

  "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.8": "50c416ca41ed0df3d54ccf11c7e5487c64f9e2fee97deb21741086c61a99007ee3dc011d34a6261a3d32cff3f46483bce930ae92e96d54abe607576095bc3906",

  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "6d65384886c655b4a9190a2c8e3cd99d7049d13864be0f9b06c32a23ba1242bd09be0e9cba9425898a48b41bba52eb98223e34e3943924370a68f7c7800f66b2",

  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.8": "b80e0473848b7d26ab845368e75fd834f71fe6b03f1753450a9c521fe99024a5caa40a85ce8bce1bce079971b31dc2266c718e05ff950143f98a3310944863f4",

  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "ebe38407efd0e45e92f939fe725e64695096c4389747b81f241e8a5d655526615e81512f3d61deae6aaf60669328a9bc93ac352351d6ccf8f1746caeb44bd7ab",

  "@rollup/rollup-linux-riscv64-gnu@npm:4.34.8": "1efd1e6142b2bbaa986f5c9edc1caee98f3fbd18160da02fd6c05b324b683eec0d8a9b0d4525b67de70873375988d1a4986dfdaf94ec847d9f30a82e5bac1bcd",

  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "32cc2e2d03eadca60f42ba14af9723584c1ef7ee29f8a79578aacd9ce17e287d1f841aa926278d4b7cbf0f6d054c4ec045873a24c67279ca37f20e999f24bd4e",

  "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "507c785bde98633f0139baccce0635047d43b19fb1d1fc770d4d88b11ef62b7885b0dac51a42c5f3e05bc0a56480928ae6304898884f0b5b0e56ad0cc98920f6",

  "@rollup/rollup-linux-s390x-gnu@npm:4.34.8": "d536c327ad26cf9ad586ad68e146f4cbd64b6bb1daf146f8124f6257f70f42e1d05e37afab902f97049cf8d0b7e60458480a8cf2e49379f1efa1568ac13f6107",

  "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "e464366194da4d1a72fc5ecce6c59027004b878fc36114f2d7c25812da5fe1885c29eb14d7bb318a4bb3242a99e772f7713da22f7f2d93f4b6e6a3e012f3d1f4",

  "@rollup/rollup-linux-x64-gnu@npm:4.34.8": "9c8e0c8ae968e8400641d782d7cb0b9b06cdec0c0a366c20259e49da0984ffea2a6af15de3e1fdfc92c1906a97044ea676195b945750848c8ddf34abf675eebf",

  "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "b472cd5acd066a60bd970865be1b229ca4c31a658a5c0277b6f441396243a20c535502a0ea7ea0dca6d12e2ccf53324b7e94c0d32a4f81f0b9866fd6cc3aff5a",

  "@rollup/rollup-linux-x64-musl@npm:4.34.8": "994b3a904c79fa72a3c331c983c27296ebb302b08f6c624ecbbf91cfa136f03cbdad4be904fd1a80b44d521e49399aff6e7902b594146a8c73cb6d1ad13dce08",

  "@rollup/rollup-linux-x64-musl@npm:4.40.0": "f553ef17a801559ca9418eb57dd9621884bde4d0d9f01292d9bb84de271efbf4ba737ddaf78a710edd6138528f3d8e2b3d6ba1a969c9e34624ad4266bfba39db",

  "@rollup/rollup-win32-arm64-msvc@npm:4.34.8": "5d09e6b59d1b08bb85922170aad0b8ada8bff7a5d63bed3b1ba49d4bbe32fd2557527d85c1bb97bf8d7f20778c2266b35c86bb4b0c035835099a3f6b222bc26c",

  "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "f14da0ce3062084d81fd42432ddf6c3cd869b4c48dc1acd803bc151bc3b508dbd290d60624ab5507d691b9e53bec81a508b61688304f171088549067ec86445d",

  "@rollup/rollup-win32-ia32-msvc@npm:4.34.8": "d4817c6e0744f2a53c24ea6855ed061fb03437fa0187f86363768d0edffc7e1bd281f9003e684779ac5662627daab1f2816084a257a13ade5bc0fd7e63912d94",

  "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "e6849d8cb8c276681f558b8212d58340488814e697486d9d125c1191479a4819387f681945f59c2b9fdd40020403cb72a099906960625da65d2114cf3df701e5",

  "@rollup/rollup-win32-x64-msvc@npm:4.34.8": "47679da18b7676a91d123a73298047fca019b4a9dfc4e026c43ba0dfea763ed972a9ce0cd46766317af45ef4d2a09cccc6284c4226a006b05d2e6fb712dad29c",

  "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "347f3af8176858afaec0f4f0d7951d4cda81f77c30e8260c678a11809bcdee0542762f27f6a4194562c2a8a6321a774ea523216ed8cf105e041eff7498443f28",

  "@swc/core-darwin-arm64@npm:1.6.13": "b55457da071a6368d270fe89d26ad00f14bf8400cf99517c62869b185afd128f9b0123524a0e7ce4397f21449b2b86ab82080c1cb351d1e461f8596bcfedf4b2",

  "@swc/core-darwin-x64@npm:1.6.13": "c14d0ca32797bfbecd8ad74684201c1d88b82ac05d7177ad4c7f6fab767148a25e163fba36513f1964805a3b7b58582f2a37cb3b1f1cc18e1c4a9ed4a49ce62a",

  "@swc/core-linux-arm-gnueabihf@npm:1.6.13": "b261eb4ced147281393676c7f9ce34b2134a3c2ebcd9a0a05886d116b6eac4c7f4edcfe5d9fcbcc811a8fe15817de1327cda95abe55cbe861e2fab876e4c162d",

  "@swc/core-linux-arm64-gnu@npm:1.6.13": "179f4cea2add5ffb4f36cf737ebc4703ab206036e6c9ca3a8df0d91df4c5834e498cba93b24f4eb10a9bec854bcd66f31ec54b79dd25679d00daa36ba352862d",

  "@swc/core-linux-arm64-musl@npm:1.6.13": "7a7c77769d06ccc02d2c20190c63adab443241f99b09139818698d4f7841d9a30545f88884027bf8037507a7a6b19fc28708f44989953b89908ff78693fc54b6",

  "@swc/core-linux-x64-gnu@npm:1.6.13": "14e1c47f987ab50e67297be4b6c6b2c9186c7947b64c2c14d6077a0f196a684a7d992a79c40a30abdee0d4a1aec53c0506afbf0f1974dfe7520a058b5217daed",

  "@swc/core-linux-x64-musl@npm:1.6.13": "00d5da501ce964666ba42d770c5d2a43532baaf3a9844c7cb76790ed475e3d80377528cced0b7f745da0c0fe2b20000b3a223cf792595f266405dadc66b25874",

  "@swc/core-win32-arm64-msvc@npm:1.6.13": "84453749f42a0f4b3f3a8938da3be7a98091331647432117fc7511cb32a68d331ff2cb8bb10faa72cb5093ccded1dfa578a7609addbcfe359ad4643660502b62",

  "@swc/core-win32-ia32-msvc@npm:1.6.13": "f674cb40b25b6a42214c666f512c7a0e94cbe99f3ea36d70ec83bd7888f6f2a97b7dff99c873a5707a8957704d40348f4493d3a75c3fd8eacc7a98027c51fcb6",

  "@swc/core-win32-x64-msvc@npm:1.6.13": "44ba6fba5171022243faa4f908041f8d0d1d75d9f9bba9fc8139440ea9e3f6992973c50aa38a27a8e34df48e7fa95dff3818eb9b73cbcd5d82ae981cc334a6f3"

}

pkgs/development/python-modules/locust/webui.nix

+17 −10
Original line number Diff line number Diff line 
{

  stdenv,

  fetchYarnDeps,

  yarnConfigHook,

  yarnBuildHook,

  yarn-berry_4,

  nodejs,

  version,

  src,

  lib,

}:



let

  yarn-berry = yarn-berry_4;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "locust-ui";

  inherit version src;



  yarnOfflineCache = fetchYarnDeps {

    yarnLock = "${finalAttrs.src}/yarn.lock";

    hash = "sha256-OTGTpAAxr8rmCi5oEWIWzwZqiP3Cx3vyc3r2kbcLyUg=";

  missingHashes = ./missing-hashes.json;

  yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {

    inherit (finalAttrs) src missingHashes;

    hash = "sha256-FbKaU3wezuvcn98FOcUZbmoot/iHtmeStp4n0dNwFYA=";

  };



  nativeBuildInputs = [

    yarnConfigHook

    yarnBuildHook

    yarn-berry

    yarn-berry.yarnBerryConfigHook

    nodejs

  ];



  buildPhase = ''

    runHook preBuild

    yarn build

    runHook postBuild

  '';



  dontNpmPrune = true;

  yarnBuildScript = "build";

  postInstall = ''

    mkdir -p $out/dist

    cp -r dist/** $out/dist