diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index 12ed97576699..e053bd9400c4 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -158,7 +158,7 @@ in serviceConfig = { ExecStart = [ "" - "${cfg.package}/bin/stalwart-mail --config=${configFile}" + "${lib.getExe cfg.package} --config=${configFile}" ]; LoadCredential = lib.mapAttrsToList (key: value: "${key}:${value}") cfg.credentials; @@ -171,6 +171,10 @@ in CacheDirectory = "stalwart-mail"; StateDirectory = "stalwart-mail"; + # Upstream uses "stalwart" as the username since 0.12.0 + User = "stalwart-mail"; + Group = "stalwart-mail"; + # Bind standard privileged ports AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix index 5f9562013011..4bafcf1c1f8c 100644 --- a/nixos/tests/paretosecurity.nix +++ b/nixos/tests/paretosecurity.nix @@ -126,8 +126,6 @@ xfce.wait_for_text("Pareto Security") # Test 6: paretosecurity:// URL handler is registered - xfce.execute("su - alice -c 'xdg-open paretosecurity://foo >/dev/null &'") - xfce.wait_for_text("Failed to add device") - + xfce.succeed("su - alice -c 'xdg-open paretosecurity://foo'") ''; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7d0dbcdba06b..e7415ee7d925 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -15289,6 +15289,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + uv-nvim = buildVimPlugin { + pname = "uv.nvim"; + version = "2025-05-31"; + src = fetchFromGitHub { + owner = "benomahony"; + repo = "uv.nvim"; + rev = "642e45d392a65fe15dbebd63444e45e21a38f883"; + sha256 = "1l681q5d3c8hqr1vvb4rxs6y5a1fs3m3cx3v0n6lvmlcdbdn4mjb"; + }; + meta.homepage = "https://github.com/benomahony/uv.nvim/"; + meta.hydraPlatforms = [ ]; + }; + vCoolor-vim = buildVimPlugin { pname = "vCoolor.vim"; version = "2020-10-14"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2f732430fe9c..4164a6c0f229 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -120,6 +120,8 @@ websocat, # luau-lsp-nvim dependencies luau-lsp, + # uv.nvim dependencies + uv, # nvim-vstsl dependencies vtsls, }: @@ -3528,6 +3530,13 @@ in postPatch = "cd editor-support/vim"; }; + uv-nvim = super.uv-nvim.overrideAttrs { + dependencies = with self; [ + telescope-nvim + ]; + runtimeDeps = [ uv ]; + }; + vCoolor-vim = super.vCoolor-vim.overrideAttrs { # on linux can use either Zenity or Yad. propagatedBuildInputs = [ zenity ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 63fabcda49af..55b9fddd28d7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1173,6 +1173,7 @@ https://github.com/Shougo/unite.vim/,, https://github.com/sontungexpt/url-open/,HEAD, https://github.com/axieax/urlview.nvim/,, https://github.com/vim-scripts/utl.vim/,, +https://github.com/benomahony/uv.nvim/,HEAD, https://github.com/KabbAmine/vCoolor.vim/,, https://github.com/junegunn/vader.vim/,, https://github.com/jbyuki/venn.nvim/,, diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 045d1daf5e3a..0655fef98a6e 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-05-16"; + version = "0-unstable-2025-05-30"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "47910f9c8b1e51d049327ab768189c24e34efafb"; - hash = "sha256-XliePwpMYGQLYoWQU0l9Ctcmtf0TlXKpA5PagCurXhE="; + rev = "67c0bb961e7679aa8f1882ee6411ce34cef084db"; + hash = "sha256-4hkKf61h/0FVE9nQub2YN0mOpql7dwmVngckagWLCuc="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix index 286b73516ac7..635481d2f9b1 100644 --- a/pkgs/by-name/aw/aws-sso-cli/package.nix +++ b/pkgs/by-name/aw/aws-sso-cli/package.nix @@ -10,13 +10,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "synfinatic"; repo = "aws-sso-cli"; rev = "v${version}"; - hash = "sha256-hzX5gqr8tJk9EtP3ophbJ5m3rb92ZOs9UuDVTvxFcpI="; + hash = "sha256-GoLSdQb6snViYD9QY6NTypKquFsoX3jgClyrgTGoRq8="; }; vendorHash = "sha256-SNMU7qDfLRGUSLjzrJHtIMgbcRc2DxXwWEUaUEY6PME="; diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 4f9074ef8418..e506896871e7 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -27,17 +27,17 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "bacon"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${finalAttrs.version}"; - hash = "sha256-/m549z9NWZhkn6/Y6WM1+og0vyg1DbqZmK3oGpydQa0="; + hash = "sha256-8f+EphnooB/9KY9M+mi8xBUX/cH7EvoyHlD/4RjgeaA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-X35mC8c1NeonUA1yYO9C7KCzHKpyIn6mbVWkZUhv+Es="; + cargoHash = "sha256-48QDMJrxm+9psSeCRG7rsNPwxv+FKLrkLMvIvwsV3GQ="; buildFeatures = lib.optionals withSound [ "sound" diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index abaf20e2879f..3aae78ec39ec 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.16.0"; + version = "5.18.0"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; tag = finalAttrs.version; - hash = "sha256-yQ4jJUIA4E+rQiR2VtEupgZoAzek/2lzol74vmppb/k="; + hash = "sha256-jaDFi4lbaX6aOWBR9pvTS5UHuUdHomQ/nssj4IE/aOE="; }; patches = [ ]; diff --git a/pkgs/by-name/br/browsh/package.nix b/pkgs/by-name/br/browsh/package.nix index f14b7662e8cb..8d4661c5045d 100644 --- a/pkgs/by-name/br/browsh/package.nix +++ b/pkgs/by-name/br/browsh/package.nix @@ -6,14 +6,14 @@ }: let - version = "1.8.2"; + version = "1.8.3"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}.xpi"; - hash = "sha256-04rLyQt8co3Z7UJnDJmj++E4n7of0Zh1jQ90Bfwnx5A="; + hash = "sha256-wLctfGHDCgy3nMG/nc882qNjHOAp8VeOZcEWJD7QThY="; }; in @@ -29,10 +29,10 @@ buildGoModule rec { owner = "browsh-org"; repo = "browsh"; rev = "v${version}"; - hash = "sha256-KbBVcNuERBL94LuRx872zpjQTzR6c5GalsBoNR52SuQ="; + hash = "sha256-Abna1bAaqOT44zZJsObLMR5fTW2xlWBg1M0JYH0Yc6g="; }; - vendorHash = "sha256-eCvV3UuM/JtCgMqvwvqWF3bpOmPSos5Pfhu6ETaS58c="; + vendorHash = "sha256-481dC7UrNMnb1QswvK2FqUiioTZ9xJP4dSd3rvRkqro="; preBuild = '' cp "${webext}" src/browsh/browsh.xpi diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix index 6479c15eeb76..a37ca2faac41 100644 --- a/pkgs/by-name/bu/burp/package.nix +++ b/pkgs/by-name/bu/burp/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "grke"; repo = "burp"; rev = version; - sha256 = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc="; + hash = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc="; }; patches = [ @@ -29,7 +29,13 @@ stdenv.mkDerivation rec { (fetchpatch { name = "ncurses-6.3.patch"; url = "https://github.com/grke/burp/commit/1d6c931af7c11f164cf7ad3479781e8f03413496.patch"; - sha256 = "14sfbfahlankz3xg6v10i8fnmpnmqpp73q9xm0l0hnjh25igv6bl"; + hash = "sha256-dJn9YhFQWggoqD3hce7F1d5qHYogbPP6+NMqCpVbTpM="; + }) + # Pull upstream fix for backup resuming + (fetchpatch { + name = "fix-resume.patch"; + url = "https://github.com/grke/burp/commit/b5ed667f73805b5af9842bb0351f5af95d4d50b3.patch"; + hash = "sha256-MT9D2thLgV4nT3LsIDHZp8sWQF2GlOENj0nkOQXZKuk="; }) ]; diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index 941dde968ba1..a8a4b1462dbe 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.29"; + version = "0.4.30"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-2Hdsakol6uHOITg8qgMTXZMtgvExKUrThxr/J93vInc="; + hash = "sha256-yG4VXGWxU4sWX9q2ykA0wkZ/5S4quIcYNGbZzADUD/I="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { sourceRoot = "${src.name}/c2FmZQ"; - vendorHash = "sha256-Evx81YLXUWBZ0Wk55TToVGxuOPFlKbULwAOeDilsUFA="; + vendorHash = "sha256-+BzvB3djuvFqb/KS9iJeWX2oUFF7f9ldGEH+liGDVNg="; subPackages = [ "c2FmZQ-client" diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix index 5b437cb0f1e4..a091b19928a9 100644 --- a/pkgs/by-name/cl/clive/package.nix +++ b/pkgs/by-name/cl/clive/package.nix @@ -10,16 +10,16 @@ }: buildGoModule rec { pname = "clive"; - version = "0.12.9"; + version = "0.12.11"; src = fetchFromGitHub { owner = "koki-develop"; repo = "clive"; tag = "v${version}"; - hash = "sha256-mNx5SCBvhpxk9IkKp1j0oyPNZl91cAKHGIUzyYf+bYU="; + hash = "sha256-BAKZTWcC8EzDTlQZUJBzVQNF0kDBY7Lx+8ZFAYgoWlQ="; }; - vendorHash = "sha256-jHvr2tWp8iscm6vgHdRTYlFmPOWlRG3lz8hl4PM6e/c="; + vendorHash = "sha256-ljjSopfKGSotJx52SScl7KwFyKbFF9uxQMODjuZH4vc="; subPackages = [ "." ]; buildInputs = [ ttyd ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index fcefe632938d..16b22ef13917 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.204.0"; + version = "0.204.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-jW6L4Rxm05ymjtyKPt56ulSuUcfJv9Ev6Jk403NnDt0="; + hash = "sha256-z3SwTBcCETIe2xPN9VU3mqYxd7npvrs44FkGQp56Y00="; }; - vendorHash = "sha256-+rARu2Qfi2IFngoFl4qmPiRk5iXE4+A74RhHIjocieg="; + vendorHash = "sha256-dBOZ5kYQxVTWB1CTTF3L+FIsuLnVQmA7Vjid7CdJbeo="; commonMeta = with lib; { license = licenses.mit; diff --git a/pkgs/by-name/f2/f2/package.nix b/pkgs/by-name/f2/f2/package.nix index 52942fe78fd3..b152d9ad0e46 100644 --- a/pkgs/by-name/f2/f2/package.nix +++ b/pkgs/by-name/f2/f2/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "f2"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "ayoisaiah"; repo = "f2"; tag = "v${finalAttrs.version}"; - hash = "sha256-hl4giLTQtqJiPseiTzWPtksEYlyQpE1UOC7JMUF9v4Y="; + hash = "sha256-Roectcq8jMtw9bFnojJBq4+8dG7V4AGxclfqVSTdl4A="; }; - vendorHash = "sha256-xeylGT32bGMJjGdpQQH8DBpqxtvMxpqSEsLPbeoUzl4="; + vendorHash = "sha256-i6hgLj1zu8D0mrO0f+SZ4wAkmMKIPtzOKpu9zMAEML0="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index 90e984ce04a4..32792f207d93 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -9,13 +9,13 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator-mcp"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "fluxcd-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-GGHufHUqTylgynK19aaj4KAawlzzuz3iSEHa+vVVPMM="; + hash = "sha256-SszWTuK3HVsyc669NThQn5VAVwD/7JQtKtqBJD6cTT0="; }; vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY="; diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix index 4462ceebfc25..256bd60429cb 100644 --- a/pkgs/by-name/fl/fluxcd-operator/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator/package.nix @@ -9,13 +9,13 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "fluxcd-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-GGHufHUqTylgynK19aaj4KAawlzzuz3iSEHa+vVVPMM="; + hash = "sha256-SszWTuK3HVsyc669NThQn5VAVwD/7JQtKtqBJD6cTT0="; }; vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY="; diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 48ff8f1b767d..babed86be830 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.65"; + version = "1.0.69"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-Gebd0dj5VbUiYPTmOlkDQEiIDjflV02GLHCEIjh4S04="; + hash = "sha256-U90y8VxGrRgXTdrusImNK2kRO+Tw9uiXoMiEb3YgaBM="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix index 36b9e3b2cf93..077afdb30a99 100644 --- a/pkgs/by-name/gc/gcli/package.nix +++ b/pkgs/by-name/gc/gcli/package.nix @@ -11,24 +11,15 @@ stdenv.mkDerivation rec { pname = "gcli"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "herrhotzenplotz"; repo = "gcli"; rev = "v${version}"; - hash = "sha256-N5dzGhyXPDWcm/cNUSUQt4rR+PzaD1OUssRO3Sdfmoo="; + hash = "sha256-s71RImg/N8v9h472upI94Pae/Zlw27f4Kc9SCavP1oY="; }; - patches = [ - # Darwin builds are fixed in master, but the change is unreleased. - (fetchpatch { - name = "darwin-build-fix.patch"; - url = "https://github.com/herrhotzenplotz/gcli/commit/720e372250fd363bdd90e9452907508563e30f93.patch"; - hash = "sha256-TpjIisje20YObN2wf8iQlwHlY5kg0S7xTkUWxAmK+po="; - }) - ]; - nativeBuildInputs = [ pkg-config byacc diff --git a/pkgs/by-name/go/goto/package.nix b/pkgs/by-name/go/goto/package.nix index 3a36d160a2cc..3d3a1861bc97 100644 --- a/pkgs/by-name/go/goto/package.nix +++ b/pkgs/by-name/go/goto/package.nix @@ -2,7 +2,6 @@ fetchFromGitHub, gawk, lib, - nix-update-script, runCommand, stdenvNoCC, writableTmpDirAsHomeHook, @@ -48,10 +47,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { touch $out ''; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - meta = { description = "Alias and navigate to directories with tab completion"; homepage = "https://github.com/iridakos/goto"; diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix index 25164b54e280..149079d515ab 100644 --- a/pkgs/by-name/gr/grml-zsh-config/package.nix +++ b/pkgs/by-name/gr/grml-zsh-config/package.nix @@ -2,21 +2,25 @@ stdenv, fetchFromGitHub, lib, + asciidoctor, txt2tags, }: stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.14"; + version = "0.19.19"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-7UiP6CUP/qArOfcrFtpiNUBBwkcCSrvsPb29SSqSkmg="; + sha256 = "sha256-47C1yq9IMaOLvehy3ekvjmAVl06hhJbKDxkCJFAALs0="; }; strictDeps = true; - nativeBuildInputs = [ txt2tags ]; + nativeBuildInputs = [ + asciidoctor + txt2tags + ]; buildPhase = '' cd doc diff --git a/pkgs/by-name/li/libcs50/package.nix b/pkgs/by-name/li/libcs50/package.nix index ffb201859600..a11949699d64 100644 --- a/pkgs/by-name/li/libcs50/package.nix +++ b/pkgs/by-name/li/libcs50/package.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out cp -R build/lib $out/lib cp -R build/include $out/include - ln -sf $out/lib/libcs50.so.11.0.3 $out/lib/libcs50.so.11 runHook postInstall ''; diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 72ddc32becc6..fd1e5e3268de 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -37,7 +37,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "138.0.4-1"; + version = "139.0-1"; in stdenv.mkDerivation { @@ -47,9 +47,9 @@ stdenv.mkDerivation { url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - i686-linux = "sha256-9lHQQ9DGfIIjMhvtorrFTHjjt+qCFRdhgLmkDYn5/sI="; - x86_64-linux = "sha256-N4MmZgYtezRzofuxPreWM+MrPZbgrh/jhBtDqHndFzw="; - aarch64-linux = "sha256-y4wR6RgtEesvogy+fRtVwY6dMMrrC/bPjH35N/ARI2U="; + i686-linux = "sha256-nWJRYEmjX8aE9zSuLU1FMg4FeZuDiC1eu+nxIRPhlNE="; + x86_64-linux = "sha256-2PmN18Rda0KeguQRsd5sZr3TRS8cEkTY21WhxxahCFc="; + aarch64-linux = "sha256-EzgGhIrS/D6IEylrhX0uvpSkWte/mHMyUYjXsm0PUn8="; } .${stdenv.hostPlatform.system} or throwSystem; }; diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 1f0e4c3e9415..00abcd3a3d91 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.674"; + version = "0.676"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-9HdrwFbjeRwYXVIm6JtqT+HI0ZFJDm9//kvuU25u5Qo="; + hash = "sha256-Zmg1ah5um9ByBTvuDTrEBg1V2qlrg7AQcOlJvK5u/cg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix index 0fa9e08fa4ce..05211c8098fe 100644 --- a/pkgs/by-name/pa/paretosecurity/package.nix +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -17,16 +17,16 @@ buildGoModule (finalAttrs: { webkitgtk_4_1 ]; pname = "paretosecurity"; - version = "0.2.23"; + version = "0.2.27"; src = fetchFromGitHub { owner = "ParetoSecurity"; repo = "agent"; rev = finalAttrs.version; - hash = "sha256-jqjfaTvbwp/3P3E7eYv8CFaaYNjPfnbrFIzD6JcccV4="; + hash = "sha256-dYQNSzovWCX7sj7VjgBc5GHz+5dKLTiB5pvbVSLMyqY="; }; - vendorHash = "sha256-v9M1CX6mIK8MdaI5TVa0Uc+HnIy+oCg+vYlH3eU809Q="; + vendorHash = "sha256-PhuHRs0PjIJqY3ZBC4ga7zFxgf57xfPjJ3VIDaA61F0"; proxyVendor = true; # Skip building the Windows installer diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index ab630fc51c63..140190b48066 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -21,17 +21,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0-nightly-2025-05-22"; + version = "0-nightly-2025-06-01"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0-" finalAttrs.version; - hash = "sha256-30mKM2CfqlFXLjp8Ui7qXodrfVL1GFvjkEYBPMAiQsI="; + hash = "sha256-7fkeQZHrzyKxga5wWkIA4uo0ka1pNfYrXIz250uJ1KI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RqvFLGYVxB9WimReMXDuAkSkLRuySHkjmAUliapCSdo="; + cargoHash = "sha256-pCE70CP5+Rm28yokh88zP9Si2lmikCRxD7cRKFrz+o0="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = diff --git a/pkgs/by-name/sc/scom/package.nix b/pkgs/by-name/sc/scom/package.nix index c7e2f9821d5b..af50df478a03 100644 --- a/pkgs/by-name/sc/scom/package.nix +++ b/pkgs/by-name/sc/scom/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finaAttrs: { pname = "scom"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "crash-systems"; repo = "scom"; tag = finaAttrs.version; - hash = "sha256-z/y4SB0R3nxiBGAWLGBsRH0tncDuBxpjy6NGG8ZbIPw="; + hash = "sha256-ZcD7H+tgekwZ6TOAjw6cxa78uMsBXFkIFZrHF+ErW4k="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 2e163cf893e4..5c1e5d620656 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -29,18 +29,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.15.12"; + version = "0.15.13"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst"; - hash = "sha256-oyNBEdVrsi8MuiYIlU7IjfJg60dy8FTtKXcJEgA+yKA="; + hash = "sha256-XpfBllGv9xBoe5MpLVNhy0EWUglLzIxiyBHBn3qBRks="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-v/sqXA4aAXGcGy+/2UrtThN3jS30q35QPwpchS7oRgk="; + hash = "sha256-phRnyaF8KTYlgrgBeVNPxBAokRBUoj9vs7P9y97wbG8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 1567814a12a4..6aa5c143921e 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -24,13 +24,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); - version = "0.11.8"; + version = "0.12.2"; src = fetchFromGitHub { owner = "stalwartlabs"; - repo = "mail-server"; + repo = "stalwart"; tag = "v${finalAttrs.version}"; - hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4="; + hash = "sha256-P19jeEzFE8Gu6hqHZJiPoJ70r+zOmzOpEwfFqPQczZY="; }; # rocksdb does not properly distinguish between pointers it has allocated itself @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-iheURWxO0cOvO+FV01l2Vmo0B+S2mXzue6mx3gapftQ="; + cargoHash = "sha256-WVvDapCA9pTgOtPpbsK78u2AC2hUfo3sOejZ6pJSlQk="; nativeBuildInputs = [ pkg-config @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rocksdbJemalloc ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ]; - # Issue: https://github.com/stalwartlabs/mail-server/issues/1104 + # Issue: https://github.com/stalwartlabs/stalwart/issues/1104 buildNoDefaultFeatures = true; buildFeatures = [ @@ -133,6 +133,10 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=smtp::queue::retry::queue_retry" # Missing store type. Try running `STORE= cargo test`: NotPresent "--skip=store::store_tests" + # Missing store type. Try running `STORE= cargo test`: NotPresent + "--skip=cluster::cluster_tests" + # Missing store type. Try running `STORE= cargo test`: NotPresent + "--skip=webdav::webdav_tests" # thread 'config::parser::tests::toml_parse' panicked at crates/utils/src/config/parser.rs:463:58: # called `Result::unwrap()` on an `Err` value: "Expected ['\\n'] but found '!' in value at line 70." "--skip=config::parser::tests::toml_parse" @@ -189,6 +193,7 @@ rustPlatform.buildRustPackage (finalAttrs: { } ]; + mainProgram = "stalwart"; maintainers = with lib.maintainers; [ happysalada onny diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 5ed67c2b45c2..72466a751a02 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "webadmin"; - version = "0.1.25"; + version = "0.1.26"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; tag = "v${version}"; - hash = "sha256-Hv7FojY/SZgbzS8XGVj0uRfynZCZPEbPiSHRuBtt/Jc="; + hash = "sha256-TWzXSBXLZd4b02cfiERZqNaXcfxx1pH7OFUcdEugH7k="; }; npmDeps = fetchNpmDeps { @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-/BoGeAF4GbM8ddWCnxAueJQYgQZvAL0pQ0pDUW0mXI0="; + cargoHash = "sha256-Eh5wu3RHNPWIPDZPUlh8L6OvghkfmMp0eAOTbk9Fs+0="; postPatch = '' # Using local tailwindcss for compilation diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix index 66415d3c5811..ee4f302bb61c 100644 --- a/pkgs/by-name/ti/ticker/package.nix +++ b/pkgs/by-name/ti/ticker/package.nix @@ -8,21 +8,21 @@ buildGoModule rec { pname = "ticker"; - version = "5.0.0"; + version = "5.0.5"; src = fetchFromGitHub { owner = "achannarasappa"; repo = "ticker"; tag = "v${version}"; - hash = "sha256-fRmW9Cs0Rxp+St4BUswHt/JxHgVy1Go4OR9oarkAufw="; + hash = "sha256-SwQkoviJCPJmz//EIBRqvaWtg65xgTo98VnoiciwKHY="; }; - vendorHash = "sha256-4e3TB4EHJTFxBcjAepEU8u4gurhss2seihw3VRiVoqQ="; + vendorHash = "sha256-XKl4bGWTz3AKl+hLFY0R0uT5ryOCHNzoeVHczMb32zo="; ldflags = [ "-s" "-w" - "-X github.com/achannarasappa/ticker/v4/cmd.Version=${version}" + "-X github.com/achannarasappa/ticker/v${lib.versions.major version}/cmd.Version=${version}" ]; # Tests require internet diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index ba80b7978426..05b3ef823722 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-AxPUNdZbvc6T4sFFTkQnOAg26vmzf86oaGbtzapybFc=", - "version": "0.2025.05.14.08.11.stable_03" + "hash": "sha256-II8VDM6qBkep+v017+hhOfx+wfHoMo5lR22IvvXmiy8=", + "version": "0.2025.05.28.08.11.stable_02" }, "linux_x86_64": { - "hash": "sha256-vdBTwn3ElyOIIyPXNbScvymq6P5d15b41NKAg7QSigk=", - "version": "0.2025.05.14.08.11.stable_03" + "hash": "sha256-7/U/ZPJLNbBpk0fNAh0OHr68+x5zhYsbJn+vc09/h4w=", + "version": "0.2025.05.28.08.11.stable_02" }, "linux_aarch64": { - "hash": "sha256-jpTVEvZUmLlsiYTJtECT2G899PyFTXZz5qa9+RPWzaI=", - "version": "0.2025.05.14.08.11.stable_03" + "hash": "sha256-TX1OYadvUdOp9R3eDdw1ONtN/wn7K8m1IH1IwIdSuJQ=", + "version": "0.2025.05.28.08.11.stable_02" } } diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix index e8208d4b3d8d..f29a92714b16 100644 --- a/pkgs/by-name/wi/winbox4/package.nix +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -5,7 +5,7 @@ }: let pname = "winbox"; - version = "4.0beta20"; + version = "4.0beta21"; metaCommon = { description = "Graphical configuration utility for RouterOS-based devices"; @@ -23,13 +23,13 @@ let x86_64-zip = callPackage ./build-from-zip.nix { inherit pname version metaCommon; - hash = "sha256-mU+z7yRYKXnGAXHB5LS5SVUgIzRlR9nV2FzXispntF0="; + hash = "sha256-Uoawz+CW1JLVOEoxSF49WpF31VuUDWK4q9tl1qAwS/c="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-tLsreK6YsqsbMaY4dil34eiHxAG7GrZYyll6BX9dsx8="; + hash = "sha256-PCdN5z77RU5WgYzk2h/ou2OeswZQl32FfxozEZ8ZlTo="; }; in (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: { diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix index 116f81dab20e..217b3d5d2b97 100644 --- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix +++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zigbee2mqtt"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; tag = finalAttrs.version; - hash = "sha256-u3wSp+F31I8PNzh5uQe0MC+WgmQCUvOlWqX1HT7qVhM="; + hash = "sha256-azgZzw1Bgqepg6UM8INbMGZRerbafGJWQfqSEepPf1I="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-WiX2BL5C0LmwGfOc/mWCRpp9jIezmqfl9ZkeIGR4i9w="; + hash = "sha256-Uli0skvkAyVbKdna9MTWoQzK3V7puM7gd7GzCk7tS78="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 4dc7048dd737..e54bac921456 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + gitUpdater, google-api-core, grpc-google-iam-v1, mock, @@ -9,7 +10,6 @@ protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: @@ -18,17 +18,18 @@ buildPythonPackage rec { version = "3.4.1"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "google_cloud_kms"; - inherit version; - hash = "sha256-9BqX3B7SlAgM2LZaOFvHPeMlPG+PtnPcneWWlZhZbqU="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "google-cloud-python"; + tag = "google-cloud-kms-v${version}"; + hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw="; }; - nativeBuildInputs = [ setuptools ]; + sourceRoot = "${src.name}/packages/google-cloud-kms"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ grpc-google-iam-v1 google-api-core proto-plus @@ -53,11 +54,15 @@ buildPythonPackage rec { "google.cloud.kms_v1" ]; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "google-cloud-kms-v"; + }; + + meta = { description = "Cloud Key Management Service (KMS) API API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-kms-v${version}/packages/google-cloud-kms/CHANGELOG.md"; - license = licenses.asl20; - maintainers = [ ]; + changelog = "https://github.com/googleapis/google-cloud-python/blob/${src.tag}/packages/google-cloud-kms/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sarahec ]; }; } diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix index cc4ab9da79df..cd851c25b38b 100644 --- a/pkgs/development/python-modules/livekit-protocol/default.nix +++ b/pkgs/development/python-modules/livekit-protocol/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "livekit-protocol"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; tag = "protocol-v${version}"; - hash = "sha256-1La7XYTo9onQFNx84CwabPM6N6LXIn/7swH50hFQvB8="; + hash = "sha256-iXYxTs87kAe4KZEPSdM6DZKlv98B6sABgyqrhzdr2ug="; }; pypaBuildFlags = [ "livekit-protocol" ]; diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index b054bc1a21d7..d0d4df2d0d6f 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "nidaqmx"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ni"; repo = "nidaqmx-python"; - rev = "${version}"; - hash = "sha256-rf5cGq3Iv6ucURSUFuFANQzaGeufBZ+adjKlg4B5DRY="; + tag = version; + hash = "sha256-WNr+zVrA4X2AjizsmMEau54Vv1Svey3LNsCo8Bm/W+A="; }; disabled = pythonOlder "3.8"; @@ -76,7 +76,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "nidaqmx" ]; meta = { - changelog = "https://github.com/ni/nidaqmx-python/releases/tag/v${version}"; + changelog = "https://github.com/ni/nidaqmx-python/releases/tag/${src.tag}"; description = "API for interacting with the NI-DAQmx driver"; homepage = "https://github.com/ni/nidaqmx-python"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix index 2c236dca67fd..6758e35783be 100644 --- a/pkgs/development/python-modules/pulsar-client/default.nix +++ b/pkgs/development/python-modules/pulsar-client/default.nix @@ -1,133 +1,93 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, - python, + fetchFromGitHub, + + # build + setuptools, + cmake, + pkg-config, + + # dependencies + libpulsar, + pybind11, + certifi, + + # optional dependencies + fastavro, + grpcio, + prometheus-client, + protobuf, + ratelimit, + + # test + unittestCheckHook, }: -let - version = "3.4.0"; - inherit (python) pythonVersion; - - Srcs = - let - getSrcFromPypi = - { - platform, - dist, - hash, - }: - fetchPypi { - inherit - version - platform - dist - hash - ; - pname = "pulsar_client"; - format = "wheel"; - python = dist; - abi = dist; - }; - in - { - "3.9-x86_64-linux" = getSrcFromPypi { - platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; - dist = "cp39"; - hash = "sha256-1P5ArMoLZiUkHUoQ/mJccbNj5/7el/op+Qo6cGQ33xE="; - }; - "3.9-aarch64-linux" = getSrcFromPypi { - platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; - dist = "cp39"; - hash = "sha256-11JQZRwMLtt7sK/JlCBqqRyfTVIAVJFN2sL+nAkQgvU="; - }; - "3.9-aarch64-darwin" = getSrcFromPypi { - platform = "macosx_10_15_universal2"; - dist = "cp39"; - hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8="; - }; - "3.9-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_15_universal2"; - dist = "cp39"; - hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8="; - }; - "3.10-x86_64-linux" = getSrcFromPypi { - platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; - dist = "cp310"; - hash = "sha256-swp1kuQsdgNOmo1k1C3VurNhQl+GneVi6cytaY4ZzYg="; - }; - "3.10-aarch64-linux" = getSrcFromPypi { - platform = "musllinux_1_1_aarch64"; - dist = "cp310"; - hash = "sha256-1ZYwkKeKVkS6JfQdo6bUnqPwDJcrCVuv82WRbcJGQmo="; - }; - "3.10-aarch64-darwin" = getSrcFromPypi { - platform = "macosx_10_15_universal2"; - dist = "cp310"; - hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo="; - }; - "3.10-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_15_universal2"; - dist = "cp310"; - hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo="; - }; - "3.11-x86_64-linux" = getSrcFromPypi { - platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; - dist = "cp311"; - hash = "sha256-M1cd6ZzYmDSfF5eLpi4rg56gJ1+3Bn8xv19uv+rgmH0="; - }; - "3.11-aarch64-linux" = getSrcFromPypi { - platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; - dist = "cp311"; - hash = "sha256-+HQ8MgqpZ5jSDK+pjql6aMQpX8SHLCOs1eAS/TbLBro="; - }; - "3.11-aarch64-darwin" = getSrcFromPypi { - platform = "macosx_10_15_universal2"; - dist = "cp311"; - hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M="; - }; - "3.11-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_15_universal2"; - dist = "cp311"; - hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M="; - }; - "3.12-x86_64-linux" = getSrcFromPypi { - platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; - dist = "cp312"; - hash = "sha256-xgbATzVzQQQvpsdUd959IgT3rlCqKcL3SyTlTIX0f5Y="; - }; - "3.12-aarch64-linux" = getSrcFromPypi { - platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; - dist = "cp312"; - hash = "sha256-8gK4Th9oPWRnLdGXERRgCuLlw3NVhyhv+b+0MThfCOg="; - }; - "3.12-aarch64-darwin" = getSrcFromPypi { - platform = "macosx_10_15_universal2"; - dist = "cp312"; - hash = "sha256-Hgd6SDm+Pq094/BbTCRCadyi3wf0fOoLkFRMfp3BZC8="; - }; - "3.12-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_15_universal2"; - dist = "cp312"; - hash = "sha256-Hgd6SDm+Pq094/BbTCRCadyi3wf0fOoLkFRMfp3BZC8="; - }; - }; -in -buildPythonPackage { +buildPythonPackage rec { pname = "pulsar-client"; - inherit version; + version = "3.7.0"; + pyproject = true; - format = "wheel"; + src = fetchFromGitHub { + owner = "apache"; + repo = "pulsar-client-python"; + tag = "v${version}"; + hash = "sha256-M8Y72VgtPdM80AO9jRyyyOFW6wQ7dbKH33alLWcTLV8="; + }; - src = - Srcs."${pythonVersion}-${stdenv.hostPlatform.system}" - or (throw "Unsupported '${pythonVersion}-${stdenv.hostPlatform.system}' target"); + build-system = [ + setuptools + ]; - meta = with lib; { - description = "Client for pulsar"; - homepage = "https://pypi.org/project/pulsar-client/"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libpulsar + pybind11 + ]; + + preBuild = '' + make -j$NIX_BUILD_CORES + make install + cd .. + ''; + + dependencies = [ certifi ]; + + optional-dependencies = { + functions = [ + # apache-bookkeeper-client + grpcio + prometheus-client + protobuf + ratelimit + ]; + avro = [ fastavro ]; + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + }; + + nativeCheckInputs = [ + unittestCheckHook + ] ++ optional-dependencies.all; + + unittestFlagsArray = [ + "-s" + "test" + ]; + + pythonImportsCheck = [ "pulsar" ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Apache Pulsar Python client library"; + homepage = "https://pulsar.apache.org/docs/next/client-libraries-python/"; + changelog = "https://github.com/apache/pulsar-client-python/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ gaelreyrol ]; }; } diff --git a/pkgs/development/python-modules/pulsar/default.nix b/pkgs/development/python-modules/pulsar/default.nix deleted file mode 100644 index 84407f37b1c3..000000000000 --- a/pkgs/development/python-modules/pulsar/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - cmake, - pkg-config, - libpulsar, - pybind11, - certifi, -}: - -buildPythonPackage rec { - pname = "pulsar"; - version = "3.6.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "apache"; - repo = "pulsar-client-python"; - tag = "v${version}"; - hash = "sha256-KdPLp0BmZnobU4F6tuMj2DY/ya4QHeGcM/eEAivoXNI="; - }; - - disabled = pythonOlder "3.7"; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - libpulsar - pybind11 - ]; - - preBuild = '' - make -j$NIX_BUILD_CORES - make install - cd .. - ''; - - propagatedBuildInputs = [ certifi ]; - - # Requires to setup a cluster - doCheck = false; - - pythonImportsCheck = [ "pulsar" ]; - - meta = with lib; { - description = "Apache Pulsar Python client library"; - homepage = "https://pulsar.apache.org/docs/next/client-libraries-python/"; - changelog = "https://github.com/apache/pulsar-client-python/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ gaelreyrol ]; - }; -} diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 8eb126bb4c56..6b7051bc4bde 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "textual"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-kPu8qjIbsSOgIdBTubjz6gR58Myu2ioWdpzk5LEedU4="; + hash = "sha256-GsdWWK8Y/9Wg+Ka3YJXovRuQDrvUJUYqtA64wc8Xv9k="; }; build-system = [ poetry-core ]; diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index cdcddb01caba..da2bacd0ee9c 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "adguardhome"; - version = "0.107.61"; + version = "0.107.62"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "AdGuardHome"; tag = "v${version}"; - hash = "sha256-nKN1yr0HxUrjFD/9e87pxNqbQkNFlreJI2OHEQkbW2Q="; + hash = "sha256-CqXf19DyDFgSnd/dziUq9Gl1d1V20OWE5MTQMi260Zc="; }; - vendorHash = "sha256-odUfgLTSBLnzN1wsl7TOftGn7OmdbACO/83ukZ8PUaQ="; + vendorHash = "sha256-lY24TtW4vpMRUzOZmeX3Ip9ikUc4z1HG49DpeECExdk="; dashboard = buildNpmPackage { inherit src; diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh index 6583a235f4de..7839d18d2cb7 100755 --- a/pkgs/servers/adguardhome/update.sh +++ b/pkgs/servers/adguardhome/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl gnugrep nix-prefetch jq +#! nix-shell -i bash -p curl gnugrep jq nix-prefetch nix-update # This file is based on /pkgs/servers/gotify/update.sh diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix index 0ffe10b72a7f..31691cb11b13 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "mini-graph-card"; - version = "0.13.0-dev.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-graph-card"; tag = "v${version}"; - hash = "sha256-er+oaUffKh4hXenDD6VHJ01K8kupzhY4Js8M1zSLMvQ="; + hash = "sha256-flZfOVY0/xZOL1ZktRGQhRyGAZronLAjpM0zFpc+X1U="; }; - npmDepsHash = "sha256-0INteDirb9jkmA0fNAuii0woqnZjTm0gl1brOeIJrn0="; + npmDepsHash = "sha256-xzhyYYZLl8pyfK3+MRn35Ffdw/c78v8PjwLlAuQO92g="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index b80a481a3113..3ec05f243fa9 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -98,7 +98,10 @@ let gme = [ game-music-emu ]; mad = [ libmad ]; mikmod = [ libmikmod ]; - mpg123 = [ mpg123 ]; + mpg123 = [ + libid3tag + mpg123 + ]; opus = [ libopus ]; vorbis = [ libvorbis ]; # Encoder plugins @@ -196,13 +199,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.24.3"; + version = "0.24.4"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-lbYQ3fHq1Z6i3zVdLiO9q+3t2BkREwvgOHUVfTJniNg="; + sha256 = "sha256-wiQa6YtaD9/BZsC9trEIZyLcIs72kzuP99O4QVP15nQ="; }; buildInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e4ea750561d..c02511dd278e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11756,8 +11756,6 @@ self: super: with self; { pulp = callPackage ../development/python-modules/pulp { }; - pulsar = callPackage ../development/python-modules/pulsar { }; - pulsar-client = callPackage ../development/python-modules/pulsar-client { }; pulsectl = callPackage ../development/python-modules/pulsectl { };