diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 9b3068796d8e..5061666f57ce 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1291,7 +1291,10 @@ in { SystemCallArchitectures = "native"; # Upstream grafana is not setting SystemCallFilter for compatibility # reasons, see https://github.com/grafana/grafana/pull/40176 - SystemCallFilter = [ "@system-service" "~@privileged" ]; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ] ++ lib.optional (cfg.settings.server.protocol == "socket") [ "@chown" ]; UMask = "0027"; }; preStart = '' diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index f6566d449709..8bf4caad7fbf 100644 --- a/nixos/tests/grafana/basic.nix +++ b/nixos/tests/grafana/basic.nix @@ -25,6 +25,22 @@ let extraNodeConfs = { sqlite = {}; + socket = { config, ... }: { + services.grafana.settings.server = { + protocol = "socket"; + socket = "/run/grafana/sock"; + socket_gid = config.users.groups.nginx.gid; + }; + + users.users.grafana.extraGroups = [ "nginx" ]; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."_".locations."/".proxyPass = "http://unix:/run/grafana/sock"; + }; + }; + declarativePlugins = { services.grafana.declarativePlugins = [ pkgs.grafanaPlugins.grafana-clock-panel ]; }; @@ -92,6 +108,17 @@ in { ) sqlite.shutdown() + with subtest("Successful API query as admin user with sqlite db listening on socket"): + socket.wait_for_unit("grafana.service") + socket.wait_for_open_port(80) + print(socket.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1/api/org/users -i" + )) + socket.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1/api/org/users | grep admin\@localhost" + ) + socket.shutdown() + with subtest("Successful API query as admin user with postgresql db"): postgresql.wait_for_unit("grafana.service") postgresql.wait_for_unit("postgresql.service") diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index fe0bed84b505..6a9707dd4110 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.6.1", - "repo_hash": "sha256-cdwfljmJvApU2q0pmWSmcMnHkQH4hfN7+cld5oP880g=", + "version": "15.6.2", + "repo_hash": "sha256-WMDst9BHjqK5UIYKzqJJnhrLPHxV0PmW+r8FGBueBs8=", "yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.6.1-ee", + "rev": "v15.6.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.6.1", + "GITALY_SERVER_VERSION": "15.6.2", "GITLAB_PAGES_VERSION": "1.63.0", "GITLAB_SHELL_VERSION": "14.13.0", - "GITLAB_WORKHORSE_VERSION": "15.6.1" + "GITLAB_WORKHORSE_VERSION": "15.6.2" }, "vendored_gems": [ "bundler-checksum", diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 14e9344b1854..5f47a29cf1e5 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.6.1"; + version = "15.6.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-mzX+6kMXqdrxqMaUwN2tG5kJgKSRv0/tNN8ibHqBbzU="; + sha256 = "sha256-or5Z96BCLFUC4r9bAZf9ytUOt4WozqwwuWGFuX2ix9k="; }; vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index be226c94f43b..3cf201a9fef5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.6.1"; + version = "15.6.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index cf08454a6496..a2997bff4d3b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -336,8 +336,7 @@ gem 'pg_query', '~> 2.2' gem 'premailer-rails', '~> 1.10.3' -# LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.28.0' +gem 'gitlab-labkit', '~> 0.29.0' gem 'thrift', '>= 0.16.0' # I18n diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 2174cec05f8a..c179654f21dd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -575,7 +575,7 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.28.0) + gitlab-labkit (0.29.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -1668,7 +1668,7 @@ DEPENDENCIES gitlab-dangerfiles (~> 3.6.2) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.4.0) - gitlab-labkit (~> 0.28.0) + gitlab-labkit (~> 0.29.0) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 54d4cfb85aab..69ac4830afce 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2084,10 +2084,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7"; + sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; gitlab-license = { groups = ["default"]; diff --git a/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix index 34f32e4f117c..4b6c0d89a82a 100644 --- a/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "xenstore-tool"; - inherit (xenstore_transport) src version useDune2 minimumOCamlVersion; + inherit (xenstore_transport) src version; buildInputs = [ xenstore_transport xenstore lwt ]; diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 189920290e37..745752947232 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -1,25 +1,23 @@ { lib, buildDunePackage, fetchurl -, cstruct, ppx_cstruct, lwt, ounit, stdlib-shims +, cstruct, ppx_cstruct, lwt, ounit2 }: buildDunePackage rec { pname = "xenstore"; - version = "2.1.1"; + version = "2.2.0"; - minimumOCamlVersion = "4.04"; - - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-xenstore/releases/download/${version}/xenstore-${version}.tbz"; - sha256 = "283814ea21adc345c4d59cfcb17b2f7c1185004ecaecc3871557c961874c84f5"; + url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; + hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0="; }; nativeBuildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ stdlib-shims cstruct lwt ]; + propagatedBuildInputs = [ cstruct lwt ]; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; meta = with lib; { description = "Xenstore protocol in pure OCaml"; diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix index 1981f2d5cabb..a7fb853f3bec 100644 --- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -4,8 +4,7 @@ buildDunePackage rec { pname = "xenstore_transport"; version = "1.3.0"; - minimumOCamlVersion = "4.04"; - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "xapi-project"; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 98d86b25c67f..8263104c3915 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-2ZruUkSpLclsz3ZSyTM+UshfGG4bHwfQMM8UFjlkvBg="; + hash = "sha256-U3hIKmgnafkuVLi1r42BBXDKVcSSvLaRnmOEANasEyY="; }; prePatch = '' diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index ff8265beac92..5123b9be6856 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.57"; + version = "8.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BX0ZZpYvuGs9xEe/rCyOJc7td0UJ5JsYCSahOpmRAxg="; + hash = "sha256-AXn2iNSMDn4WHre52G1YeUCvH1F0+Xwf39iTxZnA2Uo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index db3aef0b2bb0..23d4c3f7f5f4 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qdsSM+7ScSfxhmLAqwi1iraGHrhb5NBee/j+TKr2WUA="; + hash = "sha256-V23pgHQ9GdZ2mukFEMAhkp+dl/CQTGxWHAhF7s1VvHo="; }; propagatedBuildInputs = [ @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Some out-of-the-box hooks for pre-commit"; homepage = "https://github.com/pre-commit/pre-commit-hooks"; + changelog = "https://github.com/pre-commit/pre-commit-hooks/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index c9b344e5acf9..a23de9c8d70c 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; + hash = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; checkInputs = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-engineio/"; + changelog = "https://github.com/miguelgrinberg/python-engineio/blob/v${version}/CHANGES.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index a6b2bc0d247a..99cbce9ae1c3 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.7.1"; + version = "5.7.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,17 +23,24 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; + hash = "sha256-mSFs/k+3Lp5w4WdOLKj65kOA5b+Nc1uuksVmeeqV58E="; }; propagatedBuildInputs = [ - aiohttp bidict python-engineio - requests - websocket-client ]; + passthru.optional-dependencies = { + client = [ + requests + websocket-client + ]; + asyncio_client = [ + aiohttp + ]; + }; + checkInputs = [ mock msgpack @@ -51,6 +58,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-socketio/"; + changelog = "https://github.com/miguelgrinberg/python-socketio/blob/v${version}/CHANGES.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 6d3c9d5e397d..34b22109d8e4 100644 --- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -1,24 +1,27 @@ { lib -, python-dateutil -, python-socketio -, requests -, jsonschema -, pythonOlder -, pytestCheckHook , buildPythonPackage , fetchFromGitHub +, jsonschema +, pytestCheckHook +, python-dateutil +, python-socketio +, pythonOlder +, requests }: buildPythonPackage rec { pname = "ripe-atlas-cousteau"; version = "1.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "RIPE-NCC"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; + hash = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; }; postPatch = '' @@ -30,7 +33,7 @@ buildPythonPackage rec { python-dateutil requests python-socketio - ]; + ] ++ python-socketio.optional-dependencies.client; checkInputs = [ pytestCheckHook @@ -44,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for RIPE ATLAS API"; homepage = "https://github.com/RIPE-NCC/ripe-atlas-cousteau"; + changelog = "https://github.com/RIPE-NCC/ripe-atlas-cousteau/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Only; maintainers = with maintainers; [ raitobezarius ]; }; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 8f8d49d34f1a..0f67fe231a33 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -18,17 +18,19 @@ buildPythonPackage rec { pname = "tpm2-pytss"; - version = "1.2.0"; + version = "2.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OgWWTjcj3Qd4dSaCwY+fuRQpLSFn4+9o11kPR9n8a54="; + hash = "sha256-iN5ePKMnYh1VzGbKtwdIx1tG74T+8ax/AqDGgermr90="; }; nativeBuildInputs = [ cffi - pkgconfig # this is the python module + pkgconfig # this is the Python module pkg-config # this is the actual pkg-config tool setuptools-scm ]; @@ -52,10 +54,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "tpm2_pytss" ]; + pythonImportsCheck = [ + "tpm2_pytss" + ]; meta = with lib; { homepage = "https://github.com/tpm2-software/tpm2-pytss"; + changelog = "https://github.com/tpm2-software/tpm2-pytss/blob/${version}/CHANGELOG.md"; description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)"; license = licenses.bsd2; maintainers = with maintainers; [ baloo ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 56f79842c7a4..8384c45e6600 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.15.8"; + version = "3.17.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bFUDm6/4XUyyrMxc1KKqbVi1gmUJ7Lxonei/HxlmGwI="; + sha256 = "sha256-Aluy+jouh73Whz8R20Wnyhkhby+Lau0pFA/KV+MsKY4="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index c530218b79fc..325ce0e5fce8 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.12.0"; + version = "4.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ru0DCl9MOrU4uZvLXDxM4txD0D/GR4eYBHvqeMcbTVA="; + hash = "sha256-jyH2qJoVFuNwZCOtl2CvuuMCpJXCvlxcaHJd7fT1XzA="; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Twitter library for Python"; homepage = "https://github.com/tweepy/tweepy"; + changelog = "https://github.com/tweepy/tweepy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index acf092b8411c..39430b92140d 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.4"; + version = "2.8.19.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NRqMqa/UrqZi+HwXJNLhrln59fmWkb47OxHSOTzTqqE="; + hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 7ba9ad6d971a..e1ff2f67a315 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2022.6.0.1"; + version = "2022.7.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0HgZY3TRJ36fmYTUk3PqBDzyxk1dXEkfvIbCWFV71G8="; + sha256 = "sha256-TyDClTs6OgWH6USJ7EyeAsPTrtubpc1+eW4S9M+nAn4="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 8928dda88fef..e69d9dc8ec48 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.21.3"; + version = "4.3.21.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Lh8YQFYYjIdU3tC1Fz3AGCTSv+QZdf4xgGimi+7ftiw="; + sha256 = "sha256-95afc6D3np54lfBToG2LQp+3tdT+Emm47kBGM4j2U60="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix index f9bc60a8b92c..fe16137f19a8 100644 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.8.1"; + version = "1.5.8.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-9kwV7ATAkRgZrEwP0AUnlRMgAfv16iPR1+T+rX3km/w="; + hash = "sha256-OmK8JRaPi0TOdOERT5+8Luh9bpbjiAy+85qtlSJVW04="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 1a5e718d451b..7a76ebeb8f28 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -1,6 +1,7 @@ { lib , appdirs , buildPythonPackage +, cryptography , fetchFromGitHub , multitasking , numpy @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.77"; + version = "0.1.93"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,11 +22,12 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gg9wX3WWacS5BmbR1wgdicFxhPN5b45KH0+obWmJ65g="; + hash = "sha256-AyuIngXReI4PX554SuGIgoQoklFieZiEZzeVBcvPvEk="; }; propagatedBuildInputs = [ appdirs + cryptography multitasking numpy pandas @@ -41,8 +43,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Yahoo! Finance market data downloader (+faster Pandas Datareader)"; - homepage = "https://aroussi.com/post/python-yahoo-finance"; + description = "Module to doiwnload Yahoo! Finance market data"; + homepage = "https://github.com/ranaroussi/yfinance"; + changelog = "https://github.com/ranaroussi/yfinance/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 63d7a3919511..461b250fa6b9 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.5.0"; + version = "3.5.3"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-kwur74jaAjGch4Jruq6OX1lWqX8b3NZYvxxNsp+n/TI="; + hash = "sha256-D/i1KGKPuhayKU8jaXhWnVgpU5Z/SG12AW8R7bgSQh8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index f122aaf641db..effba31ef8fd 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.9"; + version = "3.1.1"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "HGN2CKJ76FzgKkOsU5pLMsRl7hEGMcZ8Loa2YP0P558="; + sha256 = "+59/5vfwx9fys7Q63SahVPS/ckvwkr4w6T37UqAnwZ4="; }; buildInputs = [ linuxHeaders ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}" - for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko; do + for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko uniwill_wmi.ko; do mv src/$module $out/lib/modules/${kernel.modDirVersion} done ''; diff --git a/pkgs/tools/misc/usbmuxd2/default.nix b/pkgs/tools/misc/usbmuxd2/default.nix new file mode 100644 index 000000000000..f4ac629d073c --- /dev/null +++ b/pkgs/tools/misc/usbmuxd2/default.nix @@ -0,0 +1,85 @@ +{ lib +, clangStdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libimobiledevice +, libusb1 +, avahi +, clang +}: let + + libgeneral = clangStdenv.mkDerivation rec { + pname = "libgeneral"; + version = "unstable-2021-12-12"; + src = fetchFromGitHub { + owner = "tihmstar"; + repo = pname; + rev = "017d71edb0a12ff4fa01a39d12cd297d8b3d8d34"; + sha256 = "sha256-NrSl/BeKe3wahiYTHGRVSq3PLgQfu76kHCC5ziY7cgQ="; + }; + postPatch = '' + # Set package version so we don't require git + sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac + ''; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + meta = with lib; { + description = "Helper library used by usbmuxd2"; + homepage = "https://github.com/tihmstar/libgeneral"; + license = licenses.lgpl21; + platforms = platforms.all; + }; + }; + +in +clangStdenv.mkDerivation rec { + pname = "usbmuxd2"; + version = "unstable-2022-02-07"; + + src = fetchFromGitHub { + owner = "tihmstar"; + repo = pname; + rev = "753b79eaf317c56df6c8b1fb6da5847cc54a0bb0"; + hash = "sha256-T9bt3KOJwFpdPeFuXfBhkBZNaNzix3Q3D47vASR+fVg="; + }; + + postPatch = '' + # Set package version so we don't require git + sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac + # Do not check libgeneral version + sed -i 's/libgeneral >= 39/libgeneral/' configure.ac + ''; + + nativeBuildInputs = [ + autoreconfHook + clang + pkg-config + ]; + + propagatedBuildInputs = [ + avahi + libgeneral + libimobiledevice + libusb1 + ]; + + configureFlags = [ + "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + makeFlags = [ + "sbindir=${placeholder "out"}/bin" + ]; + + meta = with lib; { + homepage = "https://github.com/tihmstar/usbmuxd2"; + description = "A socket daemon to multiplex connections from and to iOS devices"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d384c6dd086..ff60bc1d6a36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12594,6 +12594,8 @@ with pkgs; usbmuxd = callPackage ../tools/misc/usbmuxd {}; + usbmuxd2 = callPackage ../tools/misc/usbmuxd2 {}; + ustreamer = callPackage ../applications/video/ustreamer { }; usync = callPackage ../applications/misc/usync { }; @@ -15811,7 +15813,13 @@ with pkgs; openssl = openssl_1_1; }; - clisp = callPackage ../development/interpreters/clisp { }; + clisp = callPackage ../development/interpreters/clisp { + # On newer readline8 fails as: + # # + # does not have the required size or alignment + readline = readline6; + }; + clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter {