demostf/frontend
1
0
Fork 0
mirror of https://codeberg.org/demostf/frontend.git synced 2026-06-03 18:24:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

flake update

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
docker.nix
View file

@ -1,6 +1,6 @@
{ dockerTools {
, demostf-frontend dockerTools,
, demostf-frontend,
}: }:
dockerTools.buildLayeredImage { dockerTools.buildLayeredImage {
name = "demostf/frontend"; name = "demostf/frontend";

30
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1730060262, "lastModified": 1739936662,
"narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734353159, "lastModified": 1742215471,
"narHash": "sha256-TDCUemm0azypG46OnVNISAcz6LDuMnD8rixps1NejfQ=", "narHash": "sha256-I/7CY1gd5R4b3rBlhcJyjCYcP+v/164g83uOT9HTfj0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flakelight", "repo": "flakelight",
"rev": "8ea81fa76945397adb766e1f249238bab6e72079", "rev": "e40a1a8c6d18c761659ed88d7536310a7e604f7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,11 +44,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1734789971, "lastModified": 1740783063,
"narHash": "sha256-Krf10FGET5NRfrWcQjaaSpo6cSXM2Wyl84DqHttNghw=", "narHash": "sha256-nJ/tvNBWFNJtwtNG/KsqtVq4p3aitkEb1pRW0qHvmsk=",
"owner": "icewind1991", "owner": "icewind1991",
"repo": "mill-scale", "repo": "mill-scale",
"rev": "ad3de3f1708ae23e9ebf2b4ef0f787366ddc45ee", "rev": "591ea924cfd3cd7932b385341fb0aad0a935bb46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732981179, "lastModified": 1742136038,
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,11 +105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731897198, "lastModified": 1740277845,
"narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "narHash": "sha256-NNU0CdiaSbAeZ8tpDG4aFi9qtcdlItRvk8Xns9oBrVU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "rev": "f933070c29f9c1c5457447a51903f27f76ebb519",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View file

@ -14,7 +14,12 @@
flake = false; flake = false;
}; };
}; };
outputs = { mill-scale, npmlock2nix, ... }: mill-scale ./. { outputs = {
mill-scale,
npmlock2nix,
...
}:
mill-scale ./. {
packageOpts = {demostf-frontend-node-modules, ...}: { packageOpts = {demostf-frontend-node-modules, ...}: {
preBuild = '' preBuild = ''
ln -s ${demostf-frontend-node-modules}/node_modules . ln -s ${demostf-frontend-node-modules}/node_modules .
@ -37,7 +42,8 @@
(import ./nix/overlay.nix) (import ./nix/overlay.nix)
]; ];
toolchain = pkgs: pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; toolchain = pkgs: pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
tools = pkgs: with pkgs; [ tools = pkgs:
with pkgs; [
bacon bacon
cargo-edit cargo-edit
nodejs nodejs

11
nix/node_modules.nix
View file

@ -1,9 +1,8 @@
{ npmlock2nix {
, nodejs_20 npmlock2nix,
, lib nodejs_20,
, lib,
}: }: let
let
inherit (lib.sources) sourceByRegex; inherit (lib.sources) sourceByRegex;
in in
npmlock2nix.v2.node_modules { npmlock2nix.v2.node_modules {

19
nix/package.nix
View file

@ -1,13 +1,12 @@
{ stdenv {
, makeRustPlatform stdenv,
, lib makeRustPlatform,
, demostf-frontend-toolchain lib,
, pkg-config demostf-frontend-toolchain,
, openssl pkg-config,
, demostf-frontend-node-modules openssl,
, demostf-frontend-node-modules,
}: }: let
let
inherit (lib.sources) sourceByRegex; inherit (lib.sources) sourceByRegex;
rustPlatform = makeRustPlatform { rustPlatform = makeRustPlatform {
rustc = demostf-frontend-toolchain; rustc = demostf-frontend-toolchain;