Compare commits

..

No commits in common. "c1cc163e672585b2c85242b4ee8e30fd68e20b9d" and "fa24cd91bed037b0b7ba9f8894996f732fa38717" have entirely different histories.

2 changed files with 30 additions and 45 deletions

View file

@ -2,9 +2,7 @@
"nodes": { "nodes": {
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1701473968, "lastModified": 1701473968,
@ -22,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1703637592, "lastModified": 1702312524,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,27 +34,29 @@
"type": "github" "type": "github"
} }
}, },
"root": { "nixpkgs-lib": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs",
"systems": "systems"
}
},
"systems": {
"locked": { "locked": {
"lastModified": 1681028828, "dir": "lib",
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "lastModified": 1701253981,
"owner": "nix-systems", "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"repo": "default", "owner": "NixOS",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "dir": "lib",
"repo": "default", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
},
"root": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -1,39 +1,23 @@
{ {
inputs = { inputs = {
nixpkgs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
url = "github:NixOS/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts";
};
flake-parts = {
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
systems = {
url = "github:nix-systems/default";
};
}; };
outputs = inputs @ { outputs = inputs@{ nixpkgs, flake-parts, ... }:
nixpkgs, flake-parts.lib.mkFlake { inherit inputs; } {
flake-parts, systems = [ "x86_64-linux" "aarch64-linux" ];
...
}:
flake-parts.lib.mkFlake {inherit inputs;} {
systems = import inputs.systems;
perSystem = { perSystem = { pkgs, system, ... }: {
pkgs,
system,
...
}: {
devShells.default = devShells.default =
pkgs.mkShell {packages = with pkgs; [marp-cli];}; pkgs.mkShell { packages = with pkgs; [ marp-cli ]; };
packages.slides = pkgs.stdenvNoCC.mkDerivation { packages.slides = pkgs.stdenvNoCC.mkDerivation {
name = "slides"; name = "slides";
src = ./.; src = ./.;
dontUnpack = true; dontUnpack = true;
buildInputs = with pkgs; [marp-cli]; buildInputs = with pkgs; [ marp-cli ];
buildPhase = '' buildPhase = ''
marp --html $src/slides.md --allow-local-files -o slides.html marp --html $src/slides.md --allow-local-files -o slides.html
@ -48,3 +32,4 @@
}; };
}; };
} }