Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-NuJK5BjEsGeNQ2lBOHc5zPVzblwaS51hMUiYNtpQVlw=";
|
||||
hash = "sha256-YPA0+kj5ATEpPSMqdqqtG0s/hlODSmme2i2vgfUiRvI=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-6+X7h6AHmCwTmH0gOoB9Mb8yEsmmyJEQ58sSVrqSTeA=";
|
||||
hash = "sha256-P/8SOKEK8y7gLPD/r88tDoMuh2AeCUd7hPA6Be7+YuU=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-mvYWAEKoQODGgZ4CaJ5xlGnwEBatMU2oecSM2hVmRog=";
|
||||
hash = "sha256-QqHrephuGy+gq30HhRb/zjq3yEFQ6Vf3W6x2gaobObo=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-5EsFUBJie2zNtlwJYIcFndkNPDDsZlUAggLwF1QESug=";
|
||||
hash = "sha256-fhi3jgnl0Pu0WWHtOLEDlbgqNaGPJr6Ps3jxjhjvOBs=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "continue";
|
||||
publisher = "Continue";
|
||||
version = "1.2.10";
|
||||
version = "1.2.11";
|
||||
}
|
||||
// sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2025-11-23";
|
||||
version = "0-unstable-2025-11-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "f40a84ed2a104e46fc48ed9820f91b0542328732";
|
||||
hash = "sha256-yU4rKkynKILsEgxJbNGAXIzp5U8J4WILQzJ3WJ2Q2dg=";
|
||||
rev = "e1c45b0e0dcc50065913f6953466f1eef1028440";
|
||||
hash = "sha256-BICDRJfewohoSHNq1DPjZ7b69S4FxPeSLotp5JeSBrQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
anki-utils,
|
||||
fetchFromSourcehut,
|
||||
nix-update-script,
|
||||
gitUpdater,
|
||||
}:
|
||||
anki-utils.buildAnkiAddon (finalAttrs: {
|
||||
pname = "anki-connect";
|
||||
@@ -14,7 +14,7 @@ anki-utils.buildAnkiAddon (finalAttrs: {
|
||||
hash = "sha256-ZPjGqyxTyLg5DtOUPJWCBC/IMfDVxtWt86VeFrsE41k=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/plugin";
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = gitUpdater { };
|
||||
meta = {
|
||||
description = ''
|
||||
Enable external applications such as Yomichan to communicate
|
||||
|
||||
@@ -13,9 +13,6 @@
|
||||
finalAttrs:
|
||||
{
|
||||
pname,
|
||||
version,
|
||||
src,
|
||||
sourceRoot ? "",
|
||||
configurePhase ? ''
|
||||
runHook preConfigure
|
||||
runHook postConfigure
|
||||
@@ -26,7 +23,6 @@
|
||||
'',
|
||||
dontPatchELF ? true,
|
||||
dontStrip ? true,
|
||||
nativeBuildInputs ? [ ],
|
||||
passthru ? { },
|
||||
meta ? { },
|
||||
# Script run after "user_files" folder is populated.
|
||||
@@ -37,14 +33,10 @@
|
||||
}:
|
||||
{
|
||||
inherit
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
configurePhase
|
||||
buildPhase
|
||||
dontPatchELF
|
||||
dontStrip
|
||||
nativeBuildInputs
|
||||
;
|
||||
|
||||
pname = "anki-addon-${pname}";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
anki-utils.buildAnkiAddon (finalAttrs: {
|
||||
pname = "reviewer-refocus-card";
|
||||
version = "0-unstable-2022-12-24";
|
||||
version = "0.3.0-unstable-2022-12-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glutanimate";
|
||||
repo = "anki-addons-misc";
|
||||
|
||||
@@ -30,7 +30,7 @@ tag_sha="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github
|
||||
rev="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/ankitects/anki/git/tags/$tag_sha" | jq -r '.object.sha')"
|
||||
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
scriptDir="$nixpkgs/pkgs/games/anki"
|
||||
scriptDir="$nixpkgs/pkgs/by-name/an/anki"
|
||||
|
||||
ver=$(nix-instantiate --eval -E "(import \"$nixpkgs\" { config = {}; overlays = []; }).anki.version" | tr -d '"')
|
||||
|
||||
@@ -51,7 +51,7 @@ yarnHash=$(yarn-berry-fetcher prefetch $TMPDIR/yarn.lock $TMPDIR/missing-hashes.
|
||||
echo "Copying missing-hashes.json back into nixpkgs"
|
||||
cp $TMPDIR/missing-hashes.json "$scriptDir/missing-hashes.json"
|
||||
|
||||
sed -i -E "s|yarnHash = \".*\"|yarnHash = \"$yarnHash\"|" "$scriptDir/default.nix"
|
||||
sed -i -E "s|yarnHash = \".*\"|yarnHash = \"$yarnHash\"|" "$scriptDir/package.nix"
|
||||
|
||||
echo "yarnHash updated"
|
||||
echo "Regenerating uv-deps.json"
|
||||
@@ -82,8 +82,8 @@ echo "Wrote uv-deps.json"
|
||||
|
||||
srcHash="$(nix-prefetch-github ankitects anki --fetch-submodules --rev "$tag" --json | jq -r '.hash')"
|
||||
|
||||
sed -i "s|version = \".*\";|version = \"$tag\";|" "$scriptDir/default.nix"
|
||||
sed -i "s|rev = \".*\";|rev = \"$rev\";|" "$scriptDir/default.nix"
|
||||
sed -i "s|srcHash = \".*\";|srcHash = \"$srcHash\";|" "$scriptDir/default.nix"
|
||||
sed -i "s|version = \".*\";|version = \"$tag\";|" "$scriptDir/package.nix"
|
||||
sed -i "s|rev = \".*\";|rev = \"$rev\";|" "$scriptDir/package.nix"
|
||||
sed -i "s|srcHash = \".*\";|srcHash = \"$srcHash\";|" "$scriptDir/package.nix"
|
||||
|
||||
touch $TMPDIR/.done
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dtop";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amir20";
|
||||
repo = "dtop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IAaAJFwZivN6Eq6/h1cX4zeiLBJSmfS6VqKZY9ySD8Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-23EK6pTLiBl0Vhh+GqfzeHagj7ah1YqaSJdalonlAnA=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Terminal dashboard for Docker monitoring across multiple hosts with Dozzle integration";
|
||||
homepage = "https://dtop.dev/";
|
||||
downloadPage = "https://github.com/amir20/dtop";
|
||||
changelog = "https://github.com/amir20/dtop/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kpbaks ];
|
||||
mainProgram = "dtop";
|
||||
};
|
||||
})
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "enzyme";
|
||||
version = "0.0.217";
|
||||
version = "0.0.223";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnzymeAD";
|
||||
repo = "Enzyme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CKNwTuR0sP8U1TrFqZipZcymObMtpw4qrOkGqQn3GX0=";
|
||||
hash = "sha256-J11NVgBT8wOrSEP7lQZMGu5Th0VFrWTzEs0tz8otgcc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -90,6 +90,7 @@ stdenv.mkDerivation rec {
|
||||
CONFIG_ACS=y
|
||||
CONFIG_WNM=y
|
||||
CONFIG_MBO=y
|
||||
CONFIG_WPA_CLI_EDIT=y
|
||||
|
||||
CONFIG_IEEE80211R=y
|
||||
CONFIG_IEEE80211W=y
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyperfine";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "hyperfine";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk=";
|
||||
hash = "sha256-Ee889Fx2Mi2005SrlcKc7TwG8ZIpTqisfLebXYadvSg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eZpGqkowp/R//RqLRk3AIbTpW3i9e+lOWpfdli7S4uE=";
|
||||
cargoHash = "sha256-0e6QDVv//WQtfvrJj6jW1sEz7jFv3VC6UKLvclyytLs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minijinja";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "minijinja";
|
||||
rev = version;
|
||||
hash = "sha256-R/bnJx0JygrcMvGDl2YBdGNziKBOds3azGj1IHzpU2Q=";
|
||||
hash = "sha256-tULwJHqH8SnUjhbRHXOQffajMkZS0kYpRAv5sAHxUKg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SKnq/CbpPnUvjqWGt8Val/xKcqxpj7jCI4ABI8t4Lao=";
|
||||
cargoHash = "sha256-mYpDixMw5oLkAsF+elFawm3FgcOaXp0VivyJELmIok8=";
|
||||
|
||||
# The tests relies on the presence of network connection
|
||||
doCheck = false;
|
||||
|
||||
@@ -1,30 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "regippy";
|
||||
version = "2.0.1";
|
||||
let
|
||||
pname = "regrippy";
|
||||
version = "2.0.2";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
inherit pname version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airbus-cert";
|
||||
repo = "regrippy";
|
||||
rev = "05c9db999853c47af1d15f92f1a34aa2441e8882";
|
||||
hash = "sha256-gS7qVPlXwn6UXRXPN5ahPmQL3JpwmESUEi0KKAzOo+8=";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-43Wh5iQE1ihD8aGxDmmwKDkPeMfySP0mdk0XhrVefyc=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/regrip.py $out/bin/regrippy
|
||||
'';
|
||||
|
||||
build-system = [ python3.pkgs.setuptools ];
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
dependencies = [
|
||||
python3.pkgs.importlib-resources
|
||||
python3.pkgs.python-registry
|
||||
dependencies = with python3Packages; [
|
||||
importlib-resources
|
||||
python-registry
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-wanxiang";
|
||||
version = "13.4.6";
|
||||
version = "13.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amzxyz";
|
||||
repo = "rime_wanxiang";
|
||||
tag = "v" + finalAttrs.version;
|
||||
hash = "sha256-sQqcD6HmDn5LCI1b7ipHyBFw1/rfwhJUkBVvfQpRfvQ=";
|
||||
hash = "sha256-k5yJ7k33ttA8+ejMhxoJrhFQvRDtLmXqS9al2EQQOr0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
nix-update-script,
|
||||
xdg-utils,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -138,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--add-flags $out/share/siyuan/resources/app \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
--inherit-argv0
|
||||
|
||||
install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
calceph,
|
||||
withCalceph ? true,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "supernovas";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smithsonian";
|
||||
repo = "supernovas";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hv+OdLTzGp8y1yovZF+sSXiUi7bJx+a1V2ldsAHG9ME=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals withCalceph [ calceph ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "ENABLE_CALCEPH" withCalceph)
|
||||
(lib.cmakeBool "BUILD_EXAMPLES" false)
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "High-performance astrometry library for C/C++";
|
||||
homepage = "https://smithsonian.github.io/SuperNOVAS/";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ kiranshila ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tev";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tom94";
|
||||
repo = "tev";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-pK4XFrwNxaFgLFNTK8uPVSF4GBAkH8KkSFi3yWgMjF0=";
|
||||
hash = "sha256-5UkE7hd9ffKlDssZ0osslbWXSOGqodkS81/qnQfZzac=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux (
|
||||
|
||||
@@ -10,13 +10,13 @@ let
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "typescript-go";
|
||||
version = "0-unstable-2025-11-24";
|
||||
version = "0-unstable-2025-11-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "typescript-go";
|
||||
rev = "bd7c18dc8ed3c5ed960d72f1e329353f0a594bcc";
|
||||
hash = "sha256-RbLplpBIf7K576T6nN8EBr2TPoPuk8O9SbZ/VMHq3aw=";
|
||||
rev = "ea6a3dc055cfcac80fecf12264b01d62bfd7a094";
|
||||
hash = "sha256-gn46RcWqXor7yyMhG/TH3DwzTAko/5kST65iZ32vqgg=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
bzip2,
|
||||
cmake,
|
||||
gtk3,
|
||||
libGL,
|
||||
libvpx,
|
||||
libwebp,
|
||||
makeWrapper,
|
||||
ninja,
|
||||
openal,
|
||||
pkg-config,
|
||||
SDL2,
|
||||
vulkan-loader,
|
||||
zlib,
|
||||
zmusic,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uzdoom";
|
||||
version = "4.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UZDoom";
|
||||
repo = "UZDoom";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vMynousxc2k7jSa6ScYNeZ9/ozRnDXTyKwgcYQcf87M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "doc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
gtk3
|
||||
libGL
|
||||
libvpx
|
||||
libwebp
|
||||
openal
|
||||
SDL2
|
||||
vulkan-loader
|
||||
zlib
|
||||
zmusic
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tools/updaterevision/UpdateRevision.cmake \
|
||||
--replace-fail "unknown" "${finalAttrs.src.tag}"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "DYN_GTK" false)
|
||||
(lib.cmakeBool "DYN_OPENAL" false)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(lib.cmakeFeature "OPENAL_INCLUDE_DIR" "${openal}/include/AL")
|
||||
(lib.cmakeFeature "OPENAL_LIBRARY" "${openal}/lib/libopenal.dylib")
|
||||
(lib.cmakeBool "HAVE_VULKAN" true)
|
||||
(lib.cmakeBool "HAVE_GLES2" false)
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out"/{Applications,bin}
|
||||
mv uzdoom.app "$out/Applications/"
|
||||
makeWrapper $out/Applications/uzdoom.app/Contents/MacOS/uzdoom $out/bin/uzdoom \
|
||||
--chdir $out/Applications/uzdoom.app/Contents/MacOS/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
mv $out/bin/uzdoom $out/share/games/uzdoom/uzdoom
|
||||
makeWrapper $out/share/games/uzdoom/uzdoom $out/bin/uzdoom \
|
||||
--set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/UZDoom/UZDoom";
|
||||
description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine";
|
||||
mainProgram = "uzdoom";
|
||||
longDescription = ''
|
||||
UZDoom is a feature centric port for all Doom engine games, based on
|
||||
GZDoom, adding an advanced renderer and powerful scripting capabilities
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
Gliczy
|
||||
keenanweaver
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wrangler";
|
||||
version = "4.50.0";
|
||||
version = "4.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "workers-sdk";
|
||||
rev = "wrangler@${finalAttrs.version}";
|
||||
hash = "sha256-/hAqcaZCzF6n1yS2dsqXDk9J6Zu6+MDTc+BzKJ81XYk=";
|
||||
hash = "sha256-NYYw4/Yx4wVn7snXQsGxtppLNvqzAjg6fqQIFeKc9L4=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch
|
||||
;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-z38rGh9Wnj9iDR196hcVmS2AY1l07UJfcAhmD0Qx1Co=";
|
||||
hash = "sha256-utRo6lI8YgVJItqa/433HWNTp2AAHgiA3xWdJn2IELg=";
|
||||
};
|
||||
# pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
newScope,
|
||||
yarn-berry,
|
||||
yarn,
|
||||
replaceVars,
|
||||
libzip,
|
||||
zlib,
|
||||
zlib-ng,
|
||||
makeScopeWithSplicing',
|
||||
generateSplicesForMkScope,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -56,32 +57,36 @@ let
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
berryVersion = lib.versions.major yarn-berry.version;
|
||||
|
||||
otherSplices = generateSplicesForMkScope "yarn-berry_${berryVersion}-fetcher";
|
||||
in
|
||||
|
||||
lib.makeScope newScope (
|
||||
final:
|
||||
let
|
||||
berryVersion = lib.versions.major yarn-berry.version;
|
||||
makeScopeWithSplicing' {
|
||||
inherit otherSplices;
|
||||
f =
|
||||
final:
|
||||
let
|
||||
err = throw ''
|
||||
Berry version ${toString berryVersion} not supported by yarn-berry-fetcher.
|
||||
Supported versions: ${lib.concatStringsSep ", " (lib.attrNames variantOverlays)}
|
||||
'';
|
||||
variantOverlay = (variantOverlays.${berryVersion} or err) final;
|
||||
in
|
||||
(
|
||||
{
|
||||
inherit yarn-berry berryVersion;
|
||||
|
||||
err = throw ''
|
||||
Berry version ${toString berryVersion} not supported by yarn-berry-fetcher.
|
||||
Supported versions: ${lib.concatStringsSep ", " (lib.attrNames variantOverlays)}
|
||||
'';
|
||||
variantOverlay = (variantOverlays.${berryVersion} or err) final;
|
||||
in
|
||||
(
|
||||
{
|
||||
inherit yarn-berry berryVersion;
|
||||
yarn-berry-offline = final.yarn-berry.overrideAttrs (old: {
|
||||
pname = old.pname + "-offline";
|
||||
patches = (old.patches or [ ]) ++ final.berryOfflinePatches;
|
||||
});
|
||||
|
||||
yarn-berry-offline = final.yarn-berry.overrideAttrs (old: {
|
||||
pname = old.pname + "-offline";
|
||||
patches = (old.patches or [ ]) ++ final.berryOfflinePatches;
|
||||
});
|
||||
|
||||
yarn-berry-fetcher = final.callPackage ./yarn-berry-fetcher.nix { };
|
||||
fetchYarnBerryDeps = final.callPackage ./fetch-yarn-berry-deps.nix { };
|
||||
yarnBerryConfigHook = final.callPackage ./yarn-berry-config-hook.nix { };
|
||||
}
|
||||
// variantOverlay
|
||||
)
|
||||
)
|
||||
yarn-berry-fetcher = final.callPackage ./yarn-berry-fetcher.nix { };
|
||||
fetchYarnBerryDeps = final.callPackage ./fetch-yarn-berry-deps.nix { };
|
||||
yarnBerryConfigHook = final.callPackage ./yarn-berry-config-hook.nix { };
|
||||
}
|
||||
// variantOverlay
|
||||
);
|
||||
}
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "yay";
|
||||
version = "12.5.2";
|
||||
version = "12.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jguer";
|
||||
repo = "yay";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-obLGR4924hzDNJdTy7116oRXIHSOMFm3etV4fqJ+Yfg=";
|
||||
hash = "sha256-Nsno5oUVUCqt5tn+qUFoDj/n1oHyMwWTAUBG/OU11SA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rwws/Uw/gsTUbNLjJJ71DBLjVAH9wbOeb8CxjNmR25c=";
|
||||
vendorHash = "sha256-7y7Kb9770LiZxE0HOefh8T3+i36VcjsElo3GE+GdWeg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -77,6 +77,11 @@ let
|
||||
])
|
||||
++ additionalPkgs pkgs;
|
||||
|
||||
extraBwrapArgs = [
|
||||
"--bind-try /etc/nixos/ /etc/nixos/"
|
||||
"--ro-bind-try /etc/xdg/ /etc/xdg/"
|
||||
];
|
||||
|
||||
# symlink shared assets, including icons and desktop entries
|
||||
extraInstallCommands = ''
|
||||
ln -s "${zed-editor}/share" "$out/"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datetime";
|
||||
version = "5.5";
|
||||
version = "6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "zopefoundation";
|
||||
repo = "datetime";
|
||||
tag = version;
|
||||
hash = "sha256-VgIEpa3WpxfIUpBjXMor/xEEu+sp7z/EsLYEvU0RzWk=";
|
||||
hash = "sha256-bxFdj9B0LUbnn/q5RcO3tBwqAMMl3Ovom036y0yfUbE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipycanvas";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kh8UgiWLWSm1mTF7XBKZMdgOFr41+jgwCjLnqkz+n4k=";
|
||||
hash = "sha256-OFNwRHcRlN2jFjbEEHh4RxZyp6y1hLfotRgrIpsXBtU=";
|
||||
};
|
||||
|
||||
# We relax dependencies here instead of pulling in a patch because upstream
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "maestral";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "SamSchott";
|
||||
repo = "maestral";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xFSnJPKTAPXYa4FuqkFF5gLzGZ9TltNVDhyBnswiut4=";
|
||||
hash = "sha256-mYFiQL4FumJWP2y1u5tIo1CZL027J8/EIYqJQde7G/c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spotipy";
|
||||
version = "2.25.1";
|
||||
version = "2.25.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YH08Q3IrfiF6fmyC8XJYt5i5KlEgF9YMBjI9Yq6BTNc=";
|
||||
hash = "sha256-XtRcBEFWylUYmX4lArHyweczZAfLH7j+ES0US01Sgsg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
+2
-2
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "advanced-camera-card";
|
||||
version = "7.19.3";
|
||||
version = "7.19.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
|
||||
hash = "sha256-Y6wwpemByMIEh1HSllD/fuNrXPLFd5kpcjsETlfZcks=";
|
||||
hash = "sha256-fxNCF0mmfTo08UQJUF5ZGYi5EPN/SVKZI9Uo0TMRzw8=";
|
||||
};
|
||||
|
||||
# TODO: build from source once yarn berry support lands in nixpkgs
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
tzdata,
|
||||
wire,
|
||||
yarn-berry_4,
|
||||
yarn-berry_4-fetcher,
|
||||
buildPackages,
|
||||
python3,
|
||||
jq,
|
||||
moreutils,
|
||||
@@ -44,7 +46,8 @@ buildGoModule (finalAttrs: {
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
|
||||
# Since this is not a dependency attribute the buildPackages has to be specified.
|
||||
offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-CAEhdKsFMUuIs8DsJ9xSr2FRdBp4fPUWyvjC6FuiyG8=";
|
||||
};
|
||||
@@ -69,17 +72,19 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wire
|
||||
jq
|
||||
moreutils
|
||||
removeReferencesTo
|
||||
# required to run old node-gyp
|
||||
(python3.withPackages (ps: [ ps.distutils ]))
|
||||
(python3.pythonOnBuildForHost.withPackages (ps: [ ps.distutils ]))
|
||||
faketty
|
||||
nodejs
|
||||
yarn-berry_4
|
||||
yarn-berry_4.yarnBerryConfigHook
|
||||
yarn-berry_4-fetcher.yarnBerryConfigHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ];
|
||||
|
||||
@@ -88,7 +93,7 @@ buildGoModule (finalAttrs: {
|
||||
overrideModAttrs = (
|
||||
old: {
|
||||
nativeBuildInputs = lib.filter (
|
||||
x: lib.getName x != (lib.getName yarn-berry_4.yarnBerryConfigHook)
|
||||
x: lib.getName x != (lib.getName buildPackages.yarn-berry_4-fetcher.yarnBerryConfigHook)
|
||||
) old.nativeBuildInputs;
|
||||
}
|
||||
);
|
||||
@@ -99,9 +104,14 @@ buildGoModule (finalAttrs: {
|
||||
wire gen -tags oss ./pkg/server
|
||||
wire gen -tags oss ./pkg/cmd/grafana-cli/runner
|
||||
|
||||
GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go
|
||||
GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go
|
||||
|
||||
# ```
|
||||
# go-1.25.4/share/go/pkg/tool/linux_amd64/link: running aarch64-unknown-linux-gnu-gcc failed: exit status 1
|
||||
# aarch64-unknown-linux-gnu-gcc -m64 -s -o $WORK/b001/exe/gen -rdynamic /build/go-link-507658645/go.o
|
||||
# aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option '-m64'
|
||||
# ```
|
||||
# Above log is due to https://github.com/golang/go/blob/b194f5d24a71e34f147c90e4351d80ac75be55de/src/cmd/cgo/gcc.go#L1763
|
||||
CC="$CC_FOR_BUILD" LD="$CC_FOR_BUILD" GOOS= GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go
|
||||
CC="$CC_FOR_BUILD" LD="$LD_FOR_BUILD" GOOS= GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'elm_install'
|
||||
@@ -1,39 +0,0 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
adts (0.1.2)
|
||||
commander (4.4.3)
|
||||
highline (~> 1.7.2)
|
||||
contracts (0.16.0)
|
||||
elm_install (1.0.1)
|
||||
adts (~> 0.1.2)
|
||||
commander (~> 4.4, >= 4.4.2)
|
||||
contracts (~> 0.16.0)
|
||||
git (~> 1.3)
|
||||
git_clone_url (~> 2.0)
|
||||
hashdiff (~> 0.3.1)
|
||||
indentation (~> 0.1.1)
|
||||
smart_colored (~> 1.1, >= 1.1.1)
|
||||
solve (~> 3.1)
|
||||
git (1.3.0)
|
||||
git_clone_url (2.0.0)
|
||||
uri-ssh_git (>= 2.0)
|
||||
hashdiff (0.3.4)
|
||||
highline (1.7.8)
|
||||
indentation (0.1.1)
|
||||
molinillo (0.5.7)
|
||||
semverse (2.0.0)
|
||||
smart_colored (1.1.1)
|
||||
solve (3.1.0)
|
||||
molinillo (>= 0.5)
|
||||
semverse (>= 1.1, < 3.0)
|
||||
uri-ssh_git (2.0.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
elm_install
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
@@ -1,114 +0,0 @@
|
||||
{
|
||||
adts = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1793bfsgg8ca58b70xas9rglnspig41ih0iwqcad62s0grxzrjwz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.2";
|
||||
};
|
||||
commander = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "01qx76y05v29kgyjsfkai73gwfnqhypp1k8v024m9w7qzpv4mpxf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.4.3";
|
||||
};
|
||||
contracts = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "119f5p1n6r5svbx8h09za6a4vrsnj5i1pzr9cqdn9hj3wrxvyl3a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.16.0";
|
||||
};
|
||||
elm_install = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0d3fwhj54madabmzamss865kj8czicgaq5fbdll9kpapqvy6a2j5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
git = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
};
|
||||
git_clone_url = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0qgq7pjl461si3m2gr28vwbx47dcbpyy682mcwra5y1klpkbcvr5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
};
|
||||
hashdiff = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.4";
|
||||
};
|
||||
highline = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.8";
|
||||
};
|
||||
indentation = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0ix64qgmm91xm1yiqxdcn9bqb1l6gwvkv7322yni34b3bd16lgvc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
};
|
||||
molinillo = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.7";
|
||||
};
|
||||
semverse = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1cf6iv5wgwb7b8jf7il751223k9yahz9aym06s9r0prda5mwddyy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
};
|
||||
smart_colored = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0hccah5iwsvn9rf7zdgl7mdbh0h63vfwy1c6d280cb9qkfj8rdny";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
};
|
||||
solve = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0bbzny2bl94mv1xwcfrxbi3fjhxxawlz6la7mip2wwz9kkaf376h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.0";
|
||||
};
|
||||
uri-ssh_git = {
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0klyyvivbjll2ry18d8fhm1rbxbzd4kqa9lskxyiha4ndlb22cqj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
};
|
||||
}
|
||||
@@ -4184,7 +4184,13 @@ with pkgs;
|
||||
yapf = with python3Packages; toPythonApplication yapf;
|
||||
|
||||
yarn-berry_4 = yarn-berry.override { berryVersion = 4; };
|
||||
yarn-berry_4-fetcher = callPackage ../by-name/ya/yarn-berry/fetcher {
|
||||
yarn-berry = yarn-berry_4;
|
||||
};
|
||||
yarn-berry_3 = yarn-berry.override { berryVersion = 3; };
|
||||
yarn-berry_3-fetcher = callPackage ../by-name/ya/yarn-berry/fetcher {
|
||||
yarn-berry = yarn-berry_3;
|
||||
};
|
||||
|
||||
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user