dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
K900 2024-10-17 09:07:35 +03:00
commit 47f2d87e32
28 changed files with 224 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/tiled/default.nix
View File

@ -8,6 +8,7 @@
, qtbase
, qtdeclarative
, qttools
, qtwayland
, qtsvg
, zlib
, zstd
@ -15,7 +16,7 @@
}:
let
qtEnv = env "tiled-qt-env" [ qtbase qtdeclarative qtsvg qttools ];
qtEnv = env "tiled-qt-env" [ qtbase qtdeclarative qtsvg qttools qtwayland ];
in
stdenv.mkDerivation rec {

15
pkgs/applications/graphics/hdrmerge/default.nix
View File

@ -16,12 +16,12 @@
mkDerivation rec {
pname = "hdrmerge";
version = "unstable-2023-01-04";
version = "0.5.0-unstable-2024-08-02";
src = fetchFromGitHub {
owner = "jcelaya";
repo = "hdrmerge";
rev = "ca38b54f980564942a7f2b014a5f57a64c1d9019";
hash = "sha256-DleYgpDXP0NvbmEURXnBfe3OYnT1CaQq+Mw93JQQprE=";
rev = "e2a46f97498b321b232cc7f145461212677200f1";
hash = "sha256-471gJtF9M36pAId9POG8ZIpNk9H/157EdHqXSAPlhN0=";
};
nativeBuildInputs = [
@ -42,15 +42,6 @@ mkDerivation rec {
"-include cstdint"
];
patches = [
# https://github.com/jcelaya/hdrmerge/pull/222
(fetchpatch {
name = "exiv2-0.28.patch";
url = "https://github.com/jcelaya/hdrmerge/commit/377d8e6f3c7cdd1a45b63bce2493ad177dde03fb.patch";
hash = "sha256-lXHML6zGkVeWKvmY5ECoJL2xjmtZz77XJd5prpgJiZo=";
})
];
desktopItems = [
(makeDesktopItem {
name = "HDRMerge";

13
pkgs/applications/networking/cluster/kubelogin/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule, go }:
{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, go }:
buildGoModule rec {
pname = "kubelogin";
@ -18,6 +18,17 @@ buildGoModule rec {
"-X main.goVersion=${lib.getVersion go}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
$out/bin/kubelogin completion bash >kubelogin.bash
$out/bin/kubelogin completion fish >kubelogin.fish
$out/bin/kubelogin completion zsh >kubelogin.zsh
installShellCompletion kubelogin.{bash,fish,zsh}
'';
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "Kubernetes credential plugin implementing Azure authentication";
mainProgram = "kubelogin";

15
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -234,13 +234,13 @@
"vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ="
},
"cloudflare": {
"hash": "sha256-9M7PQEBg0qDmyz2B35krNUF9dDo0g28JomFor7b/Nsc=",
"hash": "sha256-R6cJQaBnsARO3qg48ijqVdyrSivLN3Wf96yqTjuaN/c=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.41.0",
"rev": "v4.44.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-uLkoG0m3v1vohXO03nCrfxEhvJYfJOvYSIHsgYCjKtc="
"vendorHash": "sha256-g575BZRdCekfUgF78DENloCeM8TTz5OhLxxgb1OkElc="
},
"cloudfoundry": {
"hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
@ -461,6 +461,15 @@
"spdx": "MPL-2.0",
"vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw="
},
"gitea": {
"hash": "sha256-cIbDYFc6q6GMoQH9bqEA/LqC3MczAM7mewhYRRYQcy0=",
"homepage": "https://registry.terraform.io/providers/go-gitea/gitea",
"owner": "go-gitea",
"repo": "terraform-provider-gitea",
"rev": "v0.5.1",
"spdx": "MIT",
"vendorHash": "sha256-7gA6KoP7NwjwItigBUeCg9AYQ/MggkOHOe/bH7Tf/xA="
},
"github": {
"hash": "sha256-XnCoXKKAk1RvQiZ7IWxIOalSS5EC/l7jJYf7RVpAT6s=",
"homepage": "https://registry.terraform.io/providers/integrations/github",

45
pkgs/applications/version-management/gh/default.nix
View File

@ -1,17 +1,25 @@
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, stdenv, testers, gh }:
{
lib,
fetchFromGitHub,
buildGoModule,
installShellFiles,
stdenv,
testers,
gh,
}:
buildGoModule rec {
pname = "gh";
version = "2.58.0";
version = "2.59.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
hash = "sha256-KHJKE550XlGdB++jq/1kHP4o1QISbPtbt4GU9uIP3RE=";
rev = "refs/tags/v${version}";
hash = "sha256-QOc99KmcGk9b9uy1/y1FSe0zYE1q0g06k7niqtsMDmY=";
};
vendorHash = "sha256-6T9LQNzGpADLwI0pFvjBe5rqbXOEDZmjYCy4RhNqcFI=";
vendorHash = "sha256-Mje0IbvRj6pmOe8s8PX87ntPE+ZZeciLyOP6fmv7PmI=";
nativeBuildInputs = [ installShellFiles ];
@ -21,19 +29,22 @@ buildGoModule rec {
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 bin/gh -t $out/bin
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installManPage share/man/*/*.[1-9]
installPhase =
''
runHook preInstall
install -Dm755 bin/gh -t $out/bin
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installManPage share/man/*/*.[1-9]
installShellCompletion --cmd gh \
--bash <($out/bin/gh completion -s bash) \
--fish <($out/bin/gh completion -s fish) \
--zsh <($out/bin/gh completion -s zsh)
'' + ''
runHook postInstall
'';
installShellCompletion --cmd gh \
--bash <($out/bin/gh completion -s bash) \
--fish <($out/bin/gh completion -s fish) \
--zsh <($out/bin/gh completion -s zsh)
''
+ ''
runHook postInstall
'';
# most tests require network access
doCheck = false;

18
pkgs/applications/version-management/git-cliff/default.nix
View File

@ -4,6 +4,7 @@
, rustPlatform
, Security
, SystemConfiguration
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
@ -26,6 +27,23 @@ rustPlatform.buildRustPackage rec {
Security SystemConfiguration
];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export OUT_DIR=$(mktemp -d)
# Generate shell completions
$out/bin/git-cliff-completions
installShellCompletion \
--bash $OUT_DIR/git-cliff.bash \
--fish $OUT_DIR/git-cliff.fish \
--zsh $OUT_DIR/_git-cliff
# Generate man page
$out/bin/git-cliff-mangen
installManPage $OUT_DIR/git-cliff.1
'';
meta = with lib; {
description = "Highly customizable Changelog Generator that follows Conventional Commit specifications";
homepage = "https://github.com/orhun/git-cliff";

10
pkgs/by-name/ca/cargo-make/package.nix
View File

@ -2,6 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, installShellFiles
, bzip2
, openssl
, stdenv
@ -21,7 +22,10 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-RjsYrFbS/OiMQKTiPshGcBI9KF75Z5stn2HaB6mniZE=";
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [
bzip2
@ -30,6 +34,10 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.SystemConfiguration
];
postInstall = ''
installShellCompletion extra/shell/*.bash
'';
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
# See also:

4
pkgs/by-name/ci/cimg/package.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cimg";
version = "3.4.2";
version = "3.4.3";
src = fetchFromGitHub {
owner = "GreycLab";
repo = "CImg";
rev = "refs/tags/v.${finalAttrs.version}";
hash = "sha256-lYs8V/phdyM1kpcxBDS3vAjxFgGCaaOCdNHU3//dgDs=";
hash = "sha256-Abe7mSbdj06MossUQXCKZPzzfyvJyRVeLfzINYNPv4g=";
};
outputs = [ "out" "doc" ];

6
pkgs/by-name/co/copycat/package.nix
View File

@ -1,7 +1,9 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
darwin,
}:
rustPlatform.buildRustPackage rec {
@ -17,6 +19,10 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-LYVhvq5l+PCZXW+elWi3zZFxLekgPn+plo4dybbLK9g=";
buildInputs = lib.optionals (stdenv.isDarwin) [
darwin.apple_sdk_11_0.frameworks.AppKit
];
meta = {
description = "Utility to copy project tree contents to clipboard";
homepage = "https://github.com/DeeKahy/CopyCat";

29
pkgs/by-name/lo/localsend/package.nix
View File

@ -5,6 +5,7 @@
fetchFromGitHub,
flutter324,
makeDesktopItem,
copyDesktopItems,
nixosTests,
pkg-config,
libayatana-appindicator,
@ -35,7 +36,10 @@ let
"permission_handler_windows" = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
copyDesktopItems
];
buildInputs = [ libayatana-appindicator ];
@ -50,20 +54,19 @@ let
mkdir -p $d
ln -s $out/app/data/flutter_assets/assets/img/logo-''${s}.png $d/localsend.png
done
mkdir -p $out/share/applications
cp $desktopItem/share/applications/*.desktop $out/share/applications
substituteInPlace $out/share/applications/*.desktop --subst-var out
'';
desktopItem = makeDesktopItem {
name = "LocalSend";
exec = "@out@/bin/localsend_app";
icon = "localsend";
desktopName = "LocalSend";
startupWMClass = "localsend_app";
genericName = "An open source cross-platform alternative to AirDrop";
categories = [ "Network" ];
};
desktopItems = [
(makeDesktopItem {
name = "LocalSend";
exec = "localsend_app";
icon = "localsend";
desktopName = "LocalSend";
startupWMClass = "localsend_app";
genericName = "An open source cross-platform alternative to AirDrop";
categories = [ "Network" ];
})
];
passthru = {
updateScript = ./update.sh;

31
pkgs/by-name/ni/nix-search-cli/package.nix
View File

@ -1,34 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
, unstableGitUpdater
{
lib,
buildGoModule,
fetchFromGitHub,
unstableGitUpdater,
}:
buildGoModule {
pname = "nix-search-cli";
version = "0-unstable-2023-09-12";
version = "0.2-unstable-2024-09-24";
src = fetchFromGitHub {
owner = "peterldowns";
repo = "nix-search-cli";
rev = "f3f1c53c72dadac06472a7112aeb486ab5dda695";
hash = "sha256-YM1Lf7py79rU8aJE0PfQaMr5JWx5J1covUf1aCjRkc8=";
rev = "7d6b4c501ee448dc2e5c123aa4c6d9db44a6dd12";
hash = "sha256-0Zms/QVCUKxILLLJYsaodSW64DJrVr/yB13SnNL8+Wg=";
};
vendorHash = "sha256-JDOu7YdX9ztMZt0EFAMz++gD7n+Mn1VOe5g6XwrgS5M=";
vendorHash = "sha256-RZuB0aRiMSccPhX30cGKBBEMCSvmC6r53dWaqDYbmyA=";
passthru.updateScript = unstableGitUpdater {
# Almost every commit is tagged as "release-<unix-time>-<commit>", software doesn't keep track of its version
# Using 0 feels closer to what the tagging is trying to express
hardcodeZeroVersion = true;
};
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
meta = {
description = "CLI for searching packages on search.nixos.org";
homepage = "https://github.com/peterldowns/nix-search-cli";
license = licenses.mit;
maintainers = with maintainers; [ donovanglover ];
platforms = platforms.all;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ donovanglover ];
platforms = lib.platforms.all;
mainProgram = "nix-search";
};
}

11
pkgs/by-name/ux/uxplay/package.nix
View File

@ -3,13 +3,13 @@
stdenv,
fetchFromGitHub,
cmake,
openssl,
libplist,
pkg-config,
wrapGAppsHook3,
avahi,
avahi-compat,
gst_all_1,
libplist,
openssl,
nix-update-script,
}:
@ -26,14 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace lib/CMakeLists.txt \
--replace "APPLE" "FALSE" \
--replace ".a" "${stdenv.hostPlatform.extensions.sharedLibrary}"
sed -i '/PKG_CONFIG_EXECUTABLE/d' renderers/CMakeLists.txt
sed -i -e '/PKG_CONFIG_EXECUTABLE/d' -e '/PKG_CONFIG_PATH/d' renderers/CMakeLists.txt
'';
nativeBuildInputs = [
cmake
openssl
libplist
pkg-config
wrapGAppsHook3
];
@ -47,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
libplist
openssl
];
passthru.updateScript = nix-update-script { };

86
pkgs/by-name/ze/zed-editor/Cargo.lock generated
View File

@ -2282,9 +2282,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.18"
version = "4.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
dependencies = [
"clap_builder",
"clap_derive",
@ -2292,9 +2292,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.18"
version = "4.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
dependencies = [
"anstream",
"anstyle",
@ -4145,6 +4145,7 @@ dependencies = [
"snippet_provider",
"task",
"theme",
"tokio",
"toml 0.8.19",
"ui",
"url",
@ -5147,9 +5148,9 @@ dependencies = [
[[package]]
name = "grid"
version = "0.13.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d196ffc1627db18a531359249b2bf8416178d84b729f3cebeb278f285fb9b58c"
checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
[[package]]
name = "group"
@ -6301,6 +6302,7 @@ dependencies = [
"strum 0.25.0",
"text",
"theme",
"thiserror",
"tiktoken-rs",
"ui",
"unindent",
@ -6367,7 +6369,6 @@ dependencies = [
"node_runtime",
"paths",
"project",
"protols-tree-sitter-proto",
"regex",
"rope",
"rust-embed",
@ -7841,9 +7842,9 @@ dependencies = [
[[package]]
name = "parking"
version = "2.2.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
@ -8351,9 +8352,9 @@ dependencies = [
[[package]]
name = "pretty_assertions"
version = "1.4.0"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
dependencies = [
"diff",
"yansi",
@ -8625,15 +8626,6 @@ version = "2.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
[[package]]
name = "protols-tree-sitter-proto"
version = "0.2.0"
source = "git+https://github.com/zed-industries/tree-sitter-proto?rev=0848bd30a64be48772e15fbb9d5ba8c0cc5772ad#0848bd30a64be48772e15fbb9d5ba8c0cc5772ad"
dependencies = [
"cc",
"tree-sitter-language",
]
[[package]]
name = "psm"
version = "0.1.21"
@ -8945,7 +8937,6 @@ dependencies = [
"gpui",
"language",
"log",
"markdown",
"menu",
"ordered-float 2.10.1",
"picker",
@ -9099,6 +9090,7 @@ dependencies = [
"serde_json",
"smol",
"tempfile",
"thiserror",
"util",
]
@ -9107,7 +9099,9 @@ name = "remote_server"
version = "0.1.0"
dependencies = [
"anyhow",
"backtrace",
"cargo_toml",
"clap",
"client",
"clock",
"env_logger",
@ -10061,9 +10055,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.127"
version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"indexmap 2.4.0",
"itoa",
@ -10604,6 +10598,7 @@ dependencies = [
"libsqlite3-sys",
"parking_lot",
"smol",
"sqlformat",
"thread_local",
"util",
"uuid",
@ -10620,9 +10615,9 @@ dependencies = [
[[package]]
name = "sqlformat"
version = "0.2.4"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f"
checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
dependencies = [
"nom",
"unicode_categories",
@ -10878,6 +10873,7 @@ dependencies = [
"fuzzy",
"gpui",
"indoc",
"isahc_http_client",
"language",
"log",
"menu",
@ -11276,6 +11272,7 @@ dependencies = [
"project",
"serde",
"serde_json",
"settings",
"theme",
"ui",
"util",
@ -11284,9 +11281,9 @@ dependencies = [
[[package]]
name = "taffy"
version = "0.4.4"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ec17858c2d465b2f734b798b920818a974faf0babb15d7fef81818a4b2d16f1"
checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94"
dependencies = [
"arrayvec",
"grid",
@ -11360,6 +11357,7 @@ dependencies = [
name = "telemetry_events"
version = "0.1.0"
dependencies = [
"language",
"semantic_version",
"serde",
]
@ -11425,12 +11423,12 @@ dependencies = [
[[package]]
name = "terminal_size"
version = "0.3.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
dependencies = [
"rustix 0.38.35",
"windows-sys 0.48.0",
"windows-sys 0.59.0",
]
[[package]]
@ -11509,7 +11507,6 @@ dependencies = [
"serde_json_lenient",
"serde_repr",
"settings",
"story",
"util",
"uuid",
]
@ -11556,18 +11553,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.63"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.63"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
@ -11746,6 +11743,7 @@ dependencies = [
"pretty_assertions",
"project",
"recent_projects",
"remote",
"rpc",
"serde",
"settings",
@ -14118,6 +14116,7 @@ dependencies = [
"parking_lot",
"postage",
"project",
"release_channel",
"remote",
"schemars",
"serde",
@ -14313,9 +14312,9 @@ dependencies = [
[[package]]
name = "yansi"
version = "0.5.1"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
[[package]]
name = "yazi"
@ -14398,7 +14397,7 @@ dependencies = [
[[package]]
name = "zed"
version = "0.156.2"
version = "0.157.5"
dependencies = [
"activity_indicator",
"anyhow",
@ -14540,7 +14539,7 @@ dependencies = [
[[package]]
name = "zed_dart"
version = "0.1.0"
version = "0.1.1"
dependencies = [
"zed_extension_api 0.1.0",
]
@ -14645,7 +14644,7 @@ dependencies = [
[[package]]
name = "zed_php"
version = "0.2.0"
version = "0.2.1"
dependencies = [
"zed_extension_api 0.1.0",
]
@ -14657,6 +14656,13 @@ dependencies = [
"zed_extension_api 0.1.0",
]
[[package]]
name = "zed_proto"
version = "0.2.0"
dependencies = [
"zed_extension_api 0.1.0",
]
[[package]]
name = "zed_purescript"
version = "0.0.1"

5
pkgs/by-name/ze/zed-editor/package.nix
View File

@ -86,13 +86,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "zed-editor";
version = "0.156.2";
version = "0.157.5";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
hash = "sha256-nZsc8BUxHIVZoJvY+6JFIyuLJrnQ4H7LhesnEnceA74=";
hash = "sha256-xtSdlzj1AxhJN4aXLJ+Oy51LX4QduLwcuCfK42kthvE=";
fetchSubmodules = true;
};
@ -112,7 +112,6 @@ rustPlatform.buildRustPackage rec {
"font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo=";
"lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";
"nvim-rs-0.8.0-pre" = "sha256-VA8zIynflul1YKBlSxGCXCwa2Hz0pT3mH6OPsfS7Izo=";
"protols-tree-sitter-proto-0.2.0" = "sha256-0pvHuwqtkHYLevQnaEFmfyDtILD7Wy0in2KSKFR2mKw=";
"tree-sitter-gomod-1.0.2" = "sha256-FCb8ndKSFiLY7/nTX7tWF8c4KcSvoBU1QB5R4rdOgT0=";
"tree-sitter-gowork-0.0.1" = "sha256-WRMgGjOlJ+bT/YnSBeSLRTLlltA5WwTvV0Ow/949+BE=";
"tree-sitter-heex-0.0.1" = "sha256-SnjhL0WVsHOKuUp3dkTETnCgC/Z7WN0XmpQdJPBeBhw=";

4
pkgs/development/libraries/alglib/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "alglib3";
version = "4.02.0";
version = "4.03.0";
src = fetchurl {
url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz";
sha256 = "sha256-U7/ukBXdwC8GkpevFfSfbgbiyOf7CkDv0PUAL8BnAag=";
sha256 = "sha256-k7/U9Tq2ND8+qd8tHZP9Gq1okJF3tMNej3WE/6NkBYI=";
};
nativeBuildInputs = [

3
pkgs/development/libraries/clfft/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }:
{ lib, gccStdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }:
let
inherit (darwin.apple_sdk.frameworks) OpenCL;
stdenv = gccStdenv;
in
stdenv.mkDerivation rec {
pname = "clfft";

22
pkgs/development/libraries/google-cloud-cpp/default.nix
View File

@ -14,6 +14,7 @@
, openssl
, pkg-config
, protobuf
, pkgsBuildHost
# default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
, apis ? [ "*" ]
, staticOnly ? stdenv.hostPlatform.isStatic
@ -97,14 +98,21 @@ stdenv.mkDerivation rec {
''
);
installCheckPhase = lib.optionalString doInstallCheck ''
installCheckPhase = let
disabledTests = lib.optionalString stdenv.hostPlatform.isDarwin ''
common_internal_async_connection_ready_test
bigtable_async_read_stream_test
bigtable_metadata_update_policy_test
bigtable_bigtable_benchmark_test
bigtable_embedded_server_test
'';
in ''
runHook preInstallCheck
# Disable any integration tests, which need to contact the internet.
# Also disable the `storage_benchmark_*` tests.
# With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON.
# With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF
ctest --label-exclude integration-test --exclude-regex storage_benchmarks_
ctest \
--label-exclude integration-test \
--exclude-from-file <(echo '${disabledTests}')
runHook postInstallCheck
'';
@ -122,6 +130,8 @@ stdenv.mkDerivation rec {
"-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF"
] ++ lib.optionals (apis != [ "*" ]) [
"-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-DGOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE=${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin"
];
requiredSystemFeatures = [ "big-parallel" ];
@ -130,7 +140,7 @@ stdenv.mkDerivation rec {
license = with licenses; [ asl20 ];
homepage = "https://github.com/googleapis/google-cloud-cpp";
description = "C++ Idiomatic Clients for Google Cloud Platform services";
platforms = [ "x86_64-linux" "aarch64-linux" ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with maintainers; [ cpcloud ];
};
}

2
pkgs/development/libraries/protobuf/generic.nix
View File

@ -46,8 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch";
hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ=";
})
] ++ lib.optionals stdenv.hostPlatform.isStatic [
./static-executables-have-no-rpath.patch
];
nativeBuildInputs = [

18
pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch
View File

@ -1,18 +0,0 @@
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 26a55be8b..b6823c3f9 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -32,13 +32,6 @@ if (protobuf_BUILD_PROTOC_BINARIES)
install(TARGETS protoc EXPORT protobuf-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
- if (UNIX AND NOT APPLE)
- set_property(TARGET protoc
- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
- elseif (APPLE)
- set_property(TARGET protoc
- PROPERTY INSTALL_RPATH "@loader_path/../lib")
- endif()
endif (protobuf_BUILD_PROTOC_BINARIES)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

4
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
View File

@ -85,7 +85,7 @@ buildDunePackage rec {
stdune
]
else if lib.versionAtLeast version "1.7.0" then
[ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ]
[ re octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ]
else
[
ppx_yojson_conv_lib
@ -113,7 +113,7 @@ buildDunePackage rec {
] else if lib.versionAtLeast version "1.7.0" then [
csexp
jsonrpc
pp
(pp.override { version = "1.2.0"; })
ppx_yojson_conv_lib
result
uutf

15
pkgs/development/ocaml-modules/pp/default.nix
View File

@ -1,16 +1,23 @@
{ buildDunePackage, fetchurl, ppx_expect, lib }:
{ lib
, buildDunePackage
, fetchurl
, ppx_expect
, version ? "2.0.0"
}:
buildDunePackage rec {
pname = "pp";
version = "1.2.0";
inherit version;
src = fetchurl {
url =
"https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz";
hash = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw=";
hash = {
"2.0.0" = "sha256-hlE1FRiwkrSi3vTggXHCdhUvkvtqhKixm2uSnM20RBk=";
"1.2.0" = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw=";
}."${version}";
};
duneVersion = "3";
minimalOCamlVersion = "4.08";
checkInputs = [ ppx_expect ];

7
pkgs/development/python-modules/hahomematic/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2024.9.12";
version = "2024.10.8";
pyproject = true;
disabled = pythonOlder "3.12";
@ -25,15 +25,14 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = "hahomematic";
rev = "refs/tags/${version}";
hash = "sha256-lfJJKOk8Oj7bEaL96TjkFQfT/dLkkMkwSDHClDIJHqE=";
hash = "sha256-NFDh6XA6c1IWTHYjXB19V2kEW3ZkjFU/mz5XduzXj+g=";
};
__darwinAllowLocalNetworking = true;
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools~=69.2.0" "setuptools" \
--replace-fail "wheel~=0.43.0" "wheel"
--replace-fail "setuptools==75.1.0" "setuptools" \
'';
build-system = [ setuptools ];

1
pkgs/development/python-modules/js2py/default.nix
View File

@ -42,5 +42,6 @@ buildPythonPackage rec {
homepage = "https://github.com/PiotrDabkowski/Js2Py";
license = licenses.mit;
maintainers = with maintainers; [ onny ];
knownVulnerabilities = [ "CVE-2024-28397" ];
};
}

12
pkgs/development/python-modules/lark/default.nix
View File

@ -3,9 +3,6 @@
buildPythonPackage,
fetchFromGitHub,
regex,
pytestCheckHook,
pythonOlder,
js2py,
setuptools,
}:
@ -33,13 +30,8 @@ buildPythonPackage rec {
"lark.grammars"
];
# Js2py is not supported on 3.12
doCheck = pythonOlder "3.12";
nativeCheckInputs = [
js2py
pytestCheckHook
];
# Js2py is needed for tests but it's marked as insecure
doCheck = false;
meta = with lib; {
description = "Modern parsing library for Python, implementing Earley & LALR(1) and an easy interface";

4
pkgs/development/python-modules/latexrestricted/default.nix
View File

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "latexrestricted";
version = "0.4.0";
version = "0.5.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-AMfDTruJKejDdXW98VkeeEwELql5566bsL1SutLDpso=";
hash = "sha256-PwhVKgoXujiLC+3FPAtUdvBEgeNwD6aBK+I5p8xeLwo=";
};
build-system = [ setuptools ];

4
pkgs/games/heroic/default.nix
View File

@ -88,9 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" \
--replace-fail "Exec=heroic-run" "Exec=heroic"
mkdir -p "$out/share/applications" "$out/share/icons/hicolor/512x512/apps"
mkdir -p "$out/share/applications" "$out/share/icons/hicolor/scalable/apps"
ln -s "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications"
ln -s "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.png" "$out/share/icons/hicolor/512x512/apps"
ln -s "$out/share/heroic/src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg"
runHook postInstall
'';

4
pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix
View File

@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "danielperna84";
domain = "homematicip_local";
version = "1.65.0";
version = "1.67.0";
src = fetchFromGitHub {
owner = "danielperna84";
repo = "custom_homematic";
rev = "refs/tags/${version}";
hash = "sha256-rUiesrVpGZMMo8JSboFTDE2oE0Q9hNYR4AvA/GR5+MY=";
hash = "sha256-lKjBt5oMSdGHXUddaGM+BQOhFnsobvgf2k6qMu2uofY=";
};
dependencies = [

4
pkgs/top-level/all-packages.nix
View File

@ -8823,7 +8823,9 @@ with pkgs;
jmespath = callPackage ../development/tools/jmespath { };
juicefs = callPackage ../tools/filesystems/juicefs { };
juicefs = callPackage ../tools/filesystems/juicefs {
buildGoModule = buildGo122Module;
};
juicity = callPackage ../tools/networking/juicity { };