Merge pull request 'Add NixOS environment file' (#174) from 170-add-nixos-environment-file into main
Some checks failed
Push Workflows / docs (push) Successful in 1m30s
Push Workflows / docker-build (push) Failing after 1m30s
Push Workflows / test (push) Successful in 3m52s
Push Workflows / leptos-test (push) Successful in 6m31s
Push Workflows / build (push) Successful in 7m2s
Push Workflows / nix-build (push) Successful in 26m17s

Reviewed-on: #174
This commit is contained in:
Ethan Girouard 2024-12-18 05:35:17 +00:00
commit ecc5b35cd0
5 changed files with 232 additions and 1 deletions

View File

@ -73,3 +73,13 @@ jobs:
with: with:
name: docs name: docs
path: target/doc path: target/doc
nix-build:
runs-on: ubuntu-latest
steps:
- name: Update Package Lists
run: apt update
- name: Install Nix
run: apt install -y nix-bin
- name: Build project with Nix
run: nix build --experimental-features 'nix-command flakes' git+$GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git?ref=$GITHUB_REF_NAME#default

4
.gitignore vendored
View File

@ -31,3 +31,7 @@ playwright/.cache/
# Sass cache # Sass cache
.sass-cache .sass-cache
# Nix-related files
.direnv/
result

114
flake.lock generated Normal file
View File

@ -0,0 +1,114 @@
{
"nodes": {
"cargo-leptos": {
"flake": false,
"locked": {
"lastModified": 1732915351,
"narHash": "sha256-QPCYKlbPHuSBmwfkKdYhcVF81Lnirf65IYao7UVxz9Q=",
"owner": "leptos-rs",
"repo": "cargo-leptos",
"rev": "7d782a18e9d377be9de8d6217567ddde830fe89e",
"type": "github"
},
"original": {
"owner": "leptos-rs",
"ref": "v0.2.22",
"repo": "cargo-leptos",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1733940404,
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1728538411,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"cargo-leptos": "cargo-leptos",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1734230139,
"narHash": "sha256-zsp0Mz8VgyIAnU8UhP/YT1g+zlsl+NIJTBMAbY+RifQ=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "150fbc8aa2bc501041810bbc1dbfe73694a861be",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

102
flake.nix Normal file
View File

@ -0,0 +1,102 @@
{
description = "LibreTunes build and development environment";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
rust-overlay.url = "github:oxalica/rust-overlay";
flake-utils.url = "github:numtide/flake-utils";
cargo-leptos = {
url = "github:leptos-rs/cargo-leptos?ref=v0.2.22";
flake = false;
};
};
outputs = { self, nixpkgs, rust-overlay, flake-utils, cargo-leptos, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs {
inherit system overlays;
};
# Build a specific version of cargo-leptos
cargo-leptos-build = pkgs.rustPlatform.buildRustPackage {
name = "cargo-leptos";
buildFeatures = ["no_downloads"];
src = cargo-leptos;
cargoHash = "sha256-4v6sCTPRxe7bO7uV3HwUC8P1UsG8ydIvZ4rG2kU22zA=";
nativeBuildInputs = with pkgs; [
pkg-config
openssl
];
doCheck = false;
};
buildPkgs = with pkgs; [
(rust-bin.fromRustupToolchainFile ./rust-toolchain.toml)
cargo-leptos-build
clang
sass
openssl
postgresql
imagemagick
pkg-config
];
in
{
devShells.default = pkgs.mkShell {
LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ];
buildInputs = with pkgs; buildPkgs ++ [
diesel-cli
];
shellHook = ''
set -a
[[ -f .env ]] && source .env
set +a
'';
};
packages.default = pkgs.rustPlatform.buildRustPackage {
name = "libretunes";
src = ./.;
cargoLock = {
lockFile = ./Cargo.lock;
};
LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ];
nativeBuildInputs = with pkgs; buildPkgs ++ [
makeWrapper
];
buildInputs = with pkgs; [
openssl
imagemagick
];
# TODO enable --release builds
# Creates an issue with cargo-leptos trying to create cache directories
# See https://github.com/leptos-rs/cargo-leptos/issues/79
buildPhase = ''
cargo-leptos build --precompress #--release
'';
installPhase = ''
mkdir -p $out/bin
install -t $out target/debug/libretunes
cp -r target/site $out/site
makeWrapper $out/libretunes $out/bin/libretunes \
--set LEPTOS_SITE_ROOT $out/site
'';
doCheck = false;
};
}
);
}

View File

@ -1,3 +1,4 @@
[toolchain] [toolchain]
channel = "nightly" channel = "nightly"
targets = ["wasm32-unknown-unknown"]