diff --git a/.github/labeler.yml b/.github/labeler.yml index ef7483d6e20b..03d218711774 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -7,7 +7,8 @@ - any: - base-branch: - '^release-' - - '^staging-' + - '^staging-\d' + - '^staging-next-\d' # NOTE: bsd, darwin and cross-compilation labels are handled by ofborg "6.topic: agda": diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 53ec3bcfebd4..4cf2793b8885 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1301,6 +1301,13 @@ githubId = 45176912; name = "Tomasz Hołubowicz"; }; + altsalt = { + email = "salt@sal.td"; + github = "altsalt"; + githubId = 2441328; + matrix = "@salt:sal.td"; + name = "Wm Salt Hale"; + }; alunduil = { email = "alunduil@gmail.com"; github = "alunduil"; @@ -1589,6 +1596,13 @@ githubId = 7644264; name = "Andrew Gazelka"; }; + AndrewKvalheim = { + email = "andrew@kvalhe.im"; + github = "AndrewKvalheim"; + githubId = 1844746; + matrix = "@andrew:kvalhe.im"; + name = "Andrew Kvalheim"; + }; andrewrk = { email = "superjoe30@gmail.com"; github = "andrewrk"; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 193e4222a37e..45c631a36dfd 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -18,9 +18,7 @@ let cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON fullConfig); - pluginsEnv = package.python.withPackages (ps: [ ps.octoprint ] ++ (cfg.plugins ps)); - - package = pkgs.octoprint; + pluginsEnv = cfg.package.python.withPackages (ps: [ ps.octoprint ] ++ (cfg.plugins ps)); in { @@ -30,6 +28,8 @@ in services.octoprint = { + package = lib.mkPackageOption pkgs "octoprint" { }; + enable = lib.mkEnableOption "OctoPrint, web interface for 3D printers"; host = lib.mkOption { diff --git a/nixos/modules/services/web-apps/stash.nix b/nixos/modules/services/web-apps/stash.nix index 60c8ad8a8eb4..47f66edb7ddb 100644 --- a/nixos/modules/services/web-apps/stash.nix +++ b/nixos/modules/services/web-apps/stash.nix @@ -225,7 +225,7 @@ let }; gallery_cover_regex = mkOption { type = types.str; - default = "(poster|cover|folder|board)\.[^\.]+$"; + default = "(poster|cover|folder|board)\\.[^.]+$"; description = "Regex used to identify images as gallery covers"; }; no_proxy = mkOption { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 06213b9ce7c6..b5c46f2fb16a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -619,7 +619,6 @@ in odoo = handleTest ./odoo.nix { }; odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; }; odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; }; - odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; }; # 9pnet_virtio used to mount /nix partition doesn't support # hibernation. This test happens to work on x86_64-linux but # not on other platforms. diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 02e81e52c6b8..06f92e7ca10d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4630,6 +4630,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + famous-quotes-nvim = buildVimPlugin { + pname = "famous-quotes.nvim"; + version = "2025-05-07"; + src = fetchFromGitHub { + owner = "mahyarmirrashed"; + repo = "famous-quotes.nvim"; + rev = "dc493abfb51581b6716986b4311c367c6a100bab"; + sha256 = "179hgxyhzca4g0xmx02kl7gy7c6058kgww4zv7f1dvl2mf59ln67"; + }; + meta.homepage = "https://github.com/mahyarmirrashed/famous-quotes.nvim/"; + meta.hydraPlatforms = [ ]; + }; + far-vim = buildVimPlugin { pname = "far.vim"; version = "2024-05-14"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5022f66dc337..a023288461b2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -354,6 +354,7 @@ https://github.com/sainnhe/everforest/,, https://github.com/google/executor.nvim/,HEAD, https://github.com/jinh0/eyeliner.nvim/,HEAD, https://github.com/fenetikm/falcon/,, +https://github.com/mahyarmirrashed/famous-quotes.nvim/,HEAD, https://github.com/brooth/far.vim/,, https://github.com/Chaitanyabsprip/fastaction.nvim/,HEAD, https://github.com/pteroctopus/faster.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 8b972e5241f7..de3df334e4ee 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.13.3"; - hash = "sha256-N7y0+WeP0zgWRBD2LqLR++dQty9wbaqA+vWQYsaGo2k="; + version = "3.14.0"; + hash = "sha256-Eel+kU8WxCeKDaQvO8fVlmGiDBF0/bqiFrNWvmA0DbQ="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index 374a4b30b6ed..3e3198363b4a 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2025-04-19"; + version = "0-unstable-2025-04-29"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "7b5c19ff5e28dfeb814e912d028cb34b53c01f10"; - hash = "sha256-RdRdmvUZB1jGgeuNBGhqztZadag0/8USTjtTAKjaxSo="; + rev = "e13b683c5236adf8560613a883a0af8841ee49cb"; + hash = "sha256-0kAxCVcVMz6pxScVZhEvPWIHj29cO9xoI1bhgyXUMvU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 356127483fe8..ae52a8f37aa9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.1.4.3"; + version = "6.1.5.2"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-PTO4x5YKqs4wWonW3N/sMAVlbWJp+eVjLL98G9bNZ4c="; + hash = "sha256-BETlzGL/5IjXajyyvQtYb0Q0sra4BILSL9fX4BNPNSI="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json index ccec2735b33e..c4e14a7559e8 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.json +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json @@ -1,8 +1,8 @@ [ { "pname": "AngleSharp", - "version": "1.2.0", - "hash": "sha256-l8+Var9o773VL6Ybih3boaFf9sYjS7eqtLGd8DCIPsk=" + "version": "1.3.0", + "hash": "sha256-xq+G2f9FCqS6PjIgfDdZjVRoaxVMiSyOXC7KtMzMpPU=" }, { "pname": "CryptSharpStandard", @@ -276,8 +276,8 @@ }, { "pname": "Markdig.Signed", - "version": "0.40.0", - "hash": "sha256-msd36cVKi3MTkT1QQg/b5yW4oLM3e8hbahPPkvhzRZw=" + "version": "0.41.0", + "hash": "sha256-fFAfiC6UVrirA/I11urHK4z08iF96Rkez/3HtTmleDs=" }, { "pname": "Microsoft.ApplicationInsights", @@ -286,8 +286,8 @@ }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "9.0.3", - "hash": "sha256-URV7tlaHv1JPpqeJXQMYRoIZYU7lFGJPyTKbl2p3gqI=" + "version": "9.0.4", + "hash": "sha256-TGyUwcxFsEDYvOTj+GBmhbkkb2vqe3Ver1Y8AqP7/x8=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -296,8 +296,8 @@ }, { "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator", - "version": "3.11.0-beta1.25076.3", - "hash": "sha256-JCyHBJ7BhQFem8vp96ewwFvWaZccOBg1viAHxZwzORg=" + "version": "3.11.0-beta1.25123.3", + "hash": "sha256-FcW0EmA3dJfuV/rStaq47uSUkXV6jlmY1HCbvhpRbL4=" }, { "pname": "Microsoft.CodeCoverage", @@ -441,23 +441,23 @@ }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.7.0", - "hash": "sha256-LqEtksyd06m12yasVQK/9j6Y/giTDqfMJrdUUDxW0WY=" + "version": "8.8.0", + "hash": "sha256-UwRAN/yuGF5vss7vDHIxlLjn0kKGVPmN5ga3GQP2TF0=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.7.0", - "hash": "sha256-P9oPGIyaZrRd1EqhgvuSF5Bt/7fm/dS3nC3HXo4C720=" + "version": "8.8.0", + "hash": "sha256-9eMcoTMyWb+4ZLxGxwa2BSQG1/nYR5TwLvuivXXsOjU=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.7.0", - "hash": "sha256-yXyiQR87kb630Qwu+D0GifWxPj74VN7wtzOincrSdIg=" + "version": "8.8.0", + "hash": "sha256-uKsTmgcGgjxAIIWt03XU0ecL5Zpdu2lcI7cIbyWDxtM=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.7.0", - "hash": "sha256-l4jl4mU3bG433xSKDdCAkEqD0uUGKTOmbthhYAogcRI=" + "version": "8.8.0", + "hash": "sha256-MSChrqqB6LtJzhX5hSvdokHmZhlN05g2aK6CT1By8E8=" }, { "pname": "Microsoft.NET.Test.Sdk", @@ -646,23 +646,23 @@ }, { "pname": "protobuf-net", - "version": "3.2.46", - "hash": "sha256-NirxAUXEIUQz0HHLS+KS4fgOZwJy1zJZYGcjPa5ujTs=" + "version": "3.2.52", + "hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek=" }, { "pname": "protobuf-net.Core", - "version": "3.2.46", - "hash": "sha256-Srg7pP7rleL462idLPFUxgXBLrywWeHFyEvSV+keA4E=" + "version": "3.2.52", + "hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ=" }, { "pname": "Scalar.AspNetCore", - "version": "2.1.3", - "hash": "sha256-o0rPXtulpU7y0gfQkUq9MQzud2X6A8DAJ38NPGeP5zs=" + "version": "2.2.1", + "hash": "sha256-dnxwn7KG02ko7QWSXf5xclfQSDg1OhqlnaWD6Le0Yfk=" }, { "pname": "SteamKit2", - "version": "3.0.2", - "hash": "sha256-bRiLFaq/hsr+7BKtSKoD2+pf0VCGhBYe/rO3DgqMZpo=" + "version": "3.1.0", + "hash": "sha256-Lpz0OQrKQW0AMrt9wvK4tO/NjJdHvXvlt+jitKrphVA=" }, { "pname": "System.Buffers", @@ -674,11 +674,6 @@ "version": "1.7.1", "hash": "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo=" }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" - }, { "pname": "System.Collections.Immutable", "version": "8.0.0", @@ -686,33 +681,33 @@ }, { "pname": "System.Composition", - "version": "9.0.3", - "hash": "sha256-WnAxY6yJygMiHhht3/Cu2q6usvbqjy10+dnQhVAOBoc=" + "version": "9.0.4", + "hash": "sha256-Ec1PdqzxQOaNsnonimmpyq5f5+Wa+lvWdR0Je3/a2OI=" }, { "pname": "System.Composition.AttributedModel", - "version": "9.0.3", - "hash": "sha256-wNsQq1oshdAXZYlE3a0V+qdaSY7UAJa6XyjVEKtCzdM=" + "version": "9.0.4", + "hash": "sha256-r71EJF5F5ZjAgkuvcI00tAnnIrK+IQ5Wj7wU8MwwRRQ=" }, { "pname": "System.Composition.Convention", - "version": "9.0.3", - "hash": "sha256-FxDt7YeQ/n3RJbfgqhKnWxZGvAisArsWS6Nl5XN8Cm0=" + "version": "9.0.4", + "hash": "sha256-BfLOq0FSx1QVfT2mqcqU/nfvgIJA+tf3Ng0CxHx1GG4=" }, { "pname": "System.Composition.Hosting", - "version": "9.0.3", - "hash": "sha256-Lshms36a63CFbBKA34tXJON2/fFy6UeAK2EcKFgGHas=" + "version": "9.0.4", + "hash": "sha256-+ep0Y2ptrKsb3JlArfhKndUuoBVrS1f59okbdKRKVYQ=" }, { "pname": "System.Composition.Runtime", - "version": "9.0.3", - "hash": "sha256-YjWG/ugx/aEDND496fYbRVD7+lpOU7cNZFPICkHc4S0=" + "version": "9.0.4", + "hash": "sha256-ztqnugik7Ye70YDQGvgPWfovFbHZ2R2tFSWZf8IGcMM=" }, { "pname": "System.Composition.TypedParts", - "version": "9.0.3", - "hash": "sha256-gMkfMOSVX0YLAtBamdHacmSBTDE+XHR2ocp5/Bwrj0U=" + "version": "9.0.4", + "hash": "sha256-WFw1we/U8o14HNXwwVW4lggCpekb2c/ptpO8LbWYBr8=" }, { "pname": "System.Diagnostics.DiagnosticSource", @@ -726,8 +721,8 @@ }, { "pname": "System.IO.Hashing", - "version": "9.0.1", - "hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs=" + "version": "9.0.4", + "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU=" }, { "pname": "System.Linq.Async", @@ -766,8 +761,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "9.0.3", - "hash": "sha256-27A1V1ANw23BZPxSMJQsrrwQ1hruFj48DtWuyavViT4=" + "version": "9.0.4", + "hash": "sha256-VSlwaKi5WU6J0LYVh/hFfZuSkCG4V99MH2iLwspTrYA=" }, { "pname": "System.Security.Principal.Windows", diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 9a185ff1f9f6..a5119a758495 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "c3113782bc4895099b1a07a0e811d1e5af871ddc"; + version = "6f0393c091d04ecb69dff790f6146cc375b71268"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -15,10 +15,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-B2gn40LWVm75pwV5sQpv1gRsNof9tQUDClu7oLSz/VM="; + hash = "sha256-Mj7ubIB84gCE/Y3ZzISQ4coGLGZfg4curuBYQdRWiUY="; }; - npmDepsHash = "sha256-Btf/S3ia8Uo/ChrKoYKRk9sKS+ZuQGtaAnaQeGDTIYI="; + npmDepsHash = "sha256-b5L1Lcmehv8aheFaYp0iPyNhwekOiq8J4rVaE4/Oqj4="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index a5cd70d6faea..0550b42cfaf0 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.7.6"; + version = "1.7.7"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-vJIHDp91T9oMtUT7bsSCxj6XkvT4bLMol9wEr19Wkig="; + hash = "sha256-q7qGL89gPlFLV+lJgO7ruBPI2pBzoHqiF/FD5KP3cnM="; }; buildInputs = diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/applications/office/beancount/beancount-ing-diba.nix index 84e905353740..2a4b567177e8 100644 --- a/pkgs/applications/office/beancount/beancount-ing-diba.nix +++ b/pkgs/applications/office/beancount/beancount-ing-diba.nix @@ -2,30 +2,28 @@ lib, python3, fetchFromGitHub, - fetchpatch, + beangulp, + beancount, }: python3.pkgs.buildPythonApplication rec { pname = "beancount-ing-diba"; - version = "0.6.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "siddhantgoel"; repo = "beancount-ing-diba"; rev = "v${version}"; - sha256 = "sha256-1cdXqdeTz38n0g13EXJ1/IF/gJJCe1uL/Z5NJz4DL+E="; + sha256 = "sha256-zjwajl+0ix4wnW0bf4MAuO9Lr9F8sBv87TIL5Ghmlxg="; }; - patches = [ - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://github.com/siddhantgoel/beancount-ing/commit/2d030330eed313a32c3968a2c8ce9400c6d18a41.patch"; - hash = "sha256-6v7eQhgj6d4x9uWSyuO3IxXrSWkJZRS/M4N3j0H3R/U="; - }) - ]; - format = "pyproject"; + propagatedBuildInputs = [ + beancount + beangulp + ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/applications/office/beancount/beancount_share.nix b/pkgs/applications/office/beancount/beancount_share.nix index 48951fe6ce41..9e2a0c29c411 100644 --- a/pkgs/applications/office/beancount/beancount_share.nix +++ b/pkgs/applications/office/beancount/beancount_share.nix @@ -2,21 +2,28 @@ lib, python3, fetchFromGitHub, + beancount, + beancount-plugin-utils, }: -python3.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication rec { pname = "beancount_share"; - version = "2023-12-31"; + version = "0.1.11"; src = fetchFromGitHub { owner = "akuukis"; repo = "beancount_share"; - rev = "8f925422b9947e88babbeab3fdf7d71c53c9aa9e"; - sha256 = "sha256-+ZA84VS0wf9TdrYleYB5OeKz7T8sDtrl4BM7Ft+k7OI="; + rev = "v${version}"; + sha256 = "sha256-BW2KEC0pmervT71FBixPcQciEuGcElCd2wW7BZL1xUg="; }; format = "pyproject"; + propagatedBuildInputs = [ + beancount + beancount-plugin-utils + ]; + buildInputs = [ python3.pkgs.setuptools ]; @@ -26,8 +33,5 @@ python3.pkgs.buildPythonApplication { description = "Beancount plugin to share expenses with external partners within one ledger"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matthiasbeyer ]; - broken = true; - # At 2024-06-29, missing unpacked dependency - # https://hydra.nixos.org/build/262800507/nixlog/1 }; } diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix index bbb08321b336..be0d1e4a35a9 100644 --- a/pkgs/by-name/al/alertmanager-ntfy/package.nix +++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "alertmanager-ntfy"; - version = "0-unstable-2025-02-24"; + version = "0-unstable-2025-05-04"; src = fetchFromGitHub { owner = "alexbakker"; repo = "alertmanager-ntfy"; - rev = "4573b96077faf39c3d04df913e93d9ded1f1a16c"; - hash = "sha256-JmXeDZBcbRDEaDVt7HuR9L9WZzrtqDrUMpHM7cHSQO0="; + rev = "f05e3c029bab3bdfb9aefbddbfc6bd9c7d4aa80f"; + hash = "sha256-rKCJnffsBEXmTg2s0nqQf8BuHQnSgcwVBhC7gRzg4ew="; }; vendorHash = "sha256-e1JAoDNm2+xB/bZcEGr5l4+va8GIg1R8pdj3d+/Y+UY="; diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 23b0d16d645c..5f47bd7d26d8 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -51,9 +51,13 @@ testers, enableShared ? !stdenv.hostPlatform.isStatic, enableFlight ? stdenv.buildPlatform == stdenv.hostPlatform, - enableJemalloc ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64, + # Disable also on RiscV + # configure: error: cannot determine number of significant virtual address bits + enableJemalloc ? + !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isRiscV64, enableS3 ? true, - enableGcs ? !stdenv.hostPlatform.isDarwin, + # google-cloud-cpp fails to build on RiscV + enableGcs ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isRiscV64, }: let diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index f85cf9bf13ef..39c2699bc2da 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -6,15 +6,15 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "carapace-bridge"; - version = "1.2.7"; + version = "1.2.9"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; - tag = "v${version}"; - hash = "sha256-8i516GwXJFEB4VdvsV1KS0q2U9ZbpRBmZxqzTrzYlPk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y69byUUDJJ+nJuZ6lcl+McFtJGYb5zgE8+QTbhoZ9Bc="; }; # buildGoModule try to run `go mod vendor` instead of `go work vendor` on the @@ -36,9 +36,9 @@ buildGoModule rec { meta = { description = "Multi-shell completion bridge for carapace"; homepage = "https://carapace.sh/"; - changelog = "https://github.com/carapace-sh/carapace-bridge/releases/tag/v${version}"; + changelog = "https://github.com/carapace-sh/carapace-bridge/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ famfo ]; license = lib.licenses.mit; mainProgram = "carapace-bridge"; }; -} +}) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 01ef9f4c99d8..2a1f79a8f48f 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,17 +25,18 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.413"; + version = "3.2.416"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-WCgBnPQRt4dxINZNq0kmCGbszOMx3aeTsB/aex9E1Yg="; + hash = "sha256-exxU3w1dcd+tBHvdjJvjtevs7b01Pog47Of+u5dnWTo="; }; pythonRelaxDeps = [ + "asteval" "bc-detect-secrets" "bc-python-hcl2" "boto3" @@ -69,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { aiohttp aiomultiprocess argcomplete + asteval bc-detect-secrets bc-jsonpath-ng bc-python-hcl2 diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 3d6c8ec08104..f56dc18dcdbf 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "25.0.2"; + version = "25.0.4"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-UmTy4Flxz/zIh3cLxRi7EhNDf0Ojc7fuzCbRKIE/+CQ="; - aarch64-linux = "sha256-I+V/2kfdxGx8zNkH98b2685IQPbVPSe9++qS4QEg0LU="; - x86_64-darwin = "sha256-8Qf69OHXPiqdMs//f1jbKbyKoll+oX+P+l3mpdOvraI="; - aarch64-darwin = "sha256-bGxn8y9hvJyqj1/i5tScufO5/ZjdlOlPChmeL+DWwoY="; + x86_64-linux = "sha256-ALtJIld7gT4pj+jGRkwMloq6B/ZBOMYZxws9N7xNNZg="; + aarch64-linux = "sha256-Ka+jEI6y1BRqV83yDvu1yDzJfpUIxKKD+zehVHcNQ/o="; + x86_64-darwin = "sha256-P8f0NlMjh/46RChQy8JIm71msqX023K2QaFEic2Br9M="; + aarch64-darwin = "sha256-a9H9M1j6iPcrVcfDxCZHeZj6e55QH3XochXaL2OStlI="; }; in fetchurl { @@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preInstall = '' # most directories are for different architectures, only keep what we need shopt -s extglob - pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/ + pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_*/com/sun/jna/ rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/ popd ''; diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh index c89262bb3a29..cda09005e38e 100755 --- a/pkgs/by-name/db/dbeaver-bin/update.sh +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -1,8 +1,9 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +BASEDIR="$(dirname "$0")/../../../.." latestVersion=$(curl "https://api.github.com/repos/dbeaver/dbeaver/tags" | jq -r '.[0].name') -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; dbeaver-bin.version" | tr -d '"') +currentVersion=$(nix-instantiate --eval -E "with import ${BASEDIR} {}; lib.getVersion dbeaver-bin" | tr -d '"') echo "latest version: $latestVersion" echo "current version: $currentVersion" @@ -22,5 +23,5 @@ do prefetch=$(nix-prefetch-url "https://github.com/dbeaver/dbeaver/releases/download/$latestVersion/dbeaver-ce-$latestVersion-$2") hash=$(nix-hash --type sha256 --to-sri $prefetch) - update-source-version dbeaver-bin $latestVersion $hash --system=$1 --ignore-same-version + (cd "$BASEDIR" && update-source-version dbeaver-bin $latestVersion $hash --system=$1 --ignore-same-version) done diff --git a/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch b/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch index 3dcc79124ec3..20d1bc70e641 100644 --- a/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch +++ b/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch @@ -1,6 +1,6 @@ -From 3b1bcc92389e8468cd3790dfd223cb653b5f753f Mon Sep 17 00:00:00 2001 +From fae7504042bb5e3efe253476000d1b15523bd2d7 Mon Sep 17 00:00:00 2001 From: OPNA2608 -Date: Sun, 16 Mar 2025 19:56:39 +0100 +Date: Thu, 1 May 2025 15:57:02 +0200 Subject: [PATCH] Make findPath & its calls behave well with store - images is a cache of downloaded card images. @@ -8,14 +8,23 @@ Subject: [PATCH] Make findPath & its calls behave well with store - campaigns, cubes & constructed are user-downloaded files that set up possible game styles. create & populate them for the game, and tell it to not try to create them on its own. --- - index.js | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + index.js | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js -index 738bfca..3ac32e8 100755 +index 99f0697..492d096 100755 --- a/index.js +++ b/index.js -@@ -75,16 +75,16 @@ app.on('ready', () => { +@@ -8,6 +8,8 @@ const path = require('path'); + const fs = require('fs'); + app.commandLine.appendSwitch('disable-gpu-vsync'); //NVIDIA vsync patch //must be before whenready + ++const userCacheDir = path.normalize(process.env.HOME + "/.cache/ddm") ++ + app.on('ready', () => { + const mainWindow = new BrowserWindow({ + width: 1344, +@@ -61,16 +63,16 @@ app.on('ready', () => { const isDir = fs.statSync(fullPath).isDirectory(); if (containsDanger(fullPath)) throw new Error ("Dangerous files detected"); if (isDir) return fullPath; @@ -24,7 +33,7 @@ index 738bfca..3ac32e8 100755 else try { //dev - const fullPath = path.join(__dirname, folderName); -+ const fullPath = path.join(allowFolderCreation ? (process.env.HOME + "/.cache/ddm") : __dirname, folderName); ++ const fullPath = path.join(allowFolderCreation ? userCacheDir : __dirname, folderName); if (!fs.existsSync(fullPath) && allowFolderCreation) fs.mkdirSync(fullPath, {recursive: true}); const isDir = fs.statSync(fullPath).isDirectory(); console.log(fullPath) @@ -35,7 +44,16 @@ index 738bfca..3ac32e8 100755 } -@@ -108,7 +108,7 @@ app.on('ready', () => { +@@ -92,7 +94,7 @@ app.on('ready', () => { + path.join(basePath, "campaigns"), + path.join(basePath, "cubes"), + path.join(basePath, "constructed"), +- path.join(basePath, "images") ++ path.join(userCacheDir, "images") + ]; + + // Check if the directory is within allowed paths +@@ -117,7 +119,7 @@ app.on('ready', () => { try { if (!["campaigns", "cubes", "constructed"].includes(folderName)) throw new Error(`bad folder name ${folderName}`); @@ -44,7 +62,7 @@ index 738bfca..3ac32e8 100755 if (!fs.existsSync(folderPath)) fs.mkdirSync(folderPath); const files = fs.readdirSync(folderPath); if (folderName === "campaigns" ) return files.filter(file => fs.statSync (path.join(folderPath, file)).isDirectory()); -@@ -127,7 +127,7 @@ app.on('ready', () => { +@@ -136,7 +138,7 @@ app.on('ready', () => { ipcMain.handle('open-local-folder', async (event, folderName) => { if (!["campaigns", "cubes", "constructed"].includes(folderName)) throw new Error(`bad folder name ${constructed}`); diff --git a/pkgs/by-name/dd/ddm/package.nix b/pkgs/by-name/dd/ddm/package.nix index 5443a7b4beec..5d8e10e52412 100644 --- a/pkgs/by-name/dd/ddm/package.nix +++ b/pkgs/by-name/dd/ddm/package.nix @@ -16,11 +16,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ddm"; - version = "4.0.0"; + version = "4.1.0"; src = requireFile { name = "DungeonDuelMonsters-linux-x64.zip"; - hash = "sha256-Ycy5Cbd4NR/TptVnl5wV154uA0JU0UzIRHTAi/xm0cs="; + hash = "sha256-gq2nGwpaStqaVI1pL63xygxOI/z53o+zLwiKizG98Ks="; url = "https://mikaygo.itch.io/ddm"; }; diff --git a/pkgs/by-name/fl/flashlabel-yxwl/package.nix b/pkgs/by-name/fl/flashlabel-yxwl/package.nix new file mode 100644 index 000000000000..b862bfd7cb38 --- /dev/null +++ b/pkgs/by-name/fl/flashlabel-yxwl/package.nix @@ -0,0 +1,87 @@ +{ + autoPatchelfHook, + cups, + lib, + requireFile, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "flashlabel-yxwl"; + version = "1.2.1"; + + # The source URL currently redirects through “pCloud”, a file storage service + # that resists direct downloads. + src = requireFile { + name = "A4_Linux_Driver_Ver${version}.run"; + url = "https://flashlabel.net/YXWL-A4driver-linux"; + hash = "sha256-qkc3NJ1dK0nJf+Q7xL7f1/+X0COWSWMEbH4luzaFARc="; + }; + + # The driver is distributed as a self-extracting executable consisting of a + # shell script concatenated with a gzipped tar archive. The script hard codes + # its length in the `lines` variable, which we read to locate the archive. + unpackPhase = '' + lines="$(sed 's/^lines=//; t; d' "$src")" + tail --lines "+$lines" "$src" | tar --extract --gzip --strip-components=1 + ''; + + patchPhase = '' + runHook prePatch + + # Remove model from manufacturer name + sed --in-place 's/\(^\*Manufacturer: "YXWL\) [^"]*\("$\)/\1\2/' *.ppd + + runHook postPatch + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ cups ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir --parents $out/lib/cups/filter + mv {A80,A80H} $out/lib/cups/filter + + mkdir --parents $out/share/cups/model + mv *.ppd $out/share/cups/model + + runHook postInstall + ''; + + postFixup = '' + gzip --best $out/share/cups/model/*.ppd + ''; + + meta = { + description = "CUPS driver for FlashLabel A4 thermal printers"; + longDescription = '' + Supported models: + + - A80 + - A80H + - A81 + - A81H + - C80 + - C80H + - D80 + - D80 Pro + - Y8 + - Y8 Pro + - Y80 + ''; + homepage = "https://help.flashlabel.com/support/solutions/articles/150000191214"; + downloadPage = "https://flashlabel.net/YXWL-A4driver-linux"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + altsalt + AndrewKvalheim + ]; + }; +} diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix index 71338621fefd..ce3a0ead609e 100644 --- a/pkgs/by-name/fl/fleet/package.nix +++ b/pkgs/by-name/fl/fleet/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "fleet"; - version = "4.67.2"; + version = "4.67.3"; src = fetchFromGitHub { owner = "fleetdm"; repo = "fleet"; tag = "fleet-v${finalAttrs.version}"; - hash = "sha256-iMLD9M4EzXHRxvc5px9UcXEdjRIO1jm+hYwhaYaFON8="; + hash = "sha256-d574YSeMbb/+1wxEMAN0URfpb58NpG8NuOHGQs0GyLk="; }; vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60="; diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index 2c0927aca9b5..c6e120dafb69 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -1,11 +1,12 @@ { + stdenv, lib, python3Packages, fetchFromGitHub, makeWrapper, gdal, geos, - pnpm_9, + pnpm, nodejs, postgresql, postgresqlTestHook, @@ -20,20 +21,21 @@ let in python.pkgs.buildPythonApplication rec { pname = "froide"; - version = "0-unstable-2024-11-22"; + version = "0-unstable-2025-04-25"; pyproject = true; src = fetchFromGitHub { owner = "okfde"; repo = "froide"; - rev = "a90f5c4d40b46a161111eefdc84e5214e85715b0"; - hash = "sha256-Q+iNI3yqxqAtDONHY+SaZeMyjY6hqTxwy7YmiiY94+0="; + rev = "9e4838fc5f17a0506af42ad5fd1ebc66cff4b92a"; + hash = "sha256-0EC6oCaiK7gw5ikemskiK3qOlflGHzlG4giDQNj9tBQ="; }; patches = [ ./django_42_storages.patch ]; + # Relax dependency pinning + # Channels: https://github.com/okfde/froide/issues/995 pythonRelaxDeps = [ - "pikepdf" "channels" ]; @@ -42,7 +44,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper nodejs - pnpm_9.configHook + pnpm.configHook ]; dependencies = with python.pkgs; [ @@ -75,6 +77,7 @@ python.pkgs.buildPythonApplication rec { djangorestframework djangorestframework-csv djangorestframework-jsonp + dogtail drf-spectacular drf-spectacular-sidecar easy-thumbnails @@ -99,9 +102,9 @@ python.pkgs.buildPythonApplication rec { websockets ]; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-DMoaXNm5S64XBERHFnFM6IKBkzXRGDEYWSTruccK9Hc="; + hash = "sha256-IeuQoiI/r9AKLZgKkZx0C+qE9ueWuC39Y77MB08zSAc="; }; postBuild = '' @@ -155,14 +158,20 @@ python.pkgs.buildPythonApplication rec { "test_logfile_rotation" ]; - preCheck = '' - export PGUSER="froide" - export postgresqlEnableTCP=1 - export postgresqlTestUserOptions="LOGIN SUPERUSER" - export GDAL_LIBRARY_PATH="${gdal}/lib/libgdal.so" - export GEOS_LIBRARY_PATH="${geos}/lib/libgeos_c.so" - export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" - ''; + preCheck = + '' + export PGUSER="froide" + export postgresqlEnableTCP=1 + export postgresqlTestUserOptions="LOGIN SUPERUSER" + export GDAL_LIBRARY_PATH="${gdal}/lib/libgdal.so" + export GEOS_LIBRARY_PATH="${geos}/lib/libgeos_c.so" + '' + + lib.optionalString (!stdenv.hostPlatform.isRiscV) '' + export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" + ''; + + # Playwright tests not supported on RiscV yet + doCheck = lib.meta.availableOn stdenv.hostPlatform playwright-driver.browsers; meta = { description = "Freedom of Information Portal"; diff --git a/pkgs/by-name/go/go-import-lint/package.nix b/pkgs/by-name/go/go-import-lint/package.nix new file mode 100644 index 000000000000..37d2e6e4b7a0 --- /dev/null +++ b/pkgs/by-name/go/go-import-lint/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule (finalAttrs: { + pname = "go-import-lint"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "hedhyw"; + repo = "go-import-lint"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YaIKtbdjqtmHGZgk3AlHrSJrWGMGJTIv1t/LYoB4vmw="; + }; + vendorHash = null; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Golang source code analyzer that checks imports order"; + homepage = "https://github.com/hedhyw/go-import-lint"; + changelog = "https://github.com/hedhyw/go-import-lint/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "go-import-lint"; + }; +}) diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix index 95fb72c33f73..ab6f950cdfdd 100644 --- a/pkgs/by-name/in/intel-gmmlib/package.nix +++ b/pkgs/by-name/in/intel-gmmlib/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.7.1"; + version = "22.7.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; tag = "intel-gmmlib-${version}"; - hash = "sha256-Wm9bHe65ak7ERSEgrSO9x9hUV6ypRbODoY4eodebOVE="; + hash = "sha256-TVravPYbOaZBtS5BepRc316m4uIPm5M1YbDWMV5lW0Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ne/netcdf/package.nix b/pkgs/by-name/ne/netcdf/package.nix index 42aa89ab7d94..b9bfa0de107e 100644 --- a/pkgs/by-name/ne/netcdf/package.nix +++ b/pkgs/by-name/ne/netcdf/package.nix @@ -46,15 +46,17 @@ stdenv.mkDerivation rec { libxml2 # xml2-config ]; - buildInputs = [ - curl - hdf5 - libxml2 - mpi - bzip2 - libzip - zstd - ] ++ lib.optional szipSupport szip; + buildInputs = + [ + curl + hdf5 + libxml2 + bzip2 + libzip + zstd + ] + ++ lib.optional szipSupport szip + ++ lib.optional mpiSupport mpi; strictDeps = true; diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix index 254459e62081..ceef961f1fd8 100644 --- a/pkgs/by-name/od/odoo/package.nix +++ b/pkgs/by-name/od/odoo/package.nix @@ -9,7 +9,7 @@ let odoo_version = "18.0"; - odoo_release = "20250213"; + odoo_release = "20250506"; python = python312.override { self = python; }; @@ -24,7 +24,7 @@ python.pkgs.buildPythonApplication rec { # find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "odoo-${version}"; - hash = "sha256-iohlJ5OQ10iUaWjC4AFYmBwXuf9OOXAdCgdhdJAchYQ="; # odoo + hash = "sha256-rNG0He+51DnRT5g1SovGZ9uiE1HWXtcmAybcadBMjY4="; # odoo }; makeWrapperArgs = [ @@ -97,11 +97,11 @@ python.pkgs.buildPythonApplication rec { }; }; - meta = with lib; { + meta = { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ mkg20001 siriobalmelli ]; diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix deleted file mode 100644 index c149bf1ee2bb..000000000000 --- a/pkgs/by-name/od/odoo15/package.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchzip, - python310, - rtlcss, - wkhtmltopdf, - nixosTests, -}: - -let - odoo_version = "15.0"; - odoo_release = "20241010"; - python = python310.override { - self = python; - packageOverrides = self: super: { - pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { - version = "1.28.6"; - - src = fetchFromGitHub { - owner = "py-pdf"; - repo = "pypdf"; - rev = version; - fetchSubmodules = true; - hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; - }; - - dependencies = [ self.setuptools ]; - - nativeCheckInputs = with self; [ - pytestCheckHook - pillow - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { - pname = "odoo"; - version = "${odoo_version}.${odoo_release}"; - - format = "setuptools"; - - # latest release is at https://github.com/odoo/docker/blob/5fb6a842747c296099d9384587cd89640eb7a615/15.0/Dockerfile#L58 - src = fetchzip { - url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; - name = "odoo-${version}"; - hash = "sha256-Hkre6mghEiLrDwfB1BxGbqEm/zruHLwaS+eIFQKjl1o="; # odoo - }; - - makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - "${lib.makeBinPath [ - wkhtmltopdf - rtlcss - ]}" - ]; - - propagatedBuildInputs = with python.pkgs; [ - babel - chardet - decorator - docutils - ebaysdk - freezegun - gevent - greenlet - idna - jinja2 - libsass - lxml - lxml-html-clean - markupsafe - mock - num2words - ofxparse - passlib - pillow - polib - psutil - psycopg2 - pydot - pyopenssl - pypdf2 - pyserial - python-dateutil - python-ldap - python-stdnum - pytz - pyusb - qrcode - reportlab - requests - setuptools - vobject - werkzeug - xlrd - xlsxwriter - xlwt - zeep - ]; - - # takes 5+ minutes and there are not files to strip - dontStrip = true; - - passthru = { - updateScript = ./update.sh; - tests = { inherit (nixosTests) odoo15; }; - }; - - meta = with lib; { - description = "Open Source ERP and CRM"; - homepage = "https://www.odoo.com/"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ mkg20001 ]; - }; -} diff --git a/pkgs/by-name/od/odoo15/update.sh b/pkgs/by-name/od/odoo15/update.sh deleted file mode 100755 index 2265f9048c0e..000000000000 --- a/pkgs/by-name/od/odoo15/update.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch -# shellcheck shell=bash - -set -euo pipefail - -SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" -PKG=$(basename "$SCRIPT_DIR") - -LATEST="18" # increment manually -VERSION="${PKG/#odoo}" -VERSION="${VERSION:-$LATEST}.0" - -RELEASE="$( - curl "https://nightly.odoo.com/$VERSION/nightly/src/" | - sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' | - tail -n 1 -)" - -latestVersion="$VERSION.$RELEASE" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "$PKG is up-to-date: $currentVersion" - exit 0 -fi - -cd "$SCRIPT_DIR" - -sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix -sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix -sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix diff --git a/pkgs/by-name/od/odoo16/fix-test.patch b/pkgs/by-name/od/odoo16/fix-test.patch new file mode 100644 index 000000000000..232590c87c30 --- /dev/null +++ b/pkgs/by-name/od/odoo16/fix-test.patch @@ -0,0 +1,22 @@ +diff --git a/odoo/http.py b/odoo/http.py +index f26dd52db235c..9689fc894b2b1 100644 +--- a/odoo/http.py ++++ b/odoo/http.py +@@ -117,6 +117,7 @@ + import glob + import hashlib + import hmac ++import importlib.metadata + import inspect + import json + import logging +@@ -256,7 +257,7 @@ def get_default_session(): + 'alias', 'host', 'methods', + } + +-if parse_version(werkzeug.__version__) >= parse_version('2.0.2'): ++if parse_version(importlib.metadata.version('werkzeug')) >= parse_version('2.0.2'): + # Werkzeug 2.0.2 adds the websocket option. If a websocket request + # (ws/wss) is trying to access an HTTP route, a WebsocketMismatch + # exception is raised. On the other hand, Werkzeug 0.16 does not + diff --git a/pkgs/by-name/od/odoo16/package.nix b/pkgs/by-name/od/odoo16/package.nix index 73791dbcfcf1..6e95a6909def 100644 --- a/pkgs/by-name/od/odoo16/package.nix +++ b/pkgs/by-name/od/odoo16/package.nix @@ -1,7 +1,7 @@ { lib, fetchzip, - python310, + python311, rtlcss, wkhtmltopdf, nixosTests, @@ -9,8 +9,8 @@ let odoo_version = "16.0"; - odoo_release = "20241010"; - python = python310.override { + odoo_release = "20250506"; + python = python311.override { self = python; }; in @@ -24,9 +24,11 @@ python.pkgs.buildPythonApplication rec { src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "odoo-${version}"; - hash = "sha256-ICe5UOy+Ga81fE66SnIhRz3+JEEbGfoz7ag53mkG4UM="; # odoo + hash = "sha256-dBqRZ3cf4/udP9hm+u9zhuUCkH176uG2NPAy5sujyNc="; # odoo }; + patches = [ ./fix-test.patch ]; + makeWrapperArgs = [ "--prefix" "PATH" @@ -90,14 +92,14 @@ python.pkgs.buildPythonApplication rec { passthru = { updateScript = ./update.sh; tests = { - inherit (nixosTests) odoo; + inherit (nixosTests) odoo16; }; }; - meta = with lib; { + meta = { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ mkg20001 ]; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/by-name/od/odoo17/package.nix b/pkgs/by-name/od/odoo17/package.nix index 698afb37d103..ac5db5d4ff76 100644 --- a/pkgs/by-name/od/odoo17/package.nix +++ b/pkgs/by-name/od/odoo17/package.nix @@ -2,7 +2,8 @@ lib, fetchgit, fetchzip, - python310, + fetchpatch2, + python311, rtlcss, wkhtmltopdf, nixosTests, @@ -10,8 +11,8 @@ let odoo_version = "17.0"; - odoo_release = "20241010"; - python = python310.override { + odoo_release = "20250506"; + python = python311.override { self = python; packageOverrides = final: prev: { # requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions @@ -37,8 +38,14 @@ python.pkgs.buildPythonApplication rec { src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "odoo-${version}"; - hash = "sha256-s4Fvzjwl2oM0V9G1WQdSoqo7kE7b8tJdluk9f7A06e8="; # odoo + hash = "sha256-V15Oe3AOBJ1agt5WmpFZnC7EkyoKyxTH8Iqdf2/9aec="; # odoo }; + patches = [ + (fetchpatch2 { + url = "https://github.com/odoo/odoo/commit/ade3200e8138a9c28eb9b294a4efd2753a8e5591.patch?full_index=1"; + hash = "sha256-EFKjrR38eg9bxlNmRNoLSXem+MjQKqPcR3/mSgs0cDs="; + }) + ]; makeWrapperArgs = [ "--prefix" @@ -105,15 +112,15 @@ python.pkgs.buildPythonApplication rec { passthru = { updateScript = ./update.sh; tests = { - inherit (nixosTests) odoo; + inherit (nixosTests) odoo17; }; }; - meta = with lib; { + meta = { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ mkg20001 siriobalmelli ]; diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix index e98259df0075..836eac472b81 100644 --- a/pkgs/by-name/op/openstack-rs/package.nix +++ b/pkgs/by-name/op/openstack-rs/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "openstack-rs"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "gtema"; repo = "openstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-Dq1ixAzUJJHbu40cpr4rMpvxPaG4kFDBwOI/4n9nWNo="; + hash = "sha256-n3tVkEDn5giAYxcFWI/sc0yCjK1A80L7+dp44QXoCc4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5e8Tro73H9EznVuTLlVsjDgcC94HUAYEbJxjIdVGjgg="; + cargoHash = "sha256-lu3OeBP2fHGX1SV1LnDv/RCAVhoEVZIRiMoXWJ3H4IQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index 6e6089f50321..845bf3bb5115 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -75,6 +75,12 @@ stdenv.mkDerivation rec { pmix ]; + # Setting this manually, required for RiscV cross-compile + configureFlags = [ + "--with-pmix=${lib.getDev pmix}" + "--with-pmix-libdir=${lib.getLib pmix}/lib" + ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 0b2a13317059..e84299018587 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.208.1"; + version = "39.264.0"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-Y4EJCbIK3XZAilbf/zMEfjEDYHNrUrAGRfsNmY0h/Bw="; + hash = "sha256-ACeZ0RAIplcaRKyoEXFCwA/zu96CaLxTwjV0ok3TQ8w="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-5KGTt6lx44LNpHG/RelCQ1ZlQOMOL6bJi66M2nCiirg="; + hash = "sha256-2F4vcdu2f0yh+hvs1WWM6MsWv2mmUUhzFVWN3BQvfNk="; }; env.COREPACK_ENABLE_STRICT = 0; @@ -93,7 +93,12 @@ stdenv.mkDerivation (finalAttrs: { version = testers.testVersion { package = finalAttrs.finalPackage; }; vm-test = nixosTests.renovate; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(\\d+\\.\\d+\\.\\d+)$" + ]; + }; }; meta = { diff --git a/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix b/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix index 7205a20196dd..7f4c0c8e163f 100644 --- a/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix +++ b/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-joypad-autoconfig"; - version = "1.20.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-joypad-autoconfig"; rev = "v${version}"; - hash = "sha256-TdNyQOMLBgwpeYDE8qrRrIMUYcagiBJ02rSVU4Ycn1o="; + hash = "sha256-yLxJaHvscNHvuX1ak1bQ1yGMYv5yO4gTj53neT+JsRo="; }; makeFlags = [ diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index 6ec021b53ee6..23a5777153e2 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "rosa"; - version = "1.2.52"; + version = "1.2.53"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-bImuMrrXssKEh4VvSMy4iuK61GJ+Pltt6Ksir1Bx1as="; + hash = "sha256-t8hJscLk0tRi7CC6maE478CEbOkJtVkbXA0Ag1DxFB4="; }; vendorHash = null; diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index 05402129249b..dcd0876bba60 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -9,25 +9,23 @@ rustPlatform.buildRustPackage rec { pname = "snpguest"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "virtee"; repo = "snpguest"; tag = "v${version}"; - hash = "sha256-Fu8A3n1vzA8y5ccyo785udOTTqumLQWCOy0RL/mQ/us="; + hash = "sha256-bUdJUWeXi+TKQVW3xSRpLhf2BfXZWPz9Rwddob1nCK0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6AXpdm4Ge8j8w74YGEQYpj6r8gKp+Bim/6xA2WLjSC0="; + cargoHash = "sha256-RGlYY6f7csrCIYxj0Nfejn0lCXEgGd/MD442H3Q3OZ0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - env = { - OPENSSL_NO_VENDOR = true; - }; + env.OPENSSL_NO_VENDOR = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix index 722579b17237..0d96a89418cf 100644 --- a/pkgs/by-name/sv/svtplay-dl/package.nix +++ b/pkgs/by-name/sv/svtplay-dl/package.nix @@ -21,7 +21,7 @@ let requests-mock ; - version = "4.103"; + version = "4.109"; in @@ -34,7 +34,7 @@ buildPythonApplication { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-pSTYrDgHmx4V+Y9iGRj3fCHiyoBP9FUf/XIRJyoUvMY="; + hash = "sha256-VHONba7ywvIFlH1swUU8oCTu+Y+RcerqJMe6+URgldo="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 36d5d600d48b..3502de2b9748 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.31.1"; + version = "1.32.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${version}"; - hash = "sha256-Q/nanx+R7JJpDiSkHM0eYHRFiXFR+VZG7mKoUMglcT4="; + hash = "sha256-1IILk52HyeGMZC+oD2tIUApEgV8RAojmAlVP/uQIng0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nKsn7Odce2/ftkPxYT/bAcMTS6DowSjKepBBGrCvkPY="; + cargoHash = "sha256-HKJ9ndh23ho3PtWUpGPaGOaECQC2dEfKp0D1N2PY9Ew="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/us/usbguard/package.nix b/pkgs/by-name/us/usbguard/package.nix index 9c2c6a2a495b..bdcd016cf0e3 100644 --- a/pkgs/by-name/us/usbguard/package.nix +++ b/pkgs/by-name/us/usbguard/package.nix @@ -16,11 +16,14 @@ libqb, libseccomp, polkit, - protobuf, + protobuf_29, audit, libsodium, }: +let + protobuf = protobuf_29; +in stdenv.mkDerivation rec { version = "1.1.3"; pname = "usbguard"; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 7a85f303fd06..4d834f272740 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -30,6 +30,7 @@ in spaceTimeSupport ? false, unsafeStringSupport ? false, framePointerSupport ? false, + noNakedPointers ? false, }: assert useX11 -> safeX11 stdenv; @@ -38,6 +39,7 @@ assert flambdaSupport -> lib.versionAtLeast version "4.03"; assert spaceTimeSupport -> lib.versionAtLeast version "4.04" && lib.versionOlder version "4.12"; assert unsafeStringSupport -> lib.versionAtLeast version "4.06" && lib.versionOlder version "5.0"; assert framePointerSupport -> lib.versionAtLeast version "4.01"; +assert noNakedPointers -> lib.versionAtLeast version "4.02" && lib.versionOlder version "5.0"; let src = @@ -112,7 +114,8 @@ stdenv.mkDerivation ( ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && lib.versionOlder version "4.08") [ "-host ${stdenv.hostPlatform.config}" "-target ${stdenv.targetPlatform.config}" - ]; + ] + ++ optional noNakedPointers (flags "--disable-naked-pointers" "-no-naked-pointers"); dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; # on aarch64-darwin using --host and --target causes the build to invoke diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index 640e10ba4c4e..07d6fd02be44 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asn1"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "andrivet"; repo = "python-asn1"; tag = "v${version}"; - hash = "sha256-OVDhA5ClnwJJwZw0oinAUUDBN/s2ECgHXEww+8hB/fQ="; + hash = "sha256-aICQO2pAZKO+F9o5/sPyZGtIAlXaOUxe9qkb6sQX60U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index 93d4182ec564..4ad6e09d42b6 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { meta = { description = "Python client for coiled.io dask clusters"; homepage = "https://www.coiled.io/"; - license = lib.licenses.bsd3; + license = lib.licenses.elastic20; maintainers = with lib.maintainers; [ daspk04 ]; mainProgram = "coiled"; }; diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 88c019862ad4..61210550ece6 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.50.0"; + version = "0.53.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-taC95lKQdGzygWAi7w1eKy2yDeX6V6YsGROHHstBTfo="; + hash = "sha256-QuPoez1F9v87LGM0Ov6Wg2f5pLAr0uDqZ0b08Xda5+k="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index f2bb49b0d4e8..24289add7fce 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -28,13 +29,15 @@ poppler-utils, pytest-playwright, playwright-driver, - pnpm_9, + pnpm, nodejs, + markdown, + nh3, }: buildPythonPackage rec { pname = "django-filingcabinet"; - version = "0.17-unstable-2024-11-15"; + version = "0.17-unstable-2025-04-10"; pyproject = true; src = fetchFromGitHub { @@ -42,11 +45,13 @@ buildPythonPackage rec { repo = "django-filingcabinet"; # No release tagged yet on GitHub # https://github.com/okfde/django-filingcabinet/issues/69 - rev = "33c88e1ca9fccd0ea70f8b609580eeec486bda5c"; - hash = "sha256-p7VJUiO7dhTR+S3/4QrmrQeJO6xGj7D7I8W3CBF+jo8="; + rev = "64b7b4ad804067e2f16e8a0f165c139e3ffe5fb5"; + hash = "sha256-48Peui/5N/GfzWS1EJ5uKeKEoPjX+fPEXzG2owxsDaE="; }; postPatch = '' + # zipstream is discontinued and outdated + # https://github.com/okfde/django-filingcabinet/issues/90 substituteInPlace pyproject.toml \ --replace-fail "zipstream" "zipstream-ng" ''; @@ -55,7 +60,7 @@ buildPythonPackage rec { nativeBuildInputs = [ nodejs - pnpm_9.configHook + pnpm.configHook ]; dependencies = [ @@ -68,6 +73,8 @@ buildPythonPackage rec { djangorestframework feedgen jsonschema + markdown + nh3 pikepdf pycryptodome pypdf @@ -85,9 +92,9 @@ buildPythonPackage rec { #annotate = [ fcdocs-annotate ]; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-32kOhB2+37DD4hKXKep08iDxhXpasKPfcv9fkwISxeU="; + hash = "sha256-uMO2iEOi9ACYdIM8Thf7+y1KpHQEqVxO3yxZ8RaGFXA="; }; postBuild = '' @@ -117,13 +124,19 @@ buildPythonPackage rec { "test_document_viewer" ]; - preCheck = '' - export DJANGO_SETTINGS_MODULE="test_project.settings" - export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" - ''; + preCheck = + '' + export DJANGO_SETTINGS_MODULE="test_project.settings" + '' + + lib.optionalString (!stdenv.hostPlatform.isRiscV) '' + export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" + ''; pythonImportsCheck = [ "filingcabinet" ]; + # Playwright tests not supported on RiscV yet + doCheck = lib.meta.availableOn stdenv.hostPlatform playwright-driver.browsers; + meta = { description = "Django app that manages documents with pages, annotations and collections"; homepage = "https://github.com/okfde/django-filingcabinet"; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 08f676729163..2f9cd6a685d4 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -3,7 +3,6 @@ pkgs, buildPythonPackage, fetchFromGitea, - fetchpatch, replaceVars, colord, setuptools, @@ -23,7 +22,7 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitea { @@ -31,15 +30,10 @@ buildPythonPackage rec { owner = "josch"; repo = "img2pdf"; tag = version; - hash = "sha256-/nxXgGsnj5ktxUYt9X8/9tJzXgoU8idTjVgLh+8jol8="; + hash = "sha256-71u6ex+UAEFPDtR9QI8Ezah5zCorn4gMdAnzFz4blsI="; }; patches = [ - (fetchpatch { - name = "exiftool-13.23-compat.patch"; - url = "https://gitlab.mister-muffin.de/josch/img2pdf/commit/59132f20f8a40f6ed4e5cd2a3719bf55473ba4d7.patch"; - hash = "sha256-A36YSZ6kBFzEa2lSKIVHRg9r6Oi8FGkOnmt2YxlkwWw="; - }) (replaceVars ./default-icc-profile.patch { srgbProfile = if stdenv.hostPlatform.isDarwin then diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 35390e75df76..cb67f1450edd 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.25"; + version = "0.3.24"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain==${version}"; - hash = "sha256-AzH1rZFqEH8sovZZfJykvsEmCedEZWigQFHWHl6/PdE="; + hash = "sha256-Up/pH2TxLPiPO49oIa2ZlNeH3TyN9sZSlNsqOIRmlxc="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 78cd23d01250..68faebc6033b 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "12.0.0"; + version = "12.0.1"; pyproject = true; src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy"; tag = "v${version}"; - hash = "sha256-2dEoPgT8g59sLRV5gMPo7XII0XjTrn2cVdYetxDj/V0="; + hash = "sha256-BKT/qBWlfShAveL1KY5XXgQjhxR3Vr4zoJwiRxtBJkE="; }; pythonRelaxDeps = [ @@ -144,7 +144,7 @@ buildPythonPackage rec { meta = with lib; { description = "Man-in-the-middle proxy"; homepage = "https://mitmproxy.org/"; - changelog = "https://github.com/mitmproxy/mitmproxy/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/mitmproxy/mitmproxy/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 849ce582b805..91a8e322dec9 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "8.1.0"; + version = "9.0.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; tag = "v${version}"; - hash = "sha256-SRuBV7XWt4Myks7kbUzGAscggspUbRoLOvYNiorF8To="; + hash = "sha256-DGtfXM0Bfo5iyJ66/Bm5rQB2/ZYA+ZhlkUci1viynWY="; }; pythonRelaxDeps = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple API to access Netatmo weather station data"; homepage = "https://github.com/jabesq/pyatmo"; - changelog = "https://github.com/jabesq/pyatmo/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jabesq/pyatmo/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index cfd1223fb2d9..b9d56e3d7c95 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,337 +1,337 @@ { "bluedevil": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/bluedevil-6.3.4.tar.xz", - "hash": "sha256-VZtwsbJngjn2iiIDlHLpB25uMC4DnnJVpEDUhXPHD7o=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/bluedevil-6.3.5.tar.xz", + "hash": "sha256-DuDbv+445vKtvtfRC43vEopPmZvL4p8DXDvUTwpu/LA=" }, "breeze": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/breeze-6.3.4.tar.xz", - "hash": "sha256-l69TDnRurqQj90Fpf5HrR65ejog77z01P7Ja0LXtFaw=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/breeze-6.3.5.tar.xz", + "hash": "sha256-WAPY49Tt994m4t8h7ChmK2EaC8pQXDm5kcd2PbpgJqs=" }, "breeze-grub": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/breeze-grub-6.3.4.tar.xz", - "hash": "sha256-bKyzbyAqi/B6RacpXB/Rf6vUp0d2LJnryiC70kbk+ik=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/breeze-grub-6.3.5.tar.xz", + "hash": "sha256-+VsB3HrZdRz9nB78eqSbNCkfkxtWJUXhuwBg3kCzoEY=" }, "breeze-gtk": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/breeze-gtk-6.3.4.tar.xz", - "hash": "sha256-bBWYHTyU6xKp2YDvTP2zCJgj5YND152LL9NGrG0FVm8=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/breeze-gtk-6.3.5.tar.xz", + "hash": "sha256-spJicqyQjcDBIXWTMzFs/lVnxZHZdXJOLUUxFBUHWA0=" }, "breeze-plymouth": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/breeze-plymouth-6.3.4.tar.xz", - "hash": "sha256-G3PdRH24BJorFXQocLNJnluLTW9R+x3WuqVxib86SJQ=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/breeze-plymouth-6.3.5.tar.xz", + "hash": "sha256-/3GTud0REb1ZsYEHyau0ov3nBj2MZkT15OcFHc3HsZU=" }, "discover": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/discover-6.3.4.tar.xz", - "hash": "sha256-KhjK7Wc0k8vrhAqhZmJtQoMnLJdXivC/Z+iIe2cs89g=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/discover-6.3.5.tar.xz", + "hash": "sha256-CCLh+uB4oA4ylbV44AVNHgmNrKdddedpxMGtqTfws6A=" }, "drkonqi": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/drkonqi-6.3.4.tar.xz", - "hash": "sha256-2I502PlRJeO2T03/Jf72yq+b8Xm9xcwFkbTBXUZrQAs=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/drkonqi-6.3.5.tar.xz", + "hash": "sha256-0Mk/D8G0IDtiRdOi9OnIXUFhVw0UoU2B7tWk69Wt/80=" }, "flatpak-kcm": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/flatpak-kcm-6.3.4.tar.xz", - "hash": "sha256-XZb2Uyx6BYQndL02aUlwDKKHbl9epDuUmR6KykvavtQ=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/flatpak-kcm-6.3.5.tar.xz", + "hash": "sha256-H+8vTOZjpnlr0gWmumjGcnbXzjN72uKW/mO4iZDt/zA=" }, "kactivitymanagerd": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kactivitymanagerd-6.3.4.tar.xz", - "hash": "sha256-T1C15X+DsoqIg5MYY0hHdkSHe4icMAZR4OBt137pdQI=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kactivitymanagerd-6.3.5.tar.xz", + "hash": "sha256-FUR351a/7aqUFZyIbA1t1jvHCcHzvMisxJhMiPfDP9U=" }, "kde-cli-tools": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kde-cli-tools-6.3.4.tar.xz", - "hash": "sha256-igD17Aqy4nBuy17SbAt9+QUk/Uac0VdphHbjpUo4VSI=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kde-cli-tools-6.3.5.tar.xz", + "hash": "sha256-8EekZ1bIgvk5LGTj5irQmKsY838fNb38YggrFKemkDc=" }, "kde-gtk-config": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kde-gtk-config-6.3.4.tar.xz", - "hash": "sha256-9z78GNRufm5lFRN+cb+Nl9oOW0ltYFBug3HGt7It9KQ=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kde-gtk-config-6.3.5.tar.xz", + "hash": "sha256-RQrbVRLDDEpau6djxPkoYeoYujNM2FohE+3lReFXwjY=" }, "kdecoration": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kdecoration-6.3.4.tar.xz", - "hash": "sha256-udBJqfWmNZhW5m260HabSBiSEK1/iz4AnaK0rigTeJo=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kdecoration-6.3.5.tar.xz", + "hash": "sha256-bhVXEPXzp5m0fZBriiphFqlR3uPRkP4VvHJBPKljPwc=" }, "kdeplasma-addons": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kdeplasma-addons-6.3.4.tar.xz", - "hash": "sha256-rTZh45am4t7v5tTVxosl0xZj3jDX5q6r3k/qlaNogac=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kdeplasma-addons-6.3.5.tar.xz", + "hash": "sha256-J7xDCi1PX/hbAsEgxFr+PgIoflsTvXMOq7jtSE1epLo=" }, "kgamma": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kgamma-6.3.4.tar.xz", - "hash": "sha256-/Dxhse6ggH/wRx5OicsO+gv4txCTPhWfeUBQmC2eTds=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kgamma-6.3.5.tar.xz", + "hash": "sha256-FgZi3xHwzXzNqpfBbmNFIqsMhuWi1JzhQ4mZ/mWXmSs=" }, "kglobalacceld": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kglobalacceld-6.3.4.tar.xz", - "hash": "sha256-gn0TbhkStiSQJkv+bAPOTp2dAHc+ctN3/OI/AL9w6tk=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kglobalacceld-6.3.5.tar.xz", + "hash": "sha256-92yf9N8PbeDJ7kdcfjV0l/d9JhWnrdCXtmndaLWaaQA=" }, "kinfocenter": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kinfocenter-6.3.4.tar.xz", - "hash": "sha256-ireGGfbAXnFiCZ1SuoOwtdEaOYXMSwq/QRLZH4FcL2k=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kinfocenter-6.3.5.tar.xz", + "hash": "sha256-QDVErutgb/s75V2kIT0XEsv5NTTAmC44IErYY+Aa6MM=" }, "kmenuedit": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kmenuedit-6.3.4.tar.xz", - "hash": "sha256-fp3RXpxcXtri2qN5Hlb7a1Ro4NerH/XM1YmCey7/m14=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kmenuedit-6.3.5.tar.xz", + "hash": "sha256-EsPBJegT+C1XJ68dYmIIMPXdXdWyAkjxYYWR4jXuk0s=" }, "kpipewire": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kpipewire-6.3.4.tar.xz", - "hash": "sha256-u/1Cc3tZaPvIVel0qmhznofM0ksKbiPXGvwOmKkRVFg=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kpipewire-6.3.5.tar.xz", + "hash": "sha256-mbYSu+D+P0QFT8VxMeBfwAX2dczAcaCItaDxVNA68vc=" }, "krdp": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/krdp-6.3.4.tar.xz", - "hash": "sha256-hLzwZovaFy46r/AQt7rCvRDfKJofRYq8213U5sUljLw=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/krdp-6.3.5.tar.xz", + "hash": "sha256-aldaFtzFOJbfDIId491JNA8eI8Bhz7Uotrx+NJn/wuY=" }, "kscreen": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kscreen-6.3.4.tar.xz", - "hash": "sha256-ma+Ey1uOFKiUXf/yDnrNQkXK6fHHzTEfPu6N0iwQCyU=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kscreen-6.3.5.tar.xz", + "hash": "sha256-cdy3kCFoHY5I2Bm4EOZzboiypGTmsVml9w/pRfqRCiU=" }, "kscreenlocker": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kscreenlocker-6.3.4.tar.xz", - "hash": "sha256-RmfvP6x91ECla0ryUb9aSn6EB17y1hbTSuM1hiTA6UY=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kscreenlocker-6.3.5.tar.xz", + "hash": "sha256-eW7zTpH5fb6xkAKw/0QA63MtrJHVGEo5m/nlveI2qPY=" }, "ksshaskpass": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/ksshaskpass-6.3.4.tar.xz", - "hash": "sha256-eTNB2xLPOOzs6ZjMu7aFhxvl5Qma5siGhyJ5QzolWZU=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/ksshaskpass-6.3.5.tar.xz", + "hash": "sha256-38BKYTDVjVYfsO6PrioSf4haqOLe4IdznaMEOHlHrY8=" }, "ksystemstats": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/ksystemstats-6.3.4.tar.xz", - "hash": "sha256-AABqk3DQOhEUwxqGnGwGdsRJOqw3FhON2a6omNDoU5U=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/ksystemstats-6.3.5.tar.xz", + "hash": "sha256-4v2Lo/0K4P+RCz/Zb2F1adG/sAwnloaf61+PszTvQ1U=" }, "kwallet-pam": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kwallet-pam-6.3.4.tar.xz", - "hash": "sha256-164MW6pS3g+Kfc5gZRJFW5Qwej/Awh04ed/mMXVOowk=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kwallet-pam-6.3.5.tar.xz", + "hash": "sha256-qUOpVXVE2Opr3ibsFlw+yLfAKoF7bnxAbFV67iaaPN4=" }, "kwayland": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kwayland-6.3.4.tar.xz", - "hash": "sha256-qQhI1SOKt15wbJalNay+9REEQekv/J/JQzbGmh7faDU=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kwayland-6.3.5.tar.xz", + "hash": "sha256-D8Hw7N1TDlKExs8NHO1IRRQyKEvGXG5NhXihOgnf970=" }, "kwayland-integration": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kwayland-integration-6.3.4.tar.xz", - "hash": "sha256-RspZg1uMkk32FvMxwbM71weE3f39xQqz9LuLlE8E+P0=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kwayland-integration-6.3.5.tar.xz", + "hash": "sha256-iVnwHXG9zZ3eMsSt6GP1SNeSAyZ/R/gmR8qP+nN2iX4=" }, "kwin": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kwin-6.3.4.tar.xz", - "hash": "sha256-50ph7MxdMkjb1iC2wsexdQE7Ff9Z4Xr3D4iu/AgkRaU=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kwin-6.3.5.tar.xz", + "hash": "sha256-1xzay6s1+BOeeZ/gATJI9o6AK6UWQRtEbV1mwwvX5ew=" }, "kwrited": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/kwrited-6.3.4.tar.xz", - "hash": "sha256-97LL5Lt/eVURofeXJ7CFM5XyA0X66i5Nr9NKtEHJdbY=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/kwrited-6.3.5.tar.xz", + "hash": "sha256-JijIieIDhUmdxqC5lbuNIffSXX/+pNfrvh5EZdaWZm8=" }, "layer-shell-qt": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/layer-shell-qt-6.3.4.tar.xz", - "hash": "sha256-+AyYP0jTq+/WaEzpP8ZzaM4gfyFgc01OETpBjGmiY0Y=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/layer-shell-qt-6.3.5.tar.xz", + "hash": "sha256-cGLKDlDczpfdEdit8bhtSfHFZCPyNB3Os+pA3EggbiU=" }, "libkscreen": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/libkscreen-6.3.4.tar.xz", - "hash": "sha256-rO0VYBEVrL1ACcK8a9RFRW/CHB0Ebe4WQfIlIO657Dw=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/libkscreen-6.3.5.tar.xz", + "hash": "sha256-Wl0Uus/smwWRwebW4U85jmlDZsH/Lzj24M11LtqRueM=" }, "libksysguard": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/libksysguard-6.3.4.tar.xz", - "hash": "sha256-BMHuixoXStX41vHi1C7rkwebLzhWuty4y1Ph+dfLFdw=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/libksysguard-6.3.5.tar.xz", + "hash": "sha256-NsAfjIIYwXUGLooNssB8o5q+rDT8YtfmtIGU8FO8NSM=" }, "libplasma": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/libplasma-6.3.4.tar.xz", - "hash": "sha256-iAuXC5Ih+zknj06pKBRbCuTbNownObXayaad/NAA9fA=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/libplasma-6.3.5.tar.xz", + "hash": "sha256-UBLIPS2iZd6WBwm08hOPOXiqROH7K7DWs++V3pjm6uQ=" }, "milou": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/milou-6.3.4.tar.xz", - "hash": "sha256-rnvX0i5m5YgDT+Iac6qLN20jPoL0RHBwe3CMF3Hj/zc=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/milou-6.3.5.tar.xz", + "hash": "sha256-vPTHP2I/oFEL0YXmHk5VsnX9yIpOXdMRheC3I2ZvyPo=" }, "ocean-sound-theme": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/ocean-sound-theme-6.3.4.tar.xz", - "hash": "sha256-BjF9rGZa7FhtIUEjesbImNQBxWWaTw2YVItrkBnEoew=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/ocean-sound-theme-6.3.5.tar.xz", + "hash": "sha256-5qsu8Sujks2tvE+hBDpKHVQZthd6CGgi9ox6W1IXmMM=" }, "oxygen": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/oxygen-6.3.4.tar.xz", - "hash": "sha256-KOJScPOI7Kg1f7DrC4RKib26L/+Fg3GhGiBux84rANw=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/oxygen-6.3.5.tar.xz", + "hash": "sha256-el8Gp0xF7amZqW+OtbLW5Yvqk8OX3xSEtIkoZ32v1z0=" }, "oxygen-sounds": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/oxygen-sounds-6.3.4.tar.xz", - "hash": "sha256-Sc7sE4ogFX1fFiXUdNYWxIzAUnBbEFnBdjyMFXmGIGU=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/oxygen-sounds-6.3.5.tar.xz", + "hash": "sha256-QFjwO+89nHNKZ5qvbmDO6y6EUAcHi0tlSh88kNKCLlY=" }, "plasma-activities": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-activities-6.3.4.tar.xz", - "hash": "sha256-ZwpXGEOPDJFdprElo0+LRik7IvntvEvW8MzjcPPQ3QU=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-activities-6.3.5.tar.xz", + "hash": "sha256-7uVaTt4tl3+R2lp/3tbdIa6mwu5PXZ3xFoJwqNYdGfo=" }, "plasma-activities-stats": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-activities-stats-6.3.4.tar.xz", - "hash": "sha256-AUvT65g9yOEP9S7QL41JBWK50NYjkY6ScNnYSqWyi00=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-activities-stats-6.3.5.tar.xz", + "hash": "sha256-ZU+sklcd7L2lG9yf7bjA4+X3DXQvcQkZhMELE38cxG4=" }, "plasma-browser-integration": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-browser-integration-6.3.4.tar.xz", - "hash": "sha256-+MK5g9DJS4q5kKDiCvuUmw72nyubfhdktnatDEGh7XA=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-browser-integration-6.3.5.tar.xz", + "hash": "sha256-/+EdOQ8xEtvmfxx9vIAAodQUdJrpxn/np5SJ8grjwko=" }, "plasma-desktop": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-desktop-6.3.4.tar.xz", - "hash": "sha256-2yTDxdTD4MEhS1GtaIq2A8LJ6064LZc72qrWdRmixX8=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-desktop-6.3.5.tar.xz", + "hash": "sha256-BH956THyCUNUsYTUsfypFUpzLHSYvxhxqAECB/gCn5o=" }, "plasma-dialer": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-dialer-6.3.4.tar.xz", - "hash": "sha256-RWbaU0SNdmj+fQVvUiwNXxuyQCEOWrkIDKw9kdBFUHk=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-dialer-6.3.5.tar.xz", + "hash": "sha256-sbuKAI+g4w1TGTAdppr5et2Uus5OUEkXBmpxMUDBt1M=" }, "plasma-disks": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-disks-6.3.4.tar.xz", - "hash": "sha256-5YsW+z9hKftitPoQRlCaWaHVqVC9vEukTe/umODx3Uc=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-disks-6.3.5.tar.xz", + "hash": "sha256-6vMIr/1yB+6FRK55yZ03a/f56J4iiwE71xavnFMNb80=" }, "plasma-firewall": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-firewall-6.3.4.tar.xz", - "hash": "sha256-npHbCUh7LtVewxZMZ0AlNRdexICsZInZyPI+AKb7xUc=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-firewall-6.3.5.tar.xz", + "hash": "sha256-cj7lwTHUmlocJYoPAFtSsrww+Jq1DcJWRC8RS+RO+fQ=" }, "plasma-integration": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-integration-6.3.4.tar.xz", - "hash": "sha256-y4qgHkBlO24Pca02fLlXVrF3fqAnEiy2YcL/39QQkbc=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-integration-6.3.5.tar.xz", + "hash": "sha256-25RRAKxGG5vgG6N069BHwwm08HdmaMpXBWCHAJTQkRo=" }, "plasma-mobile": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-mobile-6.3.4.tar.xz", - "hash": "sha256-uh7c4GRSmtynR/ASCbh26MRBzvRv+q1w3ou/Yx89VVk=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-mobile-6.3.5.tar.xz", + "hash": "sha256-Bnxd7xZOqMU0qRD7V7TdabHIOmh3l17+vht7J0BF9Jc=" }, "plasma-nano": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-nano-6.3.4.tar.xz", - "hash": "sha256-GOpIjK5v65G9MmxdspPDyZeF+39YO/nLD33NG/vg2iA=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-nano-6.3.5.tar.xz", + "hash": "sha256-/qNsyIFyyGmfbGQ82umgH5JAinaUKiPrVld9zw/DjV8=" }, "plasma-nm": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-nm-6.3.4.tar.xz", - "hash": "sha256-/crmRb4iaSciWqynG0/aEaQ63KFpmCtpya2AFsadoL0=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-nm-6.3.5.tar.xz", + "hash": "sha256-FAHNOR5oTLkaKtyJ4CWlKEVctoPM3PFSpgVwEpM2I/k=" }, "plasma-pa": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-pa-6.3.4.tar.xz", - "hash": "sha256-K7lk4pt6N/Kls3h85XM0eprb+4ieuknJlAS+RE9em5k=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-pa-6.3.5.tar.xz", + "hash": "sha256-pm//c61ZxH0KDE8axDSa+81Td+eSjt1oSfWn5OEcAZg=" }, "plasma-sdk": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-sdk-6.3.4.tar.xz", - "hash": "sha256-rqUu9ZBVUtUkLol00vngU0RXZGULwmO7DzXuQ6XLCcw=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-sdk-6.3.5.tar.xz", + "hash": "sha256-cOBH/yxXURTLs254LD4EWyUyWoDY/XpAG9gVjD+ynNM=" }, "plasma-systemmonitor": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-systemmonitor-6.3.4.tar.xz", - "hash": "sha256-mdfEKRJoEXLjBJWPsdMwzsxs6V24oDNpU/8rTQxlrF0=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-systemmonitor-6.3.5.tar.xz", + "hash": "sha256-cudaSypUb+mGlOWySQUOM1i6rgscOSV6D9pyBqZ3phA=" }, "plasma-thunderbolt": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-thunderbolt-6.3.4.tar.xz", - "hash": "sha256-RVZqA94SO5tHC7XzWlQqFuAF5OqD+tVzkcIc3DjUvLA=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-thunderbolt-6.3.5.tar.xz", + "hash": "sha256-RHLy64VCp5dq4c3aAC1CIBmhFm3r6QIYCneImpAkhD8=" }, "plasma-vault": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-vault-6.3.4.tar.xz", - "hash": "sha256-3nevdOCclTntz2MI7kXgKDCZBb6gjiT1/5hZd+n4bGI=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-vault-6.3.5.tar.xz", + "hash": "sha256-psyOrngWcfYtRl3J7EU2BECaJKXJqRyivQKRIrfQHnM=" }, "plasma-welcome": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-welcome-6.3.4.tar.xz", - "hash": "sha256-M9VS45jyFF+VGQVvmJ3gBmzI/cppYaMJ16Cs5tzvObM=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-welcome-6.3.5.tar.xz", + "hash": "sha256-fuRzKbKUZUm36lPKE8LUpZLSmh7mO5Lo73sF3Dd8cMY=" }, "plasma-workspace": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-workspace-6.3.4.tar.xz", - "hash": "sha256-hdmd0NijN1iZevAz0kxF7jmRUu/SyLfeC9OjT9HN0VU=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-workspace-6.3.5.tar.xz", + "hash": "sha256-f1CPbKJ9fWFe7ieRndCw+U0Wi6gcOk1UOWgEa8y3h/I=" }, "plasma-workspace-wallpapers": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma-workspace-wallpapers-6.3.4.tar.xz", - "hash": "sha256-yj1wSdqS3jvvtqkF1Cbjk0YPrPsJHfmE9q5h8O7KjEk=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma-workspace-wallpapers-6.3.5.tar.xz", + "hash": "sha256-ipG/gDePFrEvmiAcclLPC6a5DT43hqNll7OyEV+A23w=" }, "plasma5support": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plasma5support-6.3.4.tar.xz", - "hash": "sha256-2lJ20B58JJtrkUQjWzp4IudKb59+/XkAUy+iHWREvYQ=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plasma5support-6.3.5.tar.xz", + "hash": "sha256-6CVJ3gQ+i++iFWrYHK98eoFRkUnNeqgE/9YCoMSlSL4=" }, "plymouth-kcm": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/plymouth-kcm-6.3.4.tar.xz", - "hash": "sha256-inZWgUAyPHbxG3E3F/fVr0juM9IW/Dne38lvgANozPY=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/plymouth-kcm-6.3.5.tar.xz", + "hash": "sha256-ZvD+YUe70EACAzec0xIDs2ZC2Pe64Px5AGjpWFN/h00=" }, "polkit-kde-agent-1": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/polkit-kde-agent-1-6.3.4.tar.xz", - "hash": "sha256-p5f24CSRovxg7aFKdeXnlrVlEzA8mbdGX9lkIn6YxM8=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/polkit-kde-agent-1-6.3.5.tar.xz", + "hash": "sha256-WAcbNSmlO2yZ8aKrUbRSxxusAtH0RW60sBScm8m9W6A=" }, "powerdevil": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/powerdevil-6.3.4.tar.xz", - "hash": "sha256-u4+zN/0hR5M5ZwdzCyK4+CITUpamsqwMKNd0CWqyK14=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/powerdevil-6.3.5.tar.xz", + "hash": "sha256-ppiD1hVuemd8jRy1zZFaieJGaSdO8ZZtXZzrMTJQ2lM=" }, "print-manager": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/print-manager-6.3.4.tar.xz", - "hash": "sha256-WzLVNcAgo4yAutlSoa2nZK0eog3F3Cu19KA0qcbHamE=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/print-manager-6.3.5.tar.xz", + "hash": "sha256-dxUfOVrZHtprZE62yH/iib4ZjqtBwDnmC9uzsW1VmsE=" }, "qqc2-breeze-style": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/qqc2-breeze-style-6.3.4.tar.xz", - "hash": "sha256-7iCZSN6R4k5Bla/Q1ZRnLdgFpzREUxkWwq2PmfVR+cY=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/qqc2-breeze-style-6.3.5.tar.xz", + "hash": "sha256-MHqit3HhWFHXAWmah3TrSCYaoRewv/+dqBwzlPuNS+o=" }, "sddm-kcm": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/sddm-kcm-6.3.4.tar.xz", - "hash": "sha256-bbqv39XYKT9t2QyGWUqXWo0cOvB/oHEQRKiq4supF0M=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/sddm-kcm-6.3.5.tar.xz", + "hash": "sha256-tJBj8KKKPkLbpsbe5nWj1TPXJ8M/Q76JEPZAa1x9CNI=" }, "spacebar": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/spacebar-6.3.4.tar.xz", - "hash": "sha256-/ht8VlG6q89YAEHPFhbt5K1DSuhPCDhGTpCC0eTx5jM=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/spacebar-6.3.5.tar.xz", + "hash": "sha256-r5hOC4wDgLdPeL/2+UbXzmhtMSa+ylTV7oXvcRRRrXM=" }, "spectacle": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/spectacle-6.3.4.tar.xz", - "hash": "sha256-Uu6VTVnavl3Ho8xnsW1h7LOaEt1ZZhKGSO+/BLS6zPo=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/spectacle-6.3.5.tar.xz", + "hash": "sha256-3vyxsuooW+jF2cnt44mmYo4Lzl2Z0JFs6SWGVSOe8WA=" }, "systemsettings": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/systemsettings-6.3.4.tar.xz", - "hash": "sha256-I0yhfQWl0JwVcOHZNf0D2i3UzlPFt1RbpDalatS574M=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/systemsettings-6.3.5.tar.xz", + "hash": "sha256-3Qu1QUBb7RVHRjPNitkKme/MdjuSPaYPtAtpLCrW5Iw=" }, "wacomtablet": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/wacomtablet-6.3.4.tar.xz", - "hash": "sha256-kcV+ESlQcRpauBQq+Slfq9LEbqaYcFrpbewy3tn3W1Q=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/wacomtablet-6.3.5.tar.xz", + "hash": "sha256-fXAzHewvgLLFZOeIGyX2Ka36Uu/Hr2DfmhVHnrUy8Lc=" }, "xdg-desktop-portal-kde": { - "version": "6.3.4", - "url": "mirror://kde/stable/plasma/6.3.4/xdg-desktop-portal-kde-6.3.4.tar.xz", - "hash": "sha256-WcYvZ50trHId1TfYOtMHXBKdB+EFbgpZIRf3EZefCCE=" + "version": "6.3.5", + "url": "mirror://kde/stable/plasma/6.3.5/xdg-desktop-portal-kde-6.3.5.tar.xz", + "hash": "sha256-DCvcVypvQO5F0b2gkO10JVGwyjSMRpuhRw+HRTlabPg=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix index 05f13b663a1f..1e6652164854 100644 --- a/pkgs/kde/plasma/breeze/default.nix +++ b/pkgs/kde/plasma/breeze/default.nix @@ -3,24 +3,10 @@ qtbase, qtsvg, libsForQt5, - fetchpatch, }: mkKdeDerivation { pname = "breeze"; - # Backport fixes for Qt 6.9 - # FIXME: remove in 6.3.5 / 6.4 - patches = [ - (fetchpatch { - url = "https://invent.kde.org/plasma/breeze/-/commit/098ad3facb3d76fe4476424f1b7bf3c9c2c1b142.patch"; - hash = "sha256-o9XrhYJIvygZ6nfcDKL22jxP7eaHeN3RGBixiOZh9O8="; - }) - (fetchpatch { - url = "https://invent.kde.org/plasma/breeze/-/commit/e2f16562b64c63b623def44476eadc635a82c7de.patch"; - hash = "sha256-hPbLEfD3mhPfpoDfVUolUZ4+Pip5VNj8di/0ZDj7Jzw="; - }) - ]; - outputs = [ "out" "dev" diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 6b8bd06d5a0e..0d78ac721cf2 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -17,7 +17,6 @@ pipewire, krunner, python3, - fetchpatch, }: mkKdeDerivation { pname = "kwin"; @@ -30,13 +29,6 @@ mkKdeDerivation { ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch - - # Backport crash fix - # FIXME: remove in 6.3.5 - (fetchpatch { - url = "https://invent.kde.org/plasma/kwin/-/commit/93bf2f98ae22e654d997c7140b7fe9936fa3f2d3.patch"; - hash = "sha256-Jaa7IVuYMfxzUv0y2rUo5hdYavjaUkEW9/yteL5katE="; - }) ]; postPatch = '' diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix index 846e8d568432..f933687143a8 100644 --- a/pkgs/kde/plasma/plasma-vault/default.nix +++ b/pkgs/kde/plasma/plasma-vault/default.nix @@ -6,7 +6,6 @@ fuse, cryfs, encfs, - fetchpatch, }: mkKdeDerivation { pname = "plasma-vault"; @@ -16,13 +15,6 @@ mkKdeDerivation { ./0002-cryfs-path.patch ./0003-fusermount-path.patch ./0004-gocryptfs-path.patch - - # Fix build with Qt 6.9 - # FIXME: remove in 6.3.5 - (fetchpatch { - url = "https://invent.kde.org/plasma/plasma-vault/-/commit/a982e58679caa583ceb4cc883d1c1923dab54db9.patch"; - hash = "sha256-Khws1fvVTFEgwMDGt7P52PHboa+4kq6g792kFaT5ceU="; - }) ]; CXXFLAGS = [ diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index e9e9bbe1b41b..b5a8b5d3657f 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -17,7 +17,6 @@ qttools, qqc2-breeze-style, gpsd, - fetchpatch, }: mkKdeDerivation { pname = "plasma-workspace"; @@ -33,13 +32,6 @@ mkKdeDerivation { # @QtBinariesDir@ only appears in the *removed* lines of the diff QtBinariesDir = null; }) - - # Backport patch recommended by upstream - # FIXME: remove in 6.3.5 - (fetchpatch { - url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/47d502353720004fa2d0e7b0065994b75b3e0ded.patch"; - hash = "sha256-wt0ZIF4zcEOmP0o4ZcjBYxVjr2hVUlOKVJ8SMNSYt68="; - }) ]; postInstall = '' diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index eb7580d17a1e..4b7b78a4ab53 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -878,10 +878,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.4"; + version = "3.4.1"; }; debug = { dependencies = [ @@ -2346,10 +2346,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19cq7hbddq23yhyqysds2ic89mg3h8ngvmvjf0sj6k25cgwrlnc9"; + sha256 = "14zmzjy2sp87ac6iygkk3pz9snjvx4ks681vg4gxz8x8q7gmzajj"; type = "gem"; }; - version = "0.4.19"; + version = "0.5.8"; }; net-ldap = { groups = [ "default" ]; @@ -2431,10 +2431,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb"; + sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.8"; }; oj = { dependencies = [ diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 15a415f21ba3..b1c8389786c1 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -5,14 +5,14 @@ patches ? [ ], }: let - version = "4.3.7"; + version = "4.3.8"; in (applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-KmeWBMuyJ/ZdZnFXAlpvgXV+J8IZrcaTXvvui4l6mjY="; + hash = "sha256-08AApylDOz8oExZ0cRaZTgNAuP+1wiLkx0SDhkO2fMM="; }; patches = patches ++ [ ]; }) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index f5efb7306312..f639bd38ef1f 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -4,25 +4,26 @@ fetchFromGitHub, testers, carapace, + nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "carapace"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; - rev = "v${version}"; - hash = "sha256-ewZ06HPAS7UXmnRlrOaHegVrfYxwko/jyHqtQV/0JwY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-VKc4JnezPdbgUIiSOnHIkUCLas//4TMIKiYd71EMamk="; }; - vendorHash = "sha256-+jOZ7EhMQZHvu4XToM7L1w2YCKCTOHKzZCOBsulLsH8="; + vendorHash = "sha256-APJBCUdicKb81gY3ukhMHVgapDl+4tsMdNHEwZbarKE="; ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; subPackages = [ "./cmd/carapace" ]; @@ -33,6 +34,7 @@ buildGoModule rec { GOOS= GOARCH= go generate ./... ''; + passthru.updateScript = nix-update-script { }; passthru.tests.version = testers.testVersion { package = carapace; }; meta = with lib; { @@ -42,4 +44,4 @@ buildGoModule rec { license = licenses.mit; mainProgram = "carapace"; }; -} +}) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index b919d7c48d2b..916f0ee2fdd3 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.26"; + version = "3.88.28"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-WB2ZL6Vut1dhSDslcAiTvf2REKlUtIEFEIA3rImrMJ4="; + hash = "sha256-VrwZ0MsZ7ZkSfHlmXShiLfZp04vfczuEYh7OHtOUt0Y="; }; vendorHash = "sha256-hBStZjhoBK58vQV22/EZ/h3Fd961fkj3tQbp1gvMID8="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5e6ee7707b97..ca3b4c3a7efe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1332,6 +1332,7 @@ mapAliases { oathToolkit = oath-toolkit; # Added 2022-04-04 oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30 + odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06 oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22 onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 openai-whisper-cpp = whisper-cpp; # Added 2024-12-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba1d003cf0ae..6d4dfdd62e62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14981,9 +14981,13 @@ with pkgs; physfs = physfs_2; }; - beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { }; + beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { + inherit (python3Packages) beancount beangulp; + }; - beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { }; + beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { + inherit (python3Packages) beancount beancount-plugin-utils; + }; cataclysmDDA = callPackage ../games/cataclysm-dda { };