Skip to content

Commit 1f4465a

Browse files
committed
nix: refactor and clean up flake
1 parent da86e4d commit 1f4465a

6 files changed

Lines changed: 79 additions & 338 deletions

File tree

.github/workflows/merge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Install nix
6666
uses: DeterminateSystems/nix-installer-action@v17
6767
- name: Build
68-
run: nix build .#dev.presenterm
68+
run: nix build .#presenterm
6969

7070
bat-assets:
7171
name: Validate bat assets

flake.lock

Lines changed: 8 additions & 278 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 19 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,24 @@
11
{
22
description = "A terminal slideshow tool";
33

4-
inputs = {
5-
flakebox = {
6-
url = "github:rustshop/flakebox?rev=62af969ab344229d2a0d585a482293b3f186b221";
4+
inputs.nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
5+
6+
outputs =
7+
{ nixpkgs, self }:
8+
let
9+
inherit (nixpkgs.lib) genAttrs systems;
10+
forEachSystem = genAttrs systems.flakeExposed;
11+
pkgsForEach = nixpkgs.legacyPackages;
12+
rev = self.shortRev or self.dirtyShortRev or "unknown";
13+
in
14+
{
15+
packages = forEachSystem (system: {
16+
presenterm = pkgsForEach.${system}.callPackage ./package.nix { inherit rev; };
17+
default = self.packages.${system}.presenterm;
18+
});
19+
20+
devShells = forEachSystem (system: {
21+
default = pkgsForEach.${system}.callPackage ./shell.nix { };
22+
});
723
};
8-
9-
flake-utils.url = "github:numtide/flake-utils";
10-
};
11-
12-
outputs = { self, flake-utils, flakebox }:
13-
flake-utils.lib.eachDefaultSystem (system:
14-
let
15-
projectName = "presenterm";
16-
pkgs = flakebox.inputs.nixpkgs.legacyPackages.${system};
17-
18-
flakeboxLib = flakebox.lib.mkLib pkgs {
19-
config = {
20-
github.ci.buildOutputs = [ ".#ci.${projectName}" ];
21-
};
22-
};
23-
24-
buildPaths = [
25-
"build.rs"
26-
"Cargo.toml"
27-
"Cargo.lock"
28-
".cargo"
29-
"src"
30-
"themes"
31-
"bat"
32-
"executors.yaml"
33-
];
34-
35-
buildSrc = flakeboxLib.filterSubPaths {
36-
root = builtins.path {
37-
name = projectName;
38-
path = ./.;
39-
};
40-
paths = buildPaths;
41-
};
42-
43-
multiBuild =
44-
(flakeboxLib.craneMultiBuild { }) (craneLib':
45-
let
46-
craneLib = (craneLib'.overrideArgs {
47-
pname = projectName;
48-
src = buildSrc;
49-
nativeBuildInputs = [ ];
50-
});
51-
in
52-
{
53-
${projectName} = craneLib.buildPackage { };
54-
});
55-
in
56-
{
57-
packages.default = multiBuild.${projectName};
58-
59-
legacyPackages = multiBuild;
60-
61-
devShells = flakeboxLib.mkShells { };
62-
}
63-
);
6424
}

0 commit comments

Comments
 (0)