diff options
72 files changed, 380 insertions, 283 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 616eadb9547..65dfe19ecc4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8056,6 +8056,11 @@ github = "jorsn"; githubId = 4646725; }; + joscha = { + name = "joscha Loos"; + email = "j.loos@posteo.net"; + githubId = 57965027; + }; joshniemela = { name = "Joshua Niemelä"; email = "josh@jniemela.dk"; @@ -13497,6 +13502,12 @@ githubId = 18196237; name = "Quentin Inkling"; }; + quentin-m = { + email = "me+nix@quentin-machu.fr"; + github = "Quentin-M"; + githubId = 1332289; + name = "Quentin Machu"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index b73528abaf6..d607e92e5ec 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -154,5 +154,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ erictapen bbenno ]; + meta.maintainers = with lib.maintainers; [ erictapen bbenno joscha ]; } diff --git a/pkgs/applications/blockchains/taro/default.nix b/pkgs/applications/blockchains/taproot-assets/default.nix index ef2c71ebd6f..80cc3dbfebb 100644 --- a/pkgs/applications/blockchains/taro/default.nix +++ b/pkgs/applications/blockchains/taproot-assets/default.nix @@ -4,19 +4,19 @@ }: buildGoModule rec { - pname = "taro"; - version = "0.1.0-alpha"; + pname = "taproot-assets"; + version = "0.2.2"; src = fetchFromGitHub { owner = "lightninglabs"; - repo = "taro"; + repo = "taproot-assets"; rev = "v${version}"; - sha256 = "sha256-0kEdGHi+R9Ns3cVgHSpK/GMVqi8xU/xV831ogV2ErYM="; + hash = "sha256-DOtCnPnS5Oq5B4xaYmNCXxMYJ9fhPZ11OfPKXH7eKUg="; }; - vendorSha256 = "sha256-huQZy62lx82lmuCQ7RQ+7SLMJIBYKfXbw+2ZkswPXxw="; + vendorHash = "sha256-fc++0M7Mnn1nJOkV2gzAVRQCp3vOqsO2OQNlOKaMmB4="; - subPackages = [ "cmd/tarocli" "cmd/tarod" ]; + subPackages = [ "cmd/tapcli" "cmd/tapd" ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 985b8136a0a..0018102bd81 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autospotting"; - version = "unstable-2022-02-17"; + version = "unstable-2023-07-03"; src = fetchFromGitHub { - owner = "cloudutil"; + owner = "LeanerCloud"; repo = "AutoSpotting"; - rev = "f295a1f86c4a21144fc7fe28a69da5668fb7ad0c"; - sha256 = "sha256-n5R5RM2fv3JWqtbSsyb7GWS4032dkgcihAKbpjB/5PM="; + rev = "6b08f61d72eafddf01bb68ccb789505f1c7be3eb"; + hash = "sha256-gW8AIPqwNXfjsPxPv/5+gF374wTw8iavhjmlG4Onkxg="; }; - vendorSha256 = "sha256-w7OHGZ7zntu8ZlI5gA19Iq7TKR23BQk9KpkUO+njL9Q="; + vendorHash = "sha256-RuBchKainwE6RM3AphKWjndGZc1nh7A/Xxcacq1r7Nk="; excludedPackages = [ "scripts" ]; diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/applications/misc/go-org/default.nix index 3e3bc67e897..6ab70d0fe30 100644 --- a/pkgs/applications/misc/go-org/default.nix +++ b/pkgs/applications/misc/go-org/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-org"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "niklasfasching"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wp8WEfRcrtn+VdcbehYcOJI5FkPQiyo6nLsTDvR7riE="; + hash = "sha256-BPCQxl0aJ9PrEC5o5dc5uBbX8eYAxqB+qMLXo1LwCoA="; }; - vendorSha256 = "sha256-njx89Ims7GZql8sbVmH/E9gM/ONRWiPRLVs+FzsCSzI="; + vendorHash = "sha256-HbNYHO+tqFEs9VXdxyA+r/7mM/p+NBn8PomT8JAyKR8="; postInstallCheck = '' $out/bin/go-org > /dev/null diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index 3a8750301fe..e90299baa56 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "keylight-controller-mschneider82"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "mschneider82"; repo = "keylight-control"; rev = "v${version}"; - sha256 = "sha256-UZfbGihCgFBQE1oExuzCexoNgpVGwNoA9orjZ9fh4gA="; + hash = "sha256-xC/JRM8vyqAsxPpf37P3pZv6i73s+CLQt6Sh4nMxwzM="; }; - vendorSha256 = "sha256-nFttVJbEAAGsrAglMphuw0wJ2Kf8sWB4HrpVqfHO76o="; + vendorHash = "sha256-nFttVJbEAAGsrAglMphuw0wJ2Kf8sWB4HrpVqfHO76o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index a5933d105f4..4cc21a2269d 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "aws-workspaces"; - version = "4.5.0.2006"; + version = "4.6.0.4187"; src = fetchurl { # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${version}_amd64.deb" "https://archive.org/download/workspacesclient_${version}_amd64/workspacesclient_${version}_amd64.deb" ]; - sha256 = "sha256-1ysj020fYOmIRvZR27+7ZNqdzqkA2QbrCwDU18ouxaI="; + sha256 = "sha256-A+b79ewh4hBIf8jgK0INILFktTqRRpOgXRH0FGziV6c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index d21097df07b..b571d0a48db 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -16,11 +16,10 @@ , stdenv , fetchFromGitea , buildNpmPackage -, writeShellApplication }: let - frontend = buildNpmPackage rec { + frontend = buildNpmPackage { pname = "forgejo-frontend"; inherit (forgejo) src version; @@ -39,17 +38,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.19.3-0"; + version = "1.19.4-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-0T26EsU5lJ+Rxy/jSDn8nTk5IdHO8oK3LvN7tPArPgs="; + hash = "sha256-pTcnST8A4gADPBkNago9uwRFEmTx8vNONL/Emer4xLI="; }; - vendorHash = "sha256-bnLcHmwOh/fw6ecgsndX2BmVf11hJWllE+f2J8YSzec="; + vendorHash = "sha256-LKxhNbSIRaP4EGWX6mE26G9CWfoFTrPRjrL4ShpRHWo="; subPackages = [ "." ]; @@ -111,12 +110,12 @@ buildGoModule rec { tests = nixosTests.forgejo; }; - meta = with lib; { + meta = { description = "A self-hosted lightweight software forge"; homepage = "https://forgejo.org"; - changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ emilylange urandom ]; + changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emilylange urandom bendlas ]; broken = stdenv.isDarwin; mainProgram = "gitea"; }; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 006fc2aff92..786a2ad5da0 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -1,6 +1,5 @@ # buildEnv creates a tree of symlinks to the specified paths. This is -# a fork of the buildEnv in the Nix distribution. Most changes should -# eventually be merged back into the Nix distribution. +# a fork of the hardcoded buildEnv in the Nix distribution. { buildPackages, runCommand, lib, substituteAll }: diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index a176ddf9b42..05fea9caddb 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -15,12 +15,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.68.0"; + version = "0.69.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-XHfpYX0lXzT15fuFQcmRBhhaKI9Y4bYOy6kXR320BV0="; + sha256 = "sha256-Swt4uihsAtHVMkc0DxATwB8FvgxwtSJTN3E5cBtyXf8="; fetchSubmodules = true; }; diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index dfd0f027d6b..64bfb8f8599 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { "-DBUILD_DOC=ON" ]; + # dvips output references texlive in comments, resulting in a huge closure + postInstall = lib.optionalString docSupport '' + rm $out/share/doc/${pname}/*.ps + ''; + meta = with lib; { description = "Command-line tool for programming Atmel AVR microcontrollers"; longDescription = '' diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index aa3fe0b16b0..4dec50bcc77 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q2.2"; + version = "2023.Q2.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "V6DszDpiwvIcfWh2f8+1sWTQJHxwsxm0LoxSLoJOWHo="; + sha256 = "FoDXg0ocKBtwY22UJJCnyLn99CpmDE9HOMw7iiZkf6k="; }; buildInputs = [ diff --git a/pkgs/development/libraries/asmjit/default.nix b/pkgs/development/libraries/asmjit/default.nix index 5335363c9ba..7edc7c666a9 100644 --- a/pkgs/development/libraries/asmjit/default.nix +++ b/pkgs/development/libraries/asmjit/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "asmjit"; - version = "unstable-2022-11-10"; + version = "unstable-2023-04-28"; src = fetchFromGitHub { owner = "asmjit"; repo = "asmjit"; - rev = "0c03ed2f7497441ac0de232bda2e6b8cc041b2dc"; - hash = "sha256-CfTtdgb+ZCLHwCRa+t2O4CG9rhHgqPLcfHDqLBvI9Tg="; + rev = "3577608cab0bc509f856ebf6e41b2f9d9f71acc4"; + hash = "sha256-EIfSruaM2Z64XOYAeEaf/wFy6/7UO6Sth487R1Q0yhI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 4a0c8a6cad0..c166d36d5a6 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; + hash = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; }; nativeBuildInputs = [ @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + postFixup = if stdenv.isDarwin + then ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' + else null; + # python-config from build Python gives incorrect values when cross-compiling. # If python-config is not found, the build falls back to using the sysconfig # module, which works correctly in all cases. diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index a752f713043..1e581c65e2d 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -273,14 +273,14 @@ let }; }; - cl-colors2_0_5_3 = build-asdf-system { + cl-colors2_0_5_4 = build-asdf-system { inherit (super.cl-colors2) pname systems lispLibs; - version = "0.5.3"; + version = "0.5.4"; src = pkgs.fetchgit { url = "https://notabug.org/cage/cl-colors2"; - rev = "refs/tags/v0.5.3"; - sha256 = "sha256-anYkLJoNOVBQoXzWVBgbEusQDdud0RA8nZzedl8V93w="; + rev = "refs/tags/v0.5.4"; + sha256 = "sha256-JbT1BKjaXDwdlzHLPjX1eg0RMIOT86R17SPgbe2h+tA="; }; }; @@ -396,12 +396,12 @@ let nyxt-gtk = build-asdf-system { inherit (super.nyxt) pname; - version = "3.1.0"; + version = "3.3.0"; lispLibs = with super; [ self.nasdf-unstable self.prompter - self.cl-colors2_0_5_3 + self.cl-colors2_0_5_4 self.njson_1_0_0 self.nsymbols_0_3_1 self.nclasses_0_5_0 @@ -464,8 +464,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.1.0"; - sha256 = "sha256-H3AlslECb/VvIC6zAGkLNTaGJ/nb97J6RXAN8sEgAgY="; + rev = "3.3.0"; + sha256 = "sha256-hSu+XGb87yzZPbJgcUhU81VGhNdMiN6GKspGQJU+SxY="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index dfe47d30681..7c6d33512bb 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -56,6 +57,10 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + # performance tests aren't useful to us and disabling them allows us to # decouple ourselves from an unnecessary build dep preCheck = '' diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index e325d5b541b..f1920b889f1 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "15.1.1"; + version = "15.1.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pdG/yfrGWMu85WXA7CXrmK2FXc+x3e/RNPXCWIEn8n8="; + hash = "sha256-IY9vRLbuQy4YDOE9RE2sSxOZaco5NuMG0cFrU2etTn0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 225ee7efd01..61ed10390bd 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , cherrypy , fetchFromGitHub -, lockfile +, flit-core +, filelock , mock , msgpack , pytestCheckHook @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "cachecontrol"; - version = "0.12.11"; - format = "setuptools"; + version = "0.13.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ionrock"; repo = pname; - rev = "v${version}"; - hash = "sha256-uUPIQz/n347Q9G7NDOGuB760B/KxOglUxiS/rYjt5Po="; + rev = "refs/tags/v${version}"; + hash = "sha256-4N+vk65WxOrT+IJRn+lEnbs5vlWQh9ievVHWWe3BKJ0="; }; postPatch = '' @@ -34,29 +35,39 @@ buildPythonPackage rec { "urllib3.response.HTTPResponse.from_httplib" ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ msgpack requests ]; + passthru.optional-dependencies = { + filecache = [ + filelock + ]; + redis = [ + redis + ]; + }; + nativeCheckInputs = [ cherrypy mock pytestCheckHook - ] ++ passthru.optional-dependencies.filecache; + requests + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "cachecontrol" ]; - passthru.optional-dependencies = { - filecache = [ lockfile ]; - redis = [ redis ]; - }; - meta = with lib; { description = "Httplib2 caching for requests"; homepage = "https://github.com/ionrock/cachecontrol"; + changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index dcb22d82023..6739b356fce 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.25.0"; + version = "2.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VJ+iu3cd+iVFLT3v/sLUeh0wbpKjaVP/KY1YbwPXKtM="; + hash = "sha256-fUqX5n/tQ7BgtIo3/1jyOGvkIUiVltbfLpzwIZ0YJ0M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 8d54e68bab7..9e45b46c5f7 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.3.2"; + version = "2.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; + hash = "sha256-N7gCc8jX7uGugWs6IK5DWF6lBQbLDmDzz1vl+H8Tc8s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index cb6c238154c..4d3acc891f2 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.13.0"; + version = "3.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YdEMSLC6qz79t/caG2DUMhSxxjCh40Cu3+aABvVxQow="; + hash = "sha256-alCuqR65Xpa5RYsUMouJrmyYJ52AFWlyN/rO1Nue+ZU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 522d466bdad..4bdd783af81 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.4.1"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GJbhT2PBIaPx4sIhKHzH/QBlDSpz+LOPggQK5tWqt78="; + hash = "sha256-YxxOyvPlUfSeIS8aUrULWnD6XgPh+nJuPHIywmgYMQU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index a0ed249d47b..8f602f974d9 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.12.1"; + version = "3.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KBqnGp56U2lGLo/2MWu5kfHr7pfIJJDT857+xnrK+iU="; + hash = "sha256-+Ab1XD45m3PqQ0LHBIRVId5wARJ9KOjClEk9C2c2NBY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index ae30c971492..4b3ecdcab5f 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.9.1"; + version = "1.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3N7LtFKvTdV0zBGIyUgi6tCVZX7+rbJD5Lb+xZafJNw="; + hash = "sha256-S+7x6gIxJDfV7Xe6DOBVbJNMREYlRFLyGo8BEpIdIow="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 26247453cc7..1afb505c421 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lfT4lgW4n3k5Fs2Owng8JoHGYDwjoKTzaKhEf35O+VA="; + hash = "sha256-/lBwhUR+z0Ydr9LNS4AWxYmeWOUgvQS1G7Orb2sI+v8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 57390756eec..0cd8a9d28dd 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.17.0"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AoIoGmOvL0mAD5dhsWxIkIFAw4G+1i9SyNF4D5I4Fz0="; + hash = "sha256-GqcYccqc6yAfuN3ntTypXvMNricr0cfCmCwnU0zJBoE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 367987b8230..4a2e0277924 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lC3Hp1fBK09aYUv4hO77FOlPOqQb+W2h/2MGJ9MhZ/Q="; + hash = "sha256-FAwHU1haRZd7ucfRxwfn+KtWM8/1a97Z74UvkBa3Mq8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 66a49625d1a..5c2494e5b68 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w6BCbs0lpw2lOyqQedcXMSKahJak7a6NN4Xsy7+CjVs="; + hash = "sha256-CGqEWjSm4QWrijpICTkupjZ6ZbKLdWHCYQFTSocF7Tc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 2b54e9b8fde..b90e3263e7f 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JVXRVq7yrRLj15ZMKVCBvCsrRP8KcRj9XNvfeH0rXVc="; + hash = "sha256-SJpjS72keOf9QF1imsWLbgMSzxCDloO4tuc4vUy8ZBk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 6333f2f72df..a2185b7a429 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.15.1"; + version = "1.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OaF1pzRY5k5SvXNCxTviP/2lhC7Up+oXaQB14f2tGj8="; + hash = "sha256-WgrqxnVsbA0ppvfcqxW+kA8vjn71bMU9qAyZraqYt8g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index f830ed3b6a6..860a65207ee 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BKDbtyn1wnzTXM6B7lgUCe17NLB9yaj1XhMbP4zE3Qo="; + hash = "sha256-UtT1z5zMzc7+Xhqcx5u77IS8GC8KaNOpYstZ8BlrFGc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 5389fd3cce3..930c5805e6f 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.10.1"; + version = "1.10.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yXT7b5gQR2z3tj6ok5TBqN9H9/LcIwPnKLt0tQC83mc="; + hash = "sha256-mnvdA0etVTN2zGatMXxSI9GuBL3PdO3L/NEmBc/3tRA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 772ca69dda6..5c9997225f7 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.16.1"; + version = "2.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FJ0Rzpvn6oHUrDVE0/zUxxap7bLLd12cB1IxVwsHn7s="; + hash = "sha256-WWUhCRw5uUomDYFHdkIcigCfZGOzkogAQe+oAoO1/Sk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 7b44b02199d..90d692094f0 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.23.0"; + version = "1.23.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4mzQ2mUc7cdBYI7F+VCjsF7nyMn2JSf0sELHUI50w9U="; + hash = "sha256-GlFoeifExNS7pd+vDnYWsGWPNDkQ4SmnFFnTnsjTN6Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 224f98f4717..462bcba9dfc 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.20.0"; + version = "2.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5sW4b/6OR0ucgraZ75AvdclHjnfkTqOd45l7PvivPi4="; + hash = "sha256-Zhw5u7bysha6VqzjsIcmDpd43Rmt6e+jcAre6SWACa0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index f69cb6709fd..ad654c6e2ad 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.13.1"; + version = "2.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mbhFBVx6Gye3M0lCny1vag659Am0ze7InfmeFr0ZeDM="; + hash = "sha256-VXYUs5PQ+bH97d/vOAxag4CAn8ROMvPZewF05e/k7PM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 5cabd25b9af..d8f8b1a2844 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-twaJlx/2W1BQCWZMTQbZOp74oFecL2vwZkAxK/XwE8E="; + hash = "sha256-pn2ofYfcHBxAw7IK5lKqf1AGj8e+DU8W++9XVFPZ5Ws="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index efb8a4250cc..3b29befab95 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.11.1"; + version = "3.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-keQK0Lc34yphEQZFEU6T/7rfXS/9clwSreE0frWO+s8="; + hash = "sha256-CZluS7DfpcICMYWvhxkvHSwANmj4yfT6xDJCMQskQj4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 6743c32fe8e..21760337af4 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.4.3"; + version = "3.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RSe/saqfidAn20INQN6fquSCS2QGyANzpt2CfnmJwJ4="; + hash = "sha256-QFdErlCFIDTMR7MqmxuuUNP7Cc0eIWABQYKJHvV2ZpU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 771cbcf0196..702ba0d2103 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.12.1"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CCfxIwACFxMuFjxJG7v5e/WXvN0V4QysPYD2NtkKnEU="; + hash = "sha256-C2WQmyQjoe2t6RZ8HtnNkzN3V8FuYQwgtlhCOwaHNt8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index ae208f61c66..a761c978593 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-w/LA3BqxUcu1+nwq55g+v/QMhz8/uCTz2aRDYIdGPtk="; + hash = "sha256-VAm/jHeG/LfLpouHc3mSX8Kr8u/keHY552dLzoGaPrQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix index 7acb17c9366..f2081260686 100644 --- a/pkgs/development/python-modules/matplotx/default.nix +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -41,11 +42,13 @@ buildPythonPackage rec { ]; }; - checkInputs = passthru.optional-dependencies.all; + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.all; disabledTestPaths = [ "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 96fa5309a81..db8b4cd572b 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , flit-core @@ -35,6 +36,10 @@ buildPythonPackage rec { rich ]; + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 4b082e22d61..ef5da81ddca 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp-retry , buildPythonPackage , fetchFromGitHub , freezegun @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "2.0.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ssm/nFciUeWexgsKUpF4qZHz/grG8OYJV7roBAjMsac="; + hash = "sha256-JTZtRh7Ecsq0DUpGt5AxAVnN79i/nppsEjoHWcpTOsM="; }; postPatch = '' @@ -42,6 +43,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + aiohttp-retry ical pycryptodome pydantic diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index a3e4c0c561a..eeeb2468881 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for UONET+ e-register API"; homepage = "https://vulcan-api.readthedocs.io/"; + changelog = "https://github.com/kapi2289/vulcan-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 595fed924d5..be5e669c4d9 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.311"; + version = "2.3.312"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QVh3dJYIR3n1fmhZviI6ohb6SDQsQQPk1k8KpwKvghU="; + hash = "sha256-SskpDZosJOPF2HhzclRI+8xd3ELtoxdeW8nWXrmI4hM="; }; patches = [ diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index d117d9319d8..0e21a4e7d97 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,22 +2,24 @@ buildGoModule rec { pname = "dockle"; - version = "0.4.5"; + version = "0.4.11"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QC0WAM+qitee0dyJorl5Hio3COy4JiIHmFgBIj7S2yM="; + hash = "sha256-KdHRKY7HabPN1jrEqAEF4QImLVECGbjHRA1tw51j32w="; }; - vendorSha256 = "sha256-9n/782uKu7qNV/WEpbEV3aHcPXipyOhGdAhT/F4O2xc="; + vendorHash = "sha256-2YH7XO5F+nZb6Dug5F40dvrZEPvMn+XtdQ6i0gug4VY="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; ldflags = [ - "-s" "-w" "-X main.version=${version}" + "-s" + "-w" + "-X github.com/goodwithtech/dockle/pkg.version=${version}" ]; preCheck = '' diff --git a/pkgs/development/tools/faq/default.nix b/pkgs/development/tools/faq/default.nix new file mode 100644 index 00000000000..9ea3372f24e --- /dev/null +++ b/pkgs/development/tools/faq/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, jq +, oniguruma +}: + +buildGoModule rec { + pname = "faq"; + # Latest git release (0.0.7) presents vendor issues - using latest commit instead. + version = "unstable-2022-01-09"; + + src = fetchFromGitHub { + owner = "jzelinskie"; + repo = "faq"; + rev = "594bb8e15dc4070300f39c168354784988646231"; + sha256 = "1lqrchj4sj16n6y5ljsp8v4xmm57gzkavbddq23dhlgkg2lfyn91"; + }; + vendorSha256 = "sha256-731eINkboZiuPXX/HQ4r/8ogLedKBWx1IV7BZRKwU3A"; + + buildInputs = [ + jq + oniguruma + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/jzelinskie/faq/internal/version.Version=${version}" + ]; + + tags = [ + "netgo" + ]; + + subPackages = [ + "cmd/faq" + ]; + + doCheck = true; + + meta = with lib; { + description = "faq is a tool intended to be a more flexible jq, supporting additional formats"; + homepage = "https://github.com/jzelinskie/faq"; + license = licenses.asl20; + maintainers = with maintainers; [ quentin-m ]; + }; +} diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index 0151a6fb38b..7f515529fce 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fission"; - version = "1.14.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; - rev = version; - sha256 = "sha256-U/UV5NZXmycDp8+g5XV6P2b+4SutR51rVHdPp9HdPjM="; + rev = "v${version}"; + hash = "sha256-Ui7HGiWjzbhEOLuxC3TkFqDwwi3YsLMuxhZsPrJzPN0="; }; - vendorSha256 = "sha256-1ujJuhK7pm/A1Dd+Wm9dtc65mx9pwLBWMWwEJnbja8s="; + vendorHash = "sha256-XQd5jTZ37DhvQq7x1OyhIb1uoMv5Y7Ayv4CX33BCLBE="; ldflags = [ "-s" "-w" "-X info.Version=${version}" ]; diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 6509f371e4f..338371e36c7 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.33.1"; + version = "1.34.0"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dwnPFbgfrc+1qF3u5Nm1KQu84UWK6H6VerSUaQacbRs="; + sha256 = "sha256-ttzfyTfv0835w4BaSWxT17/e/fjNCxWABW/kZKpy7q8="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-T88C5oYyVfepUw0cdNRhEwrvEI0t1gw/5qZL1E46pkY="; + cargoHash = "sha256-hYRVlCQ9+FCQFtT6uku7FynzHMdHvKATqkr5tCJoZCU="; doCheck = false; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index fdfa3541142..7669bd77706 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "runme"; - version = "1.2.6"; + version = "1.3.0"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-yiprpN2vKGX2g2ANoRgCze2cAccPigI7GAPBFIf7xxo="; + hash = "sha256-pfx4X9FgC08nQ74j9MJRBKIZnvO3plHN4cmaU4kFOoI="; }; - vendorHash = "sha256-el+gM3GRN5KU4RlSAx02rn+22xj28IZq3erZUzPbUUw="; + vendorHash = "sha256-BJhda5mE5f4kvi8CLjgMJYjdUS3vsUSwmHhTW/AVKCI="; nativeBuildInputs = [ installShellFiles @@ -63,7 +63,7 @@ buildGoModule rec { meta = with lib; { description = "Execute commands inside your runbooks, docs, and READMEs"; homepage = "https://runme.dev"; - changelog = "https://github.com/stateful/runme/releases/tag/v${src.rev}"; + changelog = "https://github.com/stateful/runme/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index b14f35a6258..a7d7d8c8c58 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -2,41 +2,24 @@ , fetchFromGitHub , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { - version = "2.7.1"; - src = fetchFromGitHub { - owner = "CycloneDX"; - repo = "cyclonedx-python-lib"; - rev = "v${version}"; - hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.5.6"; + version = "2.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hpzJtKtvhudT7OzZnuv6LbnMHnHIBYmQsAR1oRglvT0="; + hash = "sha256-Ja3LPKfrqs1evNzjOJ3oxh2vxqw8oZJDIsyZGT0q3PY="; }; - nativeBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ flit-core ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ cachecontrol cyclonedx-python-lib html5lib @@ -47,7 +30,7 @@ buildPythonApplication rec { toml ] ++ cachecontrol.optional-dependencies.filecache; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ pretend pytestCheckHook ]; diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index ca1ef092902..b949e7d4b8c 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -746,7 +746,7 @@ dependencies = [ [[package]] name = "flake8-to-ruff" -version = "0.0.276" +version = "0.0.277" dependencies = [ "anyhow", "clap", @@ -1829,7 +1829,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.276" +version = "0.0.277" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1865,6 +1865,7 @@ dependencies = [ "result-like", "ruff_cache", "ruff_diagnostics", + "ruff_index", "ruff_macros", "ruff_python_ast", "ruff_python_semantic", @@ -1926,7 +1927,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.276" +version = "0.0.277" dependencies = [ "annotate-snippets 0.9.1", "anyhow", diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index daec2d57fdd..a34a753d64e 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.276"; + version = "0.0.277"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-abFvjBmaY6SvfEHm/8P92s3Ns3jswLHrW2RdZc6IS64="; + hash = "sha256-oFSMsiy9airi/SwOxA3YO02polvFl8ZZUHkD71c5unA="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 3cffebbe8df..a600da01c93 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - hash = "sha256-F/AAPNhasXnSr0edl0PVSEnX/oWe6QkgHlDOFWXjOkk="; + hash = "sha256-l7pBOYNTUkjHxgcuyNfVrAifEsHN1rIHYpQ2UxHwZf0="; }; - cargoHash = "sha256-PHPpuMhv8Oj3whrLv9m20dALVUjS9JJRrhXR64wNaqU="; + cargoHash = "sha256-LjMgZFkk8/StVZTbnXumjCI3r1trNKggAEbUOlDhb4s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index fe7a0b328a9..07fb168eeb9 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.3.1"; - sha256 = "sha256-EqgtswZpeVm0OJs1Gl+XhImGsTE/mQGw4LPYz08/mZE="; + version = "20.4.0"; + sha256 = "sha256-Cb0Lc8UmtjwCnV3f2IXRCWLnrYfJdblFg8H4zpDuU0g="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/servers/go-libp2p-daemon/default.nix index 995cfe2d26d..8ab0ff82311 100644 --- a/pkgs/servers/go-libp2p-daemon/default.nix +++ b/pkgs/servers/go-libp2p-daemon/default.nix @@ -1,17 +1,17 @@ { lib, buildGoModule, fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "go-libp2p-daemon"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "libp2p"; repo = "go-libp2p-daemon"; - rev = "bfa207ed34c27947f0828a4ae8d10bda62aa49a9"; - sha256 = "1f3gjkmpqngajjpijpjdmkmsjfm9bdgakb5r28fnc6w9dmfyj51x"; + rev = "v${version}"; + hash = "sha256-3zlSD+9KnIOBlaE3gCTBGKwZY0rMW8lbb4b77BlJm/g="; }; - vendorSha256 = "0g25r7wd1hvnwxxq18mpx1r1wig6dnlnvzkpvgw79q6nymxlppmv"; + vendorHash = "sha256-8wrtPfuZ9X3cKjDeywht0d3p5lQouk6ZPO1PIjBz2Ro="; doCheck = false; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 85f7cce8d3a..eeb1d18f7c1 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.6.3"; + version = "2023.7.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-Ia+y9I92XqPcoRFXfEmoAmzU2LUH5oP+A5Uu/8DdUAc="; + hash = "sha256-N/3Gja6WPNdRsWl4XYMo9skCTJiHFkhr9y+T0MFrUTc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 3e1632860b5..faefc611fce 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; + sha256 = "10y18l67i6ry7v9w0qwh26477g4gm0qrjjpa87pa5a42hzkglnc7"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; + sha256 = "1ihayijdgasf0rp10x6h335k3y1hgqr6c9s8lxqmhm4gpczajaac"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; + sha256 = "03557cskby5alpncnhgm1j1kq43xqq75sdd6r2x22q3j2jv68pj5"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; + sha256 = "1x7ffyan8sbv4ywjghiyiv077vfxyf6i6y0h4k0mfpdmf76l0i86"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; + sha256 = "0g5gw9ywirw7814wn8cdnnv1df58x5gplgpb15gaw5gzkw9cgvd8"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; + sha256 = "0cmzc2c00lsdr5hpmsgs8axs5pbhv5xyqiyi69wf81pqypd2cy3l"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; + sha256 = "153z9lmkip3v243xxa5rcc8am82ma73ar46q4vxbmzi850a5yjj2"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; + sha256 = "1bpr0zspih2rf2ppzjxaw8sq6gfqg9vss5h0fs4r85p03579swin"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; + sha256 = "06403rkjnyr80yj4g05lb5hn04yfzipa7bm0gplbqrrykr3hvh5r"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; + sha256 = "094kvh8bp792xccql54kky8prmvqvfzwwv9xas2pnh8s4v3avbzl"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; + sha256 = "0s465919p6fcgcsqin8w8hay2m598dvnzks490hbsb0p68sdz69m"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -609,10 +609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.2"; }; connection_pool = { groups = ["default" "test"]; @@ -768,10 +768,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxrvqv3l5w9p20s129rg41zc6agf1n4yrmganancnvykbkygki2"; + sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.6"; }; dotenv = { groups = ["default"]; @@ -1566,10 +1566,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n0pijrc465zzrv5flxc41375zwaz9yfc2n0r80zjwarc1ixkdx1"; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; type = "gem"; }; - version = "2.8.0.1"; + version = "2.8.1"; }; makara = { dependencies = ["activerecord"]; @@ -1669,10 +1669,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1720,10 +1720,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.6"; }; net-ldap = { groups = ["default"]; @@ -1794,10 +1794,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1805,10 +1805,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; + sha256 = "1g6wvxab4qwnbny983n9bckc0afy6y6s3g5v3csdbsp8n7g9vxi3"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.5"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -2132,10 +2132,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.2"; + version = "2.2.7"; }; rack-attack = { dependencies = ["rack"]; @@ -2198,10 +2198,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; + sha256 = "17ympjpkhz06xqsay18hskpbs64nh05hzrsckx8va6ikrxhs2ksq"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2264,10 +2264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; + sha256 = "0g92if3cxxysl9h6x6ibs7y9dsbcniiwgcldvg00kib02b3pxkbb"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2893,10 +2893,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; tilt = { groups = ["default"]; @@ -2913,10 +2913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; tpm-key_attestation = { dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; @@ -3202,10 +3202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; type = "gem"; }; - version = "2.6.6"; + version = "2.6.8"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 8809483fe17..f8b37d94cfa 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -3,8 +3,8 @@ src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; - rev = "v4.1.2"; - sha256 = "mkcGEQVE+sF4jYdEubHTGK9mp9O/Ny08AUqnnwW736M="; + rev = "v4.1.3"; + sha256 = "F+cpL+ZFfe52f82qtJxuxRCILW3zr6K5OMrvaOgWe58="; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index d80cafca6d6..309d01fc75a 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"4.1.2" +"4.1.3" diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 1a085c0e062..890817dd407 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation { "zsh_cv_sys_dynamic_strip_lib=yes" ]; + postPatch = '' + substituteInPlace Src/Modules/pcre.mdd \ + --replace 'pcre-config' 'true' + ''; + preConfigure = '' # use pkg-config instead of pcre-config configureFlagsArray+=("PCRECONF=''${PKG_CONFIG} libpcre") diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index b60ea95302b..28379107ada 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -34,9 +34,10 @@ buildGoModule rec { '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $out/bin/restic generate \ --bash-completion restic.bash \ + --fish-completion restic.fish \ --zsh-completion restic.zsh \ --man . - installShellCompletion restic.{bash,zsh} + installShellCompletion restic.{bash,fish,zsh} installManPage *.1 ''; diff --git a/pkgs/tools/misc/uair/default.nix b/pkgs/tools/misc/uair/default.nix index 90036a6b457..5d154ef82d8 100644 --- a/pkgs/tools/misc/uair/default.nix +++ b/pkgs/tools/misc/uair/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "uair"; - version = "v0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "metent"; repo = pname; - rev = version; - hash = "sha256-qxfdKU3SFGVpp3OG0m+0qDvs5cB2bAaTF8+K6zwXRnI="; + rev = "v${version}"; + hash = "sha256-cxSNBxs6ixbjWMUYzOnwI+vavkfyaQx3/OmVdTCr7M0="; }; - cargoHash = "sha256-XmEbXzpynkUPXywaf4wPcWq9zf3gNOHkcVr2jz3WNnc="; + cargoHash = "sha256-cDIF4RvJ7K6t18GPgiRV6NDoD/x3II/3wCHW3KK2/os="; nativeBuildInputs = [ installShellFiles scdoc ]; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 731fe83dc9b..7ef5cf0b4ed 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -8,17 +8,16 @@ stdenv.mkDerivation rec { owner = "nicm"; repo = pname; rev = version; - sha256 = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0="; + hash = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl tdb zlib flex bison ]; - meta = with lib; { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; homepage = "https://github.com/nicm/fdm"; downloadPage = "https://github.com/nicm/fdm/releases"; license = licenses.isc; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a72c2f032c9..8462a153da5 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-07-04"; + version = "2023-07-05"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a6ELQlfer7kmeWxjiuAelT2TcmwXoAD3s/x3f1JsRlQ="; + hash = "sha256-YJ7RR4PMa87Fw8dtRK4t+rDI1uyLfW8vQ/Rp1gr/Qw0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 37b0cf7a1e7..010d142837e 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.42.0"; + version = "3.43.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-ZPlIuWprlB9Xp3aD4AjWfYMEnDwyoijNqhBGgq3BJ5M="; + hash = "sha256-QZFn9O5feTrw+/vW0n4oqVJUbsOBFnvbXWdnVWVoc2Y="; }; - vendorHash = "sha256-gIiG9fULEEqWLdCoPOtbE6bSYyZv8I36vBRB6b3KOI8="; + vendorHash = "sha256-G+G8Rlgn2GICXHtGSKZ1jzMJ8ERWZr/w5z9CtLo3L+E="; ldflags = [ "-s" diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/tools/text/tidy-viewer/default.nix index 47fabde6068..6c38007b3f2 100644 --- a/pkgs/tools/text/tidy-viewer/default.nix +++ b/pkgs/tools/text/tidy-viewer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tidy-viewer"; - version = "1.4.30"; + version = "1.5.2"; src = fetchFromGitHub { owner = "alexhallam"; repo = "tv"; rev = version; - sha256 = "sha256-z1H27D0DYQieU91FBZreN6XQCFvwxBJBIWBZRO50cnw="; + sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4="; }; - cargoSha256 = "sha256-rLRyzQkwbjIMhLLHSuDKQznBIDV9iAqCUVg6q5gRhsA="; + cargoSha256 = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM="; # this test parses command line arguments # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index c7f68f2bd52..3ff93ad2301 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "17"; src = fetchurl { - url = "ftp://ftp.knackered.org/pub/psutils/psutils-p${version}.tar.gz"; - sha256 = "1r4ab1fvgganm02kmm70b2r1azwzbav2am41gbigpa2bb1wynlrq"; + url = "http://knackered.knackered.org/angus/download/${pname}/${pname}-p${version}.tar.gz"; + hash = "sha256-OFPreVhLqPvieoFUJbZan38Vsljg1DoFqFa9t11YiuQ="; }; configurePhase = '' @@ -15,13 +15,16 @@ stdenv.mkDerivation rec { Makefile.unix > Makefile ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + preInstall = '' mkdir -p $out/bin $out/share/man/man1 ''; - meta = with lib; { + meta = { description = "Collection of useful utilities for manipulating PS documents"; homepage = "http://knackered.knackered.org/angus/psutils/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 420a85403fe..a83002aebf7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1653,6 +1653,7 @@ mapAliases ({ tangogps = foxtrotgps; # Added 2020-01-26 taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 + taro = taproot-assets; # Added 2023-07-04 tdesktop = telegram-desktop; # Added 2023-04-07 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eccf0a95f4e..96bfabf69ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -587,6 +587,8 @@ with pkgs; expressvpn = callPackage ../applications/networking/expressvpn { }; + faq = callPackage ../development/tools/faq { }; + figma-agent = callPackage ../applications/graphics/figma-agent { }; figma-linux = callPackage ../applications/graphics/figma-linux { }; @@ -8471,14 +8473,14 @@ with pkgs; grub2 = callPackage ../tools/misc/grub/default.nix { # update breaks grub2 - gnulib = pkgs.gnulib.overrideAttrs (_: rec { + gnulib = pkgs.gnulib.overrideAttrs { version = "20200223"; src = fetchgit { url = "https://git.savannah.gnu.org/r/gnulib.git"; rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; }; - }); + }; }; grub2_efi = grub2.override { @@ -14304,14 +14306,14 @@ with pkgs; wget2 = callPackage ../tools/networking/wget2 { # update breaks grub2 - gnulib = pkgs.gnulib.overrideAttrs (_: rec { + gnulib = pkgs.gnulib.overrideAttrs { version = "20210208"; src = fetchgit { url = "https://git.savannah.gnu.org/r/gnulib.git"; rev = "0b38e1d69f03d3977d7ae7926c1efeb461a8a971"; sha256 = "06bj9y8wcfh35h653yk8j044k7h5g82d2j3z3ib69rg0gy1xagzp"; }; - }); + }; }; wgpu-utils = callPackage ../tools/graphics/wgpu-utils { @@ -15308,9 +15310,9 @@ with pkgs; clangMultiStdenv = overrideCC stdenv buildPackages.clang_multi; multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv; - gcc_debug = lowPrio (wrapCC (gcc.cc.overrideAttrs (_: { + gcc_debug = lowPrio (wrapCC (gcc.cc.overrideAttrs { dontStrip = true; - }))); + })); gccCrossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic; @@ -21005,7 +21007,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_1_3_0 = libgit2.overrideAttrs (_: rec { + libgit2_1_3_0 = libgit2.overrideAttrs rec { version = "1.3.0"; src = pkgs.fetchFromGitHub { owner = "libgit2"; @@ -21014,9 +21016,9 @@ with pkgs; sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; }; patches = []; - }); + }; - libgit2_1_5 = libgit2.overrideAttrs (_: rec { + libgit2_1_5 = libgit2.overrideAttrs rec { version = "1.5.1"; src = pkgs.fetchFromGitHub { owner = "libgit2"; @@ -21024,7 +21026,7 @@ with pkgs; rev = "v${version}"; hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; }; - }); + }; libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -21311,7 +21313,7 @@ with pkgs; gtkimageview = callPackage ../development/libraries/gtkimageview { }; glib = callPackage ../development/libraries/glib (let - glib-untested = glib.overrideAttrs (_: { doCheck = false; }); + glib-untested = glib.overrideAttrs { doCheck = false; }; in { # break dependency cycles # these things are only used for tests, they don't get into the closure @@ -24261,7 +24263,7 @@ with pkgs; rocksdb_lite = rocksdb.override { enableLite = true; }; - rocksdb_6_23 = rocksdb.overrideAttrs (_: rec { + rocksdb_6_23 = rocksdb.overrideAttrs rec { pname = "rocksdb"; version = "6.23.3"; src = fetchFromGitHub { @@ -24270,7 +24272,7 @@ with pkgs; rev = "v${version}"; sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; }; - }); + }; rotate-backups = callPackage ../tools/backup/rotate-backups { }; @@ -25515,11 +25517,11 @@ with pkgs; sqitchMysql = (callPackage ../development/tools/misc/sqitch { mysqlSupport = true; - }).overrideAttrs (_: { pname = "sqitch-mysql"; }); + }).overrideAttrs { pname = "sqitch-mysql"; }; sqitchPg = (callPackage ../development/tools/misc/sqitch { postgresqlSupport = true; - }).overrideAttrs (_: { pname = "sqitch-pg"; }); + }).overrideAttrs { pname = "sqitch-pg"; }; ### DEVELOPMENT / R MODULES @@ -27496,13 +27498,13 @@ with pkgs; inherit (callPackages ../os-specific/linux/kernel-headers { inherit (pkgsBuildBuild) elf-header; }) linuxHeaders makeLinuxHeaders; - linuxHeaders_5_19 = linuxHeaders.overrideAttrs (_: rec { + linuxHeaders_5_19 = linuxHeaders.overrideAttrs rec { version = "5.19.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; sha256 = "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1"; }; - }); + }; klibc = callPackage ../os-specific/linux/klibc { }; @@ -32437,10 +32439,10 @@ with pkgs; # telegram-desktop has random crashes when jemalloc is built with gcc. # Apparently, it triggers some bug due to usage of gcc's builtin # functions like __builtin_ffsl by jemalloc when it's built with gcc. - jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs(_: { + jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs { # no idea how to fix the tests :( doCheck = false; - }); + }; }; kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; @@ -35446,12 +35448,12 @@ with pkgs; darwin = true; }; }; - }).overrideAttrs (_: rec { + }).overrideAttrs { pname = "vim-darwin"; meta = { platforms = lib.platforms.darwin; }; - }); + }; vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; @@ -36384,7 +36386,7 @@ with pkgs; boost = boost175; inherit (darwin) autoSignDarwinBinariesHook; }; - elementsd-simplicity = elementsd.overrideAttrs (_: rec { + elementsd-simplicity = elementsd.overrideAttrs { version = "unstable-2023-04-18"; src = fetchFromGitHub { owner = "ElementsProject"; @@ -36392,7 +36394,7 @@ with pkgs; rev = "ea318a45094ab3d31dd017d7781a6f28f1ffaa33"; # simplicity branch latest sha256 = "ooe+If3HWaJWpr2ux7DpiCTqB9Hv+aXjquEjplDjvhM="; }; - }); + }; ergo = callPackage ../applications/blockchains/ergo { }; @@ -36500,7 +36502,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - taro = callPackage ../applications/blockchains/taro { }; + taproot-assets = callPackage ../applications/blockchains/taproot-assets { }; inherit (callPackages ../applications/blockchains/teos { }) teos @@ -38826,7 +38828,7 @@ with pkgs; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = polyml.overrideAttrs (_: { + polyml = polyml.overrideAttrs { pname = "polyml-for-isabelle"; version = "2022"; configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; @@ -38837,7 +38839,7 @@ with pkgs; rev = "bafe319bc3a65bf63bd98a4721a6f4dd9e0eabd6"; sha256 = "1ygs09zzq8icq1gc8qf4sb24lxx7sbcyd5hw3vw67a3ryaki0qw2"; }; - }); + }; java = openjdk17; }; @@ -40942,13 +40944,13 @@ with pkgs; phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 - openfst = openfst.overrideAttrs (_: rec { + openfst = openfst.overrideAttrs rec { version = "1.7.9"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-${version}.tar.gz"; sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; }; - }); + }; }; duti = callPackage ../os-specific/darwin/duti { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index da6bb754298..3311de6b9de 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -862,15 +862,22 @@ with self; { AppMusicChordPro = buildPerlPackage { pname = "App-Music-ChordPro"; - version = "0.977"; + version = "6.010"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-0.977.tar.gz"; - hash = "sha256-EPOVabK2KSct2zQIUxdb0E3YTHEHLOqzcSW2xga58T0="; + url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-6.010.tar.gz"; + hash = "sha256-SqTkbR2bWIMcU5gSRf2WW6s1ckHtJVPkxj/bBO9X4kM="; }; buildInputs = [ PodParser ]; - propagatedBuildInputs = [ AppPackager FileLoadLines IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] + propagatedBuildInputs = [ AppPackager FileLoadLines FileHomeDir IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] ++ lib.optionals (!stdenv.isDarwin) [ Wx ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + + # Delete tests that fail when version env var is set, see + # https://github.com/ChordPro/chordpro/issues/293 + patchPhase = '' + rm t/320_subst.t t/321_subst.t t/322_subst.t + ''; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/chordpro rm $out/bin/wxchordpro # Wx not supported on darwin @@ -9475,10 +9482,10 @@ with self; { FileLoadLines = buildPerlPackage { pname = "File-LoadLines"; - version = "1.01"; + version = "1.021"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/File-LoadLines-1.01.tar.gz"; - hash = "sha256-boxuaqSffLmY+r+5ZqSZK7DGLxzT49chNaMRVoNGWdE="; + url = "mirror://cpan/authors/id/J/JV/JV/File-LoadLines-1.021.tar.gz"; + hash = "sha256-mOQS98aSYRNPNLh4W926sxVrj0UlU9u1tWytaDuG//A="; }; buildInputs = [ TestException ]; meta = { @@ -19385,10 +19392,10 @@ with self; { PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.042"; + version = "2.044"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.042.tar.gz"; - hash = "sha256-q5kpQVAGAdwxoaL65s3hD3VTGogKKjEAyZ1VYKzVPF0="; + url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.044.tar.gz"; + hash = "sha256-stFVeeQnI9jX+bct6G0NNc3jTx63cTRWuirTX7PL6n4="; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -22274,10 +22281,10 @@ with self; { StringInterpolateNamed = buildPerlPackage { pname = "String-Interpolate-Named"; - version = "1.00"; + version = "1.03"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/String-Interpolate-Named-1.00.tar.gz"; - hash = "sha256-cnKZ+mkli2BHcOBZ7E2pBr/ecYYf3R4+ieMGdzccWoA="; + url = "mirror://cpan/authors/id/J/JV/JV/String-Interpolate-Named-1.03.tar.gz"; + hash = "sha256-on13VgcnX2jtkqQT85SsAJLn3hzZPWJHnUf7pwF6Jtw="; }; meta = { description = "Interpolated named arguments in string"; @@ -25544,12 +25551,12 @@ with self; { TextLayout = buildPerlPackage { pname = "Text-Layout"; - version = "0.019"; + version = "0.031"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/Text-Layout-0.019.tar.gz"; - hash = "sha256-oEPyqJ4ROynFI6nvpx+oOY7XXt1IIZOQGzjQjdSkEI4="; + url = "mirror://cpan/authors/id/J/JV/JV/Text-Layout-0.031.tar.gz"; + hash = "sha256-EQ4ObbzKIFhKcckNpxBYAdRrXXYd+QmsTfYQbDM3B34="; }; - buildInputs = [ PDFAPI2 ]; + buildInputs = [ IOString PDFAPI2 ]; meta = { description = "Pango style markup formatting"; license = with lib.licenses; [ artistic1 gpl1Plus ]; |