mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
9bca079625
62 changed files with 961 additions and 611 deletions
|
|
@ -870,6 +870,12 @@ lib.mapAttrs mkLicense (
|
|||
fullName = "ISC License";
|
||||
};
|
||||
|
||||
json = {
|
||||
spdxId = "JSON";
|
||||
fullName = "JSON License";
|
||||
free = false;
|
||||
};
|
||||
|
||||
databricks = {
|
||||
fullName = "Databricks License";
|
||||
url = "https://www.databricks.com/legal/db-license";
|
||||
|
|
|
|||
|
|
@ -239,13 +239,16 @@ in
|
|||
mkdir -vp "$INSTANCE_DIR"
|
||||
cd "$INSTANCE_DIR"
|
||||
|
||||
# force reregistration on changed labels
|
||||
# force reregistration on changed token or labels
|
||||
export TOKEN_HASH_FILE="$INSTANCE_DIR/.token-hash"
|
||||
export TOKEN_HASH_CURRENT="$(printf '%s' "$TOKEN" | sha256sum | cut -d' ' -f1)"
|
||||
export TOKEN_HASH_STORED="$(cat "$TOKEN_HASH_FILE" 2>/dev/null || echo "")"
|
||||
export LABELS_FILE="$INSTANCE_DIR/.labels"
|
||||
export LABELS_WANTED="$(echo ${escapeShellArg (concatStringsSep "\n" instance.labels)} | sort)"
|
||||
export LABELS_CURRENT="$(cat $LABELS_FILE 2>/dev/null || echo 0)"
|
||||
|
||||
if [ ! -e "$INSTANCE_DIR/.runner" ] || [ "$LABELS_WANTED" != "$LABELS_CURRENT" ]; then
|
||||
# remove existing registration file, so that changing the labels forces a re-registration
|
||||
if [ ! -e "$INSTANCE_DIR/.runner" ] || [ "$LABELS_WANTED" != "$LABELS_CURRENT" ] || [ "$TOKEN_HASH_CURRENT" != "$TOKEN_HASH_STORED" ]; then
|
||||
# remove existing registration file, so that changing the token or labels forces a re-registration
|
||||
rm -v "$INSTANCE_DIR/.runner" || true
|
||||
|
||||
# perform the registration
|
||||
|
|
@ -256,7 +259,8 @@ in
|
|||
--labels ${escapeShellArg (concatStringsSep "," instance.labels)} \
|
||||
--config ${configFile}
|
||||
|
||||
# and write back the configured labels
|
||||
# and write back the configured labels and token hash
|
||||
printf '%s' "$TOKEN_HASH_CURRENT" > "$TOKEN_HASH_FILE"
|
||||
echo "$LABELS_WANTED" > "$LABELS_FILE"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ assertNoAdditions {
|
|||
};
|
||||
});
|
||||
|
||||
barbar-nvim = super.barbar-nvim.overrideAttrs {
|
||||
barbar-nvim = super.barbar-nvim.overrideAttrs (old: {
|
||||
# Optional integrations
|
||||
checkInputs = with self; [
|
||||
bufferline-nvim
|
||||
|
|
@ -322,7 +322,11 @@ assertNoAdditions {
|
|||
];
|
||||
# E5108: Error executing lua ...implugin-barbar.nvim-2025-04-28/lua/bufferline/utils.lua:10: module 'barbar.utils.hl' not found:
|
||||
nvimSkipModules = [ "bufferline.utils" ];
|
||||
};
|
||||
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.json;
|
||||
};
|
||||
});
|
||||
|
||||
barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [
|
||||
|
|
@ -5729,6 +5733,12 @@ assertNoAdditions {
|
|||
];
|
||||
};
|
||||
|
||||
zenburn = super.zenburn.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.gpl3Only;
|
||||
};
|
||||
});
|
||||
|
||||
zig-vim = super.zig-vim.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -2693,8 +2693,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "magit";
|
||||
publisher = "kahole";
|
||||
version = "0.6.68";
|
||||
hash = "sha256-yLeCyq3aZI/WbwJpGxqy5fEY5s8kZETKYzusss5iYAY=";
|
||||
version = "0.6.69";
|
||||
hash = "sha256-gx7OWV+X17XqShFj0mH4Zg6X26vpOnkrYW8/YdeGd7c=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/kahole.magit/changelog";
|
||||
|
|
|
|||
|
|
@ -16,18 +16,21 @@
|
|||
assert
|
||||
withDynarec
|
||||
-> (
|
||||
stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isLoongArch64
|
||||
stdenv.hostPlatform.isAarch64
|
||||
|| stdenv.hostPlatform.isRiscV64
|
||||
|| stdenv.hostPlatform.isLoongArch64
|
||||
|| (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)
|
||||
);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "box64";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ptitSeb";
|
||||
repo = "box64";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ihg7sos2pyyZjXiYMct/gg/ianiu0yagNtXio+A7J3c=";
|
||||
hash = "sha256-XESbBWXSj2vrwVaHsVIU+m/Ru/hOXcx9ywrA2WqXG/o=";
|
||||
};
|
||||
|
||||
# Setting cpu doesn't seem to work (or maybe isn't enough / gets overwritten by the wrapper's arch flag?), errors about unsupported instructions for target
|
||||
|
|
@ -60,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# Arch dynarec
|
||||
(lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch64))
|
||||
(lib.cmakeBool "RV64_DYNAREC" (withDynarec && stdenv.hostPlatform.isRiscV64))
|
||||
(lib.cmakeBool "PPC64LE_DYNAREC" (
|
||||
withDynarec && (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)
|
||||
))
|
||||
(lib.cmakeBool "LARCH64_DYNAREC" (withDynarec && stdenv.hostPlatform.isLoongArch64))
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz";
|
||||
sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz";
|
||||
sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"airgap-images-amd64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "1b6dbb5cebc30c3218a5910a6c0503d2cd9a92a8c494d323c12c181d8d90e525"
|
||||
},
|
||||
"airgap-images-amd64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "1d98b5f32c85ae41371851e6c14b81bdb8960177b28ccd1deda55c1a05586704"
|
||||
},
|
||||
"airgap-images-arm-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "d7ad1e1cb378e4638a92cee9358390b047adfc4c2d5f8fcb1247903c900255e2"
|
||||
},
|
||||
"airgap-images-arm-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "9880d9f56c5ec9b61714aa27caab365b237f51ec272e27cfc3bfead5ae60eeee"
|
||||
},
|
||||
"airgap-images-arm64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "2807168a82c3f9657540ac272afa186e6cf360cb068c35e5cad2e9447a8947a1"
|
||||
},
|
||||
"airgap-images-arm64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "65959cea20b4448096f6cd36e84b567dace2bf14f54c577de90c0b93ca559d2a"
|
||||
}
|
||||
}
|
||||
21
pkgs/applications/networking/cluster/k3s/1_36/versions.nix
Normal file
21
pkgs/applications/networking/cluster/k3s/1_36/versions.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
k3sVersion = "1.36.0+k3s1";
|
||||
k3sCommit = "09347304fd829ba8e9378bb16fe20bacba939e27";
|
||||
k3sRepoSha256 = "1qdwqbfngxxzfjcq263lfhrp8khv6mi2a9yw06v0jswh41r42m3c";
|
||||
k3sVendorHash = "sha256-Qli3CgKlUBhc8fwIJVB/89QH/jYXHn2K7y491BEj0Sk=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
|
||||
k3sRootVersion = "0.15.0";
|
||||
k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
|
||||
k3sCNIVersion = "1.9.1-k3s1";
|
||||
k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh";
|
||||
containerdVersion = "2.2.3-k3s1";
|
||||
containerdSha256 = "0fn252icn082822r754i2bqd8rivhvjwkfk031a8g0vvw8rz46vj";
|
||||
containerdPackage = "github.com/k3s-io/containerd/v2";
|
||||
criCtlVersion = "1.36.0-k3s1";
|
||||
flannelVersion = "v0.28.4";
|
||||
flannelPluginVersion = "v1.9.0-flannel1";
|
||||
kubeRouterVersion = "v2.6.3-k3s1";
|
||||
criDockerdVersion = "v0.3.19-k3s5";
|
||||
helmJobVersion = "v0.9.17-build20260422";
|
||||
}
|
||||
|
|
@ -21,4 +21,9 @@ in
|
|||
k3s_1_35 = (common (import ./1_35/versions.nix) extraArgs).overrideAttrs {
|
||||
patches = [ ./go_runc_require.patch ];
|
||||
};
|
||||
|
||||
k3s_1_36 = (common (import ./1_36/versions.nix) extraArgs).overrideAttrs {
|
||||
__structuredAttrs = true;
|
||||
patches = [ ./go_runc_require.patch ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,17 +9,18 @@
|
|||
pnpmConfigHook,
|
||||
geist-font,
|
||||
nix-update-script,
|
||||
which,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.25.4";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel-labs";
|
||||
repo = "agent-browser";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2Dv+ZY9cvcz6EIpI+gkV9w5eqQzpAD2N+yf4dJrmdwg=";
|
||||
hash = "sha256-c+AJAXMX88t+zzFsEAtFJDjDY5EbhmEyMRGFL4t63nE=";
|
||||
};
|
||||
|
||||
# The Rust CLI embeds the dashboard UI via RustEmbed at compile time.
|
||||
|
|
@ -46,8 +47,8 @@ let
|
|||
|
||||
pnpmWorkspaces = [ "dashboard" ];
|
||||
|
||||
# Replace Google Fonts fetch with a local font from nixpkgs since
|
||||
# the nix sandbox has no network access.
|
||||
# Replace Google Fonts fetch with a local font from nixpkgs since the
|
||||
# Nix sandbox has no network access.
|
||||
postPatch = ''
|
||||
substituteInPlace packages/dashboard/src/app/layout.tsx --replace-fail \
|
||||
'{ Geist } from "next/font/google"' \
|
||||
|
|
@ -80,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
sourceRoot = "${finalAttrs.src.name}/cli";
|
||||
|
||||
cargoHash = "sha256-3vzVVHFo13ZLsbbXw7n9BE/YXBJwoxzhvfjuqOQwdfg=";
|
||||
cargoHash = "sha256-2u7yokHCxIVq16370Mg+n5kf03yUDYJmctFxN1fnaAA=";
|
||||
|
||||
# Place the pre-built dashboard where RustEmbed expects it
|
||||
postUnpack = ''
|
||||
|
|
@ -88,14 +89,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
cp -r ${dashboard} source/packages/dashboard/out
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
# `which_exists` spawns the external `which` binary at runtime to probe
|
||||
# for optional tools; pin it to an absolute store path.
|
||||
postPatch = ''
|
||||
substituteInPlace src/doctor/helpers.rs src/install.rs --replace-fail \
|
||||
'"which"' '"${lib.getExe which}"'
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# skills/ contains SKILL.md for tools like Claude Code
|
||||
# The `skills` subcommand looks for `skills/` and `skill-data/` next to
|
||||
# `bin/`, relative to the canonical exe path. See cli/src/skills.rs.
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/agent-browser
|
||||
cp -r ../skills $out/share/agent-browser/
|
||||
cp -r ../skills $out/skills
|
||||
cp -r ../skill-data $out/skill-data
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "asccli";
|
||||
version = "1.2.7";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rorkai";
|
||||
repo = "App-Store-Connect-CLI";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-VGXGm7SA26O2BnidbnSJy9r7sdhHi1ekxaiKoqiW9iw=";
|
||||
hash = "sha256-VMLLziuLV7F95mTdEmaUxwMC9vKSTejJZgw3KFHr7sg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-712Q7KiFQyTDjX4Srhukv3eQ84MRjnQxrpgBfqK2xa4=";
|
||||
vendorHash = "sha256-XBEDMUGwSh8P+dVKMebN3zD83e1odAN+Wy15yys0+2M=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: {
|
|||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/claude-agent-acp \
|
||||
--prefix CLAUDE_CODE_EXECUTABLE ${lib.getExe claude-code}
|
||||
--set-default CLAUDE_CODE_EXECUTABLE ${lib.getExe claude-code}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-gA+dpodk6u8dv9VaKNi/xzI8ys39iztQdia+eGkzXs4=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-uR0wm2+zmcec3esfYwgq4pRqSHkZnd3O8XhgnANf/1Q=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-xXq8Dckg3YOf2AT9uOZqVfq00FhZp/X5UU8hLmAln1U=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ rustPlatform.buildRustPackage {
|
|||
|
||||
cargoHash = "sha256-czfDtiSEmzmcLfpqv0/8sP8zDAEKh+pkQkGXdd5NskM=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-iWZRxn0puWwAibjbj/jdk4t6qgETEUJUv612RZSavMw=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-Zl7c/3q5J+9y1vRJdR77NJ6y62bV1bxaVMuiyxDbLX4=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
libcosmicAppHook
|
||||
just
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-tMSqyl75XK2rgqRtgHAPtr+KFotx61HGqzv0iqzakS8=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-jhugV3eF7g6WU5ez3LzqKc/wP952Zpi8Hplg9SZflns=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
env.VERGEN_GIT_SHA = finalAttrs.src.tag;
|
||||
|
||||
cargoBuildFlags = [ "--all" ];
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-wAjFC6qAC3nllbnZf0KVaZTEztNYo6GTvwcp5FYmXLw=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-DESnl5NjakU4++Ep6CHxDZzHn+o0Gi0eREpXk5BN5iY=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
buildFeatures = [ "nixos" ];
|
||||
|
||||
# cargo-auditable fails during the build when compiling the `crabtime::function`
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-wZgxlq9MVCeESH093MaQybVMyq50L7aYwj//2r/B0QM=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-EIwYabYWSHTMnNFcammidn3bI4fc6JFdcVkGj7RmWqA=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
which
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-1YRWWI2qhCI0GrxBAAkGT/AbtkTHgdbYsG8obriZ+zg=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-vU++jreNHCRjxyyoj53LB2Sa7cdVUWGAvECcqoDofF8=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-YPxbOSz/E3hoMT4dutk60jWJMpJHqOWpCSA91b+mHaE=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cosmic-protocols";
|
||||
version = "0-unstable-2026-01-08";
|
||||
version = "0-unstable-2026-05-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-protocols";
|
||||
rev = "160b086abe03cd34a8a375d7fbe47b24308d1f38";
|
||||
hash = "sha256-ymn+BUTTzyHquPn4hvuoA3y1owFj8LVrmsPu2cdkFQ8=";
|
||||
rev = "c253ec1d6804afbcdf250f5cc37ae1194bba7bd2";
|
||||
hash = "sha256-KO7VTxomhrnwzFlkkXSoP0eh3NRShBD4srW5W6temxo=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-QWSPj7bxxWh5/KeNEtUsfDKg+JMONLjomrMcn57j6fw=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-q0RJST1yeqPBjU5MseNZIrZw+brfDtQLKiw7wyViflE=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-5dLG40X+yxJo566guyHqOCLNp+uNSE+HONS8GIDm58A=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace data/start-cosmic \
|
||||
--replace-fail '/usr/bin/cosmic-session' "${placeholder "out"}/bin/cosmic-session" \
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-pvoCqFvMVqNTfdU5WidGijfFNsC9i2XNuNV33F8aKZw=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-O6d47H+vcSn9G6EIMpSshfL+cBJWZMYXHHKsu2n/huk=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
just
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-DCqEXoJ1qTwKemSCGe7AwQCdOFw7Qh3PoxbB9XdLfHk=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-9iHcmImA2tscpRuRKE/nUrwhR5RU5xA2zxJpcDt+2sE=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "drupal";
|
||||
version = "11.3.8";
|
||||
version = "11.3.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.drupalcode.org";
|
||||
owner = "project";
|
||||
repo = "drupal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-z2uhUqY5z1lrq18jfqh0Tsxtc1X+sJ5BKr/Fot89HyA=";
|
||||
hash = "sha256-r+Xd+vD4HAUOmVqZOzZo4cVsItv5WwW1OFOC2SICroo=";
|
||||
};
|
||||
|
||||
composerNoPlugins = false;
|
||||
vendorHash = "sha256-rTAHOt+LiG2bYZqOfG0wtW69bJisrrAA3yIhBOSIQPk=";
|
||||
vendorHash = "sha256-FFHgINgXFT5eV2gx87Peoh3mfsvlQzG4tZRus97Faes=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
|
|
|||
33
pkgs/by-name/em/emmylua-formatter/package.nix
Normal file
33
pkgs/by-name/em/emmylua-formatter/package.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
lib,
|
||||
emmylua-ls,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "emmylua_formatter";
|
||||
inherit (emmylua-ls) version src cargoHash;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
buildAndTestSubdir = "crates/emmylua_formatter";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/luafmt";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Lua and EmmyLua formatter used by the EmmyLua Analyzer Rust workspace.";
|
||||
homepage = "https://github.com/EmmyLuaLs/emmylua-analyzer-rust";
|
||||
changelog = "https://github.com/EmmyLuaLs/emmylua-analyzer-rust/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
mrcjkb
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "luafmt";
|
||||
};
|
||||
})
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "git-extras";
|
||||
version = "7.4.0";
|
||||
version = "7.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tj";
|
||||
repo = "git-extras";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-xxBmOAJgoVR+K3gEM5KFKyWenwFnar+zF26HnTG5vuw=";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-BmRLwdaP6Ic8cCtqPFaExEeqeE51l8JzzDmIfxz8Nvs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/tj/git-extras/releases/tag/${finalAttrs.src.tag}";
|
||||
homepage = "https://github.com/tj/git-extras";
|
||||
description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more";
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
138
pkgs/by-name/in/intelephense/package-lock.json
generated
138
pkgs/by-name/in/intelephense/package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "intelephense",
|
||||
"version": "1.18.1",
|
||||
"version": "1.18.2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "intelephense",
|
||||
"version": "1.18.1",
|
||||
"version": "1.18.2",
|
||||
"license": "SEE LICENSE IN LICENSE.txt",
|
||||
"dependencies": {
|
||||
"@bmewburn/js-beautify": "1.15.4",
|
||||
|
|
@ -139,21 +139,21 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@azure/opentelemetry-instrumentation-azure-sdk": {
|
||||
"version": "1.0.0-beta.9",
|
||||
"resolved": "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.9.tgz",
|
||||
"integrity": "sha512-gNCFokEoQQEkhu2T8i1i+1iW2o9wODn2slu5tpqJmjV1W7qf9dxVv6GNXW1P1WC8wMga8BCc2t/oMhOK3iwRQg==",
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0.tgz",
|
||||
"integrity": "sha512-Y8rZOIMXQY/GwNRL+uLVuwIn9aEa/KnnggyYUmFxC1MigmRJCNH5NxMmxKSpddXF9SW6Z1ijRd6Pptd2A5OhGw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@azure/core-tracing": "^1.2.0",
|
||||
"@azure/logger": "^1.0.0",
|
||||
"@opentelemetry/api": "^1.9.0",
|
||||
"@opentelemetry/core": "^2.0.0",
|
||||
"@opentelemetry/instrumentation": "^0.200.0",
|
||||
"@opentelemetry/instrumentation": "^0.211.0",
|
||||
"@opentelemetry/sdk-trace-web": "^2.0.0",
|
||||
"tslib": "^2.7.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18.0.0"
|
||||
"node": ">=20.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@azure/opentelemetry-instrumentation-azure-sdk/node_modules/@opentelemetry/core": {
|
||||
|
|
@ -275,9 +275,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@discoveryjs/json-ext": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-1.0.0.tgz",
|
||||
"integrity": "sha512-dDlz3W405VMFO4w5kIP9DOmELBcvFQGmLoKSdIRstBDubKFYwaNHV1NnlzMCQpXQFGWVALmeMORAuiLx18AvZQ==",
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-1.1.0.tgz",
|
||||
"integrity": "sha512-Xc3VhU02wqZ1HvHRJUwL09HkZSTvidqY5Ya0NXBSYOxAp+Ln9dcJr9fySI+CkONzP3PekQo9WdzCv0PGER/mOA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
|
|
@ -422,9 +422,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@opentelemetry/api-logs": {
|
||||
"version": "0.200.0",
|
||||
"resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.200.0.tgz",
|
||||
"integrity": "sha512-IKJBQxh91qJ+3ssRly5hYEJ8NDHu9oY/B1PXVSCWf7zytmYO9RNLB0Ox9XQ/fJ8m6gY6Q6NtBWlmXfaXt5Uc4Q==",
|
||||
"version": "0.211.0",
|
||||
"resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.211.0.tgz",
|
||||
"integrity": "sha512-swFdZq8MCdmdR22jTVGQDhwqDzcI4M10nhjXkLr1EsIzXgZBqm4ZlmmcWsg3TSNf+3mzgOiqveXmBLZuDi2Lgg==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@opentelemetry/api": "^1.3.0"
|
||||
|
|
@ -458,16 +458,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@opentelemetry/instrumentation": {
|
||||
"version": "0.200.0",
|
||||
"resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.200.0.tgz",
|
||||
"integrity": "sha512-pmPlzfJd+vvgaZd/reMsC8RWgTXn2WY1OWT5RT42m3aOn5532TozwXNDhg1vzqJ+jnvmkREcdLr27ebJEQt0Jg==",
|
||||
"version": "0.211.0",
|
||||
"resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.211.0.tgz",
|
||||
"integrity": "sha512-h0nrZEC/zvI994nhg7EgQ8URIHt0uDTwN90r3qQUdZORS455bbx+YebnGeEuFghUT0HlJSrLF4iHw67f+odY+Q==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@opentelemetry/api-logs": "0.200.0",
|
||||
"@types/shimmer": "^1.2.0",
|
||||
"import-in-the-middle": "^1.8.1",
|
||||
"require-in-the-middle": "^7.1.1",
|
||||
"shimmer": "^1.2.1"
|
||||
"@opentelemetry/api-logs": "0.211.0",
|
||||
"import-in-the-middle": "^2.0.0",
|
||||
"require-in-the-middle": "^8.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.19.0 || >=20.6.0"
|
||||
|
|
@ -770,9 +768,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@types/estree": {
|
||||
"version": "1.0.8",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
|
||||
"integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
|
||||
"version": "1.0.9",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
|
||||
"integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
|
|
@ -876,12 +874,6 @@
|
|||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/shimmer": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz",
|
||||
"integrity": "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@typespec/ts-http-runtime": {
|
||||
"version": "0.3.5",
|
||||
"resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.5.tgz",
|
||||
|
|
@ -1340,9 +1332,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/baseline-browser-mapping": {
|
||||
"version": "2.10.24",
|
||||
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.24.tgz",
|
||||
"integrity": "sha512-I2NkZOOrj2XuguvWCK6OVh9GavsNjZjK908Rq3mIBK25+GD8vPX5w2WdxVqnQ7xx3SrZJiCiZFu+/Oz50oSYSA==",
|
||||
"version": "2.10.29",
|
||||
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.29.tgz",
|
||||
"integrity": "sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
|
|
@ -1452,9 +1444,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/caniuse-lite": {
|
||||
"version": "1.0.30001791",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz",
|
||||
"integrity": "sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==",
|
||||
"version": "1.0.30001792",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001792.tgz",
|
||||
"integrity": "sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -1552,9 +1544,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/cjs-module-lexer": {
|
||||
"version": "1.4.3",
|
||||
"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
|
||||
"integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz",
|
||||
"integrity": "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cliui": {
|
||||
|
|
@ -1937,9 +1929,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/electron-to-chromium": {
|
||||
"version": "1.5.348",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.348.tgz",
|
||||
"integrity": "sha512-QC2X59nRlycQQMc4ZXjSVBX+tSgJfgRtcrYHbIZLgOV2dCvefoQGegLR7lLXKgpPpSuVmJU19LMzGrSa2C7k3Q==",
|
||||
"version": "1.5.353",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.353.tgz",
|
||||
"integrity": "sha512-kOrWphBi8TOZyiJZqsgqIle0lw+tzmnQK83pV9dZUd01Nm2POECSyFQMAuarzZdYqQW7FH9RaYOuaRo3h+bQ3w==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
|
|
@ -1960,9 +1952,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/enhanced-resolve": {
|
||||
"version": "5.21.0",
|
||||
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz",
|
||||
"integrity": "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==",
|
||||
"version": "5.21.2",
|
||||
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.2.tgz",
|
||||
"integrity": "sha512-xe9vQb5kReirPUxgQrXA3ihgbCqssmTiM7cOZ+Gzu+VeGWgpV98lLZvp0dl4yriyAePcewxGUs9UpKD8PET9KQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -2002,6 +1994,7 @@
|
|||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
|
||||
"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
|
|
@ -2222,9 +2215,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fast-uri": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
|
||||
"integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
|
||||
"integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2338,6 +2331,7 @@
|
|||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
|
||||
"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
|
|
@ -2429,6 +2423,7 @@
|
|||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz",
|
||||
"integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"function-bind": "^1.1.2"
|
||||
|
|
@ -2509,15 +2504,15 @@
|
|||
}
|
||||
},
|
||||
"node_modules/import-in-the-middle": {
|
||||
"version": "1.15.0",
|
||||
"resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.15.0.tgz",
|
||||
"integrity": "sha512-bpQy+CrsRmYmoPMAE/0G33iwRqwW4ouqdRg8jgbH3aKuCtOc8lxgmYXg2dMM92CRiGP660EtBcymH/eVUpCSaA==",
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-2.0.6.tgz",
|
||||
"integrity": "sha512-3vZV3jX0XRFW3EJDTwzWoZa+RH1b8eTTx6YOCjglrLyPuepwoBti1k3L2dKwdCUrnVEfc5CuRuGstaC/uQJJaw==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"acorn": "^8.14.0",
|
||||
"acorn": "^8.15.0",
|
||||
"acorn-import-attributes": "^1.9.5",
|
||||
"cjs-module-lexer": "^1.2.2",
|
||||
"module-details-from-path": "^1.0.3"
|
||||
"cjs-module-lexer": "^2.2.0",
|
||||
"module-details-from-path": "^1.0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/import-local": {
|
||||
|
|
@ -2579,12 +2574,13 @@
|
|||
}
|
||||
},
|
||||
"node_modules/is-core-module": {
|
||||
"version": "2.16.1",
|
||||
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
|
||||
"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
|
||||
"version": "2.16.2",
|
||||
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz",
|
||||
"integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"hasown": "^2.0.2"
|
||||
"hasown": "^2.0.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
|
|
@ -3313,6 +3309,7 @@
|
|||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
|
||||
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/path-scurry": {
|
||||
|
|
@ -3654,17 +3651,16 @@
|
|||
}
|
||||
},
|
||||
"node_modules/require-in-the-middle": {
|
||||
"version": "7.5.2",
|
||||
"resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.5.2.tgz",
|
||||
"integrity": "sha512-gAZ+kLqBdHarXB64XpAe2VCjB7rIRv+mU8tfRWziHRJ5umKsIHN2tLLv6EtMw7WCdP19S0ERVMldNvxYCHnhSQ==",
|
||||
"version": "8.0.1",
|
||||
"resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-8.0.1.tgz",
|
||||
"integrity": "sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"debug": "^4.3.5",
|
||||
"module-details-from-path": "^1.0.3",
|
||||
"resolve": "^1.22.8"
|
||||
"module-details-from-path": "^1.0.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.6.0"
|
||||
"node": ">=9.3.0 || >=8.10.0 <9.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/requizzle": {
|
||||
|
|
@ -3681,6 +3677,7 @@
|
|||
"version": "1.22.12",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
|
||||
"integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"es-errors": "^1.3.0",
|
||||
|
|
@ -3895,9 +3892,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/socks": {
|
||||
"version": "2.8.8",
|
||||
"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.8.tgz",
|
||||
"integrity": "sha512-NlGELfPrgX2f1TAAcz0WawlLn+0r3FyhhCRpFFK2CemXenPYvzMWWZINv3eDNo9ucdwme7oCHRY0Jnbs4aIkog==",
|
||||
"version": "2.8.9",
|
||||
"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz",
|
||||
"integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ip-address": "^10.1.1",
|
||||
|
|
@ -4086,6 +4083,7 @@
|
|||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
|
||||
"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
|
|
@ -4109,9 +4107,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/terser": {
|
||||
"version": "5.46.2",
|
||||
"resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",
|
||||
"integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==",
|
||||
"version": "5.47.1",
|
||||
"resolved": "https://registry.npmjs.org/terser/-/terser-5.47.1.tgz",
|
||||
"integrity": "sha512-tPbLXTI6ohPASb/1YViL428oEHu6/qv1OxqYnfaonVCFHqx4+wCd95pHrQWsL5X4pl90CTyW9piSAsS2L0VoMw==",
|
||||
"dev": true,
|
||||
"license": "BSD-2-Clause",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
fetchurl,
|
||||
}:
|
||||
let
|
||||
version = "1.18.1";
|
||||
version = "1.18.2";
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "intelephense";
|
||||
|
|
@ -12,14 +12,14 @@ buildNpmPackage {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/intelephense/-/intelephense-${version}.tgz";
|
||||
hash = "sha256-GkjSPm54lAzaPb/Z31Gng+EZCuxXF8ys1YtKmRkSSpc=";
|
||||
hash = "sha256-9he4PwHY/ohSKVTlD11MOlcrB3ldAp6EWiIYJRMj2b0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-U3q2Suf9FxroXnDg8NcW186hGbcpE4UQGgHqD5n6/MM=";
|
||||
npmDepsHash = "sha256-gamhLTob6xyxwWRf61HwoemP1emuboVcdbltugISclE=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
}:
|
||||
let
|
||||
version = "1.50.0";
|
||||
version = "1.51.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
|
|
@ -30,14 +30,16 @@ rustPlatform.buildRustPackage {
|
|||
]
|
||||
++ lib.optionals withDocumentation [ "doc" ];
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = "just";
|
||||
tag = version;
|
||||
hash = "sha256-2hq7lgjL4XbcaaWxuDfqU0UcC4DRYKL6WFjdnb5AmjY=";
|
||||
hash = "sha256-urD9R/qn7rwtzaVP65angk7z4bwxlP3w5G5Aa5tVmuw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tKeVE5BpDvElnpN/CO6lOqDUwhWD1dGm7k51Z3wAviE=";
|
||||
cargoHash = "sha256-war9yybsyfsm/wNlY+/fiN8pxxQwNLMogqe5u+jHNaw=";
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
pkg-config,
|
||||
openssl,
|
||||
versionCheckHook,
|
||||
|
|
@ -26,10 +28,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
OPENSSL_NO_VENDOR = 1;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd mago \
|
||||
--bash <("$out/bin/mago" generate-completions bash) \
|
||||
--zsh <("$out/bin/mago" generate-completions zsh) \
|
||||
--fish <("$out/bin/mago" generate-completions fish)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mongodb-ce";
|
||||
version = "8.2.6";
|
||||
version = "8.2.7";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
|
||||
|
|
@ -53,19 +53,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-VjFKDwqBI42XQwL7/+eGLv6WlMSY6tYqC8qSy1laDfA=";
|
||||
hash = "sha256-GYyWeVSoRXgrlQqx7R2chxH3+5S4ewbTefWJR9S2Frs=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-jqpQ0gjoLfnv+kYqbFyyAKZbA3+hGK8BU/cBzhzqtCI=";
|
||||
hash = "sha256-HTErVesWEWDjheedELdDOwlMrDvhV3JdVGtV3RuSeBI=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-Oba6gK0hrRyo29mJ1/6Bpgql9BR160LUJH/kB0AGLz0=";
|
||||
hash = "sha256-DeD/v+NP2b8BTReV80+Lz0O9t6e3O9+52sJmTK5NtVY=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-74MB0FzbRoZ3Wu4d3OORtfHNZ83GEXnC0h2rJGosTxs=";
|
||||
hash = "sha256-d8uulXczpq7ZEDmDsbb3o9kaZJ1IYzZ6MkgBLkNU4Mo=";
|
||||
};
|
||||
};
|
||||
updateScript =
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ntpd-rs";
|
||||
version = "1.7.2";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pendulum-project";
|
||||
repo = "ntpd-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xH9Z/aOfqY51GxbJeTidsEIbbKNaqNa/okIInvPKxp0=";
|
||||
hash = "sha256-JeOgXIvn5kVy+KjCpjkR+7di1SYD3hi0dEoVpm5vxDg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9NeNBoq8OzSUilZVvYC1jL9Mf3pLKAsFBMWiSO/ky7I=";
|
||||
cargoHash = "sha256-rQdLNYa9nyiA7xgi57aDjeSQpa4D7BDW32SVEduSm2U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pandoc
|
||||
|
|
@ -39,18 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
"--skip=daemon::ntp_source::tests::test_deny_stops_poll"
|
||||
"--skip=daemon::ntp_source::tests::test_timeroundtrip"
|
||||
"--skip=daemon::server::tests::test_server_serves"
|
||||
"--skip=nts::tests::test_key_exchange_roundtrip_no_cookies"
|
||||
"--skip=nts::tests::test_keyexchange_fixed_key_no_permission"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_fixed_key"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_fixed_key_keep_alive"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_fixed_key_no_permit"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_no_proto_overlap"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_no_upgrade_possible"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_supports"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_upgrading"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_v4"
|
||||
"--skip=nts::tests::test_keyexchange_roundtrip_v5"
|
||||
"--skip=nts::tests::test_keyexchange_supports_no_permission"
|
||||
"--skip=daemon::spawn::nts::tests::allow_srv_direct_name_resolution"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "nwg-displays";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-displays";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e1vAVJ6wsPWbKWnVQcp1f1Z+TP3whoMHopN0N0aS9fE=";
|
||||
hash = "sha256-07rsLClG4OIErzC+6qnFHn9cwa2XBYl5diN0KUglh/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "objfw";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.nil.im";
|
||||
owner = "ObjFW";
|
||||
repo = "ObjFW";
|
||||
rev = "${finalAttrs.version}-release";
|
||||
hash = "sha256-5ECvNsDU3MagbS2tVq2sJCRMQHBkCuMQHqpWlB6tbR8=";
|
||||
hash = "sha256-r2rwLUWxm4t8/YTF7vPp5pOfb7txNmQuoiyaF74tyFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
|||
version = "9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.openbsd.org/pub/OpenBSD/OpenBGPD/openbgpd-${finalAttrs.version}.tar.gz";
|
||||
url = "mirror://openbsd/OpenBGPD/openbgpd-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-GUUYWBGdRplN/4zyfQYzMpzULyi6Oou1pfz0Zexem8M=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.11.6";
|
||||
version = "1.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-H+noiYY/Nv7DfUTWbvsCnKbjOc2494FVn7Fqos/3ThU=";
|
||||
hash = "sha256-FMj4UnQPc/PhnNcFNPhKtfKJu6jER5eLoBOVXHTLkXQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WO5OtKwluks5nuSHJ4NO1+EKhtCrJE9MuMGmu5fYKM4=";
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "photoqt";
|
||||
version = "5.2";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://photoqt.org/downloads/source/photoqt-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ufgDXKN7LY8Uy0uwL+QKvjH3O/F1EIAx2MPYYS1/els=";
|
||||
hash = "sha256-NuZET8uS7sxRXvpJGKiOulUvb/y5/O6LYXyr0RBln+4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -76,5 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "photoqt";
|
||||
maintainers = with lib.maintainers; [ wegank ];
|
||||
platforms = lib.platforms.unix;
|
||||
# cplusplus/singletons/scripts/pqc_scriptsimages.cpp:1740:19: error: no matching function for call to 'setxattr'
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ radicle-node }:
|
||||
|
||||
radicle-node.override {
|
||||
version = "1.9.0-rc.1";
|
||||
srcHash = "sha256-CM1BdpdnAyAelrPAJjvsD7qOfHkV3EEmF4pTNOFvQik=";
|
||||
cargoHash = "sha256-N28PQpuTcDAszWF0TPY/H5uzWfQZSuxn0XVYLeKNmn0=";
|
||||
version = "1.9.0-rc.3";
|
||||
srcHash = "sha256-NUxrNv0NbqZqE0zx8L+PS32jFeb/upoGtZorEcL4O1c=";
|
||||
cargoHash = "sha256-WUOfZ41ImJQhX5Jqj6z8v28oapG/sP4zBe8inkfDlbA=";
|
||||
updateScript = ./update-unstable.sh;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "release-plz";
|
||||
version = "0.3.157";
|
||||
version = "0.3.158";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MarcoIeni";
|
||||
repo = "release-plz";
|
||||
rev = "release-plz-v${finalAttrs.version}";
|
||||
hash = "sha256-ATPf1ObepPT2Ndd72hXpqEHMGpaZz12Ee8wwCPCQrlQ=";
|
||||
hash = "sha256-AFqSj5utn5PGo7mC1LdZSdw71kDEGg1F+ELNolkBgV0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-q1iSB+Qi8UAXajlVD6AvMrFJFliywQQauTZ+TInbvd4=";
|
||||
cargoHash = "sha256-0rd5ouIsdZQexyprsOA0MRy3nRMhRHk23aEyF8QaZ2o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
1010
pkgs/by-name/sc/schildi-revenge/deps.json
generated
1010
pkgs/by-name/sc/schildi-revenge/deps.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -14,20 +14,20 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "schildi-revenge";
|
||||
version = "26.04.04";
|
||||
version = "26.05.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SchildiChat";
|
||||
repo = "schildi-revenge";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B3UOCcEWPt+kejK6mJZkYnVoSfzx1m28DM+Oco6iFJ8=";
|
||||
hash = "sha256-B12OcryErrrFyKFweCFQWnbt/L8HvceAhBI51TlT3pg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoRoot = "matrix-rust-sdk";
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src cargoRoot;
|
||||
hash = "sha256-1BUBOBOsQ+I3bKUMnzwtqCd/uh/gEWW9THhjaDXWWeg=";
|
||||
hash = "sha256-8HI7UtuO2eg3/Zb2PhX0jvTDaIOpCCY0EHkrsdzSEkc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "coop-deluxe";
|
||||
repo = "sm64coopdx";
|
||||
# Replace with `tag = "v${finalAttrs.version}";` in the next version. The upstream repository tagged the wrong commit.
|
||||
rev = "6092488d1c4fc741b16a0789ef9c08ec0279333f";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BIdKKIp6q9Vp2DByXzT9CJzOszFhjriiWBEqFwUT28M=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zbus_xmlgen";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-lFgYGzc0+VIwiXZrKKc+cVwj2U8Y1mg4BMIuG0S/8+g=";
|
||||
hash = "sha256-STwci4PaleJc7TBK1dth2uHuXEVb1wDOSWOV+8RznmU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-//0cJF47E58tkubXRrJcUcqHkhzp3zdshxj9VQ5Zrgw=";
|
||||
cargoHash = "sha256-w5l6cUIA8vZmChLzjDF7UVf/ExeLnzo+Yd24LzAd+ss=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
nativeCheckInputs = [ rustfmt ];
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@ let
|
|||
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
|
||||
"22.1.5".officialRelease.sha256 = "sha256-eunfMOH+HVpefZJ+CG7hXDoM+pi6iYvHpD3DoSAsjoE=";
|
||||
"23.0.0-git".gitRelease = {
|
||||
rev = "cd6119c00b461c36139f1f4a0ca1653a6ab2a32b";
|
||||
rev-version = "23.0.0-unstable-2026-05-03";
|
||||
sha256 = "sha256-sK6G7GFetfHpu2QcYWfEo/PEwQ0pKxKp63E87X8zjiw=";
|
||||
rev = "084a5acf5a076aa32c04cbcdca25c27fc75d8e6d";
|
||||
rev-version = "23.0.0-unstable-2026-05-10";
|
||||
sha256 = "sha256-xSyanVzsHokSrxhixUW3ovREeojTX7pedlBoaFpbtXQ=";
|
||||
};
|
||||
}
|
||||
// llvmVersions;
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvista";
|
||||
version = "0.48.0";
|
||||
version = "0.48.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyvista";
|
||||
repo = "pyvista";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mdqngUVcZFB15FdzkVv38X4gz46hyORuJda2k0Dw30w=";
|
||||
hash = "sha256-tXTDZ1htOGTrdiqbCyMiCQz44lHN5ruqW6bWkc3G2CI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sdkmanager";
|
||||
version = "0.6.11";
|
||||
version = "0.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "fdroid";
|
||||
repo = "sdkmanager";
|
||||
tag = version;
|
||||
hash = "sha256-UBBko5copc5y9kdUr8jqJgijxRLfpRuJmT1QSow/eVg=";
|
||||
hash = "sha256-/MrRCR6TJ64DiL4D1290jik1L+jITi4dH9Tj3cjF+ms=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "urllib3" ];
|
||||
|
|
|
|||
|
|
@ -16,12 +16,10 @@ let
|
|||
filter
|
||||
findFirst
|
||||
getName
|
||||
isDerivation
|
||||
length
|
||||
concatMap
|
||||
mutuallyExclusive
|
||||
optional
|
||||
optionalString
|
||||
isAttrs
|
||||
isString
|
||||
warn
|
||||
|
|
@ -308,15 +306,17 @@ let
|
|||
union
|
||||
int
|
||||
attrs
|
||||
attrsOf
|
||||
any
|
||||
listOf
|
||||
bool
|
||||
record
|
||||
intersection
|
||||
not
|
||||
derivation
|
||||
;
|
||||
platforms = listOf (union [
|
||||
str
|
||||
(attrsOf any)
|
||||
attrs
|
||||
]); # see lib.meta.platformMatch
|
||||
in
|
||||
record {
|
||||
|
|
@ -338,7 +338,10 @@ let
|
|||
let
|
||||
# TODO disallow `str` licenses, use a module
|
||||
licenseType = union [
|
||||
(attrsOf any)
|
||||
(intersection [
|
||||
attrs
|
||||
(not derivation)
|
||||
])
|
||||
str
|
||||
];
|
||||
in
|
||||
|
|
@ -347,9 +350,9 @@ let
|
|||
licenseType
|
||||
];
|
||||
sourceProvenance = listOf attrs;
|
||||
maintainers = listOf (attrsOf any); # TODO use the maintainer type from lib/tests/maintainer-module.nix
|
||||
nonTeamMaintainers = listOf (attrsOf any); # TODO use the maintainer type from lib/tests/maintainer-module.nix
|
||||
teams = listOf (attrsOf any); # TODO similar to maintainers, use a teams type
|
||||
maintainers = listOf attrs; # TODO use the maintainer type from lib/tests/maintainer-module.nix
|
||||
nonTeamMaintainers = listOf attrs; # TODO use the maintainer type from lib/tests/maintainer-module.nix
|
||||
teams = listOf attrs; # TODO similar to maintainers, use a teams type
|
||||
priority = int;
|
||||
pkgConfigModules = listOf str;
|
||||
inherit platforms;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ let
|
|||
isInt
|
||||
isAttrs
|
||||
isList
|
||||
isDerivation
|
||||
all
|
||||
any
|
||||
attrNames
|
||||
|
|
@ -103,6 +104,11 @@ lib.fix (self: {
|
|||
) (attrNames attrs);
|
||||
};
|
||||
|
||||
derivation = {
|
||||
name = "derivation";
|
||||
verify = isDerivation;
|
||||
};
|
||||
|
||||
listOf =
|
||||
t:
|
||||
assert isTypeDef t;
|
||||
|
|
@ -141,6 +147,29 @@ lib.fix (self: {
|
|||
verify = v: any (func: func v) funcs;
|
||||
};
|
||||
|
||||
intersection =
|
||||
types:
|
||||
assert all isTypeDef types;
|
||||
let
|
||||
# Store a list of functions so we don't have to pay the cost of attrset lookups at runtime.
|
||||
funcs = map (t: t.verify) types;
|
||||
in
|
||||
{
|
||||
name = "intersection<${concatStringsSep "," (map (t: t.name) types)}>";
|
||||
verify = v: all (func: func v) funcs;
|
||||
};
|
||||
|
||||
not =
|
||||
t:
|
||||
assert isTypeDef t;
|
||||
let
|
||||
inherit (t) verify;
|
||||
in
|
||||
{
|
||||
name = "not<${t.name}>";
|
||||
verify = v: !(verify v);
|
||||
};
|
||||
|
||||
enum =
|
||||
values:
|
||||
assert isList values && all isString values;
|
||||
|
|
|
|||
|
|
@ -9633,6 +9633,7 @@ with pkgs;
|
|||
k3s_1_33
|
||||
k3s_1_34
|
||||
k3s_1_35
|
||||
k3s_1_36
|
||||
;
|
||||
k3s = k3s_1_35;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue