diff options
Diffstat (limited to 'pkgs/development')
82 files changed, 327 insertions, 1342 deletions
diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix index b201ca169d4..1ca1e3cd200 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/development/embedded/fpga/apio/default.nix @@ -10,13 +10,14 @@ , scons , setuptools , tinyprog +, flit-core , pytestCheckHook }: buildPythonApplication rec { pname = "apio"; version = "0.8.1"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "FPGAwars"; @@ -47,6 +48,10 @@ buildPythonApplication rec { 'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))' ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ click semantic-version diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 306c33a91fd..700276e77af 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -45,15 +45,6 @@ in { propagatedBuildInputs = [ ]; } ./egg-unpack-hook.sh) {}; - flitBuildHook = callPackage ({ makePythonHook, flit }: - makePythonHook { - name = "flit-build-hook"; - propagatedBuildInputs = [ flit ]; - substitutions = { - inherit pythonInterpreter; - }; - } ./flit-build-hook.sh) {}; - pipBuildHook = callPackage ({ makePythonHook, pip, wheel }: makePythonHook { name = "pip-build-hook.sh"; diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh deleted file mode 100644 index 45893aae00f..00000000000 --- a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -# Setup hook for flit -echo "Sourcing flit-build-hook" - -flitBuildPhase () { - echo "Executing flitBuildPhase" - runHook preBuild - @pythonInterpreter@ -m flit build --format wheel - runHook postBuild - echo "Finished executing flitBuildPhase" -} - -if [ -z "${dontUseFlitBuild-}" ] && [ -z "${buildPhase-}" ]; then - echo "Using flitBuildPhase" - buildPhase=flitBuildPhase -fi diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index e9c783116b6..fbacf6bb233 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -11,7 +11,6 @@ , namePrefix , update-python-libraries , setuptools -, flitBuildHook , pypaBuildHook , pypaInstallHook , pythonCatchConflictsHook @@ -90,7 +89,6 @@ # Several package formats are supported. # "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. # "wheel" : Install from a pre-compiled wheel. -# "flit" : Install a flit package. This builds a wheel. # "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel. # "egg": Install a package from an egg. # "other" : Provide your own buildPhase and installPhase. @@ -122,7 +120,7 @@ let else "setuptools"; - withDistOutput = lib.elem format' ["pyproject" "setuptools" "flit" "wheel"]; + withDistOutput = lib.elem format' ["pyproject" "setuptools" "wheel"]; name_ = name; @@ -222,8 +220,6 @@ let unzip ] ++ lib.optionals (format' == "setuptools") [ setuptoolsBuildHook - ] ++ lib.optionals (format' == "flit") [ - flitBuildHook ] ++ lib.optionals (format' == "pyproject") [( if isBootstrapPackage then pypaBuildHook.override { diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index e5f9c00b2fb..d42e4e85c10 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -98,12 +98,10 @@ , ... } @ attrs: -assert lib.assertMsg (format != "flit") "flit is not a supported Python 2 format"; - let inherit (python) stdenv; - withDistOutput = lib.elem format ["pyproject" "setuptools" "flit" "wheel"]; + withDistOutput = lib.elem format ["pyproject" "setuptools" "wheel"]; name_ = name; @@ -171,7 +169,7 @@ let nativeBuildInputs = [ python wrapPython - ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)? pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ pythonCatchConflictsHook diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index 8bece077f8c..b016aa4d4d6 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "2.2.0"; + version = "2.2.2"; # Dependencies buildInputs = [ curl netcdf hdf5 python3 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/28013/${pname}-${version}.tar.gz"; - sha256 = "sha256-Z5yNEFcGyv/LoJYOxd3EoTMsG0DFL4LDk3NWmZ2PrfI="; + url = "https://code.mpimet.mpg.de/attachments/download/28882/${pname}-${version}.tar.gz"; + sha256 = "sha256-QZx3MVJEAZr0GilsBQZvR0zMv5Tev6rp4hBtpRvHyTc="; }; configureFlags = [ diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6403ef4aaa9..9349a9d6a04 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -71,7 +71,9 @@ mapAliases { eslint_d = pkgs.eslint_d; # Added 2023-05-26 inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 + generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) gqlint; # added 2023-08-19 inherit (pkgs) graphqurl; # added 2023-08-19 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index e4aa11738cc..2ca45fd86ec 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -37,7 +37,6 @@ fkill-cli = "fkill"; fleek-cli = "fleek"; git-run = "gr"; - gitmoji-cli = "gitmoji"; graphql-cli = "graphql"; graphql-language-service-cli = "graphql-lsp"; grunt-cli = "grunt"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 925e8b050da..04de42dd00c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -120,12 +120,10 @@ , "fx" , "ganache" , "gatsby-cli" -, "generator-code" , "get-graphql-schema" , "git-run" , "git-standup" , "@gitbeaker/cli" -, "gitmoji-cli" , "gramma" , "grammarly-languageserver" , "graphql" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 72af9e92a6f..19190ea18b0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -78768,846 +78768,6 @@ in bypassCache = true; reconstructLock = true; }; - generator-code = nodeEnv.buildNodePackage { - name = "generator-code"; - packageName = "generator-code"; - version = "1.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.8.tgz"; - sha512 = "vaqIRIxCAkY9NBep8qacZqJjZKezSjEK6UilcwgsS4vCRkd9PqjxhH2NLWnFjrNGaxG0k0u4piyHtOwagd/mfQ=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.13" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.20" - (sources."@babel/highlight-7.22.20" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@gar/promisify-1.1.3" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."@isaacs/string-locale-compare-1.1.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-4.3.1" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."fs-minipass-2.1.0" - sources."glob-8.1.0" - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - (sources."ignore-walk-4.0.1" // { - dependencies = [ - sources."minimatch-3.1.2" - ]; - }) - sources."json-parse-even-better-errors-2.3.1" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-5.1.6" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - sources."node-gyp-8.4.1" - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - (sources."npm-packlist-3.0.0" // { - dependencies = [ - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@npmcli/move-file-2.0.1" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."pacote-12.0.3" - sources."proc-log-1.0.0" - sources."read-package-json-fast-2.0.3" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/fs-3.1.0" - sources."@npmcli/git-4.1.0" - sources."@npmcli/installed-package-contents-2.0.2" - (sources."@npmcli/map-workspaces-2.0.4" // { - dependencies = [ - sources."glob-8.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."minimatch-5.1.6" - sources."npm-normalize-package-bin-1.0.1" - sources."read-package-json-fast-2.0.3" - ]; - }) - (sources."@npmcli/metavuln-calculator-2.0.0" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."fs-minipass-2.1.0" - (sources."glob-8.1.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."ignore-walk-4.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - sources."node-gyp-8.4.1" - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."pacote-12.0.3" - sources."read-package-json-fast-2.0.3" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/move-file-1.1.2" - sources."@npmcli/name-from-folder-1.0.1" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/package-json-1.0.1" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - sources."@npmcli/promise-spawn-6.0.2" - sources."@npmcli/run-script-6.0.2" - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.6.0" - sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.11.0" - sources."@octokit/plugin-paginate-rest-2.21.3" - sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.16.2" - sources."@octokit/request-5.6.3" - sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.41.0" - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."@types/expect-1.20.4" - sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.9" - sources."@types/normalize-package-data-2.4.1" - sources."@types/vinyl-2.0.7" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - (sources."are-we-there-yet-3.0.1" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."argparse-1.0.10" - sources."array-differ-3.0.0" - sources."array-union-2.1.0" - sources."arrify-2.0.1" - sources."asap-2.0.6" - sources."async-3.2.4" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."before-after-hook-2.2.3" - (sources."bin-links-3.0.3" // { - dependencies = [ - sources."npm-normalize-package-bin-2.0.0" - ]; - }) - sources."binaryextensions-4.18.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."glob-10.3.4" - sources."minimatch-9.0.3" - sources."minipass-7.0.3" - ]; - }) - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-1.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-table-0.3.11" - sources."cli-width-3.0.0" - sources."clone-2.1.2" - sources."clone-buffer-1.0.0" - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.3" - sources."cmd-shim-5.0.0" - sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."colors-1.0.3" - sources."commander-7.1.0" - sources."common-ancestor-path-1.0.1" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - (sources."cross-spawn-7.0.3" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."dargs-7.0.0" - sources."dateformat-4.6.3" - sources."debug-4.3.4" - sources."debuglog-1.0.1" - sources."deep-extend-0.6.0" - (sources."defaults-1.0.4" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."delegates-1.0.0" - sources."deprecation-2.3.1" - sources."dezalgo-1.0.4" - sources."diff-5.1.0" - sources."dir-glob-3.0.1" - sources."eastasianwidth-0.2.0" - sources."ejs-3.1.9" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."error-10.4.0" - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."event-target-shim-5.0.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."execa-5.1.1" - sources."exponential-backoff-3.1.1" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."fast-glob-3.3.1" - sources."fast-plist-0.1.3" - sources."fastq-1.15.0" - sources."figures-3.2.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."fill-range-7.0.1" - sources."find-up-4.1.0" - sources."find-yarn-workspace-root2-1.2.16" - sources."first-chunk-stream-2.0.0" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gauge-4.0.4" - sources."get-stdin-4.0.1" - sources."get-stream-6.0.1" - sources."github-username-6.0.0" - (sources."glob-7.2.3" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."grouped-queue-2.0.0" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."has-flag-4.0.0" - sources."has-unicode-2.0.1" - sources."hosted-git-info-6.1.1" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."human-signals-2.1.0" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - (sources."inquirer-8.2.6" // { - dependencies = [ - sources."wrap-ansi-6.2.0" - ]; - }) - sources."interpret-1.4.0" - sources."ip-2.0.0" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-lambda-1.0.1" - sources."is-number-7.0.0" - sources."is-plain-obj-2.1.0" - sources."is-plain-object-5.0.0" - sources."is-scoped-2.1.0" - sources."is-stream-2.0.1" - sources."is-unicode-supported-0.1.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" - sources."isbinaryfile-5.0.0" - sources."isexe-2.0.0" - sources."jackspeak-2.3.3" - (sources."jake-10.8.7" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-stringify-nice-1.1.4" - sources."jsonparse-1.3.1" - sources."just-diff-5.2.0" - sources."just-diff-apply-5.5.0" - sources."lines-and-columns-1.2.4" - (sources."load-yaml-file-0.2.0" // { - dependencies = [ - sources."pify-4.0.1" - sources."strip-bom-3.0.0" - ]; - }) - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."mem-fs-2.3.0" - sources."mem-fs-editor-9.7.0" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-fn-2.1.0" - sources."minimatch-7.4.6" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."mkdirp-infer-owner-2.0.0" - sources."ms-2.1.2" - (sources."multimatch-5.0.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."mute-stream-0.0.8" - sources."negotiator-0.6.3" - sources."node-fetch-2.7.0" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."nopt-6.0.0" - sources."normalize-package-data-5.0.0" - sources."normalize-path-3.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" - sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-10.1.0" - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - sources."npm-registry-fetch-14.0.5" - sources."npm-run-path-4.0.1" - sources."npmlog-6.0.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-queue-6.6.2" - sources."p-timeout-3.2.0" - sources."p-transform-1.3.0" - sources."p-try-2.2.0" - sources."pacote-15.2.0" - sources."pad-component-0.0.1" - (sources."parse-conflict-json-2.0.2" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - (sources."parse-json-5.2.0" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pkg-dir-4.2.0" - (sources."preferred-pm-3.1.2" // { - dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - ]; - }) - sources."pretty-bytes-5.6.0" - sources."proc-log-3.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."promise-all-reject-late-1.0.1" - sources."promise-call-limit-1.0.2" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."queue-microtask-1.2.3" - sources."read-cmd-shim-3.0.1" - (sources."read-package-json-6.0.4" // { - dependencies = [ - sources."glob-10.3.4" - sources."minimatch-9.0.3" - ]; - }) - sources."read-package-json-fast-3.0.2" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.2" - sources."type-fest-0.6.0" - ]; - }) - sources."read-pkg-up-7.0.1" - sources."readable-stream-2.3.8" - sources."readdir-scoped-modules-1.1.0" - sources."rechoir-0.6.2" - sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.1" - sources."request-light-0.7.0" - sources."resolve-1.22.6" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sanitize-filename-1.6.3" - sources."scoped-regex-2.1.0" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shelljs-0.8.5" - sources."signal-exit-3.0.7" - sources."sigstore-1.9.0" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."sort-keys-4.2.0" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - sources."sprintf-js-1.0.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-bom-2.0.0" - sources."strip-bom-buf-1.0.0" - sources."strip-bom-stream-2.0.0" - sources."strip-final-newline-2.0.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."taketalk-1.0.0" - (sources."tar-6.2.0" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."text-table-0.2.0" - sources."textextensions-5.16.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."treeverse-1.0.4" - sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.6.2" - sources."tuf-js-1.1.7" - sources."type-fest-0.8.1" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."universal-user-agent-6.0.0" - sources."untildify-4.0.0" - sources."utf8-byte-length-1.0.4" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."vinyl-2.2.1" - sources."vinyl-file-3.0.0" - sources."walk-up-path-1.0.0" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-3.0.1" - sources."which-pm-2.0.0" - sources."wide-align-1.1.5" - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-4.0.2" - sources."yallist-4.0.0" - (sources."yeoman-environment-3.19.3" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-6.0.3" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."escape-string-regexp-4.0.0" - sources."find-up-5.0.0" - sources."fs-minipass-2.1.0" - sources."gauge-3.0.2" - (sources."glob-8.1.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."ignore-walk-4.0.1" - sources."isbinaryfile-4.0.10" - sources."json-parse-even-better-errors-2.3.1" - sources."locate-path-6.0.0" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - (sources."node-gyp-8.4.1" // { - dependencies = [ - sources."are-we-there-yet-3.0.1" - sources."gauge-4.0.4" - sources."npmlog-6.0.2" - sources."readable-stream-3.6.2" - ]; - }) - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."npmlog-5.0.1" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."pacote-12.0.3" - sources."read-package-json-fast-2.0.3" - sources."readable-stream-4.4.2" - sources."safe-buffer-5.2.1" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."string_decoder-1.3.0" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."yeoman-generator-5.9.0" - sources."yocto-queue-0.1.0" - (sources."yosay-2.0.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Yeoman generator for Visual Studio Code extensions."; - homepage = "http://code.visualstudio.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; get-graphql-schema = nodeEnv.buildNodePackage { name = "get-graphql-schema"; packageName = "get-graphql-schema"; @@ -79732,329 +78892,6 @@ in bypassCache = true; reconstructLock = true; }; - gitmoji-cli = nodeEnv.buildNodePackage { - name = "gitmoji-cli"; - packageName = "gitmoji-cli"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-8.5.0.tgz"; - sha512 = "ZSplvgm8UiAjsWBOxYAfbLj8JTMFj5TjB6yM7RFlqEfsFMgP0fhIPpgnHU5aMiyVyvX6jBRVf1hzjrmP3/cgiA=="; - }; - dependencies = [ - sources."@ljharb/through-2.3.9" - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/http-cache-semantics-4.0.2" - sources."agent-base-7.1.0" - sources."ajv-8.12.0" - sources."ajv-formats-2.1.1" - sources."ansi-align-3.0.1" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ast-types-0.13.4" - sources."atomically-2.0.2" - sources."base64-js-1.5.1" - sources."basic-ftp-5.0.3" - sources."bl-4.1.0" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - }) - sources."buffer-5.7.1" - sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.13" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."chardet-0.7.0" - sources."ci-info-3.8.0" - sources."cli-boxes-3.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-width-4.1.0" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."conf-11.0.2" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."configstore-6.0.0" // { - dependencies = [ - sources."dot-prop-6.0.1" - ]; - }) - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."data-uri-to-buffer-4.0.1" - sources."debounce-fn-5.1.2" - sources."debug-4.3.4" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."degenerator-5.0.1" - sources."dot-prop-7.2.0" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."env-paths-3.0.0" - sources."escape-goat-4.0.0" - sources."escape-string-regexp-5.0.0" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."execa-8.0.1" - sources."external-editor-3.1.0" - sources."fast-deep-equal-3.1.3" - sources."fetch-blob-3.2.0" - sources."figures-5.0.0" - sources."form-data-encoder-2.1.4" - sources."formdata-polyfill-4.0.10" - sources."fs-extra-8.1.0" - sources."fuse.js-6.6.2" - sources."get-stream-8.0.1" - (sources."get-uri-6.0.1" // { - dependencies = [ - sources."data-uri-to-buffer-5.0.1" - ]; - }) - sources."global-dirs-3.0.1" - (sources."got-12.6.1" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."has-yarn-3.0.0" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.0" - sources."http2-wrapper-2.2.0" - sources."https-proxy-agent-7.0.2" - sources."human-signals-5.0.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."inherits-2.0.4" - sources."ini-2.0.0" - (sources."inquirer-9.2.11" // { - dependencies = [ - sources."is-unicode-supported-0.1.0" - (sources."ora-5.4.1" // { - dependencies = [ - sources."chalk-4.1.2" - ]; - }) - ]; - }) - (sources."inquirer-autocomplete-prompt-3.0.0" // { - dependencies = [ - sources."ansi-escapes-6.2.0" - sources."run-async-2.4.1" - sources."type-fest-3.13.1" - ]; - }) - sources."ip-1.1.8" - sources."is-ci-3.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.4.0" - sources."is-interactive-1.0.0" - sources."is-npm-6.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-stream-3.0.0" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-1.3.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."json-buffer-3.0.1" - sources."json-schema-traverse-1.0.0" - sources."json-schema-typed-8.0.1" - sources."jsonfile-4.0.0" - sources."keyv-4.5.3" - sources."latest-version-7.0.0" - sources."lodash-4.17.21" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."is-unicode-supported-0.1.0" - ]; - }) - sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" - sources."meow-12.1.1" - sources."merge-stream-2.0.0" - sources."mimic-fn-4.0.0" - sources."mimic-response-4.0.0" - sources."minimist-1.2.8" - sources."ms-2.1.2" - sources."mute-stream-1.0.0" - sources."netmask-2.0.2" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.2" - sources."normalize-url-8.0.0" - (sources."npm-run-path-5.1.0" // { - dependencies = [ - sources."path-key-4.0.0" - ]; - }) - sources."onetime-6.0.0" - (sources."ora-7.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."cli-cursor-4.0.0" - sources."emoji-regex-10.2.1" - sources."is-interactive-2.0.0" - sources."log-symbols-5.1.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-4.0.0" - sources."signal-exit-3.0.7" - sources."string-width-6.1.0" - sources."strip-ansi-7.1.0" - ]; - }) - sources."os-tmpdir-1.0.2" - sources."p-cancelable-3.0.0" - sources."pac-proxy-agent-7.0.1" - sources."pac-resolver-7.0.0" - sources."package-json-8.1.1" - sources."path-exists-5.0.0" - sources."path-key-3.1.1" - sources."picocolors-1.0.0" - sources."proto-list-1.2.4" - (sources."proxy-agent-6.3.1" // { - dependencies = [ - sources."lru-cache-7.18.3" - ]; - }) - sources."proxy-from-env-1.1.0" - sources."punycode-2.3.0" - sources."pupa-3.1.0" - sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."readable-stream-3.6.2" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - (sources."restore-cursor-3.1.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."signal-exit-3.0.7" - ]; - }) - sources."run-async-3.0.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - sources."semver-diff-4.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-8.0.2" - sources."source-map-0.6.1" - (sources."stdin-discarder-0.1.0" // { - dependencies = [ - sources."bl-5.1.0" - sources."buffer-6.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-3.0.0" - sources."strip-json-comments-2.0.1" - sources."stubborn-fs-1.2.5" - sources."supports-color-7.2.0" - sources."tmp-0.0.33" - sources."tslib-2.6.2" - sources."type-fest-2.19.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-3.0.0" - sources."universalify-0.1.2" - sources."update-notifier-6.0.2" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."validator-13.11.0" - sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.2.1" - sources."when-exit-2.1.1" - sources."which-2.0.2" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-6.2.0" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A gitmoji client for using emojis on commit messages."; - homepage = "https://github.com/carloscuesta/gitmoji-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gramma = nodeEnv.buildNodePackage { name = "gramma"; packageName = "gramma"; diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix index cd33ae2f7f5..b71712aba99 100644 --- a/pkgs/development/ocaml-modules/junit/default.nix +++ b/pkgs/development/ocaml-modules/junit/default.nix @@ -14,12 +14,11 @@ buildDunePackage (rec { tyxml ]; - duneVersion = "3"; doCheck = true; meta = with lib; { description = "ocaml-junit is an OCaml package for the creation of JUnit XML reports, proving a typed API to produce valid reports acceptable to Jenkins, comes with packages supporting OUnit and Alcotest."; - license = licenses.gpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; homepage = "https://github.com/Khady/ocaml-junit"; }; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 9c1914b0f32..1f23194582a 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -7,6 +7,9 @@ , topkg }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "ptime is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation (finalAttrs: { version = "1.1.0"; pname = "ocaml${ocaml.version}-ptime"; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 777f7778249..7adfc337888 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -15,13 +15,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-nVkue3qB6OwXKcyaYU1WmXG7pamKQtk8cbztVVkNejo="; + hash = "sha256-gI1Hd/i3S+lNcXaGG/hBR/cdn3S1fQ6xJ0xtRXo48rI="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index ae0cbf99841..66f81b12329 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchPypi +, flit , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; version = "1.2.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c"; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ aiohttp ] ++ lib.optionals (pythonOlder "3.7") [ diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index b09accb38b7..4a66a8f35d0 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 20271236723..f0e63e0ae37 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, fetchpatch +, flit-core , pygments , pytestCheckHook , uvloop @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "aiorun"; version = "2023.7.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +23,18 @@ buildPythonPackage rec { hash = "sha256-3AGsT8IUNi5SZHBsBfd7akj8eQ+xb0mrR7ydIr3T8gs="; }; + patches = [ + # Raise flit-core version constrains + (fetchpatch { # https://github.com/cjrh/aiorun/pull/85 + url = "https://github.com/cjrh/aiorun/commit/a0c027ea331167712738e35ca70fefcd794e16d5.patch"; + hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix index 24e32526682..2282a06e5c6 100644 --- a/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/pkgs/development/python-modules/argon2-cffi/default.nix @@ -6,6 +6,7 @@ , wheel , buildPythonPackage , fetchPypi +, flit-core , isPy3k , lib , stdenv @@ -15,13 +16,17 @@ buildPythonPackage rec { pname = "argon2-cffi"; version = "21.3.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 9257e12f721..9049a228518 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitLab +, flit-core , python }: buildPythonPackage rec { pname = "asyncinotify"; version = "4.0.2"; - format = "flit"; + format = "pyproject"; src = fetchFromGitLab { owner = "Taywee"; @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; }; + nativeBuildInputs = [ + flit-core + ]; + checkPhase = '' ${python.pythonForBuild.interpreter} ${src}/test.py ''; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 4d27c6da882..8cd6af449f9 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , typing-extensions +, flit-core , pytestCheckHook , pythonOlder }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; version = "3.10.8"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-7HQFyIR+NWRzbFkzkZiuEQotZfCXpCzrWfWIFg1lWv4="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index b7ccfedfbb8..582e7c5dccf 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , ipykernel , isPy27 , python @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bash_kernel"; version = "0.9.0"; - format = "flit"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { @@ -33,6 +34,8 @@ buildPythonPackage rec { --replace "\"bash\"" "'${bash}/bin/bash'" ''; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ ipykernel pexpect ]; # no tests diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index e5420f26c1a..90cf6a4be7f 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , psutil , pytestCheckHook , pyyaml @@ -11,13 +12,17 @@ buildPythonPackage rec { pname = "circus"; version = "0.18.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ psutil pyzmq diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 1d2f56a85f1..a3a979f68f8 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "confuse"; version = "1.7.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/django-types/default.nix b/pkgs/development/python-modules/django-types/default.nix index 71542f2f9b4..5c16312538a 100644 --- a/pkgs/development/python-modules/django-types/default.nix +++ b/pkgs/development/python-modules/django-types/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "django-types"; - version = "0.17.0"; + version = "0.18.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-wcQqt4h2xXxyg0LVqwYHJas3H8jcg7uFuuC+BoRqrXA="; + hash = "sha256-uOIzTIEIZNer8RzTzbHaOyAVtn5/EnAAfjN3f/G9hlQ="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix index 07def603cb7..cd55d1c4c2b 100644 --- a/pkgs/development/python-modules/ecs-logging/default.nix +++ b/pkgs/development/python-modules/ecs-logging/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ecs-logging"; version = "2.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index 0d7218ea3ea..b4b0b9b2106 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, flit-core , pytestCheckHook , pythonOlder , borgbackup @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "emborg"; version = "1.37"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-bHYs+vlNku/T5Hb9u77Xml9/FNj5vgqPeXSzcilsS+I="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ appdirs arrow diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index 387ee2bea4e..098d13e87c9 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, bleach, markdown }: +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core, bleach, markdown }: buildPythonPackage rec { pname = "formbox"; version = "0.4.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -13,6 +13,7 @@ buildPythonPackage rec { hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk="; }; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ bleach markdown ]; doCheck = false; # there's no test pythonImportsCheck = [ "formbox" ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 37a9d75beee..e109f4fa048 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit , uritemplate , pyjwt , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "gidgethub"; version = "5.3.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,6 +25,10 @@ buildPythonPackage rec { hash = "sha256-ns59N/vOuBm4BWDn7Vj5NuSKZdN+xfVtt5FFFWtCaiU="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ uritemplate pyjwt diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index fd01e1b1d81..6ff8cc13be0 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , google-auth , google-auth-oauthlib , pytest-vcr @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix index 80068293145..6e6d0e21ef0 100644 --- a/pkgs/development/python-modules/ipwhl/default.nix +++ b/pkgs/development/python-modules/ipwhl/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, pythonOlder, fetchFromSourcehut -, kubo, packaging, tomli }: +, kubo, packaging, tomli, flit-core }: buildPythonPackage rec { pname = "ipwhl"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -14,6 +14,7 @@ buildPythonPackage rec { hash = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; }; + nativeBuildInputs = [ flit-core ]; buildInputs = [ kubo ]; propagatedBuildInputs = [ packaging tomli ]; doCheck = false; # there's no test diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 81b89e77a8b..631a853833d 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "jupyter-book"; version = "0.15.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index cbeb05bde98..29a8bb02458 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "jupyter-cache"; version = "0.6.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/loca/default.nix b/pkgs/development/python-modules/loca/default.nix index 8ad0a4adbe7..28a9020d744 100644 --- a/pkgs/development/python-modules/loca/default.nix +++ b/pkgs/development/python-modules/loca/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut }: +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core }: buildPythonPackage rec { pname = "loca"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromSourcehut { @@ -13,6 +13,10 @@ buildPythonPackage rec { sha256 = "1l6jimw3wd81nz1jrzsfw1zzsdm0jm998xlddcqaq0h38sx69w8g"; }; + nativeBuildInputs = [ + flit-core + ]; + doCheck = false; # all checks are static analyses pythonImportsCheck = [ "loca" ]; diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index 19b5d10ca0e..b16fd1a572d 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -2,18 +2,23 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, hatchling }: buildPythonPackage rec { pname = "looseversion"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit version pname; sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; + nativeBuildInputs = [ + hatchling + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index 1d285d89c70..a7fd0f94037 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonPackage rec { pname = "mdformat-admon"; version = "1.0.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,6 +35,10 @@ in python.pkgs.buildPythonPackage rec { hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU="; }; + nativeBuildInputs = with python.pkgs; [ + flit-core + ]; + buildInputs = with python.pkgs; [ mdformat ]; diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index cee0e1bd5e5..4d7b56f0c2f 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , markdown-it-py , mdformat @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat-footnote"; version = "0.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdit-py-plugins diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix index 67e0634fa1d..b073bb83a59 100644 --- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , markdown-it-py , mdformat @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "mdformat-frontmatter"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-PhT5whtvvcYSs5gHQEsIvV1evhx7jR+3DWFMHrF0uMw="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdit-py-plugins diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 73404542652..e8efd7bac91 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdformat-gfm , mdit-py-plugins @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; version = "1.0.4"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdformat-gfm diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix index b4d293f6368..c5bbeeb46de 100644 --- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix +++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdit-py-plugins , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-simple-breaks"; version = "0.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat ]; diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix index 747029eab27..018371ada82 100644 --- a/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/pkgs/development/python-modules/mdformat-tables/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdit-py-plugins , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-tables"; version = "0.4.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-Q61GmaRxjxJh9GjyR8QCZOH0njFUtAWihZ9lFQJ2nQQ="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat ]; diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index a3c2ad7794f..00a657800da 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mediafile"; version = "0.10.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 28f754e98ed..c37aa8f867e 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit-core , ipython , matplotlib , numpy @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "mediapy"; version = "1.1.8"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,9 +21,10 @@ buildPythonPackage rec { hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; - format = "flit"; pythonImportsCheck = [ "mediapy" ]; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index f5243236189..86a1b5d3d32 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "more-itertools"; version = "9.1.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-yrqjQa0DieqDwXqUVmpTrkydBzSYYeyxTcbQNFz5rF0="; }; - nativeBuildInouts = [ + nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 6ede481fba8..33c06fc2461 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "myst-nb"; version = "0.17.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 807060528ee..185fffba413 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , docopt , fetchFromGitHub -, flitBuildHook +, flit-core , hypothesis , inform , nestedtext @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index 340af281269..35d6fa16e1d 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }: +{ lib, buildPythonPackage, fetchPypi, flit-core, fire, tqdm, intelhex, libusb1 }: buildPythonPackage rec { pname = "nkdfu"; version = "0.2"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ fire tqdm diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index 38370a1c805..4306579bc51 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , pytestCheckHook , coveralls , numpy @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "parametrize-from-file"; version = "0.17.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit version; @@ -40,6 +41,10 @@ buildPythonPackage rec { --replace "more_itertools~=8.10" "more_itertools" ''; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ numpy pytestCheckHook diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index c9753a47d81..0faa3c324b3 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/pkgs/development/python-modules/pep440/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pep440"; version = "0.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 84f3798df84..62fb96fb31a 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -13,11 +13,11 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.2"; + version = "2.2.4"; src = fetchPypi { inherit pname version; - hash = "sha256-OR/kE3VO/U4O8AFUtEJx1jxM3Uvt8IjSMRGlcl2GMhA="; + hash = "sha256-LBzB1mSLK+ZulE2y/6WRZqN7kWTRE1rVJdnNix4pgWg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index d70cfd1c434..ddb610b53bc 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -1,13 +1,15 @@ { buildPythonPackage , fetchPypi +, fetchpatch , lib , nix-update-script , pythonOlder +, flit-core }: buildPythonPackage rec { pname = "pkgutil-resolve-name"; version = "1.3.10"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,6 +19,18 @@ buildPythonPackage rec { hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; + patches = [ + # Raise flit-core version constrains + (fetchpatch { # https://github.com/graingert/pkgutil-resolve-name/pull/5 + url = "https://github.com/graingert/pkgutil-resolve-name/commit/042834290c735fa836bb308ce9e93c9f64d67cbe.patch"; + hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 2a6ad34d706..0af07db4ec1 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,10 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, flit-core }: buildPythonPackage rec { pname = "pytest-celery"; version = "0.1.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "celery"; @@ -19,6 +19,10 @@ buildPythonPackage rec { --replace '"celery >= 4.4.0"' "" ''; + nativeBuildInputs = [ + flit-core + ]; + # This package has nothing to test or import. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index dbbf42c9b6a..1f11f31e213 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytest , pytestCheckHook }: @@ -8,14 +9,18 @@ buildPythonPackage rec { pname = "pytest-check"; version = "2.1.4"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; }; - buildInputs = [ + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index 29cf253fad2..eea7a6ead0e 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, flit-core , py-cid , pytestCheckHook , pytest-cov @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-cid"; version = "1.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { @@ -25,6 +26,10 @@ buildPythonPackage rec { --replace "pytest >= 5.0, < 7.0" "pytest >= 5.0" ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ py-cid ]; diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix index 89b035e74d8..be52de50f41 100644 --- a/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iabj6WuS6+65O4ztagT1/H+U8/SKySQ9bQiOfvln1AQ="; + hash = "sha256-4946iE+VYaPndJtQLQE7Q7VSs4aXxrg3wL4p84oT5to="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index bf629cc356a..80dea1dbeaa 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix index 2b3860c93f9..2da96d21c9e 100644 --- a/pkgs/development/python-modules/pytest-raisin/default.nix +++ b/pkgs/development/python-modules/pytest-raisin/default.nix @@ -1,14 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, flit-core +, flit , pytest }: buildPythonPackage rec { pname = "pytest-raisin"; version = "0.4"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "wimglenn"; @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flit-core + flit ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index 51385c46434..27057d92ea1 100644 --- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-lsp-jsonrpc"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XTvnDTaP5oweGSq1VItq+SEv7S/LrQq4YP1XQc3bxbk="; + hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/python_docs_theme/default.nix b/pkgs/development/python-modules/python_docs_theme/default.nix index 1e3776b906a..90cf78e4d69 100644 --- a/pkgs/development/python-modules/python_docs_theme/default.nix +++ b/pkgs/development/python-modules/python_docs_theme/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, sphinx }: +{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }: buildPythonPackage rec { pname = "python_docs_theme"; version = "2023.7"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "python"; @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "sha256-43/TlgYm7Q4ZtY25MiLU9fd1atDmiDUeUK6AYfDfmag="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ sphinx ]; pythonImportsCheck = [ "python_docs_theme" ]; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 18141543c98..367416c2960 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , buildPythonPackage , unittestCheckHook +, flit-core , daqp , ecos , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "qpsolvers"; version = "3.4.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + flit-core quadprog unittestCheckHook ]; diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix index 68eba2e9462..92e1f94c1ad 100644 --- a/pkgs/development/python-modules/quantiphy-eval/default.nix +++ b/pkgs/development/python-modules/quantiphy-eval/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , inform , pythonOlder , sly @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "quantiphy-eval"; version = "0.5"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ inform sly diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix index b05a0428f97..57ac30017ce 100644 --- a/pkgs/development/python-modules/quantiphy/default.nix +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , pytestCheckHook , pythonOlder , inform @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix index 558dcdc076a..ca003ed9069 100644 --- a/pkgs/development/python-modules/rkm-codes/default.nix +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { format = "pyproject"; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/rsskey/default.nix b/pkgs/development/python-modules/rsskey/default.nix index 095ce2b5c8c..61cba286d1b 100644 --- a/pkgs/development/python-modules/rsskey/default.nix +++ b/pkgs/development/python-modules/rsskey/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , feedparser , httpx , loca @@ -11,13 +12,17 @@ buildPythonPackage rec { pname = "rsskey"; version = "0.2.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-QedLuwd0ES2LWhZ72Cjh3+ZZ7HbRyNsyLN9lNFbY5dQ="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ feedparser httpx diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index b0166c303d7..fef12eb963a 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, flit , click , cryptography , ecdsa @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "solo-python"; version = "0.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ click cryptography diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 4e585353687..ad109b1d30f 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-design"; version = "0.5.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index cc0163ba3d6..0aff8f37caa 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; version = "0.3.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index f11db7fc973..d6237387bf8 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "sphinx-hoverxref"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 4803e8d4c1a..0f44efae979 100644 --- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , sphinx }: buildPythonPackage rec { pname = "sphinx-inline-tabs"; version = "2023.04.21"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index ca7e574c82f..d20446e91bb 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; version = "0.5.3"; - format = "flit"; + format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index c6255bbc538..edc8e2ce6b0 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; version = "0.8.3"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index 6d05a38d63a..ecb2cbf55e7 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index bfe40429127..54d7fa12829 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, flit +, flit-core , pytestCheckHook , numpy , scipy @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "3.1.0"; disabled = pythonOlder "3.6"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "joblib"; @@ -22,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ pytestCheckHook numpy diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix index b4f7ed0ef58..5e14812fe7b 100644 --- a/pkgs/development/python-modules/tidyexc/default.nix +++ b/pkgs/development/python-modules/tidyexc/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit }: buildPythonPackage rec { pname = "tidyexc"; version = "0.10.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6"; }; + nativeBuildInputs = [ + flit + ]; + pythonImportsCheck = [ "tidyexc" ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 4c21305ac09..35c8578cab4 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinycss2"; version = "1.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index 1fe1d303856..b003f134004 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, click, tomli }: +{ lib, buildPythonPackage, fetchPypi, flit, click, tomli }: buildPythonPackage rec { pname = "turnt"; version = "1.11.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ click tomli diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index bcf6f5afa78..4602a30fde9 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1bFSpasqo+UUmhHPezulxdSTF23KOPZsqJadrdWo9kU="; + hash = "sha256-ryBymzmNLzuDklHXReT0DyPLCb1reX4Kb/bu1GynBCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zeversolarlocal/default.nix b/pkgs/development/python-modules/zeversolarlocal/default.nix index 04063837b42..b1e515d7632 100644 --- a/pkgs/development/python-modules/zeversolarlocal/default.nix +++ b/pkgs/development/python-modules/zeversolarlocal/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , flit-core +, dos2unix , httpx , pytest-asyncio , pytest-mock @@ -12,7 +14,7 @@ buildPythonPackage rec { pname = "zeversolarlocal"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,6 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core + dos2unix ]; propagatedBuildInputs = [ @@ -35,6 +38,20 @@ buildPythonPackage rec { pytestCheckHook ]; + # the patch below won't apply unless we fix the line endings + prePatch = '' + dos2unix pyproject.toml + ''; + + patches = [ + # Raise the flit-core limit + # https://github.com/sander76/zeversolarlocal/pull/4 + (fetchpatch { + url = "https://github.com/sander76/zeversolarlocal/commit/bff072ea046de07eced77bc79eb8e90dfef1f53f.patch"; + hash = "sha256-tzFCwPzhAfwVfN5mLY/DMwRv7zGzx3ScBe+kKzkYcvo="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov zeversolarlocal --cov-report xml:cov.xml --cov-report term-missing -vv" "" diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index fca02e80ee5..545236b561c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -4,6 +4,7 @@ , bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils +, diffutils, gnupatch # updater , python3, writeScript # Apple dependencies @@ -110,10 +111,12 @@ let [ bash coreutils + diffutils file findutils gawk gnugrep + gnupatch gnused gnutar gzip diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index b259b683dde..ece8f93b57a 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvmPackages }: +{ lib, stdenv, llvmPackages, enableLibcxx ? false }: +# enableLibcxx will use the c++ headers from clang instead of gcc. +# This shouldn't have any effect on platforms that use clang as the default compiler already. let unwrapped = llvmPackages.clang-unwrapped; @@ -9,7 +11,7 @@ in stdenv.mkDerivation { pname = "clang-tools"; version = lib.getVersion unwrapped; dontUnpack = true; - clang = llvmPackages.clang; + clang = if enableLibcxx then llvmPackages.libcxxClang else llvmPackages.clang; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix index cd2a9788f40..68093f39e4f 100644 --- a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "gitea-actions-runner"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "act_runner"; rev = "v${version}"; - hash = "sha256-HWJrgZJfI5fOeZvQkmpd6wciJWh1JOmZMlyGHSbgHpc="; + hash = "sha256-GE9yqp5zWJ4lL0L/w3oSvU72AiHBNb+yh2qBPKPe9X0="; }; - vendorHash = "sha256-Z61kTbKHSUpt2F6jVUUK4KwMJ0ILT1FI4/62AkNQuZI="; + vendorHash = "sha256-NoaLq5pCwTuPd9ne5LYcvJsgUXAqcfkcW3Ck2K350JE="; ldflags = [ "-s" diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 225a2981a60..c9d2cc352e1 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.17"; + version = "0.7.19"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-JkZVuOlN9lDTdJ2076+STLU+UcoAAmWdqsBDGMtUJyw="; + hash = "sha256-Qs2Ik559KOhkwTSaEoYLqy4m9y/mRp7XThArKOkH3uI="; }; - vendorHash = "sha256-R3UxfshCAca73xRnjen5Dg8/gbTrTpZsz9HB18/MxEQ="; + vendorHash = "sha256-h3/FmhcXwRvDoOwJ643ze3GrV13tIhnnIMynQgf5emg="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json index 10c7b9e4ca4..201aae3c920 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json @@ -4,7 +4,6 @@ "flit", "flit-core", "pbr", - "flitBuildHook", "cython", "hatchling", "hatch-vcs", diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index 176881caeed..04174d1c435 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -316,7 +316,7 @@ "setuptools" ], "aiohttp-remotes": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiohttp-retry": [ @@ -348,7 +348,7 @@ "setuptools" ], "aiojobs": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiokafka": [ @@ -428,7 +428,6 @@ ], "aioprocessing": [ "flit-core", - "flitBuildHook", "setuptools" ], "aiopulse": [ @@ -476,7 +475,7 @@ "setuptools" ], "aiorun": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiosenseme": [ @@ -920,7 +919,7 @@ "setuptools" ], "argon2-cffi": [ - "flitBuildHook", + "flit-core", "setuptools" ], "argon2-cffi-bindings": [ @@ -1143,7 +1142,7 @@ "setuptools" ], "asyncstdlib": [ - "flitBuildHook", + "flit-core", "setuptools" ], "asynctest": [ @@ -2014,7 +2013,7 @@ "setuptools" ], "bash-kernel": [ - "flitBuildHook", + "flit-core", "setuptools" ], "bashlex": [ @@ -3297,7 +3296,6 @@ ], "confuse": [ "flit-core", - "flitBuildHook", "setuptools" ], "connect-box": [ @@ -4859,7 +4857,6 @@ ], "ecs-logging": [ "flit-core", - "flitBuildHook", "setuptools" ], "ed25519": [ @@ -5162,7 +5159,7 @@ "exceptiongroup": [ "flit-core", "flit-scm", - "flitBuildHook", + "flit-core", "setuptools" ], "exchangelib": [ @@ -5293,7 +5290,7 @@ "setuptools" ], "fastapi": [ - "flitBuildHook", + "flit-core", "hatchling", "setuptools" ], @@ -5897,7 +5894,7 @@ "setuptools" ], "formbox": [ - "flitBuildHook", + "flit-core", "setuptools" ], "formencode": [ @@ -6004,7 +6001,7 @@ "setuptools" ], "furo": [ - "flitBuildHook", + "flit-core", "setuptools" ], "fuse": [ @@ -6248,7 +6245,7 @@ "setuptools" ], "gidgethub": [ - "flitBuildHook", + "flit-core", "setuptools" ], "gigalixir": [ @@ -7612,14 +7609,14 @@ "setuptools" ], "ipfshttpclient": [ - "flitBuildHook", + "flit-core", "setuptools" ], "iptools": [ "setuptools" ], "ipwhl": [ - "flitBuildHook", + "flit-core", "setuptools" ], "ipwhois": [ @@ -8068,7 +8065,6 @@ ], "jupyter-book": [ "flit-core", - "flitBuildHook", "setuptools" ], "jupyter-c-kernel": [ @@ -8755,7 +8751,7 @@ "setuptools" ], "loca": [ - "flitBuildHook", + "flit-core", "setuptools" ], "localimport": [ @@ -9166,7 +9162,6 @@ ], "mediafile": [ "flit-core", - "flitBuildHook", "setuptools" ], "mediapy": [ @@ -9536,7 +9531,6 @@ ], "more-itertools": [ "flit-core", - "flitBuildHook", "setuptools" ], "more-properties": [ @@ -9830,12 +9824,10 @@ ], "myst-nb": [ "flit-core", - "flitBuildHook", "setuptools" ], "myst-parser": [ "flit-core", - "flitBuildHook", "setuptools" ], "nad-receiver": [ @@ -10140,7 +10132,7 @@ "setuptools" ], "nkdfu": [ - "flitBuildHook", + "flit-core", "setuptools" ], "nltk": [ @@ -11239,7 +11231,6 @@ ], "pep440": [ "flit-core", - "flitBuildHook", "setuptools" ], "pep440-version-utils": [ @@ -11281,7 +11272,6 @@ ], "pex": [ "flit-core", - "flitBuildHook", "setuptools" ], "pexif": [ @@ -14144,15 +14134,15 @@ "setuptools" ], "pytest-celery": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-check": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-cid": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-clarity": [ @@ -14310,7 +14300,6 @@ ], "pytest-param-files": [ "flit-core", - "flitBuildHook", "setuptools" ], "pytest-profiling": [ @@ -14332,7 +14321,6 @@ ], "pytest-raisin": [ "flit-core", - "flitBuildHook", "setuptools" ], "pytest-random-order": [ @@ -16016,7 +16004,7 @@ "setuptools" ], "rsskey": [ - "flitBuildHook", + "flit-core", "setuptools" ], "rst2ansi": [ @@ -16878,7 +16866,7 @@ "setuptools" ], "solo-python": [ - "flitBuildHook", + "flit-core", "setuptools" ], "somajo": [ @@ -17012,19 +17000,17 @@ ], "sphinx-design": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-external-toc": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-fortran": [ "setuptools" ], "sphinx-inline-tabs": [ - "flitBuildHook", + "flit-core", "setuptools" ], "sphinx-jinja": [ @@ -17042,7 +17028,6 @@ ], "sphinx-mdinclude": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-multitoc-numbering": [ @@ -17053,7 +17038,6 @@ ], "sphinx-pytest": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-rtd-theme": [ @@ -17434,7 +17418,7 @@ "setuptools" ], "structlog": [ - "flitBuildHook", + "flit-core", "hatch-fancy-pypi-readme", "hatch-vcs", "hatchling", @@ -17952,7 +17936,7 @@ "setuptools" ], "threadpoolctl": [ - "flitBuildHook", + "flit-core", "setuptools" ], "threat9-test-bed": [ @@ -18023,7 +18007,6 @@ ], "tinycss2": [ "flit-core", - "flitBuildHook", "setuptools" ], "tinydb": [ @@ -18343,7 +18326,7 @@ "setuptools" ], "turnt": [ - "flitBuildHook", + "flit-core", "setuptools" ], "tusker": [ @@ -19848,7 +19831,6 @@ ], "zeversolarlocal": [ "flit-core", - "flitBuildHook", "setuptools" ], "zfec": [ |