Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix crane name in package build

Browse Source
This commit is contained in:
Henry-Hiles
2026-04-07 20:41:19 +00:00
committed by Henry Hiles
parent 4d59e07006
commit 16321cf467
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/packages/default.nix
+4 -4
View File
@@ -2,6 +2,7 @@
{ {
perSystem = perSystem =
{ {
craneLib,
self', self',
pkgs, pkgs,
lib, lib,
@@ -10,14 +11,13 @@
{ {
packages = packages =
let let
crane = self'.packages.crane;
src = src =
let let
# see https://crane.dev/API.html#cranelibfiltercargosources # see https://crane.dev/API.html#cranelibfiltercargosources
# we need to keep the `web` directory which would be filtered out by the regular source filtering function # we need to keep the `web` directory which would be filtered out by the regular source filtering function
# https://crane.dev/API.html#cranelibcleancargosource # https://crane.dev/API.html#cranelibcleancargosource
isWebTemplate = path: _type: builtins.match ".*(src/(web|service)|docs).*" path != null; isWebTemplate = path: _type: builtins.match ".*(src/(web|service)|docs).*" path != null;
isRust = crane.filterCargoSources; isRust = craneLib.filterCargoSources;
isNix = path: _type: builtins.match ".+/nix.*" path != null; isNix = path: _type: builtins.match ".+/nix.*" path != null;
webOrRustNotNix = p: t: !(isNix p t) && (isWebTemplate p t || isRust p t); webOrRustNotNix = p: t: !(isNix p t) && (isWebTemplate p t || isRust p t);
in in
@@ -34,11 +34,11 @@
env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ]; env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];
}; };
cargoArtifacts = crane.buildDepsOnly common; cargoArtifacts = craneLib.buildDepsOnly common;
rocksdb = pkgs.callPackage ./rocksdb.nix { }; rocksdb = pkgs.callPackage ./rocksdb.nix { };
continuwuity = crane.buildPackage ( continuwuity = craneLib.buildPackage (
common common
// { // {
inherit cargoArtifacts; inherit cargoArtifacts;