diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 18:00:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-09 18:00:56 +0000 |
commit | e112f9b8bbb5af9de4426046a7cb4490e2c12eb0 (patch) | |
tree | cfbfa6683968f4f673f45c5ca8b4d6b43bcef225 /pkgs/development | |
parent | c17ba56fe923f649d8802777c586f61f8b8c4ad0 (diff) | |
parent | ab5d8762780613cc7f99132ba29f8e6ef950178e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
31 files changed, 207 insertions, 270 deletions
diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index b884809505f33..621887d6cd124 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -84,7 +84,8 @@ let runHook postInstall ''; - postInstall = '' + # Release will generate a binary which will cause a read null byte failure, see #261354 + postInstall = lib.optionalString (releaseType == "escript") '' for dir in $out/rel/*/erts-*; do echo "ERTS found in $dir - removing references to erlang to reduce closure size" for f in $dir/bin/{erl,start}; do diff --git a/pkgs/development/interpreters/babashka/completions/bb.bash b/pkgs/development/interpreters/babashka/completions/bb.bash new file mode 100644 index 0000000000000..9746fd02a0580 --- /dev/null +++ b/pkgs/development/interpreters/babashka/completions/bb.bash @@ -0,0 +1,5 @@ +_bb_tasks() { + COMPREPLY=( $(compgen -W "$(bb tasks |tail -n +3 |cut -f1 -d ' ')" -- ${COMP_WORDS[COMP_CWORD]}) ); +} +# autocomplete filenames as well +complete -f -F _bb_tasks bb diff --git a/pkgs/development/interpreters/babashka/completions/bb.fish b/pkgs/development/interpreters/babashka/completions/bb.fish new file mode 100644 index 0000000000000..36cf89fbced77 --- /dev/null +++ b/pkgs/development/interpreters/babashka/completions/bb.fish @@ -0,0 +1,9 @@ +function __bb_complete_tasks + if not test "$__bb_tasks" + set -g __bb_tasks (bb tasks |tail -n +3 |cut -f1 -d ' ') + end + + printf "%s\n" $__bb_tasks +end + +complete -c bb -a "(__bb_complete_tasks)" -d 'tasks' diff --git a/pkgs/development/interpreters/babashka/completions/bb.zsh b/pkgs/development/interpreters/babashka/completions/bb.zsh new file mode 100644 index 0000000000000..5082197405293 --- /dev/null +++ b/pkgs/development/interpreters/babashka/completions/bb.zsh @@ -0,0 +1,6 @@ +_bb_tasks() { + local matches=(`bb tasks |tail -n +3 |cut -f1 -d ' '`) + compadd -a matches + _files # autocomplete filenames as well +} +compdef _bb_tasks bb diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index ef9636e12deca..4c4cfd67dcdce 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -4,23 +4,24 @@ , removeReferencesTo , fetchurl , writeScript +, installShellFiles }: let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.3.185"; + version = "1.3.186"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-nTW7LpvWoF8hBWtpWOc8VtVvx3v1ISJGvxnnYIvprQk="; + sha256 = "sha256-T7inTJHSnUySituU0fcgZ0xWjIY3yb8BlSakqym67ew="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; executable = "bb"; - nativeBuildInputs = [ removeReferencesTo ]; + nativeBuildInputs = [ removeReferencesTo installShellFiles ]; extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" @@ -42,6 +43,9 @@ let # graalvm-ce anyway. postInstall = '' remove-references-to -t ${graalvmDrv} $out/bin/${executable} + installShellCompletion --cmd bb --bash ${./completions/bb.bash} + installShellCompletion --cmd bb --zsh ${./completions/bb.zsh} + installShellCompletion --cmd bb --fish ${./completions/bb.fish} ''; passthru.updateScript = writeScript "update-babashka" '' diff --git a/pkgs/development/interpreters/babashka/wrapped.nix b/pkgs/development/interpreters/babashka/wrapped.nix index eb03045719f0a..29468265eb9c1 100644 --- a/pkgs/development/interpreters/babashka/wrapped.nix +++ b/pkgs/development/interpreters/babashka/wrapped.nix @@ -3,6 +3,7 @@ , babashka-unwrapped , callPackage , makeWrapper +, installShellFiles , rlwrap , clojureToolsBabashka ? callPackage ./clojure-tools.nix { } , jdkBabashka ? clojureToolsBabashka.jdk @@ -23,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontUnpack = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = let unwrapped-bin = "${babashka-unwrapped}/bin/bb"; in @@ -37,6 +38,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \ --set-default JAVA_HOME ${jdkBabashka} + installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash + installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish + installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/zsh/site-functions/_bb '' + lib.optionalString withRlwrap '' substituteInPlace $out/bin/bb \ diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 91118946a182b..dbaa4888922c5 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, python3, hunspell }: let @@ -934,4 +934,37 @@ rec { readmeFile = "README_pt_PT.txt"; license = with lib.licenses; [ gpl2 lgpl21 mpl11 ]; }; + + /* PERSIAN */ + + fa_IR = fa-ir; + fa-ir = mkDict { + pname = "hunspell-dict-fa-ir"; + version = "experimental-2022-09-04"; + dictFileName = "fa-IR"; + readmeFile = "README.md"; + src = fetchFromGitHub { + owner = "b00f"; + repo = "lilak"; + rev = "1a80a8e5c9377ac424d29ef20be894e250bc9765"; + hash = "sha256-xonnrclzgFEHdQ9g8ijm0bo9r5a5Y0va52NoJR5d8mo="; + }; + nativeBuildInputs = [ python3 ]; + buildPhase = '' + runHook preBuild + mkdir build + (cd src && python3 lilak.py) + mv build/* ./ + # remove timestamp from file + sed -i 's/^\(## *File Version[^,]*\),.*/\1/' fa-IR.aff + runHook postBuild + ''; + meta = with lib; { + description = "Hunspell dictionary for Persian (Iran)"; + homepage = "https://github.com/b00f/lilak"; + license = licenses.asl20; + maintainers = with maintainers; [ nix-julia ]; + platforms = platforms.all; + }; + }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 9b26b352cdad8..cea4d5b4c6faa 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-cyV3tgmZz5AExxxdGJ12r+PPXn7v2AEhxb9icBxolS8="; + sha256 = "sha256-51isH1hlzgbD0JVtGp3NuaGY5l2CeS1S7oVeRYG+vWI="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix index 69e45a6aee093..9d826b92f164a 100644 --- a/pkgs/development/libraries/science/math/nccl/tests.nix +++ b/pkgs/development/libraries/science/math/nccl/tests.nix @@ -1,40 +1,47 @@ -{ config -, cudaPackages +{ backendStdenv +, config +, cuda_cccl +, cuda_cudart +, cuda_nvcc +, cudaVersion , fetchFromGitHub +, gitUpdater , lib -, mpiSupport ? false , mpi -, stdenv +, mpiSupport ? false +, nccl , which }: -cudaPackages.backendStdenv.mkDerivation (finalAttrs: { +backendStdenv.mkDerivation (finalAttrs: { pname = "nccl-tests"; - version = "2.13.6"; + version = "2.13.8"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-3gSBQ0g6mnQ/MFXGflE+BqqrIUoiBgp8+fWRQOvLVkw="; + hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; }; strictDeps = true; nativeBuildInputs = [ - cudaPackages.cuda_nvcc + cuda_nvcc which ]; buildInputs = [ - cudaPackages.cuda_cudart - cudaPackages.nccl + cuda_cudart + nccl + ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # <nv/target> ] ++ lib.optional mpiSupport mpi; makeFlags = [ - "CUDA_HOME=${cudaPackages.cuda_nvcc}" - "NCCL_HOME=${cudaPackages.nccl}" + "CUDA_HOME=${cuda_nvcc}" + "NCCL_HOME=${nccl}" ] ++ lib.optionals mpiSupport [ "MPI=1" ]; @@ -46,12 +53,17 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { cp -r build/* $out/bin/ ''; + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + meta = with lib; { description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; homepage = "https://github.com/NVIDIA/nccl-tests"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.bsd3; broken = !config.cudaSupport || (mpiSupport && mpi == null); - maintainers = with maintainers; [ jmillerpdt ]; + maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members; }; }) diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index f2f9b6ec8859f..b9f34eeb9748d 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.16"; + version = "1.13.17"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI="; + sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 0bfe127efff40..97013e58554c1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -99,6 +99,7 @@ mapAliases { manta = pkgs.node-manta; # Added 2023-05-06 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 + inherit (pkgs) mathjax-node-cli; # added 2023-11-02 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 inherit (pkgs) mermaid-cli; # added 2023-10-01 musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 471b37c30bf07..56b4337509611 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -166,7 +166,6 @@ , "markdown-link-check" , "mastodon-bot" , "mathjax" -, "mathjax-node-cli" , "meat" , "mocha" , "multi-file-swagger" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 168d6b0c3c2a5..5963f7ebdf4f4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -86763,212 +86763,6 @@ in bypassCache = true; reconstructLock = true; }; - mathjax-node-cli = nodeEnv.buildNodePackage { - name = "mathjax-node-cli"; - packageName = "mathjax-node-cli"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mathjax-node-cli/-/mathjax-node-cli-1.0.1.tgz"; - sha512 = "p1OB9zalQZkKYumfx+8mSX59MysF2Ox2H88gHSUQpdjpuMISwIPfw0MQmsvcS00hntSX05uEDa3uzo+1SgSk5w=="; - }; - dependencies = [ - sources."abab-2.0.6" - sources."acorn-5.7.4" - (sources."acorn-globals-4.3.4" // { - dependencies = [ - sources."acorn-6.4.2" - ]; - }) - sources."acorn-walk-6.2.0" - sources."ajv-6.12.6" - sources."ansi-regex-3.0.1" - sources."ansi-styles-4.3.0" - sources."array-equal-1.0.0" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-limiter-1.0.1" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."bcrypt-pbkdf-1.0.2" - sources."browser-process-hrtime-1.0.0" - sources."camelcase-5.3.1" - sources."caseless-0.12.0" - sources."cliui-4.1.0" - sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."commander-11.1.0" - sources."core-util-is-1.0.2" - sources."cross-spawn-6.0.5" - sources."cssom-0.3.8" - sources."cssstyle-1.4.0" - sources."dashdash-1.14.1" - (sources."data-urls-1.1.0" // { - dependencies = [ - sources."whatwg-url-7.1.0" - ]; - }) - sources."decamelize-1.2.0" - sources."deep-is-0.1.4" - sources."delayed-stream-1.0.0" - sources."domexception-1.0.1" - sources."ecc-jsbn-0.1.2" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."escalade-3.1.1" - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."execa-1.0.0" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."find-up-3.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."get-caller-file-1.0.3" - sources."get-stream-4.1.0" - sources."getpass-0.1.7" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."html-encoding-sniffer-1.0.2" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."invert-kv-2.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."jsdom-11.12.0" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."lcid-2.0.0" - sources."left-pad-1.3.0" - sources."levn-0.3.0" - sources."locate-path-3.0.0" - sources."lodash-4.17.21" - sources."lodash.sortby-4.7.0" - sources."map-age-cleaner-0.1.3" - sources."mathjax-2.7.9" - sources."mathjax-node-2.1.1" - (sources."mathjax-node-sre-3.0.3" // { - dependencies = [ - sources."yargs-12.0.5" - ]; - }) - sources."mem-4.3.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."nice-try-1.0.5" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" - sources."nwsapi-2.2.7" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."optionator-0.8.3" - sources."os-locale-3.1.0" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."parse5-4.0.0" - sources."path-exists-3.0.0" - sources."path-key-2.0.1" - sources."performance-now-2.1.0" - sources."pn-1.1.0" - sources."prelude-ls-1.1.2" - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.3.1" - sources."qs-6.5.3" - sources."request-2.88.2" - sources."request-promise-core-1.1.4" - sources."request-promise-native-1.0.9" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.3.0" - sources."semver-5.7.2" - sources."set-blocking-2.0.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" - sources."source-map-0.6.1" - sources."speech-rule-engine-2.4.0" - sources."sshpk-1.18.0" - sources."stealthy-require-1.1.1" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" - sources."symbol-tree-3.2.4" - sources."tough-cookie-2.5.0" - sources."tr46-1.0.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."uri-js-4.4.1" - sources."uuid-3.4.0" - sources."verror-1.10.0" - sources."w3c-hr-time-1.0.2" - sources."webidl-conversions-4.0.2" - sources."whatwg-encoding-1.0.5" - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-6.5.0" - sources."which-1.3.1" - sources."which-module-2.0.1" - sources."wicked-good-xpath-1.3.0" - sources."word-wrap-1.2.5" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-5.2.3" - sources."xml-name-validator-3.0.0" - sources."xmldom-sre-0.1.31" - sources."y18n-4.0.3" - (sources."yargs-17.7.2" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."cliui-8.0.1" - sources."get-caller-file-2.0.5" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-parser-21.1.1" - ]; - }) - sources."yargs-parser-11.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CLI tools for calling mathjax-node"; - homepage = "https://github.com/mathjax/mathjax-node-cli#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; meat = nodeEnv.buildNodePackage { name = "meat"; packageName = "meat"; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index b14730c05f5a6..b4e4774af8ce1 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.4.9"; + version = "2.4.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-8MllMKf/xp5SdtF9P1Sa6Ytml4nQ5OX7vs7ITU8mCRU="; + hash = "sha256-D+bgKI6olK3smgnRdACvd0gYMWvS6ao6f7nQh3YExXw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dalle-mini/default.nix b/pkgs/development/python-modules/dalle-mini/default.nix index e50249dc7dd9a..0c768ba5dbe14 100644 --- a/pkgs/development/python-modules/dalle-mini/default.nix +++ b/pkgs/development/python-modules/dalle-mini/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , einops , emoji , flax @@ -16,16 +17,20 @@ buildPythonPackage rec { pname = "dalle-mini"; version = "0.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-k4XILjNNz0FPcAzwPEeqe5Lj24S2Y139uc9o/1IUS1c="; }; - format = "setuptools"; - - buildInputs = [ - jaxlib + # Fix incompatibility with the latest JAX versions + # See https://github.com/borisdayma/dalle-mini/pull/338 + patches = [ + (fetchpatch { + url = "https://github.com/borisdayma/dalle-mini/pull/338/commits/22ffccf03f3e207731a481e3e42bdb564ceebb69.patch"; + hash = "sha256-LIOyfeq/oVYukG+1rfy5PjjsJcjADCjn18x/hVmLkPY="; + }) ]; propagatedBuildInputs = [ @@ -34,6 +39,7 @@ buildPythonPackage rec { flax ftfy jax + jaxlib pillow transformers unidecode @@ -49,7 +55,5 @@ buildPythonPackage rec { homepage = "https://github.com/borisdayma/dalle-mini"; license = licenses.asl20; maintainers = with maintainers; [ r-burns ]; - # incompatible with recent versions of JAX - broken = true; }; } diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 1f702894258bf..ee84d47edf552 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.1"; + version = "1.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-xCC0AEiHrulxNdBf59ap9oKh/mF1u9IzZsPYFJeHNR0="; + hash = "sha256-JaXADzNxRqumjx6FZxJj6ioMVdUMR6S1FQQ6QcP8S5Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index d3d3a7add2c7b..1612bfac0d96f 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , dacite , fetchFromGitHub -, orjson , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,14 +22,13 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K8EiDb6B18No9RNbw2a7U+FJQaXrrcFf0hgt40r6Igo="; + hash = "sha256-24O9Yl0+boxDtyPW4tBTsk2iDGGXf8ofkDHu8B+GxhE="; }; propagatedBuildInputs = [ aiohttp aqipy-atmotech dacite - orjson ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 10e3cef7a69a8..1f2ddb3d8cfd7 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch"; hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA="; }) + (fetchpatch { + name = "_raveled_index_for.patch"; + url = "https://github.com/sods/paramz/pull/40/commits/dd68a81cfd28edb48354c6a9b493ef711f00fb5b.patch"; + hash = "sha256-nbnW3lYJDT1WXko3Y28YyELhO0QIAA1Tx0CJ57T1Nq0="; + }) ]; propagatedBuildInputs = [ numpy scipy six decorator ]; diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index 0408b74ead497..2138d71819784 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pdfplumber"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jsvine"; repo = "pdfplumber"; rev = "refs/tags/v${version}"; - hash = "sha256-nuHHEVOYm2/PkXIs9Ze5y5xyJMLkxqp3q3u4gV8Ks80="; + hash = "sha256-fd/4I6jjc0Wz2+XHGXAGg0Am3Dmw9R2ZX7nymIj/UnA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index bb60adfc4bb25..470c67d6ae071 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k="; + hash = "sha256-Gy+i/9OTi7S+/+XWFGy8sr2plqWk2p8xq//Ysk4Hsxc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index f5de2371e01ef..8f7f1e96effed 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -22,11 +22,11 @@ # integrating with ipython-sql buildPythonPackage rec { pname = "pgcli"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-C/X427yQR+BkbQFqQhMoomDEbP8hCJCLEbtVyWR17o0="; + hash = "sha256-8v7qIJnOGtXoqdXZOw7a9g3GHpeyG3XpHZcjk5zlO9I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 613222d5089ee..f16fa4cedfd9c 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231105"; + version = "0.10.0.20231109"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+/r2gVtA0j+aY827B0wZCOlogil7921V94/bay8/dVg="; + hash = "sha256-cr2rEoGVJ8BeXLfyPq4Auxu7OEOlVnKxlSMUREmji2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 6c7c30fe384de..5ef572c481756 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.2.2"; + version = "0.2.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-YQlPv8YfPbYfpg+4VrLWHOWYJoecuAr3K7JBiogiI/g="; + hash = "sha256-HZLWpoo0luAqqwLA3t7cDh0yVP6znrzMoUg7cuexd28="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index 0d1e44468e4ef..e148fce241635 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { pname = "tika-client"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = "refs/tags/${version}"; - hash = "sha256-yp9Wxc5RUZYhv2RxQwImZGqqoQmtZEkfEmj40ilxhQM="; + hash = "sha256-fFibRF3SoDOje6M9YmZI0dwYVn/cvgXqmClvqvNy5f8="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { description = "A modern Python REST client for Apache Tika server"; homepage = "https://github.com/stumpylog/tika-client"; changelog = "https://github.com/stumpylog/tika-client/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3; + license = licenses.mpl20; maintainers = with maintainers; [ e1mo ]; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index b6c4d9bc4f4a3..743f8952a9e4f 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -46,7 +46,10 @@ let inherit (lib) attrsets lists strings trivial; - inherit (cudaPackages) cudaFlags cudnn nccl; + inherit (cudaPackages) cudaFlags cudnn; + + # Some packages are not available on all platforms + nccl = cudaPackages.nccl or null; setBool = v: if v then "1" else "0"; @@ -176,6 +179,13 @@ in buildPythonPackage rec { 'message(FATAL_ERROR "Found NCCL header version and library version' \ 'message(WARNING "Found NCCL header version and library version' '' + # TODO(@connorbaker): Remove this patch after 2.1.0 lands. + + lib.optionalString cudaSupport '' + substituteInPlace torch/utils/cpp_extension.py \ + --replace \ + "'8.6', '8.9'" \ + "'8.6', '8.7', '8.9'" + '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") '' @@ -251,6 +261,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; + USE_NCCL = setBool (nccl != null); USE_SYSTEM_NCCL = setBool useSystemNccl; # don't build pytorch's third_party NCCL USE_STATIC_NCCL = setBool useSystemNccl; @@ -318,6 +329,8 @@ in buildPythonPackage rec { libcusolver.lib libcusparse.dev libcusparse.lib + ] ++ lists.optionals (nccl != null) [ + # Some platforms do not support NCCL (i.e., Jetson) nccl.dev # Provides nccl.h AND a static copy of NCCL! ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ cuda_nvprof.dev # <cuda_profiler_api.h> diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix index afded05e0c08f..798ae11df5cbb 100644 --- a/pkgs/development/skaware-packages/default.nix +++ b/pkgs/development/skaware-packages/default.nix @@ -8,17 +8,22 @@ lib.makeScope pkgs.newScope (self: buildPackage = callPackage ./build-skaware-package.nix { }; cleanPackaging = callPackage ./clean-packaging.nix { }; + # execline execline = callPackage ./execline { }; execline-man-pages = callPackage ./execline-man-pages { }; + # servers & tools mdevd = callPackage ./mdevd { }; nsss = callPackage ./nsss { }; - sdnotify-wrapper = callPackage ./sdnotify-wrapper { }; + tipidee = callPackage ./tipidee { }; utmps = callPackage ./utmps { }; + # libs skalibs = callPackage ./skalibs { }; skalibs_2_10 = callPackage ./skalibs/2_10.nix { }; + sdnotify-wrapper = callPackage ./sdnotify-wrapper { }; + # s6 tooling s6 = callPackage ./s6 { }; s6-dns = callPackage ./s6-dns { }; s6-linux-init = callPackage ./s6-linux-init { }; diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix new file mode 100644 index 0000000000000..6b44516615a07 --- /dev/null +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -0,0 +1,40 @@ +{ skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "tipidee"; + version = "0.0.1.0"; + sha256 = "sha256-rKi9IX9CcRhY4n44i2vDom9MIeuGxRAHF7u0C3nNvFU="; + + description = "A HTTP 1.1 webserver, serving static files and CGI/NPH"; + + outputs = [ "bin" "lib" "out" "dev" "doc" ]; + + configureFlags = [ + "--libdir=\${lib}/lib" + "--libexecdir=\${lib}/libexec" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + + # we set sysconfdir to /etc here to allow tipidee-config + # to look in the global paths for its configs. + # This is not encouraged, but a valid use-case. + "--sysconfdir=/etc" + ]; + + postInstall = '' + # remove all tipidee executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libtipidee.* + + mv doc $doc/share/doc/tipidee/html + mv examples $doc/share/doc/tipidee/examples + ''; + +} diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index 7f3d667efda21..56c3a72ea7f14 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.15.5"; + version = "1.15.6"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-DrrIh2ThayFUqnUGGHkX0WmVkzitnVEOMXS8yWydD0A="; + sha256 = "sha256-OK6KELzazvB+zOghEYjFySs3a+lto4/z7h8s9IlbLLg="; }; dontUnpack = true; diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix index d7c4e27b0e7f3..a0ba21d606744 100644 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ b/pkgs/development/tools/fermyon-spin/default.nix @@ -43,8 +43,12 @@ in stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp $src/* $out/bin + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 73bf606aa7aa4..26f2aeae13bec 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.55.1"; + version = "1.55.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-r4tPFHvxXMgyGc5KTz0fM5nZ20OVSPQ6kKnTkeaefPI="; + hash = "sha256-DO71wfDmCuziEcsme1g1uNIl3MswA+EkQcYzOYHbG+I="; }; - vendorHash = "sha256-NfSO3JUrFJi1lwxhy+eubNNKuhgLTfDt2KLAnmOjdoA="; + vendorHash = "sha256-0+jImfMdVocOczGWeO03YXUg5yKYTu3WeJaokSlcYFM="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 4ca59fffe7f3a..f0f8a3454550f 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.10"; + version = "1.0.11"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-xwKNDTlghNkq36wMAKSa+reROqGwMm4dZ/Hfos1zuP4="; + hash = "sha256-yZp/AFlOVRtZ60865utrtVv0zlerwFMhpqBh26WnfL8="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-gaquYp4q22IJHV7Fx5GxZWVFvJzU30HOmL32lkxJeQ8="; + hash = "sha256-/9MKD2iRogrOIiKlCCPUX5KoDD0rM7K8+jVLx9xxs5s="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-DPVnTzdGprjZ16kme3Y6xBognjWHt+0N/zk0J3dm8jY="; + hash = "sha256-9wE3GL+EGvPHtVgfMx09Jn+WU/VoUf5x/QrrdlhePa8="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-Er7QiWBhENTa9xhCIVqECCzexWejBwBC59u3CJKQiwc="; + hash = "sha256-pT9+GchNC3vmeFgTF0GzzyLzWBrCQcR/DFRVK2CnHCw="; }; }; updateScript = writeShellScript "update-bun" '' |