diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 780a6b2a83a6..0f55ab8a09ce 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -32,7 +32,7 @@ let VARIANT_ID = cfg.variant_id; }; - initrdReleaseContents = osReleaseContents // { + initrdReleaseContents = (removeAttrs osReleaseContents [ "BUILD_ID" ]) // { PRETTY_NAME = "${osReleaseContents.PRETTY_NAME} (Initrd)"; }; initrdRelease = pkgs.writeText "initrd-release" (attrsToText initrdReleaseContents); diff --git a/pkgs/applications/misc/river-luatile/default.nix b/pkgs/applications/misc/river-luatile/default.nix index 86a596be9b6b..6b5c27bab5ae 100644 --- a/pkgs/applications/misc/river-luatile/default.nix +++ b/pkgs/applications/misc/river-luatile/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "river-luatile"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "river-luatile"; rev = "v${version}"; - hash = "sha256-flh1zUBranb7w1fQuinHbVRGlVxfl2aKxSwShHFG6tI="; + hash = "sha256-ZBytoj4L72TjxJ7vFivjcSO69AcdwKNbXh4rA/bn5iU="; }; - cargoHash = "sha256-9YQxa6folwCJNoEa75InRbK1X7cD4F5QGzeGlfsr/5s="; + cargoHash = "sha256-GcMSglLKuUD3nVj0/8Nbrk4qs5gl5PlCj7r1MYq/vQg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9dadb938610b..1896bafd9031 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-mpCd1POtIN/gaiXdL832UK6a1XoaUYHpS6shD8WXA88=", + "hash": "sha256-WA4wXUkYCxFV7b/Gr3TvrFtZWJAr0CI2F2a6gsSbRjU=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.62.0", + "rev": "v3.62.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -182,13 +182,13 @@ "vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw=" }, "buildkite": { - "hash": "sha256-/bLMhyJFdoktlekxsItPcu+YoqiFDOdUsMpwqNhiuJU=", + "hash": "sha256-QXhuT/EOqaxBCFGh49JIkrX8SoiSIZEyNzR5RDJldyo=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.19.0", + "rev": "v0.19.1", "spdx": "MIT", - "vendorHash": "sha256-ZWC6CtAheuHZtLc8BolrniRPNpKkG0VR3UY5bVUtrSk=" + "vendorHash": "sha256-cWENIMdkg7+h0sIci+W6A9pxhfQ5/wvWbKx5D4S5Nw0=" }, "checkly": { "hash": "sha256-ZJQdH1ot/ygnM4Q2rihzHFH67ge6zfVrPASgV0lUs34=", @@ -381,11 +381,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-vQ9SXWVr7eAg0SvwR5t5CvAllD6wG4aqmleMFYoREfE=", + "hash": "sha256-/TVsH07uWVI0hhN5ulzSW2nGUEaaW3ZiePT+wGoatKY=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.2.0", + "rev": "v5.2.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -408,15 +408,14 @@ "vendorHash": "sha256-f+Z6Y2WPxqJoHoCwuK6sgFa8nUnkW/WwrD55dtU0wtM=" }, "fortios": { - "deleteVendor": true, - "hash": "sha256-nvK5mbQdCB6lmdyhJbMS15eOER8eIAYv26mc1FCifXs=", + "hash": "sha256-fWz3OAIOSVHNA6x8i6f/ewcC0WwWDYzeaT8rz3vFDWA=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "v1.16.0", + "rev": "1.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" + "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" }, "gandi": { "hash": "sha256-eVSMjXSYRedig93Tm2ZLpbuJhG3wKSBwfLli7OWs3dU=", @@ -873,11 +872,11 @@ "vendorHash": "sha256-OT6VKLCc1sCPe4r/L5lhSF9BLLYU0iNNW21fSrEF7mA=" }, "opsgenie": { - "hash": "sha256-us4UaCLvWWoS+N7eXPs2/xSk9wl1zULaiG93LX45bks=", + "hash": "sha256-SjvFRwhWK3COj9SaehT2XnMxK5z7qA+5LvGCFHRuiiQ=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.24", + "rev": "v0.6.25", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 22cacdd01ca1..8199a9feb375 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jmeter"; - version = "5.5"; + version = "5.6"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; - sha256 = "sha256-YOicfEUjcxRn/bcX8z1hQIbBDwMWNpy6pFZQrhxALh8="; + sha256 = "sha256-AZaQ4vNSB3418fJxXLPAX472lnsyBMCYBltdFqwSP54="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index cde50dc485ea..db9518d2470e 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.2.2"; + version = "0.2.4"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - sha256 = "sha256-WOq+phZlvmXd/kDchP9RjyCE362hDR20cqNZMxgxVdM="; + sha256 = "sha256-5yganpfgnQBaNIAkxjc81T0m51DeynnrWvti0G/qmvA="; stripRoot = false; }; diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 2d23f7b294d6..1e8e2ae2f4d4 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -10,13 +10,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "20.3.8"; + version = "20.3.9"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-Sv5poUW/W0sTJft+peOlRAe3Qtst7UbCTW4WgNP/bpI="; + sha256 = "sha256-Z5p/lw7qg6aacJ0eSqswaiwTOsUmuDbNlRRs51LdjRw="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index b3174cbe54ff..425c45d198e5 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.5.0"; + version = "1.5.0.1"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-6VsQLouK9gwBwbTdprtOgcBKJ0VD8pC/h49AcjS4F3U="; + sha256 = "sha256-e8uOvIPeAB0fVDhBl2YnaVGpmDdgPkdqVhAHKFXrMyY="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index f60c9626c553..93a562d50d79 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.2.0"; + version = "12.2.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - hash = "sha256-ikodKEvlg+QU0af8IjiMjhMyQSV6icHVUczf0rWfVaI="; + hash = "sha256-Aa2OzY3x8yRn/uFaCbbKihpsPueup7doPp5i8I04iaQ="; }; sourceRoot = "${src.name}/open-vm-tools"; diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 8ff9344b3f52..cd4a8b2462aa 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub, unstableGitUpdater }: stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2023-03-26"; + version = "unstable-2023-06-04"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "eac67db33b2111f19ac267585032df8b4838e6f4"; - hash = "sha256-FBoagGHWsxZo40gOqeBUw0L+LtNAVF/q6IZ3N9QBFQs="; + rev = "d5fce963985df270cb99d020169b4f28122e6415"; + hash = "sha256-snODSEtH1K/X0MakJWcPM40cqLUA+0cbBkhAHuisCyI="; }; dontBuild = true; @@ -18,6 +18,8 @@ stdenvNoCC.mkDerivation rec { cp -r man3/ man7/ $out/share/man/ ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Unix manual pages for R6RS and R7RS"; homepage = "https://github.com/schemedoc/manpages"; diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 8616ed9a0210..f1838b548147 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.049"; + version = "0.050"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-UTiuWbRUJVGEuqNj2EU6VBb8Y4FO08TA2Nk7cjsjmuM="; + hash = "sha256-XySK+o0ROfmvII5Yvb/3HbLepRTaeVNEZwSVbhsZDsE="; }; installPhase = '' diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 332d9409ab11..eb3f03d57e40 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.9.0"; + version = "4.10.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "sha256-hKMHJF/FXPeQjkEXLTN6zjKMaVGa3LdIebXya3NRSzU="; + sha256 = "sha256-HTdaV1cLbwGYuikS9EAVvAOdLmCoWlvVXlpYsUwY5IA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index cb7b7466d053..a8d228addc22 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x76f9Sw3BMgWSY7DLIqDjbggp/qVu8mJBtf4znTz9hA="; + hash = "sha256-GmteQy+nYQFspLvdw44TjuQQeTRQ24OtDeAA+TQJKiU="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index 59d4a8ce09ec..43734b19b890 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libytnef"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "Yeraze"; repo = "ytnef"; rev = "v${version}"; - sha256 = "sha256-VlgvbU8yNHyVRKqaNqqCpLBsndltfAk33BuzvFuViqU="; + hash = "sha256-kQb45Da0T7wWi1IivA8Whk+ECL2nyFf7Gc0gK1HKj2c="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix new file mode 100644 index 000000000000..ee1f6c7de6cc --- /dev/null +++ b/pkgs/development/python-modules/argilla/default.nix @@ -0,0 +1,120 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, deprecated +, rich +, backoff +, packaging +, pydantic +, typer +, tqdm +, wrapt +, numpy +, httpx +, pandas +, monotonic +# test dependencies +, pytestCheckHook +, fastapi +, sqlalchemy +, opensearch-py +, factory_boy +, elasticsearch8 +, elastic-transport +, luqum +, pytest-asyncio +, passlib +, python-jose +, alembic +, uvicorn +, schedule +, prodict +, datasets +, psutil +, spacy +, cleanlab +, snorkel +, transformers +, faiss +}: +let + pname = "argilla"; + version = "1.8.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "argilla-io"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pUfuwA/+fe1VVWyGxEkvSuJLNxw3sHmp8cQZecW8GWY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"rich <= 13.0.1"' '"rich"' \ + --replace '"numpy < 1.24.0"' '"numpy"' + ''; + + propagatedBuildInputs = [ + deprecated + rich + backoff + packaging + pydantic + typer + tqdm + wrapt + numpy + pandas + httpx + monotonic + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # tests require an opensearch instance running and flyingsquid to be packaged + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + fastapi + sqlalchemy + opensearch-py + factory_boy + elasticsearch8 + elastic-transport + luqum + pytest-asyncio + passlib + python-jose + alembic + uvicorn + schedule + prodict + datasets + psutil + spacy + cleanlab + snorkel + transformers + faiss + ] ++ opensearch-py.optional-dependencies.async; + + pytestFlagsArray = [ "--ignore=tests/server/datasets/test_dao.py" ]; + + meta = with lib; { + description = "Argilla: the open-source data curation platform for LLMs"; + homepage = "https://github.com/argilla-io/argilla"; + changelog = "https://github.com/argilla-io/argilla/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix new file mode 100644 index 000000000000..0ac79e306c17 --- /dev/null +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, scikit-learn +, termcolor +, tqdm +, pandas +# test dependencies +, tensorflow +, torch +, datasets +, torchvision +, keras +, fasttext +}: +let + pname = "cleanlab"; + version = "2.4.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "cleanlab"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XFrjjBJA0OQEAspnQQiSIW4td0USJDXTp9C/91mobp8="; + }; + + # postPatch = '' + # substituteInPlace pyproject.toml \ + # --replace '"rich <= 13.0.1"' '"rich"' \ + # --replace '"numpy < 1.24.0"' '"numpy"' + # ''; + + propagatedBuildInputs = [ + scikit-learn + termcolor + tqdm + pandas + ]; + + nativeCheckInputs = [ + tensorflow + torch + datasets + torchvision + keras + fasttext + ]; + + meta = with lib; { + description = "The standard data-centric AI package for data quality and machine learning with messy, real-world data and labels."; + homepage = "https://github.com/cleanlab/cleanlab"; + changelog = "https://github.com/cleanlab/cleanlab/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 77b5aa44d319..6cec59e72ac1 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.2.1"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DIjS56QDdjH8lp8yZE8UIccOM+OoafJK3DWZ1d/q29k="; + hash = "sha256-nrE8PdvzhH7lO0flvNkGC61NOVT4aj2E2gKEDRkp+b4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/luqum/default.nix b/pkgs/development/python-modules/luqum/default.nix new file mode 100644 index 000000000000..2c9f78fc583c --- /dev/null +++ b/pkgs/development/python-modules/luqum/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# dependencies +, ply +# test dependencies +, elasticsearch-dsl +}: +let + pname = "luqum"; + version = "0.13.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jurismarches"; + repo = pname; + rev = version; + hash = "sha256-lcJCLl0crCl3Y5UlWBMZJR2UtVP96gaJNRxwY9Xn7TM="; + }; + + propagatedBuildInputs = [ + ply + ]; + + nativeCheckInputs = [ + elasticsearch-dsl + ]; + + meta = with lib; { + description = "A lucene query parser generating ElasticSearch queries and more !"; + homepage = "https://github.com/jurismarches/luqum"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/msg-parser/default.nix b/pkgs/development/python-modules/msg-parser/default.nix new file mode 100644 index 000000000000..9670403e640e --- /dev/null +++ b/pkgs/development/python-modules/msg-parser/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# dependencies +, olefile +# test dependencies +, pytestCheckHook +}: +let + pname = "msg-parser"; + version = "1.2.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "vikramarsid"; + repo = "msg_parser"; + rev = "4100b553b24895b489ebd414c771933fc1e558d3"; + hash = "sha256-srDk6w8nzt0dyGCFQWfVCnKb4LawHoqoHX6d1l1dAmM="; + }; + + propagatedBuildInputs = [ + olefile + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python module to read, parse and converting Microsoft Outlook MSG E-Mail files."; + homepage = "https://github.com/vikramarsid/msg_parser"; + license = licenses.bsd2; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/snorkel/default.nix b/pkgs/development/python-modules/snorkel/default.nix new file mode 100644 index 000000000000..6e918c2f9145 --- /dev/null +++ b/pkgs/development/python-modules/snorkel/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, tensorboard +, scipy +, tqdm +, scikit-learn +, munkres +, networkx +, torch +, pandas +# test dependencies +, pytestCheckHook +, spacy +, pyspark +, dill +, dask +, spacy_models +}: +let + pname = "snorkel"; + version = "0.9.9"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "snorkel-team"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IDWYvblS0Q8ubuHzgIc7fU/gwpJ43Dd7VMWycMfAJxc="; + }; + + propagatedBuildInputs = [ + tensorboard + scipy + tqdm + scikit-learn + munkres + networkx + torch + pandas + ]; + + # test fail because of some wrong path references + # things like No such file or directory: '/nix/store/8r9x7xv9nfwmd36ca28a39xaharcjdzj-python3.10-pyspark-3.4.0/lib/python3.10/site-packages/pyspark/./bin/spark-submit' + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + spacy + pyspark + dill + dask + spacy_models.en_core_web_sm + ] ++ dask.optional-dependencies.distributed; + + meta = with lib; { + description = "A system for quickly generating training data with weak supervision"; + homepage = "https://github.com/snorkel-team/snorkel"; + changelog = "https://github.com/snorkel/snorkel/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 0b994d80bbaa..20459a25d4d9 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3LoqG7t2InDBrfOk0vve/6C5Vjifq5L+Tt8ulMGuASg="; + hash = "sha256-YUDvsgY5bLZwTCvBejqeRScgH6wu68ym3VxkSUmeqwI="; }; - cargoHash = "sha256-k41hF7qhT9Y7IBp7rzpRP9pTIf1ZQsEyslaHmss+NhE="; + cargoHash = "sha256-blcXhWaIWIA4BhmMX/T1mDDr1tUvxiauq7tXKBeZGbY="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index f40390b92135..ff018c69e1de 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.53"; + version = "1.0.56"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-+2ZZKX7w9P+2D6g1BYXC5tl4soYYKuDdAqIlJuD+OFE="; + sha256 = "sha256-7XOOdDewLzLNtPqq26XTAQ0apa6L1x0b7ruvxc4Pdhw="; }; - cargoHash = "sha256-Rn7M95BHR1IaNE58EfuXWdyxhoMskIN7HmKVKhToS8s="; + cargoHash = "sha256-imVIRZiuMMSdW/iLlYPS7Z/xQdfWegxR3LXbjvSjieM="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 97d7b81d90a9..d567e0303960 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.39"; + version = "0.1.40"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/TAgAwP4y3MBIvcgCi2SiMfQ61BrFYuUY2LTg8mJn7U="; + sha256 = "sha256-zsQHVnFMMPZosGtA6ugJSFONrA1tS5Z2UoGr5IEpiAc="; }; - cargoHash = "sha256-RGIqFTi0CFiPLMI3K7hsWMJXDrjVNbGnS7ZfTeBTPn0="; + cargoHash = "sha256-dEDpl2dnD+IDGtHQTT15QTfRIC2t+scsdyUYVqDSHJk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix index 920e22251fb2..9e9fc837e820 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/games/doom-ports/slade/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "slade"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - sha256 = "sha256-YZTCviGhOlAgD3RidPu8gPqqo4MLURiBGV7nazILwFg="; + sha256 = "sha256-CN01w+sXXRqvQqu1whePAb+phVx+VM8tL2NusfnCyF8="; }; postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index b31c03699bd6..38dbc1fa8f81 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -36,6 +36,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-m+hczXog03Gz81CP/blkRJPaTrEhmLQFvVtOfWKYQL4="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; + npmBuildFlags = [ "--" "--standalone" ]; prePatch = '' cp ${./package-lock.json} ./package-lock.json @@ -46,13 +47,15 @@ buildNpmPackage rec { src = ./replace-git.patch; inherit version; }) + ./disable-updater-ui.patch ]; - installPhase = if buildWebExtension then '' - cp -r dist/chromium-unpacked/ $out - '' else '' - cp -r dist/ $out - ''; + installPhase = + if buildWebExtension then '' + cp -r dist/chromium-unpacked/ $out + '' else '' + cp -r dist/ $out + ''; meta = with lib; { description = "Vencord web extension"; diff --git a/pkgs/misc/vencord/disable-updater-ui.patch b/pkgs/misc/vencord/disable-updater-ui.patch new file mode 100644 index 000000000000..6682d814b862 --- /dev/null +++ b/pkgs/misc/vencord/disable-updater-ui.patch @@ -0,0 +1,35 @@ +diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx +index 4d0b86c..0f1d87f 100644 +--- a/src/components/VencordSettings/UpdaterTab.tsx ++++ b/src/components/VencordSettings/UpdaterTab.tsx +@@ -249,4 +249,4 @@ function Updater() { + ); + } + +-export default IS_WEB ? null : wrapTab(Updater, "Updater"); ++export default null; +diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx +index 3ea5a43..da63213 100644 +--- a/src/plugins/_core/settings.tsx ++++ b/src/plugins/_core/settings.tsx +@@ -105,7 +105,7 @@ export default definePlugin({ + label: "Themes", + element: require("@components/VencordSettings/ThemesTab").default, + }, +- !IS_WEB && { ++ false && !IS_WEB && { + section: "VencordUpdater", + label: "Updater", + element: require("@components/VencordSettings/UpdaterTab").default, +diff --git a/src/utils/updater.ts b/src/utils/updater.ts +index 2e2bfe1..5ebd06e 100644 +--- a/src/utils/updater.ts ++++ b/src/utils/updater.ts +@@ -38,6 +38,7 @@ async function Unwrap(p: Promise>) { + } + + export async function checkForUpdates() { ++ return false; + changes = await Unwrap(VencordNative.updater.getUpdates()); + if (changes.some(c => c.hash === gitHash)) { + isNewer = true; diff --git a/pkgs/misc/vencord/replace-git.patch b/pkgs/misc/vencord/replace-git.patch index ca377c642f25..829321638bf2 100644 --- a/pkgs/misc/vencord/replace-git.patch +++ b/pkgs/misc/vencord/replace-git.patch @@ -7,7 +7,7 @@ index 7ff599a..85b3bfa 100644 export const watch = process.argv.includes("--watch"); export const isStandalone = JSON.stringify(process.argv.includes("--standalone")); -export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim(); -+export const gitHash = "@version@"; ++export const gitHash = "v@version@"; export const banner = { js: ` // Vencord ${gitHash} diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 172bc90ded1f..ba4650768649 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2023-04-13"; + version = "unstable-2023-06-22"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "da87c79b3a35f5a4a504ea331e9ec52b4f786976"; - sha256 = "EW1roiFaSgbXWYtc5Hxgj7m/ph6g1g225nXbvp0rtsw="; + rev = "c9c716e9c11938a1aff2f30230d4dc1da38dc564"; + sha256 = "QwFWQMg9Q67eKkzGVz4zmcXtPcuLvFTUlagVxDN/2h4="; fetchSubmodules = true; }; diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index bd9d12491863..959f55ecc330 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "granted"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4+euNW/dv8OoWxVwEonI7R7aTLeM8QfG5xQlu5+PduA="; + sha256 = "sha256-/mSefgkRNhKahToUOZQ73TYERq2mV23u+M8DSJL8E4Y="; }; - vendorHash = "sha256-P7HeJUdVlqrTEMVXGlvcCr9ezEmqIw5AX/+xdcFQoH4="; + vendorHash = "sha256-SGm5jJ8savjUqgeK5wQ9dxz9BgROkKrnrSwNcojC9gE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index fd774726285b..30d676d4b2ef 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shotgun"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "neXromancers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ovqPBZznDQnQa9YW1xXA02Jl0AQ7sJNpzovA1SVR8Zc="; + sha256 = "sha256-sBstFz7cYfwVQpDZeC3wPjzbKU5zQzmnhiWNqiCda1k="; }; - cargoSha256 = "sha256-mWifSN9Hpsivq0RdZ9l9+8CWaZMHfzzhT2r27FAuesU="; + cargoSha256 = "sha256-P6riJgnEe+bNP3cUKNCfIkgKM44XGYSDADnU6w7CFDA="; meta = with lib; { description = "Minimal X screenshot utility"; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index adc21b5265c3..2a89c46f0ab1 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "sha256-zB0Cbf0JGIdh0J02crKglOFqWIqNmVyD7kHvg27egNw="; + sha256 = "sha256-ijbJ3ttSLO3UL8TBdayJeYcsBMisv4vICQW3+ZhVsuM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 3a3887922af2..40575bc598c0 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-eaObjK7mG78Ktje8D/V96tRGP68O+dE+ZWdWYPUVVIQ="; + hash = "sha256-c+DAFnHcQq1zMWFXnB0Bp1/HCeCBaUGCAd/XAClB0Lk="; }; vendorHash = "sha256-mzMoXgO60Skqh1fwN647GFctzuM6CCaYEoPIwLjYol4="; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7d01fa1c98b..f6ae01f8bea8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -606,6 +606,8 @@ self: super: with self; { argh = callPackage ../development/python-modules/argh { }; + argilla = callPackage ../development/python-modules/argilla { }; + argon2-cffi = callPackage ../development/python-modules/argon2-cffi { }; argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { }; @@ -1863,6 +1865,8 @@ self: super: with self; { clean-fid = callPackage ../development/python-modules/clean-fid { }; + cleanlab = callPackage ../development/python-modules/cleanlab { }; + cleo = callPackage ../development/python-modules/cleo { }; clevercsv = callPackage ../development/python-modules/clevercsv { }; @@ -5951,6 +5955,8 @@ self: super: with self; { luhn = callPackage ../development/python-modules/luhn { }; + luqum = callPackage ../development/python-modules/luqum { }; + luxor = callPackage ../development/python-modules/luxor { }; luxtronik = callPackage ../development/python-modules/luxtronik { }; @@ -6482,6 +6488,8 @@ self: super: with self; { msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; + msg-parser = callPackage ../development/python-modules/msg-parser { }; + msgspec = callPackage ../development/python-modules/msgspec { }; msldap = callPackage ../development/python-modules/msldap { }; @@ -11382,6 +11390,8 @@ self: super: with self; { snitun = callPackage ../development/python-modules/snitun { }; + snorkel = callPackage ../development/python-modules/snorkel { }; + snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { };