flake update

This commit is contained in:
Robin Appelman 2025-03-17 17:09:13 +01:00
commit 780d5fcf50
6 changed files with 94 additions and 90 deletions

View file

@ -1,12 +1,11 @@
{ npmlock2nix
, nodejs_20
, lib
,
}:
let
{
npmlock2nix,
nodejs_20,
lib,
}: let
inherit (lib.sources) sourceByRegex;
in
npmlock2nix.v2.node_modules {
src = sourceByRegex ../. [ "package.*" ];
nodejs = nodejs_20;
}
npmlock2nix.v2.node_modules {
src = sourceByRegex ../. ["package.*"];
nodejs = nodejs_20;
}

View file

@ -1,5 +1,5 @@
prev: final: {
demostf-frontend-node-modules = final.callPackage ./node_modules.nix { };
demostf-frontend = final.callPackage ./package.nix { };
demostf-frontend-docker = final.callPackage ./docker.nix { };
demostf-frontend-node-modules = final.callPackage ./node_modules.nix {};
demostf-frontend = final.callPackage ./package.nix {};
demostf-frontend-docker = final.callPackage ./docker.nix {};
}

View file

@ -1,39 +1,38 @@
{ stdenv
, makeRustPlatform
, lib
, demostf-frontend-toolchain
, pkg-config
, openssl
, demostf-frontend-node-modules
,
}:
let
{
stdenv,
makeRustPlatform,
lib,
demostf-frontend-toolchain,
pkg-config,
openssl,
demostf-frontend-node-modules,
}: let
inherit (lib.sources) sourceByRegex;
rustPlatform = makeRustPlatform {
rustc = demostf-frontend-toolchain;
cargo = demostf-frontend-toolchain;
};
in
rustPlatform.buildRustPackage rec {
pname = "demostf-frontend";
version = "0.1.0";
rustPlatform.buildRustPackage rec {
pname = "demostf-frontend";
version = "0.1.0";
src = sourceByRegex ../. [ "Cargo.*" "(src|build|images|script|style|.sqlx)(/.*)?" ];
src = sourceByRegex ../. ["Cargo.*" "(src|build|images|script|style|.sqlx)(/.*)?"];
buildInputs = [ openssl ];
buildInputs = [openssl];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [pkg-config];
preBuild = ''
ln -s ${demostf-frontend-node-modules}/node_modules .
'';
preBuild = ''
ln -s ${demostf-frontend-node-modules}/node_modules .
'';
doCheck = false;
doCheck = false;
cargoLock = {
lockFile = ../Cargo.lock;
outputHashes = {
"jsx-dom-expressions-0.1.0" = "sha256-5TN9FBfPYznTkpL9ZtnKv3RghX7r8c2WvSL1sc+F0cw=";
cargoLock = {
lockFile = ../Cargo.lock;
outputHashes = {
"jsx-dom-expressions-0.1.0" = "sha256-5TN9FBfPYznTkpL9ZtnKv3RghX7r8c2WvSL1sc+F0cw=";
};
};
};
}
}