Skip to content

feat: add NixOS/flake-compat to have full compatibility with non-flake setups #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drupol wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add NixOS/flake-compat to have full compatibility with non-flake setups #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(import (
let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
nodeName = lock.nodes.root.inputs.flake-compat;
in
fetchTarball {
url =
lock.nodes.${nodeName}.locked.url
or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
sha256 = lock.nodes.${nodeName}.locked.narHash;
}
) { src = ./.; }).outputs.packages.${builtins.currentSystem}
33 changes: 17 additions & 16 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
description = "Typst - a modern typesetting system";

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
systems.url = "github:nix-systems/default";

flake-compat = {
url = "github:NixOS/flake-compat";
flake = false;
};

typst = {
url = "github:typst/typst/0.14";
Expand Down Expand Up @@ -32,7 +38,7 @@
...
}:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = import inputs.systems;
systems = inputs.nixpkgs.lib.systems.flakeExposed;

imports = [
inputs.flake-parts.flakeModules.easyOverlay
Expand Down
12 changes: 12 additions & 0 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(import (
let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
nodeName = lock.nodes.root.inputs.flake-compat;
in
fetchTarball {
url =
lock.nodes.${nodeName}.locked.url
or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
sha256 = lock.nodes.${nodeName}.locked.narHash;
}
) { src = ./.; }).shellNix