diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index c4d402335439..162e385f909e 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } { }; sublime4-dev = common { - buildVersion = "4207"; + buildVersion = "4212"; dev = true; - x64sha256 = "q8UVYQhLu18Lh1sLp+1jR4Kx1taDsRUOmHY4km6opJA="; - aarch64sha256 = "sZwAZCMsvJuCvxpmjn829SxsV0IIuI+SEPjbQJwNO7Q="; + x64sha256 = "AA6ZsWNXs6J4JXI0tbJPDoAhoN8Jj58jhD0hLnTEFNI="; + aarch64sha256 = "oz9Y7JgQEQskPF23bw6LfBMi0Rke8DDOok0H4ZD+uS0="; } { }; } diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8fbb2e4781b1..5700976fb7d2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -429,8 +429,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.19.0"; - hash = "sha256-PTuOqbvhN2lutShMn76uxune/gd5sTc5KSfA2xLhmH8="; + version = "1.20.0"; + hash = "sha256-+A1G+3Qe2yzDslgX3ap3N03woHrqAp5Q5uj1nqVGE7k="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -3502,8 +3502,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.466.0"; - hash = "sha256-s2Ks5vhH9q7Io0jmTVGQ9jffy618W5WT1hghQCqoP5M="; + version = "0.469.0"; + hash = "sha256-kvmQlazS+Zuubx67b8kvy4P8U3b5WQqRd/GCxW+0gsI="; }; meta = { description = "Open any folder or repository inside a Docker container"; @@ -3742,8 +3742,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "2.3.0"; - hash = "sha256-vb2tTtdHRmlF/TZRqUFjZNgE+5jizX/ky+NgzJYvXUg="; + version = "2.4.0"; + hash = "sha256-k67wBwqX2gibQd/uADXQZitA1FWdSnMkQkgVdKU0sBw="; }; }; @@ -3867,6 +3867,8 @@ let }; }; + posit.air-vscode = callPackage ./posit.air-vscode { }; + prettier.prettier-vscode = callPackage ./prettier.prettier-vscode { }; prince781.vala = callPackage ./prince781.vala { }; @@ -5336,8 +5338,8 @@ let mktplcRef = { name = "csharp-ls"; publisher = "vytautassurvila"; - version = "0.0.35"; - hash = "sha256-3EgC90XebG+YLWZTIJ3+5xDmGlU2Tr4bWwXL+jrt9XA="; + version = "0.0.36"; + hash = "sha256-WQB6GJewHBMz9bphrJ65IZTg75kkWuBvIvA+Co9aX04="; }; meta = { changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix index 76aec4c23853..62bf37671829 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-bicep"; - version = "0.46.1"; - hash = "sha256-SXs7x2KvWaXsZSfxheCQQul9jUiXTUst8i/E4qwl9jM="; + version = "0.47.16"; + hash = "sha256-L/RAdKMzH4ANBtSl7ik5/awD62z03jzEwXKVGUwT74w="; }; buildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-python-envs/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-python-envs/default.nix index a0b49680da49..cdcf8df2bba4 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-python-envs/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-python-envs/default.nix @@ -1,23 +1,53 @@ { + stdenvNoCC, lib, vscode-utils, }: -vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-python-envs"; - publisher = "ms-python"; - version = "1.33.2026051501"; - hash = "sha256-V5anlwzLt0V08HsO6TCBIUPD3VPhyohg7YnSc/1++GE="; - }; +vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-fOqG/GSQmKDHA3J10x/m9q5URjSPAoWHqg/OfZtz418="; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + hash = "sha256-MA2kXhM6rSp9OPtDm4daFrBpH+CNNXLjSG095QndOvM="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + hash = "sha256-UiA9Ar34UuHKBKm0B6jc+qWwzxlJbXEG2FaMBV39AeI="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + hash = "sha256-+v8U/aFNp/b6Dj62J+MLYQ8dcfO4qinWd/XST6ntnNc="; + }; + }; + in + { + name = "vscode-python-envs"; + publisher = "ms-python"; + version = "1.36.0"; + } + // sources.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); meta = { description = "Provides a unified python environment experience"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-python-envs"; homepage = "https://github.com/microsoft/vscode-python-environments"; + changelog = "https://github.com/microsoft/vscode-python-environments/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Zocker1999NET ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; -} +}) diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index 36392353acac..50b2c4728481 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -84,8 +84,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.124.0"; - hash = "sha256-GokSJOEpHomkBbkPUBhVXWZCrGbi5oZTlw5PFV12ZBY="; + version = "0.128.0"; + hash = "sha256-RYv96lYoQKOk2cskbP6aISxnoMkxeo/dDSKurtyCvyw="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 00130c33e0a5..9633b0fc7152 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -42,15 +42,15 @@ let isDarwin = stdenv.hostPlatform.isDarwin; supported = { x86_64-linux = { - hash = "sha256-Ok5jk6XUqrSh6vJJyIydA6aYEw3GhsRHqjjEsmzr7/0="; + hash = "sha256-og4lqDIo14VKViPEnwDDNzd4K/3eh0/v9Bf+LZtSwAI="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-/9TFwQP7g1PRUY93tohOqnTvLC6NS9xulBYxwqrIgfY="; + hash = "sha256-m2ni6PnptPvNpPrzQvdWKkuUce9hBvAPlxbYCKgRdVg="; arch = "linux-arm64"; }; aarch64-darwin = { - hash = "sha256-fsHmPWUnDDr4fcRMBPepXnxIhqXDt9ZsBjtUL1VD71E="; + hash = "sha256-yiNgrk6+qnSqATx94D14OFlStIgHnF3NXiwL/AY9Yuo="; arch = "darwin-arm64"; }; }; @@ -63,7 +63,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.33.8"; + version = "1.34.4"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/posit.air-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/posit.air-vscode/default.nix new file mode 100644 index 000000000000..97e1f8b6b0e8 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/posit.air-vscode/default.nix @@ -0,0 +1,27 @@ +{ + lib, + vscode-utils, + air-formatter, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "air-vscode"; + publisher = "posit"; + version = "0.28.0"; + hash = "sha256-/B5Qzbndk4l+PyEWlODfIOkBPSVrh6Qi3gFrNmUjykE="; + }; + patchPhase = '' + runHook prePatch + rm bundled/bin/air + ln -s "${lib.getExe air-formatter}" bundled/bin/air + runHook postPatch + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/Posit.air-vscode/changelog"; + description = "A Visual Studio Code extension for Air, an R formatter and language server, written in Rust."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Posit.air-vscode"; + homepage = "https://posit-dev.github.io/air"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.chvp ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index abda3122d485..f4ea13eb179d 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -14,15 +14,15 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-3FE2tZtkDZttZlD7foqt1qgcb1w37mT0/RC30HYEvNA="; + hash = "sha256-hcRjZ+z7gUg0jG12c9k98d+3knGgtW6XRF2tSfQQvOg="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-xxniWRtMkh3NE9OWJkR9xUARJTBnQkoTRlXrQa95K/k="; + hash = "sha256-4375B2WsRajVtCewX2ruWDrdgsGlccefcfHDl8X6z9A="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-/pj6HPuqvAYXrBVX/FoOZRDYL5xvdnM+PPM27/5+hxw="; + hash = "sha256-3na7btLQRIAb9EtHAHUSbLvdM/j/EJ9z0W5qv0Ysoz4="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -34,7 +34,7 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.55"; + version = "0.1.56"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index b7289bf725e2..49ab89c5a409 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.39.5"; - sha256 = "sha256-8f9LGmNE8ilPYZmbJpmmAx9DkKJXbQzAia11rM3wTec="; + version = "0.40.1"; + sha256 = "sha256-OFe7XZCoac31V1ZK75tpXmuCmyTdGzPxDo7fJkcUiV4="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 852ff5c4303d..c0da6463f045 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -13,22 +13,22 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-eo/NsznwHU4IFTKcxI4eGJrutHzmY4PLigT+2B5uklk="; + hash = "sha256-is7nNav1inG96NoND/XcVQhltT2sbvHa7qkb+wMGAC0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-T+bzAp9FkHdMU4Nklo7S37q0tnC91uIbgUOYSQNCkPo="; + hash = "sha256-hsuV25YRGatyfK7QEZkdxgc4hyyC6JEfzF2ilRd8hYI="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-LIPX1ri904wH7PKJE1uMHcefc1lXb1KV6TCDSph7P9o="; + hash = "sha256-hHrr3ni0dcSSBqbs+XRP6P9xiyWcMqDYUi1z0+WnJNk="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.35.0"; + version = "0.35.1"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fbd9eb354f61..fd81ed462cee 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1427,11 +1427,11 @@ "vendorHash": "sha256-/5VP9ljeMyvikllhfZ4kUQgMEeyRKG3lfJjbp5SWtJ0=" }, "ucloud_ucloud": { - "hash": "sha256-9lh0RSeOP+lkUbrBjKtI9m3Fk1gFr6t7mTQdls1q1lw=", + "hash": "sha256-cw/xAib+XlI4yV+4RaRsJYrNrYhhlF1ebVQeVhtsv1U=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.39.6", + "rev": "v1.43.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/by-name/bl/bleur/package.nix b/pkgs/by-name/bl/bleur/package.nix index 17d5345493a0..0192b7765e7a 100644 --- a/pkgs/by-name/bl/bleur/package.nix +++ b/pkgs/by-name/bl/bleur/package.nix @@ -3,16 +3,17 @@ pkg-config, openssl, rustPlatform, - fetchgit, + fetchFromCodeberg, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "bleur"; version = "0.0.7"; __structuredAttrs = true; - src = fetchgit { - url = "https://git.oss.uzinfocom.uz/bleur/bleur.git"; - rev = "v${finalAttrs.version}"; + src = fetchFromCodeberg { + owner = "bleur"; + repo = "bleur"; + tag = "v${finalAttrs.version}"; hash = "sha256-bFpOvnC2MILr3b+KdVOAvDGmEZM8LDlwGd04csk2l18="; }; @@ -26,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Template manager & buddy for bleur templates by Orzklv"; platforms = with lib.platforms; linux ++ darwin; mainProgram = "bleur"; - homepage = "https://bleur.uz/"; + homepage = "https://codeberg.org/bleur/bleur"; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/development/tools/ceedling/Gemfile b/pkgs/by-name/ce/ceedling/Gemfile similarity index 100% rename from pkgs/development/tools/ceedling/Gemfile rename to pkgs/by-name/ce/ceedling/Gemfile diff --git a/pkgs/development/tools/ceedling/Gemfile.lock b/pkgs/by-name/ce/ceedling/Gemfile.lock similarity index 100% rename from pkgs/development/tools/ceedling/Gemfile.lock rename to pkgs/by-name/ce/ceedling/Gemfile.lock diff --git a/pkgs/development/tools/ceedling/gemset.nix b/pkgs/by-name/ce/ceedling/gemset.nix similarity index 100% rename from pkgs/development/tools/ceedling/gemset.nix rename to pkgs/by-name/ce/ceedling/gemset.nix diff --git a/pkgs/development/tools/ceedling/default.nix b/pkgs/by-name/ce/ceedling/package.nix similarity index 100% rename from pkgs/development/tools/ceedling/default.nix rename to pkgs/by-name/ce/ceedling/package.nix diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index d9452626d109..23f85cc8750e 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -38,7 +38,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI for executing Cirrus tasks locally and in any CI"; homepage = "https://github.com/cirruslabs/cirrus-cli"; - license = lib.licenses.agpl3Plus; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ techknowlogick ]; mainProgram = "cirrus"; }; diff --git a/pkgs/by-name/cl/cliproxyapi/package.nix b/pkgs/by-name/cl/cliproxyapi/package.nix index 222f174f4d18..790762b44404 100644 --- a/pkgs/by-name/cl/cliproxyapi/package.nix +++ b/pkgs/by-name/cl/cliproxyapi/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { __structuredAttrs = true; pname = "cliproxyapi"; - version = "7.3.2"; + version = "7.3.10"; src = fetchFromGitHub { owner = "router-for-me"; repo = "CLIProxyAPI"; tag = "v${finalAttrs.version}"; - hash = "sha256-AgyWs2xkgkUqKKOSY1dAaN9BdEqo73BKmPpYMzSxVds="; + hash = "sha256-pKguqvvQA1IVIE4f3qQbZ8VOWEcY4evkyacyYt36+T8="; }; - vendorHash = "sha256-CrDp7MOr+AwJUhTovklXx3F1yaktQlvD7VYhYSY6VvY="; + vendorHash = "sha256-r3yWkdMcM40G9jV7MxW/qNv3E9WrHavFilW24quEf+8="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index 3de830d2d615..f48793ed90f5 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "ginkgo"; - version = "2.32.2"; + version = "2.33.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-tPw47ItW6S7ULab4ioXhvssd6eNV2CGMM3pzz8dtb9g="; + sha256 = "sha256-jnYnaML+MYOoMB1AKTdCQrmTXunKdWAYafvk7ZbFi8w="; }; vendorHash = "sha256-lj8b9f5q9hbPML7uLca74lTCadNOCtGIDmvP+CUwJx4="; diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index 8d98ebd2c356..17913e8b1181 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_GITHASH=OFF" "-DINSTALL_LICENSE=OFF" "-DINSTALL_CADICAL=OFF" + "-DSTAGE1_CMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DUSE_MIMALLOC=${if enableMimalloc then "ON" else "OFF"}" ]; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/by-name/li/libtool_1_5/package.nix similarity index 100% rename from pkgs/development/tools/misc/libtool/default.nix rename to pkgs/by-name/li/libtool_1_5/package.nix diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix index 06efddae9cfa..0a1ba9a98d14 100644 --- a/pkgs/by-name/ne/neovim-node-client/package.nix +++ b/pkgs/by-name/ne/neovim-node-client/package.nix @@ -9,18 +9,18 @@ buildNpmPackage rec { pname = "node-client"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "neovim"; repo = "node-client"; tag = "v${version}"; - hash = "sha256-nAV0X5882Ps5zDPfmoRHm0a0NtzCOpBQEZqOT2/GCZU="; + hash = "sha256-bhO52di2NmXk2VI8eFwxVKkPh1yEGJCeWXp3xLBWFFQ="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-AN3TVvCyWjjm1GfnI+ZMt27KQC7qYxQ0bcysAaDsyz4="; + hash = "sha256-Vl6VPcwDrYAC4HWeY+6eWPl/2+Mw6fkScS5fsrLlWxw="; }; buildPhase = '' diff --git a/pkgs/by-name/ok/oklch-color-picker/package.nix b/pkgs/by-name/ok/oklch-color-picker/package.nix index d014cad5103a..43e7276ea6ab 100644 --- a/pkgs/by-name/ok/oklch-color-picker/package.nix +++ b/pkgs/by-name/ok/oklch-color-picker/package.nix @@ -7,6 +7,11 @@ autoPatchelfHook, wayland, libxkbcommon, + libx11, + libxcursor, + libxi, + libxrandr, + libxcb, libGL, stdenv, makeDesktopItem, @@ -37,6 +42,11 @@ rustPlatform.buildRustPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland libxkbcommon + libx11 + libxcursor + libxi + libxrandr + libxcb ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index e246a11f51c2..1ed6c88a175c 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromGitLab, appstream-glib, autoAddDriverRunpath, cargo, @@ -18,23 +18,25 @@ dmidecode, util-linux, systemd, + libsoup_3, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.10.2"; + version = "51.0"; - src = fetchFromGitHub { - owner = "nokyan"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME/Incubator"; repo = "resources"; - tag = "v${finalAttrs.version}"; - hash = "sha256-BkyWq3Cwt34lNQ/p1iQcfIlkCefE2YeiQMd1T6ODbxw="; + tag = finalAttrs.version; + hash = "sha256-ZdLBWawoD07SxC+/QTeyOXx7uAyazP6XjLeTF6lsWRw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-zzSqwc+MoYoieOT0qmgfxKG8/HLGTVsTgcru5wZgn2M="; + hash = "sha256-m4LwmA5mwd2bUK5X26HJvIr6hxf75O+9WGEfYVthSh0="; }; nativeBuildInputs = [ @@ -54,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita + libsoup_3 ]; # Check all Command::new @@ -63,10 +66,6 @@ stdenv.mkDerivation (finalAttrs: { systemd # udevadm ]; - mesonFlags = [ - (lib.mesonOption "profile" "default") - ]; - preFixup = '' gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}) ''; @@ -76,10 +75,9 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - changelog = "https://github.com/nokyan/resources/releases/tag/v${finalAttrs.version}"; description = "Monitor your system resources and processes"; - homepage = "https://github.com/nokyan/resources"; - license = lib.licenses.gpl3Only; + homepage = "https://gitlab.gnome.org/GNOME/Incubator/resources"; + license = lib.licenses.gpl3Plus; mainProgram = "resources"; maintainers = with lib.maintainers; [ lukas-heiligenbrunner diff --git a/pkgs/by-name/sa/sarabun-font/package.nix b/pkgs/by-name/sa/sarabun-font/package.nix index 34089c8f5cad..b50f5dc1d60b 100644 --- a/pkgs/by-name/sa/sarabun-font/package.nix +++ b/pkgs/by-name/sa/sarabun-font/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -15,21 +16,26 @@ stdenvNoCC.mkDerivation { sha256 = "jcSQ72WK0GucZPgG7IQKrKzCOEbGgbQVl21RIKSF6A0="; }; + nativeBuildInputs = [ installFonts ]; + outputs = [ "out" "doc" ]; + dontInstallWebfonts = true; + installPhase = '' runHook preInstall - mkdir -p $doc/sarabun $out/share/fonts/truetype + + mkdir -p $doc/sarabun cp -r $src/OFL.txt $src/docs/* $doc/sarabun - cp $src/fonts/*.ttf $out/share/fonts/truetype + runHook postInstall ''; meta = { - homepage = "https://cadsondemak.github.io/sarabun/"; + homepage = "https://cadsondemak.github.io/Sarabun/"; description = "Slightly-condensed looped Thai and sans serif Latin typeface for communications"; longDescription = '' The most popular typeface from the 13 fonts from SIPA Thailand’s National diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index d9dcff49b70c..42f00e2d1ff3 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.18.6"; + version = "1.18.10"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-4a4DwFpjWJ9UtL5DR1Djln1DtMkkgYgvVgj5PiQLlXQ="; + hash = "sha256-IAsmddpnmYhObcDa47W30obH60gCDOgmDI4crUu/Tro="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-Yq9OlFByYRhq3L3XRtDhOtXouglyWjp4HY2JG1LJ4pE="; + hash = "sha256-alRLgA3TQD7rxN/CiNS0a5lFD48tdnbwm3KRYk+RCeQ="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-rbl24OuOa0imdhfyK+xF7gEVKhzKyJx83KQ5sUUfEZg="; + hash = "sha256-Q/iXE350V73wH6WnWdACooN6ocUzAiV/X3CT+hN/MWY="; }; }; updateScript = "${ diff --git a/pkgs/by-name/tm/tmate/package.nix b/pkgs/by-name/tm/tmate/package.nix index 06dcbdb1d7fc..46ba8b43305f 100644 --- a/pkgs/by-name/tm/tmate/package.nix +++ b/pkgs/by-name/tm/tmate/package.nix @@ -57,5 +57,9 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ck3d ]; mainProgram = "tmate"; + knownVulnerabilities = [ + "There are no upstream releases since 2019-11." + "CVE-2018-19387" + ]; }; } diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index 52ec1315a698..2036e1dd8ed0 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "topgrade"; - version = "17.10.0"; + version = "17.12.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; tag = "v${finalAttrs.version}"; - hash = "sha256-tzza9uFeyhdk6GoFfqPrkutWUZz5bJV26gAfHf5bVyA="; + hash = "sha256-7K/iuXx78ATBhOAHSHQjkHRuBxxPeF4fWcEYKHb9DQ8="; }; - cargoHash = "sha256-DBRYrWE0Qidtt3CDfjDaIAHT0gq+XHunrm8eqybVQuk="; + cargoHash = "sha256-mEH4+0Crhd12LyJeCFKcnciiEJ2mBllaGOUiqUrYKvw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tz/tzf-rs/package.nix b/pkgs/by-name/tz/tzf-rs/package.nix index c043802b2612..ea65d9de8612 100644 --- a/pkgs/by-name/tz/tzf-rs/package.nix +++ b/pkgs/by-name/tz/tzf-rs/package.nix @@ -6,7 +6,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "tzf-rs"; - version = "2.0.0"; + version = "2.1.2"; __structuredAttrs = true; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "ringsaturn"; repo = "tzf-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-t/LleWuSu8czVhs0GqvgmoL8u0A6t7hcuNKDkKAy0Hc="; + hash = "sha256-FeTMcaYkANW3Kd6nE9GddMCUJ3PZ08w1U9eLWA0Kvw0="; }; buildFeatures = [ @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "export-geojson" ]; - cargoHash = "sha256-FpoXDbCufkm4FrqZHINZkJ79TA6vGDRaerousVY7HcA="; + cargoHash = "sha256-TmBYab6XUCLsPwZu3t1yWKjypXuLwCcILHwEUviEmFM="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/vs/vscode-html-languageserver/package.nix b/pkgs/by-name/vs/vscode-html-languageserver/package.nix index 4bc31f06e332..380fe87d0649 100644 --- a/pkgs/by-name/vs/vscode-html-languageserver/package.nix +++ b/pkgs/by-name/vs/vscode-html-languageserver/package.nix @@ -9,18 +9,18 @@ buildNpmPackage (finalAttrs: { pname = "vscode-html-languageserver"; - version = "1.136.1"; + version = "1.138.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode"; tag = finalAttrs.version; - hash = "sha256-Y6FRttdpn353w/ykJbaE+NjM1NfXQewl9Fgux7m10lk="; + hash = "sha256-PQqCs0tXjwEMjvHCuIRO6lc4ih2vISMrtXZrgl4Jypg="; }; sourceRoot = "${finalAttrs.src.name}/extensions/html-language-features/server"; - npmDepsHash = "sha256-3LdWhp2wJwa0jQgkVZPH3ae8RexS1SU07xaPjM+XcWQ="; + npmDepsHash = "sha256-sE4tqJPE9aOhpPbV6Q0ZBFVJw8TlQ+osiSxV2pfC6Fw="; __structuredAttrs = true; diff --git a/pkgs/by-name/vs/vscode-json-languageserver/package.nix b/pkgs/by-name/vs/vscode-json-languageserver/package.nix index cc719b0122cf..a1835b9a79e1 100644 --- a/pkgs/by-name/vs/vscode-json-languageserver/package.nix +++ b/pkgs/by-name/vs/vscode-json-languageserver/package.nix @@ -9,18 +9,18 @@ buildNpmPackage (finalAttrs: { pname = "vscode-json-languageserver"; - version = "1.136.1"; + version = "1.138.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode"; tag = finalAttrs.version; - hash = "sha256-Y6FRttdpn353w/ykJbaE+NjM1NfXQewl9Fgux7m10lk="; + hash = "sha256-PQqCs0tXjwEMjvHCuIRO6lc4ih2vISMrtXZrgl4Jypg="; }; sourceRoot = "${finalAttrs.src.name}/extensions/json-language-features/server"; - npmDepsHash = "sha256-kVZ7pnC/3m0I1jwuN3Ad6carWpj+O7IYnRZ3cx5W00g="; + npmDepsHash = "sha256-4VqxQYvCaKemc/Tr99bu47PHfmjCJ/KfljMn4bAydog="; __structuredAttrs = true; diff --git a/pkgs/development/lean-modules/lean4/default.nix b/pkgs/development/lean-modules/lean4/default.nix index 3f62f6151b8f..d9ce64b4f591 100644 --- a/pkgs/development/lean-modules/lean4/default.nix +++ b/pkgs/development/lean-modules/lean4/default.nix @@ -95,6 +95,7 @@ let "-DINSTALL_LICENSE=OFF" "-DINSTALL_CADICAL=OFF" "-DINSTALL_LEANTAR=OFF" + "-DSTAGE1_CMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DUSE_MIMALLOC=ON" ]; diff --git a/pkgs/development/python-modules/bibtexparser/2.nix b/pkgs/development/python-modules/bibtexparser/2.nix index 747ec54a3c57..fff62206c9be 100644 --- a/pkgs/development/python-modules/bibtexparser/2.nix +++ b/pkgs/development/python-modules/bibtexparser/2.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bibtexparser"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "sciunto-org"; repo = "python-bibtexparser"; tag = "v${version}"; - hash = "sha256-rOWXCT/E0LQ4Fc50iJnGR8ZZ5lrKA2SO1jQqUqV6Tlw="; + hash = "sha256-m/ISlU30R5mLFuzZ+DguG/sZ3TpMGM5Ng1ufnhjdifM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/electrum-ecc/default.nix b/pkgs/development/python-modules/electrum-ecc/default.nix index 37db42c2a6a4..daa8c827dbd1 100644 --- a/pkgs/development/python-modules/electrum-ecc/default.nix +++ b/pkgs/development/python-modules/electrum-ecc/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "electrum-ecc"; - version = "0.0.7"; + version = "0.0.8"; pyproject = true; build-system = [ setuptools ]; src = fetchPypi { pname = "electrum_ecc"; inherit version; - hash = "sha256-7UE04dv/D9gwInZMasyXoCzeNRKSfXxB9NSLmgbpH7I="; + hash = "sha256-lIaad94o7nm39+l0r1wgs5K5SZBYgKiyZQTiggJkQQY="; }; env = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4059e2d939ee..301f9a00fe85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5097,8 +5097,6 @@ with pkgs; libtool = libtool_2; - libtool_1_5 = callPackage ../development/tools/misc/libtool { }; - libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; linuxkit = callPackage ../development/tools/misc/linuxkit { @@ -5406,8 +5404,6 @@ with pkgs; ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu); - ceedling = callPackage ../development/tools/ceedling { }; - celt = callPackage ../development/libraries/celt { }; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { }; celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { };