Merge master into staging-next
This commit is contained in:
commit
fdb8a452db
@ -6,18 +6,18 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "chamber";
|
pname = "chamber";
|
||||||
version = "3.1.2";
|
version = "3.1.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "segmentio";
|
owner = "segmentio";
|
||||||
repo = "chamber";
|
repo = "chamber";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-9+I/zH4sHlLQkEn+fCboI3vCjYjlk+hdYnWuxq47r5I=";
|
sha256 = "sha256-Hh+u5Rf7YN1Gk2whBMXmtXdXCSeh2CqaQBSzw8KNb5E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
env.CGO_ENABLED = 0;
|
env.CGO_ENABLED = 0;
|
||||||
|
|
||||||
vendorHash = "sha256-IjCBf1h6r+EDLfgGqP/VfsHaD5oPkIR33nYBAcb6SLY=";
|
vendorHash = "sha256-xhfBpLAhAVT42vA2oRm+EQHXA1dWy3UD5m8Ds8/IyAk=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|||||||
@ -9,14 +9,14 @@
|
|||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "guile-json-rpc";
|
pname = "guile-json-rpc";
|
||||||
version = "0.4.5a";
|
version = "0.5.0";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
domain = "codeberg.org";
|
domain = "codeberg.org";
|
||||||
owner = "rgherdt";
|
owner = "rgherdt";
|
||||||
repo = "scheme-json-rpc";
|
repo = "scheme-json-rpc";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-sTJxPxHKovMOxfu5jM/6EpB9RFpG+9E3388xeE2Fpgw=";
|
hash = "sha256-xCykgq0L6PDqjXfNwsqV9u1nFiK9t+qCUgIgzZoIsxc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|||||||
@ -10,14 +10,14 @@
|
|||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "guile-lsp-server";
|
pname = "guile-lsp-server";
|
||||||
version = "0.4.7";
|
version = "0.4.8";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
domain = "codeberg.org";
|
domain = "codeberg.org";
|
||||||
owner = "rgherdt";
|
owner = "rgherdt";
|
||||||
repo = "scheme-lsp-server";
|
repo = "scheme-lsp-server";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-XNzon1l6CnCd4RasNrHHxWEBNhyaHXgdNLsvjvRLbfk=";
|
hash = "sha256-x0BqN2JM1eVmaHp+F4N8OsotqL8hlWNIE2rmCq9Qn+w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|||||||
@ -26,17 +26,17 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
|
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
|
||||||
pname = "neovide";
|
pname = "neovide";
|
||||||
version = "0.15.0";
|
version = "0.15.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neovide";
|
owner = "neovide";
|
||||||
repo = "neovide";
|
repo = "neovide";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-MLiLddF53OXDPYuJbTAscezxN09mxZkuSOZtQz07JSE=";
|
hash = "sha256-2iV3g6tcCkMF7sFG/GZDz3czPZNIDi6YLfrVzYO9jYI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-1ni8AZIwAz5R2Ejt9Fj5qmybvL4KZV/M3BMqQx4HFLU=";
|
cargoHash = "sha256-YlHAcUCRk6ROg5yXIumHfsiR/2TrsSzbuXz/IQK7sEo=";
|
||||||
|
|
||||||
SKIA_SOURCE_DIR =
|
SKIA_SOURCE_DIR =
|
||||||
let
|
let
|
||||||
|
|||||||
@ -35,20 +35,20 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "siyuan";
|
pname = "siyuan";
|
||||||
version = "3.2.0";
|
version = "3.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "siyuan-note";
|
owner = "siyuan-note";
|
||||||
repo = "siyuan";
|
repo = "siyuan";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-Dqdooc1fhBxPDsdFXjUcsVkiXWHWGypyq8qJLd30tEA=";
|
hash = "sha256-QDuSYEp9wdhVQt9cydxEMkjJyom+VwhJYl6vBbA1S00=";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernel = buildGoModule {
|
kernel = buildGoModule {
|
||||||
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
||||||
inherit (finalAttrs) src;
|
inherit (finalAttrs) src;
|
||||||
sourceRoot = "${finalAttrs.src.name}/kernel";
|
sourceRoot = "${finalAttrs.src.name}/kernel";
|
||||||
vendorHash = "sha256-LXW3k3wsszJ0Ep8JyGhe9jvlH2FA0a3GCrmDrzJ34Wk=";
|
vendorHash = "sha256-5BCwk1bP4dHMLNV175OMHrmZVPInpjdE5vcETcsLhVw=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
(replaceVars ./set-pandoc-path.patch {
|
(replaceVars ./set-pandoc-path.patch {
|
||||||
@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
postPatch
|
postPatch
|
||||||
;
|
;
|
||||||
fetcherVersion = 1;
|
fetcherVersion = 1;
|
||||||
hash = "sha256-eSf4mpKBm1G4K9+V6VXEiPrIVQMyru7o9BGVIUycQaQ=";
|
hash = "sha256-WktlH+HmV4tegHxPb3BjYMr6EPsslCKb6p8aJ5bSdlY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "${finalAttrs.src.name}/app";
|
sourceRoot = "${finalAttrs.src.name}/app";
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user