diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 5c35cfa177a2..72fad73bae50 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -587,7 +587,10 @@ in Restart = "always"; # Runtime directory and mode RuntimeDirectory = "gitea"; - RuntimeDirectoryMode = "0755"; + RuntimeDirectoryMode = "0750"; + # Proc filesystem + ProcSubset = "pid"; + ProtectProc = "invisible"; # Access write directories ReadWritePaths = [ cfg.customDir cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ]; UMask = "0027"; @@ -607,15 +610,17 @@ in ProtectKernelModules = true; ProtectKernelLogs = true; ProtectControlGroups = true; - RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6" ]; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; LockPersonality = true; MemoryDenyWriteExecute = true; RestrictRealtime = true; RestrictSUIDSGID = true; + RemoveIPC = true; PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @setuid @swap"; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" "setrlimit" ]; }; environment = { diff --git a/nixos/tests/deepin.nix b/nixos/tests/deepin.nix index 0fe93486b6cb..acec27ca1c42 100644 --- a/nixos/tests/deepin.nix +++ b/nixos/tests/deepin.nix @@ -10,6 +10,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { ./common/user-account.nix ]; + virtualisation.memorySize = 2048; + services.xserver.enable = true; services.xserver.displayManager = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c05ace52d545..9b20443b660a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1175,8 +1175,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.15.1"; - sha256 = "sha256-u7Vrj55u5BVZ9AAjarKV9veq2kTgEqeQvhV1j+HSIxU="; + version = "0.15.2"; + sha256 = "sha256-Zu/AcV0KY3QV0hyZsGrQdbc/Qc0pKNHVkHZVJ3PL0ps="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 4505aceee869..5a0d120e4c2a 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.114.1"; + version = "0.115.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - hash = "sha256-kez84MWr/ld74S2Pv0U4WyeZAbdAdrjg8eOsISeuzbg="; + hash = "sha256-q8HN8OloZomg7znL6pnWJyZ1q/LT7qIb3Y/IYZas9j4="; }; - vendorHash = "sha256-dE2mWCfBr0Ss6I42b+cZAXuK63fxWad1vuZETW59cXI="; + vendorHash = "sha256-1GGTK0t/DWXhnuvx6QQjLLoZA8bwVNE3lu7ut8FLHoM="; doCheck = false; diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix index e49a9c2176c2..8283cebb38ab 100644 --- a/pkgs/applications/misc/kord/default.nix +++ b/pkgs/applications/misc/kord/default.nix @@ -1,4 +1,6 @@ { lib +, stdenv +, darwin , fetchFromGitHub , rustPlatform , pkg-config @@ -26,8 +28,11 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ] + ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + + buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; meta = with lib; { description = "A music theory binary and library for Rust"; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 6c631ad3130f..d74a639a4e9c 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -80,13 +80,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-gTWQSqgksZMxdaZ7V3hmnqXlZ+OMI86RX0lC8z1AEzI="; + hash = "sha256-T0kK9JaaX8+hUxsnG/TftGPHWwkhPDx4nqGrplmIiI0="; }; propagatedBuildInputs = with self; [ diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 4fb5779f0bae..3b78353edf89 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2023.5.1"; + version = "2023.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-Pt/iyBMAHMNxN92UAXPNoVXh8kOGdD5+JGZlXEioByY="; + hash = "sha256-ZqiIt5zWEfw6Edi+q5/kAh/g3W/+OPNxKf/NWOnpCqY="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index b31c776c88d6..46cbafff2ad9 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -51,7 +51,7 @@ rec { # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad = nomad_1_4; + nomad = nomad_1_5; nomad_1_2 = generic { buildGoModule = buildGo120Module; diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 16622bb5da5a..928a6509333b 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-yMAQEgQPySz5xvbnzO3omiqEajDjSqFt/UroJ04tUY8="; + sha256 = "sha256-9Y+NvKJ6+lzLaIIEgpY5zwiKd+mb9sbOcS5rsH2yB8g="; }; - vendorHash = "sha256-kv5kNFFw57ZuNgwNMucmCPIwaAhpzT0hs2K1B65WxpU="; + vendorHash = "sha256-lZwj8Ne6/XYkmjYhytT75DyJWwweuX0x88VsGdKTMac="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 71192486cd61..2088483263ae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,13 +28,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-wXNCEaLfZAEX1ExnUjUkkGwwD/YDSD6dzj2unNWVZbU=", + "hash": "sha256-rmXfUMP1CWKV7ahxfmCr2FvWYcEWKh+V3fWSQWvcUDU=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.5.0", + "rev": "v4.6.0", "spdx": "MIT", - "vendorHash": "sha256-9DCu0qqQl4qnnyp+KvuAuJMRjtiejpkyiBxkKUBpoGg=" + "vendorHash": "sha256-oUUl7m7+r10xSklrcsTYOU8wk8n7TLu6Qt50wTKLULk=" }, "akamai": { "hash": "sha256-RIJarmJZHDl5XhXLnr1igiBq9Uu9/2N+vhosPFTs2tg=", @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-3tJoKGjsBb80Z+2XSLvUKcKApDNY+wmVbq4Qb45r1uo=", + "hash": "sha256-MT/A2P2E/fQUUClwBnDGff0i39iNjN4pMdtazHjgCkA=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.5.0", + "rev": "v5.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-4bQ0GRcbIRk240BSccQ5SZBDDLmJGRs4r9ZzATfjp60=" + "vendorHash": "sha256-y+X4sSWkcGcQfDUomdCUOkogNglahRTCx7bbABY9GXs=" }, "azuread": { "hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=", @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-WA4wXUkYCxFV7b/Gr3TvrFtZWJAr0CI2F2a6gsSbRjU=", + "hash": "sha256-iZg9iTmomNmk8K1gPfXZNiesJPuKyjfBdTyoeV7qBdo=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.62.1", + "rev": "v3.63.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -381,11 +381,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-/TVsH07uWVI0hhN5ulzSW2nGUEaaW3ZiePT+wGoatKY=", + "hash": "sha256-Fp2wj5UTl00ufDKobsIvf4f6SCug7NTuWFf2Rkp3RL0=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.2.1", + "rev": "v5.2.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -673,11 +673,11 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-9Z1FxCWNDlQ64ZY7UBQkQQJJpZeshw7kkeyjFCt/Fos=", + "hash": "sha256-dX6sG8htSZgs/OSfH09gfx4ng3Sj0uAdzQFMrVwibPk=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.5.0", + "rev": "v2.5.1", "spdx": "MPL-2.0", "vendorHash": "sha256-n9ZZsTNE4E3T3SjF3+JjElDq5PVaD9o2Q2ATexRS/q0=" }, @@ -854,29 +854,29 @@ "vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A=" }, "openstack": { - "hash": "sha256-UGs2Os7cWSd69ekzyoDLwzJxhGgUJbDJyrCIc6ipcwY=", + "hash": "sha256-Iauu0sQf8wq4Ev8JflxrthXYe99YDnt5ZzWQ/q3Bjfw=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.51.1", + "rev": "v1.52.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI=" + "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" }, "opentelekomcloud": { - "hash": "sha256-UtgVaX7gRp9+0KQTKLPeQmPZ1eg4LgEiNb7FTcF3eKA=", + "hash": "sha256-VPXuM1w6A/dNJcdpEQsi9wmp93urJclWN5jLMBme9h8=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.1", + "rev": "v1.35.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-OT6VKLCc1sCPe4r/L5lhSF9BLLYU0iNNW21fSrEF7mA=" + "vendorHash": "sha256-TKYKKw6Mrq7hhM+at9VAiVxIpjYeg7AmEIEzfDIJA5M=" }, "opsgenie": { - "hash": "sha256-SjvFRwhWK3COj9SaehT2XnMxK5z7qA+5LvGCFHRuiiQ=", + "hash": "sha256-S3hVBO9amg4uQzwTnkpVBgLdf1+IMhRkDSnZJ6pHXk4=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.25", + "rev": "v0.6.26", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1016,13 +1016,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-H3+2lyn17FwF/zskVAzz0mYnyPkL2/otqoCkgcVFWf4=", + "hash": "sha256-mG3JUf7OASLvsfD7jk1p4CQRfrDj/TNnUKD1SzHQqEA=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.24.0", + "rev": "v7.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0fqIaIINBvTAHVHZP/AcS4hNyjXHM+wfHp/0I7xqRhg=" + "vendorHash": "sha256-JE6gg32TmpEHxskJjFaqeg0tfR463fUUnwKzc0O08eo=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index dd5cfe31fe92..f3a1bca06254 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gt0M1o/zC5eJc4Mc21UwT5eu+mCO4+4F5PjRiCExKjg="; + hash = "sha256-Grm2TlBdfRqEeyW+Mvf4lMJokctrCDscm1AmkNzcZps="; }; vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA="; diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 51fc9c8e898c..26ecf043a4d5 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib +, fetchFromGitHub +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "lieer"; - version = "1.3"; + version = "1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "gauteh"; repo = "lieer"; - rev = "v${version}"; - sha256 = "12sl7d381l1gjaam419xc8gxmsprxf0hgksz1f974qmmijvr02bh"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-2LujfvsxMHHmYjYOnLJaLdSlzDeej+ehUr4YfVe903U="; }; propagatedBuildInputs = with python3Packages; [ - notmuch + notmuch2 oauth2client google-api-python-client tqdm @@ -21,7 +25,10 @@ python3Packages.buildPythonApplication rec { # no tests doCheck = false; - pythonImportsCheck = [ "lieer" ]; + + pythonImportsCheck = [ + "lieer" + ]; meta = with lib; { description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; diff --git a/pkgs/applications/networking/mailreaders/mswatch/default.nix b/pkgs/applications/networking/mailreaders/mswatch/default.nix new file mode 100644 index 000000000000..41f0ac2fe488 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mswatch/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchzip +, pkg-config +, autoreconfHook +, bison +, flex +, glib +}: + +stdenv.mkDerivation rec { + pname = "mswatch"; + # Stable release won't compile successfully + version = "unstable-2018-11-21"; + + src = fetchzip { + url = "https://sourceforge.net/code-snapshots/svn/m/ms/mswatch/code/mswatch-code-r369-trunk.zip"; + hash = "sha256-czwwhchTizfgVmeknQGLijYgaFSP/45pD2yhDKj5BKw="; + }; + nativeBuildInputs = [ + pkg-config + autoreconfHook + bison # For yacc + flex + ]; + buildInputs = [ + glib + ]; + + meta = with lib; { + description = "A command-line Linux utility that efficiently directs mail synchronization between a pair of mailboxes."; + homepage = "https://mswatch.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 963a78bf06ff..14cfac4c1e6e 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gerbv"; - version = "2.9.7"; + version = "2.9.8"; src = fetchFromGitHub { owner = "gerbv"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KxKNMWhWwmlIpueDOSWAWADEHFha8axywPJ6rRz0jIg="; + hash = "sha256-6r9C5qDOXsQoLsYMSCuIS01gI0ijH7WDoepcowo1yQw="; }; postPatch = '' diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 03fd5e6f6c0f..1518d2d5a9c9 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -89,6 +89,8 @@ python3.pkgs.buildPythonApplication rec { # Tests require access to real cloud services doCheck = false; + pythonImportsCheck = [ "dvc" "dvc.api" ]; + meta = with lib; { description = "Version Control System for Machine Learning Projects"; homepage = "https://dvc.org"; diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix index af3c39a149a1..c8915e3f354c 100644 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "deepin-calculator"; - version = "5.8.23"; + version = "5.8.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-MczQWYIQfpSkyA3144y3zly66N0vgcVvTYR6B7Hq1aw="; + sha256 = "sha256-Gv4X1vT3w3kd1FN6BBpUeG2VBz/e+OWLBQyBL7r3BrI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index a80381f041d1..e55640cbd094 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-camera"; - version = "1.4.11"; + version = "1.4.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ="; + sha256 = "sha256-h4oCxtj9GwaZqioZ4vFx2Cq8a1w7lYQvOhDAd7x9gMU="; }; # QLibrary and dlopen work with LD_LIBRARY_PATH diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index e512dd277545..0a2c84763f2e 100644 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "deepin-image-viewer"; - version = "5.9.11"; + version = "5.9.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-IkjAW4bqQLEWF2tgccYCVnQgcEp9DJoXrEx2HDC25gs="; + sha256 = "sha256-T/hbygnbao5rbw0gHH0ULHOz/2j70ktyzYGWXPDCJoQ="; }; patches = [ diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index b4741fe2f9c1..0dda3c3860f7 100644 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "deepin-movie-reborn"; - version = "5.10.23"; + version = "5.10.28"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-0m8wYRQGsdN4zpnHUJKCfF05SdvTauRSp6gCu2F9ZAI"; + sha256 = "sha256-aILaiVkApXBKJUxvQ1k7CHzL3IOwshsTTjW5Ak31xEM="; }; patches = [ diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index ecd7fde5944d..fe39459ec046 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "deepin-music"; - version = "6.2.27"; + version = "6.2.28"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-0adAAQe9WG1G+JcxD4ypYyYE4MrRijfuj/VBno2WsLk="; + sha256 = "sha256-rSaB8kIbpyPuhw3vWLWlXgY6xJpxLL8DktgcBoca0L0="; }; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 442132787d72..c24bb6716138 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.3.1"; + version = "6.4.0"; outputs = [ "out" "dev" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-JFkyO4r/Fb8bjWn+wVS2rIpFz19/uBVCsLt8091xzVI="; + sha256 = "sha256-mpCB8jRE9QIUiyBWkfYpfm6dsnMDcWvwwg8twbOiZ6I="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 622e935e1c2b..0f4736990cf3 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "sideload"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-AIfQDkodxc3zKi9oYBWIkOw1UgW+nXufNXbpM1Jxjtg="; + sha256 = "sha256-BkU2lANn2KNaElL/JZ3TPVZIjh8eM3//ZiO4lFBIMm8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 498b8ce432ad..3514091f1ed9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; - version = "6.5.2"; + version = "6.5.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-IW6twvEbCzQbuNFnryHxer5rK5zYfbmilcLjHCV9ZsM="; + sha256 = "sha256-qERXF7aymI2xbyqrD6rwUBiFNRnIiVllavSPgW0F8yk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 9ba16c2eb765..d7bd9c926ede 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -109,10 +109,6 @@ lib.makeScope pkgs.newScope (self: with self; { gala = callPackage ./desktop/gala { }; - gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract { - inherit (gnome) gnome-bluetooth_1_0; - }; - wingpanel = callPackage ./desktop/wingpanel { }; wingpanel-with-indicators = callPackage ./desktop/wingpanel/wrapper.nix { @@ -248,6 +244,8 @@ lib.makeScope pkgs.newScope (self: with self; { file-roller = pkgs.gnome.file-roller; # added 2022-03-12 + gnome-bluetooth-contract = throw "pantheon.gnome-bluetooth-contract has been removed, abandoned by upstream."; # added 2022-06-30 + notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 } diff --git a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix deleted file mode 100644 index 6df583c2ce6a..000000000000 --- a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, unstableGitUpdater -, substituteAll -, gnome-bluetooth_1_0 -}: - -stdenv.mkDerivation rec { - pname = "gnome-bluetooth-contract"; - version = "unstable-2021-02-22"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = pname; - rev = "8dcd4d03dc7a7d487980fd8bc95af985dc4fff5c"; - sha256 = "sha256-9eX6j/cvN/CoqrHrh9mZEsUJ8viDWIGxIva1xFwIK7c="; - }; - - patches = [ - (substituteAll { - src = ./exec-path.patch; - # sendto device selection is removed in gnome-bluetooth 42 - # https://github.com/elementary/gnome-bluetooth-contract/issues/1 - gnome_bluetooth = gnome-bluetooth_1_0; - }) - ]; - - dontConfigure = true; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/contractor - cp *.contract $out/share/contractor/ - - runHook postInstall - ''; - - passthru = { - updateScript = unstableGitUpdater { - url = "https://github.com/elementary/gnome-bluetooth-contract.git"; - }; - }; - - meta = with lib; { - description = "Contractor extension for GNOME Bluetooth"; - homepage = "https://github.com/elementary/gnome-bluetooth-contract"; - license = licenses.gpl3Plus; - maintainers = teams.pantheon.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/exec-path.patch b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/exec-path.patch deleted file mode 100644 index c0bd9e579f46..000000000000 --- a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/exec-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/io.elementary.contracter.gnome-bluetooth.contract b/io.elementary.contracter.gnome-bluetooth.contract -index 3eb2334..ce0e5f5 100644 ---- a/io.elementary.contracter.gnome-bluetooth.contract -+++ b/io.elementary.contracter.gnome-bluetooth.contract -@@ -3,5 +3,5 @@ Name=Send Files via Bluetooth - Icon=bluetooth - Description=Send files to device... - MimeType=!inode; --Exec=bluetooth-sendto %F -+Exec=@gnome_bluetooth@/bin/bluetooth-sendto %F - Gettext-Domain=gnome-bluetooth2 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 8f00b01ee331..81604c472446 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -19,24 +18,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-t8Sn8NQW7WueinPkJdn8hd0oCJ3uFeRJliggSFHoaZU="; + sha256 = "sha256-VLW3r5X0AWhNRQpajYmCNMIl/UvZCWz14gpxZLlLJdQ="; }; - patches = [ - # Prevent a race that skips automatic resource loading - # https://github.com/elementary/wingpanel-indicator-bluetooth/issues/203 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-bluetooth/commit/4f9237c0cb1152a696ccdd2a2fc83fc706f54d62.patch"; - sha256 = "sha256-fUnqw0EAWvtpoo2wI++2B5kXNqQPxnsjPbZ7O30lXBI="; - }) - ]; - nativeBuildInputs = [ glib # for glib-compile-schemas libxml2 diff --git a/pkgs/development/interpreters/erlang/24.nix b/pkgs/development/interpreters/erlang/24.nix index 2cea49fd9409..da1ab11a524e 100644 --- a/pkgs/development/interpreters/erlang/24.nix +++ b/pkgs/development/interpreters/erlang/24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.12"; - sha256 = "sha256-XrQvpIHCxXbcaP9cvX1nwl9LumZeVzlgRJwq2Dj0VoY="; + version = "24.3.4.13"; + sha256 = "sha256-2+Fmj6qUJoutLXbexgPRpJbspnzuwSfu4OpyRd+7N3Y="; } diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index 4d04abee3adc..9e779dea6d89 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , ninja , pkg-config , meson @@ -20,6 +21,22 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w="; }; + patches = [ + # Fix compatibility issues with curl > 7.85, see: + # https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a + # PATCH CAN BE REMOVED AFTER 0.3.0 + (fetchpatch { + url = "https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a.patch"; + hash = "sha256-hOBk7riuVI7k7qe/SMq3XJnFzyZ0gB9kVG7dKvWOsPY="; + }) + # Fix error when building with fmt >= 10, see: + # https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc + # PATCH CAN BE REMOVED AFTER 0.3.0 + (fetchpatch { + url = "https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch"; + hash = "sha256-a52Id7Nm3Mmmwv7eL58j6xovjlkpAO4KahVM/Q3H65w="; + }) + ]; nativeBuildInputs = [ ninja pkg-config meson ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 305d460ffc67..e648492b55c9 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "12mkg5gncwj7c3l7j6jcsnbwi4fxczvm51x2dgg0my7bl5ja6pd0"; - platforms."x86_64-linux".sha256 = "0nwvqs3l881w6d7gmcpgf6p3sbbjlzmbnz8imzijpnmki71j9s7f"; + platforms."aarch64-linux".sha256 = "1lymwdc0199nx46ah617hig85nghjwp4m97rcagfjb490rsn4kpg"; + platforms."x86_64-linux".sha256 = "0nh3rknnirm59ppcndifpzmay16018ahp2vxmfbkyx54pl10n3d9"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "114.2.11"; - gitRevision = "87c8807"; - chromiumVersion = "114.0.5735.134"; + version = "114.2.12"; + gitRevision = "7c09f21"; + chromiumVersion = "114.0.5735.199"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index bec3bba51e6e..7be484538ab1 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,45 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, strace, which }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch2 +, autoreconfHook +, strace +, which +}: stdenv.mkDerivation rec { pname = "libeatmydata"; - version = "105"; + version = "131"; src = fetchFromGitHub { owner = "stewartsmith"; repo = pname; - rev = "${pname}-${version}"; - sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc="; }; patches = [ - ./find-shell-lib.patch - # Fixes "error: redefinition of 'open'" on musl - (fetchpatch { + (fetchpatch2 { url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch"; - stripLen = 1; - sha256 = "sha256-yfMfISbYL7r/R2C9hYPjvGcpUB553QSiW0rMrxG11Oo="; + hash = "sha256-MZfTgf2Qn94UpPlYNRM2zK99iKQorKQrlbU5/1WJhJM="; }) ]; - patchFlags = [ "-p0" ]; - postPatch = '' - substituteInPlace eatmydata.in \ - --replace NIX_OUT_DIR $out - patchShebangs . ''; nativeBuildInputs = [ autoreconfHook - ] ++ lib.optionals doCheck [ strace which ]; + ]; + + nativeCheckInputs = [ + strace + which + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - # while we can *build* in parallel, the tests also run in parallel which does - # not work with v105. Later versions (unreleased) have a fix for that. The - # problem is that on hydra we cannot use strace, so the tests don't run there. enableParallelBuilding = true; - doCheck = false; meta = with lib; { description = "Small LD_PRELOAD library to disable fsync and friends"; diff --git a/pkgs/development/libraries/libeatmydata/find-shell-lib.patch b/pkgs/development/libraries/libeatmydata/find-shell-lib.patch deleted file mode 100644 index a6320edda29d..000000000000 --- a/pkgs/development/libraries/libeatmydata/find-shell-lib.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- eatmydata.in 2020-02-01 18:10:59.618679823 -0800 -+++ eatmydata.in.new 2020-02-01 18:08:25.092620247 -0800 -@@ -15,15 +15,8 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . - --export `dpkg-architecture|grep DEB_BUILD_MULTIARCH` -- --shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh" --if [ -f "$shlib" ]; then -- . "$shlib" --else -- echo "Unable to locate eatmydata shell library, it was not enabled" >&2 -- exec "$@" --fi -+shlib="NIX_OUT_DIR/libexec/eatmydata.sh" -+. "$shlib" - - usage() - { diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 3eb1d47c98d1..1636d6cd6c65 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -13,10 +13,6 @@ , x11Support ? !stdenv.isDarwin }: -let - inherit (lib) getLib optional optionalString; - -in stdenv.mkDerivation rec { pname = "libepoxy"; version = "1.5.10"; @@ -33,7 +29,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs src/*.py '' - + optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" ''; @@ -41,8 +37,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; - buildInputs = lib.optionals x11Support [ + buildInputs = lib.optionals (x11Support && !stdenv.isDarwin) [ libGL + ] ++ lib.optionals x11Support [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Carbon @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { "-Dx11=${lib.boolToString x11Support}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) preCheck = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 5407a74ee2ba..35811b8129a6 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.40.2"; + version = "2.40.3"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-lomIcNmU2kBu56YygW3N6aO7OV7l80T8s/O4zIp34AA="; + hash = "sha256-zAqoP0DbxkwcauQuxrha9L4qnb9STPy5X4mjZ/tQmN0="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 0ce962417ed7..aaa5a275db7a 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -11,12 +11,9 @@ let param = if lib.versionAtLeast ppxlib.version "0.26.0" then - if lib.versionAtLeast ocaml.version "4.14" then { - version = "3.1"; - sha256 = "sha256-qG8Wxd/ATwoogeKJDyt5gkGhP5Wvc0j0mMqcoVDkeq4="; - } else { - version = "3.0"; - sha256 = "sha256-+4ggynMznVfjviMBjXil8CXdMByq4kSmDz6P2PyEETA="; + { + version = "3.2"; + sha256 = "sha256-5Vf1LRhSotNpTPzHmRgCMRYtrpgaspLlyzv1XdGt+u8="; } else { version = "2.5"; diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index 3a385e8f9bbf..aa825107715d 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -3,17 +3,17 @@ buildPecl { pname = "yaml"; - version = "2.2.2"; - sha256 = "sha256-EZBS8EYdV9hvRMJS+cmy3XQ0hscBwaCroK6+zdDYuCo="; + version = "2.2.3"; + sha256 = "sha256-WTfrlyLd9tZGJnmc+gJFmP8kUuoVeZLk5nMxolP5AjY="; - configureFlags = [ "--with-yaml=${libyaml}" ]; + configureFlags = [ "--with-yaml=${libyaml.dev}" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config libyaml ]; - meta = with lib; { + meta = { description = "YAML-1.1 parser and emitter"; - license = licenses.mit; - homepage = "https://bd808.com/pecl-file_formats-yaml/"; - maintainers = teams.php.members; + license = lib.licenses.mit; + homepage = "https://github.com/php/pecl-file_formats-yaml"; + maintainers = lib.teams.php.members; }; } diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 698e4f59060c..16d76e377cac 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OWIhjZhrjvbjQg6tzZm0aoKiErWBazzbGHpChkJHjbU="; + hash = "sha256-UZpg6zqu0fnajmpprmhcezWngO3IKISfHMB4JJ5cr1Y="; }; # Relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 17626ca23f52..eb1a5bdf50aa 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.1.1"; + version = "5.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-lbaDoLEOMzMGwqBx6gBynVpXz/NM/uCJELwd4d1IEwk="; + hash = "sha256-IOQyQ78u9Pr27UKchjSqzCl47UajknI8MYZZy2DheSk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 1466d435d3c8..71e4078990c9 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.4.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Zu2tD5isiOKOn1/bNgVo1F2/CbFFj5wVp1CUO+6btBc="; + hash = "sha256-uN3N8/RzZyMp+ljgGYqBLUperNYOnbOPTWjlDlos5QE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/confection/default.nix b/pkgs/development/python-modules/confection/default.nix index 08dccaafcf1b..40e388b0659b 100644 --- a/pkgs/development/python-modules/confection/default.nix +++ b/pkgs/development/python-modules/confection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confection"; - version = "0.0.4"; + version = "0.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "explosion"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JZQ9D5+UAobywlj8eiyw15wXKYhUKz6+lf9hikMV6x0="; + hash = "sha256-yF+rG0UblGk6BCrqFrWXkB8ET0NPCL7v+4IJTmkYoTY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index e8ba85c3a98a..b6bbf7b2dfc6 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "4.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xXtUEunPYiuVh+1o4xoFutGstZ918ju5xK5zLvgbLHc="; + hash = "sha256-GCY7M0XnVsGyuADSq/EzOy9fged5frj+hRDLhs2Uq8I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index 758ea888b5f4..614affcc3fcb 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.11.1"; + version = "1.11.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "deep_translator"; inherit version; - hash = "sha256-Q73sKqin8R8dUsMS9EjYXlxWDCSQb9R8wvvh4OXl6GY="; + hash = "sha256-gBJgxpIxE4cH6oiglV5ITbfUDiEMngrg93Ny/9pfS/U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 8122af7e28b9..971a65eeb1d5 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -58,5 +58,8 @@ buildPythonPackage rec { changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; + # No support for funcy > 2 + # https://github.com/Suor/django-cacheops/issues/454 + broken = true; }; } diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix index 12918bb33bf2..88dc763aa15f 100644 --- a/pkgs/development/python-modules/django-vite/default.nix +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "django-vite"; - version = "2.1.1"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MrBin99"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MKAzNtmFue7MrYtg5sOXog1u1daJwh3t98aIUSyyfBQ="; + hash = "sha256-HrcQt0Mdko+/XJd0srQTBYMtHaLZyImMuQn39HIwDfY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index ca232d369323..1595be39c101 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iMFZLsXChfQfkkrbZycYjP53r8zQBHEEncVpOlVkcyc="; + hash = "sha256-LuCKQkiQodBDDO3TJ6wWqJG7kDHZyMz9dBpVooGeW3g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index e7a2ecb2e2a5..827ee3421bc7 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.1.3"; + version = "4.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-AkFDAmJX3wyRHHHCNFX/VqAqhNTjaYVoJDTRrFZ71H0="; + hash = "sha256-cU22JdrCTvg8cF1LK9dYfOTztp3qoXV9VK6aMpbKFHc="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 14b92fb7ee2b..2034433c0923 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ff/pPziFbU7sbcffzq0/3tHnS7MOCCVKV0G01JSNVGU="; + hash = "sha256-giR0feAzPnginmzV8lqs1mpDtdBl7dExg21MhaGeCSQ="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 74c8b8ff4d67..bafaf0fdb1f1 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -1,15 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "funcy"; - version = "1.18"; + version = "2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FUSNGajrzHpYWv56OEoZGG0L1ny/VvtCzR/Q92MT+bI="; + hash = "sha256-OWMxXVnUHG8wwEvJEOEKtQo6xKIlhov6lv7tEz3wdcs="; }; # No tests @@ -18,7 +22,9 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of fancy functional tools focused on practicality"; homepage = "https://funcy.readthedocs.org/"; + changelog = "https://github.com/Suor/funcy/blob/2.0/CHANGELOG"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix new file mode 100644 index 000000000000..f6532efc79f3 --- /dev/null +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-cloud-testutils +, grpcio +, grpcio-status +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-ai-generativelanguage"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EIQruf8+/VFIlRBU9sI7bT4Xk3blFmSLhxJnMw1E4oA="; + }; + + propagatedBuildInputs = [ + google-api-core + grpcio + grpcio-status + proto-plus + protobuf + ]; + + nativeCheckInputs = [ + google-cloud-testutils + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.ai.generativelanguage" + "google.ai.generativelanguage_v1beta2" + ]; + + meta = with lib; { + description = "Google Ai Generativelanguage API client library"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-ai-generativelanguage"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-ai-generativelanguage-v${version}/packages/google-ai-generativelanguage/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 2551f67815dd..7b237bb1a213 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.11.2"; + version = "3.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oPDQSS//TJyRHKsnZA5pDdFLRC7agzMZsRGQBCsvdGk="; + hash = "sha256-1Fhb6edsmE7IPvKQ6+/xdWLSyfL0+E0wFdm3sntJmp0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index f7eca6c920e0..dcb22d820236 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.24.0"; + version = "2.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pTs3sEieEQRWDiSUeQDgPzsbny8mblXlYzGj5EtuXCA="; + hash = "sha256-VJ+iu3cd+iVFLT3v/sLUeh0wbpKjaVP/KY1YbwPXKtM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 067699219167..7b44b02199d4 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.22.0"; + version = "1.23.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lRFWozkurWzP3v80VkvH9XrFobrqFsQ9J3jtUeKl1AE="; + hash = "sha256-4mzQ2mUc7cdBYI7F+VCjsF7nyMn2JSf0sELHUI50w9U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix new file mode 100644 index 000000000000..ffab9af49802 --- /dev/null +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, google-ai-generativelanguage +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "google-generativeai"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "google"; + repo = "generative-ai-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-caFq7BZKRuNU7fKJWeWSbbDFNpav7OrIET4OQSHkPz4="; + }; + + pythonRelaxDeps = [ + "google-ai-generativelanguage" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + google-ai-generativelanguage + ]; + + # Issue with the google.ai module. Check with the next release + doCheck = false; + + pythonImportsCheck = [ + "google.generativeai" + ]; + + meta = with lib; { + description = "Python client library for Google's large language model PaLM API"; + homepage = "https://github.com/google/generative-ai-python"; + changelog = "https://github.com/google/generative-ai-python/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 4c75a2cbb3f0..e5446d31a6a9 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -1,22 +1,31 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , lxml , beautifulsoup4 , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "html-sanitizer"; - version = "1.9.3"; + version = "2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; - rev = version; - hash = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; + rev = "refs/tags/${version}"; + hash = "sha256-t9mwsieFwdRPkOcnOc66lau+S9naK6Ys79zgIv3+3qw="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ lxml beautifulsoup4 @@ -43,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allowlist-based and very opinionated HTML sanitizer"; homepage = "https://github.com/matthiask/html-sanitizer"; + changelog = "https://github.com/matthiask/html-sanitizer/blob/${version}/CHANGELOG.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 7832a46d368b..6bacec60da98 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msgpack"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-9dhpwY8DAgLrQS8Iso0q/upVPWYTruieIA16yn7wH18="; + hash = "sha256-wHVUQoTq3Fzdxw9HVzMdmdy8FrK71ISdFfiq5M820xw="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "MessagePack serializer implementation"; homepage = "https://github.com/msgpack/msgpack-python"; - changelog = "https://github.com/msgpack/msgpack-python/blob/master/ChangeLog.rst"; + changelog = "https://github.com/msgpack/msgpack-python/blob/v${version}/ChangeLog.rst"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/netio/default.nix b/pkgs/development/python-modules/netio/default.nix index 46186fbab750..82e5d1641fd8 100644 --- a/pkgs/development/python-modules/netio/default.nix +++ b/pkgs/development/python-modules/netio/default.nix @@ -1,35 +1,34 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pyopenssl , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "netio"; - version = "1.0.7"; - format = "setuptools"; + version = "1.0.10"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "netioproducts"; - repo = "PyNetio"; - rev = "v${version}"; - hash = "sha256-07GzT9j27KmrTQ7naIdlIz7HB9knHpjH4mQhlwUKucU="; + src = fetchPypi { + pname ="Netio"; + inherit version; + hash = "sha256-+fGs7ZwvspAW4GlO5Hx+gNb+7Mhl9HC4pijHyk+8PYs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests pyopenssl ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "import py2exe" "" - ''; - pythonImportsCheck = [ "Netio" ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index ba8b2577986a..0ce6dc642448 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.12.0"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6UQNCGZeNSeJiZOVkKU/N6k46tpPlEaESTCqLuMNc74="; + hash = "sha256-VuhdDmbelX1ZnR77JAnTmv7v2PAQCb/aB5a0Kktng1g="; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 91fdc8389664..4aa6718c82eb 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.4.0"; + version = "3.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Fnoj4RhUrbN/hgLeb8w6T5b9Xx4yO5u4MyXzhAjFqv0="; + hash = "sha256-cs1mq4z2GnWFTlp1P3W+o17gdcOpb53k4qZtAux/xlI="; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix index 8280f62723d9..d69e92636aef 100644 --- a/pkgs/development/python-modules/ruuvitag-ble/default.nix +++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ruuvitag-ble"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WkPYlEkUH1xvGjBVr6JkLx5CfIPvAa9vX50OjCOmTME="; + hash = "sha256-J+807p2mE+VZ0oqldFtjdcNGsRTkAU54s6byQSGrng4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index c347be86e252..7dafe6f2cd6d 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.15.1"; + version = "2.16.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EZL/sYz2U4V2p0eEoxLwZhe9Xok9IcZabNLwAE6itGw="; + hash = "sha256-GJmeAhakNCocSR/HtUsSiNsrFdFmUK6eI5U2mHXD/5c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index 9b8c611b925d..d9910e570d5d 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/pkgs/development/python-modules/solc-select/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "solc-select"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - hash = "sha256-850IA1NVvQ4KiH5KEIjqEKFd1k5ECMx/zXLZE7Rvx5k="; + hash = "sha256-23ud4AmvbeOlQWuAu+W21ja/MUcDwBYxm4wSMeJIpsc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index 195999cbe47b..b7d2661ce2c8 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "strenum"; - version = "0.4.10"; + version = "0.4.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "irgeek"; repo = "StrEnum"; rev = "refs/tags/v${version}"; - hash = "sha256-OkNV4kUXGgYPGuyylGOtAr0e0spgZQ1MrftKKL2HmV8="; + hash = "sha256-LrDLIWiV/zIbl7CwKh7DAy4LoLyY7+hfUu8nqduclnA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 7a8cc909d72f..da73522b72dd 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.3.0"; + version = "8.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-PtTdc4EdvrHSXDDYN0TtDwEO/mubifCr2U4AE67OJIc="; + hash = "sha256-ZvAbzceHEkVf/BPT8klYuiFQbMn/NCwsDTR32ku1c8w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 8829279a1859..e0093f2ef892 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.7"; + version = "0.7.9"; src = fetchFromGitHub { owner = "williballenthin"; repo = "viv-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE="; + hash = "sha256-xM3jtA6fNk36+enL/EcQH59CNajYnGlEDu06QXIFz6A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index d8b5a7e9ee86..bf281f374c50 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "vivisect"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tAIhsHFds3qwPngfOsR1+xDKgi29ACnvFAYoklRnCAI="; + hash = "sha256-URRBEZelw4s43zqtb/GrLxIksvrqHbqQWntT9jVonhU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 59e8d5ca3a9a..3c1627eb9e1b 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.9"; + version = "3.7.9.1"; src = fetchPypi { inherit version pname; - hash = "sha256-q994axJexRU1SUlg9P71NvaZRpR9dj46GX85cbvMEy8="; + hash = "sha256-MOVsYfUq3n62hPEUIOGA75RviGofHcXaJKMnYERxg74="; }; buildInputs = [ openssl bzip2 ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 189ba4f8dd17..76c397512136 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.303"; + version = "2.3.309"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-h9O9hYAQX2CqSwEWs3gWDOOisfWa3taDmSjxSw44Kt4="; + hash = "sha256-aTp7K2u9SXwkvFuskMH32Fb9MfAXyU9dyiavmMBVJf4="; }; patches = [ diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 7320c34ea1c4..c3afb993bc9c 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.9.6"; + version = "1.9.8"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = "refs/tags/${version}"; - hash = "sha256-5gRIxjPcyPWmeoqj/s259r8DuujnBBKc/8+0l4RgCWM="; + hash = "sha256-nT41Pw5DJJ9iSp1uFXaCySuKCwh1/wuV2iY++dfs9FY="; }; vendorHash = "sha256-ECVKofvmLuFAFvncq63hYUaYW8/2+F4gZr8wIGQyrdU="; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index a088e8d6a442..62ee400a25ca 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.20"; + version = "0.5.22"; src = fetchCrate { inherit pname version; - sha256 = "sha256-76FR1Irmqi/m6fJbhqN6+iBMfQNDkgO1SDBw/hzNCOY="; + sha256 = "sha256-nvDeKHOpDhszLxPFh1CZhA+NrFnKbminv8qlIT0qvx0="; }; - cargoSha256 = "sha256-9QCXHVANvlmgEWNClgFkpCaduK/69vOLD9NTWv4H+Rw="; + cargoSha256 = "sha256-krpvo55PNECVLh1SjZhXwFVjI6s2u7l/MPCYeDFsylM="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 885d159844c6..764732c043d2 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "3.7.3"; + version = "3.7.5"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -12,7 +12,7 @@ let cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHash = "sha256-iV6tj7pLXWJU0uV0xAk2gJrH5vPIqojDQuCk6NxAAw4="; + outputHash = "sha256-5WNvA7pzOyH1WnAiBaRhk1S34Lba9wgCQg5JaOe8VXw="; }; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 36d2d5daf004..d376a4823800 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.5"; + version = "2.6"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-QGrZid1MVAofFcsnZ20f8RJdyNrVsRkUg2yPGC/iGVU="; + sha256 = "sha256-Lz36JhsmZ/mfWMc4reJqQahOtzE57tQl6keQjozUZgo="; }; outputs = [ "out" "man" "doc" ] diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 635763c8768f..390f88c16357 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1446,9 +1446,10 @@ ]; "google_generative_ai_conversation" = ps: with ps; [ aiohttp-cors + google-generativeai hassil home-assistant-intents - ]; # missing inputs: google-generativeai + ]; "google_mail" = ps: with ps; [ aiohttp-cors fnv-hash-fast @@ -4966,6 +4967,7 @@ "google_assistant" "google_assistant_sdk" "google_domains" + "google_generative_ai_conversation" "google_mail" "google_pubsub" "google_sheets" diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 68bcd61293d5..02e16a1b0faa 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.18.0"; + version = "3.18.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-c85G76u0qLyRbiXEWpYKZerrkZmHkq+VmCdHJk6pH9M="; + hash = "sha256-gtCDeWQLXdhNc5Gn9020ib0IZxjVkHnOUHNf1vqsc0k="; rev = "v${version}"; }; @@ -26,7 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Fast and secure on-the-fly image processing server written in Go"; homepage = "https://imgproxy.net"; - changelog = "https://github.com/imgproxy/imgproxy/blob/master/CHANGELOG.md"; + changelog = "https://github.com/imgproxy/imgproxy/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ paluh ]; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 5b07f7c1d0c6..41c255217313 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.327"; + version = "0.21.341"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-CVdtnUOlbVyQXJmnV0wuRHyD4nT3g0IpT9sDD/9CR/NDlDwsg/+/9qV77GpqJiI8n0NmGaGg7dmLmlK9XGufuw=="; + hash = "sha512-VLLiLw5AQAvOhJkEqcvR4lwmk7twkkNSlh10JBIbMIGzy7uq7EI+1Yx8ahi3MYQyVGPhXRzQuds5ThEnE4cLgA=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index bc8a39fd4cfa..3baacb2fc8d5 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.20"; + version = "1.6.21"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-j2BPjjoXVjfcHwad5vonORFoUMn4Hjdk8vrJo7J74wc="; + sha256 = "sha256-x4iYDvxBfdXZPEQrHIuHafsgGIlsKd44h9IqLxQ9ou4="; }; configureFlags = [ diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 49cb954b2939..a53fdfdb750f 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.2.0"; + version = "11.3.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4539"; - sha256 = "LIcB8EBMGTiFw5hrvWZPxr8Zol6WUH/1I7kVohbo4eA="; + rev = "4560"; + sha256 = "JuE5QG8mlKppB/04pT5TNPrfxGJil5/8eEoDx6jm7Tg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/blahaj/default.nix b/pkgs/tools/misc/blahaj/default.nix index 181b5c10babd..1b0e5ff839ea 100644 --- a/pkgs/tools/misc/blahaj/default.nix +++ b/pkgs/tools/misc/blahaj/default.nix @@ -5,19 +5,19 @@ crystal.buildCrystalPackage rec { pname = "blahaj"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "GeopJr"; repo = "BLAHAJ"; rev = "v${version}"; - hash = "sha256-drdC507lIYanHS7fneW9Xwqmyr6f1oGF1+xeYQ2DzKA="; + hash = "sha256-rX6isAIlpNDBOGLmtvRXmqY90ByFfXeYI0HAAPIMXf8="; }; meta = with lib; { description = "Gay sharks at your local terminal - lolcat-like CLI tool"; homepage = "https://blahaj.queer.software"; license = licenses.bsd2; - maintainers = with maintainers; [ aleksana ]; + maintainers = with maintainers; [ aleksana cafkafk ]; }; } diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix index 32a574b3c055..a753eaf93742 100644 --- a/pkgs/tools/misc/github-backup/default.nix +++ b/pkgs/tools/misc/github-backup/default.nix @@ -7,11 +7,12 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.42.0"; + version = "0.43.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tFfS3Z7xrbN2QEOrYcUVd8/YwGKfmR2NaUBeXuSL+tY="; + hash = "sha256-S0674oTUsXftXlbP8fbF09FIWnWwq/Mgbv960tg3FNg="; }; makeWrapperArgs = [ @@ -24,6 +25,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Backup a github user or organization"; homepage = "https://github.com/josegonzalez/python-github-backup"; + changelog = "https://github.com/josegonzalez/python-github-backup/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 771ef059fa89..810a893ead2d 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2023.04"; + version = "2023.06"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "sha256-6STKoDARQ6Ue/ckd3kdIH+ZKnQ4iozx4a070g2N+XMo="; + sha256 = "sha256-MLEBT1UpyFiIGqI9W2bw2I2j4JanJ0MAV8nwcL/1QBM="; }; installPhase = '' diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index e3a46b5b0fb8..39ab5bb406db 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "8.15.0"; + version = "8.16.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-kPTnbet/+iw0ZYxczyn9K5IzTmLwoZiEKSjTFfBHKow="; + hash = "sha256-aTpE/8nPSnLqcj6KnBi70ZoOlkOXdmsw9INNnoVIjQw="; }; proxyVendor = true; - vendorHash = "sha256-7FNZ/In8S3vpUEHLIzqPLSTY+ZW9kfNNT6EcSAZRgtI="; + vendorHash = "sha256-pc9m58Sjegr2J+JqcOYu1xo3AZCN+EI2mlXKL14qqRU="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index c9079518083d..37b0cf7a1e73 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.41.1"; + version = "3.42.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-U8GNGeBGqL4p35ogV07NZdOYgRVAMW5MMXje/s/zthM="; + hash = "sha256-ZPlIuWprlB9Xp3aD4AjWfYMEnDwyoijNqhBGgq3BJ5M="; }; - vendorHash = "sha256-U0qYNJwJpyUwCycwhu1XY83xPKiQdwzc1YuN5JGQE08="; + vendorHash = "sha256-gIiG9fULEEqWLdCoPOtbE6bSYyZv8I36vBRB6b3KOI8="; ldflags = [ "-s" diff --git a/pkgs/tools/system/mediawriter/default.nix b/pkgs/tools/system/mediawriter/default.nix new file mode 100644 index 000000000000..e4012ca6778c --- /dev/null +++ b/pkgs/tools/system/mediawriter/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, adwaita-qt6 +, appstream-glib +, cmake +, fetchFromGitHub +, qt6 +, udisks2 +, xz +}: + +stdenv.mkDerivation rec { + pname = "mediawriter"; + version = "5.0.6"; + + src = fetchFromGitHub { + owner = "FedoraQt"; + repo = "MediaWriter"; + rev = "refs/tags/${version}"; + hash = "sha256-M8tnFwpM94xrcgw87yRG2kUZ2y5C0M4ptPokK+2B+xk="; + }; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + adwaita-qt6 + appstream-glib + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + udisks2 + xz + ]; + + meta = with lib; { + description = "Tool to write images files to portable media"; + homepage = "https://github.com/FedoraQt/MediaWriter"; + changelog = "https://github.com/FedoraQt/MediaWriter/releases/tag/${version}"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4096730ed02c..21b83d86d6d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,6 +429,8 @@ with pkgs; chatgpt-retrieval-plugin = callPackage ../servers/chatgpt-retrieval-plugin { }; + mswatch = callPackage ../applications/networking/mailreaders/mswatch { }; + chef-cli = callPackage ../tools/misc/chef-cli { }; checkov = callPackage ../development/tools/analysis/checkov { @@ -10243,6 +10245,8 @@ with pkgs; mediawiki = callPackage ../servers/web-apps/mediawiki { }; + mediawriter = callPackage ../tools/system/mediawriter { }; + memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; @@ -22091,9 +22095,7 @@ with pkgs; libe57format = callPackage ../development/libraries/libe57format { }; - libeatmydata = callPackage ../development/libraries/libeatmydata { - autoreconfHook = buildPackages.autoreconfHook269; - }; + libeatmydata = callPackage ../development/libraries/libeatmydata { }; libeb = callPackage ../development/libraries/libeb { }; @@ -32995,12 +32997,12 @@ with pkgs; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; - moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt ({ - } // lib.optionalAttrs stdenv.isLinux { + moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; SDL2 = buildPackages.SDL2.override { - drmSupport = true; + drmSupport = stdenv.isLinux; }; - }); + }; mooSpace = callPackage ../applications/audio/mooSpace { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ffa2532f99b9..bf94343be2f7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12935,6 +12935,32 @@ with self; { }; }; + LatexIndent = buildPerlPackage rec { + pname = "latexindent.pl"; + version = "3.21"; + + src = fetchFromGitHub { + owner = "cmhughes"; + repo = pname; + rev = "V${version}"; + hash = "sha256-STXHOzsshyN7rc2VtJxxt6La4UPGpRYlMO8TX1Jd7pM="; + }; + + outputs = [ "out" ]; + + propagatedBuildInputs = [ FileHomeDir YAMLTiny ]; + + preBuild = '' + patchShebangs ./latexindent.pl + ''; + + meta = { + description = "Perl script to add indentation to LaTeX files"; + homepage = "https://github.com/cmhughes/latexindent.pl"; + license = lib.licenses.gpl3Plus; + }; + }; + LaTeXML = buildPerlPackage rec { pname = "LaTeXML"; version = "0.8.7"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad48d07ba5d8..13ccbd69bffd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4187,6 +4187,8 @@ self: super: with self; { goodwe = callPackage ../development/python-modules/goodwe { }; + google-ai-generativelanguage = callPackage ../development/python-modules/google-ai-generativelanguage { }; + google-api-core = callPackage ../development/python-modules/google-api-core { }; google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; @@ -4297,6 +4299,8 @@ self: super: with self; { inherit (pkgs) crc32c; }; + google-generativeai = callPackage ../development/python-modules/google-generativeai { }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; google-nest-sdm = callPackage ../development/python-modules/google-nest-sdm { };